Author: jlaskowski
Date: Sun Sep 16 02:50:52 2007
New Revision: 576066
URL: http://svn.apache.org/viewvc?rev=576066&view=rev
Log:
OPENEJB-685 Use Maven 2 Remote Resources Plugin to manage LICENSE/NOTICE files
The last step in fully utilizing MRRP in OpenEJB - the assemblies include these
files too. Everything's set to go for the final vote. Hoorray!
Modified:
openejb/branches/3.0-beta-1/assembly/openejb-standalone/src/main/assembly/bin.xml
openejb/branches/3.0-beta-1/assembly/openejb-tomcat/src/main/assembly/bin.xml
openejb/branches/3.0-beta-1/assembly/openejb-tomcat/src/main/assembly/itests.xml
(contents, props changed)
Modified:
openejb/branches/3.0-beta-1/assembly/openejb-standalone/src/main/assembly/bin.xml
URL:
http://svn.apache.org/viewvc/openejb/branches/3.0-beta-1/assembly/openejb-standalone/src/main/assembly/bin.xml?rev=576066&r1=576065&r2=576066&view=diff
==============================================================================
---
openejb/branches/3.0-beta-1/assembly/openejb-standalone/src/main/assembly/bin.xml
(original)
+++
openejb/branches/3.0-beta-1/assembly/openejb-standalone/src/main/assembly/bin.xml
Sun Sep 16 02:50:52 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/branches/3.0-beta-1/assembly/openejb-tomcat/src/main/assembly/bin.xml
URL:
http://svn.apache.org/viewvc/openejb/branches/3.0-beta-1/assembly/openejb-tomcat/src/main/assembly/bin.xml?rev=576066&r1=576065&r2=576066&view=diff
==============================================================================
---
openejb/branches/3.0-beta-1/assembly/openejb-tomcat/src/main/assembly/bin.xml
(original)
+++
openejb/branches/3.0-beta-1/assembly/openejb-tomcat/src/main/assembly/bin.xml
Sun Sep 16 02:50:52 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/branches/3.0-beta-1/assembly/openejb-tomcat/src/main/assembly/itests.xml
URL:
http://svn.apache.org/viewvc/openejb/branches/3.0-beta-1/assembly/openejb-tomcat/src/main/assembly/itests.xml?rev=576066&r1=576065&r2=576066&view=diff
==============================================================================
---
openejb/branches/3.0-beta-1/assembly/openejb-tomcat/src/main/assembly/itests.xml
(original)
+++
openejb/branches/3.0-beta-1/assembly/openejb-tomcat/src/main/assembly/itests.xml
Sun Sep 16 02:50:52 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/branches/3.0-beta-1/assembly/openejb-tomcat/src/main/assembly/itests.xml
------------------------------------------------------------------------------
svn:keywords = Date Rev Author Id Revision HeadURL
