[jboss-cvs] JBossAS SVN: r108187 - in tags/JBPAPP_5_1_0_CR3.5: hornetq-int/src/etc and 1 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: fnasser at redhat.com
Date: 2010-09-16 15:37:07 -0400 (Thu, 16 Sep 2010)
New Revision: 108187

Modified:
   tags/JBPAPP_5_1_0_CR3.5/component-matrix/pom.xml
   tags/JBPAPP_5_1_0_CR3.5/hornetq-int/src/etc/build.xml
   tags/JBPAPP_5_1_0_CR3.5/security/src/etc/bin/password_tool.bat
Log:
JBPAPP-4546 JBPAPP-4795 JBPAPP-5028

Modified: tags/JBPAPP_5_1_0_CR3.5/component-matrix/pom.xml
===================================================================
--- tags/JBPAPP_5_1_0_CR3.5/component-matrix/pom.xml	2010-09-16 19:31:15 UTC (rev 108186)
+++ tags/JBPAPP_5_1_0_CR3.5/component-matrix/pom.xml	2010-09-16 19:37:07 UTC (rev 108187)
@@ -75,7 +75,7 @@
     <version.org.jboss.logmanager>1.1.0.GA</version.org.jboss.logmanager>
     <version.org.jboss.man>2.1.1.SP2</version.org.jboss.man>
     <version.org.jboss.mdr>2.0.2.GA</version.org.jboss.mdr>
-    <version.org.jboss.metadata>1.0.5.GA</version.org.jboss.metadata>
+    <version.org.jboss.metadata>1.0.6.GA</version.org.jboss.metadata>
     <version.org.jboss.microcontainer>2.0.10.GA</version.org.jboss.microcontainer>
     <version.org.jboss.naming>5.0.3.GA</version.org.jboss.naming>
     <version.org.jboss.reflect>2.0.3.GA</version.org.jboss.reflect>

Modified: tags/JBPAPP_5_1_0_CR3.5/hornetq-int/src/etc/build.xml
===================================================================
--- tags/JBPAPP_5_1_0_CR3.5/hornetq-int/src/etc/build.xml	2010-09-16 19:31:15 UTC (rev 108186)
+++ tags/JBPAPP_5_1_0_CR3.5/hornetq-int/src/etc/build.xml	2010-09-16 19:37:07 UTC (rev 108187)
@@ -52,7 +52,9 @@
          <param name="CONFIG_TYPE" value="clustered"/>
       </antcall>
 
-
+   	   <!--we need to disable guest security for production-->
+   	   <replace file="${jboss_home}/server/production/conf/props/hornetq-users.properties" token="guest=guest" value="#guest=guest"/>
+   	   <replace file="${jboss_home}/server/production/conf/props/hornetq-roles.properties" token="guest=guest" value="#guest=guest"/> 
    </target>
 
    <target name="removeCommon">

Modified: tags/JBPAPP_5_1_0_CR3.5/security/src/etc/bin/password_tool.bat
===================================================================
--- tags/JBPAPP_5_1_0_CR3.5/security/src/etc/bin/password_tool.bat	2010-09-16 19:31:15 UTC (rev 108186)
+++ tags/JBPAPP_5_1_0_CR3.5/security/src/etc/bin/password_tool.bat	2010-09-16 19:37:07 UTC (rev 108187)
@@ -32,9 +32,10 @@
 
 rem Specific dependencies
 set JBOSSPASS_CLASSPATH=%JBOSSPASS_CLASSPATH%;%JBOSS_HOME%\client\xmlsec.jar
+set JBOSSPASS_CLASSPATH=%JBOSSPASS_CLASSPATH%;%JBOSS_HOME%\client\jbosssx-client.jar
 set JBOSSPASS_CLASSPATH=%JBOSSPASS_CLASSPATH%;%JBOSS_HOME%\client\jbosssx-as-client.jar
 set JBOSSPASS_CLASSPATH=%JBOSSPASS_CLASSPATH%;%JBOSS_HOME%\common\lib\jbosssx.jar
 set JBOSSPASS_CLASSPATH=%JBOSSPASS_CLASSPATH%;%JBOSS_HOME%\common\lib\log4j.jar
 
 rem Execute the JVM
-"%JAVA%" %JAVA_OPTS% "-Djava.endorsed.dirs=%JBOSS_ENDORSED_DIRS%" "-Dprogram.name=%PROGNAME%" -classpath "%JBOSSPASS_CLASSPATH%" org.jboss.security.integration.password.PasswordTool %*
\ No newline at end of file
+"%JAVA%" %JAVA_OPTS% "-Djava.endorsed.dirs=%JBOSS_ENDORSED_DIRS%" "-Dprogram.name=%PROGNAME%" -classpath "%JBOSSPASS_CLASSPATH%" org.jboss.security.integration.password.PasswordTool %*