Author: jlaskowski
Date: Sun Sep 16 03:17:08 2007
New Revision: 576067
URL: http://svn.apache.org/viewvc?rev=576067&view=rev
Log:
OPENEJB-685 Use Maven 2 Remote Resources Plugin to manage LICENSE/NOTICE files
Merging 575958, 575992 and 576066 from the 3.0-beta-1 branch
Added:
openejb/trunk/openejb3/src/
- copied from r575992, openejb/branches/3.0-beta-1/src/
openejb/trunk/openejb3/src/main/
- copied from r575992, openejb/branches/3.0-beta-1/src/main/
openejb/trunk/openejb3/src/main/appended-resources/
- copied from r575992,
openejb/branches/3.0-beta-1/src/main/appended-resources/
openejb/trunk/openejb3/src/main/appended-resources/supplemental-models.xml
- copied unchanged from r575992,
openejb/branches/3.0-beta-1/src/main/appended-resources/supplemental-models.xml
Removed:
openejb/trunk/openejb3/LICENSE.txt
openejb/trunk/openejb3/NOTICE.txt
openejb/trunk/openejb3/assembly/openejb-itests-webapp/LICENSE.txt
openejb/trunk/openejb3/assembly/openejb-itests-webapp/NOTICE.txt
openejb/trunk/openejb3/assembly/openejb-standalone/LICENSE.txt
openejb/trunk/openejb3/assembly/openejb-standalone/NOTICE.txt
openejb/trunk/openejb3/assembly/openejb-tomcat/LICENSE.txt
openejb/trunk/openejb3/assembly/openejb-tomcat/NOTICE.txt
openejb/trunk/openejb3/container/openejb-core/LICENSE.txt
openejb/trunk/openejb3/container/openejb-core/NOTICE.txt
openejb/trunk/openejb3/container/openejb-javaagent/LICENSE.txt
openejb/trunk/openejb3/container/openejb-javaagent/NOTICE.txt
openejb/trunk/openejb3/container/openejb-jee/LICENSE.txt
openejb/trunk/openejb3/container/openejb-jee/NOTICE.txt
openejb/trunk/openejb3/container/openejb-loader/LICENSE.txt
openejb/trunk/openejb3/container/openejb-loader/NOTICE.txt
openejb/trunk/openejb3/examples/calculator-stateless-pojo/LICENSE.txt
openejb/trunk/openejb3/examples/calculator-stateless-pojo/NOTICE.txt
openejb/trunk/openejb3/examples/counter-stateful-pojo/LICENSE.txt
openejb/trunk/openejb3/examples/counter-stateful-pojo/NOTICE.txt
openejb/trunk/openejb3/examples/ejb-injection/LICENSE.txt
openejb/trunk/openejb3/examples/ejb-injection/NOTICE.txt
openejb/trunk/openejb3/examples/helloworld-stateful-pojo/LICENSE.txt
openejb/trunk/openejb3/examples/helloworld-stateful-pojo/NOTICE.txt
openejb/trunk/openejb3/examples/telephone-stateful/LICENSE.txt
openejb/trunk/openejb3/examples/telephone-stateful/NOTICE.txt
openejb/trunk/openejb3/itests/openejb-itests-app/LICENSE.txt
openejb/trunk/openejb3/itests/openejb-itests-app/NOTICE.txt
openejb/trunk/openejb3/itests/openejb-itests-beans/LICENSE.txt
openejb/trunk/openejb3/itests/openejb-itests-beans/NOTICE.txt
openejb/trunk/openejb3/itests/openejb-itests-client/LICENSE.txt
openejb/trunk/openejb3/itests/openejb-itests-client/NOTICE.txt
openejb/trunk/openejb3/server/openejb-activemq/LICENSE.txt
openejb/trunk/openejb3/server/openejb-activemq/NOTICE.txt
openejb/trunk/openejb3/server/openejb-admin/LICENSE.txt
openejb/trunk/openejb3/server/openejb-admin/NOTICE.txt
openejb/trunk/openejb3/server/openejb-axis/LICENSE.txt
openejb/trunk/openejb3/server/openejb-axis/NOTICE.txt
openejb/trunk/openejb3/server/openejb-client/LICENSE.txt
openejb/trunk/openejb3/server/openejb-client/NOTICE.txt
openejb/trunk/openejb3/server/openejb-corba/LICENSE.txt
openejb/trunk/openejb3/server/openejb-corba/NOTICE.txt
openejb/trunk/openejb3/server/openejb-ejbd/LICENSE.txt
openejb/trunk/openejb3/server/openejb-ejbd/NOTICE.txt
openejb/trunk/openejb3/server/openejb-http/LICENSE.txt
openejb/trunk/openejb3/server/openejb-http/NOTICE.txt
openejb/trunk/openejb3/server/openejb-server/LICENSE.txt
openejb/trunk/openejb3/server/openejb-server/NOTICE.txt
openejb/trunk/openejb3/server/openejb-telnet/LICENSE.txt
openejb/trunk/openejb3/server/openejb-telnet/NOTICE.txt
openejb/trunk/openejb3/server/openejb-xfire/LICENSE.txt
openejb/trunk/openejb3/server/openejb-xfire/NOTICE.txt
Modified:
openejb/trunk/openejb3/assembly/openejb-standalone/src/main/assembly/bin.xml
openejb/trunk/openejb3/assembly/openejb-tomcat/src/main/assembly/bin.xml
openejb/trunk/openejb3/assembly/openejb-tomcat/src/main/assembly/itests.xml
(contents, props changed)
openejb/trunk/openejb3/pom.xml
Modified:
openejb/trunk/openejb3/assembly/openejb-standalone/src/main/assembly/bin.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-standalone/src/main/assembly/bin.xml?rev=576067&r1=576066&r2=576067&view=diff
==============================================================================
---
openejb/trunk/openejb3/assembly/openejb-standalone/src/main/assembly/bin.xml
(original)
+++
openejb/trunk/openejb3/assembly/openejb-standalone/src/main/assembly/bin.xml
Sun Sep 16 03:17:08 2007
@@ -28,9 +28,22 @@
</formats>
<fileSets>
<fileSet>
+ <directory>target/classes</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>README.txt</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <!-- TODO: There're two ways to leverage MRRP:
+ - o the one below
+ - o pom.xml where MRRP is configured to output the files in the
directory of our choice
+ -->
+ <directory>target/maven-shared-archive-resources/META-INF</directory>
+ <outputDirectory>/</outputDirectory>
<includes>
- <include>LICENSE.txt</include>
- <include>NOTICE.txt</include>
+ <include>LICENSE</include>
+ <include>NOTICE</include>
</includes>
</fileSet>
<fileSet>
@@ -38,7 +51,6 @@
<outputDirectory>bin/</outputDirectory>
<includes>
<include>*.bat</include>
- <include>README*</include>
</includes>
<lineEnding>dos</lineEnding>
<fileMode>0755</fileMode>
Modified:
openejb/trunk/openejb3/assembly/openejb-tomcat/src/main/assembly/bin.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/src/main/assembly/bin.xml?rev=576067&r1=576066&r2=576067&view=diff
==============================================================================
--- openejb/trunk/openejb3/assembly/openejb-tomcat/src/main/assembly/bin.xml
(original)
+++ openejb/trunk/openejb3/assembly/openejb-tomcat/src/main/assembly/bin.xml
Sun Sep 16 03:17:08 2007
@@ -16,6 +16,9 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
+
+<!-- $Rev$ $Date$ -->
+
<assembly>
<id>bin</id>
<formats>
@@ -26,9 +29,19 @@
<fileSets>
<fileSet>
<includes>
- <include>README*</include>
- <include>LICENSE.txt</include>
- <include>NOTICE.txt</include>
+ <include>README.txt</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <!-- TODO: There're two ways to leverage MRRP:
+ - o the one below
+ - o pom.xml where MRRP is configured to output the files in the
directory of our choice
+ -->
+ <directory>target/maven-shared-archive-resources/META-INF</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>LICENSE</include>
+ <include>NOTICE</include>
</includes>
</fileSet>
<fileSet>
@@ -36,6 +49,8 @@
<outputDirectory>openejb</outputDirectory>
<excludes>
<exclude>org/**</exclude>
+ <exclude>META-INF/LICENSE</exclude>
+ <exclude>META-INF/NOTICE</exclude>
</excludes>
</fileSet>
<fileSet>
@@ -52,6 +67,7 @@
<include>openejb-tomcat*.jar</include>
</includes>
<excludes>
+ <!-- TODO: Fix the exclusion to pick up the proper version -->
<exclude>openejb-tomcat-3.0-incubating-SNAPSHOT-test.*</exclude>
</excludes>
</fileSet>
Modified:
openejb/trunk/openejb3/assembly/openejb-tomcat/src/main/assembly/itests.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/src/main/assembly/itests.xml?rev=576067&r1=576066&r2=576067&view=diff
==============================================================================
--- openejb/trunk/openejb3/assembly/openejb-tomcat/src/main/assembly/itests.xml
(original)
+++ openejb/trunk/openejb3/assembly/openejb-tomcat/src/main/assembly/itests.xml
Sun Sep 16 03:17:08 2007
@@ -16,6 +16,9 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
+
+<!-- $Rev$ $Date$ -->
+
<assembly>
<id>itests</id>
<formats>
@@ -25,9 +28,19 @@
<fileSets>
<fileSet>
<includes>
- <include>README*</include>
- <include>LICENSE.txt</include>
- <include>NOTICE.txt</include>
+ <include>README.txt</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <!-- TODO: There're two ways to leverage MRRP:
+ - o the one below
+ - o pom.xml where MRRP is configured to output the files in the
directory of our choice
+ -->
+ <directory>target/maven-shared-archive-resources/META-INF</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>LICENSE</include>
+ <include>NOTICE</include>
</includes>
</fileSet>
<!--<fileSet>-->
Propchange:
openejb/trunk/openejb3/assembly/openejb-tomcat/src/main/assembly/itests.xml
------------------------------------------------------------------------------
svn:keywords = Date Rev Author Id Revision HeadURL
Modified: openejb/trunk/openejb3/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/pom.xml?rev=576067&r1=576066&r2=576067&view=diff
==============================================================================
--- openejb/trunk/openejb3/pom.xml (original)
+++ openejb/trunk/openejb3/pom.xml Sun Sep 16 03:17:08 2007
@@ -147,6 +147,28 @@
</execution>
</executions>
</plugin>
+ <!-- Add NOTICE and LICENSE to generated JAR -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <version>1.0-alpha-5</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ <configuration>
+ <resourceBundles>
+
<resourceBundle>org.apache:apache-jar-resource-bundle:1.2</resourceBundle>
+ </resourceBundles>
+
<appendedResourcesDirectory>${basedir}/../../src/main/appended-resources</appendedResourcesDirectory>
+ <properties>
+ <projectName>Apache OpenEJB</projectName>
+ </properties>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
