geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r422593 - in /geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-j2ee-common: ./ src/main/assembly/ src/main/resources/ src/main/resources/var/ src/main/resources/var/config/ src/main/resources/var/log/ src/main/resources/var/secu...
Date Mon, 17 Jul 2006 01:37:43 GMT
Author: jdillon
Date: Sun Jul 16 18:37:42 2006
New Revision: 422593

URL: http://svn.apache.org/viewvc?rev=422593&view=rev
Log:
Support module to define the common resources used by j2ee assemblies

Added:
    geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-j2ee-common/
      - copied from r421793, geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-j2ee/
    geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-j2ee-common/pom.xml
      - copied, changed from r422581, geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-j2ee/pom.xml
    geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-j2ee-common/src/main/resources/
    geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-j2ee-common/src/main/resources/var/
    geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-j2ee-common/src/main/resources/var/config/
    geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-j2ee-common/src/main/resources/var/config/README.txt   (with props)
    geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-j2ee-common/src/main/resources/var/config/offline-deployer-list
    geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-j2ee-common/src/main/resources/var/log/
    geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-j2ee-common/src/main/resources/var/log/client-log4j.properties   (with props)
    geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-j2ee-common/src/main/resources/var/log/deployer-log4j.properties   (with props)
    geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-j2ee-common/src/main/resources/var/log/server-log4j.properties   (with props)
    geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-j2ee-common/src/main/resources/var/security/
    geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-j2ee-common/src/main/resources/var/security/demo_groups.properties   (with props)
    geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-j2ee-common/src/main/resources/var/security/demo_users.properties   (with props)
    geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-j2ee-common/src/main/resources/var/security/groups.properties   (with props)
    geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-j2ee-common/src/main/resources/var/security/keystores/
    geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-j2ee-common/src/main/resources/var/security/keystores/geronimo-default   (with props)
    geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-j2ee-common/src/main/resources/var/security/users.properties   (with props)
    geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-j2ee-common/src/main/resources/var/shared/
    geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-j2ee-common/src/main/resources/var/shared/classes/
    geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-j2ee-common/src/main/resources/var/shared/lib/
    geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-j2ee-common/src/main/resources/var/temp/
    geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-j2ee-common/src/main/resources/var/temp/README.txt   (with props)
Removed:
    geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-j2ee-common/src/main/assembly/
    geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-j2ee-common/src/main/var/

Copied: geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-j2ee-common/pom.xml (from r422581, geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-j2ee/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-j2ee-common/pom.xml?p2=geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-j2ee-common/pom.xml&p1=geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-j2ee/pom.xml&r1=422581&r2=422593&rev=422593&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-j2ee/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-j2ee-common/pom.xml Sun Jul 16 18:37:42 2006
@@ -28,758 +28,32 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <artifactId>geronimo-jetty-j2ee</artifactId>
-    <name>Geronimo Assemblies :: J2EE + Jetty</name>
-    <!--
-    
-    HACK:  See build/resources below...
-    
-    <packaging>pom</packaging>
-    -->
+    <artifactId>geronimo-j2ee-common</artifactId>
+    <name>Geronimo Assemblies :: J2EE Common</name>
     <packaging>jar</packaging>
     
     <description>
-        An assembly of Geronimo into a J2EE Server using Jetty as the web container.
+        Provides files common to all Geronimo J2EE server assemblies.
     </description>
     
-    <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>sharedlib</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>
-        
-        <!-- 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>
+        <!-- FIXME: Remove when the default is to use the m2 standard layout -->
+        <sourceDirectory>${pom.basedir}/src/main/java</sourceDirectory>
+        
         <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>
+                <directory>${pom.basedir}</directory>
+                <targetPath>META-INF</targetPath>
                 <includes>
-                    <include>config.xml</include>
+                    <include>LICENSE.txt</include>
+                    <include>NOTICE.txt</include>
                 </includes>
-                <filtering>true</filtering>
             </resource>
-        </resources>
-        
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>dependency-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>unpack-scripts</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>unpack</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>org.apache.geronimo.modules</groupId>
-                                    <artifactId>geronimo-scripts</artifactId>
-                                    <version>${pom.version}</version>
-                                    <type>jar</type>
-                                </artifactItem>
-                            </artifactItems>
-                            <outputDirectory>${project.build.directory}/scripts</outputDirectory>
-                        </configuration>
-                    </execution>
-                    
-                    <execution>
-                        <id>unpack-schemas</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>unpack</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>org.apache.geronimo.modules</groupId>
-                                    <artifactId>geronimo-axis-builder</artifactId>
-                                    <version>${pom.version}</version>
-                                    <type>jar</type>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.apache.geronimo.modules</groupId>
-                                    <artifactId>geronimo-client-builder</artifactId>
-                                    <version>${pom.version}</version>
-                                    <type>jar</type>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.apache.geronimo.modules</groupId>
-                                    <artifactId>geronimo-connector-builder</artifactId>
-                                    <version>${pom.version}</version>
-                                    <type>jar</type>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.apache.geronimo.modules</groupId>
-                                    <artifactId>geronimo-j2ee-builder</artifactId>
-                                    <version>${pom.version}</version>
-                                    <type>jar</type>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.apache.geronimo.modules</groupId>
-                                    <artifactId>geronimo-naming-builder</artifactId>
-                                    <version>${pom.version}</version>
-                                    <type>jar</type>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.apache.geronimo.modules</groupId>
-                                    <artifactId>geronimo-security-builder</artifactId>
-                                    <version>${pom.version}</version>
-                                    <type>jar</type>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.apache.geronimo.modules</groupId>
-                                    <artifactId>geronimo-service-builder</artifactId>
-                                    <version>${pom.version}</version>
-                                    <type>jar</type>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.apache.geronimo.modules</groupId>
-                                    <artifactId>geronimo-jetty-builder</artifactId>
-                                    <version>${pom.version}</version>
-                                    <type>jar</type>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.apache.geronimo.modules</groupId>
-                                    <artifactId>geronimo-web-builder</artifactId>
-                                    <version>${pom.version}</version>
-                                    <type>jar</type>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.apache.geronimo.modules</groupId>
-                                    <artifactId>geronimo-j2ee-builder</artifactId>
-                                    <version>${pom.version}</version>
-                                    <type>jar</type>
-                                </artifactItem>
-                            </artifactItems>
-                            <outputDirectory>${project.build.directory}/scratch/schema</outputDirectory>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>pre-assembly</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <!-- Flatten all schemas -->
-                                <mkdir dir="${project.build.directory}/schema"/>
-                                <copy todir="${project.build.directory}/schema">
-                                    <fileset dir="${project.build.directory}/scratch/schema">
-                                        <include name="**/*.xsd"/>
-                                        <include name="**/*.dtd"/>
-                                    </fileset>
-                                    <mapper type="flatten"/>
-                                </copy>
-                                
-                                <!-- Filter the config.xml -->
-                                <move file="${project.build.directory}/classes/config.xml"
-                                      tofile="${project.build.directory}/scratch/config.xml"/>
-                            </tasks>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
             
-            <plugin>
-                <groupId>org.apache.geronimo.plugins</groupId>
-                <artifactId>car-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>install-config</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>installConfig</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>bin</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>attached</goal>
-                        </goals>
-                        <configuration>
-                            <descriptors>
-                                <descriptor>${pom.basedir}/src/main/assembly/bin.xml</descriptor>
-                            </descriptors>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
+            <resource>
+                <directory>${pom.basedir}/src/main/resources</directory>
+            </resource>
+        </resources>
     </build>
     
 </project>

Added: geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-j2ee-common/src/main/resources/var/config/README.txt
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-j2ee-common/src/main/resources/var/config/README.txt?rev=422593&view=auto
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-j2ee-common/src/main/resources/var/config/README.txt (added)
+++ geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-j2ee-common/src/main/resources/var/config/README.txt Sun Jul 16 18:37:42 2006
@@ -0,0 +1,24 @@
+When Geronimo is started it will read a configuration XML file from this 
+var/config directory.  By default the config.xml file is read, but an
+alternative file can be used by setting the file name (relative to
+the var/config directory) in the org.apache.geronimo.config.file system 
+property.
+
+The configuration XML file lists the serialized modules in the 
+repository to be started.  For each module configured to be
+started in the config.xml file, Geronimo loads a serialized module
+from under the geronimo/repository directory.
+
+A module can be marked as not to be loaded by setting the "load" attribute
+to "false" on the "module" element for a module.
+
+A module may contain GBeans.  Individual GBeans in a module can be
+marked as not to be loaded by setting the "load" attribute to "false" on the
+"gbean" element for a GBean.
+
+Site specific information such as port numbers can be specified in GBean 
+attributes to override the values in the serialized module.
+
+Do not add comments to the config.xml file as the file is regenerated by 
+Geronimo when changes are made to Geronimo's configuration, therefore any
+comments added to this file will be lost.

Propchange: geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-j2ee-common/src/main/resources/var/config/README.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-j2ee-common/src/main/resources/var/config/README.txt
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-j2ee-common/src/main/resources/var/config/README.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-j2ee-common/src/main/resources/var/config/offline-deployer-list
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-j2ee-common/src/main/resources/var/config/offline-deployer-list?rev=422593&view=auto
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-j2ee-common/src/main/resources/var/config/offline-deployer-list (added)
+++ geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-j2ee-common/src/main/resources/var/config/offline-deployer-list Sun Jul 16 18:37:42 2006
@@ -0,0 +1,7 @@
+#list of deployers to be started for offline deployment
+geronimo/geronimo-gbean-deployer//car
+geronimo/j2ee-deployer//car
+geronimo/openejb-deployer//car
+geronimo/client-deployer//car
+geronimo/axis-deployer//car
+geronimo/jetty-deployer//car

Added: geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-j2ee-common/src/main/resources/var/log/client-log4j.properties
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-j2ee-common/src/main/resources/var/log/client-log4j.properties?rev=422593&view=auto
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-j2ee-common/src/main/resources/var/log/client-log4j.properties (added)
+++ geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-j2ee-common/src/main/resources/var/log/client-log4j.properties Sun Jul 16 18:37:42 2006
@@ -0,0 +1,50 @@
+##
+## Copyright 2004 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$
+##
+
+log4j.rootCategory=DEBUG, CONSOLE, FILE
+
+log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
+log4j.appender.CONSOLE.Threshold=INFO
+log4j.appender.CONSOLE.Target=System.out
+log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
+log4j.appender.CONSOLE.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}] %m%n
+
+log4j.appender.FILE=org.apache.log4j.RollingFileAppender
+log4j.appender.FILE.threshold=DEBUG
+log4j.appender.FILE.layout=org.apache.log4j.PatternLayout
+log4j.appender.FILE.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}] %m%n
+
+#
+# Note, changing log4j.appender.FILE.append=false will result in logs being 
+# overwritten without archiving the previous version of the log.
+#
+log4j.appender.FILE.append=true
+log4j.appender.FILE.file=${org.apache.geronimo.server.dir}/var/log/client.log
+log4j.appender.FILE.bufferedIO=false
+log4j.appender.FILE.maxBackupIndex=3
+log4j.appender.FILE.maxFileSize=10MB
+
+#
+# Example: enable trace logging from CONSOLE appender
+#
+#log4j.appender.CONSOLE.Threshold=TRACE#org.apache.geronimo.system.logging.log4j.XLevel
+
+#
+# Example: enable trace messages from foo.bar category
+#
+#log4j.category.foo.bar=TRACE#org.apache.geronimo.system.logging.log4j.XLevel

Propchange: geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-j2ee-common/src/main/resources/var/log/client-log4j.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-j2ee-common/src/main/resources/var/log/client-log4j.properties
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-j2ee-common/src/main/resources/var/log/client-log4j.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-j2ee-common/src/main/resources/var/log/deployer-log4j.properties
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-j2ee-common/src/main/resources/var/log/deployer-log4j.properties?rev=422593&view=auto
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-j2ee-common/src/main/resources/var/log/deployer-log4j.properties (added)
+++ geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-j2ee-common/src/main/resources/var/log/deployer-log4j.properties Sun Jul 16 18:37:42 2006
@@ -0,0 +1,50 @@
+##
+## Copyright 2004 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$
+##
+
+log4j.rootCategory=DEBUG, CONSOLE, FILE
+
+log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
+log4j.appender.CONSOLE.Threshold=INFO
+log4j.appender.CONSOLE.Target=System.out
+log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
+log4j.appender.CONSOLE.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}] %m%n
+
+log4j.appender.FILE=org.apache.log4j.RollingFileAppender
+log4j.appender.FILE.threshold=DEBUG
+log4j.appender.FILE.layout=org.apache.log4j.PatternLayout
+log4j.appender.FILE.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}] %m%n
+
+#
+# Note, changing log4j.appender.FILE.append=false will result in logs being
+# overwritten without archiving the previous version of the log.
+#
+log4j.appender.FILE.append=true
+log4j.appender.FILE.file=${org.apache.geronimo.server.dir}/var/log/deployer.log
+log4j.appender.FILE.bufferedIO=false
+log4j.appender.FILE.maxBackupIndex=3
+log4j.appender.FILE.maxFileSize=10MB
+
+#
+# Example: enable trace logging from CONSOLE appender
+#
+#log4j.appender.CONSOLE.Threshold=TRACE#org.apache.geronimo.system.logging.log4j.XLevel
+
+#
+# Example: enable trace messages from foo.bar category
+#
+#log4j.category.foo.bar=TRACE#org.apache.geronimo.system.logging.log4j.XLevel

Propchange: geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-j2ee-common/src/main/resources/var/log/deployer-log4j.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-j2ee-common/src/main/resources/var/log/deployer-log4j.properties
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-j2ee-common/src/main/resources/var/log/deployer-log4j.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-j2ee-common/src/main/resources/var/log/server-log4j.properties
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-j2ee-common/src/main/resources/var/log/server-log4j.properties?rev=422593&view=auto
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-j2ee-common/src/main/resources/var/log/server-log4j.properties (added)
+++ geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-j2ee-common/src/main/resources/var/log/server-log4j.properties Sun Jul 16 18:37:42 2006
@@ -0,0 +1,120 @@
+##
+## Copyright 2004 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$
+##
+
+log4j.rootCategory=INFO, CONSOLE, FILE
+
+log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
+log4j.appender.CONSOLE.Threshold=${org.apache.geronimo.log.ConsoleLogLevel}
+log4j.appender.CONSOLE.Target=System.out
+log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
+log4j.appender.CONSOLE.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}] %m%n
+
+log4j.appender.FILE=org.apache.log4j.RollingFileAppender
+log4j.appender.FILE.threshold=DEBUG
+log4j.appender.FILE.layout=org.apache.log4j.PatternLayout
+log4j.appender.FILE.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}] %m%n
+
+#
+# Note, changing log4j.appender.FILE.append=false will result in logs being
+# overwritten without archiving the previous version of the log.
+#
+log4j.appender.FILE.append=true
+log4j.appender.FILE.file=${org.apache.geronimo.server.dir}/var/log/geronimo.log
+log4j.appender.FILE.bufferedIO=false
+log4j.appender.FILE.maxBackupIndex=3
+log4j.appender.FILE.maxFileSize=10MB
+
+#
+# Example: enable trace logging from CONSOLE appender
+#
+#log4j.appender.CONSOLE.Threshold=TRACE#org.apache.geronimo.system.logging.log4j.XLevel
+
+#
+# Example: enable trace messages from foo.bar category
+#
+#log4j.category.foo.bar=TRACE#org.apache.geronimo.system.logging.log4j.XLevel
+
+#### Show key debug messages in the log ####
+log4j.category.org.apache.geronimo.gbean.runtime.GBeanSingleReference=DEBUG
+
+#### Eliminate any INFO level output during normal operation -- except the really relevant stuff ####
+#    We can change the Geronimo code to avoid this, but we have to just adjust the log levels for
+#    any third-party libraries.
+log4j.category.org.apache.commons.digester=ERROR
+log4j.category.org.apache.jasper.compiler.SmapUtil=WARN
+
+# ActiveMQ
+log4j.category.org.activemq.ActiveMQConnection=WARN
+log4j.category.org.activemq.store.jdbc.adapter.DefaultJDBCAdapter=WARN
+log4j.category.org.activemq.store.jdbc.JDBCPersistenceAdapter=WARN
+log4j.category.org.activemq.store.journal.JournalPersistenceAdapter=WARN
+log4j.category.org.activemq.broker.impl.BrokerContainerImpl=WARN
+log4j.category.org.activemq.broker.impl.BrokerConnectorImpl=WARN
+log4j.category.org.activemq.transport.tcp.TcpTransportChannel=ERROR
+log4j.category.org.activemq.transport.tcp.TcpTransportServerChannel=WARN
+log4j.category.org.activemq.transport.vm.VmTransportServerChannel=WARN
+
+# Don't need so much info on every web page that's rendered
+log4j.category.org.mortbay=INFO
+log4j.category.org.apache.pluto=INFO
+log4j.category.org.apache.jasper=INFO
+
+# Various Jetty startup/shutdown output
+log4j.category.org.mortbay.http.HttpServer=WARN
+log4j.category.org.mortbay.http.SocketListener=WARN
+log4j.category.org.mortbay.http.ajp.AJP13Listener=WARN
+log4j.category.org.mortbay.util.Container=WARN
+log4j.category.org.mortbay.util.Credential=WARN
+log4j.category.org.mortbay.util.ThreadedServer=WARN
+log4j.category.org.mortbay.jetty.servlet.WebApplicationContext=WARN
+log4j.category.org.mortbay.jetty.context=WARN
+
+# Various Tomcat startup output
+log4j.category.org.apache.catalina.realm.JAASRealm=WARN
+log4j.category.org.apache.catalina.realm.RealmBase=WARN
+log4j.category.org.apache.catalina.loader.WebappLoader=WARN
+log4j.category.org.apache.catalina.startup.Embedded=WARN
+log4j.category.org.apache.catalina.core.StandardEngine=WARN
+log4j.category.org.apache.catalina.core.StandardHost=WARN
+log4j.category.org.apache.jk.common.ChannelSocket=WARN
+log4j.category.org.apache.jk.server.JkMain=WARN
+log4j.category.org.apache.coyote.http11.Http11BaseProtocol=WARN
+log4j.category.org.apache.coyote.http11.Http11Protocol=WARN
+log4j.category.org.apache.catalina.core.ContainerBase=WARN
+log4j.category.org.apache.catalina.core.StandardContext=WARN
+
+# Emits a spurious WARN during startup on /some-path/* security mappings
+log4j.category.org.apache.catalina.deploy.SecurityCollection=ERROR
+
+# Prints the MBean Server ID
+log4j.category.javax.management.MBeanServerFactory=WARN
+
+# Prints the RMI connection URL
+log4j.category.javax.management.remote.rmi.RMIConnectorServer=WARN
+log4j.category.javax.management.remote.JMXServiceURL=WARN
+
+# Prints various stuff during startup
+log4j.category.org.apache.juddi.registry.RegistryServlet=WARN
+
+
+# Prints various stuff when the portal is used
+log4j.category.org.apache.pluto.portalImpl.Servlet=WARN
+# Prints stuff for AJAX calls
+log4j.category.uk.ltd.getahead.dwr.impl.DefaultConfiguration=WARN
+log4j.category.uk.ltd.getahead.dwr.impl.ExecuteQuery=WARN
+log4j.category.uk.ltd.getahead.dwr.util.Logger=WARN

Propchange: geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-j2ee-common/src/main/resources/var/log/server-log4j.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-j2ee-common/src/main/resources/var/log/server-log4j.properties
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-j2ee-common/src/main/resources/var/log/server-log4j.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-j2ee-common/src/main/resources/var/security/demo_groups.properties
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-j2ee-common/src/main/resources/var/security/demo_groups.properties?rev=422593&view=auto
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-j2ee-common/src/main/resources/var/security/demo_groups.properties (added)
+++ geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-j2ee-common/src/main/resources/var/security/demo_groups.properties Sun Jul 16 18:37:42 2006
@@ -0,0 +1,22 @@
+##
+##
+##   Copyright 2004 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.
+##
+
+manager=izumi
+it=alan
+pet=george,gracie,metro
+dog=george,gracie
+cat=metro
\ No newline at end of file

Propchange: geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-j2ee-common/src/main/resources/var/security/demo_groups.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-j2ee-common/src/main/resources/var/security/demo_groups.properties
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-j2ee-common/src/main/resources/var/security/demo_groups.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-j2ee-common/src/main/resources/var/security/demo_users.properties
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-j2ee-common/src/main/resources/var/security/demo_users.properties?rev=422593&view=auto
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-j2ee-common/src/main/resources/var/security/demo_users.properties (added)
+++ geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-j2ee-common/src/main/resources/var/security/demo_users.properties Sun Jul 16 18:37:42 2006
@@ -0,0 +1,22 @@
+##
+##
+##   Copyright 2004 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.
+##
+
+izumi=violin
+alan=starcraft
+george=bone
+gracie=biscuit
+metro=mouse
\ No newline at end of file

Propchange: geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-j2ee-common/src/main/resources/var/security/demo_users.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-j2ee-common/src/main/resources/var/security/demo_users.properties
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-j2ee-common/src/main/resources/var/security/demo_users.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-j2ee-common/src/main/resources/var/security/groups.properties
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-j2ee-common/src/main/resources/var/security/groups.properties?rev=422593&view=auto
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-j2ee-common/src/main/resources/var/security/groups.properties (added)
+++ geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-j2ee-common/src/main/resources/var/security/groups.properties Sun Jul 16 18:37:42 2006
@@ -0,0 +1 @@
+admin=system
\ No newline at end of file

Propchange: geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-j2ee-common/src/main/resources/var/security/groups.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-j2ee-common/src/main/resources/var/security/groups.properties
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-j2ee-common/src/main/resources/var/security/groups.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-j2ee-common/src/main/resources/var/security/keystores/geronimo-default
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-j2ee-common/src/main/resources/var/security/keystores/geronimo-default?rev=422593&view=auto
==============================================================================
Binary file - no diff available.

Propchange: geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-j2ee-common/src/main/resources/var/security/keystores/geronimo-default
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-j2ee-common/src/main/resources/var/security/users.properties
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-j2ee-common/src/main/resources/var/security/users.properties?rev=422593&view=auto
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-j2ee-common/src/main/resources/var/security/users.properties (added)
+++ geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-j2ee-common/src/main/resources/var/security/users.properties Sun Jul 16 18:37:42 2006
@@ -0,0 +1 @@
+system=manager
\ No newline at end of file

Propchange: geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-j2ee-common/src/main/resources/var/security/users.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-j2ee-common/src/main/resources/var/security/users.properties
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-j2ee-common/src/main/resources/var/security/users.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-j2ee-common/src/main/resources/var/temp/README.txt
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-j2ee-common/src/main/resources/var/temp/README.txt?rev=422593&view=auto
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-j2ee-common/src/main/resources/var/temp/README.txt (added)
+++ geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-j2ee-common/src/main/resources/var/temp/README.txt Sun Jul 16 18:37:42 2006
@@ -0,0 +1,10 @@
+This temp directory is used by the JVM for temporary file storage.
+The JVM is configured to use this as its java.io.tmpdir in the
+geronimo.sh and geronimo.bat scripts.  Geronimo is configured to use
+this temporary directory rather than its default for security reasons.
+The temp directory must exist for Tomcat to work correctly.
+
+This file is also included in the distribution to prevent problems with users
+who download the zip or tar.gz distribution and extract it with WinZip.
+Some versions of WinZIP decide it is not necessary to create the directory 
+because it is empty.
\ No newline at end of file

Propchange: geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-j2ee-common/src/main/resources/var/temp/README.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-j2ee-common/src/main/resources/var/temp/README.txt
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-j2ee-common/src/main/resources/var/temp/README.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain



Mime
View raw message