Return-Path: 
 <scm-return-29246-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 62541 invoked from network); 16 Jun 2008 19:00:59 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 16 Jun 2008 19:00:59 -0000
Received: (qmail 85187 invoked by uid 500); 16 Jun 2008 19:01:00 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 85137 invoked by uid 500); 16 Jun 2008 19:01:00 -0000
Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:scm-help@geronimo.apache.org>
list-unsubscribe: <mailto:scm-unsubscribe@geronimo.apache.org>
List-Post: <mailto:scm@geronimo.apache.org>
Reply-To: dev@geronimo.apache.org
List-Id: <scm.geronimo.apache.org>
Delivered-To: mailing list scm@geronimo.apache.org
Received: (qmail 85125 invoked by uid 99); 16 Jun 2008 19:01:00 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 16 Jun 2008 12:00:59 -0700
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 16 Jun 2008 19:00:18 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 7AA2D2388A04; Mon, 16 Jun 2008 12:00:36 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r668263 - in /geronimo/server/branches/2.1/framework:
 configs/jsr88-deploymentfactory/ configs/online-deployer/
 configs/online-deployer/src/main/plan/
 modules/geronimo-system/src/main/java/org/apache/geronimo/system/resolver/
Date: Mon, 16 Jun 2008 19:00:36 -0000
To: scm@geronimo.apache.org
From: gawor@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20080616190036.7AA2D2388A04@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: gawor
Date: Mon Jun 16 12:00:35 2008
New Revision: 668263

URL: http://svn.apache.org/viewvc?rev=668263&view=rev
Log:
fixes for offline deployment (GERONIMO-4072)

Modified:
    geronimo/server/branches/2.1/framework/configs/jsr88-deploymentfactory/pom.xml
    geronimo/server/branches/2.1/framework/configs/online-deployer/pom.xml
    geronimo/server/branches/2.1/framework/configs/online-deployer/src/main/plan/plan.xml
    geronimo/server/branches/2.1/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/resolver/ExplicitDefaultArtifactResolver.java

Modified: geronimo/server/branches/2.1/framework/configs/jsr88-deploymentfactory/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/framework/configs/jsr88-deploymentfactory/pom.xml?rev=668263&r1=668262&r2=668263&view=diff
==============================================================================
--- geronimo/server/branches/2.1/framework/configs/jsr88-deploymentfactory/pom.xml (original)
+++ geronimo/server/branches/2.1/framework/configs/jsr88-deploymentfactory/pom.xml Mon Jun 16 12:00:35 2008
@@ -163,7 +163,7 @@
                     <category>Deployment</category>
                     <instance>
                         <plugin-artifact>
-                            <config-xml-content server="jsr88"/>
+                            <config-xml-content server="jsr88" load="false"/>
                         </plugin-artifact>
                     </instance>
                 </configuration>

Modified: geronimo/server/branches/2.1/framework/configs/online-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/framework/configs/online-deployer/pom.xml?rev=668263&r1=668262&r2=668263&view=diff
==============================================================================
--- geronimo/server/branches/2.1/framework/configs/online-deployer/pom.xml (original)
+++ geronimo/server/branches/2.1/framework/configs/online-deployer/pom.xml Mon Jun 16 12:00:35 2008
@@ -62,29 +62,6 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-deploy-jsr88</artifactId>
-            <version>${version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-deploy-tool</artifactId>
-            <version>${version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-deploy-config</artifactId>
-            <version>${version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
-        </dependency>
-
-        <dependency>
             <groupId>commons-cli</groupId>
             <artifactId>commons-cli</artifactId>
         </dependency>

Modified: geronimo/server/branches/2.1/framework/configs/online-deployer/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/framework/configs/online-deployer/src/main/plan/plan.xml?rev=668263&r1=668262&r2=668263&view=diff
==============================================================================
--- geronimo/server/branches/2.1/framework/configs/online-deployer/src/main/plan/plan.xml (original)
+++ geronimo/server/branches/2.1/framework/configs/online-deployer/src/main/plan/plan.xml Mon Jun 16 12:00:35 2008
@@ -48,11 +48,24 @@
         </reference>
         <reference name="Repositories"></reference>
         <attribute name="versionMapLocation">var/config/artifact_aliases.properties</attribute>
+        <attribute name="additionalAliases">
+            org.apache.geronimo.framework/j2ee-system//car=org.apache.geronimo.framework/online-deployer/${version}/car
+            org.apache.geronimo.framework/j2ee-system/${version}/car=org.apache.geronimo.framework/online-deployer/${version}/car
+        </attribute>
         <reference name="ServerInfo">
             <name>ServerInfo</name>
         </reference>
     </gbean>
 
+    <!--User-editable attribute service-->
+    <gbean name="AttributeManager" 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>
+    </gbean>
+
     <!--Server attribute service-->
     <gbean name="ServerAttributeManager" class="org.apache.geronimo.system.configuration.SwitchableLocalAttributeManager">
         <reference name="ServerInfo">
@@ -99,29 +112,4 @@
         </reference>
     </gbean>
 
-    <gbean name="DeployTool" class="org.apache.geronimo.deployment.cli.DeployTool" >
-                      <reference name="DeploymentFactory">
-                          <name>DeploymentFactory</name>
-                      </reference>
-                  </gbean>
-
-    <gbean name="DeploymentFactory" class="org.apache.geronimo.deployment.plugin.factories.DeploymentFactoryWithKernel" />
-
-    <gbean name="ModuleConfigurerRegistry" class="org.apache.geronimo.deployment.plugin.jmx.RemoteDeploymentManager">
-                  <references name="ModuleConfigurers">
-                      <pattern>
-                          <name>ClientConfigurer</name>
-                      </pattern>
-                      <pattern>
-                          <name>EARConfigurer</name>
-                      </pattern>
-                      <pattern>
-                          <name>RARConfigurer</name>
-                      </pattern>
-                      <pattern>
-                          <name>WARConfigurer</name>
-                      </pattern>
-                  </references>
-              </gbean>
-
 </module>

Modified: geronimo/server/branches/2.1/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/resolver/ExplicitDefaultArtifactResolver.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/resolver/ExplicitDefaultArtifactResolver.java?rev=668263&r1=668262&r2=668263&view=diff
==============================================================================
--- geronimo/server/branches/2.1/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/resolver/ExplicitDefaultArtifactResolver.java (original)
+++ geronimo/server/branches/2.1/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/resolver/ExplicitDefaultArtifactResolver.java Mon Jun 16 12:00:35 2008
@@ -49,10 +49,18 @@
     private final ServerInfo serverInfo;
 
     public ExplicitDefaultArtifactResolver(String versionMapLocation,
+                                           ArtifactManager artifactManager,
+                                           Collection<? extends ListableRepository> repositories,
+                                           ServerInfo serverInfo ) throws IOException {
+        this(versionMapLocation, artifactManager, repositories, null, serverInfo);
+    }
+
+    public ExplicitDefaultArtifactResolver(String versionMapLocation,
             ArtifactManager artifactManager,
             Collection<? extends ListableRepository> repositories,
+            Map<String, String> additionalAliases,
             ServerInfo serverInfo ) throws IOException {
-        super(artifactManager, repositories, buildExplicitResolution(versionMapLocation, serverInfo));
+        super(artifactManager, repositories, buildExplicitResolution(versionMapLocation, additionalAliases, serverInfo));
         this.artifactAliasesFile = versionMapLocation;
         this.serverInfo = serverInfo;
     }
@@ -62,7 +70,7 @@
         return artifactAliasesFile;
     }
 
-    private static Map<Artifact, Artifact> buildExplicitResolution(String versionMapLocation, ServerInfo serverInfo) throws IOException {
+    private static Map<Artifact, Artifact> buildExplicitResolution(String versionMapLocation, Map<String, String> additionalAliases, ServerInfo serverInfo) throws IOException {
         if (versionMapLocation == null) {
             return null;
         }
@@ -76,6 +84,9 @@
                 in.close();
             }
         }
+        if (additionalAliases != null) {
+            properties.putAll(additionalAliases);
+        }
         return propertiesToArtifactMap(properties);
     }
 
@@ -136,6 +147,7 @@
     static {
         GBeanInfoBuilder infoFactory = GBeanInfoBuilder.createStatic(ExplicitDefaultArtifactResolver.class, "ArtifactResolver");
         infoFactory.addAttribute("versionMapLocation", String.class, true, true);
+        infoFactory.addAttribute("additionalAliases", Map.class, true, true);
         infoFactory.addReference("ArtifactManager", ArtifactManager.class, "ArtifactManager");
         infoFactory.addReference("Repositories", ListableRepository.class, "Repository");
         infoFactory.addReference("ServerInfo", ServerInfo.class, "GBean");
@@ -145,6 +157,7 @@
                 "versionMapLocation",
                 "ArtifactManager",
                 "Repositories",
+                "additionalAliases",
                 "ServerInfo"
         });