[jboss-cvs] JBossAS SVN: r92138 - branches/JBPAPP_5_0/build.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Fri Aug 7 11:50:01 EDT 2009 

Author: permaine
Date: 2009-08-07 11:50:01 -0400 (Fri, 07 Aug 2009)
New Revision: 92138

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-07 15:38:12 UTC (rev 92137)
+++ branches/JBPAPP_5_0/build/jbossas-5-disableauth.patch	2009-08-07 15:50:01 UTC (rev 92138)
@@ -1,23 +1,3 @@
-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"
-         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/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/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
@@ -108,26 +88,6 @@
  
     <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/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
@@ -208,30 +168,9 @@
 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
+@@ -1,2 +1 @@
+ # A sample roles.properties file for use with the UsersRolesLoginModule
 -admin=JBossAdmin,HttpInvoker
-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 --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 @@
@@ -338,8 +277,8 @@
 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
+@@ -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
@@ -403,8 +342,8 @@
 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
+@@ -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
@@ -452,35 +391,17 @@
                    <interceptor code="org.jboss.jmx.connector.invoker.SerializableInterceptor"
                       policyClass="StripModelMBeanInfoPolicy"/>
 
-diff -Naur ./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-02 15:16:54.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 ./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-02 15:16:54.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 ./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-02 15:16:54.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/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 +0,0 @@
--# A sample users.properties file for use with the UsersRolesLoginModule
+@@ -1,2 +1 @@
+ # A sample users.properties file for use with the UsersRolesLoginModule
 -# admin=admin
-diff -Naur ./server/web/conf/props/web-console-users.properties ./server/web/conf/props/web-console-users.properties
+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 +0,0 @@
--# A sample users.properties file for use with the UsersRolesLoginModule
+@@ -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

Modified: branches/JBPAPP_5_0/build/jbossas-5-enableauth.patch
===================================================================
--- branches/JBPAPP_5_0/build/jbossas-5-enableauth.patch	2009-08-07 15:38:12 UTC (rev 92137)
+++ branches/JBPAPP_5_0/build/jbossas-5-enableauth.patch	2009-08-07 15:50:01 UTC (rev 92138)
@@ -1,29 +1,10 @@
-diff -Naur ./server/production/conf/login-config.xml ./server/production/conf/login-config.xml
---- ./server/production/conf/login-config.xml	2009-06-30 09:32:56.000000000 -0400
-+++ ./server/production/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/production/conf/props/web-console-roles.properties ./server/production/conf/props/web-console-roles.properties
---- ./server/production/conf/props/web-console-roles.properties	1969-12-31 19:00:00.000000000 -0500
-+++ ./server/production/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
+diff -Naur ./server/production/deploy/management/console-mgr.sar/web-console.war/WEB-INF/classes/web-console-roles.properties ./server/production/deploy/management/console-mgr.sar/web-console.war/WEB-INF/classes/web-console-roles.properties
+--- ./server/production/deploy/management/console-mgr.sar/web-console.war/WEB-INF/classes/web-console-roles.properties 2009-08-06 11:55:40.000000000 -0400
++++ ./server/production/deploy/management/console-mgr.sar/web-console.war/WEB-INF/classes/web-console-roles.properties 2009-08-06 13:21:47.000000000 -0400
+@@ -1,2 +1,2 @@
+ # A sample roles.properties file for use with the UsersRolesLoginModule
+-admin=JBossAdmin
 +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	1969-12-31 19:00:00.000000000 -0500
-+++ ./server/production/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/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 09:32:55.000000000 -0400
 +++ ./server/production/deploy/httpha-invoker.sar/invoker.war/WEB-INF/web.xml	2009-06-30 16:15:33.000000000 -0400
@@ -115,32 +96,13 @@
     <login-config>
        <auth-method>BASIC</auth-method>
 
-diff -Naur ./server/all/conf/login-config.xml ./server/all/conf/login-config.xml
---- ./server/all/conf/login-config.xml	2009-06-30 09:32:56.000000000 -0400
-+++ ./server/all/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/all/conf/props/web-console-roles.properties ./server/all/conf/props/web-console-roles.properties
---- ./server/all/conf/props/web-console-roles.properties	1969-12-31 19:00:00.000000000 -0500
-+++ ./server/all/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
+diff -Naur ./server/all/deploy/management/console-mgr.sar/web-console.war/WEB-INF/classes/web-console-roles.properties ./server/all/deploy/management/console-mgr.sar/web-console.war/WEB-INF/classes/web-console-roles.properties
+--- ./server/all/deploy/management/console-mgr.sar/web-console.war/WEB-INF/classes/web-console-roles.properties 2009-08-06 11:55:40.000000000 -0400
++++ ./server/all/deploy/management/console-mgr.sar/web-console.war/WEB-INF/classes/web-console-roles.properties 2009-08-06 13:21:47.000000000 -0400
+@@ -1,2 +1,2 @@
+ # A sample roles.properties file for use with the UsersRolesLoginModule
+-admin=JBossAdmin
 +admin=JBossAdmin,HttpInvoker
-diff -Naur ./server/all/conf/props/web-console-users.properties ./server/all/conf/props/web-console-users.properties
---- ./server/all/conf/props/web-console-users.properties	1969-12-31 19:00:00.000000000 -0500
-+++ ./server/all/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/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-06-30 09:32:55.000000000 -0400
 +++ ./server/all/deploy/httpha-invoker.sar/invoker.war/WEB-INF/web.xml	2009-06-30 16:15:33.000000000 -0400
@@ -232,32 +194,13 @@
     <login-config>
        <auth-method>BASIC</auth-method>
 
-diff -Naur ./server/default/conf/login-config.xml ./server/default/conf/login-config.xml
---- ./server/default/conf/login-config.xml	2009-06-30 09:32:56.000000000 -0400
-+++ ./server/default/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/default/conf/props/web-console-roles.properties ./server/default/conf/props/web-console-roles.properties
---- ./server/default/conf/props/web-console-roles.properties	1969-12-31 19:00:00.000000000 -0500
-+++ ./server/default/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
+diff -Naur ./server/default/deploy/management/console-mgr.sar/web-console.war/WEB-INF/classes/web-console-roles.properties ./server/default/deploy/management/console-mgr.sar/web-console.war/WEB-INF/classes/web-console-roles.properties
+--- ./server/default/deploy/management/console-mgr.sar/web-console.war/WEB-INF/classes/web-console-roles.properties 2009-08-06 11:55:40.000000000 -0400
++++ ./server/default/deploy/management/console-mgr.sar/web-console.war/WEB-INF/classes/web-console-roles.properties 2009-08-06 13:21:47.000000000 -0400
+@@ -1,2 +1,2 @@
+ # A sample roles.properties file for use with the UsersRolesLoginModule
+-admin=JBossAdmin
 +admin=JBossAdmin,HttpInvoker
-diff -Naur ./server/default/conf/props/web-console-users.properties ./server/default/conf/props/web-console-users.properties
---- ./server/default/conf/props/web-console-users.properties	1969-12-31 19:00:00.000000000 -0500
-+++ ./server/default/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/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-06-30 09:32:55.000000000 -0400
 +++ ./server/default/deploy/jmx-console.war/WEB-INF/jboss-web.xml	2009-06-30 10:01:01.000000000 -0400

More information about the jboss-cvs-commits mailing list