geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r423369 - in /geronimo/sandbox/svkmerge/m2migration/m2-assemblies: ./ geronimo-tomcat-j2ee/ geronimo-tomcat-j2ee/src/main/assembly/ geronimo-tomcat-j2ee/src/main/var/config/ geronimo-tomcat-j2ee/src/main/var/log/ geronimo-tomcat-j2ee/src/ma...
Date Wed, 19 Jul 2006 05:10:35 GMT
Author: jdillon
Date: Tue Jul 18 22:10:35 2006
New Revision: 423369

URL: http://svn.apache.org/viewvc?rev=423369&view=rev
Log:
Convert geronimo-tomcat-j2ee to use new style assembly compatible with maven-assembly-plugin
2.1

Removed:
    geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-tomcat-j2ee/src/main/var/config/README.txt
    geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-tomcat-j2ee/src/main/var/log/
    geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-tomcat-j2ee/src/main/var/security/
    geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-tomcat-j2ee/src/main/var/shared/
    geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-tomcat-j2ee/src/main/var/temp/
Modified:
    geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-tomcat-j2ee/pom.xml
    geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-tomcat-j2ee/src/main/assembly/bin.xml
    geronimo/sandbox/svkmerge/m2migration/m2-assemblies/pom.xml

Modified: geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-tomcat-j2ee/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-tomcat-j2ee/pom.xml?rev=423369&r1=423368&r2=423369&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-tomcat-j2ee/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-tomcat-j2ee/pom.xml Tue Jul
18 22:10:35 2006
@@ -30,6 +30,13 @@
 
     <artifactId>geronimo-tomcat-j2ee</artifactId>
     <name>Geronimo Assemblies :: J2EE + Tomcat</name>
+    <!--
+    
+    HACK:  See build/resources below...
+    
+    <packaging>pom</packaging>
+    -->
+    <packaging>jar</packaging>
     
     <description>
         An assembly of Geronimo into a J2EE Server using Tomcat as the web container.
@@ -114,7 +121,8 @@
             <type>car</type>
         </dependency>
         
-        <!--dependency>
+        <!--
+        <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>activemq-broker</artifactId>
             <version>${pom.version}</version>
@@ -126,7 +134,8 @@
             <artifactId>activemq</artifactId>
             <version>${pom.version}</version>
             <type>car</type>
-        </dependency-->
+        </dependency>
+        -->
         
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
@@ -212,12 +221,14 @@
             <type>car</type>
         </dependency>
         
-        <!-- dependency>
+        <!--
+        <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>ldap-demo-tomcat</artifactId>
             <version>${pom.version}</version>
             <type>car</type>
-        </dependency -->
+        </dependency>
+        -->
         
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
@@ -226,7 +237,8 @@
             <type>car</type>
         </dependency>
         
-        <!--dependency>
+        <!--
+        <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>servlets-examples-tomcat</artifactId>
             <version>${pom.version}</version>
@@ -238,7 +250,8 @@
             <artifactId>jsp-examples-tomcat</artifactId>
             <version>${pom.version}</version>
             <type>car</type>
-        </dependency-->
+        </dependency>
+        -->
         
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
@@ -247,21 +260,26 @@
             <type>car</type>
         </dependency>
         
-        <!--dependency>
+        <!--<
+        dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jmxdebug-tomcat</artifactId>
             <version>${pom.version}</version>
             <type>car</type>
-        </dependency-->
+        </dependency>
+        -->
         
-        <!--dependency>
+        <!--
+        <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>remote-deploy-tomcat</artifactId>
             <version>${pom.version}</version>
             <type>car</type>
-        </dependency-->
+        </dependency>
+        -->
         
-        <!--dependency>
+        <!--
+        <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>uddi-tomcat</artifactId>
             <version>${pom.version}</version>
@@ -280,7 +298,8 @@
             <artifactId>daytrader-derby-tomcat-streamer-client</artifactId>
             <version>${pom.version}</version>
             <type>car</type>
-        </dependency-->
+        </dependency>
+        -->
         
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
@@ -581,13 +600,54 @@
     </dependencies>
     
     <build>
+        <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>
+                </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-j2ee</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>
@@ -604,6 +664,110 @@
                             <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-tomcat-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>
+                                
+                                <!-- Filter the config.xml -->
+                                <move file="${project.build.directory}/classes/config.xml"
+                                      tofile="${project.build.directory}/scratch/config.xml"/>
+                            </tasks>
+                        </configuration>
+                    </execution>
                 </executions>
             </plugin>
             
@@ -612,8 +776,8 @@
                 <artifactId>car-maven-plugin</artifactId>
                 <executions>
                     <execution>
-                        <id>installConfig</id>
-                        <phase>test</phase>
+                        <id>install-config</id>
+                        <phase>package</phase>
                         <goals>
                             <goal>installConfig</goal>
                         </goals>

Modified: geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-tomcat-j2ee/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-tomcat-j2ee/src/main/assembly/bin.xml?rev=423369&r1=423368&r2=423369&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-tomcat-j2ee/src/main/assembly/bin.xml
(original)
+++ geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-tomcat-j2ee/src/main/assembly/bin.xml
Tue Jul 18 22:10:35 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-tomcat-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,13 +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>
@@ -152,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>
@@ -175,15 +163,15 @@
             <directory>src/main/var</directory>
             <outputDirectory>var</outputDirectory>
         </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/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/m2-assemblies/pom.xml?rev=423369&r1=423368&r2=423369&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-assemblies/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/m2-assemblies/pom.xml Tue Jul 18 22:10:35 2006
@@ -82,12 +82,13 @@
         <module>geronimo-boilerplate-minimal</module>
         <module>geronimo-boilerplate-j2ee</module>
         <module>geronimo-jetty-j2ee</module>
+        <module>geronimo-tomcat-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>



Mime
View raw message