svn commit: r1444938 - in /cocoon/branches/BRANCH_2_1_X: legal/ tools/targets/

[email protected]
Newsgroups gmane.text.xml.cocoon.cvs
Message-ID <[email protected]> 
Author: cdamioli
Date: Mon Feb 11 19:41:18 2013
New Revision: 1444938

URL: http://svn.apache.org/r1444938
Log:
COCOON-2330 Release separate source and dependencies packages 
Remove all old legal/*.license.txt stuff
Modify build-dist.xml to reflect the new location of licensing information

Removed:
    cocoon/branches/BRANCH_2_1_X/legal/ant-contrib-0.6.jar.license.txt
    cocoon/branches/BRANCH_2_1_X/legal/ant-junit.jar.license.txt
    cocoon/branches/BRANCH_2_1_X/legal/ant-launcher.jar.license.txt
    cocoon/branches/BRANCH_2_1_X/legal/ant-trax.jar.license.txt
    cocoon/branches/BRANCH_2_1_X/legal/ant.jar.license.txt
    cocoon/branches/BRANCH_2_1_X/legal/antlr-2.7.6.jar.license.txt
    cocoon/branches/BRANCH_2_1_X/legal/asm-2.2.1.jar.license.txt
    cocoon/branches/BRANCH_2_1_X/legal/asm-util-2.2.1.jar.license.txt
    cocoon/branches/BRANCH_2_1_X/legal/avalon-framework-api-4.3.jar.license.txt
    cocoon/branches/BRANCH_2_1_X/legal/avalon-framework-impl-4.3.jar.license.txt
    cocoon/branches/BRANCH_2_1_X/legal/avalon-logkit-2.1.jar.license.txt
    cocoon/branches/BRANCH_2_1_X/legal/axis-1.4.jar.license.txt
    cocoon/branches/BRANCH_2_1_X/legal/axis-jaxrpc-1.4.jar.license.txt
    cocoon/branches/BRANCH_2_1_X/legal/axis-saaj-1.4.jar.license.txt
    cocoon/branches/BRANCH_2_1_X/legal/batik-all-1.6.jar.license.txt
    cocoon/branches/BRANCH_2_1_X/legal/bsf-2.4.0.jar.license.txt
    cocoon/branches/BRANCH_2_1_X/legal/castor-0.9.6-xml.jar.license.txt
    cocoon/branches/BRANCH_2_1_X/legal/chaperon-20040205.jar.license.txt
    cocoon/branches/BRANCH_2_1_X/legal/commons-beanutils-core-1.7.0.jar.license.txt
    cocoon/branches/BRANCH_2_1_X/legal/commons-cli-1.0.jar.license.txt
    cocoon/branches/BRANCH_2_1_X/legal/commons-codec-1.3.jar.license.txt
    cocoon/branches/BRANCH_2_1_X/legal/commons-collections-3.2.jar.license.txt
    cocoon/branches/BRANCH_2_1_X/legal/commons-dbcp-1.2.1.jar.license.txt
    cocoon/branches/BRANCH_2_1_X/legal/commons-digester-1.7.jar.license.txt
    cocoon/branches/BRANCH_2_1_X/legal/commons-discovery-0.2.jar.license.txt
    cocoon/branches/BRANCH_2_1_X/legal/commons-el-1.0.jar.license.txt
    cocoon/branches/BRANCH_2_1_X/legal/commons-httpclient-2.0.2.jar.license.txt
    cocoon/branches/BRANCH_2_1_X/legal/commons-io-1.3.1.jar.license.txt
    cocoon/branches/BRANCH_2_1_X/legal/commons-jexl-1.0.jar.license.txt
    cocoon/branches/BRANCH_2_1_X/legal/commons-jxpath-1.2.jar.license.txt
    cocoon/branches/BRANCH_2_1_X/legal/commons-lang-2.4.jar.license.txt
    cocoon/branches/BRANCH_2_1_X/legal/commons-logging-1.0.4.jar.license.txt
    cocoon/branches/BRANCH_2_1_X/legal/commons-pool-1.2.jar.license.txt
    cocoon/branches/BRANCH_2_1_X/legal/commons-transaction-1.0.1.jar.license.txt
    cocoon/branches/BRANCH_2_1_X/legal/concurrent-1.3.4.jar.license.txt
    cocoon/branches/BRANCH_2_1_X/legal/daisy-htmlcleaner-1.4.1.jar.license.txt
    cocoon/branches/BRANCH_2_1_X/legal/daisy-util-1.4.1.jar.license.txt
    cocoon/branches/BRANCH_2_1_X/legal/db-ojb-1.0.4.jar.license.txt
    cocoon/branches/BRANCH_2_1_X/legal/deli-x050330.jar.license.txt
    cocoon/branches/BRANCH_2_1_X/legal/dojo-rsrc-0.4.3.jar.license.txt
    cocoon/branches/BRANCH_2_1_X/legal/easymock-1.1.jar.license.html
    cocoon/branches/BRANCH_2_1_X/legal/ehcache-1.2.3.jar.license.txt
    cocoon/branches/BRANCH_2_1_X/legal/excalibur-component-2.1.jar.license.txt
    cocoon/branches/BRANCH_2_1_X/legal/excalibur-datasource-2.1.jar.license.txt
    cocoon/branches/BRANCH_2_1_X/legal/excalibur-i18n-1.1.jar.license.txt
    cocoon/branches/BRANCH_2_1_X/legal/excalibur-instrument-api-2.1.jar.license.txt
    cocoon/branches/BRANCH_2_1_X/legal/excalibur-instrument-client-2.1.jar.license.txt
    cocoon/branches/BRANCH_2_1_X/legal/excalibur-instrument-mgr-api-2.1.jar.license.txt
    cocoon/branches/BRANCH_2_1_X/legal/excalibur-instrument-mgr-http-2.1.jar.license.txt
    cocoon/branches/BRANCH_2_1_X/legal/excalibur-instrument-mgr-impl-2.1.jar.license.txt
    cocoon/branches/BRANCH_2_1_X/legal/excalibur-logger-2.1.jar.license.txt
    cocoon/branches/BRANCH_2_1_X/legal/excalibur-naming-1.0.jar.license.txt
    cocoon/branches/BRANCH_2_1_X/legal/excalibur-pool-api-2.1.jar.license.txt
    cocoon/branches/BRANCH_2_1_X/legal/excalibur-pool-impl-2.1.jar.license.txt
    cocoon/branches/BRANCH_2_1_X/legal/excalibur-pool-instrumented-2.1.jar.license.txt
    cocoon/branches/BRANCH_2_1_X/legal/excalibur-sourceresolve-2.2.3.jar.license.txt
    cocoon/branches/BRANCH_2_1_X/legal/excalibur-store-2.1.jar.license.txt
    cocoon/branches/BRANCH_2_1_X/legal/excalibur-xmlutil-2.1.jar.license.txt
    cocoon/branches/BRANCH_2_1_X/legal/fop-0.20.5.jar.license.txt
    cocoon/branches/BRANCH_2_1_X/legal/geronimo-spec-activation-1.0.2-rc4.jar.license.txt
    cocoon/branches/BRANCH_2_1_X/legal/geronimo-spec-javamail-1.3.1-rc5.jar.license.txt
    cocoon/branches/BRANCH_2_1_X/legal/geronimo-spec-jms-1.1-rc3.jar.license.txt
    cocoon/branches/BRANCH_2_1_X/legal/geronimo-spec-jta-1.0.1B-rc3.jar.license.txt
    cocoon/branches/BRANCH_2_1_X/legal/groovy-1.0-jsr-05.jar.license.txt
    cocoon/branches/BRANCH_2_1_X/legal/hsqldb-1.8.0.7.jar.license.txt
    cocoon/branches/BRANCH_2_1_X/legal/htmlarea.license.txt
    cocoon/branches/BRANCH_2_1_X/legal/icu4j-2.8.jar.license.txt
    cocoon/branches/BRANCH_2_1_X/legal/itext-1.1.jar.license.txt
    cocoon/branches/BRANCH_2_1_X/legal/jackrabbit-core-1.0.1.jar.license.txt
    cocoon/branches/BRANCH_2_1_X/legal/jakarta-bcel-20040329.jar.license.txt
    cocoon/branches/BRANCH_2_1_X/legal/jakarta-oro-2.0.8.jar.license.txt
    cocoon/branches/BRANCH_2_1_X/legal/jakarta-regexp-1.5.jar.license.txt
    cocoon/branches/BRANCH_2_1_X/legal/jakarta-slide-webdavlib-2.1.jar.license.txt
    cocoon/branches/BRANCH_2_1_X/legal/jcs-1.2.5-dev-20050313.jar.license.txt
    cocoon/branches/BRANCH_2_1_X/legal/jdbi-1.3.1.jar.licence.txt
    cocoon/branches/BRANCH_2_1_X/legal/jdom-1.0.jar.license.txt
    cocoon/branches/BRANCH_2_1_X/legal/jdtcore-3.0.2.jar.license.html
    cocoon/branches/BRANCH_2_1_X/legal/jena-2.1.jar.license.txt
    cocoon/branches/BRANCH_2_1_X/legal/jetty-4.2.23.jar.license.html
    cocoon/branches/BRANCH_2_1_X/legal/jfor-0.7.1.jar.license.txt
    cocoon/branches/BRANCH_2_1_X/legal/jing-20030619.jar.license.txt
    cocoon/branches/BRANCH_2_1_X/legal/joost-20040330.jar.license.txt
    cocoon/branches/BRANCH_2_1_X/legal/js-1.6R5.jar.license.txt
    cocoon/branches/BRANCH_2_1_X/legal/jsp-api-2.0.jar.license.txt
    cocoon/branches/BRANCH_2_1_X/legal/jtidy-04aug2000r7-dev.jar.license.txt
    cocoon/branches/BRANCH_2_1_X/legal/junit-3.8.2.jar.license.html
    cocoon/branches/BRANCH_2_1_X/legal/log4j-1.2.14.jar.license.txt
    cocoon/branches/BRANCH_2_1_X/legal/lucene-1.4.3.jar.license.txt
    cocoon/branches/BRANCH_2_1_X/legal/midi-license.txt
    cocoon/branches/BRANCH_2_1_X/legal/myfaces-api-r233484.jar.license.txt
    cocoon/branches/BRANCH_2_1_X/legal/myfaces-impl-r233484.jar.license.txt
    cocoon/branches/BRANCH_2_1_X/legal/nekodtd-0.1.11.jar.license.txt
    cocoon/branches/BRANCH_2_1_X/legal/nekohtml-0.9.5.jar.license.txt
    cocoon/branches/BRANCH_2_1_X/legal/pizza-1.1.jar.license.txt
    cocoon/branches/BRANCH_2_1_X/legal/pluto-1.0.1.jar.license.txt
    cocoon/branches/BRANCH_2_1_X/legal/poi-2.5.1-final-20040804.jar.license.txt
    cocoon/branches/BRANCH_2_1_X/legal/portals-bridges-common-1.0.jar.license.txt
    cocoon/branches/BRANCH_2_1_X/legal/portlet-api-1.0.jar.license.txt
    cocoon/branches/BRANCH_2_1_X/legal/qdox-1.5.jar.license.txt
    cocoon/branches/BRANCH_2_1_X/legal/quartz-1.5.2.jar.license.txt
    cocoon/branches/BRANCH_2_1_X/legal/servlet-2.3.jar.license.txt
    cocoon/branches/BRANCH_2_1_X/legal/servlet_2_2.jar.license.txt
    cocoon/branches/BRANCH_2_1_X/legal/slf4j-api-1.6.4.jar.license.txt
    cocoon/branches/BRANCH_2_1_X/legal/slide-kernel-2.1.jar.license.txt
    cocoon/branches/BRANCH_2_1_X/legal/slide-stores-2.1.jar.license.txt
    cocoon/branches/BRANCH_2_1_X/legal/slide-webdavservlet-2.1.jar.license.txt
    cocoon/branches/BRANCH_2_1_X/legal/spark.fpl.license.txt
    cocoon/branches/BRANCH_2_1_X/legal/spark.opl.license.txt
    cocoon/branches/BRANCH_2_1_X/legal/velocity-1.4.jar.license.txt
    cocoon/branches/BRANCH_2_1_X/legal/wsdl4j-1.5.1.jar.license.txt
    cocoon/branches/BRANCH_2_1_X/legal/xalan-2.7.1.jar.license.txt
    cocoon/branches/BRANCH_2_1_X/legal/xercesImpl-2.9.1.jar.license.txt
    cocoon/branches/BRANCH_2_1_X/legal/xindice-1.1b4.jar.license.txt
    cocoon/branches/BRANCH_2_1_X/legal/xml-apis-1.3.04.jar.license.txt
    cocoon/branches/BRANCH_2_1_X/legal/xml-commons-resolver-1.2.jar.license.txt
    cocoon/branches/BRANCH_2_1_X/legal/xml-commons-resolver-1.2.jar.notice.txt
    cocoon/branches/BRANCH_2_1_X/legal/xmldb-api-20030701.jar.license.txt
    cocoon/branches/BRANCH_2_1_X/legal/xmldb-common-20030701.jar.license.txt
    cocoon/branches/BRANCH_2_1_X/legal/xmldb-xupdate-20040205.jar.license.txt
    cocoon/branches/BRANCH_2_1_X/legal/xmlrpc-1.1.jar.license.txt
    cocoon/branches/BRANCH_2_1_X/legal/xmlunit1.0.jar.license.txt
    cocoon/branches/BRANCH_2_1_X/legal/xreporter-expression-20040701.jar.license.txt
Modified:
    cocoon/branches/BRANCH_2_1_X/tools/targets/dist-build.xml

Modified: cocoon/branches/BRANCH_2_1_X/tools/targets/dist-build.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/tools/targets/dist-build.xml?rev=1444938&r1=1444937&r2=1444938&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/tools/targets/dist-build.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/tools/targets/dist-build.xml Mon Feb 11 19:41:18 2013
@@ -103,24 +103,29 @@
     <gzip zipfile="${dist.target}/${dist.name}-src.tar.gz" src="${dist.target}/${dist.name}-src.tar"/>
     <delete file="${dist.target}/${dist.name}-src.tar"/>
 
-    <zip zipfile="${dist.target}/${dist.name}-deps.zip"
-         basedir="${dist.root}">
-        <include name="${dist.name}/NOTICE.txt"/>
-        <include name="${dist.name}/lib/**"/>
-        <include name="${dist.name}/tools/lib/**"/>
-        <include name="${dist.name}/tools/jetty/lib/**"/>
-        <include name="${dist.name}/legal/**"/>
+    <zip zipfile="${dist.target}/${dist.name}-deps.zip">
+    	<fileset dir="${dist.root}">
+            <include name="${dist.name}/lib/**"/>
+            <include name="${dist.name}/tools/lib/**"/>
+            <include name="${dist.name}/tools/jetty/lib/**"/>
+    	</fileset>
+        <zipfileset dir="${dist.root}/${dist.name}/legal" prefix="${dist.name}/">
+            <include name="NOTICE.txt"/>
+            <include name="LICENSE.txt"/>
+        </zipfileset>
     </zip>
 
     <tar tarfile="${dist.target}/${dist.name}-deps.tar"
          longfile="gnu">
-         <tarfileset dir="${dist.root}">
-            <include name="${dist.name}/NOTICE.txt"/>
+        <tarfileset dir="${dist.root}">
             <include name="${dist.name}/lib/**"/>
             <include name="${dist.name}/tools/lib/**"/>
             <include name="${dist.name}/tools/jetty/lib/**"/>
-            <include name="${dist.name}/legal/**"/>
-         </tarfileset>
+        </tarfileset>
+        <tarfileset dir="${dist.root}/${dist.name}/legal" prefix="${dist.name}/">
+            <include name="NOTICE.txt"/>
+            <include name="LICENSE.txt"/>
+        </tarfileset>
     </tar>
     <gzip zipfile="${dist.target}/${dist.name}-deps.tar.gz" src="${dist.target}/${dist.name}-deps.tar"/>
     <delete file="${dist.target}/${dist.name}-deps.tar"/>
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.