Author: jlaskowski
Date: Sat Sep 15 15:16:35 2007
New Revision: 575992
URL: http://svn.apache.org/viewvc?rev=575992&view=rev
Log:
OPENEJB-685 Use Maven 2 Remote Resources Plugin to manage LICENSE/NOTICE files
The remaining step to fully utilize mrrp is to include the LICENSE/NOTICE files
in assemblies and we're done
Added:
openejb/branches/3.0-beta-1/src/
openejb/branches/3.0-beta-1/src/main/
openejb/branches/3.0-beta-1/src/main/appended-resources/
openejb/branches/3.0-beta-1/src/main/appended-resources/supplemental-models.xml
(with props)
Removed:
openejb/branches/3.0-beta-1/LICENSE.txt
openejb/branches/3.0-beta-1/NOTICE.txt
openejb/branches/3.0-beta-1/assembly/openejb-itests-webapp/LICENSE.txt
openejb/branches/3.0-beta-1/assembly/openejb-itests-webapp/NOTICE.txt
openejb/branches/3.0-beta-1/assembly/openejb-standalone/LICENSE.txt
openejb/branches/3.0-beta-1/assembly/openejb-standalone/NOTICE.txt
openejb/branches/3.0-beta-1/assembly/openejb-tomcat/LICENSE.txt
openejb/branches/3.0-beta-1/assembly/openejb-tomcat/NOTICE.txt
openejb/branches/3.0-beta-1/container/openejb-core/LICENSE.txt
openejb/branches/3.0-beta-1/container/openejb-core/NOTICE.txt
openejb/branches/3.0-beta-1/container/openejb-javaagent/LICENSE.txt
openejb/branches/3.0-beta-1/container/openejb-javaagent/NOTICE.txt
openejb/branches/3.0-beta-1/container/openejb-jee/LICENSE.txt
openejb/branches/3.0-beta-1/container/openejb-jee/NOTICE.txt
openejb/branches/3.0-beta-1/container/openejb-loader/LICENSE.txt
openejb/branches/3.0-beta-1/container/openejb-loader/NOTICE.txt
openejb/branches/3.0-beta-1/examples/calculator-stateless-pojo/LICENSE.txt
openejb/branches/3.0-beta-1/examples/calculator-stateless-pojo/NOTICE.txt
openejb/branches/3.0-beta-1/examples/counter-stateful-pojo/LICENSE.txt
openejb/branches/3.0-beta-1/examples/counter-stateful-pojo/NOTICE.txt
openejb/branches/3.0-beta-1/examples/ejb-injection/LICENSE.txt
openejb/branches/3.0-beta-1/examples/ejb-injection/NOTICE.txt
openejb/branches/3.0-beta-1/examples/helloworld-stateful-pojo/LICENSE.txt
openejb/branches/3.0-beta-1/examples/helloworld-stateful-pojo/NOTICE.txt
openejb/branches/3.0-beta-1/examples/telephone-stateful/LICENSE.txt
openejb/branches/3.0-beta-1/examples/telephone-stateful/NOTICE.txt
openejb/branches/3.0-beta-1/itests/openejb-itests-app/LICENSE.txt
openejb/branches/3.0-beta-1/itests/openejb-itests-app/NOTICE.txt
openejb/branches/3.0-beta-1/itests/openejb-itests-beans/LICENSE.txt
openejb/branches/3.0-beta-1/itests/openejb-itests-beans/NOTICE.txt
openejb/branches/3.0-beta-1/itests/openejb-itests-client/LICENSE.txt
openejb/branches/3.0-beta-1/itests/openejb-itests-client/NOTICE.txt
openejb/branches/3.0-beta-1/server/openejb-activemq/LICENSE.txt
openejb/branches/3.0-beta-1/server/openejb-activemq/NOTICE.txt
openejb/branches/3.0-beta-1/server/openejb-admin/LICENSE.txt
openejb/branches/3.0-beta-1/server/openejb-admin/NOTICE.txt
openejb/branches/3.0-beta-1/server/openejb-axis/LICENSE.txt
openejb/branches/3.0-beta-1/server/openejb-axis/NOTICE.txt
openejb/branches/3.0-beta-1/server/openejb-client/LICENSE.txt
openejb/branches/3.0-beta-1/server/openejb-client/NOTICE.txt
openejb/branches/3.0-beta-1/server/openejb-corba/LICENSE.txt
openejb/branches/3.0-beta-1/server/openejb-corba/NOTICE.txt
openejb/branches/3.0-beta-1/server/openejb-ejbd/LICENSE.txt
openejb/branches/3.0-beta-1/server/openejb-ejbd/NOTICE.txt
openejb/branches/3.0-beta-1/server/openejb-http/LICENSE.txt
openejb/branches/3.0-beta-1/server/openejb-http/NOTICE.txt
openejb/branches/3.0-beta-1/server/openejb-server/LICENSE.txt
openejb/branches/3.0-beta-1/server/openejb-server/NOTICE.txt
openejb/branches/3.0-beta-1/server/openejb-telnet/LICENSE.txt
openejb/branches/3.0-beta-1/server/openejb-telnet/NOTICE.txt
openejb/branches/3.0-beta-1/server/openejb-xfire/LICENSE.txt
openejb/branches/3.0-beta-1/server/openejb-xfire/NOTICE.txt
Modified:
openejb/branches/3.0-beta-1/pom.xml
Modified: openejb/branches/3.0-beta-1/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/branches/3.0-beta-1/pom.xml?rev=575992&r1=575991&r2=575992&view=diff
==============================================================================
--- openejb/branches/3.0-beta-1/pom.xml (original)
+++ openejb/branches/3.0-beta-1/pom.xml Sat Sep 15 15:16:35 2007
@@ -147,6 +147,7 @@
</execution>
</executions>
</plugin>
+ <!-- Add NOTICE and LICENSE to generated JAR -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-remote-resources-plugin</artifactId>
@@ -158,18 +159,15 @@
</goals>
<configuration>
<resourceBundles>
-
<resourceBundle>org.apache:apache-jar-resource-bundle:1.0</resourceBundle>
+
<resourceBundle>org.apache:apache-jar-resource-bundle:1.2</resourceBundle>
</resourceBundles>
-
<appendedResourcesDirectory>${basedir}/../src/main/appended-resources</appendedResourcesDirectory>
+
<appendedResourcesDirectory>${basedir}/../../src/main/appended-resources</appendedResourcesDirectory>
+ <properties>
+ <projectName>Apache OpenEJB</projectName>
+ </properties>
</configuration>
</execution>
</executions>
- <configuration>
- <resourceBundles>
-
<resourceBundle>org.apache:apache-jar-resource-bundle:1.0</resourceBundle>
- </resourceBundles>
-
<appendedResourcesDirectory>${basedir}/../src/main/appended-resources</appendedResourcesDirectory>
- </configuration>
</plugin>
</plugins>
</build>
Added:
openejb/branches/3.0-beta-1/src/main/appended-resources/supplemental-models.xml
URL:
http://svn.apache.org/viewvc/openejb/branches/3.0-beta-1/src/main/appended-resources/supplemental-models.xml?rev=575992&view=auto
==============================================================================
---
openejb/branches/3.0-beta-1/src/main/appended-resources/supplemental-models.xml
(added)
+++
openejb/branches/3.0-beta-1/src/main/appended-resources/supplemental-models.xml
Sat Sep 15 15:16:35 2007
@@ -0,0 +1,210 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<supplementalDataModels>
+ <supplement>
+ <project>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <name>Apache Log4j</name>
+ <url>http://logging.apache.org/log4j/</url>
+ <organization>
+ <name>The Apache Software Foundation</name>
+ <url>http://www.apache.org/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>Apache License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.html</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <name>Sun JAXB Reference Implementation Runtime</name>
+ <organization>
+ <name>Sun Microsystems</name>
+ <url>http://www.sun.com/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version
1.0</name>
+ <url>http://www.sun.com/cddl/cddl.html</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <name>Java Architecture for XML Binding (JAXB) API</name>
+ <organization>
+ <name>Sun Microsystems</name>
+ <url>http://www.sun.com/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version
1.0</name>
+ <url>http://www.sun.com/cddl/cddl.html</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jsr173_api</artifactId>
+ <name>JSR173 API</name>
+ <organization>
+ <name>Sun Microsystems</name>
+ <url>http://www.sun.com/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version
1.0</name>
+ <url>http://www.sun.com/cddl/cddl.html</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>xalan</groupId>
+ <artifactId>xalan</artifactId>
+ <name>Apache Xalan</name>
+ <url>http://xalan.apache.org/</url>
+ <organization>
+ <name>The Apache Software Foundation</name>
+ <url>http://www.apache.org/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>Apache License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.html</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>xerces</groupId>
+ <artifactId>xmlParserAPIs</artifactId>
+ <name>Apache Xerces</name>
+ <url>http://xerces.apache.org/</url>
+ <organization>
+ <name>The Apache Software Foundation</name>
+ <url>http://www.apache.org/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>Apache License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.html</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ <name>Apache Ant</name>
+ <url>http://ant.apache.org/</url>
+ <organization>
+ <name>The Apache Software Foundation</name>
+ <url>http://www.apache.org/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>Apache License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.html</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <!-- TODO: Make sure it's correct - it's based on ICU4J 3.4.4 -->
+ <supplement>
+ <project>
+ <groupId>com.ibm.icu</groupId>
+ <artifactId>icu4j</artifactId>
+ <name>The International Component for Unicode (ICU)</name>
+ <url>http://www-306.ibm.com/software/globalization/icu/</url>
+ <organization>
+ <name>IBM</name>
+ <url>http://www.ibm.com/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>ICU License</name>
+
<url>http://www-306.ibm.com/software/globalization/icu/license.jsp</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>jdom</groupId>
+ <artifactId>jdom</artifactId>
+ <name>jdom</name>
+ <url>http://www.jdom.org/</url>
+ <organization>
+ <name>jdom.org</name>
+ <url>http://www.jdom.org/</url>
+ </organization>
+ <licenses>
+ <!-- TODO: Fill it out with proper values -->
+ <license>
+ <name>Apache License</name>
+ <url>http://www.jdom.org/docs/faq.html#a0030</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>activemq</groupId>
+ <artifactId>jmdns</artifactId>
+ <name>Apache ActiveMQ jmdns</name>
+ <url>http://activemq.apache.org/</url>
+ <organization>
+ <name>The Apache Software Foundation</name>
+ <url>http://www.apache.org/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>Apache License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.html</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+</supplementalDataModels>
Propchange:
openejb/branches/3.0-beta-1/src/main/appended-resources/supplemental-models.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
openejb/branches/3.0-beta-1/src/main/appended-resources/supplemental-models.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange:
openejb/branches/3.0-beta-1/src/main/appended-resources/supplemental-models.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
