[Jaffa-svn] SF.net SVN: jaffa:[5869] trunk

[<er...@us...>]

Revision: 5869
          http://jaffa.svn.sourceforge.net/jaffa/?rev=5869&view=rev
Author:   erikb78
Date:     2011-12-23 04:42:51 +0000 (Fri, 23 Dec 2011)
Log Message:
-----------
fixed jaffa-messaging-ejb.jar deployment in a cluster

Modified Paths:
--------------
    trunk/JaffaBuild/build/build-messaging.xml

Property Changed:
----------------
    trunk/


Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/JAFFA_2_1_0_RELEASE:3009-3735
/branches/JAFFA_4_1_0_RELEASE:3009-3734
/branches/JAFFA_5_0_0_RELEASE:3427-3733
/branches/JAFFA_5_10_RELEASE:5429-5781
/branches/JAFFA_5_11_RELEASE:5507-5782,5860-5861
/branches/JAFFA_5_1_0_RELEASE:3704-3732
/branches/JAFFA_5_7_RELEASE:4878-5777
/branches/JAFFA_5_8_RELEASE:5013-5779
/branches/JAFFA_5_9_RELEASE:5138-5780
/trunk/JaffaBuild/build/shared.ant.properties:1685-4877
   + /branches/JAFFA_2_1_0_RELEASE:3009-3735
/branches/JAFFA_4_1_0_RELEASE:3009-3734
/branches/JAFFA_5_0_0_RELEASE:3427-3733
/branches/JAFFA_5_10_RELEASE:5429-5781
/branches/JAFFA_5_11_RELEASE:5507-5782,5860-5861
/branches/JAFFA_5_12_RELEASE:5868
/branches/JAFFA_5_1_0_RELEASE:3704-3732
/branches/JAFFA_5_7_RELEASE:4878-5777
/branches/JAFFA_5_8_RELEASE:5013-5779
/branches/JAFFA_5_9_RELEASE:5138-5780
/trunk/JaffaBuild/build/shared.ant.properties:1685-4877

Modified: trunk/JaffaBuild/build/build-messaging.xml
===================================================================
--- trunk/JaffaBuild/build/build-messaging.xml	2011-12-23 04:39:18 UTC (rev 5868)
+++ trunk/JaffaBuild/build/build-messaging.xml	2011-12-23 04:42:51 UTC (rev 5869)
@@ -78,6 +78,20 @@
         <available file='${container.deploy.dir}/cluster-service.xml'/>
       </and>
       <then>
+      	 <if>
+      	 	  <and>
+      	       <isset property="JBOSS_PORT_09"/>
+               <isset property="jboss.use.port.bindings"/>
+               <equals arg1="${jboss.use.port.bindings}" arg2="true"/>
+       	    </and>
+      	 <then>
+      	    <var name="jndi.port" value="${JBOSS_PORT_09}"/>
+      	 </then>
+      	 <else>
+      	    <var name="jndi.port" value="1100"/>
+      	 </else>
+         </if>
+         
         <my.xmltask source='${sarFolder}/resources/jaffa-messaging-config.xml' dest='${sarFolder}/resources/jaffa-messaging-config.xml'
             failWithoutMatch='false' preservetype='true'>
           <xmlcatalog refid="dtds"/>
@@ -86,7 +100,7 @@
           <insert path='/config/jms-config' unless='jndi-context.exists'>
             <![CDATA[
     <jndi-context>
-      <param name='java.naming.provider.url'>localhost:1100</param>
+      <param name='java.naming.provider.url'>localhost:${jndi.port}</param>
     </jndi-context>
             ]]>
           </insert>
@@ -114,6 +128,8 @@
         <!-- Delete a previously existing ejb jar -->
         <delete file='${sar.ear}/jaffa-messaging-ejb.jar'/>
         <delete dir='${sar.ear}/jaffa-messaging-ejb.jar'/>
+        <delete file='${container.deploy.dir}-hasingleton/jaffa-messaging-ejb.jar'/>
+        <delete dir='${container.deploy.dir}-hasingleton/jaffa-messaging-ejb.jar'/>
 
         <ejbmodulegenerator
           configurationFileName='${sarFolder}/resources/jaffa-messaging-config.xml'
@@ -122,9 +138,14 @@
           datasourceGlobalJndiName='${appname}Datasource'
         />
 
-        <!-- Add an ejb module to application.xml -->
+        <!-- Add an ejb module to application.xml (non-clustered) -->
         <if>
-          <available file='${sar.ear}/jaffa-messaging-ejb.jar'/>
+        	<and>
+             <available file='${sar.ear}/jaffa-messaging-ejb.jar'/>
+             <not>
+                <available file='${container.deploy.dir}/cluster-service.xml'/>
+             </not>
+          </and>   
           <then>
             <my.xmltask source='${sar.ear}/META-INF/application.xml' dest='${sar.ear}/META-INF/application.xml'
                 failWithoutMatch='false' preservetype='true'>
@@ -484,6 +505,14 @@
         <move file='${sar.ear}/jaffa-messaging-ejb.jar' tofile='${sar.ear}/jaffa-messaging-ejb.jar.tmp'/>
         <unzip src='${sar.ear}/jaffa-messaging-ejb.jar.tmp' dest='${sar.ear}/jaffa-messaging-ejb.jar'/>
         <delete file='${sar.ear}/jaffa-messaging-ejb.jar.tmp'/>
+
+        <!-- if clustered, move to deploy-hasingleton -->
+        <if>
+          <available file='${container.deploy.dir}/cluster-service.xml'/>
+          <then>
+            <move file='${sar.ear}/jaffa-messaging-ejb.jar' tofile='${container.deploy.dir}-hasingleton/jaffa-messaging-ejb.jar'/>
+          </then>
+        </if>
       </then>
       <else>
         <echo level='info' message='The ejb-deployer in JBoss has not been tweaked since jaffa-messaging-ejb.jar does not exist for the application'/>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.