[jboss-cvs] JBossAS SVN: r70749 - in trunk: embedded/src/main/resources/javase/deployers and 4 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Mar 11 16:09:45 EDT 2008
Author: sguilhen at redhat.com
Date: 2008-03-11 16:09:45 -0400 (Tue, 11 Mar 2008)
New Revision: 70749
Modified:
trunk/embedded/src/main/resources/javase/conf/jboss-service.xml
trunk/embedded/src/main/resources/javase/deployers/security-deployer-beans.xml
trunk/security/src/main/org/jboss/security/auth/login/XMLLoginConfig.java
trunk/security/src/main/org/jboss/security/plugins/SecurityConfig.java
trunk/server/src/etc/conf/default/jboss-service.xml
trunk/server/src/etc/deployers/security-deployer-beans.xml
Log:
JBAS-5204: moved both the XMLLoginConfig and SecurityConfig from the jboss-service.xml to the security-deployer-beans.xml. Both were annotated with @JMX so they still can be managed via the jmx-console.
Modified: trunk/embedded/src/main/resources/javase/conf/jboss-service.xml
===================================================================
--- trunk/embedded/src/main/resources/javase/conf/jboss-service.xml 2008-03-11 18:07:17 UTC (rev 70748)
+++ trunk/embedded/src/main/resources/javase/conf/jboss-service.xml 2008-03-11 20:09:45 UTC (rev 70749)
@@ -29,16 +29,6 @@
<!-- Security -->
<!-- ==================================================================== -->
- <mbean code="org.jboss.security.plugins.SecurityConfig"
- name="jboss.security:service=SecurityConfig">
- <attribute name="LoginConfig">jboss.security:service=XMLLoginConfig</attribute>
- <depends>jboss.security:service=XMLLoginConfig</depends>
- </mbean>
- <mbean code="org.jboss.security.auth.login.XMLLoginConfig"
- name="jboss.security:service=XMLLoginConfig">
- <attribute name="ConfigResource">${jboss.embedded.bootstrap.resource.path}conf/login-config.xml</attribute>
- </mbean>
-
<!-- JAAS security manager and realm mapping -->
<mbean code="org.jboss.security.plugins.JaasSecurityManagerService"
name="jboss.security:service=JaasSecurityManager">
Modified: trunk/embedded/src/main/resources/javase/deployers/security-deployer-beans.xml
===================================================================
--- trunk/embedded/src/main/resources/javase/deployers/security-deployer-beans.xml 2008-03-11 18:07:17 UTC (rev 70748)
+++ trunk/embedded/src/main/resources/javase/deployers/security-deployer-beans.xml 2008-03-11 20:09:45 UTC (rev 70749)
@@ -27,4 +27,14 @@
<bean name="JNDIBasedSecurityManagement" class="org.jboss.security.integration.JNDIBasedSecurityManagement">
</bean>
+ <bean name="XMLLoginConfig" class="org.jboss.security.auth.login.XMLLoginConfig">
+ <property name="configResource">login-config.xml</property>
+ </bean>
+
+ <bean name="SecurityConfig" class="org.jboss.security.plugins.SecurityConfig">
+ <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
+ <property name="loginConfig">jboss.security:service=XMLLoginConfig</property>
+ <depends>jboss.security:service=XMLLoginConfig</depends>
+ </bean>
+
</deployment>
Modified: trunk/security/src/main/org/jboss/security/auth/login/XMLLoginConfig.java
===================================================================
--- trunk/security/src/main/org/jboss/security/auth/login/XMLLoginConfig.java 2008-03-11 18:07:17 UTC (rev 70748)
+++ trunk/security/src/main/org/jboss/security/auth/login/XMLLoginConfig.java 2008-03-11 20:09:45 UTC (rev 70749)
@@ -29,6 +29,7 @@
import javax.security.auth.login.Configuration;
import javax.security.auth.login.AppConfigurationEntry;
+import org.jboss.aop.microcontainer.aspects.jmx.JMX;
import org.jboss.security.config.ApplicationPolicy;
import org.jboss.system.ServiceMBeanSupport;
@@ -38,6 +39,7 @@
@author Anil.Saldhana at jboss.org
@version $Revision: 56406 $
*/
+ at JMX(name="jboss.security:service=XMLLoginConfig", exposedInterface=XMLLoginConfigMBean.class)
public class XMLLoginConfig extends ServiceMBeanSupport
implements XMLLoginConfigMBean
{
Modified: trunk/security/src/main/org/jboss/security/plugins/SecurityConfig.java
===================================================================
--- trunk/security/src/main/org/jboss/security/plugins/SecurityConfig.java 2008-03-11 18:07:17 UTC (rev 70748)
+++ trunk/security/src/main/org/jboss/security/plugins/SecurityConfig.java 2008-03-11 20:09:45 UTC (rev 70749)
@@ -28,6 +28,7 @@
import javax.management.ObjectName;
import javax.security.auth.login.Configuration;
+import org.jboss.aop.microcontainer.aspects.jmx.JMX;
import org.jboss.system.ServiceMBeanSupport;
/** The SecurityConfigMBean implementation. This class needs the
@@ -38,8 +39,8 @@
@author Scott.Stark at jboss.org
@version $Revision: 58710 $
*/
-public class SecurityConfig extends ServiceMBeanSupport
- implements SecurityConfigMBean
+ at JMX(name="jboss.security:service=SecurityConfig", exposedInterface=SecurityConfigMBean.class)
+public class SecurityConfig extends ServiceMBeanSupport implements SecurityConfigMBean
{
// Constants -----------------------------------------------------
@@ -48,6 +49,8 @@
private String loginConfigName;
/** The stack of Configuration mbeans that are active */
private Stack loginConfigStack = new Stack();
+ /** The MBeanServer */
+ private MBeanServer mbeanServer;
static class ConfigInfo
{
@@ -83,6 +86,16 @@
this.loginConfigName = name;
}
+ public MBeanServer getMbeanServer()
+ {
+ return this.mbeanServer;
+ }
+
+ public void setMbeanServer(MBeanServer server)
+ {
+ this.mbeanServer = server;
+ }
+
/** Start the configuration service by pushing the mbean given by the
LoginConfig onto the configuration stack.
*/
@@ -144,10 +157,9 @@
private ConfigInfo installConfig(ObjectName name, Configuration prevConfig)
throws JMException
{
- MBeanServer server = super.getServer();
Object[] args = {prevConfig};
String[] signature = {"javax.security.auth.login.Configuration"};
- Configuration config = (Configuration) server.invoke(name,
+ Configuration config = (Configuration) this.mbeanServer.invoke(name,
"getConfiguration", args, signature);
Configuration.setConfiguration(config);
ConfigInfo info = new ConfigInfo(name, config);
Modified: trunk/server/src/etc/conf/default/jboss-service.xml
===================================================================
--- trunk/server/src/etc/conf/default/jboss-service.xml 2008-03-11 18:07:17 UTC (rev 70748)
+++ trunk/server/src/etc/conf/default/jboss-service.xml 2008-03-11 20:09:45 UTC (rev 70749)
@@ -276,16 +276,6 @@
<!-- Security -->
<!-- ==================================================================== -->
- <mbean code="org.jboss.security.plugins.SecurityConfig"
- name="jboss.security:service=SecurityConfig">
- <attribute name="LoginConfig">jboss.security:service=XMLLoginConfig</attribute>
- <depends>jboss.security:service=XMLLoginConfig</depends>
- </mbean>
- <mbean code="org.jboss.security.auth.login.XMLLoginConfig"
- name="jboss.security:service=XMLLoginConfig">
- <attribute name="ConfigResource">login-config.xml</attribute>
- </mbean>
-
<!-- JAAS security manager and realm mapping -->
<mbean code="org.jboss.security.plugins.JaasSecurityManagerService"
name="jboss.security:service=JaasSecurityManager">
Modified: trunk/server/src/etc/deployers/security-deployer-beans.xml
===================================================================
--- trunk/server/src/etc/deployers/security-deployer-beans.xml 2008-03-11 18:07:17 UTC (rev 70748)
+++ trunk/server/src/etc/deployers/security-deployer-beans.xml 2008-03-11 20:09:45 UTC (rev 70749)
@@ -20,4 +20,14 @@
<bean name="JNDIBasedSecurityManagement" class="org.jboss.security.integration.JNDIBasedSecurityManagement">
</bean>
+ <bean name="XMLLoginConfig" class="org.jboss.security.auth.login.XMLLoginConfig">
+ <property name="configResource">login-config.xml</property>
+ </bean>
+
+ <bean name="SecurityConfig" class="org.jboss.security.plugins.SecurityConfig">
+ <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
+ <property name="loginConfig">jboss.security:service=XMLLoginConfig</property>
+ <depends>jboss.security:service=XMLLoginConfig</depends>
+ </bean>
+
</deployment>
More information about the jboss-cvs-commits
mailing list