[jboss-cvs] JBossAS SVN: r64598 - in branches/Branch_4_2: messaging/src/etc and 2 other directories.

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

Author: dimitris at jboss.org
Date: 2007-08-15 05:56:01 -0400 (Wed, 15 Aug 2007)
New Revision: 64598

Removed:
   branches/Branch_4_2/messaging/src/etc/server-jbm/
   branches/Branch_4_2/server/src/etc/conf/default/props/messaging-roles.properties
   branches/Branch_4_2/server/src/etc/conf/default/props/messaging-users.properties
Modified:
   branches/Branch_4_2/build/build-distr.xml
   branches/Branch_4_2/build/build-thirdparty.xml
   branches/Branch_4_2/server/src/etc/conf/default/login-config.xml
Log:
JBAS-4600 - leave only the renaming of mq variable and revert introduction of jboss messaging

Modified: branches/Branch_4_2/build/build-distr.xml
===================================================================
--- branches/Branch_4_2/build/build-distr.xml	2007-08-15 06:39:39 UTC (rev 64597)
+++ branches/Branch_4_2/build/build-distr.xml	2007-08-15 09:56:01 UTC (rev 64598)
@@ -526,40 +526,8 @@
       </fileset>
     </copy>
   </target>
-	
-  <target name="replace-messaging" description = "Replace JBossMQ by JBoss Messaging on a given installation">
-  	
-  	<property name="target" value="default"/>
-  	
-	
-  	<echo message="target = ${target} ${jboss.messaging.lib}"/>
-  	<move todir="${install.server}/${target}/deploy" failonerror="no">
-  	  <fileset dir="${install.server}/${target}/deploy/jms">
- 	     <include name="hajndi-jms.xml"/>
- 	     <include name="jms-ds.xml"/>
-  	     <include name="jms-ra.rar"/>
-  	  </fileset>
-  	</move>
-    <copy todir="${install.server}/${target}/lib" filtering="no">
-      <fileset dir="${jboss.messaging.lib}">
-        <include name="jboss-messaging.jar"/>
-      </fileset>
-    </copy>
 
-    <copy todir="${install.server}/${target}/deploy/jboss-messaging.sar" filtering="no">
-      <fileset dir="${project.root}/messaging/output/etc/server-jbm/default/deploy/jboss-messaging.sar">
-        <include name="**"/>
-      </fileset>
-    </copy>
 
-
-  	
-  	<delete dir="${install.server}/${target}/deploy/jms"/>
-  	<delete dir="${install.server}/${target}/deploy-hasingleton/jms"/>
-  	
-  </target>
-	
-
   <!-- === -->
   <!-- JMX -->
   <!-- === -->

Modified: branches/Branch_4_2/build/build-thirdparty.xml
===================================================================
--- branches/Branch_4_2/build/build-thirdparty.xml	2007-08-15 06:39:39 UTC (rev 64597)
+++ branches/Branch_4_2/build/build-thirdparty.xml	2007-08-15 09:56:01 UTC (rev 64598)
@@ -113,7 +113,6 @@
     <componentref name="trove" version="1.0.2-brew"/>
     <componentref name="woodstox" version="3.1.1-brew"/>
     <componentref name="xdoclet" version="1.2.3-brew"/>
-    <componentref name="jboss/messaging" version="1.4.0.CR1"/>
   </build>
 
   <synchronizeinfo/>

Modified: branches/Branch_4_2/server/src/etc/conf/default/login-config.xml
===================================================================
--- branches/Branch_4_2/server/src/etc/conf/default/login-config.xml	2007-08-15 06:39:39 UTC (rev 64597)
+++ branches/Branch_4_2/server/src/etc/conf/default/login-config.xml	2007-08-15 09:56:01 UTC (rev 64598)
@@ -134,16 +134,6 @@
       </authentication>
     </application-policy>
 
-    <application-policy name="messaging">
-    	<authentication>
-    		<login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule" flag="required">
-    			<module-option name="unauthenticatedIdentity">guest</module-option>
-    			<module-option name="usersProperties">props/messaging-users.properties</module-option>
-    			<module-option name="rolesProperties">props/messaging-roles.properties</module-option>
-    		</login-module>
-    	</authentication>
-    </application-policy>
-
     <!-- The default login configuration used by any security domain that
     does not have a application-policy entry with a matching name
     -->

Deleted: branches/Branch_4_2/server/src/etc/conf/default/props/messaging-roles.properties
===================================================================
--- branches/Branch_4_2/server/src/etc/conf/default/props/messaging-roles.properties	2007-08-15 06:39:39 UTC (rev 64597)
+++ branches/Branch_4_2/server/src/etc/conf/default/props/messaging-roles.properties	2007-08-15 09:56:01 UTC (rev 64598)
@@ -1,5 +0,0 @@
-# messaging-roles.properties
-# Add roles as you like
-# user=role1,role2,...
-#
-guest=guest
\ No newline at end of file

Deleted: branches/Branch_4_2/server/src/etc/conf/default/props/messaging-users.properties
===================================================================
--- branches/Branch_4_2/server/src/etc/conf/default/props/messaging-users.properties	2007-08-15 06:39:39 UTC (rev 64597)
+++ branches/Branch_4_2/server/src/etc/conf/default/props/messaging-users.properties	2007-08-15 09:56:01 UTC (rev 64598)
@@ -1,7 +0,0 @@
-# messaging-users.properties
-
-# Add users as you like
-# user=password
-#
-guest=guest
-          
\ No newline at end of file