Author: aadamchik
Date: Wed Jan 17 01:01:46 2007
New Revision: 496968
URL: http://svn.apache.org/viewvc?view=rev&rev=496968
Log:
adding common license stuff to cayenne-agent jar
Added:
incubator/cayenne/main/trunk/core/cayenne-legal/
- copied from r496955,
incubator/cayenne/main/trunk/framework/cayenne-license/
incubator/cayenne/main/trunk/core/cayenne-legal/pom.xml
- copied, changed from r496967,
incubator/cayenne/main/trunk/framework/cayenne-license/pom.xml
incubator/cayenne/main/trunk/core/cayenne-legal/src/
- copied from r496967,
incubator/cayenne/main/trunk/framework/cayenne-license/src/
Removed:
incubator/cayenne/main/trunk/framework/cayenne-license/
Modified:
incubator/cayenne/main/trunk/core/pom.xml
incubator/cayenne/main/trunk/framework/cayenne-agent/pom.xml
incubator/cayenne/main/trunk/framework/pom.xml
Copied: incubator/cayenne/main/trunk/core/cayenne-legal/pom.xml (from r496967,
incubator/cayenne/main/trunk/framework/cayenne-license/pom.xml)
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-legal/pom.xml?view=diff&rev=496968&p1=incubator/cayenne/main/trunk/framework/cayenne-license/pom.xml&r1=496967&p2=incubator/cayenne/main/trunk/core/cayenne-legal/pom.xml&r2=496968
==============================================================================
--- incubator/cayenne/main/trunk/framework/cayenne-license/pom.xml (original)
+++ incubator/cayenne/main/trunk/core/cayenne-legal/pom.xml Wed Jan 17 01:01:46
2007
@@ -29,7 +29,7 @@
<version>3.0-SNAPSHOT</version>
</parent>
- <artifactId>cayenne-license</artifactId>
+ <artifactId>cayenne-legal</artifactId>
<name>Cayenne License and Notice Bundle</name>
<description>Cayenne License and Notice Bundle</description>
<packaging>jar</packaging>
Modified: incubator/cayenne/main/trunk/core/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/pom.xml?view=diff&rev=496968&r1=496967&r2=496968
==============================================================================
--- incubator/cayenne/main/trunk/core/pom.xml (original)
+++ incubator/cayenne/main/trunk/core/pom.xml Wed Jan 17 01:01:46 2007
@@ -36,6 +36,7 @@
<packaging>pom</packaging>
<modules>
+ <module>cayenne-legal</module>
<module>cayenne-jdk1.4</module>
<module>cayenne-jdk1.5</module>
<module>cayenne-jpa</module>
Modified: incubator/cayenne/main/trunk/framework/cayenne-agent/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/framework/cayenne-agent/pom.xml?view=diff&rev=496968&r1=496967&r2=496968
==============================================================================
--- incubator/cayenne/main/trunk/framework/cayenne-agent/pom.xml (original)
+++ incubator/cayenne/main/trunk/framework/cayenne-agent/pom.xml Wed Jan 17
01:01:46 2007
@@ -45,6 +45,28 @@
</plugin>
<plugin>
+
<artifactId>maven-remote-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ <phase>process-resources</phase>
+ <configuration>
+ <outputDirectory>
+
${project.build.directory}/classes/META-INF/cayenne
+ </outputDirectory>
+ <resourceBundles>
+ <resourceBundle>
+
org.apache.cayenne:cayenne-legal:${version}
+
</resourceBundle>
+ </resourceBundles>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
Modified: incubator/cayenne/main/trunk/framework/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/framework/pom.xml?view=diff&rev=496968&r1=496967&r2=496968
==============================================================================
--- incubator/cayenne/main/trunk/framework/pom.xml (original)
+++ incubator/cayenne/main/trunk/framework/pom.xml Wed Jan 17 01:01:46 2007
@@ -36,7 +36,6 @@
<packaging>pom</packaging>
<modules>
- <module>cayenne-license</module>
<module>cayenne-agent</module>
<module>cayenne-server</module>
<module>cayenne-client</module>
