geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r723644 - in /geronimo/server/trunk/plugins/monitoring: agent-ds/src/main/plan/plan.xml agent/src/main/plan/plan.xml
Date Fri, 05 Dec 2008 08:16:51 GMT
Author: djencks
Date: Fri Dec  5 00:16:50 2008
New Revision: 723644

URL: http://svn.apache.org/viewvc?rev=723644&view=rev
Log:
GERONIMO-4415 try to work around gbean startup ordering issue by moving required gbean to
a parent plugin

Modified:
    geronimo/server/trunk/plugins/monitoring/agent-ds/src/main/plan/plan.xml
    geronimo/server/trunk/plugins/monitoring/agent/src/main/plan/plan.xml

Modified: geronimo/server/trunk/plugins/monitoring/agent-ds/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/agent-ds/src/main/plan/plan.xml?rev=723644&r1=723643&r2=723644&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/agent-ds/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/monitoring/agent-ds/src/main/plan/plan.xml Fri Dec  5 00:16:50
2008
@@ -78,4 +78,25 @@
             <name>jdbc/ArchiveDS</name>
         </reference>
     </gbean>
+
+    <!-- this ought to be in the agent plan but this realm is not always started before
the credential-store, even with the dependency -->
+    <gbean name="monitoring-runas-realm"
+        class="org.apache.geronimo.security.realm.GenericSecurityRealm">
+        <attribute name="realmName">monitoring-runas-realm</attribute>
+        <attribute name="publish">false</attribute>
+        <xml-reference name="LoginModuleConfiguration">
+            <lc:login-config xmlns:lc="http://geronimo.apache.org/xml/ns/loginconfig-1.2">
+                <lc:login-module control-flag="REQUIRED">
+                    <lc:login-domain-name>monitoring-runas-domain</lc:login-domain-name>
+                    <lc:login-module-class>org.apache.geronimo.security.credentialstore.RunAsLoginModule</lc:login-module-class>
+                    <lc:option name="principalClass">org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal</lc:option>
+                    <lc:option name="principalNames">admin</lc:option>
+                </lc:login-module>
+            </lc:login-config>
+        </xml-reference>
+        <!--<reference name="ServerInfo">-->
+            <!--<name>ServerInfo</name>-->
+        <!--</reference>-->
+    </gbean>
+
 </connector>

Modified: geronimo/server/trunk/plugins/monitoring/agent/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/agent/src/main/plan/plan.xml?rev=723644&r1=723643&r2=723644&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/agent/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/monitoring/agent/src/main/plan/plan.xml Fri Dec  5 00:16:50
2008
@@ -78,24 +78,6 @@
         </sys:dependency>
     </sys:gbean>
 
-    <gbean name="monitoring-runas-realm"
-        class="org.apache.geronimo.security.realm.GenericSecurityRealm">
-        <attribute name="realmName">monitoring-runas-realm</attribute>
-        <attribute name="publish">false</attribute>
-        <xml-reference name="LoginModuleConfiguration">
-            <lc:login-config xmlns:lc="http://geronimo.apache.org/xml/ns/loginconfig-1.2">
-                <lc:login-module control-flag="REQUIRED">
-                    <lc:login-domain-name>monitoring-runas-domain</lc:login-domain-name>
-                    <lc:login-module-class>org.apache.geronimo.security.credentialstore.RunAsLoginModule</lc:login-module-class>
-                    <lc:option name="principalClass">org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal</lc:option>
-                    <lc:option name="principalNames">admin</lc:option>
-                </lc:login-module>
-            </lc:login-config>
-        </xml-reference>
-        <!--<reference name="ServerInfo">-->
-            <!--<name>ServerInfo</name>-->
-        <!--</reference>-->
-    </gbean>
-
-    
+    <!-- the realm is in the agent-ds plan although it should be here.  For some reason
it doesn't always start before the credential-store
+    despite the dependency -->
 </openejb-jar>



Mime
View raw message