Return-Path: 
 <scm-return-11272-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 83555 invoked from network); 14 Apr 2006 08:32:17 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 14 Apr 2006 08:32:17 -0000
Received: (qmail 15167 invoked by uid 500); 14 Apr 2006 08:32:16 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 15145 invoked by uid 500); 14 Apr 2006 08:32:16 -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 15132 invoked by uid 99); 14 Apr 2006 08:32:15 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 14 Apr 2006 01:32:15 -0700
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194)
    by apache.org (qpsmtpd/0.29) with SMTP; Fri, 14 Apr 2006 01:32:15 -0700
Received: (qmail 83161 invoked by uid 65534); 14 Apr 2006 08:31:54 -0000
Message-ID: <20060414083154.83117.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r394049 - in /geronimo/branches/1.1/configs:
 client-system/src/plan/plan.xml jetty-deployer/src/plan/plan.xml
Date: Fri, 14 Apr 2006 08:31:48 -0000
To: scm@geronimo.apache.org
From: djencks@apache.org
X-Mailer: svnmailer-1.0.7
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: djencks
Date: Fri Apr 14 01:31:45 2006
New Revision: 394049

URL: http://svn.apache.org/viewcvs?rev=394049&view=rev
Log:
plan tweaks

Modified:
    geronimo/branches/1.1/configs/client-system/src/plan/plan.xml
    geronimo/branches/1.1/configs/jetty-deployer/src/plan/plan.xml

Modified: geronimo/branches/1.1/configs/client-system/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/client-system/src/plan/plan.xml?rev=394049&r1=394048&r2=394049&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/client-system/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/client-system/src/plan/plan.xml Fri Apr 14 01:31:45 2006
@@ -24,40 +24,67 @@
     <!-- ServerInfo service -->
     <gbean name="ServerInfo" class="org.apache.geronimo.system.serverinfo.BasicServerInfo"/>
 
-    <!-- Configuration Manager service -->
-    <gbean name="ConfigurationManager" class="org.apache.geronimo.kernel.config.KernelConfigurationManager">
-        <reference name="Stores">
-            <!--<gbean-name>*:j2eeType=ConfigurationStore,*</gbean-name>-->
-        </reference>
-        <reference name="AttributeStore">
-            <name>AttributeManager</name>
-        </reference>
-        <reference name="PersistentConfigurationList">
-          <type>AttributeStore</type>
-          <name>AttributeManager</name>
-        </reference>
+    <!--Repository-->
+    <gbean name="Repository" class="org.apache.geronimo.system.repository.Maven2Repository">
+      <attribute name="root">repository/</attribute>
+      <reference name="ServerInfo">
+        <name>ServerInfo</name>
+      </reference>
+    </gbean>
+
+    <!--Configuration Store service-->
+    <gbean name="Local" class="org.apache.geronimo.system.configuration.RepositoryConfigurationStore">
+      <reference name="Repository">
+        <name>Repository</name>
+      </reference>
     </gbean>
 
-    <!-- User-editable attribute service -->
+    <!--User-editable attribute service-->
     <gbean name="AttributeManager" class="org.apache.geronimo.system.configuration.LocalAttributeManager">
-        <reference name="ServerInfo">
-            <name>ServerInfo</name>
-        </reference>
-        <attribute name="configFile">var/config/config.xml</attribute>
-        <!-- The client container should not alter the saved configuration -->
-        <attribute name="readOnly">true</attribute>
+      <reference name="ServerInfo">
+        <name>ServerInfo</name>
+      </reference>
+      <attribute name="configFile">var/config/config.xml</attribute>
     </gbean>
 
-    <!-- Configuration Store service -->
-    <gbean name="Local" class="org.apache.geronimo.system.configuration.RepositoryConfigurationStore">
-        <reference name="Repository">
-            <name>Repository</name>
-        </reference>
+    <!-- ArtifactManager -->
+    <gbean name="ArtifactManager" class="org.apache.geronimo.kernel.repository.DefaultArtifactManager"/>
+
+    <!-- ArtifactResolver -->
+    <gbean name="ArtifactResolver" class="org.apache.geronimo.kernel.repository.DefaultArtifactResolver">
+      <reference name="ArtifactManager">
+        <name>ArtifactManager</name>
+      </reference>
+      <reference name="Repositories">
+        <!--<gbean-name>*:name=Repository,*</gbean-name>-->
+      </reference>
     </gbean>
 
-    <!-- Repository -->
-    <gbean name="Repository" class="org.apache.geronimo.system.repository.Maven2Repository">
-        <attribute name="root">repository/</attribute>
+    <!--Configuration Manager service-->
+    <gbean name="ConfigurationManager" class="org.apache.geronimo.kernel.config.EditableKernelConfigurationManager">
+      <reference name="Repositories">
+      </reference>
+      <reference name="Stores">
+      </reference>
+      <reference name="AttributeStore">
+        <name>AttributeManager</name>
+      </reference>
+      <reference name="PersistentConfigurationList">
+        <type>AttributeStore</type>
+        <name>AttributeManager</name>
+      </reference>
+      <reference name="ArtifactManager">
+        <name>ArtifactManager</name>
+      </reference>
+      <reference name="ArtifactResolver">
+        <name>ArtifactResolver</name>
+      </reference>
+    </gbean>
+
+    <!-- Logging service -->
+    <gbean name="Logger" class="org.apache.geronimo.system.logging.log4j.Log4jService">
+        <attribute name="configFileName">var/log/client-log4j.properties</attribute>
+        <attribute name="refreshPeriodSeconds">60</attribute>
         <reference name="ServerInfo">
             <name>ServerInfo</name>
         </reference>
@@ -82,12 +109,4 @@
         </reference>
     </gbean>
 
-    <!-- Logging service -->
-    <gbean name="Logger" class="org.apache.geronimo.system.logging.log4j.Log4jService">
-        <attribute name="configFileName">var/log/client-log4j.properties</attribute>
-        <attribute name="refreshPeriodSeconds">60</attribute>
-        <reference name="ServerInfo">
-            <name>ServerInfo</name>
-        </reference>
-    </gbean>
 </configuration>

Modified: geronimo/branches/1.1/configs/jetty-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/jetty-deployer/src/plan/plan.xml?rev=394049&r1=394048&r2=394049&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/jetty-deployer/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/jetty-deployer/src/plan/plan.xml Fri Apr 14 01:31:45 2006
@@ -16,12 +16,7 @@
 -->
 
 <!-- $Rev$ $Date$ -->
-<!--               parentId="${pom.groupId}/j2ee-deployer/${pom.currentVersion}/car"
--->
-<configuration
-    xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1"
-
-    >
+<configuration xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
 
     <gbean name="JettyWebBuilder" class="org.apache.geronimo.jetty.deployment.JettyModuleBuilder">
         <attribute name="defaultSessionTimeoutSeconds">1800</attribute>
@@ -40,7 +35,6 @@
             <name>POJOTemplate</name>
         </reference>
         <reference name="WebServiceBuilder">
-            <!--<module>${pom.groupId}/j2ee-deployer/${pom.currentVersion}/car</module>-->
             <name>WebServiceBuilder</name>
         </reference>
         <xml-attribute name="defaultEnvironment">