geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r592586 - in /geronimo/server/trunk/framework/configs/online-deployer: pom.xml src/main/plan/plan.xml
Date Tue, 06 Nov 2007 23:45:17 GMT
Author: djencks
Date: Tue Nov  6 15:45:15 2007
New Revision: 592586

URL: http://svn.apache.org/viewvc?rev=592586&view=rev
Log:
GERONIMO-3579 fix broken online and offline deployers from previous modifications

Modified:
    geronimo/server/trunk/framework/configs/online-deployer/pom.xml
    geronimo/server/trunk/framework/configs/online-deployer/src/main/plan/plan.xml

Modified: geronimo/server/trunk/framework/configs/online-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/online-deployer/pom.xml?rev=592586&r1=592585&r2=592586&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/online-deployer/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/online-deployer/pom.xml Tue Nov  6 15:45:15 2007
@@ -56,6 +56,29 @@
         </dependency>
 
         <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-deploy-jsr88</artifactId>
+            <version>${version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-deploy-tool</artifactId>
+            <version>${version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</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/trunk/framework/configs/online-deployer/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/online-deployer/src/main/plan/plan.xml?rev=592586&r1=592585&r2=592586&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/online-deployer/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/framework/configs/online-deployer/src/main/plan/plan.xml Tue Nov
 6 15:45:15 2007
@@ -38,15 +38,6 @@
         </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>
-
     <!-- ArtifactManager -->
     <gbean name="ArtifactManager" class="org.apache.geronimo.kernel.repository.DefaultArtifactManager"/>
 
@@ -76,7 +67,7 @@
         <reference name="Stores"></reference>
         <reference name="Watchers"></reference>
         <reference name="AttributeStore">
-            <name>AttributeManager</name>
+            <name>ServerAttributeManager</name>
         </reference>
         <reference name="PersistentConfigurationList">
             <type>AttributeStore</type>
@@ -105,5 +96,30 @@
             <name>ServerInfo</name>
         </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>



Mime
View raw message