Return-Path: 
 <scm-return-33214-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 40905 invoked from network); 4 Nov 2008 17:42:29 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 4 Nov 2008 17:42:29 -0000
Received: (qmail 88192 invoked by uid 500); 4 Nov 2008 17:42:35 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 88146 invoked by uid 500); 4 Nov 2008 17:42:35 -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 88137 invoked by uid 99); 4 Nov 2008 17:42:35 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 Nov 2008 09:42:35 -0800
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; Tue, 04 Nov 2008 17:41:26 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 197E42388878; Tue,  4 Nov 2008 09:42:08 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r711325 - in /geronimo/server/trunk/framework:
 configs/plugin/src/main/plan/plan.xml
 modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/NewServerInstanceGBean.java
Date: Tue, 04 Nov 2008 17:42:07 -0000
To: scm@geronimo.apache.org
From: djencks@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20081104174208.197E42388878@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: djencks
Date: Tue Nov  4 09:42:06 2008
New Revision: 711325

URL: http://svn.apache.org/viewvc?rev=711325&view=rev
Log:
GERONIMO-4382.  Fix persistentConfigurationList reference so new server instance command actually works

Modified:
    geronimo/server/trunk/framework/configs/plugin/src/main/plan/plan.xml
    geronimo/server/trunk/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/NewServerInstanceGBean.java

Modified: geronimo/server/trunk/framework/configs/plugin/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/plugin/src/main/plan/plan.xml?rev=711325&r1=711324&r2=711325&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/plugin/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/framework/configs/plugin/src/main/plan/plan.xml Tue Nov  4 09:42:06 2008
@@ -118,11 +118,10 @@
         <reference name="ConfigManager">
             <name>ConfigurationManager</name>
         </reference>
-        <references name="PersistentConfigurationLists">
-            <pattern>
-                <name>AttributeManager</name>
-            </pattern>
-        </references>
+        <reference name="PersistentConfigurationList">
+            <type>AttributeStore</type>
+            <name>AttributeManager</name>
+        </reference>
     </gbean>
 
 </module>

Modified: geronimo/server/trunk/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/NewServerInstanceGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/NewServerInstanceGBean.java?rev=711325&r1=711324&r2=711325&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/NewServerInstanceGBean.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/NewServerInstanceGBean.java Tue Nov  4 09:42:06 2008
@@ -41,7 +41,7 @@
 import org.apache.geronimo.system.plugin.model.PluginType;
 
 /**
- * @version $Rev:$ $Date:$
+ * @version $Rev$ $Date$
  */
 @GBean
 public class NewServerInstanceGBean implements NewServerInstance {
@@ -53,7 +53,7 @@
     private final Kernel kernel;
 
     public NewServerInstanceGBean(@ParamAttribute(name = "defaultPlugins")Map<String, String> defaultPlugins,
-                                  @ParamReference(name = "PersistentConfigurationLists")Collection<PersistentConfigurationList> persistentConfigurationLists,
+                                  @ParamReference(name = "PersistentConfigurationList", namingType="PersistentConfigurationList.PERSISTENT_CONFIGURATION_LIST")Collection<PersistentConfigurationList> persistentConfigurationLists,
                                   @ParamReference(name = "PluginInstallerGBean")PluginInstallerGBean pluginInstallerGBean,
                                   @ParamReference(name = "ConfigManager", namingType = "ConfigurationManager")ConfigurationManager configManager,
                                   @ParamSpecial(type = SpecialAttributeType.kernel)Kernel kernel) {