You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by da...@apache.org on 2008/03/07 21:04:55 UTC
svn commit: r634794 - in /openejb/trunk/openejb3:
assembly/openejb-itests-standalone-client/src/main/assembly/
assembly/openejb-standalone/src/main/assembly/
assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/assembly/
itests/openejb-itests-web/src...
Author: dain
Date: Fri Mar 7 12:04:51 2008
New Revision: 634794
URL: http://svn.apache.org/viewvc?rev=634794&view=rev
Log:
assembly plugin on windows doesn't properly resolve relative paths
Modified:
openejb/trunk/openejb3/assembly/openejb-itests-standalone-client/src/main/assembly/client.xml
openejb/trunk/openejb3/assembly/openejb-standalone/src/main/assembly/bin.xml
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/assembly/war.xml
openejb/trunk/openejb3/itests/openejb-itests-web/src/main/assembly/war.xml
Modified: openejb/trunk/openejb3/assembly/openejb-itests-standalone-client/src/main/assembly/client.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-itests-standalone-client/src/main/assembly/client.xml?rev=634794&r1=634793&r2=634794&view=diff
==============================================================================
--- openejb/trunk/openejb3/assembly/openejb-itests-standalone-client/src/main/assembly/client.xml (original)
+++ openejb/trunk/openejb3/assembly/openejb-itests-standalone-client/src/main/assembly/client.xml Fri Mar 7 12:04:51 2008
@@ -27,6 +27,7 @@
<includeBaseDirectory>false</includeBaseDirectory>
<fileSets>
<fileSet>
+ <directory>${basedir}</directory>
<outputDirectory>META-INF</outputDirectory>
<includes>
<include>README.txt</include>
@@ -37,7 +38,7 @@
- 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>
+ <directory>${basedir}/target/maven-shared-archive-resources/META-INF</directory>
<outputDirectory>META-INF</outputDirectory>
<includes>
<include>LICENSE</include>
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=634794&r1=634793&r2=634794&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 Fri Mar 7 12:04:51 2008
@@ -28,7 +28,7 @@
</formats>
<fileSets>
<fileSet>
- <directory>target/classes</directory>
+ <directory>${basedir}/target/classes</directory>
<outputDirectory>/</outputDirectory>
<includes>
<include>README.txt</include>
@@ -37,7 +37,7 @@
</includes>
</fileSet>
<fileSet>
- <directory>target/classes</directory>
+ <directory>${basedir}/target/classes</directory>
<outputDirectory>bin/</outputDirectory>
<includes>
<include>*.bat</include>
@@ -46,7 +46,7 @@
<fileMode>0755</fileMode>
</fileSet>
<fileSet>
- <directory>target/classes</directory>
+ <directory>${basedir}/target/classes</directory>
<outputDirectory>bin/</outputDirectory>
<includes>
<include>openejb</include>
@@ -55,28 +55,28 @@
<fileMode>0755</fileMode>
</fileSet>
<fileSet>
- <directory>src/main/conf</directory>
+ <directory>${basedir}src/main/conf</directory>
<includes>
<include>README.txt</include>
</includes>
<outputDirectory>conf/</outputDirectory>
</fileSet>
<fileSet>
- <directory>target/classes/empty</directory>
+ <directory>${basedir}/target/classes/empty</directory>
<outputDirectory>logs/</outputDirectory>
</fileSet>
<fileSet>
- <directory>target/classes/empty</directory>
+ <directory>${basedir}/target/classes/empty</directory>
<outputDirectory>apps/</outputDirectory>
</fileSet>
<fileSet>
- <directory>target/classes/empty</directory>
+ <directory>${basedir}/target/classes/empty</directory>
<outputDirectory>data/</outputDirectory>
</fileSet>
</fileSets>
<files>
<file>
- <source>target/classes/DATA-README.txt</source>
+ <source>${basedir}/target/classes/DATA-README.txt</source>
<outputDirectory>data/</outputDirectory>
<destName>README.txt</destName>
<!-- TODO Assembly 2.1 plugin takes a decimal permission instead of octal -->
Modified: openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/assembly/war.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/assembly/war.xml?rev=634794&r1=634793&r2=634794&view=diff
==============================================================================
--- openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/assembly/war.xml (original)
+++ openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/assembly/war.xml Fri Mar 7 12:04:51 2008
@@ -27,12 +27,13 @@
<includeBaseDirectory>false</includeBaseDirectory>
<fileSets>
<fileSet>
+ <directory>${basedir}</directory>
<includes>
<include>README.txt</include>
</includes>
</fileSet>
<fileSet>
- <directory>target/classes</directory>
+ <directory>${basedir}/target/classes</directory>
<outputDirectory>/</outputDirectory>
<includes>
<include>README.txt</include>
@@ -41,7 +42,7 @@
</includes>
</fileSet>
<fileSet>
- <directory>target/classes</directory>
+ <directory>${basedir}/target/classes</directory>
<outputDirectory>/</outputDirectory>
<excludes>
<exclude>org/**</exclude>
@@ -50,11 +51,11 @@
</excludes>
</fileSet>
<fileSet>
- <directory>target/classes</directory>
+ <directory>${basedir}/target/classes</directory>
<outputDirectory>WEB-INF/classes</outputDirectory>
</fileSet>
<fileSet>
- <directory>target</directory>
+ <directory>${basedir}/target</directory>
<outputDirectory>lib</outputDirectory>
<includes>
<include>openejb-tomcat*.jar</include>
Modified: openejb/trunk/openejb3/itests/openejb-itests-web/src/main/assembly/war.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/itests/openejb-itests-web/src/main/assembly/war.xml?rev=634794&r1=634793&r2=634794&view=diff
==============================================================================
--- openejb/trunk/openejb3/itests/openejb-itests-web/src/main/assembly/war.xml (original)
+++ openejb/trunk/openejb3/itests/openejb-itests-web/src/main/assembly/war.xml Fri Mar 7 12:04:51 2008
@@ -27,6 +27,7 @@
<includeBaseDirectory>false</includeBaseDirectory>
<fileSets>
<fileSet>
+ <directory>${basedir}</directory>
<includes>
<include>README.txt</include>
</includes>
@@ -36,7 +37,7 @@
- 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>
+ <directory>${basedir}/target/maven-shared-archive-resources/META-INF</directory>
<outputDirectory>META-INF</outputDirectory>
<includes>
<include>LICENSE</include>