Author: kurtstam Date: 2009-11-20 01:07:57 -0500 (Fri, 20 Nov 2009) New Revision: 285 Added: trunk/distribution/src/main/release/bin/ Removed: trunk/distribution/src/bin/ trunk/runtime/engine-assembly/build.xml trunk/runtime/engine-assembly/war/ Modified: trunk/distribution/pom.xml trunk/distribution/src/main/assembly/bin.xml Log: RIFTSAW-24, adding bin and lib directory back into the distribution Modified: trunk/distribution/pom.xml =================================================================== --- trunk/distribution/pom.xml 2009-11-20 05:13:52 UTC (rev 284) +++ trunk/distribution/pom.xml 2009-11-20 06:07:57 UTC (rev 285) @@ -51,6 +51,16 @@ <version>${pom.version}</version> </dependency> <dependency> + <groupId>org.jboss.soa.bpel</groupId> + <artifactId>riftsaw-bpel-compiler</artifactId> + <version>${pom.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.soa.bpel</groupId> + <artifactId>riftsaw-bpel-obj</artifactId> + <version>${pom.version}</version> + </dependency> + <dependency> <groupId>commons-codec</groupId> <artifactId>commons-codec</artifactId> <version>1.3</version> @@ -66,12 +76,56 @@ <version>1.1.1</version> </dependency> <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <version>3.1</version> + </dependency> + <dependency> + <groupId>commons-pool</groupId> + <artifactId>commons-pool</artifactId> + <version>1.2</version> + </dependency> + <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> <version>1.2.14</version> </dependency> + <dependency> + <groupId>jaxen</groupId> + <artifactId>jaxen</artifactId> + <version>1.1.1</version> + </dependency> + <dependency> + <groupId>xalan</groupId> + <artifactId>xalan</artifactId> + <version>2.7.0</version> + </dependency> + <dependency> + <groupId>xerces</groupId> + <artifactId>xercesImpl</artifactId> + <version>2.9.0</version> + </dependency> + <dependency> + <groupId>net.sf.saxon</groupId> + <artifactId>saxon-dom</artifactId> + <version>9.x</version> + </dependency> + <dependency> + <groupId>net.sf.saxon</groupId> + <artifactId>saxon-xpath</artifactId> + <version>9.x</version> + </dependency> + <dependency> + <groupId>net.sf.saxon</groupId> + <artifactId>saxon-xqj</artifactId> + <version>9.x</version> + </dependency> + <dependency> + <groupId>net.sf.saxon</groupId> + <artifactId>saxon</artifactId> + <version>9.x</version> + </dependency> - <!-- database driver --> <dependency> <groupId>mysql</groupId> Modified: trunk/distribution/src/main/assembly/bin.xml =================================================================== --- trunk/distribution/src/main/assembly/bin.xml 2009-11-20 05:13:52 UTC (rev 284) +++ trunk/distribution/src/main/assembly/bin.xml 2009-11-20 06:07:57 UTC (rev 285) @@ -72,7 +72,7 @@ </fileSet> <fileSet> - <directory>src/bin</directory> + <directory>src/main/release/bin</directory> <outputDirectory>bin</outputDirectory> </fileSet> @@ -160,6 +160,32 @@ <include>org.jboss.bpm:gwt-console-rpc</include> </includes> </dependencySet> + + <dependencySet> + <outputDirectory>/lib</outputDirectory> + <includes> + <include>commons-codec:commons-codec</include> + <include>commons-collections:commons-collections</include> + <include>commons-httpclient:commons-httpclient</include> + <include>commons-logging:commons-logging</include> + <include>commons-pool:commons-pool</include> + <include>jaxen:jaxen</include> + <include>log4j:log4j</include> + <include>org.jboss.soa.bpel:riftsaw-bpel-api</include> + <include>org.jboss.soa.bpel:riftsaw-bpel-compiler</include> + <include>org.jboss.soa.bpel:riftsaw-bpel-obj</include> + <include>org.jboss.soa.bpel:riftsaw-bpel-schemas</include> + <include>org.jboss.soa.bpel:riftsaw-tools</include> + <include>org.jboss.soa.bpel:riftsaw-utils</include> + <include>net.sf.saxon:saxon</include> + <include>net.sf.saxon:saxon-dom</include> + <include>net.sf.saxon:saxon-xpath</include> + <include>net.sf.saxon:saxon-xqj</include> + <include>wsdl4j:wsdl4j</include> + <include>xalan:xalan</include> + <include>xerces:xercesImpl</include> + </includes> + </dependencySet> </dependencySets> Copied: trunk/distribution/src/main/release/bin (from rev 284, trunk/distribution/src/bin) Property changes on: trunk/distribution/src/main/release/bin ___________________________________________________________________ Name: svn:mergeinfo + Deleted: trunk/runtime/engine-assembly/build.xml =================================================================== --- trunk/runtime/engine-assembly/build.xml 2009-11-20 05:13:52 UTC (rev 284) +++ trunk/runtime/engine-assembly/build.xml 2009-11-20 06:07:57 UTC (rev 285) @@ -1,96 +0,0 @@ -<project name="engine-assembly" default="package-bpel" basedir="."> - - <target name="unzip-ode"> - <mkdir dir="${basedir}/target/ode-distro"/> - <echo>${local.repo}</echo> - <unzip dest="${basedir}/target/ode-distro" src="${local.repo}/org/jboss/soa/bpel/jboss-riftsaw-war/${riftsaw.engine.version}/jboss-riftsaw-war-${riftsaw.engine.version}.zip"/> - </target> - - <target name="create-war" depends="unzip-ode"> - <mkdir dir="${basedir}/target/bpel.war"/> - <unzip dest="${basedir}/target/bpel.war" src="${basedir}/target/ode-distro/jboss-riftsaw-war-${riftsaw.engine.version}/bpel.war"/> - <delete dir="${basedir}/target/bpel.war/WEB-INF/lib"> - <include name="geronimo-jta*.jar"/> - <include name="xerces*.jar"/> - <include name="xml-apis*.jar"/> - <include name="riftsaw-dao-jpa*.jar" /> - <include name="axis2-spring-*.jar" /> - <include name="axis2-saaj-api-*.jar" /> - <!-- Required for ODE2.0 - <include name="saxon-xqj-*.jar" /> - --> - <include name="woden-impl-dom-*.jar" /> - <include name="geronimo-kernel-*.jar" /> - </delete> - <copy todir="${basedir}/target/bpel.war" overwrite="true" > - <fileset dir="war"/> - </copy> - - <!-- Remove the persistence.xml from riftsaw-bpel-store --> - <mkdir dir="${basedir}/target/riftsaw-bpel-store" /> - <unzip dest="${basedir}/target/riftsaw-bpel-store" src="${basedir}/target/bpel.war/WEB-INF/lib/riftsaw-bpel-store-${riftsaw.engine.version}.jar" /> - <delete file="${basedir}/target/riftsaw-bpel-store/META-INF/persistence.xml" /> - <jar destfile="${basedir}/target/bpel.war/WEB-INF/lib/riftsaw-bpel-store-${riftsaw.engine.version}.jar" basedir="${basedir}/target/riftsaw-bpel-store" /> - - <!-- Remove the persistence.xml from riftsaw-bpel-dao --> - <mkdir dir="${basedir}/target/riftsaw-bpel-dao" /> - <unzip dest="${basedir}/target/riftsaw-bpel-dao" src="${basedir}/target/bpel.war/WEB-INF/lib/riftsaw-bpel-dao-${riftsaw.engine.version}.jar" /> - <delete file="${basedir}/target/riftsaw-bpel-dao/META-INF/persistence.xml" /> - <jar destfile="${basedir}/target/bpel.war/WEB-INF/lib/riftsaw-bpel-dao-${riftsaw.engine.version}.jar" basedir="${basedir}/target/riftsaw-bpel-dao" /> - </target> - - <target name="create-sar"> - <mkdir dir="${basedir}/target/bpel"/> - <mkdir dir="${basedir}/target/bpel/lib"/> - - <unzip dest="${basedir}/target/bpel" src="${dependency.bpel.engine}"/> - <!-- copy todir="${basedir}/target/bpel/lib" file="${dependency.bpel.engine}"/ --> - - <!-- Copy libs from war for now --> - <copy todir="${basedir}/target/bpel/lib" > - <fileset dir="${basedir}/target/bpel.war/WEB-INF/lib"> - <include name="commons-lang-*.jar" /> - <!--include name="derby*.jar" / Overwritten in distribution module--> - <include name="geronimo-connector*.jar" /> - <include name="riftsaw-bpel-api*.jar" /> - <include name="riftsaw-bpel-compiler*.jar" /> - <include name="riftsaw-bpel-dao*.jar" /> - <include name="riftsaw-bpel-ql*.jar" /> - <include name="riftsaw-bpel-schemas*.jar" /> - <include name="riftsaw-bpel-store*.jar" /> - <include name="riftsaw-dao-hibernate*.jar" /> - - <!-- ODE1.3.3 --> - <include name="riftsaw-bpel-epr*.jar" /> - <include name="riftsaw-bpel-obj*.jar" /> - <include name="riftsaw-bpel-runtime*.jar" /> - <include name="riftsaw-agents*.jar" /> - <!-- --> - - <!-- ODE2 - <include name="riftsaw-engine*.jar" /> - <include name="riftsaw-il-common*.jar" /> - <include name="riftsaw-runtimes*.jar" /> - --> - - <include name="riftsaw-jacob*.jar" /> - <include name="riftsaw-scheduler-simple*.jar" /> - <include name="riftsaw-utils*.jar" /> - <include name="saxon*.jar" /> - <include name="xmlbeans*.jar" /> - </fileset> - </copy> - - <!-- - <move file="${basedir}/target/bpel.war" tofile="${basedir}/target/bpel/bpel.war" /> - --> - - <copy todir="${basedir}/target/bpel" > - <fileset dir="${basedir}/resources" /> - </copy> - - </target> - - <target name="package-bpel" depends="create-war,create-sar"/> - -</project>