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/19 23:42:09 UTC
svn commit: r423619 - in
/geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-minimal:
./ src/main/assembly/ src/main/var/config/ src/main/var/log/
src/main/var/security/ src/main/var/shared/ src/main/var/temp/
Author: jdillon
Date: Wed Jul 19 14:42:08 2006
New Revision: 423619
URL: http://svn.apache.org/viewvc?rev=423619&view=rev
Log:
Update to use boilerplate
Removed:
geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-minimal/src/main/var/config/README.txt
geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-minimal/src/main/var/log/
geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-minimal/src/main/var/security/
geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-minimal/src/main/var/shared/
geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-minimal/src/main/var/temp/
Modified:
geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-minimal/pom.xml
geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-minimal/src/main/assembly/bin.xml
geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-minimal/src/main/var/config/offline-deployer-list
Modified: geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-minimal/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-minimal/pom.xml?rev=423619&r1=423618&r2=423619&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-minimal/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-minimal/pom.xml Wed Jul 19 14:42:08 2006
@@ -30,6 +30,13 @@
<artifactId>geronimo-jetty-minimal</artifactId>
<name>Geronimo Assemblies :: Minimal + Jetty</name>
+ <!--
+
+ HACK: See build/resources below...
+
+ <packaging>pom</packaging>
+ -->
+ <packaging>jar</packaging>
<description>
A minimal Geronimo server assembly using the Jetty web-container.
@@ -405,14 +412,55 @@
</dependencies>
<build>
- <plugins>
+ <resources>
+ <!--
+ HACK: Because this is a pom packaging and assembly files/file is broke
+ we need to filter with the resources plugin... and must be a jar packaging
+ because for some %^&#ing reason maven-resources-plugin can not
+ be attached!!!!
+ -->
+ <resource>
+ <directory>${pom.basedir}/src/main/var/config</directory>
+ <includes>
+ <include>config.xml</include>
+ <include>offline-deployer-list</include>
+ </includes>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+
+ <plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>dependency-maven-plugin</artifactId>
<executions>
<execution>
- <id>unpack</id>
+ <id>unpack-boilerplate</id>
+ <phase>package</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.geronimo.assemblies</groupId>
+ <artifactId>geronimo-boilerplate-minimal</artifactId>
+ <version>${pom.version}</version>
+ <type>jar</type>
+ </artifactItem>
+ </artifactItems>
+ <outputDirectory>${project.build.directory}/boilerplate</outputDirectory>
+ </configuration>
+ </execution>
+
+ <!--
+
+ TODO: Move scripts to boilerplate
+
+ -->
+ <execution>
+ <id>unpack-scripts</id>
<phase>package</phase>
<goals>
<goal>unpack</goal>
@@ -429,6 +477,114 @@
<outputDirectory>${project.build.directory}/scripts</outputDirectory>
</configuration>
</execution>
+
+ <execution>
+ <id>unpack-schemas</id>
+ <phase>package</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-axis-builder</artifactId>
+ <version>${pom.version}</version>
+ <type>jar</type>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-client-builder</artifactId>
+ <version>${pom.version}</version>
+ <type>jar</type>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-connector-builder</artifactId>
+ <version>${pom.version}</version>
+ <type>jar</type>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-j2ee-builder</artifactId>
+ <version>${pom.version}</version>
+ <type>jar</type>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-naming-builder</artifactId>
+ <version>${pom.version}</version>
+ <type>jar</type>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-security-builder</artifactId>
+ <version>${pom.version}</version>
+ <type>jar</type>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-service-builder</artifactId>
+ <version>${pom.version}</version>
+ <type>jar</type>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-jetty-builder</artifactId>
+ <version>${pom.version}</version>
+ <type>jar</type>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-web-builder</artifactId>
+ <version>${pom.version}</version>
+ <type>jar</type>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-j2ee-builder</artifactId>
+ <version>${pom.version}</version>
+ <type>jar</type>
+ </artifactItem>
+ </artifactItems>
+ <outputDirectory>${project.build.directory}/scratch/schema</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>pre-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <!-- Flatten all schemas -->
+ <mkdir dir="${project.build.directory}/schema"/>
+ <copy todir="${project.build.directory}/schema">
+ <fileset dir="${project.build.directory}/scratch/schema">
+ <include name="**/*.xsd"/>
+ <include name="**/*.dtd"/>
+ </fileset>
+ <mapper type="flatten"/>
+ </copy>
+
+ <!-- Move filtered files -->
+ <move todir="${project.build.directory}/scratch">
+ <fileset dir="${project.build.directory}/classes">
+ <include name="config.xml"/>
+ <include name="offline-deployer-list"/>
+ </fileset>
+ </move>
+ </tasks>
+ </configuration>
+ </execution>
</executions>
</plugin>
@@ -465,6 +621,7 @@
</executions>
</plugin>
</plugins>
+
</build>
</project>
Modified: geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-minimal/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-minimal/src/main/assembly/bin.xml?rev=423619&r1=423618&r2=423619&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-minimal/src/main/assembly/bin.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-minimal/src/main/assembly/bin.xml Wed Jul 19 14:42:08 2006
@@ -68,37 +68,11 @@
</dependencySet>
<dependencySet>
- <outputDirectory>schema</outputDirectory>
- <includes>
- <include>org.apache.geronimo.modules:geronimo-axis-builder</include>
- <include>org.apache.geronimo.modules:geronimo-client-builder</include>
- <include>org.apache.geronimo.modules:geronimo-connector-builder</include>
- <include>org.apache.geronimo.modules:geronimo-j2ee-builder</include>
- <include>org.apache.geronimo.modules:geronimo-naming-builder</include>
- <include>org.apache.geronimo.modules:geronimo-security-builder</include>
- <include>org.apache.geronimo.modules:geronimo-service-builder</include>
- <include>org.apache.geronimo.modules:geronimo-jetty-builder</include>
- <include>org.apache.geronimo.modules:geronimo-web-builder</include>
- <include>org.apache.geronimo.modules:geronimo-j2ee-schema</include>
- </includes>
- <mapper>
- <type>flatten</type>
- </mapper>
- <unpack>
- <includes>
- <include>**/*.xsd</include>
- <include>**/*.dtd</include>
- </includes>
- </unpack>
- </dependencySet>
-
- <dependencySet>
<outputDirectory>bin</outputDirectory>
<outputFileNameMapping>server.jar</outputFileNameMapping>
<includes>
<include>org.apache.geronimo.configs:j2ee-system</include>
</includes>
- <fileMode>0755</fileMode>
</dependencySet>
<dependencySet>
@@ -107,7 +81,6 @@
<includes>
<include>org.apache.geronimo.configs:client-system</include>
</includes>
- <fileMode>0755</fileMode>
</dependencySet>
<dependencySet>
@@ -116,7 +89,6 @@
<includes>
<include>org.apache.geronimo.configs:online-deployer</include>
</includes>
- <fileMode>0755</fileMode>
</dependencySet>
<dependencySet>
@@ -125,7 +97,6 @@
<includes>
<include>org.apache.geronimo.configs:shutdown</include>
</includes>
- <fileMode>0755</fileMode>
</dependencySet>
<dependencySet>
@@ -134,12 +105,20 @@
<includes>
<include>org.apache.geronimo.configs:upgrade-cli</include>
</includes>
- <fileMode>0755</fileMode>
</dependencySet>
</dependencySets>
<fileSets>
<fileSet>
+ <directory>target/boilerplate</directory>
+ <outputDirectory>/</outputDirectory>
+ <excludes>
+ <exclude>META-INF/**</exclude>
+ </excludes>
+ </fileSet>
+
+ <!-- Include previously installed CAR files -->
+ <fileSet>
<directory>target/archive-tmp/repository</directory>
<outputDirectory>repository</outputDirectory>
<excludes>
@@ -151,6 +130,16 @@
</fileSet>
<fileSet>
+ <directory>target/schema</directory>
+ <outputDirectory>schema</outputDirectory>
+ <includes>
+ <include>**/*.xsd</include>
+ <include>**/*.dtd</include>
+ </includes>
+ <lineEnding>dos</lineEnding>
+ </fileSet>
+
+ <fileSet>
<directory>target/scripts</directory>
<outputDirectory>/</outputDirectory>
<includes>
@@ -171,18 +160,21 @@
</fileSet>
<fileSet>
- <directory>src/main/var</directory>
- <outputDirectory>var</outputDirectory>
+ <directory>target/scratch</directory>
+ <outputDirectory>var/config</outputDirectory>
+ <includes>
+ <include>offline-deployer-list</include>
+ </includes>
</fileSet>
- </fileSets>
-
- <files>
- <file>
- <source>src/main/var/config/config.xml</source>
+
+ <fileSet>
+ <directory>target/scratch</directory>
<outputDirectory>var/config</outputDirectory>
- <filtered>true</filtered>
<fileMode>0644</fileMode>
- </file>
- </files>
+ <includes>
+ <include>config.xml</include>
+ </includes>
+ </fileSet>
+ </fileSets>
</assembly>
Modified: geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-minimal/src/main/var/config/offline-deployer-list
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-minimal/src/main/var/config/offline-deployer-list?rev=423619&r1=423618&r2=423619&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-minimal/src/main/var/config/offline-deployer-list (original)
+++ geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-minimal/src/main/var/config/offline-deployer-list Wed Jul 19 14:42:08 2006
@@ -1,7 +1,9 @@
-#list of deployers to be started for offline deployment
-geronimo/geronimo-gbean-deployer/${pom.currentVersion}/car
-geronimo/j2ee-deployer/${pom.currentVersion}/car
-geronimo/jetty-deployer/${pom.currentVersion}/car
-geronimo/unavailable-ejb-deployer/${pom.currentVersion}/car
-geronimo/unavailable-webservices-deployer/${pom.currentVersion}/car
-geronimo/unavailable-client-deployer/${pom.currentVersion}/car
+##
+## List of deployers to be started for offline deployment
+##
+org.apache.geronimo.configs/geronimo-gbean-deployer/${pom.version}/car
+org.apache.geronimo.configs/j2ee-deployer/${pom.version}/car
+org.apache.geronimo.configs/unavailable-ejb-deployer/${pom.version}/car
+org.apache.geronimo.configs/unavailable-webservices-deployer/${pom.version}/car
+org.apache.geronimo.configs/unavailable-client-deployer/${pom.version}/car
+org.apache.geronimo.configs/jetty-deployer/${pom.version}/car