geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r421412 - in /geronimo/sandbox/svkmerge/m2migration: m2-assemblies/ m2-assemblies/j2ee-jetty-server/ m2-assemblies/j2ee-jetty-server/src/assemble/ m2-assemblies/j2ee-jetty-server/src/var/config/ m2-assemblies/j2ee-tomcat-server/ m2-assembli...
Date Wed, 12 Jul 2006 21:07:58 GMT
Author: jdillon
Date: Wed Jul 12 14:07:58 2006
New Revision: 421412

URL: http://svn.apache.org/viewvc?rev=421412&view=rev
Log:
Applying modified patches for GERONIMO-1737
This enables jetty and tomcat j2ee server assemblies in m2

NOTE: MUST apply the m2 assembly plugin patch and build locally to get 2.2-SNAPSHOT

Added:
    geronimo/sandbox/svkmerge/m2migration/m2-assemblies/j2ee-jetty-server/pom.xml   (with props)
    geronimo/sandbox/svkmerge/m2migration/m2-assemblies/j2ee-jetty-server/src/assemble/
    geronimo/sandbox/svkmerge/m2migration/m2-assemblies/j2ee-jetty-server/src/assemble/bin.xml   (with props)
    geronimo/sandbox/svkmerge/m2migration/m2-assemblies/j2ee-tomcat-server/pom.xml   (with props)
    geronimo/sandbox/svkmerge/m2migration/m2-assemblies/j2ee-tomcat-server/src/assemble/
    geronimo/sandbox/svkmerge/m2migration/m2-assemblies/j2ee-tomcat-server/src/assemble/bin.xml   (with props)
Modified:
    geronimo/sandbox/svkmerge/m2migration/m2-assemblies/j2ee-jetty-server/src/var/config/config.xml
    geronimo/sandbox/svkmerge/m2migration/m2-assemblies/j2ee-tomcat-server/src/var/config/config.xml
    geronimo/sandbox/svkmerge/m2migration/m2-assemblies/pom.xml
    geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-assembly-plugin/src/java/org/apache/geronimo/plugin/assembly/ConfigInstallerMojo.java

Added: geronimo/sandbox/svkmerge/m2migration/m2-assemblies/j2ee-jetty-server/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/m2-assemblies/j2ee-jetty-server/pom.xml?rev=421412&view=auto
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-assemblies/j2ee-jetty-server/pom.xml (added)
+++ geronimo/sandbox/svkmerge/m2migration/m2-assemblies/j2ee-jetty-server/pom.xml Wed Jul 12 14:07:58 2006
@@ -0,0 +1,650 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright 2006 The Apache Software Foundation
+    
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+    
+       http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    
+    <modelVersion>4.0.0</modelVersion>
+    
+    <parent>
+        <groupId>org.apache.geronimo.assemblies</groupId>
+        <artifactId>assemblies</artifactId>
+        <version>1.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>geronimo-jetty-j2ee</artifactId>
+    <name>Geronimo Assemblies :: J2EE+Jetty</name>
+    
+    <description>
+        An assembly of Geronimo into a J2EE Server using Jetty as the web container.
+    </description>
+    
+    <!--
+    
+    HACK: Need to explicitly configure SCM for this module since its artifactId
+          does not match the directory it lives in.
+    
+    FIXME: Rename module directory or artifactId
+    
+    -->
+    <scm>
+        <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/m2-assemblies/j2ee-jetty-server</connection>
+        <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/m2-assemblies/j2ee-jetty-server</developerConnection>
+        <url>http://svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/m2-assemblies/j2ee-jetty-server</url>
+    </scm>
+    
+    <dependencies>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>j2ee-system</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>rmi-naming</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>j2ee-server</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>j2ee-security</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>openejb</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>axis</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>j2ee-corba</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>jetty</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>directory</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>ldap-realm</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>system-database</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <!--dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>activemq-broker</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>activemq</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+        </dependency-->
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>client-system</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>client</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>client-security</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>client-corba</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>javamail</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>geronimo-gbean-deployer</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>j2ee-deployer</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>openejb-deployer</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>axis-deployer</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>client-deployer</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>hot-deployer</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>jetty-deployer</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <!-- dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>ldap-demo-jetty</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+        </dependency  -->
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>welcome-jetty</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <!--dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>servlets-examples-jetty</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>jsp-examples-jetty</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+        </dependency-->
+        
+        <!--dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>webconsole-jetty</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+        </dependency-->
+        
+        <!--dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>jmxdebug-jetty</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+        </dependency-->
+        
+        <!--dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>remote-deploy-jetty</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+        </dependency-->
+        
+        <!--dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>uddi-jetty</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>daytrader-derby-jetty</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>daytrader-derby-jetty-streamer-client</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+        </dependency-->
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>shutdown</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>online-deployer</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <!-- unpack -->
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-scripts</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <!-- lib dependencies -->
+        
+        <dependency>
+            <groupId>cglib</groupId>
+            <artifactId>cglib-nodep</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>commons-cli</groupId>
+            <artifactId>commons-cli</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-common</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-deploy-tool</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-deployment</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-kernel</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-system</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-qname_1.1_spec</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>mx4j</groupId>
+            <artifactId>mx4j</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>mx4j</groupId>
+            <artifactId>mx4j-remote</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>xpp3</groupId>
+            <artifactId>xpp3</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>xstream</groupId>
+            <artifactId>xstream</artifactId>
+        </dependency>
+        
+        <!-- endorsed -->
+        
+        <dependency>
+            <groupId>xerces</groupId>
+            <artifactId>xercesImpl</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>xerces</groupId>
+            <artifactId>xmlParserAPIs</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-deploy-jsr88</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-util</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-activation</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-axis</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-axis-builder</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-client</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-client-builder</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-connector</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-connector-builder</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-core</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-derby</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-directory</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-j2ee</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-j2ee-builder</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-j2ee-schema</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-jetty</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-jetty-builder</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-jmx-remoting</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-mail</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-management</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-naming</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-naming-builder</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-security</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-security-builder</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-service-builder</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-timer</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-tomcat</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-transaction</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-web-builder</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-webservices</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+    </dependencies>
+    
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>geronimo-assembly-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>installConfig</id>
+                        <phase>test</phase>
+                        <goals>
+                            <goal>installConfig</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <executions>
+                    <!--
+                    <execution>
+                        <id>setup</id>
+                        <phase>package</phase>
+                        <configuration>
+                            <descriptors>
+                                <descriptor>src/assemble/setup.xml</descriptor>
+                            </descriptors>
+                            <intermediaryAssembly>true</intermediaryAssembly>
+                        </configuration>
+                        <goals>
+                            <goal>assembly</goal>
+                        </goals>
+                    </execution>
+                    -->
+                    
+                    <execution>
+                        <id>test</id>
+                        <phase>package</phase>
+                        <configuration>
+                            <descriptors>
+                                <descriptor>${pom.basedir}/src/assemble/bin.xml</descriptor>
+                                <!-- <finalName>geronimo-${version}</finalName> -->
+                            </descriptors>
+                        </configuration>
+                        <goals>
+                            <goal>attached</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+    
+</project>

Propchange: geronimo/sandbox/svkmerge/m2migration/m2-assemblies/j2ee-jetty-server/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/svkmerge/m2migration/m2-assemblies/j2ee-jetty-server/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/sandbox/svkmerge/m2migration/m2-assemblies/j2ee-jetty-server/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/sandbox/svkmerge/m2migration/m2-assemblies/j2ee-jetty-server/src/assemble/bin.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/m2-assemblies/j2ee-jetty-server/src/assemble/bin.xml?rev=421412&view=auto
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-assemblies/j2ee-jetty-server/src/assemble/bin.xml (added)
+++ geronimo/sandbox/svkmerge/m2migration/m2-assemblies/j2ee-jetty-server/src/assemble/bin.xml Wed Jul 12 14:07:58 2006
@@ -0,0 +1,221 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright 2006 The Apache Software Foundation
+    
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+    
+       http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<assembly>
+    <id>bin</id>
+    
+    <formats>
+        <format>zip</format>
+        <format>tar.gz</format>
+        
+        <!--
+        
+        HACK: Turn off bz2 for now, it takes too long to generate.
+        
+        <format>tar.bz2</format>
+        -->
+    </formats>
+
+    <includeBaseDirectory>true</includeBaseDirectory>
+
+    <dependencySets>
+        <dependencySet>
+            <outputDirectory>/</outputDirectory>
+            <includes>
+                <include>org.apache.geronimo.modules:geronimo-scripts</include>
+            </includes>
+            <unpack>
+                <excludes>
+                    <exclude>**/META-INF/**</exclude>
+                </excludes>
+            </unpack>
+            <directoryMode>0755</directoryMode>
+            <fileMode>0755</fileMode>
+        </dependencySet>
+        
+        <dependencySet>
+            <outputDirectory>lib</outputDirectory>
+            <includes>
+                <include>cglib:cglib-nodep</include>
+                <include>commons-cli:commons-cli</include>
+                <include>commons-logging:commons-logging</include>
+                <include>concurrent:concurrent</include>
+                <include>org.apache.geronimo.modules:geronimo-common</include>
+                <include>org.apache.geronimo.modules:geronimo-deploy-jsr88</include>
+                <include>org.apache.geronimo.modules:geronimo-deploy-tool</include>
+                <include>org.apache.geronimo.modules:geronimo-deployment</include>
+                <include>org.apache.geronimo.modules:geronimo-kernel</include>
+                <include>org.apache.geronimo.modules:geronimo-system</include>
+                <include>org.apache.geronimo.modules:geronimo-util</include>
+                <include>org.apache.geronimo.specs:geronimo-qname_1.1_spec</include>
+                <include>org.apache.geronimo.specs:geronimo-j2ee-deployment_1.1_spec</include>
+                <include>log4j:log4j</include>
+                <include>mx4j:mx4j</include>
+                <include>mx4j:mx4j-remote</include>
+                <include>xpp3:xpp3</include>
+                <include>xstream:xstream</include>
+            </includes>
+        </dependencySet>
+        
+        <dependencySet>
+            <outputDirectory>lib/endorsed</outputDirectory>
+            <includes>
+                <include>xerces:xercesImpl</include>
+                <include>xerces:xmlParserAPIs</include>
+            </includes>
+        </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>
+            <outputDirectory>bin</outputDirectory>
+            <outputFileNameMapping>client.jar</outputFileNameMapping>
+            <includes>
+                <include>org.apache.geronimo.configs:client-system</include>
+            </includes>
+            <fileMode>0755</fileMode>
+        </dependencySet>
+        
+        <dependencySet>
+            <outputDirectory>bin</outputDirectory>
+            <outputFileNameMapping>deployer.jar</outputFileNameMapping>
+            <includes>
+                <include>org.apache.geronimo.configs:online-deployer</include>
+            </includes>
+            <fileMode>0755</fileMode>
+        </dependencySet>
+        
+        <dependencySet>
+            <outputDirectory>bin</outputDirectory>
+            <outputFileNameMapping>shutdown.jar</outputFileNameMapping>
+            <includes>
+                <include>org.apache.geronimo.configs:shutdown</include>
+            </includes>
+            <fileMode>0755</fileMode>
+        </dependencySet>
+        
+        <dependencySet>
+            <outputDirectory>bin</outputDirectory>
+            <outputFileNameMapping>upgrade.jar</outputFileNameMapping>
+            <includes>
+                <include>org.apache.geronimo.configs:upgrade-cli</include>
+            </includes>
+            <fileMode>0755</fileMode>
+        </dependencySet>
+    </dependencySets>
+
+    <fileSets>
+        <fileSet>
+            <directory>target/archive-tmp/repository</directory>
+            <outputDirectory>repository</outputDirectory>
+            <excludes>
+                <exclude>**/META-INF/maven/**</exclude>
+                <exclude>**/*.pom</exclude>
+                <exclude>**/*.sha1</exclude>
+                <exclude>**/*.md5</exclude>
+            </excludes>
+        </fileSet>
+        
+        <!--
+        
+        FIXME: Remove the need to have a version listed here!
+        
+        -->
+        
+        <fileSet>
+            <directory>target/assembly/work/geronimo-scripts-1.2-SNAPSHOT.jar</directory>
+            <outputDirectory>/</outputDirectory>
+            <includes>
+                <include>**/*.sh</include>
+            </includes>
+            <lineEnding>unix</lineEnding>
+            <fileMode>0755</fileMode>
+        </fileSet>
+        
+        <fileSet>
+            <directory>target/assembly/work/geronimo-scripts-1.2-SNAPSHOT.jar</directory>
+            <outputDirectory>/</outputDirectory>
+            <includes>
+                <include>**/*.bat</include>
+            </includes>
+            <lineEnding>dos</lineEnding>
+        </fileSet>
+        
+        <fileSet>
+            <directory>src/var</directory>
+            <outputDirectory>var</outputDirectory>
+        </fileSet>
+    </fileSets>
+
+    <files>
+        <file>
+            <source>${basedir}/src/var/config/config.xml</source>
+            <outputDirectory>var/config</outputDirectory>
+            <filtered>true</filtered>
+            <fileMode>0644</fileMode>
+        </file>
+        <file>
+            <source>${basedir}/src/var/config/config.xml</source>
+            <outputDirectory>var/config</outputDirectory>
+            <destName>config.xml.orig</destName>
+            <filtered>true</filtered>
+            <fileMode>0644</fileMode>
+        </file>
+        <file>
+            <source>${basedir}/src/var/config/config.xml</source>
+            <outputDirectory>var/config</outputDirectory>
+            <destName>offline-deployer-list</destName>
+            <filtered>true</filtered>
+            <fileMode>0644</fileMode>
+        </file>
+    </files>
+
+</assembly>

Propchange: geronimo/sandbox/svkmerge/m2migration/m2-assemblies/j2ee-jetty-server/src/assemble/bin.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/svkmerge/m2migration/m2-assemblies/j2ee-jetty-server/src/assemble/bin.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/sandbox/svkmerge/m2migration/m2-assemblies/j2ee-jetty-server/src/assemble/bin.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: geronimo/sandbox/svkmerge/m2migration/m2-assemblies/j2ee-jetty-server/src/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/m2-assemblies/j2ee-jetty-server/src/var/config/config.xml?rev=421412&r1=421411&r2=421412&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-assemblies/j2ee-jetty-server/src/var/config/config.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/m2-assemblies/j2ee-jetty-server/src/var/config/config.xml Wed Jul 12 14:07:58 2006
@@ -7,7 +7,7 @@
 <!-- ======================================================== -->
 
 <attributes xmlns="http://geronimo.apache.org/xml/ns/attributes-1.1">
-    <module name="geronimo/rmi-naming/${pom.currentVersion}/car">
+    <module name="${geronimoGroupId}/rmi-naming/${pom.version}/car">
         <gbean name="RMIRegistry">
             <attribute name="port">${PlanNamingPort}</attribute>
         </gbean>
@@ -20,9 +20,9 @@
           <attribute name="userRepositories">[]</attribute>
         </gbean>
     </module>
-    <module name="geronimo/j2ee-server/${pom.currentVersion}/car">
+    <module name="${geronimoGroupId}/j2ee-server/${pom.version}/car">
     </module>
-    <module name="geronimo/j2ee-security/${pom.currentVersion}/car">
+    <module name="${geronimoGroupId}/j2ee-security/${pom.version}/car">
         <gbean name="JaasLoginServiceRemotingServer">
             <attribute name="host">${PlanServerHostname}</attribute>
             <attribute name="port">${PlanRemoteLoginPort}</attribute>
@@ -34,14 +34,14 @@
             <attribute name="urlPath">/jndi/rmi://${PlanServerHostname}:${PlanNamingPort}/JMXConnector</attribute>
         </gbean>
     </module>
-    <module name="geronimo/axis/${pom.currentVersion}/car"/>
-    <module name="geronimo/openejb/${pom.currentVersion}/car">
+    <module name="${geronimoGroupId}/axis/${pom.version}/car"/>
+    <module name="${geronimoGroupId}/openejb/${pom.version}/car">
         <gbean name="EJBNetworkService">
             <attribute name="host">${PlanServerHostname}</attribute>
             <attribute name="port">${PlanOpenEJBPort}</attribute>
         </gbean>
     </module>
-    <module name="geronimo/j2ee-corba/${pom.currentVersion}/car" load="false">
+    <module name="${geronimoGroupId}/j2ee-corba/${pom.version}/car" load="false">
         <gbean name="NameServer">
             <attribute name="dbDir">var/cosnaming.db</attribute>
             <attribute name="port">${PlanCOSNamingPort}</attribute>
@@ -53,20 +53,20 @@
             <attribute name="args">-ORBInitRef, NameService=corbaloc::${PlanCOSNamingHost}:${PlanCOSNamingPort}/NameService</attribute>
         </gbean>
     </module>
-    <module name="geronimo/system-database/${pom.currentVersion}/car">
+    <module name="${geronimoGroupId}/system-database/${pom.version}/car">
         <gbean name="DerbyNetwork">
             <attribute name="host">${PlanServerHostname}</attribute>
             <attribute name="port">${PlanDerbyPort}</attribute>
         </gbean>
     </module>
-    <module name="geronimo/activemq-broker/${pom.currentVersion}/car">
-        <gbean name="ActiveMQ.tcp.default">
-            <attribute name="host">${PlanServerHostname}</attribute>
-            <attribute name="port">${PlanActiveMQPort}</attribute>
-        </gbean>
-    </module>
-    <module name="geronimo/activemq/${pom.currentVersion}/car"/>
-    <module name="geronimo/jetty/${pom.currentVersion}/car">
+    <!--<module name="${geronimoGroupId}/activemq-broker/${pom.version}/car">-->
+        <!--<gbean name="ActiveMQ.tcp.default">-->
+            <!--<attribute name="host">${PlanServerHostname}</attribute>-->
+            <!--<attribute name="port">${PlanActiveMQPort}</attribute>-->
+        <!--</gbean>-->
+    <!--</module>-->
+    <!--<module name="${geronimoGroupId}/activemq/${pom.version}/car"/>-->
+    <module name="${geronimoGroupId}/jetty/${pom.version}/car">
         <gbean name="JettyWebConnector">
             <attribute name="host">${PlanServerHostname}</attribute>
             <attribute name="port">${PlanHTTPPortPrimary}</attribute>
@@ -83,37 +83,37 @@
     </module>
     <!-- n.b. be sure the gbean deployer is explicitly loaded before j2ee-deployer so that defaultEnvironment
     overrides work properly -->
-    <module name="geronimo/geronimo-gbean-deployer/${pom.currentVersion}/car"/>
-    <module name="geronimo/j2ee-deployer/${pom.currentVersion}/car">
+    <module name="${geronimoGroupId}/geronimo-gbean-deployer/${pom.version}/car"/>
+    <module name="${geronimoGroupId}/j2ee-deployer/${pom.version}/car">
         <gbean name="WebBuilder">
             <attribute name="defaultNamespace">http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.1</attribute>
         </gbean>
     </module>
-    <module name="geronimo/openejb-deployer/${pom.currentVersion}/car">
+    <module name="${geronimoGroupId}/openejb-deployer/${pom.version}/car">
         <gbean name="EJBBuilder">
             <attribute name="listener">?name=JettyWebContainer</attribute>
         </gbean>
     </module>
-    <module name="geronimo/client-deployer/${pom.currentVersion}/car"/>
-    <module name="geronimo/axis-deployer/${pom.currentVersion}/car"/>
-    <module name="geronimo/javamail/${pom.currentVersion}/car" load="false">
+    <module name="${geronimoGroupId}/client-deployer/${pom.version}/car"/>
+    <module name="${geronimoGroupId}/axis-deployer/${pom.version}/car"/>
+    <module name="${geronimoGroupId}/javamail/${pom.version}/car" load="false">
         <gbean name="SMTPTransport">
             <attribute name="host">localhost</attribute>
             <attribute name="port">25</attribute>
         </gbean>
     </module>
 
-    <module name="geronimo/sharedlib/${pom.currentVersion}/car">
-        <gbean name="SharedLib">
-            <attribute name="classesDirs">var/shared/classes</attribute>
-            <attribute name="libDirs">var/shared/lib</attribute>
-        </gbean>
-    </module>
+    <!--<module name="${geronimoGroupId}/sharedlib/${pom.version}/car">-->
+        <!--<gbean name="SharedLib">-->
+            <!--<attribute name="classesDirs">var/shared/classes</attribute>-->
+            <!--<attribute name="libDirs">var/shared/lib</attribute>-->
+        <!--</gbean>-->
+    <!--</module>-->
 
-    <module name="geronimo/jetty-deployer/${pom.currentVersion}/car"/>
-    <module name="geronimo/welcome-jetty/${pom.currentVersion}/car"/>
-    <module name="geronimo/webconsole-jetty/${pom.currentVersion}/car"/>
-    <module name="geronimo/uddi-jetty/${pom.currentVersion}/car" load="false"/>
-    <module name="geronimo/remote-deploy-jetty/${pom.currentVersion}/car" />
-    <module name="geronimo/hot-deployer/${pom.currentVersion}/car" />
+    <module name="${geronimoGroupId}/jetty-deployer/${pom.version}/car"/>
+    <!--<module name="${geronimoGroupId}/welcome-jetty/${pom.version}/car"/>-->
+    <!--<module name="${geronimoGroupId}/webconsole-jetty/${pom.version}/car"/>-->
+    <!--<module name="${geronimoGroupId}/uddi-jetty/${pom.version}/car" load="false"/>-->
+    <!--<module name="${geronimoGroupId}/remote-deploy-jetty/${pom.version}/car" />-->
+    <!--<module name="${geronimoGroupId}/hot-deployer/${pom.version}/car" />-->
 </attributes>

Added: geronimo/sandbox/svkmerge/m2migration/m2-assemblies/j2ee-tomcat-server/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/m2-assemblies/j2ee-tomcat-server/pom.xml?rev=421412&view=auto
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-assemblies/j2ee-tomcat-server/pom.xml (added)
+++ geronimo/sandbox/svkmerge/m2migration/m2-assemblies/j2ee-tomcat-server/pom.xml Wed Jul 12 14:07:58 2006
@@ -0,0 +1,651 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright 2006 The Apache Software Foundation
+    
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+    
+       http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    
+    <modelVersion>4.0.0</modelVersion>
+    
+    <parent>
+        <groupId>org.apache.geronimo.assemblies</groupId>
+        <artifactId>assemblies</artifactId>
+        <version>1.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>geronimo-tomcat-j2ee</artifactId>
+    <name>Geronimo Assemblies :: J2EE+Tomcat</name>
+    
+    <description>
+        An assembly of Geronimo into a J2EE Server using Tomcat as the web container.
+    </description>
+    
+    <!--
+    
+    HACK: Need to explicitly configure SCM for this module since its artifactId
+          does not match the directory it lives in.
+    
+    FIXME: Rename module directory or artifactId
+    
+    -->
+    <scm>
+        <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/m2-assemblies/j2ee-tomcat-server</connection>
+        <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/m2-assemblies/j2ee-tomcat-server</developerConnection>
+        <url>http://svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/m2-assemblies/j2ee-tomcat-server</url>
+    </scm>
+    
+    <dependencies>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>j2ee-system</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>rmi-naming</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>j2ee-server</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>j2ee-security</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>openejb</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>axis</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>j2ee-corba</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>tomcat</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>directory</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>ldap-realm</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>system-database</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <!--dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>activemq-broker</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>activemq</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+        </dependency-->
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>client-system</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>client</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>client-security</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>client-corba</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>javamail</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>geronimo-gbean-deployer</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>j2ee-deployer</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>openejb-deployer</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>axis-deployer</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>client-deployer</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>hot-deployer</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>tomcat-deployer</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>ldap-demo-tomcat</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>welcome-tomcat</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <!--dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>servlets-examples-tomcat</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>jsp-examples-tomcat</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+        </dependency-->
+        
+        <!--dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>webconsole-tomcat</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+        </dependency-->
+        
+        <!--dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>jmxdebug-tomcat</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+        </dependency-->
+        
+        <!--dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>remote-deploy-tomcat</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+        </dependency-->
+        
+        <!--dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>uddi-tomcat</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>daytrader-derby-tomcat</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>daytrader-derby-tomcat-streamer-client</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+        </dependency-->
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>shutdown</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>online-deployer</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <!-- unpack -->
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-scripts</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <!-- lib dependencies -->
+        
+        <dependency>
+            <groupId>cglib</groupId>
+            <artifactId>cglib-nodep</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>commons-cli</groupId>
+            <artifactId>commons-cli</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-common</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-deploy-tool</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-deployment</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-kernel</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-system</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-qname_1.1_spec</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>mx4j</groupId>
+            <artifactId>mx4j</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>mx4j</groupId>
+            <artifactId>mx4j-remote</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>xpp3</groupId>
+            <artifactId>xpp3</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>xstream</groupId>
+            <artifactId>xstream</artifactId>
+        </dependency>
+        
+        <!-- endorsed -->
+        
+        <dependency>
+            <groupId>xerces</groupId>
+            <artifactId>xercesImpl</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>xerces</groupId>
+            <artifactId>xmlParserAPIs</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-deploy-jsr88</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-util</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-activation</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-axis</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-axis-builder</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-client</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-client-builder</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-connector</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-connector-builder</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-core</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-derby</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-directory</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-j2ee</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-j2ee-builder</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-j2ee-schema</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-tomcat</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-tomcat-builder</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-jmx-remoting</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-mail</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-management</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-naming</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-naming-builder</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-security</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-security-builder</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-service-builder</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-timer</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-tomcat</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-transaction</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-web-builder</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-webservices</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+    </dependencies>
+    
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>geronimo-assembly-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>installConfig</id>
+                        <phase>test</phase>
+                        <goals>
+                            <goal>installConfig</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <executions>
+                    <!--
+                    <execution>
+                        <id>setup</id>
+                        <phase>package</phase>
+                        <configuration>
+                            <descriptors>
+                                <descriptor>src/assemble/setup.xml</descriptor>
+                            </descriptors>
+                            <intermediaryAssembly>true</intermediaryAssembly>
+                        </configuration>
+                        <goals>
+                            <goal>assembly</goal>
+                        </goals>
+                    </execution>
+                    -->
+                    
+                    <execution>
+                        <id>test</id>
+                        <phase>package</phase>
+                        <configuration>
+                            <descriptors>
+                                <descriptor>${pom.basedir}/src/assemble/bin.xml</descriptor>
+                                <!-- <finalName>geronimo-${version}</finalName> -->
+                            </descriptors>
+                        </configuration>
+                        <goals>
+                            <goal>attached</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+    
+</project>

Propchange: geronimo/sandbox/svkmerge/m2migration/m2-assemblies/j2ee-tomcat-server/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/svkmerge/m2migration/m2-assemblies/j2ee-tomcat-server/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/sandbox/svkmerge/m2migration/m2-assemblies/j2ee-tomcat-server/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/sandbox/svkmerge/m2migration/m2-assemblies/j2ee-tomcat-server/src/assemble/bin.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/m2-assemblies/j2ee-tomcat-server/src/assemble/bin.xml?rev=421412&view=auto
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-assemblies/j2ee-tomcat-server/src/assemble/bin.xml (added)
+++ geronimo/sandbox/svkmerge/m2migration/m2-assemblies/j2ee-tomcat-server/src/assemble/bin.xml Wed Jul 12 14:07:58 2006
@@ -0,0 +1,224 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright 2006 The Apache Software Foundation
+    
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+    
+       http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<assembly>
+    <id>bin</id>
+    
+    <formats>
+        <format>zip</format>
+        <format>tar.gz</format>
+        
+        <!--
+        
+        HACK: Turn off bz2 for now, it takes too long to generate.
+        
+        <format>tar.bz2</format>
+        -->
+    </formats>
+
+    <includeBaseDirectory>true</includeBaseDirectory>
+
+    <dependencySets>
+        <dependencySet>
+            <outputDirectory>/</outputDirectory>
+            <includes>
+                <include>org.apache.geronimo.modules:geronimo-scripts</include>
+            </includes>
+            <unpack>
+                <excludes>
+                    <exclude>**/META-INF/**</exclude>
+                </excludes>
+            </unpack>
+            <directoryMode>0755</directoryMode>
+            <fileMode>0755</fileMode>
+        </dependencySet>
+        
+        <dependencySet>
+            <outputDirectory>lib</outputDirectory>
+            <includes>
+                <include>cglib:cglib-nodep</include>
+                <include>commons-cli:commons-cli</include>
+                <include>commons-logging:commons-logging</include>
+                <include>concurrent:concurrent</include>
+                <include>org.apache.geronimo.modules:geronimo-common</include>
+                <include>org.apache.geronimo.modules:geronimo-deploy-jsr88</include>
+                <include>org.apache.geronimo.modules:geronimo-deploy-tool</include>
+                <include>org.apache.geronimo.modules:geronimo-deployment</include>
+                <include>org.apache.geronimo.modules:geronimo-kernel</include>
+                <include>org.apache.geronimo.modules:geronimo-system</include>
+                <include>org.apache.geronimo.modules:geronimo-util</include>
+                <include>org.apache.geronimo.specs:geronimo-qname_1.1_spec</include>
+                <include>org.apache.geronimo.specs:geronimo-j2ee-deployment_1.1_spec</include>
+                <include>log4j:log4j</include>
+                <include>mx4j:mx4j</include>
+                <include>mx4j:mx4j-remote</include>
+                <include>xpp3:xpp3</include>
+                <include>xstream:xstream</include>
+            </includes>
+        </dependencySet>
+        
+        <dependencySet>
+            <outputDirectory>lib/endorsed</outputDirectory>
+            <includes>
+                <include>xerces:xercesImpl</include>
+                <include>xerces:xmlParserAPIs</include>
+            </includes>
+        </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>
+            <outputDirectory>bin</outputDirectory>
+            <outputFileNameMapping>client.jar</outputFileNameMapping>
+            <includes>
+                <include>org.apache.geronimo.configs:client-system</include>
+            </includes>
+            <fileMode>0755</fileMode>
+        </dependencySet>
+        
+        <dependencySet>
+            <outputDirectory>bin</outputDirectory>
+            <outputFileNameMapping>deployer.jar</outputFileNameMapping>
+            <includes>
+                <include>org.apache.geronimo.configs:online-deployer</include>
+            </includes>
+            <fileMode>0755</fileMode>
+        </dependencySet>
+        
+        <dependencySet>
+            <outputDirectory>bin</outputDirectory>
+            <outputFileNameMapping>shutdown.jar</outputFileNameMapping>
+            <includes>
+                <include>org.apache.geronimo.configs:shutdown</include>
+            </includes>
+            <fileMode>0755</fileMode>
+        </dependencySet>
+        
+        <dependencySet>
+            <outputDirectory>bin</outputDirectory>
+            <outputFileNameMapping>upgrade.jar</outputFileNameMapping>
+            <includes>
+                <include>org.apache.geronimo.configs:upgrade-cli</include>
+            </includes>
+            <fileMode>0755</fileMode>
+        </dependencySet>
+
+    </dependencySets>
+
+    <fileSets>
+        <fileSet>
+            <directory>target/archive-tmp/repository</directory>
+            <outputDirectory>repository</outputDirectory>
+            <excludes>
+                <exclude>**/META-INF/maven/**</exclude>
+                <exclude>**/*.pom</exclude>
+                <exclude>**/*.sha1</exclude>
+                <exclude>**/*.md5</exclude>
+            </excludes>
+        </fileSet>
+        
+        <!--
+        
+        FIXME: Remove the need to have a version listed here!
+        
+        -->
+        
+        <fileSet>
+            <directory>target/assembly/work/geronimo-scripts-1.2-SNAPSHOT.jar</directory>
+            <outputDirectory>/</outputDirectory>
+            <includes>
+                <include>**/*.sh</include>
+            </includes>
+            <lineEnding>unix</lineEnding>
+            <fileMode>0755</fileMode>
+        </fileSet>
+        
+        <fileSet>
+            <directory>target/assembly/work/geronimo-scripts-1.2-SNAPSHOT.jar</directory>
+            <outputDirectory>/</outputDirectory>
+            <includes>
+                <include>**/*.bat</include>
+            </includes>
+            <lineEnding>dos</lineEnding>
+        </fileSet>
+        
+        <fileSet>
+            <directory>src/var</directory>
+            <outputDirectory>var</outputDirectory>
+        </fileSet>
+    </fileSets>
+    
+    <files>
+        <file>
+            <source>${basedir}/src/var/config/config.xml</source>
+            <outputDirectory>var/config</outputDirectory>
+            <filtered>true</filtered>
+            <fileMode>0644</fileMode>
+        </file>
+        
+        <file>
+            <source>${basedir}/src/var/config/config.xml</source>
+            <outputDirectory>var/config</outputDirectory>
+            <destName>config.xml.orig</destName>
+            <filtered>true</filtered>
+            <fileMode>0644</fileMode>
+        </file>
+        
+        <file>
+            <source>${basedir}/src/var/config/config.xml</source>
+            <outputDirectory>var/config</outputDirectory>
+            <destName>offline-deployer-list</destName>
+            <filtered>true</filtered>
+            <fileMode>0644</fileMode>
+        </file>
+    </files>
+
+</assembly>

Propchange: geronimo/sandbox/svkmerge/m2migration/m2-assemblies/j2ee-tomcat-server/src/assemble/bin.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/svkmerge/m2migration/m2-assemblies/j2ee-tomcat-server/src/assemble/bin.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/sandbox/svkmerge/m2migration/m2-assemblies/j2ee-tomcat-server/src/assemble/bin.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: geronimo/sandbox/svkmerge/m2migration/m2-assemblies/j2ee-tomcat-server/src/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/m2-assemblies/j2ee-tomcat-server/src/var/config/config.xml?rev=421412&r1=421411&r2=421412&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-assemblies/j2ee-tomcat-server/src/var/config/config.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/m2-assemblies/j2ee-tomcat-server/src/var/config/config.xml Wed Jul 12 14:07:58 2006
@@ -7,7 +7,7 @@
 <!-- ======================================================== -->
 
 <attributes xmlns="http://geronimo.apache.org/xml/ns/attributes-1.1">
-    <module name="geronimo/rmi-naming/${pom.currentVersion}/car">
+    <module name="geronimo/rmi-naming/${pom.version}/car">
         <gbean name="RMIRegistry">
             <attribute name="port">${PlanNamingPort}</attribute>
         </gbean>
@@ -20,9 +20,9 @@
           <attribute name="userRepositories">[]</attribute>
         </gbean>
     </module>
-    <module name="geronimo/j2ee-server/${pom.currentVersion}/car">
+    <module name="geronimo/j2ee-server/${pom.version}/car">
     </module>
-    <module name="geronimo/j2ee-security/${pom.currentVersion}/car">
+    <module name="geronimo/j2ee-security/${pom.version}/car">
         <gbean name="JaasLoginServiceRemotingServer">
             <attribute name="host">${PlanServerHostname}</attribute>
             <attribute name="port">${PlanRemoteLoginPort}</attribute>
@@ -34,14 +34,14 @@
           <attribute name="urlPath">/jndi/rmi://${PlanServerHostname}:${PlanNamingPort}/JMXConnector</attribute>
         </gbean>
     </module>
-    <module name="geronimo/axis/${pom.currentVersion}/car"/>
-    <module name="geronimo/openejb/${pom.currentVersion}/car">
+    <module name="geronimo/axis/${pom.version}/car"/>
+    <module name="geronimo/openejb/${pom.version}/car">
         <gbean name="EJBNetworkService">
             <attribute name="host">${PlanServerHostname}</attribute>
             <attribute name="port">${PlanOpenEJBPort}</attribute>
         </gbean>
     </module>
-    <module name="geronimo/j2ee-corba/${pom.currentVersion}/car" load="false">
+    <module name="geronimo/j2ee-corba/${pom.version}/car" load="false">
         <gbean name="NameServer">
             <attribute name="dbDir">var/cosnaming.db</attribute>
             <attribute name="port">${PlanCOSNamingPort}</attribute>
@@ -53,20 +53,20 @@
             <attribute name="args">-ORBInitRef, NameService=corbaloc::${PlanCOSNamingHost}:${PlanCOSNamingPort}/NameService</attribute>
         </gbean>
     </module>
-    <module name="geronimo/system-database/${pom.currentVersion}/car">
+    <module name="geronimo/system-database/${pom.version}/car">
         <gbean name="DerbyNetwork">
             <attribute name="host">${PlanServerHostname}</attribute>
             <attribute name="port">${PlanDerbyPort}</attribute>
         </gbean>
     </module>
-    <module name="geronimo/activemq-broker/${pom.currentVersion}/car">
+    <!-- module name="geronimo/activemq-broker/${pom.version}/car">
         <gbean name="ActiveMQ.tcp.default">
             <attribute name="host">${PlanServerHostname}</attribute>
             <attribute name="port">${PlanActiveMQPort}</attribute>
         </gbean>
-    </module>
-    <module name="geronimo/activemq/${pom.currentVersion}/car"/>
-    <module name="geronimo/tomcat/${pom.currentVersion}/car">
+    </module  -->
+    <!-- module name="geronimo/activemq/${pom.version}/car"/  -->
+    <module name="geronimo/tomcat/${pom.version}/car">
         <gbean name="TomcatEngine">
             <reference name="TomcatValveChain" />
         </gbean>
@@ -92,37 +92,37 @@
     </module>
     <!-- n.b. be sure the gbean deployer is explicitly loaded before j2ee-deployer so that defaultEnvironment
     overrides work properly -->
-    <module name="geronimo/geronimo-gbean-deployer/${pom.currentVersion}/car"/>
-    <module name="geronimo/j2ee-deployer/${pom.currentVersion}/car">
+    <module name="geronimo/geronimo-gbean-deployer/${pom.version}/car"/>
+    <module name="geronimo/j2ee-deployer/${pom.version}/car">
         <gbean name="WebBuilder">
             <attribute name="defaultNamespace">http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.1</attribute>
         </gbean>
     </module>
-    <module name="geronimo/openejb-deployer/${pom.currentVersion}/car">
+    <module name="geronimo/openejb-deployer/${pom.version}/car">
         <gbean name="EJBBuilder">
             <attribute name="listener">?name=TomcatWebContainer</attribute>
         </gbean>
     </module>
-    <module name="geronimo/client-deployer/${pom.currentVersion}/car"/>
-    <module name="geronimo/axis-deployer/${pom.currentVersion}/car"/>
-    <module name="geronimo/javamail/${pom.currentVersion}/car" load="false">
+    <module name="geronimo/client-deployer/${pom.version}/car"/>
+    <module name="geronimo/axis-deployer/${pom.version}/car"/>
+    <module name="geronimo/javamail/${pom.version}/car" load="false">
         <gbean name="SMTPTransport">
             <attribute name="host">localhost</attribute>
             <attribute name="port">25</attribute>
         </gbean>
     </module>
 
-    <module name="geronimo/sharedlib/${pom.currentVersion}/car">
+    <!-- module name="geronimo/sharedlib/${pom.version}/car">
         <gbean name="SharedLib">
             <attribute name="classesDirs">var/shared/classes</attribute>
             <attribute name="libDirs">var/shared/lib</attribute>
         </gbean>
-    </module>
+    </module  -->
 
-    <module name="geronimo/tomcat-deployer/${pom.currentVersion}/car"/>
-    <module name="geronimo/welcome-tomcat/${pom.currentVersion}/car"/>
-    <module name="geronimo/webconsole-tomcat/${pom.currentVersion}/car"/>
-    <module name="geronimo/uddi-tomcat/${pom.currentVersion}/car" load="false"/>
-    <module name="geronimo/remote-deploy-tomcat/${pom.currentVersion}/car" />
-    <module name="geronimo/hot-deployer/${pom.currentVersion}/car" />
+    <module name="geronimo/tomcat-deployer/${pom.version}/car"/>
+    <!-- module name="geronimo/welcome-tomcat/${pom.version}/car"/>
+    <module name="geronimo/webconsole-tomcat/${pom.version}/car"/>
+    <module name="geronimo/uddi-tomcat/${pom.version}/car" load="false"/>
+    <module name="geronimo/remote-deploy-tomcat/${pom.version}/car" />
+    <module name="geronimo/hot-deployer/${pom.version}/car" /  -->
 </attributes>

Modified: geronimo/sandbox/svkmerge/m2migration/m2-assemblies/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/m2-assemblies/pom.xml?rev=421412&r1=421411&r2=421412&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-assemblies/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/m2-assemblies/pom.xml Wed Jul 12 14:07:58 2006
@@ -46,8 +46,57 @@
         <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/m2-assemblies</developerConnection>
         <url>http://svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/m2-assemblies</url>
     </scm>
+
+    <properties>
+        <geronimoGroupId>org.apache.geronimo.configs</geronimoGroupId>
+        <PlanServerHostname>0.0.0.0</PlanServerHostname>
+        <PlanNamingPort>1099</PlanNamingPort>
+        <PlanOpenEJBPort>4201</PlanOpenEJBPort>
+        <PlanClientAddresses>127.0.0.1</PlanClientAddresses>
+        <PlanIIOPPort>9000</PlanIIOPPort>
+        <PlanCOSNamingHost>localhost</PlanCOSNamingHost>
+        <PlanCOSNamingPort>1050</PlanCOSNamingPort>
+        <PlanORBSSLHost>localhost</PlanORBSSLHost>
+        <PlanORBSSLPort>2001</PlanORBSSLPort>
+        <PlanActiveMQPort>61616</PlanActiveMQPort>
+        <PlanDerbyPort>1527</PlanDerbyPort>
+        <PlanRemoteLoginPort>4242</PlanRemoteLoginPort>
+        <PlanLdapPort>1389</PlanLdapPort>
+        <PlanHTTPPortPrimary>8080</PlanHTTPPortPrimary>
+        <PlanHTTPSPortPrimary>8443</PlanHTTPSPortPrimary>
+        <PlanAJPPortPrimary>8009</PlanAJPPortPrimary>
+        <PlanHTTPPortSecondary>8090</PlanHTTPPortSecondary>
+        <PlanHTTPSPortSecondary>8453</PlanHTTPSPortSecondary>
+        <PlanAJPPortSecondary>8019</PlanAJPPortSecondary>
+        <PlanJMXPort>9999</PlanJMXPort>
+        <PlanJettyWebBuilderDefaultNamespace>http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.0</PlanJettyWebBuilderDefaultNamespace>
+        <PlanTomcatWebBuilderDefaultNamespace>http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.0</PlanTomcatWebBuilderDefaultNamespace>
+    </properties>
+    
+    <build>
+        <pluginManagement>
+            <plugins>
+                <!--
+                
+                NOTE: Need to use custom SNAPSHOT until this issue is resolved:
+                      
+                      http://jira.codehaus.org/browse/MASSEMBLY-45
+                -->
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-assembly-plugin</artifactId>
+                    <version>2.2-SNAPSHOT</version>
+                    <configuration>
+                        <tarLongFileMode>gnu</tarLongFileMode>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
     
     <modules>
+      <module>j2ee-jetty-server</module>
+      <module>j2ee-tomcat-server</module>
     </modules>
     
 </project>

Modified: geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-assembly-plugin/src/java/org/apache/geronimo/plugin/assembly/ConfigInstallerMojo.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-assembly-plugin/src/java/org/apache/geronimo/plugin/assembly/ConfigInstallerMojo.java?rev=421412&r1=421411&r2=421412&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-assembly-plugin/src/java/org/apache/geronimo/plugin/assembly/ConfigInstallerMojo.java (original)
+++ geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-assembly-plugin/src/java/org/apache/geronimo/plugin/assembly/ConfigInstallerMojo.java Wed Jul 12 14:07:58 2006
@@ -248,6 +248,7 @@
             //
             // FIXME: Using logging?
             //
+            
             System.out.println("Copying " + fileDescription);
         }
 



Mime
View raw message