[jboss-cvs] JBossAS SVN: r90749 - branches/JBPAPP_5_0/build.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Jul 1 14:17:25 EDT 2009
Author: smarlow at redhat.com
Date: 2009-07-01 14:17:25 -0400 (Wed, 01 Jul 2009)
New Revision: 90749
Modified:
branches/JBPAPP_5_0/build/jbossas-5-disableauth.patch
Log:
JBPAPP-2052 production profile for EAP 5
Modified: branches/JBPAPP_5_0/build/jbossas-5-disableauth.patch
===================================================================
--- branches/JBPAPP_5_0/build/jbossas-5-disableauth.patch 2009-07-01 17:23:49 UTC (rev 90748)
+++ branches/JBPAPP_5_0/build/jbossas-5-disableauth.patch 2009-07-01 18:17:25 UTC (rev 90749)
@@ -1,6 +1,6 @@
-diff -Naur ./server/production/conf/login-config.xml ./server/production/conf/login-config.xml
---- ./server/production/conf/login-config.xml 2009-06-30 10:11:15.000000000 -0400
-+++ ./server/production/conf/login-config.xml 2009-06-30 09:32:56.000000000 -0400
+diff -Naur --exclude='*.class' --exclude='*.jar' ./server/all/conf/login-config.xml ./server/all/conf/login-config.xml
+--- ./server/all/conf/login-config.xml 2009-07-01 13:36:17.000000000 -0400
++++ ./server/all/conf/login-config.xml 2009-07-01 13:38:06.000000000 -0400
@@ -85,8 +85,8 @@
<authentication>
<login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule"
@@ -12,21 +12,252 @@
</login-module>
</authentication>
</application-policy>
-diff -Naur ./server/production/conf/props/web-console-roles.properties ./server/production/conf/props/web-console-roles.properties
---- ./server/production/conf/props/web-console-roles.properties 2009-06-30 10:54:23.000000000 -0400
+diff -Naur --exclude='*.class' --exclude='*.jar' ./server/all/conf/props/web-console-roles.properties ./server/all/conf/props/web-console-roles.properties
+--- ./server/all/conf/props/web-console-roles.properties 2009-07-01 13:36:17.000000000 -0400
++++ ./server/all/conf/props/web-console-roles.properties 1969-12-31 19:00:00.000000000 -0500
+@@ -1,2 +0,0 @@
+-# A sample roles.properties file for use with the UsersRolesLoginModule
+-admin=JBossAdmin,HttpInvoker
+diff -Naur --exclude='*.class' --exclude='*.jar' ./server/all/conf/props/web-console-users.properties ./server/all/conf/props/web-console-users.properties
+--- ./server/all/conf/props/web-console-users.properties 2009-07-01 13:36:17.000000000 -0400
++++ ./server/all/conf/props/web-console-users.properties 1969-12-31 19:00:00.000000000 -0500
+@@ -1,2 +0,0 @@
+-# A sample users.properties file for use with the UsersRolesLoginModule
+-admin=admin
+diff -Naur --exclude='*.class' --exclude='*.jar' ./server/all/deploy/httpha-invoker.sar/invoker.war/WEB-INF/web.xml ./server/all/deploy/httpha-invoker.sar/invoker.war/WEB-INF/web.xml
+--- ./server/all/deploy/httpha-invoker.sar/invoker.war/WEB-INF/web.xml 2009-07-01 13:36:17.000000000 -0400
++++ ./server/all/deploy/httpha-invoker.sar/invoker.war/WEB-INF/web.xml 2009-06-29 16:47:04.000000000 -0400
+@@ -203,9 +203,6 @@
+ role HttpInvoker to access the HTTP invoker servlets
+ </description>
+ <url-pattern>/restricted/*</url-pattern>
+- <url-pattern>/JNDIFactory/*</url-pattern>
+- <url-pattern>/EJBInvokerServlet/*</url-pattern>
+- <url-pattern>/JMXInvokerServlet/*</url-pattern>
+ <http-method>GET</http-method>
+ <http-method>POST</http-method>
+ </web-resource-collection>
+diff -Naur --exclude='*.class' --exclude='*.jar' ./server/all/deploy/jmx-console.war/WEB-INF/jboss-web.xml ./server/all/deploy/jmx-console.war/WEB-INF/jboss-web.xml
+--- ./server/all/deploy/jmx-console.war/WEB-INF/jboss-web.xml 2009-07-01 13:36:17.000000000 -0400
++++ ./server/all/deploy/jmx-console.war/WEB-INF/jboss-web.xml 2009-05-26 16:15:38.000000000 -0400
+@@ -6,6 +6,6 @@
+ <!-- Uncomment the security-domain to enable security. You will
+ need to edit the htmladaptor login configuration to setup the
+ login modules used to authentication users.
+- -->
+ <security-domain>java:/jaas/jmx-console</security-domain>
++ -->
+ </jboss-web>
+diff -Naur --exclude='*.class' --exclude='*.jar' ./server/all/deploy/jmx-console.war/WEB-INF/web.xml ./server/all/deploy/jmx-console.war/WEB-INF/web.xml
+--- ./server/all/deploy/jmx-console.war/WEB-INF/web.xml 2009-07-01 13:36:17.000000000 -0400
++++ ./server/all/deploy/jmx-console.war/WEB-INF/web.xml 2009-05-26 16:15:38.000000000 -0400
+@@ -97,7 +97,6 @@
+ to users with the role JBossAdmin. Edit the roles to what you want and
+ uncomment the WEB-INF/jboss-web.xml/security-domain element to enable
+ secured access to the HTML JMX console.
+- -->
+ <security-constraint>
+ <web-resource-collection>
+ <web-resource-name>HtmlAdaptor</web-resource-name>
+@@ -112,6 +111,7 @@
+ <role-name>JBossAdmin</role-name>
+ </auth-constraint>
+ </security-constraint>
++ -->
+
+ <login-config>
+ <auth-method>BASIC</auth-method>
+diff -Naur --exclude='*.class' --exclude='*.jar' ./server/all/deploy/jmx-invoker-service.xml ./server/all/deploy/jmx-invoker-service.xml
+--- ./server/all/deploy/jmx-invoker-service.xml 2009-07-01 13:36:17.000000000 -0400
++++ ./server/all/deploy/jmx-invoker-service.xml 2009-07-01 13:38:06.000000000 -0400
+@@ -111,9 +111,10 @@
+ <return-type>java.lang.Object</return-type>
+ <descriptors>
+ <interceptors>
+- <!-- Uncomment to require authenticated users -->
++ <!-- Uncomment to require authenticated users
+ <interceptor code="org.jboss.jmx.connector.invoker.AuthenticationInterceptor"
+ securityDomain="java:/jaas/jmx-console"/>
++ -->
+ <!-- Interceptor that deals with non-serializable results -->
+ <interceptor code="org.jboss.jmx.connector.invoker.SerializableInterceptor"
+ policyClass="StripModelMBeanInfoPolicy"/>
+diff -Naur --exclude='*.class' --exclude='*.jar' ./server/all/deploy/management/console-mgr.sar/web-console.war/WEB-INF/jboss-web.xml ./server/all/deploy/management/console-mgr.sar/web-console.war/WEB-INF/jboss-web.xml
+--- ./server/all/deploy/management/console-mgr.sar/web-console.war/WEB-INF/jboss-web.xml 2009-07-01 13:36:17.000000000 -0400
++++ ./server/all/deploy/management/console-mgr.sar/web-console.war/WEB-INF/jboss-web.xml 2009-05-26 16:18:02.000000000 -0400
+@@ -9,8 +9,8 @@
+ <!-- Uncomment the security-domain to enable security. You will
+ need to edit the htmladaptor login configuration to setup the
+ login modules used to authentication users.
+- -->
+ <security-domain>java:/jaas/web-console</security-domain>
++ -->
+
+ <!-- The war depends on the -->
+ <depends>jboss.admin:service=PluginManager</depends>
+diff -Naur --exclude='*.class' --exclude='*.jar' ./server/all/deploy/management/console-mgr.sar/web-console.war/WEB-INF/web.xml ./server/all/deploy/management/console-mgr.sar/web-console.war/WEB-INF/web.xml
+--- ./server/all/deploy/management/console-mgr.sar/web-console.war/WEB-INF/web.xml 2009-07-01 13:36:17.000000000 -0400
++++ ./server/all/deploy/management/console-mgr.sar/web-console.war/WEB-INF/web.xml 2009-05-26 16:18:02.000000000 -0400
+@@ -339,7 +339,6 @@
+ to users with the role JBossAdmin. Edit the roles to what you want and
+ uncomment the WEB-INF/jboss-web.xml/security-domain element to enable
+ secured access to the HTML JMX console.
+- -->
+
+ <security-constraint>
+ <web-resource-collection>
+@@ -355,6 +354,7 @@
+ <role-name>JBossAdmin</role-name>
+ </auth-constraint>
+ </security-constraint>
++ -->
+
+ <login-config>
+ <auth-method>BASIC</auth-method>
+diff -Naur --exclude='*.class' --exclude='*.jar' ./server/default/conf/login-config.xml ./server/default/conf/login-config.xml
+--- ./server/default/conf/login-config.xml 2009-07-01 13:36:17.000000000 -0400
++++ ./server/default/conf/login-config.xml 2009-07-01 13:38:32.000000000 -0400
+@@ -85,8 +85,8 @@
+ <authentication>
+ <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule"
+ flag="required">
+- <module-option name="usersProperties">props/web-console-users.properties</module-option>
+- <module-option name="rolesProperties">props/web-console-roles.properties</module-option>
++ <module-option name="usersProperties">web-console-users.properties</module-option>
++ <module-option name="rolesProperties">web-console-roles.properties</module-option>
+ </login-module>
+ </authentication>
+ </application-policy>
+diff -Naur --exclude='*.class' --exclude='*.jar' ./server/default/conf/props/web-console-roles.properties ./server/default/conf/props/web-console-roles.properties
+--- ./server/default/conf/props/web-console-roles.properties 2009-07-01 13:36:17.000000000 -0400
++++ ./server/default/conf/props/web-console-roles.properties 1969-12-31 19:00:00.000000000 -0500
+@@ -1,2 +0,0 @@
+-# A sample roles.properties file for use with the UsersRolesLoginModule
+-admin=JBossAdmin,HttpInvoker
+diff -Naur --exclude='*.class' --exclude='*.jar' ./server/default/conf/props/web-console-users.properties ./server/default/conf/props/web-console-users.properties
+--- ./server/default/conf/props/web-console-users.properties 2009-07-01 13:36:17.000000000 -0400
++++ ./server/default/conf/props/web-console-users.properties 1969-12-31 19:00:00.000000000 -0500
+@@ -1,2 +0,0 @@
+-# A sample users.properties file for use with the UsersRolesLoginModule
+-admin=admin
+diff -Naur --exclude='*.class' --exclude='*.jar' ./server/default/deploy/jmx-console.war/WEB-INF/jboss-web.xml ./server/default/deploy/jmx-console.war/WEB-INF/jboss-web.xml
+--- ./server/default/deploy/jmx-console.war/WEB-INF/jboss-web.xml 2009-07-01 13:36:17.000000000 -0400
++++ ./server/default/deploy/jmx-console.war/WEB-INF/jboss-web.xml 2009-07-01 13:38:32.000000000 -0400
+@@ -6,6 +6,6 @@
+ <!-- Uncomment the security-domain to enable security. You will
+ need to edit the htmladaptor login configuration to setup the
+ login modules used to authentication users.
+- -->
+ <security-domain>java:/jaas/jmx-console</security-domain>
++ -->
+ </jboss-web>
+diff -Naur --exclude='*.class' --exclude='*.jar' ./server/default/deploy/jmx-console.war/WEB-INF/web.xml ./server/default/deploy/jmx-console.war/WEB-INF/web.xml
+--- ./server/default/deploy/jmx-console.war/WEB-INF/web.xml 2009-07-01 13:36:17.000000000 -0400
++++ ./server/default/deploy/jmx-console.war/WEB-INF/web.xml 2009-07-01 13:38:32.000000000 -0400
+@@ -97,7 +97,6 @@
+ to users with the role JBossAdmin. Edit the roles to what you want and
+ uncomment the WEB-INF/jboss-web.xml/security-domain element to enable
+ secured access to the HTML JMX console.
+- -->
+ <security-constraint>
+ <web-resource-collection>
+ <web-resource-name>HtmlAdaptor</web-resource-name>
+@@ -112,6 +111,7 @@
+ <role-name>JBossAdmin</role-name>
+ </auth-constraint>
+ </security-constraint>
++ -->
+
+ <login-config>
+ <auth-method>BASIC</auth-method>
+diff -Naur --exclude='*.class' --exclude='*.jar' ./server/default/deploy/jmx-invoker-service.xml ./server/default/deploy/jmx-invoker-service.xml
+--- ./server/default/deploy/jmx-invoker-service.xml 2009-07-01 13:36:17.000000000 -0400
++++ ./server/default/deploy/jmx-invoker-service.xml 2009-07-01 13:38:32.000000000 -0400
+@@ -111,9 +111,10 @@
+ <return-type>java.lang.Object</return-type>
+ <descriptors>
+ <interceptors>
+- <!-- Uncomment to require authenticated users -->
++ <!-- Uncomment to require authenticated users
+ <interceptor code="org.jboss.jmx.connector.invoker.AuthenticationInterceptor"
+ securityDomain="java:/jaas/jmx-console"/>
++ -->
+ <!-- Interceptor that deals with non-serializable results -->
+ <interceptor code="org.jboss.jmx.connector.invoker.SerializableInterceptor"
+ policyClass="StripModelMBeanInfoPolicy"/>
+diff -Naur --exclude='*.class' --exclude='*.jar' ./server/default/deploy/management/console-mgr.sar/web-console.war/WEB-INF/jboss-web.xml ./server/default/deploy/management/console-mgr.sar/web-console.war/WEB-INF/jboss-web.xml
+--- ./server/default/deploy/management/console-mgr.sar/web-console.war/WEB-INF/jboss-web.xml 2009-07-01 13:36:17.000000000 -0400
++++ ./server/default/deploy/management/console-mgr.sar/web-console.war/WEB-INF/jboss-web.xml 2009-07-01 13:38:32.000000000 -0400
+@@ -9,8 +9,8 @@
+ <!-- Uncomment the security-domain to enable security. You will
+ need to edit the htmladaptor login configuration to setup the
+ login modules used to authentication users.
+- -->
+ <security-domain>java:/jaas/web-console</security-domain>
++ -->
+
+ <!-- The war depends on the -->
+ <depends>jboss.admin:service=PluginManager</depends>
+diff -Naur --exclude='*.class' --exclude='*.jar' ./server/default/deploy/management/console-mgr.sar/web-console.war/WEB-INF/web.xml ./server/default/deploy/management/console-mgr.sar/web-console.war/WEB-INF/web.xml
+--- ./server/default/deploy/management/console-mgr.sar/web-console.war/WEB-INF/web.xml 2009-07-01 13:36:17.000000000 -0400
++++ ./server/default/deploy/management/console-mgr.sar/web-console.war/WEB-INF/web.xml 2009-07-01 13:38:32.000000000 -0400
+@@ -339,7 +339,6 @@
+ to users with the role JBossAdmin. Edit the roles to what you want and
+ uncomment the WEB-INF/jboss-web.xml/security-domain element to enable
+ secured access to the HTML JMX console.
+- -->
+
+ <security-constraint>
+ <web-resource-collection>
+@@ -355,6 +354,7 @@
+ <role-name>JBossAdmin</role-name>
+ </auth-constraint>
+ </security-constraint>
++ -->
+
+ <login-config>
+ <auth-method>BASIC</auth-method>
+diff -Naur --exclude='*.class' --exclude='*.jar' ./server/minimal/conf/props/web-console-roles.properties ./server/minimal/conf/props/web-console-roles.properties
+--- ./server/minimal/conf/props/web-console-roles.properties 2009-07-01 13:36:17.000000000 -0400
++++ ./server/minimal/conf/props/web-console-roles.properties 1969-12-31 19:00:00.000000000 -0500
+@@ -1,2 +0,0 @@
+-# A sample roles.properties file for use with the UsersRolesLoginModule
+-admin=JBossAdmin,HttpInvoker
+diff -Naur --exclude='*.class' --exclude='*.jar' ./server/minimal/conf/props/web-console-users.properties ./server/minimal/conf/props/web-console-users.properties
+--- ./server/minimal/conf/props/web-console-users.properties 2009-07-01 13:36:17.000000000 -0400
++++ ./server/minimal/conf/props/web-console-users.properties 1969-12-31 19:00:00.000000000 -0500
+@@ -1,2 +0,0 @@
+-# A sample users.properties file for use with the UsersRolesLoginModule
+-admin=admin
+diff -Naur --exclude='*.class' --exclude='*.jar' ./server/production/conf/login-config.xml ./server/production/conf/login-config.xml
+--- ./server/production/conf/login-config.xml 2009-07-01 13:36:17.000000000 -0400
++++ ./server/production/conf/login-config.xml 2009-07-01 13:38:33.000000000 -0400
+@@ -85,8 +85,8 @@
+ <authentication>
+ <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule"
+ flag="required">
+- <module-option name="usersProperties">props/web-console-users.properties</module-option>
+- <module-option name="rolesProperties">props/web-console-roles.properties</module-option>
++ <module-option name="usersProperties">web-console-users.properties</module-option>
++ <module-option name="rolesProperties">web-console-roles.properties</module-option>
+ </login-module>
+ </authentication>
+ </application-policy>
+diff -Naur --exclude='*.class' --exclude='*.jar' ./server/production/conf/props/web-console-roles.properties ./server/production/conf/props/web-console-roles.properties
+--- ./server/production/conf/props/web-console-roles.properties 2009-07-01 13:36:17.000000000 -0400
+++ ./server/production/conf/props/web-console-roles.properties 1969-12-31 19:00:00.000000000 -0500
@@ -1,2 +0,0 @@
-# A sample roles.properties file for use with the UsersRolesLoginModule
-admin=JBossAdmin,HttpInvoker
-diff -Naur ./server/production/conf/props/web-console-users.properties ./server/production/conf/props/web-console-users.properties
---- ./server/production/conf/props/web-console-users.properties 2009-06-30 10:19:36.000000000 -0400
+diff -Naur --exclude='*.class' --exclude='*.jar' ./server/production/conf/props/web-console-users.properties ./server/production/conf/props/web-console-users.properties
+--- ./server/production/conf/props/web-console-users.properties 2009-07-01 13:36:17.000000000 -0400
+++ ./server/production/conf/props/web-console-users.properties 1969-12-31 19:00:00.000000000 -0500
@@ -1,2 +0,0 @@
-# A sample users.properties file for use with the UsersRolesLoginModule
-admin=admin
-diff -Naur ./server/production/deploy/httpha-invoker.sar/invoker.war/WEB-INF/web.xml ./server/production/deploy/httpha-invoker.sar/invoker.war/WEB-INF/web.xml
---- ./server/production/deploy/httpha-invoker.sar/invoker.war/WEB-INF/web.xml 2009-06-30 16:15:33.000000000 -0400
-+++ ./server/production/deploy/httpha-invoker.sar/invoker.war/WEB-INF/web.xml 2009-06-30 09:32:55.000000000 -0400
+diff -Naur --exclude='*.class' --exclude='*.jar' ./server/production/deploy/httpha-invoker.sar/invoker.war/WEB-INF/web.xml ./server/production/deploy/httpha-invoker.sar/invoker.war/WEB-INF/web.xml
+--- ./server/production/deploy/httpha-invoker.sar/invoker.war/WEB-INF/web.xml 2009-07-01 13:36:17.000000000 -0400
++++ ./server/production/deploy/httpha-invoker.sar/invoker.war/WEB-INF/web.xml 2009-07-01 13:38:33.000000000 -0400
@@ -203,9 +203,6 @@
role HttpInvoker to access the HTTP invoker servlets
</description>
@@ -37,9 +268,9 @@
<http-method>GET</http-method>
<http-method>POST</http-method>
</web-resource-collection>
-diff -Naur ./server/production/deploy/jmx-console.war/WEB-INF/jboss-web.xml ./server/production/deploy/jmx-console.war/WEB-INF/jboss-web.xml
---- ./server/production/deploy/jmx-console.war/WEB-INF/jboss-web.xml 2009-06-30 10:01:01.000000000 -0400
-+++ ./server/production/deploy/jmx-console.war/WEB-INF/jboss-web.xml 2009-06-30 09:32:55.000000000 -0400
+diff -Naur --exclude='*.class' --exclude='*.jar' ./server/production/deploy/jmx-console.war/WEB-INF/jboss-web.xml ./server/production/deploy/jmx-console.war/WEB-INF/jboss-web.xml
+--- ./server/production/deploy/jmx-console.war/WEB-INF/jboss-web.xml 2009-07-01 13:36:17.000000000 -0400
++++ ./server/production/deploy/jmx-console.war/WEB-INF/jboss-web.xml 2009-07-01 13:38:33.000000000 -0400
@@ -6,6 +6,6 @@
<!-- Uncomment the security-domain to enable security. You will
need to edit the htmladaptor login configuration to setup the
@@ -48,9 +279,9 @@
<security-domain>java:/jaas/jmx-console</security-domain>
+ -->
</jboss-web>
-diff -Naur ./server/production/deploy/jmx-console.war/WEB-INF/web.xml ./server/production/deploy/jmx-console.war/WEB-INF/web.xml
---- ./server/production/deploy/jmx-console.war/WEB-INF/web.xml 2009-06-30 09:41:52.000000000 -0400
-+++ ./server/production/deploy/jmx-console.war/WEB-INF/web.xml 2009-06-30 09:32:55.000000000 -0400
+diff -Naur --exclude='*.class' --exclude='*.jar' ./server/production/deploy/jmx-console.war/WEB-INF/web.xml ./server/production/deploy/jmx-console.war/WEB-INF/web.xml
+--- ./server/production/deploy/jmx-console.war/WEB-INF/web.xml 2009-07-01 13:36:17.000000000 -0400
++++ ./server/production/deploy/jmx-console.war/WEB-INF/web.xml 2009-07-01 13:38:33.000000000 -0400
@@ -97,7 +97,6 @@
to users with the role JBossAdmin. Edit the roles to what you want and
uncomment the WEB-INF/jboss-web.xml/security-domain element to enable
@@ -67,9 +298,9 @@
<login-config>
<auth-method>BASIC</auth-method>
-diff -Naur ./server/production/deploy/jmx-invoker-service.xml ./server/production/deploy/jmx-invoker-service.xml
---- ./server/production/deploy/jmx-invoker-service.xml 2009-06-30 16:11:29.000000000 -0400
-+++ ./server/production/deploy/jmx-invoker-service.xml 2009-06-30 09:32:55.000000000 -0400
+diff -Naur --exclude='*.class' --exclude='*.jar' ./server/production/deploy/jmx-invoker-service.xml ./server/production/deploy/jmx-invoker-service.xml
+--- ./server/production/deploy/jmx-invoker-service.xml 2009-07-01 13:36:17.000000000 -0400
++++ ./server/production/deploy/jmx-invoker-service.xml 2009-07-01 13:38:32.000000000 -0400
@@ -111,9 +111,10 @@
<return-type>java.lang.Object</return-type>
<descriptors>
@@ -82,9 +313,9 @@
<!-- Interceptor that deals with non-serializable results -->
<interceptor code="org.jboss.jmx.connector.invoker.SerializableInterceptor"
policyClass="StripModelMBeanInfoPolicy"/>
-diff -Naur ./server/production/deploy/management/console-mgr.sar/web-console.war/WEB-INF/jboss-web.xml ./server/production/deploy/management/console-mgr.sar/web-console.war/WEB-INF/jboss-web.xml
---- ./server/production/deploy/management/console-mgr.sar/web-console.war/WEB-INF/jboss-web.xml 2009-06-30 10:09:05.000000000 -0400
-+++ ./server/production/deploy/management/console-mgr.sar/web-console.war/WEB-INF/jboss-web.xml 2009-06-30 09:32:55.000000000 -0400
+diff -Naur --exclude='*.class' --exclude='*.jar' ./server/production/deploy/management/console-mgr.sar/web-console.war/WEB-INF/jboss-web.xml ./server/production/deploy/management/console-mgr.sar/web-console.war/WEB-INF/jboss-web.xml
+--- ./server/production/deploy/management/console-mgr.sar/web-console.war/WEB-INF/jboss-web.xml 2009-07-01 13:36:17.000000000 -0400
++++ ./server/production/deploy/management/console-mgr.sar/web-console.war/WEB-INF/jboss-web.xml 2009-07-01 13:38:33.000000000 -0400
@@ -9,8 +9,8 @@
<!-- Uncomment the security-domain to enable security. You will
need to edit the htmladaptor login configuration to setup the
@@ -95,9 +326,9 @@
<!-- The war depends on the -->
<depends>jboss.admin:service=PluginManager</depends>
-diff -Naur ./server/production/deploy/management/console-mgr.sar/web-console.war/WEB-INF/web.xml ./server/production/deploy/management/console-mgr.sar/web-console.war/WEB-INF/web.xml
---- ./server/production/deploy/management/console-mgr.sar/web-console.war/WEB-INF/web.xml 2009-06-30 10:06:51.000000000 -0400
-+++ ./server/production/deploy/management/console-mgr.sar/web-console.war/WEB-INF/web.xml 2009-06-30 09:32:55.000000000 -0400
+diff -Naur --exclude='*.class' --exclude='*.jar' ./server/production/deploy/management/console-mgr.sar/web-console.war/WEB-INF/web.xml ./server/production/deploy/management/console-mgr.sar/web-console.war/WEB-INF/web.xml
+--- ./server/production/deploy/management/console-mgr.sar/web-console.war/WEB-INF/web.xml 2009-07-01 13:36:17.000000000 -0400
++++ ./server/production/deploy/management/console-mgr.sar/web-console.war/WEB-INF/web.xml 2009-07-01 13:38:33.000000000 -0400
@@ -339,7 +339,6 @@
to users with the role JBossAdmin. Edit the roles to what you want and
uncomment the WEB-INF/jboss-web.xml/security-domain element to enable
@@ -114,3 +345,145 @@
<login-config>
<auth-method>BASIC</auth-method>
+diff -Naur --exclude='*.class' --exclude='*.jar' ./server/standard/conf/login-config.xml ./server/standard/conf/login-config.xml
+--- ./server/standard/conf/login-config.xml 2009-07-01 13:36:17.000000000 -0400
++++ ./server/standard/conf/login-config.xml 2009-07-01 13:38:37.000000000 -0400
+@@ -85,8 +85,8 @@
+ <authentication>
+ <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule"
+ flag="required">
+- <module-option name="usersProperties">props/web-console-users.properties</module-option>
+- <module-option name="rolesProperties">props/web-console-roles.properties</module-option>
++ <module-option name="usersProperties">web-console-users.properties</module-option>
++ <module-option name="rolesProperties">web-console-roles.properties</module-option>
+ </login-module>
+ </authentication>
+ </application-policy>
+diff -Naur --exclude='*.class' --exclude='*.jar' ./server/standard/conf/props/web-console-roles.properties ./server/standard/conf/props/web-console-roles.properties
+--- ./server/standard/conf/props/web-console-roles.properties 2009-07-01 13:36:17.000000000 -0400
++++ ./server/standard/conf/props/web-console-roles.properties 1969-12-31 19:00:00.000000000 -0500
+@@ -1,2 +0,0 @@
+-# A sample roles.properties file for use with the UsersRolesLoginModule
+-admin=JBossAdmin,HttpInvoker
+diff -Naur --exclude='*.class' --exclude='*.jar' ./server/standard/conf/props/web-console-users.properties ./server/standard/conf/props/web-console-users.properties
+--- ./server/standard/conf/props/web-console-users.properties 2009-07-01 13:36:17.000000000 -0400
++++ ./server/standard/conf/props/web-console-users.properties 1969-12-31 19:00:00.000000000 -0500
+@@ -1,2 +0,0 @@
+-# A sample users.properties file for use with the UsersRolesLoginModule
+-admin=admin
+diff -Naur --exclude='*.class' --exclude='*.jar' ./server/standard/deploy/jmx-console.war/WEB-INF/jboss-web.xml ./server/standard/deploy/jmx-console.war/WEB-INF/jboss-web.xml
+--- ./server/standard/deploy/jmx-console.war/WEB-INF/jboss-web.xml 2009-07-01 13:36:17.000000000 -0400
++++ ./server/standard/deploy/jmx-console.war/WEB-INF/jboss-web.xml 2009-07-01 13:38:37.000000000 -0400
+@@ -6,6 +6,6 @@
+ <!-- Uncomment the security-domain to enable security. You will
+ need to edit the htmladaptor login configuration to setup the
+ login modules used to authentication users.
+- -->
+ <security-domain>java:/jaas/jmx-console</security-domain>
++ -->
+ </jboss-web>
+diff -Naur --exclude='*.class' --exclude='*.jar' ./server/standard/deploy/jmx-console.war/WEB-INF/web.xml ./server/standard/deploy/jmx-console.war/WEB-INF/web.xml
+--- ./server/standard/deploy/jmx-console.war/WEB-INF/web.xml 2009-07-01 13:36:17.000000000 -0400
++++ ./server/standard/deploy/jmx-console.war/WEB-INF/web.xml 2009-07-01 13:38:35.000000000 -0400
+@@ -97,7 +97,6 @@
+ to users with the role JBossAdmin. Edit the roles to what you want and
+ uncomment the WEB-INF/jboss-web.xml/security-domain element to enable
+ secured access to the HTML JMX console.
+- -->
+ <security-constraint>
+ <web-resource-collection>
+ <web-resource-name>HtmlAdaptor</web-resource-name>
+@@ -112,6 +111,7 @@
+ <role-name>JBossAdmin</role-name>
+ </auth-constraint>
+ </security-constraint>
++ -->
+
+ <login-config>
+ <auth-method>BASIC</auth-method>
+diff -Naur --exclude='*.class' --exclude='*.jar' ./server/standard/deploy/jmx-invoker-service.xml ./server/standard/deploy/jmx-invoker-service.xml
+--- ./server/standard/deploy/jmx-invoker-service.xml 2009-07-01 13:36:17.000000000 -0400
++++ ./server/standard/deploy/jmx-invoker-service.xml 2009-07-01 13:38:37.000000000 -0400
+@@ -111,9 +111,10 @@
+ <return-type>java.lang.Object</return-type>
+ <descriptors>
+ <interceptors>
+- <!-- Uncomment to require authenticated users -->
++ <!-- Uncomment to require authenticated users
+ <interceptor code="org.jboss.jmx.connector.invoker.AuthenticationInterceptor"
+ securityDomain="java:/jaas/jmx-console"/>
++ -->
+ <!-- Interceptor that deals with non-serializable results -->
+ <interceptor code="org.jboss.jmx.connector.invoker.SerializableInterceptor"
+ policyClass="StripModelMBeanInfoPolicy"/>
+diff -Naur --exclude='*.class' --exclude='*.jar' ./server/web/conf/login-config.xml ./server/web/conf/login-config.xml
+--- ./server/web/conf/login-config.xml 2009-07-01 13:36:17.000000000 -0400
++++ ./server/web/conf/login-config.xml 2009-07-01 13:38:33.000000000 -0400
+@@ -85,8 +85,8 @@
+ <authentication>
+ <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule"
+ flag="required">
+- <module-option name="usersProperties">props/web-console-users.properties</module-option>
+- <module-option name="rolesProperties">props/web-console-roles.properties</module-option>
++ <module-option name="usersProperties">web-console-users.properties</module-option>
++ <module-option name="rolesProperties">web-console-roles.properties</module-option>
+ </login-module>
+ </authentication>
+ </application-policy>
+diff -Naur --exclude='*.class' --exclude='*.jar' ./server/web/conf/props/web-console-roles.properties ./server/web/conf/props/web-console-roles.properties
+--- ./server/web/conf/props/web-console-roles.properties 2009-07-01 13:36:17.000000000 -0400
++++ ./server/web/conf/props/web-console-roles.properties 1969-12-31 19:00:00.000000000 -0500
+@@ -1,2 +0,0 @@
+-# A sample roles.properties file for use with the UsersRolesLoginModule
+-admin=JBossAdmin,HttpInvoker
+diff -Naur --exclude='*.class' --exclude='*.jar' ./server/web/conf/props/web-console-users.properties ./server/web/conf/props/web-console-users.properties
+--- ./server/web/conf/props/web-console-users.properties 2009-07-01 13:36:17.000000000 -0400
++++ ./server/web/conf/props/web-console-users.properties 1969-12-31 19:00:00.000000000 -0500
+@@ -1,2 +0,0 @@
+-# A sample users.properties file for use with the UsersRolesLoginModule
+-admin=admin
+diff -Naur --exclude='*.class' --exclude='*.jar' ./server/web/deploy/jmx-console.war/WEB-INF/jboss-web.xml ./server/web/deploy/jmx-console.war/WEB-INF/jboss-web.xml
+--- ./server/web/deploy/jmx-console.war/WEB-INF/jboss-web.xml 2009-07-01 13:36:17.000000000 -0400
++++ ./server/web/deploy/jmx-console.war/WEB-INF/jboss-web.xml 2009-07-01 13:38:33.000000000 -0400
+@@ -6,6 +6,6 @@
+ <!-- Uncomment the security-domain to enable security. You will
+ need to edit the htmladaptor login configuration to setup the
+ login modules used to authentication users.
+- -->
+ <security-domain>java:/jaas/jmx-console</security-domain>
++ -->
+ </jboss-web>
+diff -Naur --exclude='*.class' --exclude='*.jar' ./server/web/deploy/jmx-console.war/WEB-INF/web.xml ./server/web/deploy/jmx-console.war/WEB-INF/web.xml
+--- ./server/web/deploy/jmx-console.war/WEB-INF/web.xml 2009-07-01 13:36:17.000000000 -0400
++++ ./server/web/deploy/jmx-console.war/WEB-INF/web.xml 2009-07-01 13:38:33.000000000 -0400
+@@ -97,7 +97,6 @@
+ to users with the role JBossAdmin. Edit the roles to what you want and
+ uncomment the WEB-INF/jboss-web.xml/security-domain element to enable
+ secured access to the HTML JMX console.
+- -->
+ <security-constraint>
+ <web-resource-collection>
+ <web-resource-name>HtmlAdaptor</web-resource-name>
+@@ -112,6 +111,7 @@
+ <role-name>JBossAdmin</role-name>
+ </auth-constraint>
+ </security-constraint>
++ -->
+
+ <login-config>
+ <auth-method>BASIC</auth-method>
+diff -Naur --exclude='*.class' --exclude='*.jar' ./server/web/deploy/jmx-invoker-service.xml ./server/web/deploy/jmx-invoker-service.xml
+--- ./server/web/deploy/jmx-invoker-service.xml 2009-07-01 13:36:17.000000000 -0400
++++ ./server/web/deploy/jmx-invoker-service.xml 2009-07-01 13:38:33.000000000 -0400
+@@ -111,9 +111,10 @@
+ <return-type>java.lang.Object</return-type>
+ <descriptors>
+ <interceptors>
+- <!-- Uncomment to require authenticated users -->
++ <!-- Uncomment to require authenticated users
+ <interceptor code="org.jboss.jmx.connector.invoker.AuthenticationInterceptor"
+ securityDomain="java:/jaas/jmx-console"/>
++ -->
+ <!-- Interceptor that deals with non-serializable results -->
+ <interceptor code="org.jboss.jmx.connector.invoker.SerializableInterceptor"
+ policyClass="StripModelMBeanInfoPolicy"/>
More information about the jboss-cvs-commits
mailing list