geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r591154 - in /geronimo/server/trunk: assemblies/ assemblies/geronimo-boilerplate-minimal/src/main/underlay/var/config/ assemblies/geronimo-framework/src/main/resources/var/config/ assemblies/geronimo-jetty6-javaee5/src/main/resources/var/co...
Date Thu, 01 Nov 2007 22:07:14 GMT
Author: djencks
Date: Thu Nov  1 15:07:10 2007
New Revision: 591154

URL: http://svn.apache.org/viewvc?rev=591154&view=rev
Log:
GERONIMO-3579  Configure which config.xml and properties files info from the plugin xml goes into

Added:
    geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/NoServerInstanceException.java   (with props)
    geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/ServerInstance.java   (with props)
    geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ServerInstance.java   (with props)
Removed:
    geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/underlay/var/config/artifact_aliases.properties
    geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/underlay/var/config/config-substitutions.properties
    geronimo/server/trunk/assemblies/geronimo-framework/src/main/resources/var/config/jsr88-configurer-config.xml
    geronimo/server/trunk/assemblies/geronimo-framework/src/main/resources/var/config/offline-deployer-config.xml
    geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5/src/main/resources/var/config/client_artifact_aliases.properties
    geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5/src/main/resources/var/config/jsr88-configurer-config.xml
    geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5/src/main/resources/var/config/offline-deployer-config.xml
    geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/src/main/resources/var/config/jsr88-configurer-config.xml
    geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/src/main/resources/var/config/offline-deployer-config.xml
    geronimo/server/trunk/assemblies/geronimo-tomcat6-javaee5/src/main/resources/var/config/client_artifact_aliases.properties
    geronimo/server/trunk/assemblies/geronimo-tomcat6-javaee5/src/main/resources/var/config/jsr88-configurer-config.xml
    geronimo/server/trunk/assemblies/geronimo-tomcat6-javaee5/src/main/resources/var/config/offline-deployer-config.xml
    geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/src/main/resources/var/config/jsr88-configurer-config.xml
    geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/src/main/resources/var/config/offline-deployer-config.xml
Modified:
    geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/underlay/var/config/README.txt
    geronimo/server/trunk/assemblies/pom.xml
    geronimo/server/trunk/framework/configs/client-system/pom.xml
    geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/pom.xml
    geronimo/server/trunk/framework/configs/jsr88-cli/pom.xml
    geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/pom.xml
    geronimo/server/trunk/framework/configs/rmi-naming/src/main/plan/plan.xml
    geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java
    geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/resolver/ExplicitDefaultArtifactResolver.java
    geronimo/server/trunk/framework/modules/geronimo-system/src/main/xsd/plugins-1.3.xsd
    geronimo/server/trunk/framework/modules/geronimo-system/src/test/java/org/apache/geronimo/system/plugin/CopyConfigTest.java
    geronimo/server/trunk/framework/modules/geronimo-system/src/test/java/org/apache/geronimo/system/plugin/PluginInstallerTest.java
    geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/InstallModulesMojo.java
    geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PluginMetadataGeneratorMojo.java
    geronimo/server/trunk/plugins/axis/axis-deployer/pom.xml
    geronimo/server/trunk/plugins/axis2/axis2-deployer/pom.xml
    geronimo/server/trunk/plugins/client/client-deployer/pom.xml
    geronimo/server/trunk/plugins/client/client-security/pom.xml
    geronimo/server/trunk/plugins/client/client/pom.xml
    geronimo/server/trunk/plugins/connector/connector-deployer/pom.xml
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/car/PluginInfoBean.java
    geronimo/server/trunk/plugins/corba/openejb-corba-deployer/pom.xml
    geronimo/server/trunk/plugins/cxf/cxf-deployer/pom.xml
    geronimo/server/trunk/plugins/j2ee/j2ee-deployer/pom.xml
    geronimo/server/trunk/plugins/j2ee/jsr88-ear-configurer/pom.xml
    geronimo/server/trunk/plugins/j2ee/jsr88-jar-configurer/pom.xml
    geronimo/server/trunk/plugins/j2ee/jsr88-rar-configurer/pom.xml
    geronimo/server/trunk/plugins/j2ee/jsr88-war-configurer/pom.xml
    geronimo/server/trunk/plugins/jasper/jasper-deployer/pom.xml
    geronimo/server/trunk/plugins/jetty/jetty6-deployer/pom.xml
    geronimo/server/trunk/plugins/myfaces/myfaces-deployer/pom.xml
    geronimo/server/trunk/plugins/openejb/openejb-deployer/pom.xml
    geronimo/server/trunk/plugins/openjpa/persistence-jpa10-deployer/pom.xml

Modified: geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/underlay/var/config/README.txt
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/underlay/var/config/README.txt?rev=591154&r1=591153&r2=591154&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/underlay/var/config/README.txt (original)
+++ geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/underlay/var/config/README.txt Thu Nov  1 15:07:10 2007
@@ -1,4 +1,24 @@
-When Geronimo is started it will read a configuration XML file from this 
+#  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 
@@ -22,3 +42,24 @@
 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 config.xml
+   Values in this file will be overridden by environment variables and system properties
+hostName=localhost
+httpPort=8080
+httpsPort=8443
+   To run multiple instances of geronimo choose a portOffset such that none of the ports conflict
+   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.
+

Modified: geronimo/server/trunk/assemblies/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/pom.xml?rev=591154&r1=591153&r2=591154&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/pom.xml (original)
+++ geronimo/server/trunk/assemblies/pom.xml Thu Nov  1 15:07:10 2007
@@ -41,9 +41,6 @@
 
     <modules>
         <module>geronimo-boilerplate-minimal</module>
-<!--
-        <module>geronimo-boilerplate-javaee5</module>
--->
         <module>geronimo-framework</module>
         <module>geronimo-jetty6-minimal</module>
         <module>geronimo-jetty6-javaee5</module>
@@ -51,5 +48,46 @@
         <module>geronimo-tomcat6-javaee5</module>
     </modules>
 
+    <build>
+
+        <plugins>
+
+
+            <plugin>
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>car-maven-plugin</artifactId>
+                <configuration>
+                    <servers>
+                        <serverInstance>
+                            <name>default</name>
+                            <configFile>var/config/config.xml</configFile>
+                            <configSubstitutionsFile>var/config/config-substitutions.properties</configSubstitutionsFile>
+                            <configSubstitutionsPrefix>org.apache.geronimo.config.substitution.</configSubstitutionsPrefix>
+                            <artifactAliasesFile>var/config/artifact_aliases.properties</artifactAliasesFile>
+                        </serverInstance>
+                        <serverInstance>
+                            <name>client</name>
+                            <attributeManagerFrom>default</attributeManagerFrom>
+                            <artifactAliasesFile>var/config/client_artifact_aliases.properties</artifactAliasesFile>
+                        </serverInstance>
+                        <serverInstance>
+                            <name>offline</name>
+                            <configFile>var/config/offline-deployer-config.xml</configFile>
+                            <configSubstitutionsFile>var/config/config-substitutions.properties</configSubstitutionsFile>
+                            <configSubstitutionsPrefix>org.apache.geronimo.config.substitution.</configSubstitutionsPrefix>
+                            <artifactAliasesFile>var/config/artifact_aliases.properties</artifactAliasesFile>
+                        </serverInstance>
+                        <serverInstance>
+                            <name>jsr88</name>
+                            <configFile>var/config/jsr88-configurer-config.xml</configFile>
+                            <configSubstitutionsFile>var/config/config-substitutions.properties</configSubstitutionsFile>
+                            <configSubstitutionsPrefix>org.apache.geronimo.config.substitution.</configSubstitutionsPrefix>
+                            <artifactAliasesFile>var/config/artifact_aliases.properties</artifactAliasesFile>
+                        </serverInstance>
+                    </servers>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
 

Modified: geronimo/server/trunk/framework/configs/client-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/client-system/pom.xml?rev=591154&r1=591153&r2=591154&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/client-system/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/client-system/pom.xml Thu Nov  1 15:07:10 2007
@@ -177,6 +177,8 @@
                     <instance>
                         <plugin-artifact>
                             <config-xml-content load="false"/>
+                            <artifact-alias server="client" key="org.apache.geronimo.configs/j2ee-system//car">org.apache.geronimo.configs/client-system/${version}/car</artifact-alias>
+                            <artifact-alias server="client" key="org.apache.geronimo.configs/j2ee-system/${version}/car">org.apache.geronimo.configs/client-system/${version}/car</artifact-alias>
                         </plugin-artifact>
                     </instance>
 

Modified: geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/pom.xml?rev=591154&r1=591153&r2=591154&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/pom.xml Thu Nov  1 15:07:10 2007
@@ -112,6 +112,7 @@
                                     <attribute name="remoteDeployAddress">http://#{RemoteDeployHostname}:#{HTTPPortPrimary + PortOffset}</attribute>
                                 </gbean>
                             </config-xml-content>
+                            <config-xml-content server="offline"/>
                         </plugin-artifact>
                     </instance>
                 </configuration>

Modified: geronimo/server/trunk/framework/configs/jsr88-cli/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/jsr88-cli/pom.xml?rev=591154&r1=591153&r2=591154&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/jsr88-cli/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/jsr88-cli/pom.xml Thu Nov  1 15:07:10 2007
@@ -137,7 +137,7 @@
                     <category>Deployment</category>
                     <instance>
                         <plugin-artifact>
-                            <config-xml-content load="false"/>
+                            <config-xml-content server="jsr88"/>
                         </plugin-artifact>
                     </instance>
                 </configuration>

Modified: geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/pom.xml?rev=591154&r1=591153&r2=591154&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/pom.xml Thu Nov  1 15:07:10 2007
@@ -136,7 +136,7 @@
                     <category>Deployment</category>
                     <instance>
                         <plugin-artifact>
-                            <config-xml-content load="false"/>
+                            <config-xml-content server="jsr88"/>
                         </plugin-artifact>
                     </instance>
                 </configuration>

Modified: geronimo/server/trunk/framework/configs/rmi-naming/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/rmi-naming/src/main/plan/plan.xml?rev=591154&r1=591153&r2=591154&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/rmi-naming/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/framework/configs/rmi-naming/src/main/plan/plan.xml Thu Nov  1 15:07:10 2007
@@ -74,13 +74,90 @@
         <reference name="ThreadPool">
             <name>DefaultThreadPool</name>
         </reference>
+        <references name="ServerInstances">
+            <pattern>
+                <name>DefaultServer</name>
+            </pattern>
+            <pattern>
+                <name>Offline</name>
+            </pattern>
+            <pattern>
+                <name>Client</name>
+            </pattern>
+            <pattern>
+                <name>Jsr88</name>
+            </pattern>
+        </references>
+    </gbean>
+
+    <gbean name="DefaultServer" class="org.apache.geronimo.system.plugin.ServerInstance">
+        <attribute name="serverName">default</attribute>
+        <reference name="PluginAttributeStore">
+            <name>AttributeManager</name>
+        </reference>
+        <reference name="ArtifactResolver">
+            <name>ArtifactResolver</name>
+        </reference>
+    </gbean>
+
+    <gbean name="Offline" class="org.apache.geronimo.system.plugin.ServerInstance">
+        <attribute name="serverName">offline</attribute>
+        <reference name="PluginAttributeStore">
+            <name>OfflineAttributeManager</name>
+        </reference>
+        <reference name="ArtifactResolver">
+            <name>ArtifactResolver</name>
+        </reference>
+    </gbean>
+    <gbean name="OfflineAttributeManager" class="org.apache.geronimo.system.configuration.LocalAttributeManager">
+        <reference name="ServerInfo">
+            <name>ServerInfo</name>
+        </reference>
+        <attribute name="readOnly">true</attribute>
+        <attribute name="configFile">var/config/offline-deployer-config.xml</attribute>
+        <attribute name="substitutionsFile">var/config/config-substitutions.properties</attribute>
+        <attribute name="substitutionPrefix">org.apache.geronimo.config.substitution.</attribute>
+    </gbean>
+
+    <gbean name="Client" class="org.apache.geronimo.system.plugin.ServerInstance">
+        <attribute name="serverName">client</attribute>
         <reference name="PluginAttributeStore">
             <name>AttributeManager</name>
         </reference>
         <reference name="ArtifactResolver">
-          <name>ArtifactResolver</name>
+            <name>ClientArtifactResolver</name>
+        </reference>
+    </gbean>
+    <gbean name="ClientArtifactResolver" class="org.apache.geronimo.system.resolver.ExplicitDefaultArtifactResolver">
+        <reference name="ArtifactManager">
+            <name>ArtifactManager</name>
+        </reference>
+        <reference name="Repositories"></reference>
+        <attribute name="versionMapLocation">var/config/client_artifact_aliases.properties</attribute>
+        <reference name="ServerInfo">
+            <name>ServerInfo</name>
+        </reference>
+    </gbean>
+
+    <gbean name="Jsr88" class="org.apache.geronimo.system.plugin.ServerInstance">
+        <attribute name="serverName">jsr88</attribute>
+        <reference name="PluginAttributeStore">
+            <name>Jsr88AttributeManager</name>
+        </reference>
+        <reference name="ArtifactResolver">
+            <name>ArtifactResolver</name>
+        </reference>
+    </gbean>
+    <gbean name="Jsr88AttributeManager" class="org.apache.geronimo.system.configuration.LocalAttributeManager">
+        <reference name="ServerInfo">
+            <name>ServerInfo</name>
         </reference>
+        <attribute name="readOnly">true</attribute>
+        <attribute name="configFile">var/config/jsr88-configurer-config.xml</attribute>
+        <attribute name="substitutionsFile">var/config/config-substitutions.properties</attribute>
+        <attribute name="substitutionPrefix">org.apache.geronimo.config.substitution.</attribute>
     </gbean>
+
 
     <gbean name="DownloadedPluginRepos" class="org.apache.geronimo.system.plugin.PluginRepositoryDownloader">
         <attribute name="repositoryList">http://geronimo.apache.org/plugins/plugin-repository-list-2.1.txt</attribute>

Added: geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/NoServerInstanceException.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/NoServerInstanceException.java?rev=591154&view=auto
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/NoServerInstanceException.java (added)
+++ geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/NoServerInstanceException.java Thu Nov  1 15:07:10 2007
@@ -0,0 +1,43 @@
+/*
+ * 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.
+ */
+
+
+package org.apache.geronimo.system.plugin;
+
+/**
+ * @version $Rev:$ $Date:$
+ */
+public class NoServerInstanceException extends Exception {
+
+
+    public NoServerInstanceException() {
+    }
+
+    public NoServerInstanceException(String message) {
+        super(message);
+    }
+
+    public NoServerInstanceException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public NoServerInstanceException(Throwable cause) {
+        super(cause);
+    }
+}

Propchange: geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/NoServerInstanceException.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/NoServerInstanceException.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/NoServerInstanceException.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java?rev=591154&r1=591153&r2=591154&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java Thu Nov  1 15:07:10 2007
@@ -62,6 +62,9 @@
 import org.apache.geronimo.gbean.AbstractName;
 import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
+import org.apache.geronimo.gbean.ReferenceCollection;
+import org.apache.geronimo.gbean.ReferenceCollectionEvent;
+import org.apache.geronimo.gbean.ReferenceCollectionListener;
 import org.apache.geronimo.kernel.InvalidGBeanException;
 import org.apache.geronimo.kernel.config.ConfigurationData;
 import org.apache.geronimo.kernel.config.ConfigurationInfo;
@@ -80,8 +83,8 @@
 import org.apache.geronimo.kernel.repository.WritableListableRepository;
 import org.apache.geronimo.kernel.util.XmlUtil;
 import org.apache.geronimo.system.configuration.ConfigurationStoreUtil;
-import org.apache.geronimo.system.configuration.PluginAttributeStore;
 import org.apache.geronimo.system.plugin.model.ArtifactType;
+import org.apache.geronimo.system.plugin.model.ConfigXmlContentType;
 import org.apache.geronimo.system.plugin.model.CopyFileType;
 import org.apache.geronimo.system.plugin.model.DependencyType;
 import org.apache.geronimo.system.plugin.model.HashType;
@@ -91,7 +94,6 @@
 import org.apache.geronimo.system.plugin.model.PluginType;
 import org.apache.geronimo.system.plugin.model.PrerequisiteType;
 import org.apache.geronimo.system.plugin.model.PropertyType;
-import org.apache.geronimo.system.resolver.AliasedArtifactResolver;
 import org.apache.geronimo.system.serverinfo.ServerInfo;
 import org.apache.geronimo.system.threads.ThreadPool;
 import org.apache.geronimo.util.encoders.Base64;
@@ -116,21 +118,35 @@
     private final ConfigurationManager configManager;
     private final WritableListableRepository writeableRepo;
     private final ConfigurationStore configStore;
-    private final AliasedArtifactResolver artifactResolver;
     private final ServerInfo serverInfo;
     private final Map<Object, DownloadResults> asyncKeys;
     private final ThreadPool threadPool;
-    private final PluginAttributeStore attributeStore;
+    private final Map<String, ServerInstance> servers = new HashMap<String, ServerInstance>();
 
-    public PluginInstallerGBean(ConfigurationManager configManager, WritableListableRepository repository, ConfigurationStore configStore, ServerInfo serverInfo, ThreadPool threadPool, PluginAttributeStore store, AliasedArtifactResolver artifactResolver) {
+    public PluginInstallerGBean(ConfigurationManager configManager, WritableListableRepository repository, ConfigurationStore configStore, ServerInfo serverInfo, ThreadPool threadPool, Collection<ServerInstance> servers) {
         this.configManager = configManager;
         this.writeableRepo = repository;
         this.configStore = configStore;
         this.serverInfo = serverInfo;
         this.threadPool = threadPool;
         asyncKeys = Collections.synchronizedMap(new HashMap<Object, DownloadResults>());
-        attributeStore = store;
-        this.artifactResolver = artifactResolver;
+        for (ServerInstance instance: servers) {
+            this.servers.put(instance.getServerName(), instance);
+        }
+        if (servers instanceof ReferenceCollection) {
+            ((ReferenceCollection)servers).addReferenceCollectionListener(new ReferenceCollectionListener() {
+
+                public void memberAdded(ReferenceCollectionEvent event) {
+                    ServerInstance instance = (ServerInstance) event.getMember();
+                    PluginInstallerGBean.this.servers.put(instance.getServerName(), instance);
+                }
+
+                public void memberRemoved(ReferenceCollectionEvent event) {
+                    ServerInstance instance = (ServerInstance) event.getMember();
+                    PluginInstallerGBean.this.servers.remove(instance.getServerName());
+                }
+            });
+        }
     }
 
     /**
@@ -689,8 +705,12 @@
         ArrayList<Dependency> missingPrereqs = new ArrayList<Dependency>();
         for (PrerequisiteType prereq : prereqs) {
             Artifact artifact = toArtifact(prereq.getId());
-            if (artifactResolver.queryArtifacts(artifact).length == 0) {
-                missingPrereqs.add(new Dependency(artifact,ImportType.ALL));
+            try {
+                if (getServerInstance("default").getArtifactResolver().queryArtifacts(artifact).length == 0) {
+                    missingPrereqs.add(new Dependency(artifact,ImportType.ALL));
+                }
+            } catch (NoServerInstanceException e) {
+                throw new RuntimeException("Invalid setup, no default server instance registered");
             }
         }
         return missingPrereqs.toArray(new Dependency[missingPrereqs.size()]);
@@ -715,7 +735,7 @@
      *                                    are not accepted
      * @throws MissingDependencyException When a dependency cannot be located in any of the listed repositories
      */
-    private void downloadArtifact(Artifact configID, Map<Artifact, PluginType> metadata, List<String> repos, String username, String password, ResultsFileWriteMonitor monitor, Set<Artifact> soFar, Stack<Artifact> parentStack, boolean dependency) throws IOException, FailedLoginException, MissingDependencyException {
+    private void downloadArtifact(Artifact configID, Map<Artifact, PluginType> metadata, List<String> repos, String username, String password, ResultsFileWriteMonitor monitor, Set<Artifact> soFar, Stack<Artifact> parentStack, boolean dependency) throws IOException, FailedLoginException, MissingDependencyException, NoServerInstanceException {
         if (soFar.contains(configID)) {
             return; // Avoid endless work due to circular dependencies
         } else {
@@ -1716,28 +1736,56 @@
      * If a plugin includes config.xml content, copy it into the attribute
      * store.
      */
-    private void installConfigXMLData(Artifact configID, PluginArtifactType pluginData) throws InvalidGBeanException, IOException {
-        if (configManager.isConfiguration(configID) && attributeStore != null) {
-            if (pluginData != null && pluginData.getConfigXmlContent() != null) {
-                attributeStore.setModuleGBeans(configID, pluginData.getConfigXmlContent().getGbean(), pluginData.getConfigXmlContent().isLoad());
+    private void installConfigXMLData(Artifact configID, PluginArtifactType pluginData) throws InvalidGBeanException, IOException, NoServerInstanceException {
+        if (configManager.isConfiguration(configID)) {
+            if (pluginData != null && !pluginData.getConfigXmlContent().isEmpty()) {
+                for (ConfigXmlContentType configXmlContent: pluginData.getConfigXmlContent()) {
+                    String serverName = configXmlContent.getServer();
+                    ServerInstance serverInstance = getServerInstance(serverName);
+                    serverInstance.getAttributeStore().setModuleGBeans(configID, configXmlContent.getGbean(), configXmlContent.isLoad());
+                }
             } else {
-                attributeStore.setModuleGBeans(configID, null, true);
+                getServerInstance("default").getAttributeStore().setModuleGBeans(configID, null, true);
             }
         }
-        if (!pluginData.getConfigSubstitution().isEmpty() && attributeStore != null) {
-            attributeStore.addConfigSubstitutions(toProperties(pluginData.getConfigSubstitution()));
+        if (!pluginData.getConfigSubstitution().isEmpty()) {
+            Map<String, Properties> propertiesMap = toPropertiesMap(pluginData.getConfigSubstitution());
+            for (Map.Entry<String, Properties> entry: propertiesMap.entrySet()) {
+                String serverName = entry.getKey();
+                ServerInstance serverInstance = getServerInstance(serverName);
+                serverInstance.getAttributeStore().addConfigSubstitutions(entry.getValue());
+            }
         }
-        if (!pluginData.getArtifactAlias().isEmpty() && artifactResolver != null) {
-            artifactResolver.addAliases(toProperties(pluginData.getArtifactAlias()));
+        if (!pluginData.getArtifactAlias().isEmpty()) {
+            Map<String, Properties> propertiesMap = toPropertiesMap(pluginData.getArtifactAlias());
+            for (Map.Entry<String, Properties> entry: propertiesMap.entrySet()) {
+                String serverName = entry.getKey();
+                ServerInstance serverInstance = getServerInstance(serverName);
+                serverInstance.getArtifactResolver().addAliases(entry.getValue());
+            }
         }
     }
 
-    private Properties toProperties(List<PropertyType> propertyTypes) {
-        Properties properties = new Properties();
+    private ServerInstance getServerInstance(String serverName) throws NoServerInstanceException {
+        ServerInstance serverInstance = servers.get(serverName);
+        if (serverInstance == null) {
+            throw new NoServerInstanceException("No server instance configuration set up for name " + serverName);
+        }
+        return serverInstance;
+    }
+
+    private Map<String, Properties> toPropertiesMap(List<PropertyType> propertyTypes) {
+        Map<String, Properties> propertiesMap = new HashMap<String, Properties>();
         for (PropertyType propertyType : propertyTypes) {
+            String serverName = propertyType.getServer();
+            Properties properties = propertiesMap.get(serverName);
+            if (properties == null) {
+                properties = new Properties();
+                propertiesMap.put(serverName, properties);
+            }
             properties.setProperty(propertyType.getKey(), propertyType.getValue());
         }
-        return properties;
+        return propertiesMap;
     }
 
     /**
@@ -1881,12 +1929,11 @@
         infoFactory.addReference("ConfigStore", ConfigurationStore.class, "ConfigurationStore");
         infoFactory.addReference("ServerInfo", ServerInfo.class, "GBean");
         infoFactory.addReference("ThreadPool", ThreadPool.class, "GBean");
-        infoFactory.addReference("PluginAttributeStore", PluginAttributeStore.class, "AttributeStore");
-        infoFactory.addReference("ArtifactResolver", AliasedArtifactResolver.class, "ArtifactResolver");
+        infoFactory.addReference("ServerInstances", ServerInstance.class, "ServerInstance");
         infoFactory.addInterface(PluginInstaller.class);
 
         infoFactory.setConstructor(new String[]{"ConfigManager", "Repository", "ConfigStore",
-                "ServerInfo", "ThreadPool", "PluginAttributeStore", "ArtifactResolver"});
+                "ServerInfo", "ThreadPool", "ServerInstances"});
 
         GBEAN_INFO = infoFactory.getBeanInfo();
     }

Added: geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/ServerInstance.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/ServerInstance.java?rev=591154&view=auto
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/ServerInstance.java (added)
+++ geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/ServerInstance.java Thu Nov  1 15:07:10 2007
@@ -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.
+ */
+
+
+package org.apache.geronimo.system.plugin;
+
+import org.apache.geronimo.system.configuration.PluginAttributeStore;
+import org.apache.geronimo.system.resolver.AliasedArtifactResolver;
+import org.apache.geronimo.gbean.GBeanInfo;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
+
+/**
+ * @version $Rev:$ $Date:$
+ */
+public class ServerInstance {
+
+    private final String serverName;
+    private final PluginAttributeStore attributeStore;
+    private final AliasedArtifactResolver artifactResolver;
+
+
+    public ServerInstance(String serverName, PluginAttributeStore attributeStore, AliasedArtifactResolver artifactResolver) {
+        this.serverName = serverName;
+        this.attributeStore = attributeStore;
+        this.artifactResolver = artifactResolver;
+    }
+
+    public String getServerName() {
+        return serverName;
+    }
+
+    public PluginAttributeStore getAttributeStore() {
+        return attributeStore;
+    }
+
+    public AliasedArtifactResolver getArtifactResolver() {
+        return artifactResolver;
+    }
+    public static final GBeanInfo GBEAN_INFO;
+
+    static {
+        GBeanInfoBuilder infoFactory = GBeanInfoBuilder.createStatic(ServerInstance.class);
+        infoFactory.addAttribute("serverName", String.class, true, true);
+        infoFactory.addReference("PluginAttributeStore", PluginAttributeStore.class, "AttributeStore");
+        infoFactory.addReference("ArtifactResolver", AliasedArtifactResolver.class, "ArtifactResolver");
+
+        infoFactory.setConstructor(new String[]{"serverName", "PluginAttributeStore", "ArtifactResolver"});
+
+        GBEAN_INFO = infoFactory.getBeanInfo();
+    }
+
+    public static GBeanInfo getGBeanInfo() {
+        return GBEAN_INFO;
+    }
+}

Propchange: geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/ServerInstance.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/ServerInstance.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/ServerInstance.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/resolver/ExplicitDefaultArtifactResolver.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/resolver/ExplicitDefaultArtifactResolver.java?rev=591154&r1=591153&r2=591154&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/resolver/ExplicitDefaultArtifactResolver.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/resolver/ExplicitDefaultArtifactResolver.java Thu Nov  1 15:07:10 2007
@@ -93,8 +93,8 @@
         File location = serverInfo == null? new File(versionMapLocation): serverInfo.resolveServer(versionMapLocation);
         if (!location.exists()) {
             File parent = location.getParentFile();
-            if (!parent.mkdirs()) {
-                throw new IOException("Could not create directory for artifact aliases at " + location);
+            if (!parent.exists() && !parent.mkdirs()) {
+                throw new IOException("Could not create directory for artifact aliases at " + parent);
             }
         }
         FileOutputStream in = new FileOutputStream(location);

Modified: geronimo/server/trunk/framework/modules/geronimo-system/src/main/xsd/plugins-1.3.xsd
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-system/src/main/xsd/plugins-1.3.xsd?rev=591154&r1=591153&r2=591154&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-system/src/main/xsd/plugins-1.3.xsd (original)
+++ geronimo/server/trunk/framework/modules/geronimo-system/src/main/xsd/plugins-1.3.xsd Thu Nov  1 15:07:10 2007
@@ -345,7 +345,7 @@
                     </xs:documentation>
                 </xs:annotation>
             </xs:element>
-            <xs:element name="config-xml-content" type="list:config-xml-contentType" minOccurs="0"/>
+            <xs:element name="config-xml-content" type="list:config-xml-contentType" minOccurs="0" maxOccurs="unbounded"/>
             <xs:element name="artifact-alias" type="list:propertyType" minOccurs="0" maxOccurs="unbounded"/>
             <xs:element name="config-substitution" type="list:propertyType" minOccurs="0" maxOccurs="unbounded"/>
         </xs:sequence>
@@ -367,11 +367,18 @@
         <xs:attribute name="load" type="xs:boolean" default="true">
             <xs:annotation>
                 <xs:documentation>
-                    wether the module should be marked load true or false. If marked false it can still
+                    Whether the module should be marked load true or false. If marked false it can still
                     be started if other started modules depend on it.
                 </xs:documentation>
             </xs:annotation>
         </xs:attribute>
+        <xs:attribute name="server" type="xs:string" default="default">
+            <xs:annotation>
+                <xs:documentation>
+                    The "server", i.e. the named set of configuration files, this should be added to.
+                </xs:documentation>
+            </xs:annotation>
+        </xs:attribute>
     </xs:complexType>
 
     <xs:complexType name="propertyType">
@@ -387,6 +394,13 @@
                     <xs:annotation>
                         <xs:documentation>
                             key for key-value pair.
+                        </xs:documentation>
+                    </xs:annotation>
+                </xs:attribute>
+                <xs:attribute name="server" type="xs:string" default="default">
+                    <xs:annotation>
+                        <xs:documentation>
+                            The "server", i.e. the named set of configuration files, this should be added to.
                         </xs:documentation>
                     </xs:annotation>
                 </xs:attribute>

Modified: geronimo/server/trunk/framework/modules/geronimo-system/src/test/java/org/apache/geronimo/system/plugin/CopyConfigTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-system/src/test/java/org/apache/geronimo/system/plugin/CopyConfigTest.java?rev=591154&r1=591153&r2=591154&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-system/src/test/java/org/apache/geronimo/system/plugin/CopyConfigTest.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-system/src/test/java/org/apache/geronimo/system/plugin/CopyConfigTest.java Thu Nov  1 15:07:10 2007
@@ -162,7 +162,7 @@
     public void testCopyConfig() throws Exception {
         InputStream in = new ByteArrayInputStream(CONFIG.getBytes());
         PluginType pluginType = PluginXmlUtil.loadPluginMetadata(in);
-        List<GbeanType> gbeans = pluginType.getPluginArtifact().get(0).getConfigXmlContent().getGbean();
+        List<GbeanType> gbeans = pluginType.getPluginArtifact().get(0).getConfigXmlContent().get(0).getGbean();
         assertEquals(2, gbeans.size());
         GBeanOverride override = new GBeanOverride(gbeans.get(0), new JexlExpressionParser());
         String attributeValue = override.getAttribute("defaultEnvironment");
@@ -185,7 +185,8 @@
     public void testReadNoNS() throws Exception {
         Reader in = new StringReader(INSTANCE);
         PluginArtifactType instance = PluginXmlUtil.loadPluginArtifactMetadata(in);
-        assertEquals("DirectoryService", instance.getConfigXmlContent().getGbean().get(0).getName());
+        assertEquals("DirectoryService", instance.getConfigXmlContent().get(0).getGbean().get(0).getName());
+        assertEquals("default", instance.getConfigXmlContent().get(0).getServer());
     }
 
     private static final String INSTANCE2 = "                        <plugin-artifact>\n" +
@@ -253,7 +254,7 @@
     public void testXmlAttribute() throws Exception {
         Reader in = new StringReader(INSTANCE2);
         PluginArtifactType instance = PluginXmlUtil.loadPluginArtifactMetadata(in);
-        List<GbeanType> gbeans = instance.getConfigXmlContent().getGbean();
+        List<GbeanType> gbeans = instance.getConfigXmlContent().get(0).getGbean();
         assertEquals(3, gbeans.size());
         List contents = gbeans.get(0).getAttributeOrReference();
         assertEquals(2, contents.size());

Modified: geronimo/server/trunk/framework/modules/geronimo-system/src/test/java/org/apache/geronimo/system/plugin/PluginInstallerTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-system/src/test/java/org/apache/geronimo/system/plugin/PluginInstallerTest.java?rev=591154&r1=591153&r2=591154&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-system/src/test/java/org/apache/geronimo/system/plugin/PluginInstallerTest.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-system/src/test/java/org/apache/geronimo/system/plugin/PluginInstallerTest.java Thu Nov  1 15:07:10 2007
@@ -20,6 +20,7 @@
 import java.net.URL;
 import java.util.Collections;
 import java.util.List;
+import java.util.ArrayList;
 import java.util.concurrent.TimeUnit;
 
 import junit.framework.TestCase;
@@ -81,7 +82,7 @@
             public void execute(String consumerName, Runnable runnable) {
                 new Thread(runnable).start();
             }
-        }, null, null);
+        }, new ArrayList<ServerInstance>());
     }
 
     public void testParsing() throws Exception {

Modified: geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/InstallModulesMojo.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/InstallModulesMojo.java?rev=591154&r1=591153&r2=591154&view=diff
==============================================================================
--- geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/InstallModulesMojo.java (original)
+++ geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/InstallModulesMojo.java Thu Nov  1 15:07:10 2007
@@ -33,6 +33,7 @@
 import java.util.Iterator;
 import java.util.LinkedHashSet;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 import java.util.jar.JarFile;
 import java.util.zip.ZipEntry;
@@ -44,6 +45,7 @@
 import org.apache.geronimo.kernel.config.InvalidConfigException;
 import org.apache.geronimo.kernel.config.KernelConfigurationManager;
 import org.apache.geronimo.kernel.config.NoSuchConfigException;
+import org.apache.geronimo.kernel.config.PersistentConfigurationList;
 import org.apache.geronimo.kernel.repository.Artifact;
 import org.apache.geronimo.kernel.repository.ArtifactManager;
 import org.apache.geronimo.kernel.repository.DefaultArtifactManager;
@@ -52,17 +54,15 @@
 import org.apache.geronimo.kernel.repository.FileWriteMonitor;
 import org.apache.geronimo.kernel.repository.Repository;
 import org.apache.geronimo.kernel.repository.WritableListableRepository;
-import org.apache.geronimo.system.configuration.LocalAttributeManager;
 import org.apache.geronimo.system.configuration.RepositoryConfigurationStore;
-import org.apache.geronimo.system.plugin.DownloadResults;
-import org.apache.geronimo.system.plugin.PluginInstallerGBean;
 import org.apache.geronimo.system.plugin.model.ArtifactType;
 import org.apache.geronimo.system.plugin.model.PluginArtifactType;
 import org.apache.geronimo.system.plugin.model.PluginListType;
 import org.apache.geronimo.system.plugin.model.PluginType;
+import org.apache.geronimo.system.plugin.PluginInstallerGBean;
+import org.apache.geronimo.system.plugin.DownloadResults;
 import org.apache.geronimo.system.repository.Maven2Repository;
 import org.apache.geronimo.system.resolver.AliasedArtifactResolver;
-import org.apache.geronimo.system.resolver.ExplicitDefaultArtifactResolver;
 import org.apache.geronimo.system.serverinfo.BasicServerInfo;
 import org.apache.geronimo.system.serverinfo.ServerInfo;
 import org.apache.geronimo.system.threads.ThreadPool;
@@ -105,11 +105,11 @@
     private String targetConfigPath = null;
     private File targetConfigDirectory = null;
 
-    //TODO configure these in geronimo-plugin.xml
-    private String configFile = "var/config/config.xml";
-    private String configSubstitutionsFileName = "var/config/config-substitutions.properties";
-    private String configSubstitutionsPrefix = "org.apache.geronimo.configSubstitution";
-    private String artifactAliasesFileName = "var/config/artifact_aliases.properties";
+    /**
+     * ServerInstance specific in plugin configuration, to specify where config.xml and properties updates go.
+     * @parameter
+     */
+    private List<ServerInstance> servers;
 
     /**
      * Configuration to be installed specified as groupId/artifactId/version/type
@@ -184,31 +184,35 @@
 
         Kernel kernel = new BasicKernel("assembly");
         ServerInfo serverInfo = new BasicServerInfo(targetServerDirectory.getAbsolutePath(), false);
-        geronimoArtifactResolver = new ExplicitDefaultArtifactResolver(
-                artifactAliasesFileName,
-                artifactManager,
-                Collections.singleton(targetRepo),
-                serverInfo);
         ThreadPool threadPool = null;
-        LocalAttributeManager attributeStore = new LocalAttributeManager(configFile, configSubstitutionsFileName, configSubstitutionsPrefix, false, serverInfo);
-        attributeStore.load();
-        ConfigurationManager configurationManager = new KernelConfigurationManager(kernel,
-                Collections.singleton(targetStore),
-                attributeStore,
-                attributeStore,
-                artifactManager,
-                geronimoArtifactResolver,
-                Collections.singleton(targetRepo),
-                null,
-                getClass().getClassLoader());
-//
+        ConfigurationManager configurationManager = null;
+        Map<String, org.apache.geronimo.system.plugin.ServerInstance> servers = new HashMap<String, org.apache.geronimo.system.plugin.ServerInstance>();
+        for (ServerInstance serverInstance: this.servers) {
+            org.apache.geronimo.system.plugin.ServerInstance instance = serverInstance.getServerInstance(artifactManager, targetRepo, serverInfo, servers);
+            servers.put(instance.getServerName(), instance);
+            if ("default".equals(instance.getServerName())) {
+                configurationManager = new KernelConfigurationManager(kernel,
+                        Collections.singleton(targetStore),
+                        instance.getAttributeStore(),
+                        (PersistentConfigurationList)instance.getAttributeStore(),
+                        artifactManager,
+                        instance.getArtifactResolver(),
+                        Collections.singleton(targetRepo),
+                        null,
+                        getClass().getClassLoader());
+
+            }
+        }
+
+        if (configurationManager == null) {
+            throw new IllegalArgumentException("No default server instance set up");
+        }
         PluginInstallerGBean installer = new PluginInstallerGBean(configurationManager,
                 targetRepo,
                 targetStore,
                 serverInfo,
                 threadPool,
-                attributeStore,
-                geronimoArtifactResolver);
+                servers.values());
         DownloadResults downloadPoller = new DownloadResults();
 
         PluginListType pluginList = new PluginListType();
@@ -230,7 +234,9 @@
 
         installer.install(pluginList, null, null, downloadPoller);
         //ensure config.xml is saved.
-        attributeStore.save();
+        for (org.apache.geronimo.system.plugin.ServerInstance serverInstance: servers.values()) {
+            serverInstance.getAttributeStore().save();
+        }
         log.info("Installed plugins: ");
         for (Artifact artifact: downloadPoller.getInstalledConfigIDs()) {
             log.info("   " + artifact);

Modified: geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PluginMetadataGeneratorMojo.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PluginMetadataGeneratorMojo.java?rev=591154&r1=591153&r2=591154&view=diff
==============================================================================
--- geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PluginMetadataGeneratorMojo.java (original)
+++ geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PluginMetadataGeneratorMojo.java Thu Nov  1 15:07:10 2007
@@ -152,11 +152,12 @@
             if (instance.getConfigSubstitution().isEmpty()) {
                 instance.getConfigSubstitution().addAll(commonInstance.getConfigSubstitution());
             }
-            if ((instance.getConfigXmlContent() == null || instance.getConfigXmlContent().getGbean().isEmpty())
-                    && (commonInstance.getConfigXmlContent() != null && !commonInstance.getConfigXmlContent().getGbean().isEmpty())) {
-                instance.setConfigXmlContent(new ConfigXmlContentType());
-                instance.getConfigXmlContent().getGbean().addAll(commonInstance.getConfigXmlContent().getGbean());
-            }
+            //it doesn't make sense to copy a "generic" config.xml content into a specific module.
+//            if ((instance.getConfigXmlContent() == null || instance.getConfigXmlContent().getGbean().isEmpty())
+//                    && (commonInstance.getConfigXmlContent() != null && !commonInstance.getConfigXmlContent().getGbean().isEmpty())) {
+//                instance.setConfigXmlContent(new ConfigXmlContentType());
+//                instance.getConfigXmlContent().getGbean().addAll(commonInstance.getConfigXmlContent().getGbean());
+//            }
             if (instance.getCopyFile().isEmpty()) {
                 instance.getCopyFile().addAll(commonInstance.getCopyFile());
             }

Added: geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ServerInstance.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ServerInstance.java?rev=591154&view=auto
==============================================================================
--- geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ServerInstance.java (added)
+++ geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ServerInstance.java Thu Nov  1 15:07:10 2007
@@ -0,0 +1,118 @@
+/*
+ * 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.
+ */
+
+
+package org.apache.geronimo.mavenplugins.car;
+
+import java.io.IOException;
+import java.util.Collections;
+import java.util.Map;
+
+import org.apache.geronimo.kernel.repository.ArtifactManager;
+import org.apache.geronimo.kernel.repository.ListableRepository;
+import org.apache.geronimo.system.configuration.LocalAttributeManager;
+import org.apache.geronimo.system.resolver.ExplicitDefaultArtifactResolver;
+import org.apache.geronimo.system.serverinfo.ServerInfo;
+
+/**
+ * @version $Rev:$ $Date:$
+ */
+public class ServerInstance {
+
+    private String name;
+    private String attributeManagerFrom;
+    private String configFile = "var/config/config.xml";
+    private String configSubstitutionsFileName = "var/config/config-substitutions.properties";
+    private String configSubstitutionsPrefix = "org.apache.geronimo.config.substitution.";
+    private String artifactAliasesFileName = "var/config/artifact_aliases.properties";
+
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+
+    public String getAttributeManagerFrom() {
+        return attributeManagerFrom;
+    }
+
+    public void setAttributeManagerFrom(String attributeManagerFrom) {
+        this.attributeManagerFrom = attributeManagerFrom;
+    }
+
+    public String getConfigFile() {
+        return configFile;
+    }
+
+    public void setConfigFile(String configFile) {
+        this.configFile = configFile;
+    }
+
+    public String getConfigSubstitutionsFile() {
+        return configSubstitutionsFileName;
+    }
+
+    public void setConfigSubstitutionsFile(String configSubstitutionsFileName) {
+        this.configSubstitutionsFileName = configSubstitutionsFileName;
+    }
+
+    public String getConfigSubstitutionsPrefix() {
+        return configSubstitutionsPrefix;
+    }
+
+    public void setConfigSubstitutionsPrefix(String configSubstitutionsPrefix) {
+        this.configSubstitutionsPrefix = configSubstitutionsPrefix;
+    }
+
+    public String getArtifactAliasesFile() {
+        return artifactAliasesFileName;
+    }
+
+    public void setArtifactAliasesFile(String artifactAliasesFileName) {
+        this.artifactAliasesFileName = artifactAliasesFileName;
+    }
+
+    public org.apache.geronimo.system.plugin.ServerInstance getServerInstance(ArtifactManager artifactManager, ListableRepository targetRepo, ServerInfo serverInfo, Map<String, org.apache.geronimo.system.plugin.ServerInstance> serverInstances) throws IOException {
+        ExplicitDefaultArtifactResolver geronimoArtifactResolver = new ExplicitDefaultArtifactResolver(
+                artifactAliasesFileName,
+                artifactManager,
+                Collections.singleton(targetRepo),
+                serverInfo);
+        LocalAttributeManager attributeStore;
+        if (attributeManagerFrom == null) {
+            attributeStore = new LocalAttributeManager(configFile,
+                    configSubstitutionsFileName,
+                    configSubstitutionsPrefix,
+                    false,
+                    serverInfo);
+            attributeStore.load();
+        } else {
+            org.apache.geronimo.system.plugin.ServerInstance shared = serverInstances.get(attributeManagerFrom);
+            if (shared == null) {
+                throw new IllegalArgumentException("Incorrect configuration: no server instance named '" + attributeManagerFrom + "' defined before being shared from '" + name + "'");
+            }
+            attributeStore = (LocalAttributeManager) shared.getAttributeStore();
+        }
+        return new org.apache.geronimo.system.plugin.ServerInstance(name, attributeStore, geronimoArtifactResolver);
+    }
+}

Propchange: geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ServerInstance.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ServerInstance.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ServerInstance.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/server/trunk/plugins/axis/axis-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis/axis-deployer/pom.xml?rev=591154&r1=591153&r2=591154&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis/axis-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/axis/axis-deployer/pom.xml Thu Nov  1 15:07:10 2007
@@ -134,6 +134,25 @@
                                     </attribute>
                                 </gbean>
                             </config-xml-content>
+                            <config-xml-content server="offline">
+                                <gbean name="AxisServiceRefBuilder">
+                                    <attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</attribute>
+                                </gbean>
+                                <gbean name="AxisModuleBuilderExtension">
+                                    <attribute name="listener">?name=#{webcontainer}</attribute>
+                                    <attribute name="defaultEnvironment">
+                                        <environment xmlns="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>
+                                    </attribute>
+                                </gbean>
+                            </config-xml-content>
                         </plugin-artifact>
                     </instance>
                 </configuration>

Modified: geronimo/server/trunk/plugins/axis2/axis2-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/axis2-deployer/pom.xml?rev=591154&r1=591153&r2=591154&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/axis2-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/axis2/axis2-deployer/pom.xml Thu Nov  1 15:07:10 2007
@@ -88,6 +88,12 @@
                         <import>classes</import>
                       </dependency>
                     </dependencies>
+                    <instance>
+                        <plugin-artifact>
+                            <config-xml-content server="default"/>
+                            <config-xml-content server="offline"/>
+                        </plugin-artifact>
+                    </instance>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/server/trunk/plugins/client/client-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/client/client-deployer/pom.xml?rev=591154&r1=591153&r2=591154&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/client/client-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/client/client-deployer/pom.xml Thu Nov  1 15:07:10 2007
@@ -120,6 +120,12 @@
                         <type>car</type>
                       </dependency>
                     </dependencies>
+                    <instance>
+                        <plugin-artifact>
+                            <config-xml-content server="default"/>
+                            <config-xml-content server="offline"/>
+                        </plugin-artifact>
+                    </instance>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/server/trunk/plugins/client/client-security/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/client/client-security/pom.xml?rev=591154&r1=591153&r2=591154&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/client/client-security/pom.xml (original)
+++ geronimo/server/trunk/plugins/client/client-security/pom.xml Thu Nov  1 15:07:10 2007
@@ -77,6 +77,8 @@
                     <instance>
                         <plugin-artifact>
                             <config-xml-content load="false"/>
+                            <artifact-alias server="client" key="org.apache.geronimo.configs/j2ee-security//car">org.apache.geronimo.configs/client-security/${version}/car</artifact-alias>
+                            <artifact-alias server="client" key="org.apache.geronimo.configs/j2ee-security/${version}/car">org.apache.geronimo.configs/client-security/${version}/car</artifact-alias>
                         </plugin-artifact>
                     </instance>
                 </configuration>

Modified: geronimo/server/trunk/plugins/client/client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/client/client/pom.xml?rev=591154&r1=591153&r2=591154&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/client/client/pom.xml (original)
+++ geronimo/server/trunk/plugins/client/client/pom.xml Thu Nov  1 15:07:10 2007
@@ -137,6 +137,8 @@
                     <instance>
                         <plugin-artifact>
                             <config-xml-content load="false"/>
+                            <artifact-alias server="client" key="org.apache.geronimo.configs/j2ee-server//car">org.apache.geronimo.configs/client/${version}/car</artifact-alias>
+                            <artifact-alias server="client" key="org.apache.geronimo.configs/j2ee-server/${version}/car">org.apache.geronimo.configs/client/${version}/car</artifact-alias>
                         </plugin-artifact>
                     </instance>
                 </configuration>

Modified: geronimo/server/trunk/plugins/connector/connector-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector/connector-deployer/pom.xml?rev=591154&r1=591153&r2=591154&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector/connector-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/connector/connector-deployer/pom.xml Thu Nov  1 15:07:10 2007
@@ -129,6 +129,7 @@
                                     </attribute>
                                 </gbean>
                             </config-xml-content>
+                            <config-xml-content server="offline"/>
                         </plugin-artifact>
                     </instance>
                 </configuration>

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/car/PluginInfoBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/car/PluginInfoBean.java?rev=591154&r1=591153&r2=591154&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/car/PluginInfoBean.java (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/car/PluginInfoBean.java Thu Nov  1 15:07:10 2007
@@ -44,7 +44,7 @@
     protected List<ArtifactType> obsoletes;
     protected List<String> sourceRepository;
     protected List<CopyFileType> copyFile;
-    protected ConfigXmlContentType configXmlContent;
+    protected List<ConfigXmlContentType> configXmlContent;
     protected List<PropertyType> artifactAlias;
     protected List<PropertyType> configSubstitution;
     protected String name;
@@ -89,11 +89,11 @@
         this.configSubstitution = configSubstitution;
     }
 
-    public ConfigXmlContentType getConfigXmlContent() {
+    public List<ConfigXmlContentType> getConfigXmlContent() {
         return configXmlContent;
     }
 
-    public void setConfigXmlContent(ConfigXmlContentType configXmlContent) {
+    public void setConfigXmlContent(List<ConfigXmlContentType> configXmlContent) {
         this.configXmlContent = configXmlContent;
     }
 

Modified: geronimo/server/trunk/plugins/corba/openejb-corba-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/corba/openejb-corba-deployer/pom.xml?rev=591154&r1=591153&r2=591154&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/corba/openejb-corba-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/corba/openejb-corba-deployer/pom.xml Thu Nov  1 15:07:10 2007
@@ -104,6 +104,12 @@
                             <type>jar</type>
                         </dependency>
                     </dependencies>
+                    <instance>
+                        <plugin-artifact>
+                            <config-xml-content server="default"/>
+                            <config-xml-content server="offline"/>
+                        </plugin-artifact>
+                    </instance>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/server/trunk/plugins/cxf/cxf-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/cxf-deployer/pom.xml?rev=591154&r1=591153&r2=591154&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/cxf/cxf-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/cxf/cxf-deployer/pom.xml Thu Nov  1 15:07:10 2007
@@ -90,6 +90,12 @@
                         <import>classes</import>
                       </dependency>
                     </dependencies>
+                    <instance>
+                        <plugin-artifact>
+                            <config-xml-content server="default"/>
+                            <config-xml-content server="offline"/>
+                        </plugin-artifact>
+                    </instance>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/server/trunk/plugins/j2ee/j2ee-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/j2ee-deployer/pom.xml?rev=591154&r1=591153&r2=591154&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/j2ee-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/j2ee-deployer/pom.xml Thu Nov  1 15:07:10 2007
@@ -233,6 +233,14 @@
                                     <attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</attribute>
                                 </gbean>
                             </config-xml-content>
+                            <config-xml-content server="offline">
+                                <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>
+                            </config-xml-content>
                         </plugin-artifact>
                     </instance>
                 </configuration>

Modified: geronimo/server/trunk/plugins/j2ee/jsr88-ear-configurer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/jsr88-ear-configurer/pom.xml?rev=591154&r1=591153&r2=591154&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/jsr88-ear-configurer/pom.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/jsr88-ear-configurer/pom.xml Thu Nov  1 15:07:10 2007
@@ -78,7 +78,7 @@
                     <category>Deployment</category>
                     <instance>
                         <plugin-artifact>
-                            <config-xml-content load="false"/>
+                            <config-xml-content server="jsr88"/>
                         </plugin-artifact>
                     </instance>
                 </configuration>

Modified: geronimo/server/trunk/plugins/j2ee/jsr88-jar-configurer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/jsr88-jar-configurer/pom.xml?rev=591154&r1=591153&r2=591154&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/jsr88-jar-configurer/pom.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/jsr88-jar-configurer/pom.xml Thu Nov  1 15:07:10 2007
@@ -78,7 +78,7 @@
                     <category>Deployment</category>
                     <instance>
                         <plugin-artifact>
-                            <config-xml-content load="false"/>
+                            <config-xml-content server="jsr88"/>
                         </plugin-artifact>
                     </instance>
                 </configuration>

Modified: geronimo/server/trunk/plugins/j2ee/jsr88-rar-configurer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/jsr88-rar-configurer/pom.xml?rev=591154&r1=591153&r2=591154&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/jsr88-rar-configurer/pom.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/jsr88-rar-configurer/pom.xml Thu Nov  1 15:07:10 2007
@@ -80,7 +80,7 @@
                     <category>Deployment</category>
                     <instance>
                         <plugin-artifact>
-                            <config-xml-content load="false"/>
+                            <config-xml-content server="jsr88"/>
                         </plugin-artifact>
                     </instance>
                 </configuration>

Modified: geronimo/server/trunk/plugins/j2ee/jsr88-war-configurer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/jsr88-war-configurer/pom.xml?rev=591154&r1=591153&r2=591154&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/jsr88-war-configurer/pom.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/jsr88-war-configurer/pom.xml Thu Nov  1 15:07:10 2007
@@ -78,7 +78,7 @@
                     <category>Deployment</category>
                     <instance>
                         <plugin-artifact>
-                            <config-xml-content load="false"/>
+                            <config-xml-content server="jsr88"/>
                         </plugin-artifact>
                     </instance>
                 </configuration>

Modified: geronimo/server/trunk/plugins/jasper/jasper-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jasper/jasper-deployer/pom.xml?rev=591154&r1=591153&r2=591154&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jasper/jasper-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/jasper/jasper-deployer/pom.xml Thu Nov  1 15:07:10 2007
@@ -89,6 +89,12 @@
                         <type>car</type>
                       </dependency>
                     </dependencies>
+                    <instance>
+                        <plugin-artifact>
+                            <config-xml-content server="default"/>
+                            <config-xml-content server="offline"/>
+                        </plugin-artifact>
+                    </instance>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/server/trunk/plugins/jetty/jetty6-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty/jetty6-deployer/pom.xml?rev=591154&r1=591153&r2=591154&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty/jetty6-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/jetty/jetty6-deployer/pom.xml Thu Nov  1 15:07:10 2007
@@ -116,6 +116,12 @@
                         <import>classes</import>
                       </dependency>
                     </dependencies>
+                    <instance>
+                        <plugin-artifact>
+                            <config-xml-content server="default"/>
+                            <config-xml-content server="offline"/>
+                        </plugin-artifact>
+                    </instance>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/server/trunk/plugins/myfaces/myfaces-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/myfaces/myfaces-deployer/pom.xml?rev=591154&r1=591153&r2=591154&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/myfaces/myfaces-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/myfaces/myfaces-deployer/pom.xml Thu Nov  1 15:07:10 2007
@@ -85,6 +85,12 @@
                         <type>car</type>
                       </dependency>
                     </dependencies>
+                    <instance>
+                        <plugin-artifact>
+                            <config-xml-content server="default"/>
+                            <config-xml-content server="offline"/>
+                        </plugin-artifact>
+                    </instance>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/server/trunk/plugins/openejb/openejb-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb-deployer/pom.xml?rev=591154&r1=591153&r2=591154&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/openejb/openejb-deployer/pom.xml Thu Nov  1 15:07:10 2007
@@ -136,6 +136,17 @@
                                     <attribute name="port">${OpenEJBPort + PortOffset}</attribute>
                                 </gbean>
                             </config-xml-content>
+                            <config-xml-content server="offline">
+                                <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>
+                            </config-xml-content>
                             <config-substitution key="OpenEJBPort">4201</config-substitution>
                         </plugin-artifact>
                     </instance>

Modified: geronimo/server/trunk/plugins/openjpa/persistence-jpa10-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openjpa/persistence-jpa10-deployer/pom.xml?rev=591154&r1=591153&r2=591154&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openjpa/persistence-jpa10-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/openjpa/persistence-jpa10-deployer/pom.xml Thu Nov  1 15:07:10 2007
@@ -125,6 +125,28 @@
                                     </attribute>
                                 </gbean>
                             </config-xml-content>
+                            <config-xml-content server="offline">
+                                <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 name="defaultEnvironment">
+                                        <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
+                                            <dependencies>
+                                                <dependency>
+                                                    <groupId>org.apache.geronimo.configs</groupId>
+                                                    <artifactId>openjpa</artifactId>
+                                                    <type>car</type>
+                                                </dependency>
+                                            </dependencies>
+                                        </environment>
+                                    </attribute>
+                                </gbean>
+                            </config-xml-content>
                         </plugin-artifact>
                     </instance>
                 </configuration>



Mime
View raw message