7c7
< $Id: build-distr.xml 67607 2007-11-29 14:18:17Z rrajesh $
---
> $Id: build-distr.xml 66081 2007-10-12 09:16:02Z thomas.diesler@jboss.com $
387a388
>         <include name="mail-ra.rar"/>
389d389
<         <exclude name="jms-ra.rar"/>
529,539d528
< 	
<   <target name="replace-messaging-examples" description="Replacing configuration examples for JMS">
<  	 <delete dir="${install.root}/docs/examples/jms"/>
<  	
< 	 <mkdir dir="${install.root}/docs/examples/jms"/>
< 
<  	 <copy todir="${install.root}/docs/examples/jms">
<  	 	<fileset dir="${jboss.messaging.resources}" includes="**"/>
<  	 </copy>
<   </target>
< 
541,617d529
<   <target name="replace-messaging-clustered" if="jbm-clustered">
<   	<copy todir="${install.server}/${target}/deploy/jboss-messaging.sar">
<   		<fileset dir="${jboss.messaging.resources}">
<             <include name="connection-factories-service.xml"/>
<             <include name="destinations-service.xml"/>
<             <include name="clustered-hsqldb-persistence-service.xml"/>
<             <include name="messaging-service.xml"/>
<             <include name="remoting-bisocket-service.xml"/>
<   		</fileset>
<   	</copy>
<   </target>
< 	
< 
<   <target name="replace-messaging-nonclustered" unless="jbm-clustered">
<       <copy todir="${install.server}/${target}/deploy/jboss-messaging.sar">
<           <fileset dir="${jboss.messaging.resources}">
<               <include name="connection-factories-service.xml"/>
<               <include name="destinations-service.xml"/>
<               <include name="hsqldb-persistence-service.xml"/>
<               <include name="messaging-service.xml"/>
<               <include name="remoting-bisocket-service.xml"/>
<           </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-ds.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"/>
<         <include name="jboss-messaging-client.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>
<   	
<   	<unzip src="${jboss.messaging.lib}/jboss-messaging.jar" dest="${project.root}/messaging/output/etc/server-jbm/default/deploy/jboss-messaging.sar">
<   		<patternset>
<   			<include name="META-INF/MANIFEST.MF"/>
<         </patternset>
<   	</unzip>
<   	
<   	<replace file="${install.server}/${target}/conf/standardjboss.xml">
< 	  	<replacefilter token="jboss.mq:service=DestinationManager" value="jboss.messaging:service=ServerPeer"/>
< 	  	<replacefilter token="&gt;createTopic&lt;" value="&gt;deployTopic&lt;"/>
< 	  	<replacefilter token="&gt;createQueue&lt;" value="&gt;deployQueue&lt;"/>
<   	</replace>
< 
<   	<replace file="${install.server}/${target}/conf/jboss-service.xml">
< 	  	<replacefilter token="jboss.mq:service=DestinationManager" value="jboss.messaging:service=ServerPeer"/>
<   	</replace>
<   	
<     <antcall target="replace-messaging-clustered"></antcall>
<     <antcall target="replace-messaging-nonclustered"></antcall>
< 
<   	
<   	<delete dir="${install.server}/${target}/deploy/jms"/>
<   	<delete dir="${install.server}/${target}/deploy-hasingleton/jms"/>
< 
<     <!-- Removing jbossmq libraries -->
<     <delete file="${install.server}/${target}/lib/jbossmq.jar"/>
< 	<delete file="${install.client}/jbossmq-client.jar"/> 
< 	<copy file="${jboss.messaging.lib}/jboss-messaging-client.jar" todir="${install.client}"/>
<   </target>
< 	
1382,1383c1294
< 
< 
---
> 	  
1616a1528
> 
1621a1534,1558
>       <fileset dir="${sun.jaxws.lib}">
>         <include name="jaxws-tools.jar"/>
>         <include name="jaxws-rt.jar"/>
> 	<include name="stax-ex.jar"/>
> 	<include name="streambuffer.jar"/>
>       </fileset>
>       <fileset dir="${woodstox.woodstox.lib}">
>         <include name="wstx.jar"/>
>       </fileset>
>       <fileset dir="${wscommons.policy.lib}">
>         <include name="policy.jar"/>
>       </fileset>
>        <fileset dir="${stax.api.lib}">
>         <include name="stax-api.jar"/>
>       </fileset>
> 
>       <fileset dir="${jboss.jbossws.common.lib}">
>         <include name="jbossws-common.jar"/>
>       </fileset>
>       <fileset dir="${jboss.jbossws.framework.lib}">
>         <include name="jbossws-framework.jar"/>
>       </fileset>
>       <fileset dir="${jboss.jbossws.spi.lib}">
>         <include name="jbossws-spi.jar"/>
>       </fileset>
1628,1633d1564
<       <fileset dir="${stax.api.lib}">
<         <include name="stax-api.jar"/>
<       </fileset>
<       <fileset dir="${woodstox.woodstox.lib}">
<         <include name="wstx.jar"/>
<       </fileset>
1653a1585,1593
>       <fileset dir="${jboss.jbossws.common.lib}">
>         <include name="jbossws-common.jar"/>
>       </fileset>
>       <fileset dir="${jboss.jbossws.framework.lib}">
>         <include name="jbossws-framework.jar"/>
>       </fileset>
>       <fileset dir="${jboss.jbossws.spi.lib}">
>         <include name="jbossws-spi.jar"/>
>       </fileset>
1655d1594
<         <include name="jbossws-integration.jar"/>
1656a1596
>         <include name="jboss-jaxws.jar"/>
1685,1767d1624
<     <antcall target="ws-thirdparty" />
< 
<     <!-- This is executed last, so make executable all bin/*.sh scripts -->
<     <chmod perm="+x">
<       <fileset dir="${install.bin}">
<         <include name="**/*.sh"/>
<       </fileset>
<     </chmod>
<   
<   </target>
< 
<   <target name="ws-thirdparty" description = "Thirdparty setup for WS. This target works with ws 1.2.x and 2.x" depends="ws-thirdparty-12,ws-thirdparty-20"/>
< 
<   <target name="ws-thirdparty-12" description = "Thirdparty setup for WS 1.2.x" unless="build.soa">
<     <!-- copy thirdparty items to client dir -->
<      <mkdir dir="${install.client}"/>
<      <copy todir="${install.client}" filtering="no">
<        <fileset dir="${jboss.jbossws.wsconsume.impl.lib}">
<          <include name="jbossws-wsconsume-impl.jar"/>
<        </fileset>
<      </copy>
< 
<     <!-- copy thirdparty items to install/all/lib -->
<     <mkdir dir="${install.all.lib}"/>
<     <copy todir="${install.all.lib}" filtering="no">
<        <fileset dir="${jboss.jbossws.lib}">
<          <include name="jbossws-integration.jar"/>
<          <include name="jboss-jaxrpc.jar"/>
<          <include name="jboss-saaj.jar"/>
<        </fileset>
<     </copy>
< 
<     <!-- install thirdparty items to install/bin -->
<     <!-- install wstools shell scripts -->
<     <unzip dest="${install.bin}" src="${jboss.jbossws.lib}/jbossws-client.jar">
<       <patternset>
<         <include name="wstools.*"/>
<         <include name="wsconsume.*"/>
<         <include name="wsprovide.*"/>
<         <include name="wsrunclient.*"/>
<       </patternset>
<     </unzip>
< 
<     <!-- Install JBossWS -->
<     <mkdir dir="${install.all.deploy}/jbossws.sar"/>
<     <unjar dest="${install.all.deploy}/jbossws.sar" src="${jboss.jbossws.jboss42.lib}/jbossws42.sar"/>
< 
<   </target>
< 
<   <target name="ws-thirdparty-20" description = "Thirdparty setup for WS 2.0.x" if="build.soa">
<     <!-- copy thirdparty items to client dir -->
<      <mkdir dir="${install.client}"/>
<      <copy todir="${install.client}" filtering="no">
<        <fileset dir="${jboss.jbossws.common.lib}">
<          <include name="jbossws-common.jar"/>
<        </fileset>
<        <fileset dir="${jboss.jbossws.framework.lib}">
<          <include name="jbossws-framework.jar"/>
<        </fileset>
<        <fileset dir="${jboss.jbossws.spi.lib}">
<          <include name="jbossws-spi.jar"/>
<        </fileset>
<      </copy>
< 
<     <!-- copy thirdparty items to install/all/lib -->
<     <mkdir dir="${install.all.lib}"/>
<     <copy todir="${install.all.lib}" filtering="no">
<       <fileset dir="${jboss.jbossws.common.lib}">
<         <include name="jbossws-common.jar"/>
<       </fileset>
<       <fileset dir="${jboss.jbossws.framework.lib}">
<         <include name="jbossws-framework.jar"/>
<       </fileset>
<       <fileset dir="${jboss.jbossws.spi.lib}">
<         <include name="jbossws-spi.jar"/>
<       </fileset>
<       <fileset dir="${jboss.jbossws.lib}">
<          <include name="jboss-jaxrpc.jar"/>
<          <include name="jboss-jaxws.jar"/>
<          <include name="jboss-saaj.jar"/> 
<       </fileset>  
<     </copy>
< 
1769a1627
>     <!-- Install jbossws tools shell scripts -->
1776d1633
< 
1779,1780c1636
<         <include name="wsprovide.*"/>
<         <include name="wsconsume.*"/>
---
>         <include name="*.*"/>
1786a1643,1650
> 
>     <!-- This is executed last, so make executable all bin/*.sh scripts -->
>     <chmod perm="+x">
>       <fileset dir="${install.bin}">
>         <include name="**/*.sh"/>
>       </fileset>
>     </chmod>
>