Author: jeff.yuchang Date: 2010-04-28 10:18:13 -0400 (Wed, 28 Apr 2010) New Revision: 634 Added: trunk/runtime/engine-assembly/src/main/assembly/ trunk/runtime/engine-assembly/src/main/assembly/sar.xml trunk/runtime/jbossesb-bpel-assembly/src/main/assembly/ trunk/runtime/jbossesb-bpel-assembly/src/main/assembly/esb.xml Removed: trunk/runtime/engine-assembly/src/main/resources/META-INF/jboss-service.xml Modified: trunk/distribution/pom.xml trunk/distribution/src/main/assembly/bin.xml trunk/distribution/src/main/release/install/build.xml trunk/pom.xml trunk/runtime/engine-assembly/pom.xml trunk/runtime/jbossesb-bpel-assembly/pom.xml Log: * remove the jboss packaging maven plugin, use the assembly plugin, so use the includes tag to include those neccessary jars. Modified: trunk/distribution/pom.xml =================================================================== --- trunk/distribution/pom.xml 2010-04-28 10:09:12 UTC (rev 633) +++ trunk/distribution/pom.xml 2010-04-28 14:18:13 UTC (rev 634) @@ -51,6 +51,16 @@ <artifactId>riftsaw-bpel-compiler</artifactId> </dependency> <dependency> + <groupId>org.jboss.soa.bpel.runtime</groupId> + <artifactId>bpel.esb</artifactId> + <type>zip</type> + </dependency> + <dependency> + <groupId>org.jboss.soa.bpel.runtime</groupId> + <artifactId>riftsaw</artifactId> + <type>zip</type> + </dependency> + <dependency> <groupId>org.jboss.soa.bpel</groupId> <artifactId>riftsaw-bpel-obj</artifactId> </dependency> @@ -209,7 +219,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId> - <version>2.2-beta-5</version> <executions> <execution> <id>distribution-package</id> Modified: trunk/distribution/src/main/assembly/bin.xml =================================================================== --- trunk/distribution/src/main/assembly/bin.xml 2010-04-28 10:09:12 UTC (rev 633) +++ trunk/distribution/src/main/assembly/bin.xml 2010-04-28 14:18:13 UTC (rev 634) @@ -62,11 +62,6 @@ </fileSet> <fileSet> - <directory>../runtime/engine-assembly/target/riftsaw-engine/</directory> - <outputDirectory>/modules/riftsaw.sar</outputDirectory> - </fileSet> - - <fileSet> <directory>../samples</directory> <outputDirectory>samples</outputDirectory> <includes> @@ -139,14 +134,23 @@ </fileSets> - <files> - <file> - <source>../runtime/jbossesb-bpel-assembly/target/riftsaw.esb</source> - <outputDirectory>/modules</outputDirectory> - </file> - </files> - <dependencySets> + + <dependencySet> + <outputDirectory>/modules</outputDirectory> + <unpack>true</unpack> + <includes> + <include>org.jboss.soa.bpel.runtime:bpel.esb:zip</include> + </includes> + </dependencySet> + + <dependencySet> + <outputDirectory>/modules/riftsaw.sar</outputDirectory> + <unpack>true</unpack> + <includes> + <include>org.jboss.soa.bpel.runtime:riftsaw:zip</include> + </includes> + </dependencySet> <dependencySet> <outputDirectory>/db/drivers</outputDirectory> Modified: trunk/distribution/src/main/release/install/build.xml =================================================================== --- trunk/distribution/src/main/release/install/build.xml 2010-04-28 10:09:12 UTC (rev 633) +++ trunk/distribution/src/main/release/install/build.xml 2010-04-28 14:18:13 UTC (rev 634) @@ -62,8 +62,11 @@ <copy todir="${deploy.dir}/${bpel-runtime}"> <fileset dir="${modules}/${bpel-runtime}" /> </copy> - <copy todir="${deploy.dir}" file="${modules}/${jbossesb-bpel}"/> + <copy todir="${deploy.dir}/${jbossesb-bpel}"> + <fileset dir="${modules}/${jbossesb-bpel}" /> + </copy> + <!-- copy appropriate jboss-beans.xml, bpel.properties, datasource etc into server --> <copy file="../db/jboss/jboss-beans.xml" toFile="${deploy.dir}/${bpel-runtime}/META-INF/jboss-beans.xml" @@ -111,7 +114,7 @@ <echo message="Undeploy the BPEL runtime from JBoss ESB server" /> <delete dir="${deployers.dir}/${bpel-deployer}" /> <delete dir="${deploy.dir}/${bpel-runtime}" /> - <delete file="${deploy.dir}/${jbossesb-bpel}" /> + <delete dir="${deploy.dir}/${jbossesb-bpel}" /> <!--uninstall appropriate db driver--> <antcall target="internal.uninstall.riftsaw.into.jboss.db.${database}" /> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-04-28 10:09:12 UTC (rev 633) +++ trunk/pom.xml 2010-04-28 14:18:13 UTC (rev 634) @@ -157,7 +157,18 @@ <artifactId>riftsaw-agents</artifactId> <version>${riftsaw.ode.version}</version> </dependency> - + <dependency> + <groupId>org.jboss.soa.bpel.runtime</groupId> + <artifactId>bpel.esb</artifactId> + <version>${riftsaw.engine.version}</version> + <type>zip</type> + </dependency> + <dependency> + <groupId>org.jboss.soa.bpel.runtime</groupId> + <artifactId>riftsaw</artifactId> + <version>${riftsaw.engine.version}</version> + <type>zip</type> + </dependency> <!-- ODE1.3.3 dependencies --> <dependency> <groupId>org.jboss.soa.bpel</groupId> @@ -325,6 +336,11 @@ </includes> </configuration> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> + <version>2.2-beta-5</version> + </plugin> </plugins> </build> Modified: trunk/runtime/engine-assembly/pom.xml =================================================================== --- trunk/runtime/engine-assembly/pom.xml 2010-04-28 10:09:12 UTC (rev 633) +++ trunk/runtime/engine-assembly/pom.xml 2010-04-28 14:18:13 UTC (rev 634) @@ -4,7 +4,7 @@ <groupId>org.jboss.soa.bpel.runtime</groupId> <artifactId>riftsaw</artifactId> <version>2.0.1-SNAPSHOT</version> - <packaging>jboss-sar</packaging> + <packaging>pom</packaging> <name>RiftSaw::Runtime::Engine-Assembly</name> <parent> @@ -108,41 +108,32 @@ </dependencies> - <build> - <finalName>riftsaw-engine</finalName> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>jboss-packaging-maven-plugin</artifactId> - <version>2.1.1</version> - <!-- Enable 'jboss-sar', etc., as a recognized maven packaging type --> - <extensions>true</extensions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-install-plugin</artifactId> - <version>2.1</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <version>1.3</version> - <executions> - <execution> - <id>test</id> - <phase>package</phase> - <configuration> - <tasks> - <delete file="${basedir}/target/riftsaw-engine/META-INF/jboss-service.xml"/> - <delete file="${basedir}/target/riftsaw-engine/lib/geronimo-transaction-2.0.1.jar"/> - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>distribution-package</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <finalName>riftsaw-engine</finalName> + <appendAssemblyId>false</appendAssemblyId> + <descriptors> + <descriptor>src/main/assembly/sar.xml</descriptor> + </descriptors> + <tarLongFileMode>gnu</tarLongFileMode> + <archiverConfig> + <duplicateBehavior>skip</duplicateBehavior> + </archiverConfig> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> </project> Added: trunk/runtime/engine-assembly/src/main/assembly/sar.xml =================================================================== --- trunk/runtime/engine-assembly/src/main/assembly/sar.xml (rev 0) +++ trunk/runtime/engine-assembly/src/main/assembly/sar.xml 2010-04-28 14:18:13 UTC (rev 634) @@ -0,0 +1,73 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + * JBoss, Home of Professional Open Source + * Copyright 2008, JBoss Inc., and others contributors as indicated + * by the @authors tag. All rights reserved. + * See the copyright.txt in the distribution for a + * full listing of individual contributors. + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License, v. 2.1. + * This program is distributed in the hope that it will be useful, but WITHOUT A + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. + * You should have received a copy of the GNU Lesser General Public License, + * v.2.1 along with this distribution; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + * + * (C) 2008 +--> +<assembly> + <!-- id typically identifies the "type" (src vs bin etc) of the assembly --> + <id></id> + <includeBaseDirectory>false</includeBaseDirectory> + <formats> + <format>zip</format> + </formats> + + <fileSets> + + <fileSet> + <directory>src/main/resources</directory> + <outputDirectory>/</outputDirectory> + </fileSet> + + </fileSets> + + <dependencySets> + + <dependencySet> + <outputDirectory>/lib</outputDirectory> + <includes> + <include>commons-lang:commons-lang</include> + <include>org.apache.geronimo.components:geronimo-connector</include> + <include>tranql:tranql-connector</include> + <include>org.jboss.soa.bpel:riftsaw-agents</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-dao</include> + <include>org.jboss.soa.bpel:riftsaw-bpel-epr</include> + <include>org.jboss.soa.bpel:riftsaw-bpel-obj</include> + <include>org.jboss.soa.bpel:riftsaw-bpel-ql</include> + <include>org.jboss.soa.bpel:riftsaw-bpel-runtime</include> + <include>org.jboss.soa.bpel:riftsaw-bpel-schemas</include> + <include>org.jboss.soa.bpel:riftsaw-bpel-store</include> + <include>org.jboss.soa.bpel:riftsaw-dao-hibernate</include> + <include>org.jboss.soa.bpel.runtime:riftsaw-engine</include> + <include>org.jboss.soa.bpel:riftsaw-jacob</include> + <include>org.jboss.soa.bpel:riftsaw-scheduler-simple</include> + <include>org.jboss.soa.bpel.runtime:riftsaw-uddi</include> + <include>org.jboss.soa.bpel.runtime:riftsaw-uddi300</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>org.apache.xmlbeans:xmlbeans</include> + </includes> + </dependencySet> + + </dependencySets> + +</assembly> Deleted: trunk/runtime/engine-assembly/src/main/resources/META-INF/jboss-service.xml =================================================================== --- trunk/runtime/engine-assembly/src/main/resources/META-INF/jboss-service.xml 2010-04-28 10:09:12 UTC (rev 633) +++ trunk/runtime/engine-assembly/src/main/resources/META-INF/jboss-service.xml 2010-04-28 14:18:13 UTC (rev 634) @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<server> -<!-- This file is only here to satisfy the jboss-packaging-maven-plugin. - Does someone know if there is a setting to avoid needing this file? - Or does this require a new version of the plugin? - - This file is going to be deleted by the ant plugin - --> - -</server> \ No newline at end of file Modified: trunk/runtime/jbossesb-bpel-assembly/pom.xml =================================================================== --- trunk/runtime/jbossesb-bpel-assembly/pom.xml 2010-04-28 10:09:12 UTC (rev 633) +++ trunk/runtime/jbossesb-bpel-assembly/pom.xml 2010-04-28 14:18:13 UTC (rev 634) @@ -4,7 +4,7 @@ <groupId>org.jboss.soa.bpel.runtime</groupId> <artifactId>bpel.esb</artifactId> <version>2.0.1-SNAPSHOT</version> - <packaging>jboss-esb</packaging> + <packaging>pom</packaging> <name>RiftSaw::Runtime::JBossESB-BPEL-Assembly</name> <parent> <groupId>org.jboss.soa.bpel</groupId> @@ -20,34 +20,32 @@ </dependency> </dependencies> - <build> - <finalName>riftsaw</finalName> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>jboss-packaging-maven-plugin</artifactId> - <version>2.0-beta-1</version> - <extensions>true</extensions> - <configuration> - <excludes> - <exclude>commons-logging:commons-logging</exclude> - <exclude>jboss:jbossesb-rosetta</exclude> - <exclude>jboss:jboss-common</exclude> - <exclude>jboss:jboss-j2ee</exclude> - <exclude>jboss:jboss-jmx</exclude> - <exclude>jboss:jboss-system</exclude> - <exclude>org.jboss.soa.bpel.runtime:engine</exclude> - <exclude>org.jboss.soa.bpel:riftsaw-bpel-api</exclude> - <exclude>org.jboss.soa.bpel:riftsaw-bpel-dao</exclude> - <exclude>org.jboss.soa.bpel:riftsaw-bpel-store</exclude> - <exclude>org.jboss.soa.bpel:riftsaw-engine</exclude> - <exclude>org.jboss.soa.bpel:riftsaw-il-common</exclude> - <exclude>org.jboss.soa.bpel:riftsaw-scheduler-simple</exclude> - <exclude>org.jboss.soa.bpel:riftsaw-utils</exclude> - <exclude>wsdl4j:wsdl4j</exclude> - </excludes> - </configuration> - </plugin> - </plugins> - </build> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>distribution-package</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <finalName>riftsaw.esb</finalName> + <appendAssemblyId>false</appendAssemblyId> + <descriptors> + <descriptor>src/main/assembly/esb.xml</descriptor> + </descriptors> + <tarLongFileMode>gnu</tarLongFileMode> + <archiverConfig> + <duplicateBehavior>skip</duplicateBehavior> + </archiverConfig> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> </project> Added: trunk/runtime/jbossesb-bpel-assembly/src/main/assembly/esb.xml =================================================================== --- trunk/runtime/jbossesb-bpel-assembly/src/main/assembly/esb.xml (rev 0) +++ trunk/runtime/jbossesb-bpel-assembly/src/main/assembly/esb.xml 2010-04-28 14:18:13 UTC (rev 634) @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + * JBoss, Home of Professional Open Source + * Copyright 2008, JBoss Inc., and others contributors as indicated + * by the @authors tag. All rights reserved. + * See the copyright.txt in the distribution for a + * full listing of individual contributors. + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License, v. 2.1. + * This program is distributed in the hope that it will be useful, but WITHOUT A + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. + * You should have received a copy of the GNU Lesser General Public License, + * v.2.1 along with this distribution; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + * + * (C) 2008 +--> +<assembly> + <!-- id typically identifies the "type" (src vs bin etc) of the assembly --> + <id></id> + <includeBaseDirectory>true</includeBaseDirectory> + <formats> + <format>zip</format> + </formats> + + <fileSets> + + <fileSet> + <directory>src/main/resources</directory> + <outputDirectory>/</outputDirectory> + </fileSet> + + </fileSets> + + <dependencySets> + + <dependencySet> + <outputDirectory>/lib</outputDirectory> + <includes> + <include>org.jboss.soa.bpel.runtime:riftsaw-engine</include> + <include>org.jboss.soa.bpel.dependencies.esb:jbossesb-rosetta</include> + <include>org.jboss.soa.bpel:riftsaw-agents</include> + <include>org.jboss.soa.bpel:riftsaw-bpel-runtime</include> + <include>org.jboss.soa.bpel:riftsaw-bpel-epr</include> + <include>org.jboss.soa.bpel.runtime:jbossesb-bpel</include> + </includes> + </dependencySet> + + </dependencySets> + +</assembly> \ No newline at end of file