geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r1221374 [1/4] - in /geronimo/server/trunk: ./ framework/ framework/assemblies/geronimo-framework/ framework/configs/karaf-framework/ framework/configs/rmi-naming/ framework/configs/rmi-naming/src/main/history/ framework/features/ framework...
Date Tue, 20 Dec 2011 18:03:35 GMT
Author: djencks
Date: Tue Dec 20 18:03:33 2011
New Revision: 1221374

URL: http://svn.apache.org/viewvc?rev=1221374&view=rev
Log:
GERONIMO-6240 try a feature for the base geronimo stuff, work on upgrading to osgi 4.3/karaf 3.0.0-SNAPSHOT

Added:
    geronimo/server/trunk/framework/features/
    geronimo/server/trunk/framework/features/framework/
    geronimo/server/trunk/framework/features/framework/NOTICE
    geronimo/server/trunk/framework/features/framework/pom.xml
      - copied, changed from r1221373, geronimo/server/trunk/framework/configs/karaf-framework/pom.xml
    geronimo/server/trunk/framework/features/framework/src/
    geronimo/server/trunk/framework/features/framework/src/main/
    geronimo/server/trunk/framework/features/framework/src/main/distribution/
    geronimo/server/trunk/framework/features/framework/src/main/distribution/instance/
    geronimo/server/trunk/framework/features/framework/src/main/distribution/instance/var/
    geronimo/server/trunk/framework/features/framework/src/main/distribution/instance/var/config/
    geronimo/server/trunk/framework/features/framework/src/main/distribution/instance/var/config/README.txt   (with props)
    geronimo/server/trunk/framework/features/framework/src/main/distribution/instance/var/log/
    geronimo/server/trunk/framework/features/framework/src/main/distribution/instance/var/log/client-log4j.properties   (with props)
    geronimo/server/trunk/framework/features/framework/src/main/distribution/instance/var/log/deployer-log4j.properties   (with props)
    geronimo/server/trunk/framework/features/framework/src/main/distribution/instance/var/log/server-log4j.properties   (with props)
    geronimo/server/trunk/framework/features/framework/src/main/distribution/instance/var/temp/
    geronimo/server/trunk/framework/features/framework/src/main/distribution/instance/var/temp/README.txt   (with props)
    geronimo/server/trunk/framework/features/framework/src/main/distribution/text/
    geronimo/server/trunk/framework/features/framework/src/main/distribution/text/LICENSE
    geronimo/server/trunk/framework/features/framework/src/main/distribution/text/NOTICE
    geronimo/server/trunk/framework/features/framework/src/main/distribution/text/README.txt   (with props)
    geronimo/server/trunk/framework/features/framework/src/main/distribution/text/RELEASE_NOTES-3.0-beta-1.txt   (with props)
    geronimo/server/trunk/framework/features/framework/src/main/distribution/text/etc/
    geronimo/server/trunk/framework/features/framework/src/main/distribution/text/etc/equinox-debug.properties   (with props)
    geronimo/server/trunk/framework/features/framework/src/main/distribution/text/etc/hotbundles-config/
    geronimo/server/trunk/framework/features/framework/src/main/distribution/text/etc/hotbundles-config/org.apache.felix.fileinstall-deploy.cfg
    geronimo/server/trunk/framework/features/framework/src/main/distribution/text/etc/java.util.logging.properties   (with props)
    geronimo/server/trunk/framework/features/framework/src/main/distribution/text/etc/org.apache.karaf.log.cfg
    geronimo/server/trunk/framework/features/framework/src/main/distribution/text/etc/org.apache.karaf.shell.cfg
    geronimo/server/trunk/framework/features/framework/src/main/distribution/text/etc/org.ops4j.pax.url.mvn.cfg
    geronimo/server/trunk/framework/features/framework/src/main/distribution/text/etc/shell.init.script
    geronimo/server/trunk/framework/features/framework/src/main/distribution/text/etc/system.properties   (with props)
    geronimo/server/trunk/framework/features/framework/src/main/distribution/text/hotbundles/
    geronimo/server/trunk/framework/features/framework/src/main/distribution/text/hotbundles/README.txt   (with props)
    geronimo/server/trunk/framework/features/framework/src/main/history/
    geronimo/server/trunk/framework/features/framework/src/main/history/dependencies.xml   (with props)
    geronimo/server/trunk/framework/features/pom.xml   (with props)
Modified:
    geronimo/server/trunk/framework/assemblies/geronimo-framework/pom.xml
    geronimo/server/trunk/framework/configs/karaf-framework/pom.xml
    geronimo/server/trunk/framework/configs/rmi-naming/pom.xml
    geronimo/server/trunk/framework/configs/rmi-naming/src/main/history/dependencies.xml
    geronimo/server/trunk/framework/modules/geronimo-blueprint/pom.xml
    geronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/MockBundle.java
    geronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/MockBundleContext.java
    geronimo/server/trunk/framework/modules/geronimo-shell-base/pom.xml
    geronimo/server/trunk/framework/modules/geronimo-shell-diagnose/pom.xml
    geronimo/server/trunk/framework/pom.xml
    geronimo/server/trunk/pom.xml

Modified: geronimo/server/trunk/framework/assemblies/geronimo-framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/assemblies/geronimo-framework/pom.xml?rev=1221374&r1=1221373&r2=1221374&view=diff
==============================================================================
--- geronimo/server/trunk/framework/assemblies/geronimo-framework/pom.xml (original)
+++ geronimo/server/trunk/framework/assemblies/geronimo-framework/pom.xml Tue Dec 20 18:03:33 2011
@@ -61,6 +61,12 @@
             <version>3.0.0-SNAPSHOT</version>
         </dependency>
         <dependency>
+            <groupId>org.apache.geronimo.framework.features</groupId>
+            <artifactId>framework</artifactId>
+            <version>${project.version}</version>
+            <type>kar</type>
+        </dependency>
+        <dependency>
             <groupId>org.apache.geronimo.framework.plugingroups</groupId>
             <artifactId>framework</artifactId>
             <version>${project.version}</version>
@@ -180,6 +186,7 @@
                         <feature>ssh</feature>
                         <feature>config</feature>
                         <feature>kar</feature>
+                        <feature>framework</feature>
                     </startupFeatures>
                 </configuration>
             </plugin>

Modified: geronimo/server/trunk/framework/configs/karaf-framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/karaf-framework/pom.xml?rev=1221374&r1=1221373&r2=1221374&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/karaf-framework/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/karaf-framework/pom.xml Tue Dec 20 18:03:33 2011
@@ -299,10 +299,10 @@
             <groupId>org.apache.karaf.shell</groupId>
             <artifactId>org.apache.karaf.shell.obr</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.apache.karaf.shell</groupId>
-            <artifactId>org.apache.karaf.shell.osgi</artifactId>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.apache.karaf.shell</groupId>-->
+            <!--<artifactId>org.apache.karaf.shell.osgi</artifactId>-->
+        <!--</dependency>-->
         <dependency>
             <groupId>org.apache.karaf.shell</groupId>
             <artifactId>org.apache.karaf.shell.log</artifactId>

Modified: geronimo/server/trunk/framework/configs/rmi-naming/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/rmi-naming/pom.xml?rev=1221374&r1=1221373&r2=1221374&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/rmi-naming/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/rmi-naming/pom.xml Tue Dec 20 18:03:33 2011
@@ -93,7 +93,7 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.ext.aries.blueprint</groupId>
+            <groupId>org.apache.aries.blueprint</groupId>
             <artifactId>org.apache.aries.blueprint</artifactId>
         </dependency>
 

Modified: geronimo/server/trunk/framework/configs/rmi-naming/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/rmi-naming/src/main/history/dependencies.xml?rev=1221374&r1=1221373&r2=1221374&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/rmi-naming/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/framework/configs/rmi-naming/src/main/history/dependencies.xml Tue Dec 20 18:03:33 2011
@@ -17,6 +17,11 @@
         <type>jar</type>
     </dependency>
     <dependency>
+        <groupId>org.apache.aries.blueprint</groupId>
+        <artifactId>org.apache.aries.blueprint</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>org.apache.aries.jmx</groupId>
         <artifactId>org.apache.aries.jmx</artifactId>
         <type>jar</type>
@@ -32,16 +37,6 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.aries.proxy</groupId>
-        <artifactId>org.apache.aries.proxy.api</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.ext.aries.blueprint</groupId>
-        <artifactId>org.apache.aries.blueprint</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>geronimo-blueprint</artifactId>
         <type>jar</type>

Added: geronimo/server/trunk/framework/features/framework/NOTICE
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/framework/NOTICE?rev=1221374&view=auto
==============================================================================
--- geronimo/server/trunk/framework/features/framework/NOTICE (added)
+++ geronimo/server/trunk/framework/features/framework/NOTICE Tue Dec 20 18:03:33 2011
@@ -0,0 +1,55 @@
+Apache Felix Karaf :: Assembly
+Copyright 2009 The Apache Software Foundation
+
+I. Included Software
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
+
+This product includes software developed at
+The Eclipse Foundation (http://www.eclipse.org/).
+Licensed under Eclipse Public License 1.0.
+
+This product includes software developed at
+OPS4J (http://www.ops4j.org/).
+Licensed under the Apache License 2.0.
+
+This products includes software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Licensed under the Apache License 2.0.
+
+This product includes software developed at
+FUSE Source (http://www.fusesource.org/).
+Licensed under the Apache License 2.0.
+
+This product includes software developed at
+JLine (http://jline.sourceforge.net).
+Licensed under the BSD License.
+
+This product includes software developed at
+SLF4J (http://www.slf4j.org/).
+Licensed under the MIT License.
+
+
+II. Used Software
+
+This product uses software developed at
+SpringSource (http://www.springsource.org/).
+Licensed under the Apache License 2.0.
+
+This product uses software written by
+Antony Lesuisse.
+Licensed under Public Domain.
+
+This product includes software from http://www.json.org.
+Copyright (c) 2002 JSON.org
+
+
+III. License Summary
+- Apache License 2.0
+- Eclipse Public License 1.0
+- BSD License
+- MIT License
+
+

Copied: geronimo/server/trunk/framework/features/framework/pom.xml (from r1221373, geronimo/server/trunk/framework/configs/karaf-framework/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/framework/pom.xml?p2=geronimo/server/trunk/framework/features/framework/pom.xml&p1=geronimo/server/trunk/framework/configs/karaf-framework/pom.xml&r1=1221373&r2=1221374&rev=1221374&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/karaf-framework/pom.xml (original)
+++ geronimo/server/trunk/framework/features/framework/pom.xml Tue Dec 20 18:03:33 2011
@@ -21,13 +21,13 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>configs</artifactId>
-        <version>3.0-SNAPSHOT</version>
+        <groupId>org.apache.geronimo.framework.features</groupId>
+        <artifactId>features</artifactId>
+        <version>3.0-beta-1-SNAPSHOT</version>
     </parent>
 
-    <artifactId>karaf-framework</artifactId>
-    <packaging>car</packaging>
+    <artifactId>framework</artifactId>
+    <packaging>kar</packaging>
     <name>Geronimo Assemblies :: Karaf Boilerplate Framework</name>
 
     <!-- from karaf root pom -->
@@ -56,13 +56,13 @@
     <dependencyManagement>
         <dependencies>
             <!-- use versions direct from karaf -->
-            <dependency>
-                <groupId>org.apache.karaf</groupId>
-                <artifactId>karaf</artifactId>
-                <type>pom</type>
-                <version>${karaf.version}</version>
-                <scope>import</scope>
-            </dependency>
+            <!--<dependency>-->
+                <!--<groupId>org.apache.karaf</groupId>-->
+                <!--<artifactId>karaf</artifactId>-->
+                <!--<type>pom</type>-->
+                <!--<version>${karaf.version}</version>-->
+                <!--<scope>import</scope>-->
+            <!--</dependency>-->
 
             <dependency>
                 <groupId>org.apache.felix</groupId>
@@ -119,230 +119,230 @@
                 <version>${project.version}</version>
             </dependency>
 
-            <dependency>
-                <groupId>org.apache.karaf.shell</groupId>
-                <artifactId>org.apache.karaf.shell.commands</artifactId>
-                <version>${karaf.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.apache.felix.gogo</groupId>
-                        <artifactId>org.apache.felix.gogo.runtime</artifactId>
-                    </exclusion>
-               </exclusions>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.karaf.shell</groupId>
-                <artifactId>org.apache.karaf.shell.obr</artifactId>
-                <version>${karaf.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>commons-logging</groupId>
-                        <artifactId>commons-logging</artifactId>
-                    </exclusion>
-               </exclusions>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.karaf.shell</groupId>
-                <artifactId>org.apache.karaf.shell.log</artifactId>
-                <version>${karaf.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.ops4j.pax.logging</groupId>
-                        <artifactId>pax-logging-service</artifactId>
-                    </exclusion>
-               </exclusions>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.karaf.shell</groupId>
-                <artifactId>org.apache.karaf.shell.config</artifactId>
-                <version>${karaf.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.apache.karaf</groupId>
-                        <artifactId>org.apache.karaf.util</artifactId>
-                    </exclusion>
-               </exclusions>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.aries.proxy</groupId>
-                <artifactId>org.apache.aries.proxy</artifactId>
-                <version>${aries.proxy.version}</version>
-                <exclusions>
-                    <exclusion>
-                       <groupId>org.apache.aries.testsupport</groupId>
-        <artifactId>org.apache.aries.testsupport.unit</artifactId>
-                    </exclusion>
-                </exclusions> 
-            </dependency>
+            <!--<dependency>-->
+                <!--<groupId>org.apache.karaf.shell</groupId>-->
+                <!--<artifactId>org.apache.karaf.shell.commands</artifactId>-->
+                <!--<version>${karaf.version}</version>-->
+                <!--<exclusions>-->
+                    <!--<exclusion>-->
+                        <!--<groupId>org.apache.felix.gogo</groupId>-->
+                        <!--<artifactId>org.apache.felix.gogo.runtime</artifactId>-->
+                    <!--</exclusion>-->
+               <!--</exclusions>-->
+            <!--</dependency>-->
+
+            <!--<dependency>-->
+                <!--<groupId>org.apache.karaf.shell</groupId>-->
+                <!--<artifactId>org.apache.karaf.shell.obr</artifactId>-->
+                <!--<version>${karaf.version}</version>-->
+                <!--<exclusions>-->
+                    <!--<exclusion>-->
+                        <!--<groupId>commons-logging</groupId>-->
+                        <!--<artifactId>commons-logging</artifactId>-->
+                    <!--</exclusion>-->
+               <!--</exclusions>-->
+            <!--</dependency>-->
+
+            <!--<dependency>-->
+                <!--<groupId>org.apache.karaf.shell</groupId>-->
+                <!--<artifactId>org.apache.karaf.shell.log</artifactId>-->
+                <!--<version>${karaf.version}</version>-->
+                <!--<exclusions>-->
+                    <!--<exclusion>-->
+                        <!--<groupId>org.ops4j.pax.logging</groupId>-->
+                        <!--<artifactId>pax-logging-service</artifactId>-->
+                    <!--</exclusion>-->
+               <!--</exclusions>-->
+            <!--</dependency>-->
+
+            <!--<dependency>-->
+                <!--<groupId>org.apache.karaf.shell</groupId>-->
+                <!--<artifactId>org.apache.karaf.shell.config</artifactId>-->
+                <!--<version>${karaf.version}</version>-->
+                <!--<exclusions>-->
+                    <!--<exclusion>-->
+                        <!--<groupId>org.apache.karaf</groupId>-->
+                        <!--<artifactId>org.apache.karaf.util</artifactId>-->
+                    <!--</exclusion>-->
+               <!--</exclusions>-->
+            <!--</dependency>-->
+
+            <!--<dependency>-->
+                <!--<groupId>org.apache.aries.proxy</groupId>-->
+                <!--<artifactId>org.apache.aries.proxy</artifactId>-->
+                <!--<version>${aries.proxy.version}</version>-->
+                <!--<exclusions>-->
+                    <!--<exclusion>-->
+                       <!--<groupId>org.apache.aries.testsupport</groupId>-->
+        <!--<artifactId>org.apache.aries.testsupport.unit</artifactId>-->
+                    <!--</exclusion>-->
+                <!--</exclusions> -->
+            <!--</dependency>-->
             
-            <dependency>
-                <groupId>org.apache.karaf.deployer</groupId>
-                <artifactId>org.apache.karaf.deployer.blueprint</artifactId>
-                <version>${karaf.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>commons-logging</groupId>
-                        <artifactId>commons-logging</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.springframework.osgi</groupId>
-                        <artifactId>spring-osgi-core</artifactId>
-                    </exclusion>
-               </exclusions>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.karaf.deployer</groupId>
-                <artifactId>org.apache.karaf.deployer.features</artifactId>
-                <version>${karaf.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>commons-logging</groupId>
-                        <artifactId>commons-logging</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.springframework.osgi</groupId>
-                        <artifactId>spring-osgi-core</artifactId>
-                    </exclusion>
-               </exclusions>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.karaf.jaas</groupId>
-                <artifactId>org.apache.karaf.jaas.config</artifactId>
-                <version>${karaf.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>commons-logging</groupId>
-                        <artifactId>commons-logging</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.springframework.osgi</groupId>
-                        <artifactId>spring-osgi-core</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.mina</groupId>
-                <artifactId>mina-core</artifactId>
-                <version>${mina.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.slf4j</groupId>
-                        <artifactId>slf4j-api</artifactId>
-                    </exclusion>
-               </exclusions>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>org.apache.felix.fileinstall</artifactId>
-                <version>${felix.fileinstall.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.osgi</groupId>
-                        <artifactId>org.osgi.core</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.osgi</groupId>
-                        <artifactId>org.osgi.compendium</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
+            <!--<dependency>-->
+                <!--<groupId>org.apache.karaf.deployer</groupId>-->
+                <!--<artifactId>org.apache.karaf.deployer.blueprint</artifactId>-->
+                <!--<version>${karaf.version}</version>-->
+                <!--<exclusions>-->
+                    <!--<exclusion>-->
+                        <!--<groupId>commons-logging</groupId>-->
+                        <!--<artifactId>commons-logging</artifactId>-->
+                    <!--</exclusion>-->
+                    <!--<exclusion>-->
+                        <!--<groupId>org.springframework.osgi</groupId>-->
+                        <!--<artifactId>spring-osgi-core</artifactId>-->
+                    <!--</exclusion>-->
+               <!--</exclusions>-->
+            <!--</dependency>-->
+
+            <!--<dependency>-->
+                <!--<groupId>org.apache.karaf.deployer</groupId>-->
+                <!--<artifactId>org.apache.karaf.deployer.features</artifactId>-->
+                <!--<version>${karaf.version}</version>-->
+                <!--<exclusions>-->
+                    <!--<exclusion>-->
+                        <!--<groupId>commons-logging</groupId>-->
+                        <!--<artifactId>commons-logging</artifactId>-->
+                    <!--</exclusion>-->
+                    <!--<exclusion>-->
+                        <!--<groupId>org.springframework.osgi</groupId>-->
+                        <!--<artifactId>spring-osgi-core</artifactId>-->
+                    <!--</exclusion>-->
+               <!--</exclusions>-->
+            <!--</dependency>-->
+
+            <!--<dependency>-->
+                <!--<groupId>org.apache.karaf.jaas</groupId>-->
+                <!--<artifactId>org.apache.karaf.jaas.config</artifactId>-->
+                <!--<version>${karaf.version}</version>-->
+                <!--<exclusions>-->
+                    <!--<exclusion>-->
+                        <!--<groupId>commons-logging</groupId>-->
+                        <!--<artifactId>commons-logging</artifactId>-->
+                    <!--</exclusion>-->
+                    <!--<exclusion>-->
+                        <!--<groupId>org.springframework.osgi</groupId>-->
+                        <!--<artifactId>spring-osgi-core</artifactId>-->
+                    <!--</exclusion>-->
+                <!--</exclusions>-->
+            <!--</dependency>-->
+
+            <!--<dependency>-->
+                <!--<groupId>org.apache.mina</groupId>-->
+                <!--<artifactId>mina-core</artifactId>-->
+                <!--<version>${mina.version}</version>-->
+                <!--<exclusions>-->
+                    <!--<exclusion>-->
+                        <!--<groupId>org.slf4j</groupId>-->
+                        <!--<artifactId>slf4j-api</artifactId>-->
+                    <!--</exclusion>-->
+               <!--</exclusions>-->
+            <!--</dependency>-->
+
+            <!--<dependency>-->
+                <!--<groupId>org.apache.felix</groupId>-->
+                <!--<artifactId>org.apache.felix.fileinstall</artifactId>-->
+                <!--<version>${felix.fileinstall.version}</version>-->
+                <!--<exclusions>-->
+                    <!--<exclusion>-->
+                        <!--<groupId>org.osgi</groupId>-->
+                        <!--<artifactId>org.osgi.core</artifactId>-->
+                    <!--</exclusion>-->
+                    <!--<exclusion>-->
+                        <!--<groupId>org.osgi</groupId>-->
+                        <!--<artifactId>org.osgi.compendium</artifactId>-->
+                    <!--</exclusion>-->
+                <!--</exclusions>-->
+            <!--</dependency>-->
 
         </dependencies>
     </dependencyManagement>
 
     <dependencies>
-        <dependency>
-            <groupId>org.apache.karaf.deployer</groupId>
-            <artifactId>org.apache.karaf.deployer.blueprint</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.servicemix.bundles</groupId>
-                    <artifactId>org.apache.servicemix.bundles.junit</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.karaf.deployer</groupId>
-            <artifactId>org.apache.karaf.deployer.features</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.servicemix.bundles</groupId>
-                    <artifactId>org.apache.servicemix.bundles.junit</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.karaf.features</groupId>
-            <artifactId>org.apache.karaf.features.core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.karaf.features</groupId>
-            <artifactId>org.apache.karaf.features.command</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.karaf.features</groupId>
-            <artifactId>org.apache.karaf.features.management</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.karaf.shell</groupId>
-            <artifactId>org.apache.karaf.shell.console</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.karaf.shell</groupId>
-            <artifactId>org.apache.karaf.shell.obr</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.karaf.shell</groupId>
-            <artifactId>org.apache.karaf.shell.osgi</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.karaf.shell</groupId>
-            <artifactId>org.apache.karaf.shell.log</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.karaf.shell</groupId>
-            <artifactId>org.apache.karaf.shell.config</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.karaf.shell</groupId>
-            <artifactId>org.apache.karaf.shell.packages</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.karaf.shell</groupId>
-            <artifactId>org.apache.karaf.shell.commands</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.karaf.shell</groupId>
-            <artifactId>org.apache.karaf.shell.ssh</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.karaf.jaas</groupId>
-            <artifactId>org.apache.karaf.jaas.boot</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.karaf.jaas</groupId>
-            <artifactId>org.apache.karaf.jaas.config</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.bundlerepository</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.fileinstall</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.mina</groupId>
-            <artifactId>mina-core</artifactId>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.apache.karaf.deployer</groupId>-->
+            <!--<artifactId>org.apache.karaf.deployer.blueprint</artifactId>-->
+            <!--<exclusions>-->
+                <!--<exclusion>-->
+                    <!--<groupId>org.apache.servicemix.bundles</groupId>-->
+                    <!--<artifactId>org.apache.servicemix.bundles.junit</artifactId>-->
+                <!--</exclusion>-->
+            <!--</exclusions>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>org.apache.karaf.deployer</groupId>-->
+            <!--<artifactId>org.apache.karaf.deployer.features</artifactId>-->
+            <!--<exclusions>-->
+                <!--<exclusion>-->
+                    <!--<groupId>org.apache.servicemix.bundles</groupId>-->
+                    <!--<artifactId>org.apache.servicemix.bundles.junit</artifactId>-->
+                <!--</exclusion>-->
+            <!--</exclusions>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>org.apache.karaf.features</groupId>-->
+            <!--<artifactId>org.apache.karaf.features.core</artifactId>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>org.apache.karaf.features</groupId>-->
+            <!--<artifactId>org.apache.karaf.features.command</artifactId>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>org.apache.karaf.features</groupId>-->
+            <!--<artifactId>org.apache.karaf.features.management</artifactId>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>org.apache.karaf.shell</groupId>-->
+            <!--<artifactId>org.apache.karaf.shell.console</artifactId>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>org.apache.karaf.shell</groupId>-->
+            <!--<artifactId>org.apache.karaf.shell.obr</artifactId>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>org.apache.karaf.shell</groupId>-->
+            <!--<artifactId>org.apache.karaf.shell.osgi</artifactId>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>org.apache.karaf.shell</groupId>-->
+            <!--<artifactId>org.apache.karaf.shell.log</artifactId>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>org.apache.karaf.shell</groupId>-->
+            <!--<artifactId>org.apache.karaf.shell.config</artifactId>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>org.apache.karaf.shell</groupId>-->
+            <!--<artifactId>org.apache.karaf.shell.packages</artifactId>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>org.apache.karaf.shell</groupId>-->
+            <!--<artifactId>org.apache.karaf.shell.commands</artifactId>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>org.apache.karaf.shell</groupId>-->
+            <!--<artifactId>org.apache.karaf.shell.ssh</artifactId>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>org.apache.karaf.jaas</groupId>-->
+            <!--<artifactId>org.apache.karaf.jaas.boot</artifactId>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>org.apache.karaf.jaas</groupId>-->
+            <!--<artifactId>org.apache.karaf.jaas.config</artifactId>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>org.apache.felix</groupId>-->
+            <!--<artifactId>org.apache.felix.bundlerepository</artifactId>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>org.apache.felix</groupId>-->
+            <!--<artifactId>org.apache.felix.fileinstall</artifactId>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>org.apache.mina</groupId>-->
+            <!--<artifactId>mina-core</artifactId>-->
+        <!--</dependency>-->
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.configadmin</artifactId>
@@ -355,44 +355,44 @@
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.prefs</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.ops4j.pax.logging</groupId>
-            <artifactId>pax-logging-api</artifactId>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.ops4j.pax.logging</groupId>-->
+            <!--<artifactId>pax-logging-api</artifactId>-->
+        <!--</dependency>-->
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-pax-logging</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.ops4j.pax.url</groupId>
-            <artifactId>pax-url-mvn</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.ops4j.pax.url</groupId>
-            <artifactId>pax-url-wrap</artifactId>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.ops4j.pax.url</groupId>-->
+            <!--<artifactId>pax-url-mvn</artifactId>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>org.ops4j.pax.url</groupId>-->
+            <!--<artifactId>pax-url-wrap</artifactId>-->
+        <!--</dependency>-->
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-servlet_3.0_spec</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.apache.sshd</groupId>
-            <artifactId>sshd-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.osgi</groupId>
-            <artifactId>org.eclipse.osgi</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.framework</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.aries</groupId>
-            <artifactId>org.apache.aries.util</artifactId>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.apache.sshd</groupId>-->
+            <!--<artifactId>sshd-core</artifactId>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>org.eclipse.osgi</groupId>-->
+            <!--<artifactId>org.eclipse.osgi</artifactId>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>org.apache.felix</groupId>-->
+            <!--<artifactId>org.apache.felix.framework</artifactId>-->
+        <!--</dependency>-->
+
+        <!--<dependency>-->
+            <!--<groupId>org.apache.aries</groupId>-->
+            <!--<artifactId>org.apache.aries.util</artifactId>-->
+        <!--</dependency>-->
 
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
@@ -408,7 +408,7 @@
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-deploy-jsr88-full</artifactId>
             <version>${project.version}</version>
-            <scope>provided</scope>
+            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
@@ -425,21 +425,29 @@
             <artifactId>geronimo-shell</artifactId>
             <version>${version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>j2ee-system</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
         <!--agent -->
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-transformer</artifactId>
             <version>${project.version}</version>
-            <scope>provided</scope>
+            <scope>runtime</scope>
         </dependency>
         <!-- endorsed -->
         <dependency>
             <groupId>org.apache.yoko</groupId>
             <artifactId>yoko-spec-corba</artifactId>
+            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.yoko</groupId>
             <artifactId>yoko-rmi-spec</artifactId>
+            <scope>runtime</scope>
         </dependency>
     </dependencies>
     <build>
@@ -509,23 +517,23 @@
                             <goal>run</goal>
                         </goals>
                     </execution>
-                    <execution>
-                        <id>install-underlay</id>
-                        <phase>process-classes</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <mkdir dir="${project.build.outputDirectory}" />
-                                <copy todir="${project.build.outputDirectory}">
-                                    <fileset dir="${project.build.directory}/${project.build.finalName}">
-                                        <include name="**" />
-                                    </fileset>
-                                </copy>
-                            </tasks>
-                        </configuration>
-                    </execution>
+                    <!--<execution>-->
+                        <!--<id>install-underlay</id>-->
+                        <!--<phase>process-classes</phase>-->
+                        <!--<goals>-->
+                            <!--<goal>run</goal>-->
+                        <!--</goals>-->
+                        <!--<configuration>-->
+                            <!--<tasks>-->
+                                <!--<mkdir dir="${project.build.outputDirectory}" />-->
+                                <!--<copy todir="${project.build.outputDirectory}">-->
+                                    <!--<fileset dir="${project.build.directory}/${project.build.finalName}">-->
+                                        <!--<include name="**" />-->
+                                    <!--</fileset>-->
+                                <!--</copy>-->
+                            <!--</tasks>-->
+                        <!--</configuration>-->
+                    <!--</execution>-->
                 </executions>
             </plugin>
             <!--<plugin>-->
@@ -572,64 +580,66 @@
                         </goals>
                         <configuration>
                             <artifactItems>
+<!--  in karaf framework
                                 <artifactItem>
                                     <groupId>org.apache.karaf.jaas</groupId>
                                     <artifactId>org.apache.karaf.jaas.boot</artifactId>
-                                    <outputDirectory>target/dependencies/lib</outputDirectory>
+                                    <outputDirectory>target/classes/resources/lib</outputDirectory>
                                     <destFileName>karaf-jaas-boot.jar</destFileName>
                                 </artifactItem>
+-->
                                 <artifactItem>
                                     <groupId>org.apache.geronimo.framework</groupId>
                                     <artifactId>geronimo-rmi-loader</artifactId>
-                                    <outputDirectory>target/dependencies/lib</outputDirectory>
+                                    <outputDirectory>target/classes/resources/lib</outputDirectory>
                                     <destFileName>geronimo-rmi-loader.jar</destFileName>
                                 </artifactItem>
                                 <artifactItem>
                                     <groupId>org.apache.geronimo.framework</groupId>
                                     <artifactId>geronimo-main</artifactId>
-                                    <outputDirectory>target/dependencies/lib</outputDirectory>
+                                    <outputDirectory>target/classes/resources/lib</outputDirectory>
                                     <destFileName>geronimo-main.jar</destFileName>
                                 </artifactItem>
                                 <artifactItem>
                                     <groupId>org.apache.geronimo.framework</groupId>
                                     <artifactId>geronimo-cli</artifactId>
-                                    <outputDirectory>target/dependencies/lib</outputDirectory>
+                                    <outputDirectory>target/classes/resources/lib</outputDirectory>
                                     <destFileName>geronimo-cli.jar</destFileName>
                                 </artifactItem>
                                 <artifactItem>
                                     <groupId>org.apache.geronimo.framework</groupId>
                                     <artifactId>geronimo-hook</artifactId>
-                                    <outputDirectory>target/dependencies/lib</outputDirectory>
+                                    <outputDirectory>target/classes/resources/lib</outputDirectory>
                                     <destFileName>geronimo-hook.jar</destFileName>
                                 </artifactItem>
                                 <artifactItem>
                                     <groupId>org.apache.geronimo.framework</groupId>
                                     <artifactId>geronimo-deploy-jsr88-full</artifactId>
-                                    <outputDirectory>target/dependencies/jsr88</outputDirectory>
+                                    <outputDirectory>target/classes/resources/jsr88</outputDirectory>
                                     <destFileName>geronimo-deploy-jsr88-full.jar</destFileName>
                                 </artifactItem>
                                 <artifactItem>
                                     <groupId>commons-cli</groupId>
                                     <artifactId>commons-cli</artifactId>
-                                    <outputDirectory>target/dependencies/lib</outputDirectory>
+                                    <outputDirectory>target/classes/resources/lib</outputDirectory>
                                     <destFileName>commons-cli.jar</destFileName>
                                 </artifactItem>
                                 <artifactItem>
                                     <groupId>org.apache.yoko</groupId>
                                     <artifactId>yoko-spec-corba</artifactId>
-                                    <outputDirectory>target/dependencies/lib/endorsed</outputDirectory>
+                                    <outputDirectory>target/classes/resources/lib/endorsed</outputDirectory>
                                     <destFileName>yoko-spec-corba.jar</destFileName>
                                 </artifactItem>
                                 <artifactItem>
                                     <groupId>org.apache.yoko</groupId>
                                     <artifactId>yoko-rmi-spec</artifactId>
-                                    <outputDirectory>target/dependencies/lib/endorsed</outputDirectory>
+                                    <outputDirectory>target/classes/resources/lib/endorsed</outputDirectory>
                                     <destFileName>yoko-rmi-spec.jar</destFileName>
                                 </artifactItem>
                                 <artifactItem>
                                     <groupId>org.apache.geronimo.framework</groupId>
                                     <artifactId>geronimo-transformer</artifactId>
-                                    <outputDirectory>target/dependencies/lib/agent</outputDirectory>
+                                    <outputDirectory>target/classes/resources/lib/agent</outputDirectory>
                                     <destFileName>transformer.jar</destFileName>
                                 </artifactItem>
                             </artifactItems>
@@ -727,44 +737,44 @@
             <!--</plugin>-->
 
             <!-- our stuff -->
-            <plugin>
-                <groupId>org.apache.geronimo.buildsupport</groupId>
-                <artifactId>car-maven-plugin</artifactId>
-                <configuration>
-                    <useMavenDependencies>
-                        <value>true</value>
-                        <includeVersion>true</includeVersion>
-                    </useMavenDependencies>
-                    <category>Geronimo Core</category>
-                    <instance>
-                        <plugin-artifact>
-                            <copy-file relative-to="geronimo" dest-dir="">contents/</copy-file>
-                            <copy-file relative-to="server" dest-dir="">instance/</copy-file>
-                        </plugin-artifact>
-                    </instance>
-                </configuration>
-            </plugin>
+            <!--<plugin>-->
+                <!--<groupId>org.apache.geronimo.buildsupport</groupId>-->
+                <!--<artifactId>car-maven-plugin</artifactId>-->
+                <!--<configuration>-->
+                    <!--<useMavenDependencies>-->
+                        <!--<value>true</value>-->
+                        <!--<includeVersion>true</includeVersion>-->
+                    <!--</useMavenDependencies>-->
+                    <!--<category>Geronimo Core</category>-->
+                    <!--<instance>-->
+                        <!--<plugin-artifact>-->
+                            <!--<copy-file relative-to="geronimo" dest-dir="">contents/</copy-file>-->
+                            <!--<copy-file relative-to="server" dest-dir="">instance/</copy-file>-->
+                        <!--</plugin-artifact>-->
+                    <!--</instance>-->
+                <!--</configuration>-->
+            <!--</plugin>-->
 
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>boilerplate</id>
-                        <phase>compile</phase>
-                        <goals>
-                            <goal>directory-single</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${project.build.directory}</outputDirectory>
-                            <appendAssemblyId>false</appendAssemblyId>
-                            <descriptors>
-                                <descriptor>${project.basedir}/src/main/descriptors/geronimo-bin.xml</descriptor>
-                            </descriptors>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
+            <!--<plugin>-->
+                <!--<groupId>org.apache.maven.plugins</groupId>-->
+                <!--<artifactId>maven-assembly-plugin</artifactId>-->
+                <!--<executions>-->
+                    <!--<execution>-->
+                        <!--<id>boilerplate</id>-->
+                        <!--<phase>compile</phase>-->
+                        <!--<goals>-->
+                            <!--<goal>directory-single</goal>-->
+                        <!--</goals>-->
+                        <!--<configuration>-->
+                            <!--<outputDirectory>${project.build.directory}</outputDirectory>-->
+                            <!--<appendAssemblyId>false</appendAssemblyId>-->
+                            <!--<descriptors>-->
+                                <!--<descriptor>${project.basedir}/src/main/descriptors/geronimo-bin.xml</descriptor>-->
+                            <!--</descriptors>-->
+                        <!--</configuration>-->
+                    <!--</execution>-->
+                <!--</executions>-->
+            <!--</plugin>-->
         </plugins>
     </build>
 

Added: geronimo/server/trunk/framework/features/framework/src/main/distribution/instance/var/config/README.txt
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/framework/src/main/distribution/instance/var/config/README.txt?rev=1221374&view=auto
==============================================================================
--- geronimo/server/trunk/framework/features/framework/src/main/distribution/instance/var/config/README.txt (added)
+++ geronimo/server/trunk/framework/features/framework/src/main/distribution/instance/var/config/README.txt Tue Dec 20 18:03:33 2011
@@ -0,0 +1,66 @@
+#  Licensed to the Apache Software Foundation (ASF) under one or more
+#  contributor license agreements.  See the NOTICE file distributed with
+#  this work for additional information regarding copyright ownership.
+#  The ASF licenses this file to You 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.
+
+
+Files in this directory:
+
+*-config.xml
+
+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.
+
+
+*-config-substitutions.properties
+   
+Put variables and their substitution values in this file. 
+They will be used when processing the corresponding config.xml. 
+Values in this file can be overridden by environment variables and system properties 
+by prefixing the property name with 'org.apache.geronimo.config.substitution.' 
+For example, an entry such as hostName=localhost 
+can be overridden by an environment variable or system property org.apache.geronimo.config.substitution.hostName=foo 
+When running multiple instances of Geronimo choose a PortOffset value such that none of the ports conflict. 
+For example, try PortOffset=10 
+
+
+*-artifact-aliases.properties
+
+You can use this file to indicate that you want to substitute one module for another.
+format is oldartifactid=newartifactId e.g.
+org.apache.geronimo.configs/transaction//car=org.apache.geronimo.configs/transaction/1.2-SNAPSHOT/car
+versions can be ommitted on the left side but not the right.
+This can also specify explicit versions in the same format.
+

Propchange: geronimo/server/trunk/framework/features/framework/src/main/distribution/instance/var/config/README.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/framework/features/framework/src/main/distribution/instance/var/config/README.txt
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/framework/features/framework/src/main/distribution/instance/var/config/README.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/framework/features/framework/src/main/distribution/instance/var/log/client-log4j.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/framework/src/main/distribution/instance/var/log/client-log4j.properties?rev=1221374&view=auto
==============================================================================
--- geronimo/server/trunk/framework/features/framework/src/main/distribution/instance/var/log/client-log4j.properties (added)
+++ geronimo/server/trunk/framework/features/framework/src/main/distribution/instance/var/log/client-log4j.properties Tue Dec 20 18:03:33 2011
@@ -0,0 +1,57 @@
+##
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements.  See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You 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.rootLogger=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{ISO8601} %-5p [%c{1}] %m%n
+
+log4j.appender.FILE=org.apache.log4j.RollingFileAppender
+log4j.appender.FILE.threshold=TRACE
+log4j.appender.FILE.layout=org.apache.log4j.PatternLayout
+log4j.appender.FILE.layout.ConversionPattern=%d{ISO8601} %-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=10
+log4j.appender.FILE.maxFileSize=10MB
+
+#
+# Example: enable trace logging from CONSOLE appender
+#
+#log4j.appender.CONSOLE.Threshold=TRACE
+
+#
+# Example: enable trace messages from foo.bar category
+#
+#log4j.logger.foo.bar=TRACE
+
+# Aries Blueprint - hide "waiting for namespace handler" warnings
+log4j.logger.org.apache.aries.blueprint.container.BlueprintContainerImpl=ERROR
+
+# Aries Blueprint - hide "ServiceUnavailableException: The Blueprint container is being or has been destroyed" INFO message in log when shutdown geronimo.
+log4j.logger.org.apache.aries.blueprint.container.BeanRecipe=WARN

Propchange: geronimo/server/trunk/framework/features/framework/src/main/distribution/instance/var/log/client-log4j.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/framework/features/framework/src/main/distribution/instance/var/log/client-log4j.properties
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/framework/features/framework/src/main/distribution/instance/var/log/client-log4j.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/framework/features/framework/src/main/distribution/instance/var/log/deployer-log4j.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/framework/src/main/distribution/instance/var/log/deployer-log4j.properties?rev=1221374&view=auto
==============================================================================
--- geronimo/server/trunk/framework/features/framework/src/main/distribution/instance/var/log/deployer-log4j.properties (added)
+++ geronimo/server/trunk/framework/features/framework/src/main/distribution/instance/var/log/deployer-log4j.properties Tue Dec 20 18:03:33 2011
@@ -0,0 +1,71 @@
+##
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements.  See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You 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.rootLogger=INFO, CONSOLE, FILE
+
+log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
+log4j.appender.CONSOLE.Threshold=${org.apache.geronimo.log.ConsoleLogLevel}
+log4j.appender.CONSOLE.Threshold=ERROR
+log4j.appender.CONSOLE.Target=System.out
+log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
+log4j.appender.CONSOLE.layout.ConversionPattern=%d{ISO8601} %-5p [%c{1}] %m%n
+
+log4j.appender.FILE=org.apache.log4j.RollingFileAppender
+log4j.appender.FILE.threshold=TRACE
+log4j.appender.FILE.layout=org.apache.log4j.PatternLayout
+log4j.appender.FILE.layout.ConversionPattern=%d{ISO8601} %-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
+
+#
+# Example: enable trace messages from foo.bar category
+#
+#log4j.logger.foo.bar=TRACE
+
+#### This will help find connection leak problems ####
+#log4j.logger.org.apache.geronimo.connector.outbound=TRACE
+
+#### 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.logger.org.apache.commons.digester=ERROR
+log4j.logger.org.apache.jasper.compiler.SmapUtil=WARN
+
+# Prints the MBean Server ID
+log4j.logger.javax.management.MBeanServerFactory=WARN
+
+# Prints the RMI connection URL
+log4j.logger.javax.management.remote.rmi.RMIConnectorServer=WARN
+log4j.logger.javax.management.remote.JMXServiceURL=WARN
+
+# Aries Blueprint - hide "waiting for namespace handler" warnings
+log4j.logger.org.apache.aries.blueprint.container.BlueprintContainerImpl=ERROR

Propchange: geronimo/server/trunk/framework/features/framework/src/main/distribution/instance/var/log/deployer-log4j.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/framework/features/framework/src/main/distribution/instance/var/log/deployer-log4j.properties
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/framework/features/framework/src/main/distribution/instance/var/log/deployer-log4j.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/framework/features/framework/src/main/distribution/instance/var/log/server-log4j.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/framework/src/main/distribution/instance/var/log/server-log4j.properties?rev=1221374&view=auto
==============================================================================
--- geronimo/server/trunk/framework/features/framework/src/main/distribution/instance/var/log/server-log4j.properties (added)
+++ geronimo/server/trunk/framework/features/framework/src/main/distribution/instance/var/log/server-log4j.properties Tue Dec 20 18:03:33 2011
@@ -0,0 +1,162 @@
+##
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements.  See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You 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.rootLogger=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{ISO8601} %-5p [%c{1}] %m%n
+
+log4j.appender.FILE=org.apache.log4j.RollingFileAppender
+log4j.appender.FILE.Threshold=TRACE
+log4j.appender.FILE.layout=org.apache.log4j.PatternLayout
+log4j.appender.FILE.layout.ConversionPattern=%d{ISO8601} %-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
+
+#
+# Example: enable trace messages from foo.bar category
+#
+#log4j.logger.foo.bar=TRACE
+
+# Geronimo
+#This will help find connection leak problems
+#log4j.logger.org.apache.geronimo.connector.outbound=TRACE
+log4j.logger.org.apache.geronimo.system.logging.log4j.Log4jService=INFO
+
+
+log4j.logger.org.apache.geronimo.system.properties.SystemProperties=ERROR
+
+#### 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.logger.org.apache.commons.digester=ERROR
+log4j.logger.org.apache.jasper.compiler.SmapUtil=WARN
+
+# ActiveMQ
+log4j.logger.org.apache.activemq=WARN
+log4j.logger.org.apache.activemq.broker.jmx.ManagementContext=ERROR
+
+# Don't need so much info on every web page that's rendered
+log4j.logger.org.mortbay=INFO
+log4j.logger.org.apache.pluto=INFO
+log4j.logger.org.apache.pluto.container.util.StringManager=ERROR
+log4j.logger.org.apache.jasper=INFO
+
+# Various Jetty startup/shutdown output
+log4j.logger.org.mortbay.http.HttpServer=WARN
+log4j.logger.org.mortbay.http.SocketListener=WARN
+log4j.logger.org.mortbay.http.ajp.AJP13Listener=WARN
+log4j.logger.org.mortbay.util.Container=WARN
+log4j.logger.org.mortbay.util.Credential=WARN
+log4j.logger.org.mortbay.util.ThreadedServer=WARN
+log4j.logger.org.mortbay.jetty.servlet.WebApplicationContext=WARN
+log4j.logger.org.mortbay.jetty.context=WARN
+
+# Various Tomcat startup output
+log4j.logger.org.apache.catalina.realm.JAASRealm=WARN
+log4j.logger.org.apache.catalina.realm.RealmBase=WARN
+log4j.logger.org.apache.catalina.loader.WebappLoader=WARN
+log4j.logger.org.apache.catalina.startup.Embedded=WARN
+log4j.logger.org.apache.catalina.core.StandardEngine=WARN
+log4j.logger.org.apache.catalina.core.StandardHost=WARN
+log4j.logger.org.apache.jk.common.ChannelSocket=WARN
+log4j.logger.org.apache.jk.server.JkMain=WARN
+log4j.logger.org.apache.coyote.http11.Http11BaseProtocol=WARN
+log4j.logger.org.apache.coyote.http11.Http11Protocol=WARN
+log4j.logger.org.apache.catalina.core.ContainerBase=WARN
+log4j.logger.org.apache.catalina.core.StandardContext=WARN
+log4j.logger.org.apache.tomcat.util.net.SSLImplementation=WARN
+log4j.logger.org.apache.catalina.startup.DigesterFactory=ERROR
+
+# myfaces startup output
+log4j.logger.org.apache.myfaces.renderkit.html.HtmlRenderKitImpl=WARN
+log4j.logger.org.apache.myfaces.config.FacesConfigurator=WARN
+log4j.logger.org.apache.myfaces.webapp.StartupServletContextListener=WARN
+log4j.logger.org.apache.myfaces.webapp.StartupServletContextListener=WARN
+
+# emits a spurious warn about null locale during startup of webapps
+log4j.logger.org.apache.myfaces.shared_impl.util.LocaleUtils=ERROR
+
+# Emits a spurious WARN during startup on /some-path/* security mappings
+log4j.logger.org.apache.catalina.deploy.SecurityCollection=ERROR
+
+# Prints the MBean Server ID
+log4j.logger.javax.management.MBeanServerFactory=WARN
+
+# Prints the RMI connection URL
+log4j.logger.javax.management.remote.rmi.RMIConnectorServer=WARN
+log4j.logger.javax.management.remote.JMXServiceURL=WARN
+
+# Prints various stuff during startup
+log4j.logger.org.apache.juddi.registry.RegistryServlet=WARN
+
+# Prints various stuff when the portal is used
+log4j.logger.org.apache.pluto.portalImpl.Servlet=WARN
+
+# The users don't care the portlet register/unregister info in log.
+log4j.logger.org.apache.pluto.driver.container.PortletContextManager=WARN
+
+# Prints stuff for AJAX calls
+log4j.logger.uk.ltd.getahead.dwr.impl.DefaultConfiguration=WARN
+log4j.logger.uk.ltd.getahead.dwr.impl.ExecuteQuery=WARN
+log4j.logger.uk.ltd.getahead.dwr.util.Logger=WARN
+log4j.logger.org.directwebremoting.impl.DTDEntityResolver=ERROR
+
+# Aries Blueprint - hide "waiting for namespace handler" warnings
+log4j.logger.org.apache.aries.blueprint.container.BlueprintContainerImpl=ERROR
+
+# XBean - Suppress "could not load" warnings for Spring classes
+log4j.logger.org.apache.xbean.blueprint.context.impl.XBeanNamespaceHandler=ERROR
+
+# Aries Blueprint - hide "ServiceUnavailableException: The Blueprint container is being or has been destroyed" INFO message in log when shutdown geronimo.
+log4j.logger.org.apache.aries.blueprint.container.BeanRecipe=WARN
+
+# Example: enable Axis debug log output
+#log4j.logger.org.apache.axis.enterprise=DEBUG
+#log4j.logger.org.apache.axis.TIME=DEBUG
+#log4j.logger.org.apache.axis.EXCEPTIONS=DEBUG
+
+# Example: enable Axis2 debug log output
+#log4j.logger.org.apache.axis2.enterprise=DEBUG
+#log4j.logger.de.hunsicker.jalopy.io=DEBUG
+#log4j.logger.httpclient.wire.header=DEBUG
+#log4j.logger.org.apache.commons.httpclient=DEBUG
+
+# Example: enable OpenJPA debug log output
+#log4j.logger.openjpa.Runtime=TRACE
+#log4j.logger.openjpa.Enhance=TRACE
+#log4j.logger.openjpa.SQL=TRACE
+#log4j.logger.openjpa=TRACE
+

Propchange: geronimo/server/trunk/framework/features/framework/src/main/distribution/instance/var/log/server-log4j.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/framework/features/framework/src/main/distribution/instance/var/log/server-log4j.properties
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/framework/features/framework/src/main/distribution/instance/var/log/server-log4j.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/framework/features/framework/src/main/distribution/instance/var/temp/README.txt
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/framework/src/main/distribution/instance/var/temp/README.txt?rev=1221374&view=auto
==============================================================================
--- geronimo/server/trunk/framework/features/framework/src/main/distribution/instance/var/temp/README.txt (added)
+++ geronimo/server/trunk/framework/features/framework/src/main/distribution/instance/var/temp/README.txt Tue Dec 20 18:03:33 2011
@@ -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/server/trunk/framework/features/framework/src/main/distribution/instance/var/temp/README.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/framework/features/framework/src/main/distribution/instance/var/temp/README.txt
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/framework/features/framework/src/main/distribution/instance/var/temp/README.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain



Mime
View raw message