Author: objectiser Date: 2011-06-29 08:00:34 -0400 (Wed, 29 Jun 2011) New Revision: 1405 Modified: trunk/distribution/src/main/assembly/bin.xml trunk/runtime/engine-assembly/pom.xml trunk/runtime/engine-assembly/src/main/assembly/sar.xml trunk/samples/esb/conf/riftsaw-base-build.xml Log: Simplify esb samples config so that it does not reference the installation lib folder. Modified: trunk/distribution/src/main/assembly/bin.xml =================================================================== --- trunk/distribution/src/main/assembly/bin.xml 2011-06-29 11:16:18 UTC (rev 1404) +++ trunk/distribution/src/main/assembly/bin.xml 2011-06-29 12:00:34 UTC (rev 1405) @@ -243,7 +243,6 @@ <includes> <include>commons-codec:commons-codec</include> <include>commons-httpclient:commons-httpclient</include> - <include>org.jboss.soa.bpel:riftsaw-tools</include> </includes> </dependencySet> Modified: trunk/runtime/engine-assembly/pom.xml =================================================================== --- trunk/runtime/engine-assembly/pom.xml 2011-06-29 11:16:18 UTC (rev 1404) +++ trunk/runtime/engine-assembly/pom.xml 2011-06-29 12:00:34 UTC (rev 1405) @@ -63,6 +63,10 @@ <artifactId>riftsaw-jacob</artifactId> </dependency> <dependency> + <groupId>org.jboss.soa.bpel</groupId> + <artifactId>riftsaw-tools</artifactId> + </dependency> + <dependency> <groupId>org.apache.xmlbeans</groupId> <artifactId>xmlbeans</artifactId> <exclusions> Modified: trunk/runtime/engine-assembly/src/main/assembly/sar.xml =================================================================== --- trunk/runtime/engine-assembly/src/main/assembly/sar.xml 2011-06-29 11:16:18 UTC (rev 1404) +++ trunk/runtime/engine-assembly/src/main/assembly/sar.xml 2011-06-29 12:00:34 UTC (rev 1405) @@ -64,6 +64,7 @@ <include>org.jboss.soa.bpel:riftsaw-scheduler-simple</include> <include>org.jboss.soa.bpel.runtime:riftsaw-uddi</include> <include>org.jboss.soa.bpel:riftsaw-utils</include> + <include>org.jboss.soa.bpel:riftsaw-tools</include> <include>net.sourceforge.saxon:saxonhe</include> <!-- <include>net.sourceforge.saxon:saxon</include> Modified: trunk/samples/esb/conf/riftsaw-base-build.xml =================================================================== --- trunk/samples/esb/conf/riftsaw-base-build.xml 2011-06-29 11:16:18 UTC (rev 1404) +++ trunk/samples/esb/conf/riftsaw-base-build.xml 2011-06-29 12:00:34 UTC (rev 1405) @@ -15,12 +15,9 @@ <property name="riftsaw.lib.dir" value="${deploy.dir}/riftsaw.sar/lib"/> <path id="rs-exec-classpath"> - <fileset dir="../../../modules/riftsaw.sar/lib"> + <fileset dir="${deploy.dir}/riftsaw.sar/lib"> <include name="**/*.jar"/> </fileset> - <fileset dir="../../../lib"> - <include name="**/*.jar"/> - </fileset> <fileset dir="${server.lib.dir}"> <include name="**/*.jar"/> </fileset> @@ -30,10 +27,10 @@ <fileset dir="${org.jboss.as.home}/lib/endorsed"> <include name="**/*.jar"/> </fileset> - <fileset dir="../../../modules/bpel-console"> - <include name="**/*.jar" /> - </fileset> - <fileset dir="${deploy.dir}/bpel-console/gwt-console-server.war/WEB-INF/lib"> + <fileset dir="${deploy.dir}/bpel-console"> + <include name="**/*.jar" /> + </fileset> + <fileset dir="${deploy.dir}/bpel-console/gwt-console-server.war/WEB-INF/lib"> <include name="**/gson-*.jar"/> </fileset> </path>