geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r1231356 [1/2] - in /geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client: etc/ var/ var/config/ var/security/ var/security/keystores/
Date Fri, 13 Jan 2012 22:27:33 GMT
Author: djencks
Date: Fri Jan 13 22:27:32 2012
New Revision: 1231356

URL: http://svn.apache.org/viewvc?rev=1231356&view=rev
Log:
GERONIMO-6263 update client setup to be closer to server setup.  Needs a lot of cars not to be started

Added:
    geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/distribution.info
      - copied, changed from r1231355, geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/org.apache.karaf.shell.cfg
    geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/jre.properties.cxf
      - copied, changed from r1231355, geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/jre.properties
    geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/org.apache.karaf.features.obr.cfg
      - copied, changed from r1231355, geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/custom.properties
    geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/org.apache.karaf.jaas.cfg
      - copied, changed from r1231355, geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/org.apache.karaf.shell.cfg
    geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/regions-config.xml   (with props)
    geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/shell.init.script
    geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/var/
    geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/var/config/
    geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/var/config/artifact_aliases.properties   (with props)
    geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/var/config/client_artifact_aliases.properties   (with props)
    geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/var/config/config-substitutions.properties   (with props)
    geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/var/config/config.xml   (with props)
    geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/var/config/config.xml.bak
    geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/var/config/installed-plugins.properties   (with props)
    geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/var/config/jsr88-configurer-config.xml   (with props)
    geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/var/config/jsr88-configurer-config.xml.bak
    geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/var/config/offline-deployer-config.xml   (with props)
    geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/var/config/plugin-repositories.properties   (with props)
    geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/var/security/
    geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/var/security/demo_groups.properties   (with props)
    geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/var/security/demo_users.properties   (with props)
    geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/var/security/groups.properties   (with props)
    geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/var/security/keystores/
    geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/var/security/keystores/geronimo-default
    geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/var/security/users.properties   (with props)
Modified:
    geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/custom.properties
    geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/jre.properties
    geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/org.apache.karaf.features.cfg
    geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/org.apache.karaf.management.cfg
    geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/org.apache.karaf.shell.cfg
    geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/org.ops4j.pax.logging.cfg
    geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/org.ops4j.pax.url.mvn.cfg
    geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/startup.properties
    geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/system.properties

Modified: geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/custom.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/custom.properties?rev=1231356&r1=1231355&r2=1231356&view=diff
==============================================================================
--- geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/custom.properties (original)
+++ geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/custom.properties Fri Jan 13 22:27:32 2012
@@ -24,7 +24,25 @@
 
 karaf.systemBundlesStartLevel=50
 
+felix.fileinstall.noInitialDelay=true
 #
 # You can place any customized configuration here.
 #
-
+org.osgi.framework.system.packages.extra=\
+   sun.misc, \
+   sun.reflect, \
+   org.apache.yoko, \
+   org.apache.yoko.osgi, \
+   org.apache.yoko.rmispec.util
+#   org.apache.geronimo.transformer, \
+#   org.apache.geronimo.hook
+#  , \
+#   org.apache.karaf.jaas.boot; version=3.0.0-SNAPSHOT, \
+#   org.apache.karaf.version; version=3.0.0-SNAPSHOT, \
+#   org.apache.geronimo.main, \
+#   org.apache.geronimo.cli.daemon, \
+#   org.apache.geronimo.cli.client, \
+#   org.apache.geronimo.cli.shutdown, \
+#   org.apache.geronimo.cli.deployer, \
+#   org.apache.geronimo.transformer, \
+#   org.apache.geronimo.hook

Copied: geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/distribution.info (from r1231355, geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/org.apache.karaf.shell.cfg)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/distribution.info?p2=geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/distribution.info&p1=geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/org.apache.karaf.shell.cfg&r1=1231355&r2=1231356&rev=1231356&view=diff
==============================================================================
--- geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/org.apache.karaf.shell.cfg (original)
+++ geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/distribution.info Fri Jan 13 22:27:32 2012
@@ -18,7 +18,10 @@
 ################################################################################
 
 #
-sshPort=8102
-sshHost=0.0.0.0
-sshRealm=karaf
-hostKey=${karaf.base}/etc/host.key
+# This file contains the general platform information required by the itests to find out
+# about the current versions.
+#
+
+karafVersion=3.0.0-SNAPSHOT
+name=Apache Karaf
+

Modified: geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/jre.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/jre.properties?rev=1231356&r1=1231355&r2=1231356&view=diff
==============================================================================
--- geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/jre.properties (original)
+++ geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/jre.properties Fri Jan 13 22:27:32 2012
@@ -153,8 +153,8 @@ jre-1.6= \
  javax.accessibility, \
  javax.activation, \
  javax.activity, \
- javax.annotation;version="1.1", \
- javax.annotation.processing;version="1.1", \
+ javax.annotation, \
+ javax.annotation.processing, \
  javax.crypto, \
  javax.crypto.interfaces, \
  javax.crypto.spec, \
@@ -231,12 +231,12 @@ jre-1.6= \
  javax.tools, \
  javax.transaction; javax.transaction.xa; partial=true; mandatory:=partial, \
  javax.xml, \
- javax.xml.bind, \
- javax.xml.bind.annotation, \
- javax.xml.bind.annotation.adapters, \
- javax.xml.bind.attachment, \
- javax.xml.bind.helpers, \
- javax.xml.bind.util, \
+ javax.xml.bind;version="2.2", \
+ javax.xml.bind.annotation;version="2.2", \
+ javax.xml.bind.annotation.adapters;version="2.2", \
+ javax.xml.bind.attachment;version="2.2", \
+ javax.xml.bind.helpers;version="2.2", \
+ javax.xml.bind.util;version="2.2", \
  javax.xml.crypto, \
  javax.xml.crypto.dom, \
  javax.xml.crypto.dsig, \
@@ -247,9 +247,9 @@ jre-1.6= \
  javax.xml.namespace, \
  javax.xml.parsers, \
  javax.xml.soap, \
- javax.xml.stream, \
- javax.xml.stream.events, \
- javax.xml.stream.util, \
+ javax.xml.stream;version="1.2", \
+ javax.xml.stream.events;version="1.2", \
+ javax.xml.stream.util;version="1.2", \
  javax.xml.transform, \
  javax.xml.transform.dom, \
  javax.xml.transform.sax, \

Copied: geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/jre.properties.cxf (from r1231355, geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/jre.properties)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/jre.properties.cxf?p2=geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/jre.properties.cxf&p1=geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/jre.properties&r1=1231355&r2=1231356&rev=1231356&view=diff
==============================================================================
--- geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/jre.properties (original)
+++ geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/jre.properties.cxf Fri Jan 13 22:27:32 2012
@@ -151,9 +151,9 @@ jre-1.5= \
 #   - javax.transaction* is exported with a mandatory attribute
 jre-1.6= \
  javax.accessibility, \
- javax.activation, \
+# javax.activation, \
  javax.activity, \
- javax.annotation;version="1.1", \
+# javax.annotation;version="1.1", \
  javax.annotation.processing;version="1.1", \
  javax.crypto, \
  javax.crypto.interfaces, \
@@ -165,8 +165,8 @@ jre-1.6= \
  javax.imageio.plugins.jpeg, \
  javax.imageio.spi, \
  javax.imageio.stream, \
- javax.jws, \
- javax.jws.soap, \
+# javax.jws, \
+# javax.jws.soap, \
  javax.lang.model, \
  javax.lang.model.element, \
  javax.lang.model.type, \
@@ -231,12 +231,12 @@ jre-1.6= \
  javax.tools, \
  javax.transaction; javax.transaction.xa; partial=true; mandatory:=partial, \
  javax.xml, \
- javax.xml.bind, \
- javax.xml.bind.annotation, \
- javax.xml.bind.annotation.adapters, \
- javax.xml.bind.attachment, \
- javax.xml.bind.helpers, \
- javax.xml.bind.util, \
+# javax.xml.bind, \
+# javax.xml.bind.annotation, \
+# javax.xml.bind.annotation.adapters, \
+# javax.xml.bind.attachment, \
+# javax.xml.bind.helpers, \
+# javax.xml.bind.util, \
  javax.xml.crypto, \
  javax.xml.crypto.dom, \
  javax.xml.crypto.dsig, \
@@ -246,22 +246,22 @@ jre-1.6= \
  javax.xml.datatype, \
  javax.xml.namespace, \
  javax.xml.parsers, \
- javax.xml.soap, \
- javax.xml.stream, \
- javax.xml.stream.events, \
- javax.xml.stream.util, \
+# javax.xml.soap, \
+# javax.xml.stream, \
+# javax.xml.stream.events, \
+# javax.xml.stream.util, \
  javax.xml.transform, \
  javax.xml.transform.dom, \
  javax.xml.transform.sax, \
  javax.xml.transform.stax, \
  javax.xml.transform.stream, \
  javax.xml.validation, \
- javax.xml.ws, \
- javax.xml.ws.handler, \
- javax.xml.ws.handler.soap, \
- javax.xml.ws.http, \
- javax.xml.ws.soap, \
- javax.xml.ws.spi, \
+# javax.xml.ws, \
+# javax.xml.ws.handler, \
+# javax.xml.ws.handler.soap, \
+# javax.xml.ws.http, \
+# javax.xml.ws.soap, \
+# javax.xml.ws.spi, \
  javax.xml.ws.wsaddressing, \
  javax.xml.xpath, \
  org.ietf.jgss, \
@@ -313,9 +313,9 @@ jre-1.6= \
 #   - javax.transaction* is exported with a mandatory attribute
 jre-1.7= \
  javax.accessibility, \
- javax.activation, \
+# javax.activation, \
  javax.activity, \
- javax.annotation;version="1.1", \
+# javax.annotation;version="1.1", \
  javax.annotation.processing;version="1.1", \
  javax.crypto, \
  javax.crypto.interfaces, \
@@ -327,8 +327,8 @@ jre-1.7= \
  javax.imageio.plugins.jpeg, \
  javax.imageio.spi, \
  javax.imageio.stream, \
- javax.jws, \
- javax.jws.soap, \
+# javax.jws, \
+# javax.jws.soap, \
  javax.lang.model, \
  javax.lang.model.element, \
  javax.lang.model.type, \
@@ -393,12 +393,12 @@ jre-1.7= \
  javax.tools, \
  javax.transaction; javax.transaction.xa; partial=true; mandatory:=partial, \
  javax.xml, \
- javax.xml.bind, \
- javax.xml.bind.annotation, \
- javax.xml.bind.annotation.adapters, \
- javax.xml.bind.attachment, \
- javax.xml.bind.helpers, \
- javax.xml.bind.util, \
+# javax.xml.bind, \
+# javax.xml.bind.annotation, \
+# javax.xml.bind.annotation.adapters, \
+# javax.xml.bind.attachment, \
+# javax.xml.bind.helpers, \
+# javax.xml.bind.util, \
  javax.xml.crypto, \
  javax.xml.crypto.dom, \
  javax.xml.crypto.dsig, \
@@ -408,22 +408,22 @@ jre-1.7= \
  javax.xml.datatype, \
  javax.xml.namespace, \
  javax.xml.parsers, \
- javax.xml.soap, \
- javax.xml.stream, \
- javax.xml.stream.events, \
- javax.xml.stream.util, \
+# javax.xml.soap, \
+# javax.xml.stream, \
+# javax.xml.stream.events, \
+# javax.xml.stream.util, \
  javax.xml.transform, \
  javax.xml.transform.dom, \
  javax.xml.transform.sax, \
  javax.xml.transform.stax, \
  javax.xml.transform.stream, \
  javax.xml.validation, \
- javax.xml.ws, \
- javax.xml.ws.handler, \
- javax.xml.ws.handler.soap, \
- javax.xml.ws.http, \
- javax.xml.ws.soap, \
- javax.xml.ws.spi, \
+# javax.xml.ws, \
+# javax.xml.ws.handler, \
+# javax.xml.ws.handler.soap, \
+# javax.xml.ws.http, \
+# javax.xml.ws.soap, \
+# javax.xml.ws.spi, \
  javax.xml.ws.wsaddressing, \
  javax.xml.xpath, \
  org.ietf.jgss, \

Modified: geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/org.apache.karaf.features.cfg
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/org.apache.karaf.features.cfg?rev=1231356&r1=1231355&r2=1231356&view=diff
==============================================================================
--- geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/org.apache.karaf.features.cfg (original)
+++ geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/org.apache.karaf.features.cfg Fri Jan 13 22:27:32 2012
@@ -1,4 +1,28 @@
-#Features Configuration
-#Wed Jan 11 14:46:54 PST 2012
+################################################################################
+#
+#    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.
+#
+################################################################################
+
+#
+# Comma separated list of features repositories to register by default
+#
+featuresRepositories = mvn:org.apache.karaf.features/standard/3.0.0-SNAPSHOT/xml/features,mvn:org.apache.karaf.features/enterprise/3.0.0-SNAPSHOT/xml/features,mvn:org.apache.geronimo.framework.features/org.apache.geronimo.javaee-specs/3.0-SNAPSHOT/xml/features
+
+#
+# Comma separated list of features to install at startup
+#
 featuresBoot=config,ssh,management
-featuresRepositories=mvn\:org.apache.karaf.features/standard/3.0.0-SNAPSHOT/xml/features,mvn\:org.apache.karaf.features/enterprise/3.0.0-SNAPSHOT/xml/features

Copied: geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/org.apache.karaf.features.obr.cfg (from r1231355, geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/custom.properties)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/org.apache.karaf.features.obr.cfg?p2=geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/org.apache.karaf.features.obr.cfg&p1=geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/custom.properties&r1=1231355&r2=1231356&rev=1231356&view=diff
==============================================================================
--- geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/custom.properties (original)
+++ geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/org.apache.karaf.features.obr.cfg Fri Jan 13 22:27:32 2012
@@ -18,13 +18,11 @@
 ################################################################################
 
 #
-# All the values specified here will override the default values given
-# in config.properties.
+# This configuration file is used to configure the default values for features OBR resolver
 #
 
-karaf.systemBundlesStartLevel=50
-
 #
-# You can place any customized configuration here.
+# Defines whether or not the features OBR resolver has to resolve optional imports as well.  The default value is
+# false (do not attempt to resolve optional imports).
 #
-
+resolveOptionalImports = false
\ No newline at end of file

Copied: geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/org.apache.karaf.jaas.cfg (from r1231355, geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/org.apache.karaf.shell.cfg)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/org.apache.karaf.jaas.cfg?p2=geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/org.apache.karaf.jaas.cfg&p1=geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/org.apache.karaf.shell.cfg&r1=1231355&r2=1231356&rev=1231356&view=diff
==============================================================================
--- geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/org.apache.karaf.shell.cfg (original)
+++ geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/org.apache.karaf.jaas.cfg Fri Jan 13 22:27:32 2012
@@ -18,7 +18,44 @@
 ################################################################################
 
 #
-sshPort=8102
-sshHost=0.0.0.0
-sshRealm=karaf
-hostKey=${karaf.base}/etc/host.key
+# Boolean enabling / disabling encrypted passwords
+#
+encryption.enabled = false
+
+#
+# Encryption Service name
+#   the default one is 'basic'
+#   a more powerful one named 'jasypt' is available
+#       when installing the encryption feature
+#
+encryption.name =
+
+#
+# Encryption prefix
+#
+encryption.prefix = {CRYPT}
+
+#
+# Encryption suffix
+#
+encryption.suffix = {CRYPT}
+
+#
+# Set the encryption algorithm to use in Karaf JAAS login module
+# Supported encryption algorithms follow:
+#   MD2
+#   MD5
+#   SHA-1
+#   SHA-256
+#   SHA-384
+#   SHA-512
+#
+encryption.algorithm = MD5
+
+#
+# Encoding of the encrypted password.
+# Can be:
+#   hexadecimal
+#   base64
+#
+encryption.encoding = hexadecimal

Modified: geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/org.apache.karaf.management.cfg
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/org.apache.karaf.management.cfg?rev=1231356&r1=1231355&r2=1231356&view=diff
==============================================================================
--- geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/org.apache.karaf.management.cfg (original)
+++ geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/org.apache.karaf.management.cfg Fri Jan 13 22:27:32 2012
@@ -18,10 +18,46 @@
 ################################################################################
 
 #
-rmiRegistryPort = 1100
-rmiServerPort = 44445
+# The properties in this file define the configuration of Apache Karaf's JMX Management
+#
+
+#
+# Port of the registry for the exported RMI service
+#
+rmiRegistryPort = 1099
+
+#
+# Port of the registry for the exported RMI service
+#
+rmiServerPort = 44444
+
+#
+# Name of the JAAS realm used for authentication
+#
 jmxRealm = karaf
+
+#
+# The service URL for the JMXConnectorServer
+#
 serviceUrl = service:jmx:rmi://localhost:${rmiServerPort}/jndi/rmi://localhost:${rmiRegistryPort}/karaf-${karaf.name}
+
+#
+# Whether any threads started for the JMXConnectorServer should be started as daemon threads
+#
 daemon = true
+
+#
+# Whether the JMXConnectorServer should be started in a separate thread
+#
 threaded = true
+
+#
+# The ObjectName used to register the JMXConnectorServer
+#
 objectName = connector:name=rmi
+
+#
+# Role name used for JMX access authorization
+# If not set, this defaults to the ${karaf.admin.role} configured in etc/system.properties
+#
+# jmxRole=admin

Modified: geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/org.apache.karaf.shell.cfg
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/org.apache.karaf.shell.cfg?rev=1231356&r1=1231355&r2=1231356&view=diff
==============================================================================
--- geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/org.apache.karaf.shell.cfg (original)
+++ geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/org.apache.karaf.shell.cfg Fri Jan 13 22:27:32 2012
@@ -18,7 +18,28 @@
 ################################################################################
 
 #
-sshPort=8102
+# These properties are used to configure Karaf's ssh shell.
+#
+
+#
+# Via sshPort and sshHost you define the address you can login into Karaf.
+#
+sshPort=8101
 sshHost=0.0.0.0
+
+#
+# sshRealm defines which JAAS domain to use for password authentication.
+#
 sshRealm=karaf
+
+#
+# The location of the hostKey file defines where the private/public key of the server
+# is located. If no file is at the defined location it will be ignored.
+#
 hostKey=${karaf.base}/etc/host.key
+
+#
+# Role name used for SSH access authorization
+# If not set, this defaults to the ${karaf.admin.role} configured in etc/system.properties
+#
+# sshRole=admin

Modified: geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/org.ops4j.pax.logging.cfg
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/org.ops4j.pax.logging.cfg?rev=1231356&r1=1231355&r2=1231356&view=diff
==============================================================================
--- geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/org.ops4j.pax.logging.cfg (original)
+++ geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/org.ops4j.pax.logging.cfg Fri Jan 13 22:27:32 2012
@@ -32,8 +32,8 @@ log4j.appender.out.layout=org.apache.log
 log4j.appender.out.layout.ConversionPattern=%d{ISO8601} | %-5.5p | %-16.16t | %-32.32c{1} | %-32.32C %4L | %X{bundle.id} - %X{bundle.name} - %X{bundle.version} | %m%n
 log4j.appender.out.file=${karaf.data}/log/karaf.log
 log4j.appender.out.append=true
-log4j.appender.out.maxFileSize=1MB
-log4j.appender.out.maxBackupIndex=10
+log4j.appender.out.maxFileSize=10MB
+log4j.appender.out.maxBackupIndex=3
 
 # Sift appender
 log4j.appender.sift=org.apache.log4j.sift.MDCSiftingAppender
@@ -45,3 +45,123 @@ log4j.appender.sift.appender.layout.Conv
 log4j.appender.sift.appender.file=${karaf.data}/log/$\\{bundle.name\\}.log
 log4j.appender.sift.appender.append=true
 
+
+#
+# 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
+
+# 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
+

Modified: geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/org.ops4j.pax.url.mvn.cfg
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/org.ops4j.pax.url.mvn.cfg?rev=1231356&r1=1231355&r2=1231356&view=diff
==============================================================================
--- geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/org.ops4j.pax.url.mvn.cfg (original)
+++ geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/org.ops4j.pax.url.mvn.cfg Fri Jan 13 22:27:32 2012
@@ -19,12 +19,12 @@
 
 #
 # If set to true, the following property will not allow any certificate to be used
-# when accessing maven repositories through SSL
+# when accessing Maven repositories through SSL
 #
 #org.ops4j.pax.url.mvn.certificateCheck=
 
 #
-# Path to the local maven settings file.
+# Path to the local Maven settings file.
 # The repositories defined in this file will be automatically added to the list
 # of default repositories if the 'org.ops4j.pax.url.mvn.repositories' property
 # below is not set.
@@ -37,7 +37,7 @@
 #org.ops4j.pax.url.mvn.settings=
 
 #
-# Path to the local maven repository which is used to avoid downloading
+# Path to the local Maven repository which is used to avoid downloading
 # artifacts when they already exist locally.
 # The value of this property will be extracted from the settings.xml file
 # above, or defaulted to:
@@ -46,22 +46,42 @@
 #org.ops4j.pax.url.mvn.localRepository=
 
 #
+# Default this to false. It's just weird to use undocumented repos
+#
+org.ops4j.pax.url.mvn.useFallbackRepositories=false
+
+#
+# Uncomment if you are behind a web proxy. PAX URL will use the proxy settings
+# from the Maven conf/settings.xml file
+#
+# org.ops4j.pax.url.mvn.proxySupport=true
+
+#
+# Disable aether support by default.  This ensure that the defaultRepositories
+# below will be used
+#
+#org.ops4j.pax.url.mvn.disableAether=true
+
+#
 # Comma separated list of repositories scanned when resolving an artifact.
 # Those repositories will be checked before iterating through the
-     below list of repositories and even before the local repository
+#    below list of repositories and even before the local repository
 # A repository url can be appended with zero or more of the following flags:
 #    @snapshots  : the repository contains snaphots
 #    @noreleases : the repository does not contain any released artifacts
 #
 # The following property value will add the system folder as a repo.
 #
-org.ops4j.pax.url.mvn.defaultRepositories=file:${karaf.home}/${karaf.default.repository}@snapshots, \
-    file:${karaf.base}/${karaf.default.repository}@snapshots
+org.ops4j.pax.url.mvn.localRepository=file:${karaf.home}/${karaf.default.repository}@snapshots
+
+# Use the default local repo (e.g.~/.m2/repository) as a "remote" repo
+org.ops4j.pax.url.mvn.defaultLocalRepoAsRemote=true
 
 #
 # Comma separated list of repositories scanned when resolving an artifact.
 # The default list includes the following repositories:
 #    http://repo1.maven.org/maven2
+#    http://repository.apache.org/content/groups/snapshots-group
 #    http://svn.apache.org/repos/asf/servicemix/m2-repo
 #    http://repository.springsource.com/maven/bundles/release
 #    http://repository.springsource.com/maven/bundles/external
@@ -70,11 +90,9 @@ org.ops4j.pax.url.mvn.defaultRepositorie
 # A repository url can be appended with zero or more of the following flags:
 #    @snapshots  : the repository contains snaphots
 #    @noreleases : the repository does not contain any released artifacts
+#    @id=reponid : the id for the repository, just like in the settings.xml this is optional but recomendet 
 #
-# The following property value will add the system folder as a repo.
-#
-org.ops4j.pax.url.mvn.repositories= \
-    http://repo1.maven.org/maven2, \
-    http://svn.apache.org/repos/asf/servicemix/m2-repo, \
-    http://repository.springsource.com/maven/bundles/release, \
-    http://repository.springsource.com/maven/bundles/external
+org.ops4j.pax.url.mvn.repositories= +\
+    http://repo1.maven.org/maven2@id=central, \
+    http://repository.apache.org/content/groups/snapshots-group@id=apache@snapshots@noreleases
+

Added: geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/regions-config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/regions-config.xml?rev=1231356&view=auto
==============================================================================
--- geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/regions-config.xml (added)
+++ geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/regions-config.xml Fri Jan 13 22:27:32 2012
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+      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.
+-->
+<regions xmlns="http://karaf.apache.org/xmlns/region/v1.0.0">
+    <region name="org.apache.karaf.region.application"></region>
+
+    <filter to="org.eclipse.equinox.region.kernel" from="org.apache.karaf.region.application">
+        <package name="org.slf4j"/>
+        <package name="org.apache.aries.util"/>
+        <package name="org.apache.aries.util.io"/>
+        <package name="org.apache.aries.util.nls"/>
+        <package name="org.apache.aries.util.tracker"/>
+        <package name="org.apache.aries.util.service.registry"/>
+        <package name="org.apache.aries.proxy.weaving"/>
+        <package name="org.apache.aries.proxy"/>
+        <package name="org.apache.aries.blueprint"/>
+        <package name="org.apache.aries.blueprint.mutable"/>
+        <package name="org.osgi.service.blueprint"/>
+        <package name="org.osgi.service.blueprint.container"/>
+        <package name="org.osgi.service.blueprint.reflect"/>
+    </filter>
+</regions>
\ No newline at end of file

Propchange: geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/regions-config.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/regions-config.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/regions-config.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/shell.init.script
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/shell.init.script?rev=1231356&view=auto
==============================================================================
--- geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/shell.init.script (added)
+++ geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/shell.init.script Fri Jan 13 22:27:32 2012
@@ -0,0 +1,26 @@
+//
+// 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.
+//
+// This script is run each time a shell is created.
+// You can define here closures or variables that will be available
+// in each session.
+//
+ld = { log:display $args } ;
+lde = { log:display-exception $args } ;
+la = { bundle:list -t 0 $args } ;
+cl = { config:list "(service.pid=$args)" } ;
\ No newline at end of file

Modified: geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/startup.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/startup.properties?rev=1231356&r1=1231355&r2=1231356&view=diff
==============================================================================
--- geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/startup.properties (original)
+++ geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/startup.properties Fri Jan 13 22:27:32 2012
@@ -89,7 +89,6 @@ mvn\:org.apache.karaf.jaas/org.apache.ka
 mvn\:org.apache.geronimo.framework/geronimo-pax-logging/3.0-SNAPSHOT = 8
 mvn\:org.apache.felix/org.apache.felix.prefs/1.0.4 = 50
 mvn\:org.apache.geronimo.specs/geronimo-servlet_3.0_spec/1.0 = 40
-mvn\:org.apache.geronimo.framework/geronimo-main/3.0-SNAPSHOT = 50
 mvn\:org.apache.geronimo.framework/geronimo-cli/3.0-SNAPSHOT = 50
 mvn\:commons-cli/commons-cli/1.2 = 50
 mvn\:org.apache.geronimo.framework/geronimo-shell-base/3.0-SNAPSHOT = 50

Modified: geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/system.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/system.properties?rev=1231356&r1=1231355&r2=1231356&view=diff
==============================================================================
--- geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/system.properties (original)
+++ geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/system.properties Fri Jan 13 22:27:32 2012
@@ -31,13 +31,13 @@
 org.ops4j.pax.logging.DefaultServiceLog.level=ERROR
 
 #
-# Name of this karaf instance.
+# Name of this Karaf instance.
 #
-karaf.name=client
+karaf.name=root
 
 #
 # Default repository where bundles will be loaded from before using
-# other maven repositories.  For the full maven configuration, see
+# other Maven repositories.  For the full Maven configuration, see
 # the org.ops4j.pax.url.mvn.cfg file.
 #
 karaf.default.repository=system
@@ -50,12 +50,30 @@ karaf.default.repository=system
 karaf.shell.init.script=${karaf.home}/etc/shell.init.script
 
 #
+# Default role name used for console authorization (JMX, SSH and WEB)
+# The syntax is the following:
+#   [classname:]principal
+# where classname is the class name of the principal object
+# (defaults to org.apache.karaf.jaas.modules.RolePrincipal)
+# and principal is the name of the principal of that class
+# (defaults to admin).
+#
+# Note that this value can be overriden using the various ConfigAdmin
+# configurations for JMX, SSH or the WebConsole.
+#
+karaf.admin.role=admin
+
+#
 # Set this empty property to avoid errors when validating xml documents.
 #
 xml.catalog.files=
 
 #
-# Suppress the bell in the console when hitting backspace to many times
+# Suppress the bell in the console when hitting backspace too many times
 # for example
 #
 jline.nobell=true
+
+# Workaround for KARAF-1117: Jetty will use a JUL logger.
+org.eclipse.jetty.util.log.class=org.eclipse.jetty.util.log.JavaUtilLog
+

Added: geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/var/config/artifact_aliases.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/var/config/artifact_aliases.properties?rev=1231356&view=auto
==============================================================================
--- geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/var/config/artifact_aliases.properties (added)
+++ geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/var/config/artifact_aliases.properties Fri Jan 13 22:27:32 2012
@@ -0,0 +1,85 @@
+##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-jta11/1.2/car
+#versions can be ommitted on the left side but not the right.
+#This can also specify explicit versions in the same format.
+#Thu Jan 12 00:30:24 PST 2012
+org.apache.geronimo.configs/openejb-client//car=org.apache.geronimo.configs/openejb-client/3.0-SNAPSHOT/car
+org.apache.geronimo.configs/jasper//car=org.apache.geronimo.configs/jasper/3.0-SNAPSHOT/car
+org.apache.geronimo.configs/sharedlib//car=org.apache.geronimo.configs/sharedlib/3.0-SNAPSHOT/car
+org.apache.geronimo.framework/offline-deployer//car=org.apache.geronimo.framework/offline-deployer/3.0-SNAPSHOT/car
+org.apache.geronimo.configs/myfaces//car=org.apache.geronimo.configs/myfaces/3.0-SNAPSHOT/car
+org.apache.geronimo.configs/bval-deployer//car=org.apache.geronimo.configs/bval-deployer/3.0-SNAPSHOT/car
+org.apache.geronimo.plugins/openejb-console-tomcat//car=org.apache.geronimo.plugins/openejb-console-tomcat/3.0-SNAPSHOT/car
+org.apache.geronimo.configs/activemq-broker-blueprint//car=org.apache.geronimo.configs/activemq-broker-blueprint/3.0-SNAPSHOT/car
+org.apache.geronimo.configs/aries//car=org.apache.geronimo.configs/aries/3.0-SNAPSHOT/car
+org.apache.geronimo.framework/rmi-naming//car=org.apache.geronimo.framework/rmi-naming/3.0-SNAPSHOT/car
+org.apache.geronimo.plugins.monitoring/agent-car-ejb//car=org.apache.geronimo.plugins.monitoring/agent-car-ejb/3.0-SNAPSHOT/car
+org.apache.geronimo.configs/openejb-deployer//car=org.apache.geronimo.configs/openejb-deployer/3.0-SNAPSHOT/car
+org.apache.geronimo.configs/jaxws-sun-tools//car=org.apache.geronimo.configs/jaxws-sun-tools/3.0-SNAPSHOT/car
+org.apache.geronimo.configs/j2ee-corba-yoko//car=org.apache.geronimo.configs/j2ee-corba-yoko/3.0-SNAPSHOT/car
+org.apache.geronimo.configs/openjpa//car=org.apache.geronimo.configs/openjpa2/3.0-SNAPSHOT/car
+org.apache.geronimo.configs/transaction-1_6//car=org.apache.geronimo.configs/transaction-1_6/3.0-SNAPSHOT/car
+org.apache.geronimo.configs/myfaces-deployer//car=org.apache.geronimo.configs/myfaces-deployer/3.0-SNAPSHOT/car
+org.apache.geronimo.configs/openejb-corba-deployer//car=org.apache.geronimo.configs/openejb-corba-deployer/3.0-SNAPSHOT/car
+org.apache.geronimo.configs/javamail//car=org.apache.geronimo.configs/javamail/3.0-SNAPSHOT/car
+org.apache.geronimo.configs/jasper-deployer//car=org.apache.geronimo.configs/jasper-deployer/3.0-SNAPSHOT/car
+org.apache.geronimo.configs/jsr88-ear-configurer//car=org.apache.geronimo.configs/jsr88-ear-configurer/3.0-SNAPSHOT/car
+org.apache.geronimo.configs/connector-deployer-1_6//car=org.apache.geronimo.configs/connector-deployer-1_6/3.0-SNAPSHOT/car
+org.apache.geronimo.framework/server-security-config//car=org.apache.geronimo.framework/server-security-config/3.0-SNAPSHOT/car
+org.apache.geronimo.configs/web-extender//car=org.apache.geronimo.configs/web-extender/3.0-SNAPSHOT/car
+org.apache.geronimo.configs/axis2//car=org.apache.geronimo.configs/axis2/3.0-SNAPSHOT/car
+org.apache.geronimo.plugins/openjpa//car=org.apache.geronimo.plugins/openjpa2/3.0-SNAPSHOT/car
+org.apache.geronimo.framework/bundle-recorder//car=org.apache.geronimo.framework/bundle-recorder/3.0-SNAPSHOT/car
+org.apache.geronimo.configs/mejb//car=org.apache.geronimo.configs/mejb/3.0-SNAPSHOT/car
+org.apache.geronimo.configs/jaxws-deployer//car=org.apache.geronimo.configs/jaxws-deployer/3.0-SNAPSHOT/car
+org.apache.geronimo.plugins.monitoring/agent-ds//car=org.apache.geronimo.plugins.monitoring/agent-ds/3.0-SNAPSHOT/car
+org.apache.geronimo.configs/welcome-tomcat//car=org.apache.geronimo.configs/welcome-tomcat/3.0-SNAPSHOT/car
+org.apache.geronimo.plugins.monitoring/agent-car-jmx//car=org.apache.geronimo.plugins.monitoring/agent-car-jmx/3.0-SNAPSHOT/car
+org.apache.geronimo.plugins.monitoring/mconsole-ds//car=org.apache.geronimo.plugins.monitoring/mconsole-ds/3.0-SNAPSHOT/car
+org.apache.geronimo.configs/axis//car=org.apache.geronimo.configs/axis/3.0-SNAPSHOT/car
+org.apache.geronimo.plugins.monitoring/openjpa//car=org.apache.geronimo.plugins.monitoring/openjpa2/3.0-SNAPSHOT/car
+org.apache.geronimo.framework/plugin//car=org.apache.geronimo.framework/plugin/3.0-SNAPSHOT/car
+org.apache.geronimo.plugins/activemq-console-tomcat//car=org.apache.geronimo.plugins/activemq-console-tomcat/3.0-SNAPSHOT/car
+org.apache.geronimo.configs/tomcat7//car=org.apache.geronimo.configs/tomcat7/3.0-SNAPSHOT/car
+org.apache.geronimo.configs/j2ee-server//car=org.apache.geronimo.configs/j2ee-server/3.0-SNAPSHOT/car
+org.apache.geronimo.framework/j2ee-security//car=org.apache.geronimo.framework/j2ee-security/3.0-SNAPSHOT/car
+org.apache.geronimo.framework/jmx-security//car=org.apache.geronimo.framework/jmx-security/3.0-SNAPSHOT/car
+org.apache.geronimo.framework/j2ee-system//car=org.apache.geronimo.framework/j2ee-system/3.0-SNAPSHOT/car
+org.apache.geronimo.configs/aries-deployer//car=org.apache.geronimo.configs/aries-deployer/3.0-SNAPSHOT/car
+org.apache.geronimo.configs/jsr88-war-configurer//car=org.apache.geronimo.configs/jsr88-war-configurer/3.0-SNAPSHOT/car
+org.apache.geronimo.configs/db-connectors//car=org.apache.geronimo.configs/db-connectors/3.0-SNAPSHOT/car
+org.apache.geronimo.configs/openwebbeans-deployer//car=org.apache.geronimo.configs/openwebbeans-deployer/3.0-SNAPSHOT/car
+org.apache.geronimo.configs/uddi-tomcat//car=org.apache.geronimo.configs/uddi-tomcat/3.0-SNAPSHOT/car
+org.apache.geronimo.configs/hot-deployer//car=org.apache.geronimo.configs/hot-deployer/3.0-SNAPSHOT/car
+org.apache.geronimo.configs/wink//car=org.apache.geronimo.configs/wink/3.0-SNAPSHOT/car
+org.apache.geronimo.configs/system-database//car=org.apache.geronimo.configs/system-database/3.0-SNAPSHOT/car
+org.apache.geronimo.configs/persistence-jpa20-deployer//car=org.apache.geronimo.configs/persistence-jpa20-deployer/3.0-SNAPSHOT/car
+org.apache.geronimo.configs/wink-deployer//car=org.apache.geronimo.configs/wink-deployer/3.0-SNAPSHOT/car
+org.apache.geronimo.plugins/pluto-support//car=org.apache.geronimo.plugins/pluto-support/3.0-SNAPSHOT/car
+org.apache.geronimo.plugins/plancreator-console-tomcat//car=org.apache.geronimo.plugins/plancreator-console-tomcat/3.0-SNAPSHOT/car
+org.apache.geronimo.framework/online-deployer//car=org.apache.geronimo.framework/online-deployer/3.0-SNAPSHOT/car
+org.apache.geronimo.configs/remote-deploy-tomcat//car=org.apache.geronimo.configs/remote-deploy-tomcat/3.0-SNAPSHOT/car
+org.apache.geronimo.configs/j2ee-deployer//car=org.apache.geronimo.configs/j2ee-deployer/3.0-SNAPSHOT/car
+org.apache.geronimo.configs/activemq-ra//car=org.apache.geronimo.configs/activemq-ra/3.0-SNAPSHOT/car
+org.apache.geronimo.plugins/sysdb-console-tomcat//car=org.apache.geronimo.plugins/sysdb-console-tomcat/3.0-SNAPSHOT/car
+org.apache.geronimo.configs/openwebbeans//car=org.apache.geronimo.configs/openwebbeans/3.0-SNAPSHOT/car
+org.apache.geronimo.plugins/debugviews-console-tomcat//car=org.apache.geronimo.plugins/debugviews-console-tomcat/3.0-SNAPSHOT/car
+org.apache.geronimo.configs/axis-deployer//car=org.apache.geronimo.configs/axis-deployer/3.0-SNAPSHOT/car
+org.apache.geronimo.plugins/console-tomcat//car=org.apache.geronimo.plugins/console-tomcat/3.0-SNAPSHOT/car
+org.apache.geronimo.plugins/persistence-jpa10-deployer//car=org.apache.geronimo.plugins/persistence-jpa20-deployer/3.0-SNAPSHOT/car
+org.apache.geronimo.configs/axis2-ejb-deployer//car=org.apache.geronimo.configs/axis2-ejb-deployer/3.0-SNAPSHOT/car
+org.apache.geronimo.plugins/uddi-db//car=org.apache.geronimo.plugins/uddi-db/3.0-SNAPSHOT/car
+org.apache.geronimo.framework/jsr88-cli//car=org.apache.geronimo.framework/jsr88-cli/3.0-SNAPSHOT/car
+org.apache.geronimo.configs/persistence-jpa10-deployer//car=org.apache.geronimo.configs/persistence-jpa20-deployer/3.0-SNAPSHOT/car
+org.apache.geronimo.configs/tomcat7-deployer//car=org.apache.geronimo.configs/tomcat7-deployer/3.0-SNAPSHOT/car
+org.apache.geronimo.configs/webservices-common//car=org.apache.geronimo.configs/webservices-common/3.0-SNAPSHOT/car
+org.apache.geronimo.configs/axis2-ejb//car=org.apache.geronimo.configs/axis2-ejb/3.0-SNAPSHOT/car
+org.apache.geronimo.plugins.monitoring/mconsole-tomcat//car=org.apache.geronimo.plugins.monitoring/mconsole-tomcat/3.0-SNAPSHOT/car
+org.apache.geronimo.configs/jaxws-tools//car=org.apache.geronimo.configs/jaxws-tools/3.0-SNAPSHOT/car
+org.apache.geronimo.plugins/plugin-console-tomcat//car=org.apache.geronimo.plugins/plugin-console-tomcat/3.0-SNAPSHOT/car
+org.apache.geronimo.configs/jaxws-ejb-deployer//car=org.apache.geronimo.configs/jaxws-ejb-deployer/3.0-SNAPSHOT/car
+org.apache.geronimo.configs/openejb//car=org.apache.geronimo.configs/openejb/3.0-SNAPSHOT/car
+org.apache.geronimo.configs/axis2-deployer//car=org.apache.geronimo.configs/axis2-deployer/3.0-SNAPSHOT/car
+org.apache.geronimo.plugins.monitoring/persistence-jpa10-deployer//car=org.apache.geronimo.plugins.monitoring/persistence-jpa20-deployer/3.0-SNAPSHOT/car
+org.apache.geronimo.configs/openjpa2//car=org.apache.geronimo.configs/openjpa2/3.0-SNAPSHOT/car

Propchange: geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/var/config/artifact_aliases.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/var/config/artifact_aliases.properties
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/var/config/artifact_aliases.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/var/config/client_artifact_aliases.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/var/config/client_artifact_aliases.properties?rev=1231356&view=auto
==============================================================================
--- geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/var/config/client_artifact_aliases.properties (added)
+++ geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/var/config/client_artifact_aliases.properties Fri Jan 13 22:27:32 2012
@@ -0,0 +1,14 @@
+##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-jta11/1.2/car
+#versions can be ommitted on the left side but not the right.
+#This can also specify explicit versions in the same format.
+#Thu Jan 12 00:30:21 PST 2012
+org.apache.geronimo.framework/j2ee-security//car=org.apache.geronimo.configs/client-security/3.0-SNAPSHOT/car
+org.apache.geronimo.configs/transaction-1_6//car=org.apache.geronimo.configs/client-transaction-1_6/3.0-SNAPSHOT/car
+org.apache.geronimo.configs/transaction-1_6/3.0-SNAPSHOT/car=org.apache.geronimo.configs/client-transaction-1_6/3.0-SNAPSHOT/car
+org.apache.geronimo.configs/j2ee-server//car=org.apache.geronimo.configs/client/3.0-SNAPSHOT/car
+org.apache.geronimo.framework/j2ee-security/3.0-SNAPSHOT/car=org.apache.geronimo.configs/client-security/3.0-SNAPSHOT/car
+org.apache.geronimo.configs/client-deployer//car=org.apache.geronimo.configs/client-deployer/3.0-SNAPSHOT/car
+org.apache.geronimo.configs/j2ee-server/3.0-SNAPSHOT/car=org.apache.geronimo.configs/client/3.0-SNAPSHOT/car
+org.apache.geronimo.configs/client-corba-yoko//car=org.apache.geronimo.configs/client-corba-yoko/3.0-SNAPSHOT/car

Propchange: geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/var/config/client_artifact_aliases.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/var/config/client_artifact_aliases.properties
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/var/config/client_artifact_aliases.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/var/config/config-substitutions.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/var/config/config-substitutions.properties?rev=1231356&view=auto
==============================================================================
--- geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/var/config/config-substitutions.properties (added)
+++ geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/var/config/config-substitutions.properties Fri Jan 13 22:27:32 2012
@@ -0,0 +1,49 @@
+# 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 
+MaxThreadPoolSize = 500
+MinThreadPoolSize = 200
+NamingPort = 1099
+ServerHostname = 0.0.0.0
+PortOffset = 0
+JMXPort = 9999
+ResourceBindingsFormat = {groupId}/{artifactId}/{j2eeType}/{name}
+TmId = 71,84,77,73,68
+ResourceBindingsQuery = ?#org.apache.geronimo.naming.ResourceSource
+ResourceBindingsNameInNamespace = jca:
+ResourceBindingsNamePattern = 
+HTTPPort = 8080
+WebConnectorConTimeout = 20000
+AJPPort = 8009
+webcontainer = TomcatWebContainer
+HTTPSPort = 8443
+webcontainerName = tomcat7
+DerbyPort = 1527
+MulticastEnabled = false
+ClusterName = cluster1
+MulticastDiscoveryAddress = 239.255.3.2
+OpenEJBPort = 4201
+MultipointPort = 4212
+MulticastDiscoveryPort = 6142
+MultipointServers = 
+MultipointHost = 0.0.0.0
+MultipointEnabled = false
+activemq.data = var/activemq
+activemq.brokerName = DefaultActiveMQBroker
+ActiveMQPort = 61616
+ActiveMQHostname = 0.0.0.0
+ORBPort = 6882
+COSNamingPort = 1050
+ORBSSLPort = 2001
+trustStorePassword = {Simple}rO0ABXNyABlqYXZheC5jcnlwdG8uU2VhbGVkT2JqZWN0PjY9psO3VHACAARbAA1lbmNvZGVkUGFyYW1zdAACW0JbABBlbmNyeXB0ZWRDb250ZW50cQB+AAFMAAlwYXJhbXNBbGd0ABJMamF2YS9sYW5nL1N0cmluZztMAAdzZWFsQWxncQB+AAJ4cHB1cgACW0Ks8xf4BghU4AIAAHhwAAAAEArVToThqcjvbXFD5C2uUmpwdAADQUVT
+geronimo = {Simple}rO0ABXNyABlqYXZheC5jcnlwdG8uU2VhbGVkT2JqZWN0PjY9psO3VHACAARbAA1lbmNvZGVkUGFyYW1zdAACW0JbABBlbmNyeXB0ZWRDb250ZW50cQB+AAFMAAlwYXJhbXNBbGd0ABJMamF2YS9sYW5nL1N0cmluZztMAAdzZWFsQWxncQB+AAJ4cHB1cgACW0Ks8xf4BghU4AIAAHhwAAAAEArVToThqcjvbXFD5C2uUmpwdAADQUVT
+geronimo-default = {Simple}rO0ABXNyABlqYXZheC5jcnlwdG8uU2VhbGVkT2JqZWN0PjY9psO3VHACAARbAA1lbmNvZGVkUGFyYW1zdAACW0JbABBlbmNyeXB0ZWRDb250ZW50cQB+AAFMAAlwYXJhbXNBbGd0ABJMamF2YS9sYW5nL1N0cmluZztMAAdzZWFsQWxncQB+AAJ4cHB1cgACW0Ks8xf4BghU4AIAAHhwAAAAEArVToThqcjvbXFD5C2uUmpwdAADQUVT
+JMXSecurePort = 9998
+keyStorePassword = {Simple}rO0ABXNyABlqYXZheC5jcnlwdG8uU2VhbGVkT2JqZWN0PjY9psO3VHACAARbAA1lbmNvZGVkUGFyYW1zdAACW0JbABBlbmNyeXB0ZWRDb250ZW50cQB+AAFMAAlwYXJhbXNBbGd0ABJMamF2YS9sYW5nL1N0cmluZztMAAdzZWFsQWxncQB+AAJ4cHB1cgACW0Ks8xf4BghU4AIAAHhwAAAAEArVToThqcjvbXFD5C2uUmpwdAADQUVT
+SMTPPort = 25
+SMTPHost = localhost

Propchange: geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/var/config/config-substitutions.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/var/config/config-substitutions.properties
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/var/config/config-substitutions.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/var/config/config.xml?rev=1231356&view=auto
==============================================================================
--- geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/var/config/config.xml (added)
+++ geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/var/config/config.xml Fri Jan 13 22:27:32 2012
@@ -0,0 +1,254 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<attributes xmlns:ns2="http://geronimo.apache.org/xml/ns/plugins-1.3" xmlns="http://geronimo.apache.org/xml/ns/attributes-1.2">
+    <comment>
+==================================================================
+
+        THIS NEEDS TO BE EDITED OR REMOVED FOR CLIENT!
+
+Warning - This XML file is regenerated by Geronimo whenever
+changes are made to Geronimo's configuration.
+
+If you want to include comments, create a single comment element
+element.  They are allowable at any level of the configuration.
+
+!!!! Do not edit this file while Geronimo is running !!!!
+==================================================================</comment>
+    <module name="org.apache.geronimo.framework/j2ee-system/3.0-SNAPSHOT/car"/>
+    <module name="org.apache.geronimo.framework/rmi-naming/3.0-SNAPSHOT/car">
+        <gbean name="DefaultThreadPool">
+            <attribute name="keepAliveTime">30000</attribute>
+            <attribute name="minPoolSize">${MinThreadPoolSize}</attribute>
+            <attribute name="maxPoolSize">${MaxThreadPoolSize}</attribute>
+        </gbean>
+    </module>
+    <module name="org.apache.geronimo.framework/plugin/3.0-SNAPSHOT/car">
+        <gbean name="DownloadedPluginRepos">
+            <attribute name="repositoryList">http://geronimo.apache.org/plugins/plugin-repository-list-3.0.txt</attribute>
+        </gbean>
+    </module>
+    <module name="org.apache.geronimo.framework/j2ee-security/3.0-SNAPSHOT/car">
+        <gbean name="JMXService">
+            <attribute name="protocol">rmi</attribute>
+            <attribute name="host">${ServerHostname}</attribute>
+            <attribute name="port">${JMXPort + PortOffset}</attribute>
+            <attribute name="urlPath">/jndi/rmi://${ServerHostname}:${NamingPort + PortOffset}/jmxrmi</attribute>
+        </gbean>
+    </module>
+    <module name="org.apache.geronimo.framework/server-security-config/3.0-SNAPSHOT/car"/>
+    <module name="org.apache.geronimo.framework/bundle-recorder/3.0-SNAPSHOT/car"/>
+    <module name="org.apache.geronimo.configs/j2ee-server/3.0-SNAPSHOT/car"/>
+    <module name="org.apache.geronimo.configs/j2ee-deployer/3.0-SNAPSHOT/car">
+        <gbean name="WebBuilder">
+            <attribute name="defaultNamespace">http://geronimo.apache.org/xml/ns/j2ee/web/jetty-2.0</attribute>
+        </gbean>
+        <gbean name="EnvironmentEntryBuilder">
+            <attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</attribute>
+        </gbean>
+    </module>
+    <module name="org.apache.geronimo.configs/bval-deployer/3.0-SNAPSHOT/car"/>
+    <module name="org.apache.geronimo.configs/transaction-1_6/3.0-SNAPSHOT/car">
+        <gbean name="XidFactory">
+            <attribute name="tmId">${TmId}</attribute>
+        </gbean>
+        <gbean name="ResourceBindings">
+            <attribute name="format">${ResourceBindingsFormat}</attribute>
+            <attribute name="nameInNamespace">${ResourceBindingsNameInNamespace}</attribute>
+            <attribute name="namePattern">${ResourceBindingsNamePattern}</attribute>
+            <attribute name="abstractNameQuery">${ResourceBindingsQuery}</attribute>
+        </gbean>
+    </module>
+    <module name="org.apache.geronimo.configs/jasper/3.0-SNAPSHOT/car"/>
+    <module name="org.apache.geronimo.configs/tomcat7/3.0-SNAPSHOT/car"/>
+    <module name="org.apache.geronimo.configs/tomcat7-deployer/3.0-SNAPSHOT/car"/>
+    <module name="org.apache.geronimo.configs/web-extender/3.0-SNAPSHOT/car"/>
+    <module name="org.apache.geronimo.framework/online-deployer/3.0-SNAPSHOT/car" load="false"/>
+    <module name="org.apache.geronimo.framework/offline-deployer/3.0-SNAPSHOT/car" load="false"/>
+    <module name="org.apache.geronimo.configs/hot-deployer/3.0-SNAPSHOT/car">
+        <gbean name="HotDeployer">
+            <attribute name="path">deploy/</attribute>
+            <attribute name="pollIntervalMillis">2000</attribute>
+        </gbean>
+    </module>
+    <module name="org.apache.geronimo.configs/remote-deploy-tomcat/3.0-SNAPSHOT/car"/>
+    <module name="org.apache.geronimo.configs/jasper-deployer/3.0-SNAPSHOT/car"/>
+    <module name="org.apache.geronimo.configs/myfaces/3.0-SNAPSHOT/car"/>
+    <module name="org.apache.geronimo.configs/myfaces-deployer/3.0-SNAPSHOT/car"/>
+    <module name="org.apache.geronimo.configs/sharedlib/3.0-SNAPSHOT/car"/>
+    <module name="org.apache.geronimo.configs/aries/3.0-SNAPSHOT/car"/>
+    <module name="org.apache.geronimo.configs/aries-deployer/3.0-SNAPSHOT/car"/>
+    <module name="org.apache.geronimo.configs/persistence-jpa20-deployer/3.0-SNAPSHOT/car">
+        <gbean name="PersistenceUnitBuilder">
+            <attribute name="defaultPersistenceProviderClassName">org.apache.openjpa.persistence.PersistenceProviderImpl</attribute>
+            <attribute name="defaultPersistenceUnitProperties">openjpa.Log=commons
+                                        openjpa.jdbc.SynchronizeMappings=buildSchema(ForeignKeys=true)
+                                        openjpa.jdbc.UpdateManager=operation-order
+                                        openjpa.Sequence=table(Table=OPENJPASEQ, Increment=100)</attribute>
+            <attribute propertyEditor="org.apache.geronimo.deployment.service.EnvironmentBuilder" name="defaultEnvironment">
+                <environment:environment xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns:environment="http://geronimo.apache.org/xml/ns/deployment-1.2">
+                    <dependencies>
+                        <dependency>
+                            <groupId>org.apache.geronimo.configs</groupId>
+                            <artifactId>openjpa2</artifactId>
+                            <type>car</type>
+            </dependency>
+          </dependencies>
+        </environment:environment>
+            </attribute>
+        </gbean>
+    </module>
+    <module name="org.apache.geronimo.configs/openjpa2/3.0-SNAPSHOT/car"/>
+    <module name="org.apache.geronimo.configs/system-database/3.0-SNAPSHOT/car">
+        <gbean name="DerbyNetwork">
+            <attribute name="host">${ServerHostname}</attribute>
+            <attribute name="port">${DerbyPort + PortOffset}</attribute>
+        </gbean>
+    </module>
+    <module name="org.apache.geronimo.plugins/pluto-support/3.0-SNAPSHOT/car"/>
+    <module name="org.apache.geronimo.plugins/console-tomcat/3.0-SNAPSHOT/car"/>
+    <module name="org.apache.geronimo.plugins/plugin-console-tomcat/3.0-SNAPSHOT/car"/>
+    <module name="org.apache.geronimo.plugins.monitoring/mconsole-ds/3.0-SNAPSHOT/car"/>
+    <module name="org.apache.geronimo.configs/openejb/3.0-SNAPSHOT/car">
+        <gbean name="EJBNetworkService">
+            <attribute name="port">${OpenEJBPort + PortOffset}</attribute>
+            <attribute name="host">${ServerHostname}</attribute>
+            <attribute name="multicastHost">${MulticastDiscoveryAddress}</attribute>
+            <attribute name="multicastPort">${MulticastDiscoveryPort}</attribute>
+            <attribute name="multipointHost">${MultipointHost}</attribute>
+            <attribute name="multipointPort">${MultipointPort + PortOffset}</attribute>
+            <attribute name="multipointServers">${MultipointServers}</attribute>
+            <attribute name="multipointEnabled">${MultipointEnabled}</attribute>
+            <attribute name="multicastEnabled">${MulticastEnabled}</attribute>
+            <attribute name="clusterName">${ClusterName}</attribute>
+        </gbean>
+        <gbean name="DefaultStatefulContainer">
+            <attribute name="accessTimeout">30</attribute>
+            <attribute name="timeOut">20</attribute>
+            <attribute name="capacity">1000</attribute>
+            <attribute name="bulkPassivate">100</attribute>
+        </gbean>
+        <gbean name="DefaultSingletonContainer">
+            <attribute name="accessTimeout">30</attribute>
+        </gbean>
+        <gbean name="DefaultBMPContainer">
+            <attribute name="poolSize">10</attribute>
+        </gbean>
+        <gbean name="DefaultStatelessContainer">
+            <attribute name="accessTimeout">30</attribute>
+            <attribute name="closeTimeout">5</attribute>
+            <attribute name="maxSize">10</attribute>
+            <attribute name="minSize">0</attribute>
+            <attribute name="strictPooling">true</attribute>
+            <attribute name="idleTimeout">0</attribute>
+        </gbean>
+    </module>
+    <module name="org.apache.geronimo.plugins.monitoring/mconsole-tomcat/3.0-SNAPSHOT/car"/>
+    <module name="org.apache.geronimo.configs/activemq-broker-blueprint/3.0-SNAPSHOT/car"/>
+    <module name="org.apache.geronimo.configs/activemq-ra/3.0-SNAPSHOT/car">
+        <gbean name="ActiveMQ RA">
+            <attribute name="ServerUrl">tcp://${ActiveMQHostname}:${ActiveMQPort + PortOffset}</attribute>
+        </gbean>
+    </module>
+    <module name="org.apache.geronimo.plugins/activemq-console-tomcat/3.0-SNAPSHOT/car"/>
+    <module name="org.apache.geronimo.plugins/debugviews-console-tomcat/3.0-SNAPSHOT/car"/>
+    <module name="org.apache.geronimo.plugins/sysdb-console-tomcat/3.0-SNAPSHOT/car"/>
+    <module name="org.apache.geronimo.plugins/openejb-console-tomcat/3.0-SNAPSHOT/car"/>
+    <module name="org.apache.geronimo.configs/openejb-deployer/3.0-SNAPSHOT/car">
+        <gbean name="EjbRefBuilder">
+            <attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</attribute>
+        </gbean>
+        <gbean name="ClientEjbRefBuilder">
+            <attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</attribute>
+            <attribute name="host">${ServerHostname}</attribute>
+            <attribute name="port">${OpenEJBPort + PortOffset}</attribute>
+        </gbean>
+    </module>
+    <module name="org.apache.geronimo.configs/openejb-corba-deployer/3.0-SNAPSHOT/car"/>
+    <module name="org.apache.geronimo.configs/j2ee-corba-yoko/3.0-SNAPSHOT/car">
+        <gbean name="NameServer">
+            <attribute name="port">${COSNamingPort + PortOffset}</attribute>
+            <attribute name="host">${ServerHostname}</attribute>
+        </gbean>
+        <gbean name="Server">
+            <attribute name="port">${ORBSSLPort + PortOffset}</attribute>
+            <attribute name="host">${ServerHostname}</attribute>
+        </gbean>
+        <gbean name="UnprotectedServer">
+            <attribute name="port">${ORBPort + PortOffset}</attribute>
+            <attribute name="host">${ServerHostname}</attribute>
+        </gbean>
+    </module>
+    <module name="org.apache.geronimo.configs/openwebbeans/3.0-SNAPSHOT/car"/>
+    <module name="org.apache.geronimo.configs/openwebbeans-deployer/3.0-SNAPSHOT/car"/>
+    <module name="org.apache.geronimo.framework/jmx-security/3.0-SNAPSHOT/car" load="false">
+        <gbean name="JMXSecureConnector">
+            <attribute name="protocol">rmi</attribute>
+            <attribute name="host">${ServerHostname}</attribute>
+            <attribute name="port">${JMXSecurePort + PortOffset}</attribute>
+            <attribute name="urlPath">/jndi/rmi://${ServerHostname}:${NamingPort + PortOffset}/JMXSecureConnector</attribute>
+            <attribute name="algorithm">Default</attribute>
+            <attribute name="secureProtocol">TLS</attribute>
+            <attribute name="keyStore">geronimo-default</attribute>
+            <attribute name="keyAlias">geronimo</attribute>
+            <attribute name="trustStore">geronimo-default</attribute>
+            <attribute name="clientAuth">false</attribute>
+        </gbean>
+    </module>
+    <module name="org.apache.geronimo.plugins.monitoring/agent-ds/3.0-SNAPSHOT/car"/>
+    <module name="org.apache.geronimo.configs/mejb/3.0-SNAPSHOT/car"/>
+    <module name="org.apache.geronimo.plugins.monitoring/agent-car-ejb/3.0-SNAPSHOT/car" load="false"/>
+    <module name="org.apache.geronimo.plugins.monitoring/agent-car-jmx/3.0-SNAPSHOT/car"/>
+    <module name="org.apache.geronimo.configs/welcome-tomcat/3.0-SNAPSHOT/car"/>
+    <module name="org.apache.geronimo.configs/javamail/3.0-SNAPSHOT/car">
+        <gbean name="SMTPTransport">
+            <attribute name="host">${SMTPHost}</attribute>
+            <attribute name="port">${SMTPPort}</attribute>
+        </gbean>
+    </module>
+    <module name="org.apache.geronimo.plugins/plancreator-console-tomcat/3.0-SNAPSHOT/car"/>
+    <module name="org.apache.geronimo.configs/client/3.0-SNAPSHOT/car" load="false"/>
+    <module name="org.apache.geronimo.configs/client-security/3.0-SNAPSHOT/car" load="false"/>
+    <module name="org.apache.geronimo.configs/client-corba-yoko/3.0-SNAPSHOT/car" load="false"/>
+    <module name="org.apache.geronimo.configs/client-transaction-1_6/3.0-SNAPSHOT/car" load="false"/>
+    <module name="org.apache.geronimo.configs/client-deployer/3.0-SNAPSHOT/car">
+        <gbean name="AppClientBuilder">
+            <attribute name="host">${ServerHostname}</attribute>
+            <attribute name="port">${OpenEJBPort + PortOffset}</attribute>
+        </gbean>
+    </module>
+    <module name="org.apache.geronimo.configs/openejb-client/3.0-SNAPSHOT/car" load="false"/>
+    <module name="org.apache.geronimo.configs/webservices-common/3.0-SNAPSHOT/car"/>
+    <module name="org.apache.geronimo.configs/axis/3.0-SNAPSHOT/car"/>
+    <module name="org.apache.geronimo.configs/axis-deployer/3.0-SNAPSHOT/car">
+        <gbean name="AxisModuleBuilderExtension">
+            <attribute name="listener">?name=${webcontainer}</attribute>
+            <attribute propertyEditor="org.apache.geronimo.deployment.service.EnvironmentBuilder" name="defaultEnvironment">
+                <environment:environment xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns:environment="http://geronimo.apache.org/xml/ns/deployment-1.2">
+                    <dependencies>
+                        <dependency>
+                            <groupId>org.apache.geronimo.configs</groupId>
+                            <artifactId>${webcontainerName}</artifactId>
+                            <type>car</type>
+            </dependency>
+          </dependencies>
+        </environment:environment>
+            </attribute>
+        </gbean>
+    </module>
+    <module name="org.apache.geronimo.configs/jaxws-deployer/3.0-SNAPSHOT/car"/>
+    <module name="org.apache.geronimo.configs/axis2/3.0-SNAPSHOT/car"/>
+    <module name="org.apache.geronimo.configs/axis2-deployer/3.0-SNAPSHOT/car" condition="props['org.apache.geronimo.jaxws.provider'] == 'axis2' or (props['org.apache.geronimo.jaxws.provider'] == null and webcontainerName == 'tomcat7')"/>
+    <module name="org.apache.geronimo.configs/jaxws-ejb-deployer/3.0-SNAPSHOT/car"/>
+    <module name="org.apache.geronimo.configs/axis2-ejb/3.0-SNAPSHOT/car" load="false"/>
+    <module name="org.apache.geronimo.configs/axis2-ejb-deployer/3.0-SNAPSHOT/car" condition="props['org.apache.geronimo.jaxws.provider'] == 'axis2' or (props['org.apache.geronimo.jaxws.provider'] == null and webcontainerName == 'tomcat7')"/>
+    <module name="org.apache.geronimo.configs/jaxws-sun-tools/3.0-SNAPSHOT/car"/>
+    <module name="org.apache.geronimo.configs/jaxws-tools/3.0-SNAPSHOT/car"/>
+    <module name="org.apache.geronimo.plugins/uddi-db/3.0-SNAPSHOT/car"/>
+    <module name="org.apache.geronimo.configs/uddi-tomcat/3.0-SNAPSHOT/car">
+        <gbean name="DerbyProperties">
+            <attribute name="systemProperties">uddi.openjpa.ConnectionURL=jdbc:derby://localhost:${DerbyPort + PortOffset}/UddiDatabase;create=false;</attribute>
+        </gbean>
+    </module>
+    <module name="org.apache.geronimo.configs/wink/3.0-SNAPSHOT/car"/>
+    <module name="org.apache.geronimo.configs/wink-deployer/3.0-SNAPSHOT/car"/>
+    <module name="org.apache.geronimo.configs/connector-deployer-1_6/3.0-SNAPSHOT/car"/>
+</attributes>

Propchange: geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/var/config/config.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/var/config/config.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/var/config/config.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml



Mime
View raw message