Author: objectiser Date: 2011-02-07 07:53:00 -0500 (Mon, 07 Feb 2011) New Revision: 1301 Modified: trunk/distribution/src/main/release/install/build.xml trunk/runtime/jbossesb-bpel-assembly/pom.xml Log: RIFTSAW-335 - jaxrs jar needed to be removed. RIFTSAW-341 - riftsaw.esb module needed to be renamed, as deployer didn't like having to 'applications' called riftsaw. Modified: trunk/distribution/src/main/release/install/build.xml =================================================================== --- trunk/distribution/src/main/release/install/build.xml 2011-02-04 12:11:53 UTC (rev 1300) +++ trunk/distribution/src/main/release/install/build.xml 2011-02-07 12:53:00 UTC (rev 1301) @@ -16,7 +16,8 @@ <property name="server.lib.dir" value="${server.dir}/lib"/> <property name="bpel-deployer" value="riftsaw-as${as.version}.deployer" /> <property name="bpel-runtime" value="riftsaw.sar" /> - <property name="jbossesb-bpel" value="riftsaw.esb" /> + <property name="jbossesb-bpel-old" value="riftsaw.esb" /> + <property name="jbossesb-bpel" value="riftsaw-esb.esb" /> <property name="bpel-esb-examples" value="esb" /> <property name="esb.examples.dir" value="${org_jboss_esb_home}/samples/quickstarts"/> @@ -38,6 +39,10 @@ <equals arg1="${org_jboss_as_config}" arg2="all" /> </condition> + <condition property="is.as6"> + <equals arg1="${as.version}" arg2="6" /> + </condition> + <condition property="is.ws.stack.distro.available"> <available file="${ws.stack.dir}/jbossws-${ws.stack}-${ws.version}.zip" /> </condition> @@ -128,7 +133,10 @@ <unzip src="${modules}/bpel-console/riftsaw-console-identity.jar" dest="${deploy.dir}/bpel-console/bpel-identity.sar"/> <copy file="${modules}/bpel-console/gwt-console.war" todir="${deploy.dir}/bpel-console"/> <unzip src="${modules}/bpel-console/gwt-console-server.war" dest="${deploy.dir}/bpel-console/gwt-console-server.war"/> - <copy file="${modules}/bpel-console/gwt-console-server-integration.jar" todir="${server.lib.dir}"/> + + <antcall target="remove.redundant.jaxrs" /> + + <copy file="${modules}/bpel-console/gwt-console-server-integration.jar" todir="${server.lib.dir}"/> <copy file="${modules}/bpel-console/gwt-console-rpc.jar" todir="${server.lib.dir}"/> <antcall target="remove.redundant.juddi" /> @@ -142,6 +150,7 @@ <delete dir="${deployers.dir}/${bpel-deployer}" /> <delete dir="${deploy.dir}/${bpel-runtime}" /> <delete dir="${deploy.dir}/${jbossesb-bpel}" /> + <delete dir="${deploy.dir}/${jbossesb-bpel-old}" /> <!-- Name changed due to error in AS6 --> <!--uninstall appropriate db driver--> <antcall target="internal.uninstall.riftsaw.into.jboss.db.${database}" /> @@ -271,6 +280,10 @@ </target> + <target name="remove.redundant.jaxrs" if="is.as6" > + <delete file="${deploy.dir}/bpel-console/gwt-console-server.war/WEB-INF/lib/jaxrs-api-1.0.2.GA.jar"/> + </target> + <target name="check.juddi"> <condition property="is.juddi.duplicated"> Modified: trunk/runtime/jbossesb-bpel-assembly/pom.xml =================================================================== --- trunk/runtime/jbossesb-bpel-assembly/pom.xml 2011-02-04 12:11:53 UTC (rev 1300) +++ trunk/runtime/jbossesb-bpel-assembly/pom.xml 2011-02-07 12:53:00 UTC (rev 1301) @@ -34,7 +34,7 @@ <goal>single</goal> </goals> <configuration> - <finalName>riftsaw.esb</finalName> + <finalName>riftsaw-esb.esb</finalName> <appendAssemblyId>false</appendAssemblyId> <descriptors> <descriptor>src/main/assembly/esb.xml</descriptor>