riftsaw SVN: r450 - branches/ODE/ODE-2.0-maven/extensions/e4x.
by riftsaw-commits@lists.jboss.org
Author: jeff.yuchang
Date: 2010-01-09 10:03:33 -0500 (Sat, 09 Jan 2010)
New Revision: 450
Modified:
branches/ODE/ODE-2.0-maven/extensions/e4x/pom.xml
Log:
* uncomment the JSOperationTest.
* copy test/resources file into target folder.
Modified: branches/ODE/ODE-2.0-maven/extensions/e4x/pom.xml
===================================================================
--- branches/ODE/ODE-2.0-maven/extensions/e4x/pom.xml 2010-01-09 14:00:55 UTC (rev 449)
+++ branches/ODE/ODE-2.0-maven/extensions/e4x/pom.xml 2010-01-09 15:03:33 UTC (rev 450)
@@ -86,15 +86,25 @@
<build>
<plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <!-- FIXME -->
- <configuration>
- <excludes>
- <exclude>**/JSOperationTest.java</exclude>
- </excludes>
- </configuration>
- </plugin>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-test-resources</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <copy todir="${project.build.directory}/resources">
+ <fileset dir="src/test/resources"/>
+ </copy>
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</project>
15 years, 2 months
riftsaw SVN: r449 - branches/ODE/ODE-2.0-maven/dao-hibernate-db.
by riftsaw-commits@lists.jboss.org
Author: jeff.yuchang
Date: 2010-01-09 09:00:55 -0500 (Sat, 09 Jan 2010)
New Revision: 449
Modified:
branches/ODE/ODE-2.0-maven/dao-hibernate-db/pom.xml
Log:
* forgot to update the db name for hibernate in my last commit.
Modified: branches/ODE/ODE-2.0-maven/dao-hibernate-db/pom.xml
===================================================================
--- branches/ODE/ODE-2.0-maven/dao-hibernate-db/pom.xml 2010-01-09 13:50:37 UTC (rev 448)
+++ branches/ODE/ODE-2.0-maven/dao-hibernate-db/pom.xml 2010-01-09 14:00:55 UTC (rev 449)
@@ -96,7 +96,7 @@
</goals>
<configuration>
<driver>org.apache.derby.jdbc.EmbeddedDriver</driver>
- <url>jdbc:derby:${basedir}/target/derby/jpadb;create=true</url>
+ <url>jdbc:derby:${basedir}/target/derby/hibdb;create=true</url>
<username>sa</username>
<password />
<autocommit>true</autocommit>
15 years, 2 months
riftsaw SVN: r448 - in branches/ODE/ODE-2.0-maven: dao-hibernate-db and 1 other directories.
by riftsaw-commits@lists.jboss.org
Author: jeff.yuchang
Date: 2010-01-09 08:50:37 -0500 (Sat, 09 Jan 2010)
New Revision: 448
Modified:
branches/ODE/ODE-2.0-maven/dao-hibernate-db/build.xml
branches/ODE/ODE-2.0-maven/dao-hibernate-db/pom.xml
branches/ODE/ODE-2.0-maven/dao-jpa-db/build.xml
branches/ODE/ODE-2.0-maven/dao-jpa-db/pom.xml
branches/ODE/ODE-2.0-maven/pom.xml
Log:
* using sql-maven-plugin instead of sql ant task.
Modified: branches/ODE/ODE-2.0-maven/dao-hibernate-db/build.xml
===================================================================
--- branches/ODE/ODE-2.0-maven/dao-hibernate-db/build.xml 2010-01-09 09:36:03 UTC (rev 447)
+++ branches/ODE/ODE-2.0-maven/dao-hibernate-db/build.xml 2010-01-09 13:50:37 UTC (rev 448)
@@ -59,20 +59,7 @@
</target>
- <target name="create-derby-db">
- <property name="dblocation" value="${basedir}/target/derby/hibdb" />
- <sql
- driver="org.apache.derby.jdbc.EmbeddedDriver"
- url="jdbc:derby:${dblocation};create=true"
- userid="sa"
- password=""
- autocommit="yes"
- >
- <transaction src="${basedir}/target/derby.sql"/>
- <classpath>
- <path refid="classpath"/>
- </classpath>
- </sql>
+ <target name="zip-derby-db">
<zip destfile="${basedir}/target/ode-dao-hibernate-db-${ode.version}.zip" basedir="${basedir}/target/derby/" />
</target>
Modified: branches/ODE/ODE-2.0-maven/dao-hibernate-db/pom.xml
===================================================================
--- branches/ODE/ODE-2.0-maven/dao-hibernate-db/pom.xml 2010-01-09 09:36:03 UTC (rev 447)
+++ branches/ODE/ODE-2.0-maven/dao-hibernate-db/pom.xml 2010-01-09 13:50:37 UTC (rev 448)
@@ -75,9 +75,7 @@
<configuration>
<tasks>
<property name="maven.runtime.classpath" refid="maven.compile.classpath"/>
- <property name="ode.version" value="${ode.version}" />
<ant antfile="build.xml" target="create-schema" inheritRefs="true"/>
- <!--ant antfile="build.xml" target="create-derby-db" /-->
</tasks>
</configuration>
<goals>
@@ -86,6 +84,48 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>sql-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>create-derby-db</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>execute</goal>
+ </goals>
+ <configuration>
+ <driver>org.apache.derby.jdbc.EmbeddedDriver</driver>
+ <url>jdbc:derby:${basedir}/target/derby/jpadb;create=true</url>
+ <username>sa</username>
+ <password />
+ <autocommit>true</autocommit>
+ <onError>continue</onError>
+ <srcFiles>
+ <srcFile>target/derby.sql</srcFile>
+ </srcFiles>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>zip-derby-db</id>
+ <phase>package</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <property name="ode.version" value="${project.version}"/>
+ <ant antfile="build.xml" target="zip-derby-db" />
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</project>
Modified: branches/ODE/ODE-2.0-maven/dao-jpa-db/build.xml
===================================================================
--- branches/ODE/ODE-2.0-maven/dao-jpa-db/build.xml 2010-01-09 09:36:03 UTC (rev 447)
+++ branches/ODE/ODE-2.0-maven/dao-jpa-db/build.xml 2010-01-09 13:50:37 UTC (rev 448)
@@ -48,22 +48,8 @@
</target>
- <target name="create-derby-db">
- <property name="dblocation" value="${basedir}/target/derby/jpadb" />
- <sql
- driver="org.apache.derby.jdbc.EmbeddedDriver"
- url="jdbc:derby:${dblocation};create=true"
- userid="sa"
- password=""
- autocommit="yes"
- >
- <transaction src="${basedir}/target/derby.sql"/>
- <classpath>
- <path refid="classpath"/>
- </classpath>
- </sql>
- <zip destfile="${basedir}/target/ode-dao-jpa-db-${ode.version}.zip" basedir="${basedir}/target/derby/" />
-
+ <target name="zip-derby-db">
+ <zip destfile="${basedir}/target/ode-dao-jpa-db-${ode.version}.zip" basedir="${basedir}/target/derby" />
</target>
<!--
Modified: branches/ODE/ODE-2.0-maven/dao-jpa-db/pom.xml
===================================================================
--- branches/ODE/ODE-2.0-maven/dao-jpa-db/pom.xml 2010-01-09 09:36:03 UTC (rev 447)
+++ branches/ODE/ODE-2.0-maven/dao-jpa-db/pom.xml 2010-01-09 13:50:37 UTC (rev 448)
@@ -159,14 +159,56 @@
<configuration>
<tasks>
<property name="maven.runtime.classpath" refid="maven.compile.classpath"/>
- <property name="ode.version" value="${ode.version}"/>
<ant antfile="build.xml" target="create-schema" />
- <!--ant antfile="build.xml" target="create-derby-db" /-->
</tasks>
</configuration>
</execution>
</executions>
</plugin>
+
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>sql-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>create-derby-db</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>execute</goal>
+ </goals>
+ <configuration>
+ <driver>org.apache.derby.jdbc.EmbeddedDriver</driver>
+ <url>jdbc:derby:${basedir}/target/derby/jpadb;create=true</url>
+ <username>sa</username>
+ <password />
+ <autocommit>true</autocommit>
+ <onError>continue</onError>
+ <srcFiles>
+ <srcFile>target/derby.sql</srcFile>
+ </srcFiles>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>zip-derby-db</id>
+ <phase>package</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <property name="ode.version" value="${project.version}"/>
+ <ant antfile="build.xml" target="zip-derby-db" />
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
</plugins>
</build>
Modified: branches/ODE/ODE-2.0-maven/pom.xml
===================================================================
--- branches/ODE/ODE-2.0-maven/pom.xml 2010-01-09 09:36:03 UTC (rev 447)
+++ branches/ODE/ODE-2.0-maven/pom.xml 2010-01-09 13:50:37 UTC (rev 448)
@@ -138,7 +138,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-3</version>
+ <version>2.2-beta-5</version>
</plugin>
<plugin>
@@ -182,6 +182,24 @@
<version>2.3.3</version>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>sql-maven-plugin</artifactId>
+ <version>1.2</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ <version>${derby.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbytools</artifactId>
+ <version>${derby.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+
<!-- Allows direct usage of the javadoc:javadoc goal. -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
15 years, 2 months
riftsaw SVN: r447 - in branches/ODE/ODE-2.0-maven: distro/src/main/assembly and 1 other directory.
by riftsaw-commits@lists.jboss.org
Author: jeff.yuchang
Date: 2010-01-09 04:36:03 -0500 (Sat, 09 Jan 2010)
New Revision: 447
Modified:
branches/ODE/ODE-2.0-maven/distro/src/main/assembly/jbi.xml
branches/ODE/ODE-2.0-maven/distro/src/main/assembly/war.xml
branches/ODE/ODE-2.0-maven/pom.xml
Log:
* update license in the assembly descriptor.
Modified: branches/ODE/ODE-2.0-maven/distro/src/main/assembly/jbi.xml
===================================================================
--- branches/ODE/ODE-2.0-maven/distro/src/main/assembly/jbi.xml 2010-01-09 09:34:06 UTC (rev 446)
+++ branches/ODE/ODE-2.0-maven/distro/src/main/assembly/jbi.xml 2010-01-09 09:36:03 UTC (rev 447)
@@ -34,7 +34,8 @@
<fileSet>
<directory>src/bin</directory>
- <outputDirectory>/bin</outputDirectory>
+ <outputDirectory>/bin</outputDirectory>
+ <fileMode>755</fileMode>
</fileSet>
<fileSet>
@@ -44,7 +45,7 @@
<include>*.sql</include>
</includes>
<excludes>
- <exclude>*.partial.sql</exclude>
+ <exclude>*partial*.sql</exclude>
</excludes>
</fileSet>
@@ -60,6 +61,14 @@
</fileSet>
<fileSet>
+ <directory>${basedir}/license</directory>
+ <outputDirectory>/lib</outputDirectory>
+ <includes>
+ <include>*LICENSE</include>
+ </includes>
+ </fileSet>
+
+ <fileSet>
<directory>${basedir}/../extensions/e4x</directory>
<outputDirectory>/extensions/ode-extensions-e4x</outputDirectory>
<includes>
Modified: branches/ODE/ODE-2.0-maven/distro/src/main/assembly/war.xml
===================================================================
--- branches/ODE/ODE-2.0-maven/distro/src/main/assembly/war.xml 2010-01-09 09:34:06 UTC (rev 446)
+++ branches/ODE/ODE-2.0-maven/distro/src/main/assembly/war.xml 2010-01-09 09:36:03 UTC (rev 447)
@@ -34,7 +34,8 @@
<fileSet>
<directory>src/bin</directory>
- <outputDirectory>/bin</outputDirectory>
+ <outputDirectory>/bin</outputDirectory>
+ <fileMode>755</fileMode>
</fileSet>
<fileSet>
@@ -44,7 +45,7 @@
<include>*.sql</include>
</includes>
<excludes>
- <exclude>*.partial.sql</exclude>
+ <exclude>*partial*.sql</exclude>
</excludes>
</fileSet>
@@ -60,6 +61,14 @@
</fileSet>
<fileSet>
+ <directory>${basedir}/license</directory>
+ <outputDirectory>/lib</outputDirectory>
+ <includes>
+ <include>*LICENSE</include>
+ </includes>
+ </fileSet>
+
+ <fileSet>
<directory>${basedir}/../extensions/e4x</directory>
<outputDirectory>/extensions/ode-extensions-e4x</outputDirectory>
<includes>
Modified: branches/ODE/ODE-2.0-maven/pom.xml
===================================================================
--- branches/ODE/ODE-2.0-maven/pom.xml 2010-01-09 09:34:06 UTC (rev 446)
+++ branches/ODE/ODE-2.0-maven/pom.xml 2010-01-09 09:36:03 UTC (rev 447)
@@ -129,6 +129,7 @@
<module>axis2</module>
<module>jbi</module>
<module>axis2-war</module>
+ <module>distro</module>
</modules>
<build>
15 years, 2 months
riftsaw SVN: r446 - trunk/distribution/src/main/assembly.
by riftsaw-commits@lists.jboss.org
Author: jeff.yuchang
Date: 2010-01-09 04:34:06 -0500 (Sat, 09 Jan 2010)
New Revision: 446
Modified:
trunk/distribution/src/main/assembly/bin.xml
Log:
* add fileMode for the bin.
Modified: trunk/distribution/src/main/assembly/bin.xml
===================================================================
--- trunk/distribution/src/main/assembly/bin.xml 2010-01-08 16:59:54 UTC (rev 445)
+++ trunk/distribution/src/main/assembly/bin.xml 2010-01-09 09:34:06 UTC (rev 446)
@@ -84,7 +84,8 @@
<fileSet>
<directory>src/main/release/bin</directory>
- <outputDirectory>bin</outputDirectory>
+ <outputDirectory>bin</outputDirectory>
+ <fileMode>755</fileMode>
</fileSet>
<fileSet>
15 years, 2 months
riftsaw SVN: r445 - in trunk: integration-tests/src/test/java/org/jboss/soa/bpel/tests/testcases and 18 other directories.
by riftsaw-commits@lists.jboss.org
Author: objectiser
Date: 2010-01-08 11:59:54 -0500 (Fri, 08 Jan 2010)
New Revision: 445
Added:
trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/testcases/RiftSaw144TestCase.java
trunk/integration-tests/src/test/resources/testcases/RiftSaw_144/
trunk/integration-tests/src/test/resources/testcases/RiftSaw_144/build.xml
trunk/integration-tests/src/test/resources/testcases/RiftSaw_144/deployment.xml
trunk/integration-tests/src/test/resources/testcases/RiftSaw_144/jbm-queue-service.xml
trunk/integration-tests/src/test/resources/testcases/RiftSaw_144/jboss-esb.xml
trunk/integration-tests/src/test/resources/testcases/RiftSaw_144/src/
trunk/integration-tests/src/test/resources/testcases/RiftSaw_144/src/org/
trunk/integration-tests/src/test/resources/testcases/RiftSaw_144/src/org/jboss/
trunk/integration-tests/src/test/resources/testcases/RiftSaw_144/src/org/jboss/soa/
trunk/integration-tests/src/test/resources/testcases/RiftSaw_144/src/org/jboss/soa/esb/
trunk/integration-tests/src/test/resources/testcases/RiftSaw_144/src/org/jboss/soa/esb/samples/
trunk/integration-tests/src/test/resources/testcases/RiftSaw_144/src/org/jboss/soa/esb/samples/quickstart/
trunk/integration-tests/src/test/resources/testcases/RiftSaw_144/src/org/jboss/soa/esb/samples/quickstart/helloworld/
trunk/integration-tests/src/test/resources/testcases/RiftSaw_144/src/org/jboss/soa/esb/samples/quickstart/helloworld/CopyPayloadAction.java
trunk/runtime/jbossesb-bpel/src/main/java/org/jboss/internal/
trunk/runtime/jbossesb-bpel/src/main/java/org/jboss/internal/soa/
trunk/runtime/jbossesb-bpel/src/main/java/org/jboss/internal/soa/esb/
trunk/runtime/jbossesb-bpel/src/main/java/org/jboss/internal/soa/esb/actions/
trunk/runtime/jbossesb-bpel/src/main/java/org/jboss/internal/soa/esb/actions/bpel/
trunk/runtime/jbossesb-bpel/src/main/java/org/jboss/internal/soa/esb/actions/bpel/ESBInvocationAdapter.java
Removed:
trunk/runtime/jbossesb-bpel/src/main/java/org/jboss/soa/esb/actions/bpel/ESBInvocationAdapter.java
Modified:
trunk/integration-tests/build.xml
trunk/runtime/jbossesb-bpel/src/main/java/org/jboss/soa/esb/actions/bpel/BPELInvoke.java
trunk/runtime/jbossesb-bpel/src/test/java/org/jboss/soa/esb/actions/bpel/TestBPELEngine.java
Log:
RIFTSAW-144: Made use of MessagePayloadProxy, provided integration test, and moved the ESBInvocationAdapter implementation to be an internal class.
Modified: trunk/integration-tests/build.xml
===================================================================
--- trunk/integration-tests/build.xml 2010-01-08 16:31:56 UTC (rev 444)
+++ trunk/integration-tests/build.xml 2010-01-08 16:59:54 UTC (rev 445)
@@ -138,6 +138,7 @@
<ant antfile="src/test/resources/samples/Tutorial_bpel_travel_agency/build.xml" />
<ant antfile="src/test/resources/testcases/RiftSaw_118/build.xml" />
+ <ant antfile="src/test/resources/testcases/RiftSaw_144/build.xml" />
</target>
</project>
Added: trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/testcases/RiftSaw144TestCase.java
===================================================================
--- trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/testcases/RiftSaw144TestCase.java (rev 0)
+++ trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/testcases/RiftSaw144TestCase.java 2010-01-08 16:59:54 UTC (rev 445)
@@ -0,0 +1,50 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY 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 along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.soa.bpel.tests.testcases;
+
+import org.jboss.soa.bpel.tests.RiftSawTest;
+import org.jboss.soa.bpel.tests.RiftSawTestSetup;
+
+import junit.framework.Test;
+
+/**
+ * Test case for running the Quickstart_bpel_hello_world sample.
+ */
+public class RiftSaw144TestCase extends RiftSawTest {
+
+ private static final String TEST_NAME = "RiftSaw_144";
+
+ public RiftSaw144TestCase() {
+ super(TEST_NAME);
+ }
+
+ public static Test suite() {
+ return(new RiftSawTestSetup(RiftSaw144TestCase.class,
+ TEST_NAME, "RiftSaw_144.esb,../Quickstart_bpel_hello_world/Quickstart_bpel_hello_world-1.jar"));
+ }
+
+ public void testSendHello() throws Exception {
+ String result=sendESBMessage("Hello World via ESB to BPEL", "HelloWorldBPELESB", "SayHello");
+
+ assertMessage(result, "Hello World via ESB to BPEL World");
+ }
+}
Added: trunk/integration-tests/src/test/resources/testcases/RiftSaw_144/build.xml
===================================================================
--- trunk/integration-tests/src/test/resources/testcases/RiftSaw_144/build.xml (rev 0)
+++ trunk/integration-tests/src/test/resources/testcases/RiftSaw_144/build.xml 2010-01-08 16:59:54 UTC (rev 445)
@@ -0,0 +1,43 @@
+<project name="RiftSaw_144" default="deploy" basedir=".">
+
+ <description>
+ ${ant.project.name}
+ ${line.separator}
+ </description>
+
+ <property name="deploy.dir" value="${basedir}/target/tests"/>
+ <property name="classes" value="${basedir}/target/compile-tests/${ant.project.name}"/>
+ <property name="test.dir" value="${basedir}/src/test/resources/testcases/${ant.project.name}" />
+ <property name="src.dir" value="${test.dir}/src" />
+
+ <property name="sample.esb.name" value="${ant.project.name}.esb" />
+
+ <target name="compile">
+
+ <mkdir dir="${classes}" />
+
+ <javac srcdir="${src.dir}" destdir="${classes}" debug="true" deprecation="true" fork="true" >
+ <classpath>
+ <fileset dir="${org.jboss.esb.home}/lib" />
+ <fileset dir="${org.jboss.as.home}/client" excludes="jbossws-native-jaxws.jar jbossws-native-jaxws-ext.jar jaxws-rt.jar jaxws-tools.jar" />
+ </classpath>
+ </javac>
+ </target>
+
+ <target name="deploy" depends="compile" >
+ <echo>Deploy ${ant.project.name}</echo>
+ <mkdir dir="${deploy.dir}/${ant.project.name}" />
+ <zip destfile="${deploy.dir}/${ant.project.name}/${sample.esb.name}">
+ <zipfileset dir="${test.dir}" includes="deployment.xml" fullpath="META-INF/deployment.xml"/>
+ <zipfileset dir="${test.dir}" includes="jboss-esb.xml" fullpath="META-INF/jboss-esb.xml"/>
+ <zipfileset dir="${test.dir}" includes="jbm-queue-service.xml" fullpath="jbm-queue-service.xml"/>
+ <zipfileset dir="${classes}" />
+ </zip>
+ </target>
+
+ <target name="undeploy">
+ <echo>Undeploy ${ant.project.name}</echo>
+ <delete file="${deploy.dir}/${sample.jar.name}" />
+ </target>
+
+</project>
Added: trunk/integration-tests/src/test/resources/testcases/RiftSaw_144/deployment.xml
===================================================================
--- trunk/integration-tests/src/test/resources/testcases/RiftSaw_144/deployment.xml (rev 0)
+++ trunk/integration-tests/src/test/resources/testcases/RiftSaw_144/deployment.xml 2010-01-08 16:59:54 UTC (rev 445)
@@ -0,0 +1,6 @@
+<jbossesb-deployment>
+ <depends>jboss.bpel:service=BPELEngine</depends>
+ <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_bpel_helloworld_Request_esb</depends>
+ <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_bpel_helloworld_Request_esb_reply</depends>
+ <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_bpel_helloworld_Request_gw</depends>
+</jbossesb-deployment>
Added: trunk/integration-tests/src/test/resources/testcases/RiftSaw_144/jbm-queue-service.xml
===================================================================
--- trunk/integration-tests/src/test/resources/testcases/RiftSaw_144/jbm-queue-service.xml (rev 0)
+++ trunk/integration-tests/src/test/resources/testcases/RiftSaw_144/jbm-queue-service.xml 2010-01-08 16:59:54 UTC (rev 445)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_bpel_helloworld_Request_esb"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_bpel_helloworld_Request_esb_reply"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_bpel_helloworld_Request_gw"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+</server>
Added: trunk/integration-tests/src/test/resources/testcases/RiftSaw_144/jboss-esb.xml
===================================================================
--- trunk/integration-tests/src/test/resources/testcases/RiftSaw_144/jboss-esb.xml (rev 0)
+++ trunk/integration-tests/src/test/resources/testcases/RiftSaw_144/jboss-esb.xml 2010-01-08 16:59:54 UTC (rev 445)
@@ -0,0 +1,58 @@
+<?xml version = "1.0" encoding = "UTF-8"?>
+<jbossesb xmlns="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml..." parameterReloadSecs="5">
+
+ <providers>
+ <jms-provider name="JBossMQ" connection-factory="ConnectionFactory">
+ <jms-bus busid="quickstartGwChannel">
+ <jms-message-filter
+ dest-type="QUEUE"
+ dest-name="queue/quickstart_bpel_helloworld_Request_gw"
+ />
+ </jms-bus>
+ <jms-bus busid="quickstartEsbChannel">
+ <jms-message-filter
+ dest-type="QUEUE"
+ dest-name="queue/quickstart_bpel_helloworld_Request_esb"
+ />
+ </jms-bus>
+
+ </jms-provider>
+ </providers>
+
+ <services>
+ <service
+ category="HelloWorldBPELESB"
+ name="SayHello"
+ description="Hello World">
+ <listeners>
+ <jms-listener name="JMS-Gateway"
+ busidref="quickstartGwChannel"
+ is-gateway="true" />
+ <jms-listener name="helloWorld"
+ busidref="quickstartEsbChannel" />
+ </listeners>
+ <actions>
+ <action name="action1" class="org.jboss.soa.esb.actions.SystemPrintln">
+ <property name="printfull" value="true"/>
+ </action>
+ <action name="action2" class="org.jboss.soa.esb.samples.quickstart.helloworld.CopyPayloadAction">
+ <property name="set-payload-location" value="test1"/>
+ </action>
+ <action name="action3" class="org.jboss.soa.esb.actions.bpel.BPELInvoke">
+ <property name="service" value="{http://www.jboss.org/bpel/examples/wsdl}HelloService"/>
+ <property name="operation" value="hello" />
+ <property name="requestPartName" value="TestPart" />
+ <property name="responsePartName" value="TestPart" />
+ <property name="get-payload-location" value="test1"/>
+ <property name="set-payload-location" value="test2"/>
+ </action>
+ <action name="action4" class="org.jboss.soa.esb.samples.quickstart.helloworld.CopyPayloadAction">
+ <property name="get-payload-location" value="test2"/>
+ </action>
+ <!-- The next action is for Continuous Integration testing -->
+ <action name="testStore" class="org.jboss.soa.esb.actions.TestMessageStore"/>
+ </actions>
+ </service>
+ </services>
+
+</jbossesb>
Added: trunk/integration-tests/src/test/resources/testcases/RiftSaw_144/src/org/jboss/soa/esb/samples/quickstart/helloworld/CopyPayloadAction.java
===================================================================
--- trunk/integration-tests/src/test/resources/testcases/RiftSaw_144/src/org/jboss/soa/esb/samples/quickstart/helloworld/CopyPayloadAction.java (rev 0)
+++ trunk/integration-tests/src/test/resources/testcases/RiftSaw_144/src/org/jboss/soa/esb/samples/quickstart/helloworld/CopyPayloadAction.java 2010-01-08 16:59:54 UTC (rev 445)
@@ -0,0 +1,51 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, 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) 2005-2006,
+ * @author JBoss Inc.
+ */
+package org.jboss.soa.esb.samples.quickstart.helloworld;
+
+import org.jboss.soa.esb.actions.AbstractActionLifecycle;
+import org.jboss.soa.esb.helpers.ConfigTree;
+import org.jboss.soa.esb.message.Message;
+import org.jboss.soa.esb.actions.ActionProcessingException;
+import org.jboss.soa.esb.message.MessagePayloadProxy;
+import org.jboss.soa.esb.message.format.MessageFactory;
+
+
+public class CopyPayloadAction extends AbstractActionLifecycle
+{
+
+ protected ConfigTree _config;
+
+ public CopyPayloadAction(ConfigTree config) { _config = config; }
+
+ public Message process(Message message) throws Exception {
+ MessagePayloadProxy proxy=new MessagePayloadProxy(_config);
+
+ Object val=proxy.getPayload(message);
+
+ System.out.println("Payload="+val);
+
+ Message ret=MessageFactory.getInstance().getMessage();
+
+ proxy.setPayload(ret, val);
+
+ return ret;
+ }
+}
Copied: trunk/runtime/jbossesb-bpel/src/main/java/org/jboss/internal/soa/esb/actions/bpel/ESBInvocationAdapter.java (from rev 438, trunk/runtime/jbossesb-bpel/src/main/java/org/jboss/soa/esb/actions/bpel/ESBInvocationAdapter.java)
===================================================================
--- trunk/runtime/jbossesb-bpel/src/main/java/org/jboss/internal/soa/esb/actions/bpel/ESBInvocationAdapter.java (rev 0)
+++ trunk/runtime/jbossesb-bpel/src/main/java/org/jboss/internal/soa/esb/actions/bpel/ESBInvocationAdapter.java 2010-01-08 16:59:54 UTC (rev 445)
@@ -0,0 +1,106 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY 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 along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.internal.soa.esb.actions.bpel;
+
+import org.apache.ode.bpel.iapi.Message;
+import org.apache.ode.bpel.iapi.MyRoleMessageExchange;
+import org.jboss.soa.bpel.runtime.engine.InvocationAdapter;
+import org.w3c.dom.Element;
+
+import javax.xml.namespace.QName;
+
+/**
+ * @author Heiko Braun <hbraun(a)redhat.com>
+ */
+public class ESBInvocationAdapter implements InvocationAdapter<Element>
+{
+ private String operationName;
+ private QName serviceName;
+ private QName faultName;
+ private Element requestXML;
+ private Element responseXML;
+
+ public ESBInvocationAdapter(String operationName, QName serviceName)
+ {
+ this.operationName = operationName;
+ this.serviceName = serviceName;
+ }
+
+ public String getOperationName()
+ {
+ return operationName;
+ }
+
+ public QName getFaultName()
+ {
+ return faultName;
+ }
+
+ public void setFaultName(QName fname) {
+ this.faultName = fname;
+ }
+
+ public QName getServiceName()
+ {
+ return serviceName;
+ }
+
+ public void setRequestXML(Element requestXML)
+ {
+ this.requestXML = requestXML;
+ }
+
+ public void parseRequest(MyRoleMessageExchange mex, Message request)
+ {
+ if(null==this.requestXML)
+ throw new IllegalArgumentException("request XML not set");
+ request.setMessage(this.requestXML);
+ }
+
+ public void createResponse(MyRoleMessageExchange mex)
+ {
+ this.responseXML = mex.getResponse().getMessage();
+ }
+
+ public void createFault(MyRoleMessageExchange mex)
+ {
+ this.responseXML = mex.getFaultResponse().getMessage();
+ this.faultName = mex.getFault();
+ }
+
+ public Element getInvocationResult()
+ {
+ return this.responseXML;
+ }
+
+ // test methods
+ public Element getRequestXML()
+ {
+ return requestXML;
+ }
+
+ public void setResponseXML(Element responseXML)
+ {
+ this.responseXML = responseXML;
+ }
+}
+
Modified: trunk/runtime/jbossesb-bpel/src/main/java/org/jboss/soa/esb/actions/bpel/BPELInvoke.java
===================================================================
--- trunk/runtime/jbossesb-bpel/src/main/java/org/jboss/soa/esb/actions/bpel/BPELInvoke.java 2010-01-08 16:31:56 UTC (rev 444)
+++ trunk/runtime/jbossesb-bpel/src/main/java/org/jboss/soa/esb/actions/bpel/BPELInvoke.java 2010-01-08 16:59:54 UTC (rev 445)
@@ -22,9 +22,11 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.jboss.internal.soa.esb.actions.bpel.ESBInvocationAdapter;
import org.jboss.soa.esb.actions.AbstractActionLifecycle;
import org.jboss.soa.esb.helpers.ConfigTree;
import org.jboss.soa.esb.message.Message;
+import org.jboss.soa.esb.message.MessagePayloadProxy;
import org.jboss.soa.esb.message.format.MessageFactory;
import javax.naming.*;
@@ -113,6 +115,9 @@
throw new RuntimeException("Failed to locate BPEL engine");
}
+ // Create MessagePayloadProxy
+ MessagePayloadProxy proxy=new MessagePayloadProxy(_config);
+
String requestPartName=_config.getAttribute(REQUEST_PART_NAME);
logger.debug("Request: "+message);
@@ -121,7 +126,7 @@
org.w3c.dom.Element mesgElem=null;
// Get default body value
- Object value=message.getBody().get();
+ Object value=proxy.getPayload(message); //message.getBody().get();
Node node=null;
if (value instanceof String) {
@@ -178,18 +183,18 @@
org.w3c.dom.Element resp=null;
javax.xml.namespace.QName faultName=null;
- QName serviceQName = new QName(getNamespace(serviceName), getLocalPart(serviceName));
+ QName serviceQName = new QName(getNamespace(serviceName), getLocalPart(serviceName));
+
+ // Create invocationContext
+ ESBInvocationAdapter invocationContext =
+ new ESBInvocationAdapter(_config.getAttribute(OPERATION), serviceQName);
+ invocationContext.setRequestXML(mesgElem);
+
+ // invoke ODE
+ engine.invoke(invocationContext);
+ resp = invocationContext.getInvocationResult();
+ faultName = invocationContext.getFaultName();
- // Create invocationContext
- ESBInvocationAdapter invocationContext =
- new ESBInvocationAdapter(_config.getAttribute(OPERATION), serviceQName);
- invocationContext.setRequestXML(mesgElem);
-
- // invoke ODE
- engine.invoke(invocationContext);
- resp = invocationContext.getInvocationResult();
- faultName = invocationContext.getFaultName();
-
if (resp != null) {
ret = MessageFactory.getInstance().getMessage();
@@ -236,8 +241,11 @@
logger.error("Unable to convert message part '"+(defpart==null?"<undefined>":defpart)+
"' into a response document");
} else {
- ret.getBody().add(respValue);
+ //ret.getBody().add(respValue);
+ // Set the payload in the returned message
+ proxy.setPayload(ret, respValue);
+
// Check if fault name should be set
if (faultName != null) {
logger.debug("Fault '"+faultName+"' detected, throwing exception");
Deleted: trunk/runtime/jbossesb-bpel/src/main/java/org/jboss/soa/esb/actions/bpel/ESBInvocationAdapter.java
===================================================================
--- trunk/runtime/jbossesb-bpel/src/main/java/org/jboss/soa/esb/actions/bpel/ESBInvocationAdapter.java 2010-01-08 16:31:56 UTC (rev 444)
+++ trunk/runtime/jbossesb-bpel/src/main/java/org/jboss/soa/esb/actions/bpel/ESBInvocationAdapter.java 2010-01-08 16:59:54 UTC (rev 445)
@@ -1,106 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY 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 along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.soa.esb.actions.bpel;
-
-import org.apache.ode.bpel.iapi.Message;
-import org.apache.ode.bpel.iapi.MyRoleMessageExchange;
-import org.jboss.soa.bpel.runtime.engine.InvocationAdapter;
-import org.w3c.dom.Element;
-
-import javax.xml.namespace.QName;
-
-/**
- * @author Heiko Braun <hbraun(a)redhat.com>
- */
-public class ESBInvocationAdapter implements InvocationAdapter<Element>
-{
- private String operationName;
- private QName serviceName;
- private QName faultName;
- private Element requestXML;
- private Element responseXML;
-
- public ESBInvocationAdapter(String operationName, QName serviceName)
- {
- this.operationName = operationName;
- this.serviceName = serviceName;
- }
-
- public String getOperationName()
- {
- return operationName;
- }
-
- public QName getFaultName()
- {
- return faultName;
- }
-
- public void setFaultName(QName fname) {
- this.faultName = fname;
- }
-
- public QName getServiceName()
- {
- return serviceName;
- }
-
- public void setRequestXML(Element requestXML)
- {
- this.requestXML = requestXML;
- }
-
- public void parseRequest(MyRoleMessageExchange mex, Message request)
- {
- if(null==this.requestXML)
- throw new IllegalArgumentException("request XML not set");
- request.setMessage(this.requestXML);
- }
-
- public void createResponse(MyRoleMessageExchange mex)
- {
- this.responseXML = mex.getResponse().getMessage();
- }
-
- public void createFault(MyRoleMessageExchange mex)
- {
- this.responseXML = mex.getFaultResponse().getMessage();
- this.faultName = mex.getFault();
- }
-
- public Element getInvocationResult()
- {
- return this.responseXML;
- }
-
- // test methods
- Element getRequestXML()
- {
- return requestXML;
- }
-
- void setResponseXML(Element responseXML)
- {
- this.responseXML = responseXML;
- }
-}
-
Modified: trunk/runtime/jbossesb-bpel/src/test/java/org/jboss/soa/esb/actions/bpel/TestBPELEngine.java
===================================================================
--- trunk/runtime/jbossesb-bpel/src/test/java/org/jboss/soa/esb/actions/bpel/TestBPELEngine.java 2010-01-08 16:31:56 UTC (rev 444)
+++ trunk/runtime/jbossesb-bpel/src/test/java/org/jboss/soa/esb/actions/bpel/TestBPELEngine.java 2010-01-08 16:59:54 UTC (rev 445)
@@ -17,6 +17,7 @@
*/
package org.jboss.soa.esb.actions.bpel;
+import org.jboss.internal.soa.esb.actions.bpel.ESBInvocationAdapter;
import org.jboss.soa.bpel.runtime.engine.BPELEngine;
import org.jboss.soa.bpel.runtime.engine.IntegrationLayer;
15 years, 2 months
riftsaw SVN: r444 - in branches/ODE/ODE-2.0-maven/distro: src and 2 other directories.
by riftsaw-commits@lists.jboss.org
Author: jeff.yuchang
Date: 2010-01-08 11:31:56 -0500 (Fri, 08 Jan 2010)
New Revision: 444
Added:
branches/ODE/ODE-2.0-maven/distro/pom.xml
branches/ODE/ODE-2.0-maven/distro/src/main/
branches/ODE/ODE-2.0-maven/distro/src/main/assembly/
branches/ODE/ODE-2.0-maven/distro/src/main/assembly/jbi.xml
branches/ODE/ODE-2.0-maven/distro/src/main/assembly/war.xml
Log:
* add pom for distro, not fully finished yet.
Added: branches/ODE/ODE-2.0-maven/distro/pom.xml
===================================================================
--- branches/ODE/ODE-2.0-maven/distro/pom.xml (rev 0)
+++ branches/ODE/ODE-2.0-maven/distro/pom.xml 2010-01-08 16:31:56 UTC (rev 444)
@@ -0,0 +1,123 @@
+<?xml version="1.0"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-distro</artifactId>
+ <name>ODE :: Distribution</name>
+ <packaging>pom</packaging>
+
+ <parent>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ </parent>
+
+ <properties>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-utils</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-tools</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-bpel-compiler</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-bpel-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-runtimes</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-bpel-schemas</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-pool</groupId>
+ <artifactId>commons-pool</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>rhino</groupId>
+ <artifactId>js</artifactId>
+ <version>1.7R1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>apache-activemq</artifactId>
+ </dependency>
+ </dependencies>
+
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>war-distro</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <finalName>apache-ode-war-${project.version}</finalName>
+ <appendAssemblyId>false</appendAssemblyId>
+ <descriptors>
+ <descriptor>src/main/assembly/war.xml</descriptor>
+ </descriptors>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ </configuration>
+ </execution>
+ <execution>
+ <id>jbi-distro</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <finalName>apache-ode-jbi-${project.version}</finalName>
+ <appendAssemblyId>false</appendAssemblyId>
+ <descriptors>
+ <descriptor>src/main/assembly/jbi.xml</descriptor>
+ </descriptors>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Added: branches/ODE/ODE-2.0-maven/distro/src/main/assembly/jbi.xml
===================================================================
--- branches/ODE/ODE-2.0-maven/distro/src/main/assembly/jbi.xml (rev 0)
+++ branches/ODE/ODE-2.0-maven/distro/src/main/assembly/jbi.xml 2010-01-08 16:31:56 UTC (rev 444)
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+<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/examples-jbi</directory>
+ <outputDirectory>/examples</outputDirectory>
+ </fileSet>
+
+ <fileSet>
+ <directory>src/bin</directory>
+ <outputDirectory>/bin</outputDirectory>
+ </fileSet>
+
+ <fileSet>
+ <directory>${basedir}/../dao-jpa-db/target/</directory>
+ <outputDirectory>/sql</outputDirectory>
+ <includes>
+ <include>*.sql</include>
+ </includes>
+ <excludes>
+ <exclude>*.partial.sql</exclude>
+ </excludes>
+ </fileSet>
+
+ <fileSet>
+ <directory>${basedir}/../</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>LICENSE</include>
+ <include>README</include>
+ <include>NOTICE</include>
+ <include>RELEASE_NOTES</include>
+ </includes>
+ </fileSet>
+
+ <fileSet>
+ <directory>${basedir}/../extensions/e4x</directory>
+ <outputDirectory>/extensions/ode-extensions-e4x</outputDirectory>
+ <includes>
+ <include>README</include>
+ </includes>
+ </fileSet>
+
+ <fileSet>
+ <directory>${basedir}/../extensions/e4x/target</directory>
+ <outputDirectory>/extensions/ode-extensions-e4x</outputDirectory>
+ <includes>
+ <include>ode-extensions-e4x*.jar</include>
+ </includes>
+ </fileSet>
+
+ <fileSet>
+ <directory>${basedir}/../extensions/jms-eventpublisher</directory>
+ <outputDirectory>/extensions/ode-extensions-jms-eventpublisher</outputDirectory>
+ <includes>
+ <include>README</include>
+ </includes>
+ </fileSet>
+
+ <fileSet>
+ <directory>${basedir}/../extensions/jms-eventpublisher/target</directory>
+ <outputDirectory>/extensions/ode-extensions-jms-eventpublisher</outputDirectory>
+ <includes>
+ <include>ode-extensions-jms*.jar</include>
+ </includes>
+ </fileSet>
+
+ <fileSet>
+ <directory>${basedir}/../extensions</directory>
+ <outputDirectory>/extensions</outputDirectory>
+ <includes>
+ <include>README.extensions</include>
+ </includes>
+ </fileSet>
+
+ </fileSets>
+
+ <files>
+ <file>
+ <source>${basedir}/../jbi/target/ode-jbi-${project.version}.zip</source>
+ <outputDirectory>/</outputDirectory>
+ </file>
+ </files>
+
+
+ <dependencySets>
+
+ <dependencySet>
+ <outputDirectory>/lib</outputDirectory>
+ <includes>
+ <include>org.apache.ode:ode-utils</include>
+ <include>org.apache.ode:ode-tools</include>
+ <include>org.apache.ode:ode-bpel-compiler</include>
+ <include>org.apache.ode:ode-bpel-api</include>
+ <include>org.apache.ode:ode-runtimes</include>
+ <include>org.apache.ode:ode-bpel-schemas</include>
+ <include>commons-logging:commons-logging</include>
+ <include>org.apache.ode:ode-utils</include>
+ <include>commons-codec:commons-codec</include>
+ <include>commons-collections:commons-collections</include>
+ <include>commons-httpclient:commons-httpclient</include>
+ <include>commons-pool:commons-pool</include>
+ <include>net.sf.saxon:saxon</include>
+ <include>net.sf.saxon:saxon-xpath</include>
+ <include>net.sf.saxon:saxon-dom</include>
+ <include>net.sf.saxon:saxon-xqj</include>
+ <include>jaxen:jaxen</include>
+ <include>log4j:log4j</include>
+ <include>wsdl4j:wsdl4j</include>
+ <include>org.apache.ode:xalan</include>
+ <include>xerces:xercesImpl</include>
+ </includes>
+ </dependencySet>
+
+ <dependencySet>
+ <outputDirectory>/extensions/ode-extensions-e4x/lib</outputDirectory>
+ <includes>
+ <include>rhino:js</include>
+ <include>commons-logging:commons-logging</include>
+ </includes>
+ </dependencySet>
+
+ <dependencySet>
+ <outputDirectory>/extensions/ode-extensions-jms-eventpublisher/lib</outputDirectory>
+ <includes>
+ <include>org.apache.activemq:apache-activemq</include>
+ <include>org.apache.xmlbeans:xmlbeans</include>
+ </includes>
+ </dependencySet>
+
+ </dependencySets>
+
+</assembly>
Added: branches/ODE/ODE-2.0-maven/distro/src/main/assembly/war.xml
===================================================================
--- branches/ODE/ODE-2.0-maven/distro/src/main/assembly/war.xml (rev 0)
+++ branches/ODE/ODE-2.0-maven/distro/src/main/assembly/war.xml 2010-01-08 16:31:56 UTC (rev 444)
@@ -0,0 +1,160 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+<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/examples-war</directory>
+ <outputDirectory>/examples</outputDirectory>
+ </fileSet>
+
+ <fileSet>
+ <directory>src/bin</directory>
+ <outputDirectory>/bin</outputDirectory>
+ </fileSet>
+
+ <fileSet>
+ <directory>${basedir}/../dao-jpa-db/target/</directory>
+ <outputDirectory>/sql</outputDirectory>
+ <includes>
+ <include>*.sql</include>
+ </includes>
+ <excludes>
+ <exclude>*.partial.sql</exclude>
+ </excludes>
+ </fileSet>
+
+ <fileSet>
+ <directory>${basedir}/../</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>LICENSE</include>
+ <include>README</include>
+ <include>NOTICE</include>
+ <include>RELEASE_NOTES</include>
+ </includes>
+ </fileSet>
+
+ <fileSet>
+ <directory>${basedir}/../extensions/e4x</directory>
+ <outputDirectory>/extensions/ode-extensions-e4x</outputDirectory>
+ <includes>
+ <include>README</include>
+ </includes>
+ </fileSet>
+
+ <fileSet>
+ <directory>${basedir}/../extensions/e4x/target</directory>
+ <outputDirectory>/extensions/ode-extensions-e4x</outputDirectory>
+ <includes>
+ <include>ode-extensions-e4x*.jar</include>
+ </includes>
+ </fileSet>
+
+ <fileSet>
+ <directory>${basedir}/../extensions/jms-eventpublisher</directory>
+ <outputDirectory>/extensions/ode-extensions-jms-eventpublisher</outputDirectory>
+ <includes>
+ <include>README</include>
+ </includes>
+ </fileSet>
+
+ <fileSet>
+ <directory>${basedir}/../extensions/jms-eventpublisher/target</directory>
+ <outputDirectory>/extensions/ode-extensions-jms-eventpublisher</outputDirectory>
+ <includes>
+ <include>ode-extensions-jms*.jar</include>
+ </includes>
+ </fileSet>
+
+ <fileSet>
+ <directory>${basedir}/../extensions</directory>
+ <outputDirectory>/extensions</outputDirectory>
+ <includes>
+ <include>README.extensions</include>
+ </includes>
+ </fileSet>
+
+ </fileSets>
+
+ <files>
+ <file>
+ <source>${basedir}/../axis2-war/target/ode-axis2-war-${project.version}.war</source>
+ <outputDirectory>/</outputDirectory>
+ <destName>ode.war</destName>
+ </file>
+ </files>
+
+
+ <dependencySets>
+
+ <dependencySet>
+ <outputDirectory>/lib</outputDirectory>
+ <includes>
+ <include>org.apache.ode:ode-utils</include>
+ <include>org.apache.ode:ode-tools</include>
+ <include>org.apache.ode:ode-bpel-compiler</include>
+ <include>org.apache.ode:ode-bpel-api</include>
+ <include>org.apache.ode:ode-runtimes</include>
+ <include>org.apache.ode:ode-bpel-schemas</include>
+ <include>commons-logging:commons-logging</include>
+ <include>org.apache.ode:ode-utils</include>
+ <include>commons-codec:commons-codec</include>
+ <include>commons-collections:commons-collections</include>
+ <include>commons-httpclient:commons-httpclient</include>
+ <include>commons-pool:commons-pool</include>
+ <include>net.sf.saxon:saxon</include>
+ <include>net.sf.saxon:saxon-xpath</include>
+ <include>net.sf.saxon:saxon-dom</include>
+ <include>net.sf.saxon:saxon-xqj</include>
+ <include>jaxen:jaxen</include>
+ <include>log4j:log4j</include>
+ <include>wsdl4j:wsdl4j</include>
+ <include>org.apache.ode:xalan</include>
+ <include>xerces:xercesImpl</include>
+ </includes>
+ </dependencySet>
+
+ <dependencySet>
+ <outputDirectory>/extensions/ode-extensions-e4x/lib</outputDirectory>
+ <includes>
+ <include>rhino:js</include>
+ <include>commons-logging:commons-logging</include>
+ </includes>
+ </dependencySet>
+
+ <dependencySet>
+ <outputDirectory>/extensions/ode-extensions-jms-eventpublisher/lib</outputDirectory>
+ <includes>
+ <include>org.apache.activemq:apache-activemq</include>
+ <include>org.apache.xmlbeans:xmlbeans</include>
+ </includes>
+ </dependencySet>
+
+ </dependencySets>
+
+</assembly>
15 years, 2 months