Author: kurtstam Date: 2009-11-12 20:27:14 -0500 (Thu, 12 Nov 2009) New Revision: 264 Modified: trunk/distribution/pom.xml trunk/distribution/src/main/release/install/build.xml trunk/runtime/engine-assembly/build.xml Log: RIFTSAW-24, lining up xmlbeans version with jbossesb (2.20) Modified: trunk/distribution/pom.xml =================================================================== --- trunk/distribution/pom.xml 2009-11-12 20:46:10 UTC (rev 263) +++ trunk/distribution/pom.xml 2009-11-13 01:27:14 UTC (rev 264) @@ -138,11 +138,6 @@ <type>war</type> </dependency> - <dependency> <!-- remove when https://jira.jboss.org/jira/browse/RIFTSAW-24 is done --> - <groupId>org.apache.xmlbeans</groupId> - <artifactId>xmlbeans</artifactId> - <version>2.3.0</version> - </dependency> </dependencies> <build> Modified: trunk/distribution/src/main/release/install/build.xml =================================================================== --- trunk/distribution/src/main/release/install/build.xml 2009-11-12 20:46:10 UTC (rev 263) +++ trunk/distribution/src/main/release/install/build.xml 2009-11-13 01:27:14 UTC (rev 264) @@ -99,13 +99,6 @@ <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}"/> - <!-- https://jira.jboss.org/jira/browse/RIFTSAW-24 --> - <move file="${deployers.dir}/esb.deployer/lib/xbean-2.2.0.jar" - tofile="${deployers.dir}/esb.deployer/lib/xbean-2.2.0.tmp"/> - <move file="${deploy.dir}/${bpel-runtime}/lib/xmlbeans-2.3.0.jar" - tofile="${deploy.dir}/${bpel-runtime}/lib/xmlbeans-2.3.0.tmp"/> - <copy file="${modules}/shared/xmlbeans.jar" todir="${deployers.dir}/esb.deployer/lib"/> - <antcall target="remove.redundant.juddi" /> </target> @@ -119,10 +112,6 @@ <!--uninstall appropriate db driver--> <antcall target="internal.uninstall.riftsaw.into.jboss.db.${database}" /> - <!-- https://jira.jboss.org/jira/browse/RIFTSAW-24 --> - <move file="${deployers.dir}/esb.deployer/lib/xbean-2.2.0.tmp" - tofile="${deployers.dir}/esb.deployer/lib/xbean-2.2.0.jar"/> - <delete dir="${deploy.dir}/bpel-console" /> <delete file="${server.lib.dir}/gwt-console-server-integration.jar"/> <delete file="${server.lib.dir}/gwt-console-rpc.jar"/> Modified: trunk/runtime/engine-assembly/build.xml =================================================================== --- trunk/runtime/engine-assembly/build.xml 2009-11-12 20:46:10 UTC (rev 263) +++ trunk/runtime/engine-assembly/build.xml 2009-11-13 01:27:14 UTC (rev 264) @@ -86,8 +86,6 @@ <!-- <move file="${basedir}/target/bpel.war" tofile="${basedir}/target/bpel/bpel.war" /> --> - <!-- Temporary fix until version of xmlbeans resolved RIFTSAW-24 --> - <delete file="${basedir}/target/bpel.war/WEB-INF/lib/xmlbeans-2.2.0.jar" /> <copy todir="${basedir}/target/bpel" > <fileset dir="${basedir}/resources" />