Author: aadamchik
Date: Wed Jul 19 13:56:19 2006
New Revision: 423602
URL: http://svn.apache.org/viewvc?rev=423602&view=rev
Log:
fixing various pieces to create an apache build
Modified:
incubator/cayenne/main/trunk/cayenne/cayenne-ant/ant/cayenne-java.xml
incubator/cayenne/main/trunk/cayenne/cayenne-ant/ant/doc.xml
incubator/cayenne/main/trunk/cayenne/cayenne-ant/ant/dvmodeler.xml
incubator/cayenne/main/trunk/cayenne/cayenne-ant/ant/modeler.xml
incubator/cayenne/main/trunk/cayenne/cayenne-ant/build.xml
incubator/cayenne/main/trunk/cayenne/cayenne-ant/maven/build.xml
incubator/cayenne/main/trunk/cayenne/cayenne-ant/maven/cayenne-client-nodeps-pom.xml
incubator/cayenne/main/trunk/cayenne/cayenne-ant/maven/cayenne-modeler-pom.xml
incubator/cayenne/main/trunk/cayenne/cayenne-ant/maven/cayenne-nodeps-pom.xml
incubator/cayenne/main/trunk/cayenne/cayenne-ant/maven/cayenne-pom.xml
Modified: incubator/cayenne/main/trunk/cayenne/cayenne-ant/ant/cayenne-java.xml
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-ant/ant/cayenne-java.xml?rev=423602&r1=423601&r2=423602&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-ant/ant/cayenne-java.xml
(original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-ant/ant/cayenne-java.xml Wed
Jul 19 13:56:19 2006
@@ -144,7 +144,7 @@
<fileset dir="${core.build}"/>
<fileset dir="${core.build.1_5}"/>
- <metainf dir="${license.dir}" includes="LICENSE.txt"/>
+ <metainf dir="${license.dir}/top"/>
<manifest>
<attribute name="Built-By"
value="${user.name}"/>
<attribute name="Extension-Name"
value="org.apache.cayenne"/>
@@ -212,7 +212,7 @@
<exclude name="org/apache/cayenne/access/**"/>
</fileset>
- <metainf dir="${license.dir}" includes="LICENSE.txt"/>
+ <metainf dir="${license.dir}/top"/>
<manifest>
<attribute name="Built-By"
value="${user.name}"/>
<attribute name="Extension-Name"
value="org.apache.cayenne"/>
@@ -233,7 +233,7 @@
<fileset dir="${core.build.deps}"/>
- <metainf dir="${license.dir}" includes="**"/>
+ <metainf dir="${license.dir}/top"/>
<manifest>
<attribute name="Built-By"
value="${user.name}"/>
<attribute name="Extension-Name"
value="org.apache.cayenne"/>
Modified: incubator/cayenne/main/trunk/cayenne/cayenne-ant/ant/doc.xml
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-ant/ant/doc.xml?rev=423602&r1=423601&r2=423602&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-ant/ant/doc.xml (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-ant/ant/doc.xml Wed Jul 19
13:56:19 2006
@@ -78,7 +78,7 @@
<!-- copy all licenses & release notes -->
<copy todir="${dist}/doc/licenses">
- <fileset dir="${license.dir}" includes="**/**"/>
+ <fileset dir="${license.dir}/third-party"/>
</copy>
</target>
Modified: incubator/cayenne/main/trunk/cayenne/cayenne-ant/ant/dvmodeler.xml
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-ant/ant/dvmodeler.xml?rev=423602&r1=423601&r2=423602&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-ant/ant/dvmodeler.xml
(original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-ant/ant/dvmodeler.xml Wed Jul
19 13:56:19 2006
@@ -76,7 +76,7 @@
<jar jarfile="${dist}/lib/dvmodeler/cayenne-dvmodeler.jar">
<fileset dir="${dvmodeler.build}"/>
- <metainf dir="${license.dir}" includes="LICENSE.txt"/>
+ <metainf dir="${license.dir}/top"/>
<manifest>
<attribute name="Built-By"
value="${user.name}"/>
<attribute name="Extension-Name"
value="org.apache.cayenne"/>
Modified: incubator/cayenne/main/trunk/cayenne/cayenne-ant/ant/modeler.xml
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-ant/ant/modeler.xml?rev=423602&r1=423601&r2=423602&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-ant/ant/modeler.xml (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-ant/ant/modeler.xml Wed Jul 19
13:56:19 2006
@@ -81,7 +81,7 @@
<jar jarfile="${dist}/lib/modeler/cayenne-modeler.jar">
<fileset dir="${modeler.build}"/>
- <metainf dir="${license.dir}" includes="LICENSE.txt"/>
+ <metainf dir="${license.dir}/top"/>
<manifest>
<attribute name="Built-By"
value="${user.name}"/>
<attribute name="Extension-Name"
value="org.apache.cayenne"/>
Modified: incubator/cayenne/main/trunk/cayenne/cayenne-ant/build.xml
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-ant/build.xml?rev=423602&r1=423601&r2=423602&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-ant/build.xml (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-ant/build.xml Wed Jul 19
13:56:19 2006
@@ -85,6 +85,9 @@
<copy tofile="${dist}/RELEASE-NOTES.txt"
file="${notes.dir}/RELEASE-NOTES-${project.version}.txt"/>
<copy tofile="${dist}/UPGRADE.txt"
file="${notes.dir}/UPGRADE-${project.version}.txt"/>
+ <copy todir="${dist}">
+ <fileset dir="${license.dir}/top"/>
+ </copy>
<tar
tarfile="${dist.base}/${project.name}-${project.version}.tar.gz"
compression="gzip">
<tarfileset dir="${dist.base}">
Modified: incubator/cayenne/main/trunk/cayenne/cayenne-ant/maven/build.xml
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-ant/maven/build.xml?rev=423602&r1=423601&r2=423602&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-ant/maven/build.xml (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-ant/maven/build.xml Wed Jul 19
13:56:19 2006
@@ -152,8 +152,9 @@
</filterset>
</copy>
- <copy file="${cayenne.other}/licenses/LICENSE.txt"
- tofile="${stage}/LICENSE.txt"/>
+ <copy todir="${stage}">
+ <fileset dir="${cayenne.other}/licenses/top/"/>
+ </copy>
<copy
file="${dist.base}/${project.name}-${project.version}/lib/${m2.artifactId}.jar"
Modified:
incubator/cayenne/main/trunk/cayenne/cayenne-ant/maven/cayenne-client-nodeps-pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-ant/maven/cayenne-client-nodeps-pom.xml?rev=423602&r1=423601&r2=423602&view=diff
==============================================================================
---
incubator/cayenne/main/trunk/cayenne/cayenne-ant/maven/cayenne-client-nodeps-pom.xml
(original)
+++
incubator/cayenne/main/trunk/cayenne/cayenne-ant/maven/cayenne-client-nodeps-pom.xml
Wed Jul 19 13:56:19 2006
@@ -11,8 +11,8 @@
<licenses>
<license>
- <name>The Apache Software License, Version 1.1</name>
- <url>http://objectstyle.org/cayenne/license.html</url>
+ <name>Apache License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0</url>
</license>
</licenses>
Modified:
incubator/cayenne/main/trunk/cayenne/cayenne-ant/maven/cayenne-modeler-pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-ant/maven/cayenne-modeler-pom.xml?rev=423602&r1=423601&r2=423602&view=diff
==============================================================================
---
incubator/cayenne/main/trunk/cayenne/cayenne-ant/maven/cayenne-modeler-pom.xml
(original)
+++
incubator/cayenne/main/trunk/cayenne/cayenne-ant/maven/cayenne-modeler-pom.xml
Wed Jul 19 13:56:19 2006
@@ -11,8 +11,8 @@
<licenses>
<license>
- <name>The Apache Software License, Version 1.1</name>
- <url>http://objectstyle.org/cayenne/license.html</url>
+ <name>Apache License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0</url>
</license>
</licenses>
Modified:
incubator/cayenne/main/trunk/cayenne/cayenne-ant/maven/cayenne-nodeps-pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-ant/maven/cayenne-nodeps-pom.xml?rev=423602&r1=423601&r2=423602&view=diff
==============================================================================
---
incubator/cayenne/main/trunk/cayenne/cayenne-ant/maven/cayenne-nodeps-pom.xml
(original)
+++
incubator/cayenne/main/trunk/cayenne/cayenne-ant/maven/cayenne-nodeps-pom.xml
Wed Jul 19 13:56:19 2006
@@ -11,8 +11,8 @@
<licenses>
<license>
- <name>The Apache Software License, Version 1.1</name>
- <url>http://objectstyle.org/cayenne/license.html</url>
+ <name>Apache License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0</url>
</license>
</licenses>
Modified: incubator/cayenne/main/trunk/cayenne/cayenne-ant/maven/cayenne-pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-ant/maven/cayenne-pom.xml?rev=423602&r1=423601&r2=423602&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-ant/maven/cayenne-pom.xml
(original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-ant/maven/cayenne-pom.xml Wed
Jul 19 13:56:19 2006
@@ -12,8 +12,8 @@
<licenses>
<license>
- <name>The Apache Software License, Version 1.1</name>
- <url>http://objectstyle.org/cayenne/license.html</url>
+ <name>Apache License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0</url>
</license>
</licenses>
