diff options
| author | Martin Ritchie <ritchiem@apache.org> | 2006-11-10 13:15:56 +0000 |
|---|---|---|
| committer | Martin Ritchie <ritchiem@apache.org> | 2006-11-10 13:15:56 +0000 |
| commit | 2b5c4a9dd6c97a4f6b445c41ccce21e34b3558a0 (patch) | |
| tree | 95ede83b8107ad0f8f17b4661c8c7bc9dffe69f9 | |
| parent | 7d641a663802262dd381320d88a52160c2663d17 (diff) | |
| download | qpid-python-2b5c4a9dd6c97a4f6b445c41ccce21e34b3558a0.tar.gz | |
QPID-78
Added DISCLAIMER.txt LICENSE.txt and NOTICE.txt to the built jars
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid/java@473331 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | build.xml | 2 | ||||
| -rw-r--r-- | common.xml | 12 | ||||
| -rw-r--r-- | module.xml | 13 | ||||
| -rw-r--r-- | resources/META-INF/DISCLAIMER.txt | 7 |
4 files changed, 30 insertions, 4 deletions
@@ -157,7 +157,7 @@ <fileset dir="release-docs"> <include name="RELEASE_NOTES.txt"/> </fileset> - <fileset dir=""> + <fileset dir="${project.root}"> <include name="LICENSE.txt"/> <include name="README.txt"/> <include name="NOTICE.txt"/> diff --git a/common.xml b/common.xml index 6e209bdd50..84dd2e1c97 100644 --- a/common.xml +++ b/common.xml @@ -23,9 +23,8 @@ <property name="project.namever" value="${project.name}-${project.version}"/> <property name="client.namever" value="${project.name}-client-${project.version}"/> <property name="build.dir" value="${project.root}/build"/> - <property name="release.dir" value="release"/> - <property name="release.root.dir" value="${project.root}/${release.dir}"/> - + + <property name="specs.dir" value="specs"/> <property name="amqpspec.dir" value="${project.root}/../${specs.dir}"/> @@ -37,11 +36,18 @@ <property name="bin.dir" value="bin"/> <property name="etc.dir" value="etc"/> <property name="log.dir" value="log"/> + <property name="metainf.dir" value="META-INF"/> + <property name="release.dir" value="release"/> <property name="resources.dir" value="resources"/> <property name="stylesheets.dir" value="stylesheets"/> <property name="src.bin" value="${bin.dir}"/> <property name="launcher.sfx" value="-launch.jar"/> + <property name="release.root.dir" value="${project.root}/${release.dir}"/> + <property name="resources.root.dir" value="${project.root}/${resources.dir}"/> + + + <property name="dist.root" value="${build.dir}/dist"/> <property name="dist.dir" value="${dist.root}/${project.namever}"/> <property name="dist.client.dir" value="${dist.dir}/client"/> diff --git a/module.xml b/module.xml index 252871095a..2af973970d 100644 --- a/module.xml +++ b/module.xml @@ -193,6 +193,19 @@ </target> <target name="jar" depends="build"> + + <copy todir="${module.classes}"> + <fileset dir="${resources.root.dir}"> + <include name="${metainf.dir}/**"/> + </fileset> + </copy> + <copy todir="${module.classes}/${metainf.dir}"> + <fileset dir="${project.root}"> + <include name="LICENSE.txt"/> + <include name="NOTICE.txt"/> + </fileset> + </copy> + <jar destfile="${module.jar}" basedir="${module.classes}"/> </target> diff --git a/resources/META-INF/DISCLAIMER.txt b/resources/META-INF/DISCLAIMER.txt new file mode 100644 index 0000000000..d33c54a807 --- /dev/null +++ b/resources/META-INF/DISCLAIMER.txt @@ -0,0 +1,7 @@ +Qpid is an effort undergoing incubation at the Apache Software Foundation +(ASF). Incubation is required of all newly accepted projects until a further +review indicates that the infrastructure, communications, and decision making +process have stabilized in a manner consistent with other successful ASF +projects. While incubation status is not necessarily a reflection of the +completeness or stability of the code, it does indicate that the project +has yet to be fully endorsed by the ASF.
\ No newline at end of file |