[jboss-cvs] JBossAS SVN: r82211 - in branches/JBPAPP_4_2_0_GA_CP: server/src/etc/conf/default and 1 other directory.

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

Author: permaine
Date: 2008-12-10 16:54:54 -0500 (Wed, 10 Dec 2008)
New Revision: 82211

Modified:
   branches/JBPAPP_4_2_0_GA_CP/build/build.xml
   branches/JBPAPP_4_2_0_GA_CP/server/src/etc/conf/default/login-config.xml
Log:
JBPAPP-1479 Remove jbossmq application policy defined at login-config.xml

Modified: branches/JBPAPP_4_2_0_GA_CP/build/build.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/build/build.xml	2008-12-10 21:35:56 UTC (rev 82210)
+++ branches/JBPAPP_4_2_0_GA_CP/build/build.xml	2008-12-10 21:54:54 UTC (rev 82211)
@@ -1120,6 +1120,42 @@
          replace=""
      />
   
+     <replaceregexp file="${install.production.conf}/login-config.xml"
+         flags="gm"
+         match="@.*${verconf.to.keep}\s"
+         replace=""
+     />
+
+     <replaceregexp file="${install.production.conf}/login-config.xml"
+         flags="gs"
+         match="@${verconf.to.delete}((?!@END.*CONF).)*@END${verconf.to.delete}\s"
+         replace=""
+     />
+  
+     <replaceregexp file="${install.default.conf}/login-config.xml"
+         flags="gm"
+         match="@.*${verconf.to.keep}\s"
+         replace=""
+     />
+
+     <replaceregexp file="${install.default.conf}/login-config.xml"
+         flags="gs"
+         match="@${verconf.to.delete}((?!@END.*CONF).)*@END${verconf.to.delete}\s"
+         replace=""
+     />
+  
+     <replaceregexp file="${install.all.conf}/login-config.xml"
+         flags="gm"
+         match="@.*${verconf.to.keep}\s"
+         replace=""
+     />
+
+     <replaceregexp file="${install.all.conf}/login-config.xml"
+         flags="gs"
+         match="@${verconf.to.delete}((?!@END.*CONF).)*@END${verconf.to.delete}\s"
+         replace=""
+     />
+
   </target>
 
   <!-- Update config and other files for production config -->

Modified: branches/JBPAPP_4_2_0_GA_CP/server/src/etc/conf/default/login-config.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/server/src/etc/conf/default/login-config.xml	2008-12-10 21:35:56 UTC (rev 82210)
+++ branches/JBPAPP_4_2_0_GA_CP/server/src/etc/conf/default/login-config.xml	2008-12-10 21:54:54 UTC (rev 82211)
@@ -40,6 +40,7 @@
        </authentication>
     </application-policy>
 
+ at 42CONF
     <!-- Security domain for JBossMQ -->
     <application-policy name = "jbossmq">
        <authentication>
@@ -64,6 +65,7 @@
        </authentication>
     </application-policy>
     -->
+ at END42CONF
 
     <!-- Security domains for testing new jca framework -->
     <application-policy name = "HsqlDbRealm">
@@ -134,6 +136,7 @@
       </authentication>
     </application-policy>
 
+ at 43CONF
     <application-policy name="messaging">
        <authentication>
           <login-module code = "org.jboss.security.auth.spi.DatabaseServerLoginModule"
@@ -145,6 +148,7 @@
           </login-module>
        </authentication>
     </application-policy>
+ at END43CONF
 
     <!-- The default login configuration used by any security domain that
     does not have a application-policy entry with a matching name