[jboss-cvs] JBossAS SVN: r92434 - branches/JBPAPP_5_0/build.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Aug 17 12:27:32 EDT 2009
Author: permaine
Date: 2009-08-17 12:27:32 -0400 (Mon, 17 Aug 2009)
New Revision: 92434
Modified:
branches/JBPAPP_5_0/build/jbossas-5-disableauth.patch
branches/JBPAPP_5_0/build/jbossas-5-enableauth.patch
Log:
JBPAPP-2311 Installer: web-console-*properties are missing in the noauth zip
Modified: branches/JBPAPP_5_0/build/jbossas-5-disableauth.patch
===================================================================
--- branches/JBPAPP_5_0/build/jbossas-5-disableauth.patch 2009-08-17 15:40:57 UTC (rev 92433)
+++ branches/JBPAPP_5_0/build/jbossas-5-disableauth.patch 2009-08-17 16:27:32 UTC (rev 92434)
@@ -165,12 +165,6 @@
<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 +1 @@
- # A sample roles.properties file for use with the UsersRolesLoginModule
--admin=JBossAdmin,HttpInvoker
--- ./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 @@
@@ -260,26 +254,6 @@
<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 +1 @@
- # A sample roles.properties file for use with the UsersRolesLoginModule
--admin=JBossAdmin,HttpInvoker
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
@@ -325,26 +299,6 @@
<!-- 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 +1 @@
- # A sample roles.properties file for use with the UsersRolesLoginModule
--admin=JBossAdmin,HttpInvoker
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
@@ -391,18 +345,6 @@
<interceptor code="org.jboss.jmx.connector.invoker.SerializableInterceptor"
policyClass="StripModelMBeanInfoPolicy"/>
-diff -Naur ./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-02 15:16:54.000000000 -0400
-+++ ./server/standard/conf/props/web-console-users.properties 1969-12-31 19:00:00.000000000 -0500
-@@ -1,2 +1 @@
- # A sample users.properties file for use with the UsersRolesLoginModule
--# admin=admin
-diff -aur ./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-02 15:16:54.000000000 -0400
-+++ ./server/web/conf/props/web-console-users.properties 1969-12-31 19:00:00.000000000 -0500
-@@ -1,2 +1 @@
- # A sample users.properties file for use with the UsersRolesLoginModule
--# admin=admin
--- ./server/all/deploy/profileservice-jboss-beans.xml 2009-07-16 16:07:19.000000000 -0400
+++ ./server/all/deploy/profileservice-jboss-beans.xml 2009-07-16 16:02:16.000000000 -0400
@@ -174,7 +174,7 @@
Modified: branches/JBPAPP_5_0/build/jbossas-5-enableauth.patch
===================================================================
--- branches/JBPAPP_5_0/build/jbossas-5-enableauth.patch 2009-08-17 15:40:57 UTC (rev 92433)
+++ branches/JBPAPP_5_0/build/jbossas-5-enableauth.patch 2009-08-17 16:27:32 UTC (rev 92434)
@@ -279,44 +279,6 @@
<login-config>
<auth-method>BASIC</auth-method>
-diff -Naur ./server/minimal/conf/props/web-console-roles.properties ./server/minimal/conf/props/web-console-roles.properties
---- ./server/minimal/conf/props/web-console-roles.properties 1969-12-31 19:00:00.000000000 -0500
-+++ ./server/minimal/conf/props/web-console-roles.properties 2009-06-30 10:54:23.000000000 -0400
-@@ -0,0 +1,2 @@
-+# A sample roles.properties file for use with the UsersRolesLoginModule
-+admin=JBossAdmin,HttpInvoker
-diff -Naur ./server/minimal/conf/props/web-console-users.properties ./server/minimal/conf/props/web-console-users.properties
---- ./server/minimal/conf/props/web-console-users.properties 1969-12-31 19:00:00.000000000 -0500
-+++ ./server/minimal/conf/props/web-console-users.properties 2009-06-30 10:19:36.000000000 -0400
-@@ -0,0 +1,2 @@
-+# A sample users.properties file for use with the UsersRolesLoginModule
-+# admin=admin
-diff -Naur ./server/standard/conf/login-config.xml ./server/standard/conf/login-config.xml
---- ./server/standard/conf/login-config.xml 2009-06-30 09:32:56.000000000 -0400
-+++ ./server/standard/conf/login-config.xml 2009-06-30 10:11:15.000000000 -0400
-@@ -85,8 +85,8 @@
- <authentication>
- <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule"
- flag="required">
-- <module-option name="usersProperties">web-console-users.properties</module-option>
-- <module-option name="rolesProperties">web-console-roles.properties</module-option>
-+ <module-option name="usersProperties">props/web-console-users.properties</module-option>
-+ <module-option name="rolesProperties">props/web-console-roles.properties</module-option>
- </login-module>
- </authentication>
- </application-policy>
-diff -Naur ./server/standard/conf/props/web-console-roles.properties ./server/standard/conf/props/web-console-roles.properties
---- ./server/standard/conf/props/web-console-roles.properties 1969-12-31 19:00:00.000000000 -0500
-+++ ./server/standard/conf/props/web-console-roles.properties 2009-06-30 10:54:23.000000000 -0400
-@@ -0,0 +1,2 @@
-+# A sample roles.properties file for use with the UsersRolesLoginModule
-+admin=JBossAdmin,HttpInvoker
-diff -Naur ./server/standard/conf/props/web-console-users.properties ./server/standard/conf/props/web-console-users.properties
---- ./server/standard/conf/props/web-console-users.properties 1969-12-31 19:00:00.000000000 -0500
-+++ ./server/standard/conf/props/web-console-users.properties 2009-06-30 10:19:36.000000000 -0400
-@@ -0,0 +1,2 @@
-+# A sample users.properties file for use with the UsersRolesLoginModule
-+# admin=admin
diff -Naur ./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-06-30 09:32:55.000000000 -0400
+++ ./server/standard/deploy/jmx-console.war/WEB-INF/jboss-web.xml 2009-06-30 10:01:01.000000000 -0400
@@ -362,32 +324,6 @@
<!-- Interceptor that deals with non-serializable results -->
<interceptor code="org.jboss.jmx.connector.invoker.SerializableInterceptor"
policyClass="StripModelMBeanInfoPolicy"/>
-diff -Naur ./server/web/conf/login-config.xml ./server/web/conf/login-config.xml
---- ./server/web/conf/login-config.xml 2009-06-30 09:32:56.000000000 -0400
-+++ ./server/web/conf/login-config.xml 2009-06-30 10:11:15.000000000 -0400
-@@ -85,8 +85,8 @@
- <authentication>
- <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule"
- flag="required">
-- <module-option name="usersProperties">web-console-users.properties</module-option>
-- <module-option name="rolesProperties">web-console-roles.properties</module-option>
-+ <module-option name="usersProperties">props/web-console-users.properties</module-option>
-+ <module-option name="rolesProperties">props/web-console-roles.properties</module-option>
- </login-module>
- </authentication>
- </application-policy>
-diff -Naur ./server/web/conf/props/web-console-roles.properties ./server/web/conf/props/web-console-roles.properties
---- ./server/web/conf/props/web-console-roles.properties 1969-12-31 19:00:00.000000000 -0500
-+++ ./server/web/conf/props/web-console-roles.properties 2009-06-30 10:54:23.000000000 -0400
-@@ -0,0 +1,2 @@
-+# A sample roles.properties file for use with the UsersRolesLoginModule
-+admin=JBossAdmin,HttpInvoker
-diff -Naur ./server/web/conf/props/web-console-users.properties ./server/web/conf/props/web-console-users.properties
---- ./server/web/conf/props/web-console-users.properties 1969-12-31 19:00:00.000000000 -0500
-+++ ./server/web/conf/props/web-console-users.properties 2009-06-30 10:19:36.000000000 -0400
-@@ -0,0 +1,2 @@
-+# A sample users.properties file for use with the UsersRolesLoginModule
-+# admin=admin
diff -Naur ./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-06-30 09:32:55.000000000 -0400
+++ ./server/web/deploy/jmx-console.war/WEB-INF/jboss-web.xml 2009-06-30 10:01:01.000000000 -0400
@@ -717,3 +653,51 @@
-kermit=thefrog
+# kermit=thefrog
+diff -Naur server/standard/conf/login-config.xml.orig server/standard/conf/login-config.xml
+--- server/standard/conf/login-config.xml.orig 2009-08-17 09:13:52.000000000 -0400
++++ server/standard/conf/login-config.xml 2009-08-17 09:16:32.000000000 -0400
+@@ -77,20 +77,6 @@
+ </authentication>
+ </application-policy>
+
+- <!-- A template configuration for the web-console web application. This
+- defaults to the UsersRolesLoginModule the same as other and should be
+- changed to a stronger authentication mechanism as required.
+- -->
+- <application-policy name="web-console">
+- <authentication>
+- <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule"
+- flag="required">
+- <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>
+-
+ <!--
+ A template configuration for the JBossWS security domain.
+ This defaults to the UsersRolesLoginModule the same as other and should be
+diff -Naur server/web/conf/login-config.xml.orig server/web/conf/login-config.xml
+--- server/web/conf/login-config.xml.orig 2009-08-17 09:13:58.000000000 -0400
++++ server/web/conf/login-config.xml 2009-08-17 09:16:38.000000000 -0400
+@@ -77,20 +77,6 @@
+ </authentication>
+ </application-policy>
+
+- <!-- A template configuration for the web-console web application. This
+- defaults to the UsersRolesLoginModule the same as other and should be
+- changed to a stronger authentication mechanism as required.
+- -->
+- <application-policy name="web-console">
+- <authentication>
+- <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule"
+- flag="required">
+- <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>
+-
+ <!--
+ A template configuration for the JBossWS security domain.
+ This defaults to the UsersRolesLoginModule the same as other and should be
More information about the jboss-cvs-commits
mailing list