geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
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 GMT
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) {



Mime
View raw message