You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jd...@apache.org on 2006/07/17 03:49:25 UTC
svn commit: r422596 - in
/geronimo/sandbox/svkmerge/m2migration/m2-assemblies: ./
geronimo-jetty-j2ee/ geronimo-jetty-j2ee/src/main/assembly/
geronimo-jetty-j2ee/src/main/var/config/
geronimo-jetty-j2ee/src/main/var/log/ geronimo-jetty-j2ee/src/main/va...
Author: jdillon
Date: Sun Jul 16 18:49:25 2006
New Revision: 422596
URL: http://svn.apache.org/viewvc?rev=422596&view=rev
Log:
Use common module to pick up... whats common
Removed:
geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-j2ee/src/main/var/config/README.txt
geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-j2ee/src/main/var/log/
geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-j2ee/src/main/var/security/
geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-j2ee/src/main/var/shared/
geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-j2ee/src/main/var/temp/
Modified:
geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-j2ee/pom.xml
geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-j2ee/src/main/assembly/bin.xml
geronimo/sandbox/svkmerge/m2migration/m2-assemblies/pom.xml
Modified: geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-j2ee/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-j2ee/pom.xml?rev=422596&r1=422595&r2=422596&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-j2ee/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-j2ee/pom.xml Sun Jul 16 18:49:25 2006
@@ -623,6 +623,25 @@
<artifactId>dependency-maven-plugin</artifactId>
<executions>
<execution>
+ <id>unpack-common</id>
+ <phase>package</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.geronimo.assemblies</groupId>
+ <artifactId>geronimo-j2ee-common</artifactId>
+ <version>${pom.version}</version>
+ <type>jar</type>
+ </artifactItem>
+ </artifactItems>
+ <outputDirectory>${project.build.directory}/common</outputDirectory>
+ </configuration>
+ </execution>
+
+ <execution>
<id>unpack-scripts</id>
<phase>package</phase>
<goals>
Modified: geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-j2ee/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-j2ee/src/main/assembly/bin.xml?rev=422596&r1=422595&r2=422596&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-j2ee/src/main/assembly/bin.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-j2ee/src/main/assembly/bin.xml Sun Jul 16 18:49:25 2006
@@ -73,7 +73,6 @@
<includes>
<include>org.apache.geronimo.configs:j2ee-system</include>
</includes>
- <fileMode>0755</fileMode>
</dependencySet>
<dependencySet>
@@ -82,7 +81,6 @@
<includes>
<include>org.apache.geronimo.configs:client-system</include>
</includes>
- <fileMode>0755</fileMode>
</dependencySet>
<dependencySet>
@@ -91,7 +89,6 @@
<includes>
<include>org.apache.geronimo.configs:online-deployer</include>
</includes>
- <fileMode>0755</fileMode>
</dependencySet>
<dependencySet>
@@ -100,7 +97,6 @@
<includes>
<include>org.apache.geronimo.configs:shutdown</include>
</includes>
- <fileMode>0755</fileMode>
</dependencySet>
<dependencySet>
@@ -109,7 +105,6 @@
<includes>
<include>org.apache.geronimo.configs:upgrade-cli</include>
</includes>
- <fileMode>0755</fileMode>
</dependencySet>
</dependencySets>
@@ -154,6 +149,11 @@
<include>*.txt</include>
</includes>
<lineEnding>dos</lineEnding>
+ </fileSet>
+
+ <fileSet>
+ <directory>target/common</directory>
+ <outputDirectory>/</outputDirectory>
</fileSet>
<fileSet>
Modified: geronimo/sandbox/svkmerge/m2migration/m2-assemblies/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/m2-assemblies/pom.xml?rev=422596&r1=422595&r2=422596&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-assemblies/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/m2-assemblies/pom.xml Sun Jul 16 18:49:25 2006
@@ -79,15 +79,16 @@
</properties>
<modules>
- <module>geronimo-jetty-j2ee</module>
- <!--
-
- TODO: Refactor assembly to use dependency + antrun and assembly 2.1
-
- <module>geronimo-jetty-minimal</module>
- <module>geronimo-tomcat-j2ee</module>
- <module>geronimo-tomcat-minimal</module>
- -->
+ <module>geronimo-j2ee-common</module>
+ <module>geronimo-jetty-j2ee</module>
+ <!--
+
+ TODO: Refactor assembly to use dependency + antrun and assembly 2.1
+
+ <module>geronimo-jetty-minimal</module>
+ <module>geronimo-tomcat-j2ee</module>
+ <module>geronimo-tomcat-minimal</module>
+ -->
</modules>
</project>