August 2010 - riftsaw-commits - Jboss List Archives

by riftsaw-commits＠lists.jboss.org

Author: objectiser Date: 2010-08-22 16:53:36 -0400 (Sun, 22 Aug 2010) New Revision: 921 Modified: trunk/qa/hudson-riftsaw-db.sh trunk/qa/hudson-riftsaw-jboss.sh trunk/qa/hudson-riftsaw-jdk5.sh trunk/qa/hudson-riftsaw-local.sh trunk/qa/hudson-riftsaw-soa-p.sh trunk/qa/hudson-riftsaw-ws.sh Log: Update qa scripts. Modified: trunk/qa/hudson-riftsaw-db.sh =================================================================== --- trunk/qa/hudson-riftsaw-db.sh 2010-08-22 19:03:35 UTC (rev 920) +++ trunk/qa/hudson-riftsaw-db.sh 2010-08-22 20:53:36 UTC (rev 921) @@ -22,7 +22,7 @@ STARTUP_TIME="6" TEST_DELAY="40000" -ANT_PROPERTIES="-Driftsaw.parent.dir=$RIFTSAW_PARENT_DIR -Ddatabase=$DATABASE -Dreplace.qa.jdbc=$REPLACE_QA_JDBC -Dorg.jboss.as.home=$AS_HOME -Dorg.jboss.as.config=$AS_CONFIG -Djbossesb.version=$JBOSS_ESB_VERSION -Dws.stack=$WS_STACK -Dws.version=$WS_VERSION -Dws.stack.dir=$WS_STACK_DIR -Dorg.jboss.esb.home=$JBOSS_ESB_HOME -Dstartup.time=$STARTUP_TIME -Dtest.delay=$TEST_DELAY" +ANT_PROPERTIES="-Driftsaw.parent.dir=$RIFTSAW_PARENT_DIR -Ddatabase=$DATABASE -Dreplace.qa.jdbc=$REPLACE_QA_JDBC -Dorg_jboss_as_home=$AS_HOME -Dorg_jboss_as_config=$AS_CONFIG -Djbossesb.version=$JBOSS_ESB_VERSION -Dws.stack=$WS_STACK -Dws.version=$WS_VERSION -Dws.stack.dir=$WS_STACK_DIR -Dorg_jboss_esb_home=$JBOSS_ESB_HOME -Dstartup.time=$STARTUP_TIME -Dtest.delay=$TEST_DELAY" echo ANT_PROPERTIES=${ANT_PROPERTIES} #build RiftSaw and running unit tests Modified: trunk/qa/hudson-riftsaw-jboss.sh =================================================================== --- trunk/qa/hudson-riftsaw-jboss.sh 2010-08-22 19:03:35 UTC (rev 920) +++ trunk/qa/hudson-riftsaw-jboss.sh 2010-08-22 20:53:36 UTC (rev 921) @@ -21,7 +21,7 @@ WS_VERSION="3.2.2.GA" WS_STACK_DIR="$RIFTSAW_PARENT_DIR/downloads" -ANT_PROPERTIES="-Driftsaw.parent.dir=$RIFTSAW_PARENT_DIR -Ddatabase=$DATABASE -Dreplace.qa.jdbc=$REPLACE_QA_JDBC -Dorg.jboss.as.home=$AS_HOME -Dorg.jboss.as.config=$AS_CONFIG -Djbossesb.version=$JBOSS_ESB_VERSION -Dws.stack=$WS_STACK -Dws.version=$WS_VERSION -Dws.stack.dir=$WS_STACK_DIR -Dorg.jboss.esb.home=$JBOSS_ESB_HOME -Dstartup.time=$STARTUP_TIME -Dtest.delay=$TEST_DELAY" +ANT_PROPERTIES="-Driftsaw.parent.dir=$RIFTSAW_PARENT_DIR -Ddatabase=$DATABASE -Dreplace.qa.jdbc=$REPLACE_QA_JDBC -Dorg_jboss_as_home=$AS_HOME -Dorg_jboss_as_config=$AS_CONFIG -Djbossesb.version=$JBOSS_ESB_VERSION -Dws.stack=$WS_STACK -Dws.version=$WS_VERSION -Dws.stack.dir=$WS_STACK_DIR -Dorg_jboss_esb_home=$JBOSS_ESB_HOME -Dstartup.time=$STARTUP_TIME -Dtest.delay=$TEST_DELAY" echo ANT_PROPERTIES=${ANT_PROPERTIES} # build RiftSaw and running unit test Modified: trunk/qa/hudson-riftsaw-jdk5.sh =================================================================== --- trunk/qa/hudson-riftsaw-jdk5.sh 2010-08-22 19:03:35 UTC (rev 920) +++ trunk/qa/hudson-riftsaw-jdk5.sh 2010-08-22 20:53:36 UTC (rev 921) @@ -18,7 +18,7 @@ JBOSS_ESB_HOME="$RIFTSAW_PARENT_DIR/riftsaw-$RIFTSAW_VERSION/jbossesb-$JBOSS_ESB_VERSION" -ANT_PROPERTIES="-Driftsaw.parent.dir=$RIFTSAW_PARENT_DIR -Ddatabase=$DATABASE -Djboss.filename=$JBOSS_FILENAME -Dreplace.qa.jdbc=$REPLACE_QA_JDBC -Dorg.jboss.as.home=$AS_HOME -Dorg.jboss.as.config=$AS_CONFIG -Dws.stack.dir=$WS_STACK_DIR -Djbossesb.version=$JBOSS_ESB_VERSION -Dorg.jboss.esb.home=$JBOSS_ESB_HOME" +ANT_PROPERTIES="-Driftsaw.parent.dir=$RIFTSAW_PARENT_DIR -Ddatabase=$DATABASE -Djboss.filename=$JBOSS_FILENAME -Dreplace.qa.jdbc=$REPLACE_QA_JDBC -Dorg_jboss_as_home=$AS_HOME -Dorg_jboss_as_config=$AS_CONFIG -Dws.stack.dir=$WS_STACK_DIR -Djbossesb.version=$JBOSS_ESB_VERSION -Dorg_jboss_esb_home=$JBOSS_ESB_HOME" echo ANT_PROPERTIES=${ANT_PROPERTIES} # build RiftSaw and running unit test Modified: trunk/qa/hudson-riftsaw-local.sh =================================================================== --- trunk/qa/hudson-riftsaw-local.sh 2010-08-22 19:03:35 UTC (rev 920) +++ trunk/qa/hudson-riftsaw-local.sh 2010-08-22 20:53:36 UTC (rev 921) @@ -21,7 +21,7 @@ WS_VERSION="3.2.2.GA" WS_STACK_DIR="$RIFTSAW_PARENT_DIR/downloads" -ANT_PROPERTIES="-Driftsaw.parent.dir=$RIFTSAW_PARENT_DIR -Ddatabase=$DATABASE -Dreplace.qa.jdbc=$REPLACE_QA_JDBC -Dorg.jboss.as.home=$AS_HOME -Dorg.jboss.as.config=$AS_CONFIG -Djbossesb.version=$JBOSS_ESB_VERSION -Dws.stack=$WS_STACK -Dws.version=$WS_VERSION -Dws.stack.dir=$WS_STACK_DIR -Dorg.jboss.esb.home=$JBOSS_ESB_HOME -Dstartup.time=$STARTUP_TIME" +ANT_PROPERTIES="-Driftsaw.parent.dir=$RIFTSAW_PARENT_DIR -Ddatabase=$DATABASE -Dreplace.qa.jdbc=$REPLACE_QA_JDBC -Dorg_jboss_as_home=$AS_HOME -Dorg_jboss_as_config=$AS_CONFIG -Djbossesb.version=$JBOSS_ESB_VERSION -Dws.stack=$WS_STACK -Dws.version=$WS_VERSION -Dws.stack.dir=$WS_STACK_DIR -Dorg_jboss_esb_home=$JBOSS_ESB_HOME -Dstartup.time=$STARTUP_TIME" echo ANT_PROPERTIES=${ANT_PROPERTIES} # build RiftSaw and running unit test Modified: trunk/qa/hudson-riftsaw-soa-p.sh =================================================================== --- trunk/qa/hudson-riftsaw-soa-p.sh 2010-08-22 19:03:35 UTC (rev 920) +++ trunk/qa/hudson-riftsaw-soa-p.sh 2010-08-22 20:53:36 UTC (rev 921) @@ -22,7 +22,7 @@ STARTUP_TIME="6" TEST_DELAY="40000" -ANT_PROPERTIES="-Driftsaw.parent.dir=$RIFTSAW_PARENT_DIR -Ddatabase=$DATABASE -Dreplace.qa.jdbc=$REPLACE_QA_JDBC -Dorg.jboss.as.home=$AS_HOME -Dorg.jboss.as.config=$AS_CONFIG -Djbossesb.version=$JBOSS_ESB_VERSION -Dorg.jboss.esb.home=$JBOSS_ESB_HOME -Dws.stack=$WS_STACK -Dws.version=$WS_VERSION -Dws.stack.dir=$WS_STACK_DIR -Dstartup.time=$STARTUP_TIME -Dtest.delay=$TEST_DELAY" +ANT_PROPERTIES="-Driftsaw.parent.dir=$RIFTSAW_PARENT_DIR -Ddatabase=$DATABASE -Dreplace.qa.jdbc=$REPLACE_QA_JDBC -Dorg_jboss_as_home=$AS_HOME -Dorg_jboss_as_config=$AS_CONFIG -Djbossesb.version=$JBOSS_ESB_VERSION -Dorg_jboss_esb_home=$JBOSS_ESB_HOME -Dws.stack=$WS_STACK -Dws.version=$WS_VERSION -Dws.stack.dir=$WS_STACK_DIR -Dstartup.time=$STARTUP_TIME -Dtest.delay=$TEST_DELAY" echo ANT_PROPERTIES=${ANT_PROPERTIES} #build RiftSaw and running unit tests Modified: trunk/qa/hudson-riftsaw-ws.sh =================================================================== --- trunk/qa/hudson-riftsaw-ws.sh 2010-08-22 19:03:35 UTC (rev 920) +++ trunk/qa/hudson-riftsaw-ws.sh 2010-08-22 20:53:36 UTC (rev 921) @@ -20,7 +20,7 @@ STARTUP_TIME="6" TEST_DELAY="40000" -ANT_PROPERTIES="-Driftsaw.parent.dir=$RIFTSAW_PARENT_DIR -Ddatabase=$DATABASE -Dreplace.qa.jdbc=$REPLACE_QA_JDBC -Dorg.jboss.as.home=$AS_HOME -Dorg.jboss.as.config=$AS_CONFIG -Dws.stack=$WS_STACK -Dws.stack.dir=$WS_STACK_DIR -Dws.version=$WS_VERSION -Djbossesb.version=$JBOSS_ESB_VERSION -Dorg.jboss.esb.home=$JBOSS_ESB_HOME -Dstartup.time=$STARTUP_TIME -Dtest.delay=$TEST_DELAY" +ANT_PROPERTIES="-Driftsaw.parent.dir=$RIFTSAW_PARENT_DIR -Ddatabase=$DATABASE -Dreplace.qa.jdbc=$REPLACE_QA_JDBC -Dorg_jboss_as_home=$AS_HOME -Dorg_jboss_as_config=$AS_CONFIG -Dws.stack=$WS_STACK -Dws.stack.dir=$WS_STACK_DIR -Dws.version=$WS_VERSION -Djbossesb.version=$JBOSS_ESB_VERSION -Dorg_jboss_esb_home=$JBOSS_ESB_HOME -Dstartup.time=$STARTUP_TIME -Dtest.delay=$TEST_DELAY" echo ANT_PROPERTIES=${ANT_PROPERTIES} #build RiftSaw and running unit test

13 years, 8 months

1
0
0 / 0

RiftSaw - Build # 239 - Failure!

by jboss-qa-internal＠redhat.com

RiftSaw Build number 239 status: Failure Details available at http://hudson.jboss.org/hudson/job/RiftSaw/239/ JBoss server log can be found at workspace, http://hudson.qa.jboss.com/hudson/view/RiftSaw/job/RiftSaw/ws/

13 years, 8 months

1
0
0 / 0

riftsaw SVN: r920 - trunk/console.

by riftsaw-commits＠lists.jboss.org

Author: objectiser Date: 2010-08-22 15:03:35 -0400 (Sun, 22 Aug 2010) New Revision: 920 Modified: trunk/console/pom.xml Log: Re-enabled bpel2svg module, as junit version 3.8.1 seems to work now. Version 4 causes problems with integration tests. Modified: trunk/console/pom.xml =================================================================== --- trunk/console/pom.xml 2010-08-20 22:45:24 UTC (rev 919) +++ trunk/console/pom.xml 2010-08-22 19:03:35 UTC (rev 920) @@ -18,9 +18,7 @@ <modules> <module>integration</module> <module>identity</module> -  </modules> </project>

13 years, 8 months

1
0
0 / 0

riftsaw SVN: r919 - in trunk: console and 50 other directories.

by riftsaw-commits＠lists.jboss.org

Author: objectiser Date: 2010-08-20 18:45:24 -0400 (Fri, 20 Aug 2010) New Revision: 919 Added: trunk/samples/common/ trunk/samples/common/base-build.xml Modified: trunk/console/bpel2svg/src/test/java/org/jboss/soa/bpel/bpel2svg/BPEL2SVGUtilTest.java trunk/console/pom.xml trunk/distribution/src/main/assembly/bin.xml trunk/distribution/src/main/release/bin/bpelc trunk/distribution/src/main/release/bin/sendsoap trunk/distribution/src/main/release/install/build.xml trunk/distribution/src/main/release/install/deployment.properties trunk/docs/docbook/userguide/src/main/module/deploy.xml trunk/integration-tests/build.xml trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_approval_service/build.xml trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_loan_approval/build.xml trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/build.xml trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/build.xml trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/build.xml trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_simple_invoke/build.xml trunk/integration-tests/src/test/resources/samples/Quickstart_simple_esb_proxy_invoke/build.xml trunk/integration-tests/src/test/resources/samples/Quickstart_simple_esb_proxy_invoke2/build.xml trunk/integration-tests/src/test/resources/samples/Tutorial_bpel_atm/build.xml trunk/integration-tests/src/test/resources/samples/Tutorial_bpel_purchase/build.xml trunk/integration-tests/src/test/resources/samples/Tutorial_bpel_travel_agency/build.xml trunk/integration-tests/src/test/resources/testcases/RiftSaw_144/build.xml trunk/pom.xml trunk/qa/build.xml trunk/samples/esb/bpel_helloworld/build.xml trunk/samples/esb/bpel_loan_fault/build.xml trunk/samples/esb/invoke_esb_ebws/build.xml trunk/samples/esb/simple_esb_proxy_invoke/build.xml trunk/samples/esb/simple_esb_proxy_invoke2/build.xml trunk/samples/quickstart/bpel_event_listener/build.xml trunk/samples/quickstart/hello_world/build.xml trunk/samples/quickstart/hello_world_header_ode/build.xml trunk/samples/quickstart/hello_world_header_wsdl/build.xml trunk/samples/quickstart/loan_approval/build.xml trunk/samples/quickstart/math/build.xml trunk/samples/quickstart/salutations/build.xml trunk/samples/quickstart/say_hello/build.xml trunk/samples/quickstart/secure_invoke/build.xml trunk/samples/quickstart/secure_service/build.xml trunk/samples/quickstart/service_handler/build.xml trunk/samples/quickstart/simple_correlation/build.xml trunk/samples/quickstart/simple_invoke/build.xml trunk/samples/quickstart/simple_pick/build.xml trunk/samples/tutorial/BPEL-BluePrint1/build.xml trunk/samples/tutorial/BPEL-BluePrint2/build.xml trunk/samples/tutorial/BPEL-BluePrint3/build.xml trunk/samples/tutorial/BPEL-BluePrint4/build.xml trunk/samples/tutorial/BPEL-BluePrint5/build.xml trunk/samples/tutorial/atm/build.xml trunk/samples/tutorial/purchase/build.xml trunk/samples/tutorial/travel_agency/build.xml trunk/stress-tests/build.xml trunk/stress-tests/src/test/resources/performance/build.xml Log: RIFTSAW-261 - removed most libs from build, used by samples and bin scripts, and instead reference libs in the RiftSaw modules or JBossAS. Still need to update and check windows scripts in bin. Also commented out console/bpel2svg as it requires junit4, however when top level pom was upgraded to this version it caused a npe in the integration tests (secure service unit test). Will probably just need to change bpel2svg to use junit3 style unit tests for now. Modified: trunk/console/bpel2svg/src/test/java/org/jboss/soa/bpel/bpel2svg/BPEL2SVGUtilTest.java =================================================================== --- trunk/console/bpel2svg/src/test/java/org/jboss/soa/bpel/bpel2svg/BPEL2SVGUtilTest.java 2010-08-20 07:02:38 UTC (rev 918) +++ trunk/console/bpel2svg/src/test/java/org/jboss/soa/bpel/bpel2svg/BPEL2SVGUtilTest.java 2010-08-20 22:45:24 UTC (rev 919) @@ -17,7 +17,7 @@ */ package org.jboss.soa.bpel.bpel2svg; -import static org.junit.Assert.*; +import junit.framework.TestCase; import org.wso2.carbon.bpel.ui.bpel2svg.ActivityInterface; import org.wso2.carbon.bpel.ui.bpel2svg.AssignInterface; @@ -30,10 +30,9 @@ import org.wso2.carbon.bpel.ui.bpel2svg.WhileInterface; import org.wso2.carbon.bpel.ui.bpel2svg.ActivityInterface.ActivityState; -public class BPEL2SVGUtilTest { +public class BPEL2SVGUtilTest extends TestCase { - @org.junit.Test - @org.junit.Ignore + /* public void testGenerateMathNoTrace() { java.io.InputStream is=ClassLoader.getSystemResourceAsStream("bpel/Math.bpel"); @@ -92,8 +91,6 @@ } - @org.junit.Test - @org.junit.Ignore public void testGenerateMathRecvCompletedAssignFailed() { java.io.InputStream is=ClassLoader.getSystemResourceAsStream("bpel/Math.bpel"); @@ -160,8 +157,6 @@ } - @org.junit.Test - @org.junit.Ignore public void testGenerateMathRecvCompletedAssignActive() { java.io.InputStream is=ClassLoader.getSystemResourceAsStream("bpel/Math.bpel"); @@ -227,93 +222,76 @@ } } + */ - @org.junit.Test public void testMathGetLineNum53Seq() { checkActivityAtLine("bpel/Math.bpel", 53, SequenceInterface.class); } - @org.junit.Test public void testMathGetLineNum61PickReceive() { checkActivityAtLine("bpel/Math.bpel", 61, ReceiveInterface.class); } - @org.junit.Test public void testMathGetLineNum64Assign() { checkActivityAtLine("bpel/Math.bpel", 64, AssignInterface.class); } - @org.junit.Test public void testMathGetLineNum72AssignStill() { checkActivityAtLine("bpel/Math.bpel", 72, AssignInterface.class); } - @org.junit.Test public void testMathGetLineNum88Switch() { checkActivityAtLine("bpel/Math.bpel", 88, IfInterface.class); } - @org.junit.Test public void testMathGetLineNum118Sequence() { checkActivityAtLine("bpel/Math.bpel", 118, SequenceInterface.class); } - @org.junit.Test public void testMathGetLineNum119Assign() { checkActivityAtLine("bpel/Math.bpel", 119, AssignInterface.class); } - @org.junit.Test public void testMathGetLineNum132Sequence() { checkActivityAtLine("bpel/Math.bpel", 132, SequenceInterface.class); } - @org.junit.Test public void testMathGetLineNum133Switch() { checkActivityAtLine("bpel/Math.bpel", 133, IfInterface.class); } - @org.junit.Test public void testMathGetLineNum146Sequence() { checkActivityAtLine("bpel/Math.bpel", 146, SequenceInterface.class); } - @org.junit.Test public void testMathGetLineNum147Assign() { checkActivityAtLine("bpel/Math.bpel", 147, AssignInterface.class); } - @org.junit.Test public void testMathGetLineNum168Throw() { checkActivityAtLine("bpel/Math.bpel", 168, ThrowInterface.class); } - @org.junit.Test public void testMathGetLineNum177Sequence() { checkActivityAtLine("bpel/Math.bpel", 177, SequenceInterface.class); } - @org.junit.Test public void testMathGetLineNum178Assign() { checkActivityAtLine("bpel/Math.bpel", 178, AssignInterface.class); } - @org.junit.Test public void testMathGetLineNum186While() { checkActivityAtLine("bpel/Math.bpel", 186, WhileInterface.class); } - @org.junit.Test public void testMathGetLineNum188Assign() { checkActivityAtLine("bpel/Math.bpel", 188, AssignInterface.class); } - @org.junit.Test public void testMathGetLineNum229Assign() { checkActivityAtLine("bpel/Math.bpel", 229, AssignInterface.class); } - @org.junit.Test public void testMathGetLineNum253Reply() { checkActivityAtLine("bpel/Math.bpel", 253, ReplyInterface.class); } Modified: trunk/console/pom.xml =================================================================== --- trunk/console/pom.xml 2010-08-20 07:02:38 UTC (rev 918) +++ trunk/console/pom.xml 2010-08-20 22:45:24 UTC (rev 919) @@ -18,7 +18,9 @@ <modules> <module>integration</module> <module>identity</module> - <module>bpel2svg</module> +  </modules> </project> Modified: trunk/distribution/src/main/assembly/bin.xml =================================================================== --- trunk/distribution/src/main/assembly/bin.xml 2010-08-20 07:02:38 UTC (rev 918) +++ trunk/distribution/src/main/assembly/bin.xml 2010-08-20 22:45:24 UTC (rev 919) @@ -64,6 +64,7 @@ <directory>../samples</directory> <outputDirectory>samples</outputDirectory> <includes> + <include>common/**</include> <include>esb/bpel_helloworld/**</include> <include>esb/bpel_loan_fault/**</include> <include>esb/invoke_esb_ebws/**</include> @@ -152,23 +153,11 @@ <include>mysql:mysql-connector-java</include> <include>org.apache.derby:derby</include> <include>org.apache.derby:derbytools</include> - <include>com.h2database:h2</include> + <include>com.h2database:h2</include> </includes> </dependencySet> <dependencySet> - <outputDirectory>/samples/common/lib</outputDirectory> - <includes> - <include>org.jboss.soa.bpel:riftsaw-tools</include> - <include>org.jboss.soa.bpel:riftsaw-utils</include> - <include>commons-codec:commons-codec</include> - <include>commons-httpclient:commons-httpclient</include> - <include>commons-logging:commons-logging</include> - <include>log4j:log4j</include> - </includes> - </dependencySet> - - <dependencySet> <outputDirectory>/modules/bpel-console</outputDirectory> <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping> <includes> @@ -185,25 +174,7 @@ <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> Modified: trunk/distribution/src/main/release/bin/bpelc =================================================================== --- trunk/distribution/src/main/release/bin/bpelc 2010-08-20 07:02:38 UTC (rev 918) +++ trunk/distribution/src/main/release/bin/bpelc 2010-08-20 22:45:24 UTC (rev 919) @@ -53,7 +53,13 @@ fi ODE_HOME=`cd "$ODE_BIN/.." && pwd` -LIB="$ODE_HOME/lib" + +. $ODE_HOME/install/deployment.properties + +LIB1="$ODE_HOME/modules/riftsaw.sar/lib" +LIB2="$ODE_HOME/lib" +LIB3="$org_jboss_as_home/client" + ETC="$ODE_HOME/etc" @@ -88,11 +94,21 @@ LOCALCLASSPATH="$ODE_CLASSPATH" # Add Ode libraries -for f in $LIB/*.jar +for f in $LIB1/*.jar do LOCALCLASSPATH=$LOCALCLASSPATH:$f done +for f in $LIB2/*.jar +do + LOCALCLASSPATH=$LOCALCLASSPATH:$f +done + +for f in $LIB3/*.jar +do + LOCALCLASSPATH=$LOCALCLASSPATH:$f +done + # For Cygwin, switch paths to Windows format before running java if $cygwin; then ODE_HOME=`cygpath --windows "$ODE_HOME"` Modified: trunk/distribution/src/main/release/bin/sendsoap =================================================================== --- trunk/distribution/src/main/release/bin/sendsoap 2010-08-20 07:02:38 UTC (rev 918) +++ trunk/distribution/src/main/release/bin/sendsoap 2010-08-20 22:45:24 UTC (rev 919) @@ -53,7 +53,14 @@ fi ODE_HOME=`cd "$ODE_BIN/.." && pwd` -LIB="$ODE_HOME/lib" + +. $ODE_HOME/install/deployment.properties + +LIB1="$ODE_HOME/modules/riftsaw.sar/lib" +LIB2="$ODE_HOME/lib" +LIB3="$org_jboss_as_home/lib" +LIB4="$org_jboss_as_home/server/$org_jboss_as_config/lib" + ETC="$ODE_HOME/etc" @@ -88,11 +95,26 @@ LOCALCLASSPATH="$ODE_CLASSPATH" # Add Ode libraries -for f in $LIB/*.jar +for f in $LIB1/*.jar do LOCALCLASSPATH=$LOCALCLASSPATH:$f done +for f in $LIB2/*.jar +do + LOCALCLASSPATH=$LOCALCLASSPATH:$f +done + +for f in $LIB3/*.jar +do + LOCALCLASSPATH=$LOCALCLASSPATH:$f +done + +for f in $LIB4/*.jar +do + LOCALCLASSPATH=$LOCALCLASSPATH:$f +done + # For Cygwin, switch paths to Windows format before running java if $cygwin; then ODE_HOME=`cygpath --windows "$ODE_HOME"` Modified: trunk/distribution/src/main/release/install/build.xml =================================================================== --- trunk/distribution/src/main/release/install/build.xml 2010-08-20 07:02:38 UTC (rev 918) +++ trunk/distribution/src/main/release/install/build.xml 2010-08-20 22:45:24 UTC (rev 919) @@ -7,7 +7,7 @@ <property file="${org.jboss.soa.bpel.deployment.properties}"/> <property file="../version.properties" /> - <property name="server.dir" value="${org.jboss.as.home}/server/${org.jboss.as.config}"/> + <property name="server.dir" value="${org_jboss_as_home}/server/${org_jboss_as_config}"/> <property name="conf.dir" value="${server.dir}/conf"/> <property name="deploy.dir" value="${server.dir}/deploy"/> <property name="deployers.dir" value="${server.dir}/deployers"/> @@ -16,7 +16,7 @@ <property name="bpel-runtime" value="riftsaw.sar" /> <property name="jbossesb-bpel" value="riftsaw.esb" /> <property name="bpel-esb-examples" value="esb" /> - <property name="esb.examples.dir" value="${org.jboss.esb.home}/samples/quickstarts"/> + <property name="esb.examples.dir" value="${org_jboss_esb_home}/samples/quickstarts"/>  <property name="ws.stack" value="native" /> @@ -42,9 +42,9 @@ <target name="check.deploy.props"> <condition property="as.configured"> <and> - <isset property="org.jboss.as.home"/> - <isset property="org.jboss.as.config"/> - <isset property="org.jboss.esb.home"/> + <isset property="org_jboss_as_home"/> + <isset property="org_jboss_as_config"/> + <isset property="org_jboss_esb_home"/> </and> </condition> @@ -201,8 +201,8 @@ <unzip src="${ws.stack.dir}/jbossws-${ws.stack}-${ws.version}.zip" dest="${basedir}/ws-stack/dist/" /> <copy file="ws-stack/dist/jbossws-${ws.stack}-bin-dist/ant.properties.example" tofile="ws-stack/dist/jbossws-${ws.stack}-bin-dist/ant.properties" /> <ant dir="${basedir}/ws-stack/dist/jbossws-${ws.stack}-bin-dist" target="deploy-jboss510"> - <property name="jboss510.home" value="${org.jboss.as.home}" /> - <property name="jboss.server.instance" value="${org.jboss.as.config}" /> + <property name="jboss510.home" value="${org_jboss_as_home}" /> + <property name="jboss.server.instance" value="${org_jboss_as_config}" /> </ant> </target> Modified: trunk/distribution/src/main/release/install/deployment.properties =================================================================== --- trunk/distribution/src/main/release/install/deployment.properties 2010-08-20 07:02:38 UTC (rev 918) +++ trunk/distribution/src/main/release/install/deployment.properties 2010-08-20 22:45:24 UTC (rev 919) @@ -8,15 +8,15 @@ # Use of relative paths or paths with spaces will cause runtime errors # when deploying and executing the samples. # (e.g. /var/local/jboss-5.1.0.GA) -org.jboss.as.home=/local/deploy/jboss-5.1.0.GA +org_jboss_as_home=/local/deploy/jboss-5.1.0.GA # The Configuration of JBoss AS to Use # (e.g. default) -org.jboss.as.config=default +org_jboss_as_config=default # The directory for JBossESB home # (e.g. /var/local/jbossesb-4.8) -org.jboss.esb.home=/var/local/jbossesb-4.8 +org_jboss_esb_home=/var/local/jbossesb-4.8 # database # (e.g. hsql postgres mysql) Modified: trunk/docs/docbook/userguide/src/main/module/deploy.xml =================================================================== --- trunk/docs/docbook/userguide/src/main/module/deploy.xml 2010-08-20 07:02:38 UTC (rev 918) +++ trunk/docs/docbook/userguide/src/main/module/deploy.xml 2010-08-20 22:45:24 UTC (rev 919) @@ -29,7 +29,7 @@ <property name="version" value="1" /> - <property name="server.dir" value="${org.jboss.as.home}/server/${org.jboss.as.config}"/> + <property name="server.dir" value="${org_jboss_as_home}/server/${org_jboss_as_config}"/> <property name="conf.dir" value="${server.dir}/conf"/> <property name="deploy.dir" value="${server.dir}/deploy"/> <property name="server.lib.dir" value="${server.dir}/lib"/> Modified: trunk/integration-tests/build.xml =================================================================== --- trunk/integration-tests/build.xml 2010-08-20 07:02:38 UTC (rev 918) +++ trunk/integration-tests/build.xml 2010-08-20 22:45:24 UTC (rev 919) @@ -50,9 +50,9 @@ <ant antfile="build.xml" target="deploy" dir="${basedir}/../distribution/target/dist/riftsaw-${riftsaw.engine.version}/install"> - <property name="org.jboss.as.home" value="${org.jboss.as.home}" /> - <property name="org.jboss.as.config" value="${org.jboss.as.config}" /> - <property name="org.jboss.esb.home" value="${org.jboss.esb.home}" /> + <property name="org_jboss_as_home" value="${org_jboss_as_home}" /> + <property name="org_jboss_as_config" value="${org_jboss_as_config}" /> + <property name="org_jboss_esb_home" value="${org_jboss_esb_home}" /> <property name="database" value="${database}" /> </ant> </target> @@ -61,9 +61,9 @@ <ant antfile="build.xml" target="undeploy" dir="${basedir}/../distribution/target/dist/riftsaw-${riftsaw.engine.version}/install"> - <property name="org.jboss.as.home" value="${org.jboss.as.home}" /> - <property name="org.jboss.as.config" value="${org.jboss.as.config}" /> - <property name="org.jboss.esb.home" value="${org.jboss.esb.home}" /> + <property name="org_jboss_as_home" value="${org_jboss_as_home}" /> + <property name="org_jboss_as_config" value="${org_jboss_as_config}" /> + <property name="org_jboss_esb_home" value="${org_jboss_esb_home}" /> <property name="database" value="${database}" /> </ant> </target> @@ -72,14 +72,14 @@ <java classname="org.jboss.Main" fork="true" spawn="true" - dir="${org.jboss.as.home}/server/${org.jboss.as.config}" > - <arg line="-c ${org.jboss.as.config}"/> - <jvmarg value="-Djava.endorsed.dirs=${org.jboss.as.home}/lib/endorsed"/> + dir="${org_jboss_as_home}/server/${org_jboss_as_config}" > + <arg line="-c ${org_jboss_as_config}"/> + <jvmarg value="-Djava.endorsed.dirs=${org_jboss_as_home}/lib/endorsed"/> <jvmarg value="-Xms128m"/> <jvmarg value="-Xmx512m"/> <jvmarg value="-XX:MaxPermSize=256m"/> <classpath> - <pathelement path="${org.jboss.as.home}/bin/run.jar"/> + <pathelement path="${org_jboss_as_home}/bin/run.jar"/> <pathelement path="${JAVA_HOME}/lib/tools.jar"/> </classpath> </java> @@ -100,13 +100,13 @@ <target name="stop-server" > <echo>Stopping the server</echo> - <echo>Server is at ${org.jboss.as.home}</echo> + <echo>Server is at ${org_jboss_as_home}</echo> <java classname="org.jboss.Shutdown" fork="true" failonerror="false" resultproperty="shutdown.rc"> <arg line="-s jnp://localhost:1099 --shutdown"/> <classpath> - <pathelement path="${org.jboss.as.home}/bin/shutdown.jar"/> - <pathelement path="${org.jboss.as.home}/client/jbossall-client.jar"/> + <pathelement path="${org_jboss_as_home}/bin/shutdown.jar"/> + <pathelement path="${org_jboss_as_home}/client/jbossall-client.jar"/> <pathelement path="${JAVA_HOME}/lib/tools.jar"/> </classpath> </java> Modified: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_approval_service/build.xml =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_approval_service/build.xml 2010-08-20 07:02:38 UTC (rev 918) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_approval_service/build.xml 2010-08-20 22:45:24 UTC (rev 919) @@ -15,7 +15,7 @@ <path id="compile-classpath"> - <fileset dir="${org.jboss.as.home}/client" includes="*.jar" />  + <fileset dir="${org_jboss_as_home}/client" includes="*.jar" />  </path> <property name="compile-classpath" refid="compile-classpath"/> Modified: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_loan_approval/build.xml =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_loan_approval/build.xml 2010-08-20 07:02:38 UTC (rev 918) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_loan_approval/build.xml 2010-08-20 22:45:24 UTC (rev 919) @@ -15,7 +15,7 @@ <property name="war.build.dir" location="${deploy.dir}/${ant.project.name}/build/war/classes"/> <path id="compile-classpath"> - <fileset dir="${org.jboss.as.home}/client" includes="*.jar" />  + <fileset dir="${org_jboss_as_home}/client" includes="*.jar" />  </path> <property name="compile-classpath" refid="compile-classpath"/> Modified: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/build.xml =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/build.xml 2010-08-20 07:02:38 UTC (rev 918) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/build.xml 2010-08-20 22:45:24 UTC (rev 919) @@ -7,7 +7,7 @@ <property name="version" value="1" /> - <property name="server.dir" value="${org.jboss.as.home}/server/${org.jboss.as.config}"/> + <property name="server.dir" value="${org_jboss_as_home}/server/${org_jboss_as_config}"/> <property name="conf.dir" value="${server.dir}/conf"/> <property name="deployers.dir" value="${server.dir}/deployers"/> <property name="server.lib.dir" value="${server.dir}/lib"/> @@ -20,7 +20,7 @@ <property name="war.build.dir" location="${deploy.dir}/${ant.project.name}/build/war/classes"/> <path id="compile-classpath"> - <fileset dir="${org.jboss.as.home}/client" includes="*.jar" />  + <fileset dir="${org_jboss_as_home}/client" includes="*.jar" />  <fileset dir="${deployers.dir}/jbossws.deployer" includes="*.jar" /> </path> <property name="compile-classpath" refid="compile-classpath"/> Modified: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/build.xml =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/build.xml 2010-08-20 07:02:38 UTC (rev 918) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/build.xml 2010-08-20 22:45:24 UTC (rev 919) @@ -7,7 +7,7 @@ <property name="version" value="1" /> - <property name="server.dir" value="${org.jboss.as.home}/server/${org.jboss.as.config}"/> + <property name="server.dir" value="${org_jboss_as_home}/server/${org_jboss_as_config}"/> <property name="conf.dir" value="${server.dir}/conf"/> <property name="deployers.dir" value="${server.dir}/deployers"/> <property name="server.lib.dir" value="${server.dir}/lib"/> @@ -21,7 +21,7 @@ <property name="client.build.dir" location="${deploy.dir}/${ant.project.name}/build/client"/> <path id="compile-classpath"> - <fileset dir="${org.jboss.as.home}/client" includes="*.jar" /> + <fileset dir="${org_jboss_as_home}/client" includes="*.jar" /> <fileset dir="${deployers.dir}/jbossws.deployer" includes="*.jar" /> </path> <property name="compile-classpath" refid="compile-classpath"/> @@ -72,7 +72,7 @@ <pathelement location="${client.build.dir}"/> <path refid="compile-classpath" /> <pathelement location="${basedir}/client/resources"/> - <fileset dir="${org.jboss.as.home}/lib/endorsed" includes="*.jar" /> + <fileset dir="${org_jboss_as_home}/lib/endorsed" includes="*.jar" /> </classpath> </java> </target> Modified: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/build.xml =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/build.xml 2010-08-20 07:02:38 UTC (rev 918) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/build.xml 2010-08-20 22:45:24 UTC (rev 919) @@ -7,7 +7,7 @@ <property name="version" value="1" /> - <property name="server.dir" value="${org.jboss.as.home}/server/${org.jboss.as.config}"/> + <property name="server.dir" value="${org_jboss_as_home}/server/${org_jboss_as_config}"/> <property name="conf.dir" value="${server.dir}/conf"/> <property name="project.under.test" value="Quickstart_bpel_secure_service" /> @@ -20,7 +20,7 @@ <property name="war.build.dir" location="${deploy.dir}/${ant.project.name}/build/war/classes"/> <path id="compile-classpath"> - <fileset dir="${org.jboss.as.home}/client" includes="*.jar" />  + <fileset dir="${org_jboss_as_home}/client" includes="*.jar" />  </path> <property name="compile-classpath" refid="compile-classpath"/> Modified: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_simple_invoke/build.xml =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_simple_invoke/build.xml 2010-08-20 07:02:38 UTC (rev 918) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_simple_invoke/build.xml 2010-08-20 22:45:24 UTC (rev 919) @@ -15,7 +15,7 @@ <property name="war.build.dir" location="${deploy.dir}/${ant.project.name}/build/war/classes"/> <path id="compile-classpath"> - <fileset dir="${org.jboss.as.home}/client" includes="*.jar" />  + <fileset dir="${org_jboss_as_home}/client" includes="*.jar" />  </path> <property name="compile-classpath" refid="compile-classpath"/> Modified: trunk/integration-tests/src/test/resources/samples/Quickstart_simple_esb_proxy_invoke/build.xml =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_simple_esb_proxy_invoke/build.xml 2010-08-20 07:02:38 UTC (rev 918) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_simple_esb_proxy_invoke/build.xml 2010-08-20 22:45:24 UTC (rev 919) @@ -16,7 +16,7 @@ <property name="war.build.dir" location="${deploy.dir}/${ant.project.name}/build/war/classes"/> <path id="compile-classpath"> - <fileset dir="${org.jboss.as.home}/client" includes="*.jar" />  + <fileset dir="${org_jboss_as_home}/client" includes="*.jar" />  </path> <property name="compile-classpath" refid="compile-classpath"/> Modified: trunk/integration-tests/src/test/resources/samples/Quickstart_simple_esb_proxy_invoke2/build.xml =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_simple_esb_proxy_invoke2/build.xml 2010-08-20 07:02:38 UTC (rev 918) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_simple_esb_proxy_invoke2/build.xml 2010-08-20 22:45:24 UTC (rev 919) @@ -16,7 +16,7 @@ <property name="war.build.dir" location="${deploy.dir}/${ant.project.name}/build/war/classes"/> <path id="compile-classpath"> - <fileset dir="${org.jboss.as.home}/client" includes="*.jar" />  + <fileset dir="${org_jboss_as_home}/client" includes="*.jar" />  </path> <property name="compile-classpath" refid="compile-classpath"/> Modified: trunk/integration-tests/src/test/resources/samples/Tutorial_bpel_atm/build.xml =================================================================== --- trunk/integration-tests/src/test/resources/samples/Tutorial_bpel_atm/build.xml 2010-08-20 07:02:38 UTC (rev 918) +++ trunk/integration-tests/src/test/resources/samples/Tutorial_bpel_atm/build.xml 2010-08-20 22:45:24 UTC (rev 919) @@ -13,7 +13,7 @@ location="${deploy.dir}/${ant.project.name}/build/war/classes" /> <path id="compile-classpath"> - <pathelement location="${org.jboss.as.home}/client/jboss-javaee.jar" /> + <pathelement location="${org_jboss_as_home}/client/jboss-javaee.jar" /> </path> <target name="deploywar" description="make war"> Modified: trunk/integration-tests/src/test/resources/samples/Tutorial_bpel_purchase/build.xml =================================================================== --- trunk/integration-tests/src/test/resources/samples/Tutorial_bpel_purchase/build.xml 2010-08-20 07:02:38 UTC (rev 918) +++ trunk/integration-tests/src/test/resources/samples/Tutorial_bpel_purchase/build.xml 2010-08-20 22:45:24 UTC (rev 919) @@ -15,8 +15,8 @@ location="${deploy.dir}/${ant.project.name}/build/ejb/classes" /> <path id="compile-classpath"> - <pathelement location="${org.jboss.as.home}/common/lib/servlet-api.jar" /> - <pathelement location="${org.jboss.as.home}/client/jboss-javaee.jar" /> + <pathelement location="${org_jboss_as_home}/common/lib/servlet-api.jar" /> + <pathelement location="${org_jboss_as_home}/client/jboss-javaee.jar" /> </path> <target name="deployq"> Modified: trunk/integration-tests/src/test/resources/samples/Tutorial_bpel_travel_agency/build.xml =================================================================== --- trunk/integration-tests/src/test/resources/samples/Tutorial_bpel_travel_agency/build.xml 2010-08-20 07:02:38 UTC (rev 918) +++ trunk/integration-tests/src/test/resources/samples/Tutorial_bpel_travel_agency/build.xml 2010-08-20 22:45:24 UTC (rev 919) @@ -13,7 +13,7 @@ location="${deploy.dir}/${ant.project.name}/build/war/classes" /> <path id="compile-classpath"> - <pathelement location="${org.jboss.as.home}/client/jboss-javaee.jar" /> + <pathelement location="${org_jboss_as_home}/client/jboss-javaee.jar" /> </path> <target name="deploywar" description="make war"> Modified: trunk/integration-tests/src/test/resources/testcases/RiftSaw_144/build.xml =================================================================== --- trunk/integration-tests/src/test/resources/testcases/RiftSaw_144/build.xml 2010-08-20 07:02:38 UTC (rev 918) +++ trunk/integration-tests/src/test/resources/testcases/RiftSaw_144/build.xml 2010-08-20 22:45:24 UTC (rev 919) @@ -18,8 +18,8 @@ <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" /> + <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> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-08-20 07:02:38 UTC (rev 918) +++ trunk/pom.xml 2010-08-20 22:45:24 UTC (rev 919) @@ -77,7 +77,7 @@ <riftsaw.engine.version>2.2.0-SNAPSHOT</riftsaw.engine.version> <bpel.console.version>2.1.2</bpel.console.version> <commons.logging.version>1.1.1</commons.logging.version> - <junit.version>4.4</junit.version> + <junit.version>3.8.1</junit.version> <jboss.version>5.1.0.GA</jboss.version> <log4j.version>1.2.14</log4j.version> <jbossesb.version>4.8</jbossesb.version> Modified: trunk/qa/build.xml =================================================================== --- trunk/qa/build.xml 2010-08-20 07:02:38 UTC (rev 918) +++ trunk/qa/build.xml 2010-08-20 22:45:24 UTC (rev 919) @@ -34,19 +34,19 @@ <property name="soa.p.distro.path" value="${download.dir}/${soa.p.filename}" /> <property name="soa.p.home" value="${riftsaw.home}/jboss-soa-p.5.0.0/jboss-as" /> - <property name="org.jboss.as.config" value="default" /> + <property name="org_jboss_as_config" value="default" /> <property name="ojdbc.url" value="http://www.qa.jboss.com/jdbc-drivers/maven2/com/oracle/ojdbc14/10.0.2.0/o..."/> <property name="replace.qa.jdbc" value="true" /> - <property name="org.jboss.esb.home" value="${jboss.parent.dir}/jbossesb-${jbossesb.version}" /> + <property name="org_jboss_esb_home" value="${jboss.parent.dir}/jbossesb-${jbossesb.version}" /> <echo message="===============================" /> <echo message="database.......... ${database}" /> <echo message="riftsaw.version...... ${riftsaw.version}" /> <echo message="riftsaw.home......... ${riftsaw.home}" /> <echo message="jboss.home.. ${jboss.home}" /> - <echo message="org.jboss.esb.home .. ${org.jboss.esb.home}" /> + <echo message="org_jboss_esb_home .. ${org_jboss_esb_home}" /> <echo message="===============================" /> <condition property="is.jboss.distro.available"> @@ -96,7 +96,7 @@ <ant dir="${jboss.parent.dir}/jbossesb-${jbossesb.version}/install" target="deploy"> <property name="org.jboss.esb.server.home" value="${jboss.home}" /> - <property name="org.jboss.esb.server.config" value="${org.jboss.as.config}" /> + <property name="org.jboss.esb.server.config" value="${org_jboss_as_config}" /> </ant> <antcall target="get.ojdbc" /> @@ -110,8 +110,8 @@ <unzip src="../distribution/target/riftsaw-${riftsaw.version}.zip" dest="../distribution/target" /> <ant dir="../distribution/target/riftsaw-${riftsaw.version}/install" target="deploy"> - <property name="org.jboss.as.home" value="${jboss.home}" /> - <property name="org.jboss.as.config" value="${org.jboss.as.config}" /> + <property name="org_jboss_as_home" value="${jboss.home}" /> + <property name="org_jboss_as_config" value="${org_jboss_as_config}" /> </ant> </target> @@ -177,12 +177,12 @@  <target name="remove.security.constraints"> <echo>Remove the security constraints for jmx-console</echo> - <copy todir="${soa.p.home}/server/${org.jboss.as.config}/deploy/jmx-console.war/WEB-INF" overwrite="true"> + <copy todir="${soa.p.home}/server/${org_jboss_as_config}/deploy/jmx-console.war/WEB-INF" overwrite="true"> <fileset dir="${basedir}/soa-p/jmx-console.war"> <include name="*.xml" /> </fileset> </copy> - <copy todir="${soa.p.home}/server/${org.jboss.as.config}/deploy" overwrite="true"> + <copy todir="${soa.p.home}/server/${org_jboss_as_config}/deploy" overwrite="true"> <fileset dir="${basedir}/soa-p"> <include name="jmx-invoker-service.xml" /> </fileset> @@ -200,13 +200,13 @@ <target name="stop-server" > <echo>Stopping the server</echo> - <echo>Server is at ${org.jboss.as.home}</echo> + <echo>Server is at ${org_jboss_as_home}</echo> <java classname="org.jboss.Shutdown" fork="true" failonerror="false" resultproperty="shutdown.rc"> <arg line="-s jnp://localhost:1099 --shutdown"/> <classpath> - <pathelement path="${org.jboss.as.home}/bin/shutdown.jar"/> - <pathelement path="${org.jboss.as.home}/client/jbossall-client.jar"/> + <pathelement path="${org_jboss_as_home}/bin/shutdown.jar"/> + <pathelement path="${org_jboss_as_home}/client/jbossall-client.jar"/> <pathelement path="${JAVA_HOME}/lib/tools.jar"/> </classpath> </java> Added: trunk/samples/common/base-build.xml =================================================================== --- trunk/samples/common/base-build.xml (rev 0) +++ trunk/samples/common/base-build.xml 2010-08-20 22:45:24 UTC (rev 919) @@ -0,0 +1,32 @@ +<project name="base-build" basedir="."> + +  + <property file="../../install/deployment.properties" /> + + <property name="server.dir" value="${org_jboss_as_home}/server/${org_jboss_as_config}"/> + <property name="conf.dir" value="${server.dir}/conf"/> + <property name="deploy.dir" value="${server.dir}/deploy"/> + <property name="deployers.dir" value="${server.dir}/deployers"/> + <property name="server.lib.dir" value="${server.dir}/lib"/> + <property name="server.client.dir" value="${org_jboss_as_home}/client"/> + <property name="riftsaw.lib.dir" value="${deploy.dir}/riftsaw.sar/lib"/> + + <path id="rs-exec-classpath"> + <fileset dir="../../../modules/riftsaw.sar/lib"> + <include name="**/*.jar"/> + </fileset> + <fileset dir="../../../lib"> + <include name="**/*.jar"/> + </fileset> + <fileset dir="${server.lib.dir}"> + <include name="**/*.jar"/> + </fileset> + <fileset dir="${server.client.dir}"> + <include name="**/*.jar"/> + </fileset> + <fileset dir="${org_jboss_as_home}/lib/endorsed"> + <include name="**/*.jar"/> + </fileset> + </path> + +</project> Modified: trunk/samples/esb/bpel_helloworld/build.xml =================================================================== --- trunk/samples/esb/bpel_helloworld/build.xml 2010-08-20 07:02:38 UTC (rev 918) +++ trunk/samples/esb/bpel_helloworld/build.xml 2010-08-20 22:45:24 UTC (rev 919) @@ -5,16 +5,11 @@ ${line.separator} </description> -  <property file="../../../install/deployment.properties" /> + <import file="../../common/base-build.xml"/> <property name="version" value="1" /> - <property name="server.dir" value="${org.jboss.as.home}/server/${org.jboss.as.config}"/> - <property name="conf.dir" value="${server.dir}/conf"/> - <property name="deploy.dir" value="${server.dir}/deploy"/> - <property name="server.lib.dir" value="${server.dir}/lib"/> - <property name="sample.esb.name" value="${ant.project.name}.esb" /> <target name="deployesb" > @@ -34,7 +29,7 @@ </target>  - <import file="${org.jboss.esb.home}/samples/quickstarts/conf/base-build.xml"/> + <import file="${org_jboss_esb_home}/samples/quickstarts/conf/base-build.xml"/> <target name="runtest" depends="compile" description="Will send an esb Message"> Modified: trunk/samples/esb/bpel_loan_fault/build.xml =================================================================== --- trunk/samples/esb/bpel_loan_fault/build.xml 2010-08-20 07:02:38 UTC (rev 918) +++ trunk/samples/esb/bpel_loan_fault/build.xml 2010-08-20 22:45:24 UTC (rev 919) @@ -5,16 +5,11 @@ ${line.separator} </description> -  <property file="../../../install/deployment.properties" /> + <import file="../../common/base-build.xml"/> <property name="version" value="1" /> - <property name="server.dir" value="${org.jboss.as.home}/server/${org.jboss.as.config}"/> - <property name="conf.dir" value="${server.dir}/conf"/> - <property name="deploy.dir" value="${server.dir}/deploy"/> - <property name="server.lib.dir" value="${server.dir}/lib"/> - <property name="sample.esb.name" value="${ant.project.name}.esb" /> <target name="deployesb" > @@ -34,7 +29,7 @@ </target>  - <import file="${org.jboss.esb.home}/samples/quickstarts/conf/base-build.xml"/> + <import file="${org_jboss_esb_home}/samples/quickstarts/conf/base-build.xml"/> <target name="runtest" depends="compile" description="Will send an esb Message"> Modified: trunk/samples/esb/invoke_esb_ebws/build.xml =================================================================== --- trunk/samples/esb/invoke_esb_ebws/build.xml 2010-08-20 07:02:38 UTC (rev 918) +++ trunk/samples/esb/invoke_esb_ebws/build.xml 2010-08-20 22:45:24 UTC (rev 919) @@ -5,16 +5,11 @@ ${line.separator} </description> -  <property file="../../../install/deployment.properties" /> + <import file="../../common/base-build.xml"/> <property name="version" value="1" /> - <property name="server.dir" value="${org.jboss.as.home}/server/${org.jboss.as.config}"/> - <property name="conf.dir" value="${server.dir}/conf"/> - <property name="deploy.dir" value="${server.dir}/deploy"/> - <property name="server.lib.dir" value="${server.dir}/lib"/> - <property name="sample.jar.name" value="${ant.project.name}-${version}.jar" /> <property name="sample.esb.name" value="CreditAgency.esb" /> @@ -41,12 +36,7 @@ <java classname="org.apache.ode.tools.sendsoap.cline.HttpSoapSender"> <arg value="http://localhost:8080/Quickstart_bpel_approval_serviceWS"/> <arg value="messages/approve_request1.xml"/> - <classpath> - <fileset dir="../../common/lib"> - <include name="**/*.jar"/> - </fileset> - <pathelement path="${java.class.path}"/> - </classpath> + <classpath refid="rs-exec-classpath"/> </java> </target> Modified: trunk/samples/esb/simple_esb_proxy_invoke/build.xml =================================================================== --- trunk/samples/esb/simple_esb_proxy_invoke/build.xml 2010-08-20 07:02:38 UTC (rev 918) +++ trunk/samples/esb/simple_esb_proxy_invoke/build.xml 2010-08-20 22:45:24 UTC (rev 919) @@ -5,24 +5,19 @@ ${line.separator} </description> -  <property file="../../../install/deployment.properties" /> + <import file="../../common/base-build.xml"/> <property name="version" value="1" /> - <property name="server.dir" value="${org.jboss.as.home}/server/${org.jboss.as.config}"/> - <property name="conf.dir" value="${server.dir}/conf"/> - <property name="deploy.dir" value="${server.dir}/deploy"/> - <property name="server.lib.dir" value="${server.dir}/lib"/> - <property name="sample.jar.name" value="${ant.project.name}-${version}.jar" /> <property name="sample.esb.name" value="SimpleESBProxyInvoke.esb" /> <property name="war.build.dir" location="build/war/classes"/> <path id="compile-classpath"> - <fileset dir="${org.jboss.as.home}/client" includes="*.jar" /> - <fileset dir="${org.jboss.esb.home}/lib" includes="*.jar" /> + <fileset dir="${org_jboss_as_home}/client" includes="*.jar" /> + <fileset dir="${org_jboss_esb_home}/lib" includes="*.jar" /> </path> <property name="compile-classpath" refid="compile-classpath"/> @@ -83,12 +78,7 @@ <java classname="org.apache.ode.tools.sendsoap.cline.HttpSoapSender"> <arg value="http://localhost:8080/Quickstart_bpel_simple_invokeWS"/> <arg value="messages/hello_request1.xml"/> - <classpath> - <fileset dir="../../common/lib"> - <include name="**/*.jar"/> - </fileset> - <pathelement path="${java.class.path}"/> - </classpath> + <classpath refid="rs-exec-classpath"/> </java> </target> Modified: trunk/samples/esb/simple_esb_proxy_invoke2/build.xml =================================================================== --- trunk/samples/esb/simple_esb_proxy_invoke2/build.xml 2010-08-20 07:02:38 UTC (rev 918) +++ trunk/samples/esb/simple_esb_proxy_invoke2/build.xml 2010-08-20 22:45:24 UTC (rev 919) @@ -5,24 +5,19 @@ ${line.separator} </description> -  <property file="../../../install/deployment.properties" /> + <import file="../../common/base-build.xml"/> <property name="version" value="1" /> - <property name="server.dir" value="${org.jboss.as.home}/server/${org.jboss.as.config}"/> - <property name="conf.dir" value="${server.dir}/conf"/> - <property name="deploy.dir" value="${server.dir}/deploy"/> - <property name="server.lib.dir" value="${server.dir}/lib"/> - <property name="sample.jar.name" value="${ant.project.name}-${version}.jar" /> <property name="sample.esb.name" value="${ant.project.name}-service.esb" /> <property name="war.build.dir" location="build/war/classes"/> <path id="compile-classpath"> - <fileset dir="${org.jboss.as.home}/client" includes="*.jar" /> - <fileset dir="${org.jboss.esb.home}/lib" includes="*.jar" /> + <fileset dir="${org_jboss_as_home}/client" includes="*.jar" /> + <fileset dir="${org_jboss_esb_home}/lib" includes="*.jar" /> </path> <property name="compile-classpath" refid="compile-classpath"/> @@ -83,12 +78,7 @@ <java classname="org.apache.ode.tools.sendsoap.cline.HttpSoapSender"> <arg value="http://localhost:8080/Quickstart_bpel_simple_invokeWS"/> <arg value="messages/hello_request1.xml"/> - <classpath> - <fileset dir="../../common/lib"> - <include name="**/*.jar"/> - </fileset> - <pathelement path="${java.class.path}"/> - </classpath> + <classpath refid="rs-exec-classpath"/> </java> </target> Modified: trunk/samples/quickstart/bpel_event_listener/build.xml =================================================================== --- trunk/samples/quickstart/bpel_event_listener/build.xml 2010-08-20 07:02:38 UTC (rev 918) +++ trunk/samples/quickstart/bpel_event_listener/build.xml 2010-08-20 22:45:24 UTC (rev 919) @@ -5,22 +5,15 @@ ${line.separator} </description> -  <property file="../../../install/deployment.properties" /> - - <property name="server.dir" value="${org.jboss.as.home}/server/${org.jboss.as.config}"/> - <property name="conf.dir" value="${server.dir}/conf"/> - <property name="deploy.dir" value="${server.dir}/deploy"/> - <property name="server.lib.dir" value="${server.dir}/lib"/> + <import file="../../common/base-build.xml"/> - <property name="riftsaw.lib.dir" value="${deploy.dir}/riftsaw.sar/lib"/> - <property name="sample.jar.name" value="${ant.project.name}.jar" /> <property name="build.dir" location="build/classes"/> <path id="compile-classpath"> - <fileset dir="${org.jboss.as.home}/client" includes="*.jar" />  + <fileset dir="${org_jboss_as_home}/client" includes="*.jar" />  <fileset dir="${riftsaw.lib.dir}" includes="*.jar" />  </path> <property name="compile-classpath" refid="compile-classpath"/> @@ -34,7 +27,7 @@ </classpath> </javac> - <jar basedir="${build.dir}" destfile="${riftsaw.lib.dir}/${sample.jar.name}" /> + <jar basedir="${build.dir}" destfile="${riftsaw.lib.dir}/${sample.jar.name}" /> </target> <target name="deploy" depends="makejar" > Modified: trunk/samples/quickstart/hello_world/build.xml =================================================================== --- trunk/samples/quickstart/hello_world/build.xml 2010-08-20 07:02:38 UTC (rev 918) +++ trunk/samples/quickstart/hello_world/build.xml 2010-08-20 22:45:24 UTC (rev 919) @@ -5,16 +5,11 @@ ${line.separator} </description> -  <property file="../../../install/deployment.properties" /> + <import file="../../common/base-build.xml"/> <property name="version" value="1" /> - <property name="server.dir" value="${org.jboss.as.home}/server/${org.jboss.as.config}"/> - <property name="conf.dir" value="${server.dir}/conf"/> - <property name="deploy.dir" value="${server.dir}/deploy"/> - <property name="server.lib.dir" value="${server.dir}/lib"/> - <property name="sample.jar.name" value="${ant.project.name}-${version}.jar" /> <target name="deploy"> @@ -32,12 +27,7 @@ <java classname="org.apache.ode.tools.sendsoap.cline.HttpSoapSender"> <arg value="http://localhost:8080/Quickstart_bpel_hello_worldWS"/> <arg value="messages/hello_request1.xml"/> - <classpath> - <fileset dir="../../common/lib"> - <include name="**/*.jar"/> - </fileset> - <pathelement path="${java.class.path}"/> - </classpath> + <classpath refid="rs-exec-classpath"/> </java> </target> </project> Modified: trunk/samples/quickstart/hello_world_header_ode/build.xml =================================================================== --- trunk/samples/quickstart/hello_world_header_ode/build.xml 2010-08-20 07:02:38 UTC (rev 918) +++ trunk/samples/quickstart/hello_world_header_ode/build.xml 2010-08-20 22:45:24 UTC (rev 919) @@ -5,16 +5,11 @@ ${line.separator} </description> -  <property file="../../../install/deployment.properties" /> + <import file="../../common/base-build.xml"/> <property name="version" value="1" /> - <property name="server.dir" value="${org.jboss.as.home}/server/${org.jboss.as.config}"/> - <property name="conf.dir" value="${server.dir}/conf"/> - <property name="deploy.dir" value="${server.dir}/deploy"/> - <property name="server.lib.dir" value="${server.dir}/lib"/> - <property name="sample.jar.name" value="${ant.project.name}-${version}.jar" /> <target name="deploy"> @@ -32,12 +27,7 @@ <java classname="org.apache.ode.tools.sendsoap.cline.HttpSoapSender"> <arg value="http://localhost:8080/Quickstart_bpel_hello_world_header_odeWS"/> <arg value="messages/hello_request1.xml"/> - <classpath> - <fileset dir="../../common/lib"> - <include name="**/*.jar"/> - </fileset> - <pathelement path="${java.class.path}"/> - </classpath> + <classpath refid="rs-exec-classpath"/> </java> </target> </project> Modified: trunk/samples/quickstart/hello_world_header_wsdl/build.xml =================================================================== --- trunk/samples/quickstart/hello_world_header_wsdl/build.xml 2010-08-20 07:02:38 UTC (rev 918) +++ trunk/samples/quickstart/hello_world_header_wsdl/build.xml 2010-08-20 22:45:24 UTC (rev 919) @@ -5,16 +5,11 @@ ${line.separator} </description> -  <property file="../../../install/deployment.properties" /> + <import file="../../common/base-build.xml"/> <property name="version" value="1" /> - <property name="server.dir" value="${org.jboss.as.home}/server/${org.jboss.as.config}"/> - <property name="conf.dir" value="${server.dir}/conf"/> - <property name="deploy.dir" value="${server.dir}/deploy"/> - <property name="server.lib.dir" value="${server.dir}/lib"/> - <property name="sample.jar.name" value="${ant.project.name}-${version}.jar" /> <target name="deploy"> @@ -32,12 +27,7 @@ <java classname="org.apache.ode.tools.sendsoap.cline.HttpSoapSender"> <arg value="http://localhost:8080/Quickstart_bpel_hello_world_header_wsdlWS"/> <arg value="messages/hello_request1.xml"/> - <classpath> - <fileset dir="../../common/lib"> - <include name="**/*.jar"/> - </fileset> - <pathelement path="${java.class.path}"/> - </classpath> + <classpath refid="rs-exec-classpath"/> </java> </target> </project> Modified: trunk/samples/quickstart/loan_approval/build.xml =================================================================== --- trunk/samples/quickstart/loan_approval/build.xml 2010-08-20 07:02:38 UTC (rev 918) +++ trunk/samples/quickstart/loan_approval/build.xml 2010-08-20 22:45:24 UTC (rev 919) @@ -5,22 +5,17 @@ ${line.separator} </description> -  <property file="../../../install/deployment.properties" /> + <import file="../../common/base-build.xml"/> <property name="version" value="1" /> - - <property name="server.dir" value="${org.jboss.as.home}/server/${org.jboss.as.config}"/> - <property name="conf.dir" value="${server.dir}/conf"/> - <property name="deploy.dir" value="${server.dir}/deploy"/> - <property name="server.lib.dir" value="${server.dir}/lib"/> - + <property name="sample.jar.name" value="${ant.project.name}-${version}.jar" /> <property name="war.build.dir" location="build/war/classes"/> <path id="compile-classpath"> - <fileset dir="${org.jboss.as.home}/client" includes="*.jar" />  + <fileset dir="${org_jboss_as_home}/client" includes="*.jar" />  </path> <property name="compile-classpath" refid="compile-classpath"/> @@ -77,12 +72,7 @@ <java classname="org.apache.ode.tools.sendsoap.cline.HttpSoapSender"> <arg value="http://localhost:8080/Quickstart_bpel_loan_approvalWS"/> <arg value="messages/loanreq1.xml"/> - <classpath> - <fileset dir="../../common/lib"> - <include name="**/*.jar"/> - </fileset> - <pathelement path="${java.class.path}"/> - </classpath> + <classpath refid="rs-exec-classpath"/> </java> </target> @@ -91,12 +81,7 @@ <java classname="org.apache.ode.tools.sendsoap.cline.HttpSoapSender"> <arg value="http://localhost:8080/Quickstart_bpel_loan_approvalWS"/> <arg value="messages/loanreq2.xml"/> - <classpath> - <fileset dir="../../common/lib"> - <include name="**/*.jar"/> - </fileset> - <pathelement path="${java.class.path}"/> - </classpath> + <classpath refid="rs-exec-classpath"/> </java> </target> @@ -105,12 +90,7 @@ <java classname="org.apache.ode.tools.sendsoap.cline.HttpSoapSender"> <arg value="http://localhost:8080/Quickstart_bpel_loan_approvalWS"/> <arg value="messages/loanreq3.xml"/> - <classpath> - <fileset dir="../../common/lib"> - <include name="**/*.jar"/> - </fileset> - <pathelement path="${java.class.path}"/> - </classpath> + <classpath refid="rs-exec-classpath"/> </java> </target> @@ -119,12 +99,7 @@ <java classname="org.apache.ode.tools.sendsoap.cline.HttpSoapSender"> <arg value="http://localhost:8080/Quickstart_bpel_loan_approvalWS"/> <arg value="messages/loanreq4.xml"/> - <classpath> - <fileset dir="../../common/lib"> - <include name="**/*.jar"/> - </fileset> - <pathelement path="${java.class.path}"/> - </classpath> + <classpath refid="rs-exec-classpath"/> </java> </target> Modified: trunk/samples/quickstart/math/build.xml =================================================================== --- trunk/samples/quickstart/math/build.xml 2010-08-20 07:02:38 UTC (rev 918) +++ trunk/samples/quickstart/math/build.xml 2010-08-20 22:45:24 UTC (rev 919) @@ -5,16 +5,11 @@ ${line.separator} </description> -  <property file="../../../install/deployment.properties" /> + <import file="../../common/base-build.xml"/> <property name="version" value="1" /> - - <property name="server.dir" value="${org.jboss.as.home}/server/${org.jboss.as.config}"/> - <property name="conf.dir" value="${server.dir}/conf"/> - <property name="deploy.dir" value="${server.dir}/deploy"/> - <property name="server.lib.dir" value="${server.dir}/lib"/> - + <property name="sample.jar.name" value="${ant.project.name}-${version}.jar" /> <target name="deploy"> @@ -32,12 +27,7 @@ <java classname="org.apache.ode.tools.sendsoap.cline.HttpSoapSender"> <arg value="http://localhost:8080/MathProcess"/> <arg value="messages/math_${op}_request.xml"/> - <classpath> - <fileset dir="../../common/lib"> - <include name="**/*.jar"/> - </fileset> - <pathelement path="${java.class.path}"/> - </classpath> + <classpath refid="rs-exec-classpath"/> </java> </target> Modified: trunk/samples/quickstart/salutations/build.xml =================================================================== --- trunk/samples/quickstart/salutations/build.xml 2010-08-20 07:02:38 UTC (rev 918) +++ trunk/samples/quickstart/salutations/build.xml 2010-08-20 22:45:24 UTC (rev 919) @@ -5,16 +5,11 @@ ${line.separator} </description> -  <property file="../../../install/deployment.properties" /> + <import file="../../common/base-build.xml"/> <property name="version" value="1" /> - - <property name="server.dir" value="${org.jboss.as.home}/server/${org.jboss.as.config}"/> - <property name="conf.dir" value="${server.dir}/conf"/> - <property name="deploy.dir" value="${server.dir}/deploy"/> - <property name="server.lib.dir" value="${server.dir}/lib"/> - + <property name="sample.jar.name" value="${ant.project.name}-${version}.jar" /> <target name="deploy"> @@ -32,12 +27,7 @@ <java classname="org.apache.ode.tools.sendsoap.cline.HttpSoapSender"> <arg value="http://localhost:8080/SalutationsProcess"/> <arg value="messages/salute_morning.xml"/> - <classpath> - <fileset dir="../../common/lib"> - <include name="**/*.jar"/> - </fileset> - <pathelement path="${java.class.path}"/> - </classpath> + <classpath refid="rs-exec-classpath"/> </java> </target> @@ -46,12 +36,7 @@ <java classname="org.apache.ode.tools.sendsoap.cline.HttpSoapSender"> <arg value="http://localhost:8080/SalutationsProcess"/> <arg value="messages/salute_afternoon.xml"/> - <classpath> - <fileset dir="../../common/lib"> - <include name="**/*.jar"/> - </fileset> - <pathelement path="${java.class.path}"/> - </classpath> + <classpath refid="rs-exec-classpath"/> </java> </target> @@ -60,12 +45,7 @@ <java classname="org.apache.ode.tools.sendsoap.cline.HttpSoapSender"> <arg value="http://localhost:8080/SalutationsProcess"/> <arg value="messages/salute_evening.xml"/> - <classpath> - <fileset dir="../../common/lib"> - <include name="**/*.jar"/> - </fileset> - <pathelement path="${java.class.path}"/> - </classpath> + <classpath refid="rs-exec-classpath"/> </java> </target> @@ -74,12 +54,7 @@ <java classname="org.apache.ode.tools.sendsoap.cline.HttpSoapSender"> <arg value="http://localhost:8080/SalutationsProcess"/> <arg value="messages/salute_night.xml"/> - <classpath> - <fileset dir="../../common/lib"> - <include name="**/*.jar"/> - </fileset> - <pathelement path="${java.class.path}"/> - </classpath> + <classpath refid="rs-exec-classpath"/> </java> </target> Modified: trunk/samples/quickstart/say_hello/build.xml =================================================================== --- trunk/samples/quickstart/say_hello/build.xml 2010-08-20 07:02:38 UTC (rev 918) +++ trunk/samples/quickstart/say_hello/build.xml 2010-08-20 22:45:24 UTC (rev 919) @@ -5,16 +5,11 @@ ${line.separator} </description> -  <property file="../../../install/deployment.properties" /> + <import file="../../common/base-build.xml"/> <property name="version" value="1" /> - - <property name="server.dir" value="${org.jboss.as.home}/server/${org.jboss.as.config}"/> - <property name="conf.dir" value="${server.dir}/conf"/> - <property name="deploy.dir" value="${server.dir}/deploy"/> - <property name="server.lib.dir" value="${server.dir}/lib"/> - + <property name="sample.jar.name" value="${ant.project.name}-${version}.jar" /> <target name="deploy"> @@ -32,12 +27,7 @@ <java classname="org.apache.ode.tools.sendsoap.cline.HttpSoapSender"> <arg value="http://localhost:8080/SayHelloProcess"/> <arg value="messages/sayHello_request.xml"/> - <classpath> - <fileset dir="../../common/lib"> - <include name="**/*.jar"/> - </fileset> - <pathelement path="${java.class.path}"/> - </classpath> + <classpath refid="rs-exec-classpath"/> </java> </target> Modified: trunk/samples/quickstart/secure_invoke/build.xml =================================================================== --- trunk/samples/quickstart/secure_invoke/build.xml 2010-08-20 07:02:38 UTC (rev 918) +++ trunk/samples/quickstart/secure_invoke/build.xml 2010-08-20 22:45:24 UTC (rev 919) @@ -5,23 +5,17 @@ ${line.separator} </description> -  <property file="../../../install/deployment.properties" /> + <import file="../../common/base-build.xml"/> <property name="version" value="1" /> - - <property name="server.dir" value="${org.jboss.as.home}/server/${org.jboss.as.config}"/> - <property name="conf.dir" value="${server.dir}/conf"/> - <property name="deploy.dir" value="${server.dir}/deploy"/> - <property name="deployers.dir" value="${server.dir}/deployers"/> - <property name="server.lib.dir" value="${server.dir}/lib"/> - + <property name="sample.jar.name" value="${ant.project.name}-${version}.jar" /> <property name="war.build.dir" location="build/war/classes"/> <path id="compile-classpath"> - <fileset dir="${org.jboss.as.home}/client" includes="*.jar" />  + <fileset dir="${org_jboss_as_home}/client" includes="*.jar" />  <fileset dir="${deployers.dir}/jbossws.deployer" includes="*.jar" /> </path> <property name="compile-classpath" refid="compile-classpath"/> @@ -92,12 +86,7 @@ <java classname="org.apache.ode.tools.sendsoap.cline.HttpSoapSender"> <arg value="http://localhost:8080/Quickstart_bpel_secure_invokeWS"/> <arg value="messages/hello_request1.xml"/> - <classpath> - <fileset dir="../../common/lib"> - <include name="**/*.jar"/> - </fileset> - <pathelement path="${java.class.path}"/> - </classpath> + <classpath refid="rs-exec-classpath"/> </java> </target> Modified: trunk/samples/quickstart/secure_service/build.xml =================================================================== --- trunk/samples/quickstart/secure_service/build.xml 2010-08-20 07:02:38 UTC (rev 918) +++ trunk/samples/quickstart/secure_service/build.xml 2010-08-20 22:45:24 UTC (rev 919) @@ -5,24 +5,18 @@ ${line.separator} </description> -  <property file="../../../install/deployment.properties" /> + <import file="../../common/base-build.xml"/> <property name="version" value="1" /> - <property name="server.dir" value="${org.jboss.as.home}/server/${org.jboss.as.config}"/> - <property name="conf.dir" value="${server.dir}/conf"/> - <property name="deploy.dir" value="${server.dir}/deploy"/> - <property name="deployers.dir" value="${server.dir}/deployers"/> - <property name="server.lib.dir" value="${server.dir}/lib"/> - <property name="sample.jar.name" value="${ant.project.name}-${version}.jar" /> <property name="server.build.dir" location="build/server"/> <property name="client.build.dir" location="build/client"/> <path id="compile-classpath"> - <fileset dir="${org.jboss.as.home}/client" includes="*.jar" /> + <fileset dir="${org_jboss_as_home}/client" includes="*.jar" /> <fileset dir="${deployers.dir}/jbossws.deployer" includes="*.jar" /> </path> <property name="compile-classpath" refid="compile-classpath"/> @@ -65,12 +59,12 @@ <arg value="${basedir}/bpelContent/HelloWorld.wsdl"/>  <arg value="messages/hello_request1.xml"/> - <classpath> - <pathelement location="${client.build.dir}"/> - <path refid="compile-classpath" /> - <pathelement location="${basedir}/client/resources"/> - <fileset dir="${org.jboss.as.home}/lib/endorsed" includes="*.jar" /> - </classpath> + <classpath> + <pathelement location="${client.build.dir}"/> + <path refid="compile-classpath" /> + <path refid="rs-exec-classpath" /> + <pathelement location="${basedir}/client/resources"/> + </classpath> </java> </target> Modified: trunk/samples/quickstart/service_handler/build.xml =================================================================== --- trunk/samples/quickstart/service_handler/build.xml 2010-08-20 07:02:38 UTC (rev 918) +++ trunk/samples/quickstart/service_handler/build.xml 2010-08-20 22:45:24 UTC (rev 919) @@ -5,22 +5,16 @@ ${line.separator} </description> -  <property file="../../../install/deployment.properties" /> + <import file="../../common/base-build.xml"/> <property name="version" value="1" /> - <property name="server.dir" value="${org.jboss.as.home}/server/${org.jboss.as.config}"/> - <property name="conf.dir" value="${server.dir}/conf"/> - <property name="deploy.dir" value="${server.dir}/deploy"/> - <property name="deployers.dir" value="${server.dir}/deployers"/> - <property name="server.lib.dir" value="${server.dir}/lib"/> - <property name="sample.jar.name" value="${ant.project.name}-${version}.jar" /> - <property name="code.build.dir" location="build/classes"/> + <property name="code.build.dir" location="build/classes"/> - <path id="compile-classpath"> + <path id="compile-classpath"> <fileset dir="${deployers.dir}/jbossws.deployer" includes="*.jar" /> </path> @@ -54,12 +48,7 @@ <java classname="org.apache.ode.tools.sendsoap.cline.HttpSoapSender"> <arg value="http://localhost:8080/Quickstart_bpel_service_handlerWS"/> <arg value="messages/hello_request1.xml"/> - <classpath> - <fileset dir="../../common/lib"> - <include name="**/*.jar"/> - </fileset> - <pathelement path="${java.class.path}"/> - </classpath> + <classpath refid="rs-exec-classpath"/> </java> </target> </project> Modified: trunk/samples/quickstart/simple_correlation/build.xml =================================================================== --- trunk/samples/quickstart/simple_correlation/build.xml 2010-08-20 07:02:38 UTC (rev 918) +++ trunk/samples/quickstart/simple_correlation/build.xml 2010-08-20 22:45:24 UTC (rev 919) @@ -5,16 +5,11 @@ ${line.separator} </description> -  <property file="../../../install/deployment.properties" /> + <import file="../../common/base-build.xml"/> <property name="version" value="1" /> - - <property name="server.dir" value="${org.jboss.as.home}/server/${org.jboss.as.config}"/> - <property name="conf.dir" value="${server.dir}/conf"/> - <property name="deploy.dir" value="${server.dir}/deploy"/> - <property name="server.lib.dir" value="${server.dir}/lib"/> - + <property name="sample.jar.name" value="${ant.project.name}-${version}.jar" /> <target name="deploy"> @@ -32,12 +27,7 @@ <java classname="org.apache.ode.tools.sendsoap.cline.HttpSoapSender"> <arg value="http://localhost:8080/Quickstart_bpel_simple_correlationWS"/> <arg value="messages/hello_request1.xml"/> - <classpath> - <fileset dir="../../common/lib"> - <include name="**/*.jar"/> - </fileset> - <pathelement path="${java.class.path}"/> - </classpath> + <classpath refid="rs-exec-classpath"/> </java> </target> @@ -46,12 +36,7 @@ <java classname="org.apache.ode.tools.sendsoap.cline.HttpSoapSender"> <arg value="http://localhost:8080/Quickstart_bpel_simple_correlationWS"/> <arg value="messages/goodbye_request1.xml"/> - <classpath> - <fileset dir="../../common/lib"> - <include name="**/*.jar"/> - </fileset> - <pathelement path="${java.class.path}"/> - </classpath> + <classpath refid="rs-exec-classpath"/> </java> </target> @@ -60,12 +45,7 @@ <java classname="org.apache.ode.tools.sendsoap.cline.HttpSoapSender"> <arg value="http://localhost:8080/Quickstart_bpel_simple_correlationWS"/> <arg value="messages/hello_request2.xml"/> - <classpath> - <fileset dir="../../common/lib"> - <include name="**/*.jar"/> - </fileset> - <pathelement path="${java.class.path}"/> - </classpath> + <classpath refid="rs-exec-classpath"/> </java> </target> @@ -74,12 +54,7 @@ <java classname="org.apache.ode.tools.sendsoap.cline.HttpSoapSender"> <arg value="http://localhost:8080/Quickstart_bpel_simple_correlationWS"/> <arg value="messages/goodbye_request2.xml"/> - <classpath> - <fileset dir="../../common/lib"> - <include name="**/*.jar"/> - </fileset> - <pathelement path="${java.class.path}"/> - </classpath> + <classpath refid="rs-exec-classpath"/> </java> </target> @@ -88,12 +63,7 @@ <java classname="org.apache.ode.tools.sendsoap.cline.HttpSoapSender"> <arg value="http://localhost:8080/Quickstart_bpel_simple_correlationWS"/> <arg value="messages/hello_request3.xml"/> - <classpath> - <fileset dir="../../common/lib"> - <include name="**/*.jar"/> - </fileset> - <pathelement path="${java.class.path}"/> - </classpath> + <classpath refid="rs-exec-classpath"/> </java> </target> @@ -102,12 +72,7 @@ <java classname="org.apache.ode.tools.sendsoap.cline.HttpSoapSender"> <arg value="http://localhost:8080/Quickstart_bpel_simple_correlationWS"/> <arg value="messages/goodbye_request3.xml"/> - <classpath> - <fileset dir="../../common/lib"> - <include name="**/*.jar"/> - </fileset> - <pathelement path="${java.class.path}"/> - </classpath> + <classpath refid="rs-exec-classpath"/> </java> </target> </project> Modified: trunk/samples/quickstart/simple_invoke/build.xml =================================================================== --- trunk/samples/quickstart/simple_invoke/build.xml 2010-08-20 07:02:38 UTC (rev 918) +++ trunk/samples/quickstart/simple_invoke/build.xml 2010-08-20 22:45:24 UTC (rev 919) @@ -5,22 +5,17 @@ ${line.separator} </description> -  <property file="../../../install/deployment.properties" /> + <import file="../../common/base-build.xml"/> <property name="version" value="1" /> - - <property name="server.dir" value="${org.jboss.as.home}/server/${org.jboss.as.config}"/> - <property name="conf.dir" value="${server.dir}/conf"/> - <property name="deploy.dir" value="${server.dir}/deploy"/> - <property name="server.lib.dir" value="${server.dir}/lib"/> - + <property name="sample.jar.name" value="${ant.project.name}-${version}.jar" /> <property name="war.build.dir" location="build/war/classes"/> <path id="compile-classpath"> - <fileset dir="${org.jboss.as.home}/client" includes="*.jar" />  + <fileset dir="${org_jboss_as_home}/client" includes="*.jar" />  </path> <property name="compile-classpath" refid="compile-classpath"/> @@ -74,12 +69,7 @@ <java classname="org.apache.ode.tools.sendsoap.cline.HttpSoapSender"> <arg value="http://localhost:8080/Quickstart_bpel_simple_invokeWS"/> <arg value="messages/hello_request1.xml"/> - <classpath> - <fileset dir="../../common/lib"> - <include name="**/*.jar"/> - </fileset> - <pathelement path="${java.class.path}"/> - </classpath> + <classpath refid="rs-exec-classpath"/> </java> </target> Modified: trunk/samples/quickstart/simple_pick/build.xml =================================================================== --- trunk/samples/quickstart/simple_pick/build.xml 2010-08-20 07:02:38 UTC (rev 918) +++ trunk/samples/quickstart/simple_pick/build.xml 2010-08-20 22:45:24 UTC (rev 919) @@ -5,16 +5,11 @@ ${line.separator} </description> -  <property file="../../../install/deployment.properties" /> + <import file="../../common/base-build.xml"/> <property name="version" value="1" /> - - <property name="server.dir" value="${org.jboss.as.home}/server/${org.jboss.as.config}"/> - <property name="conf.dir" value="${server.dir}/conf"/> - <property name="deploy.dir" value="${server.dir}/deploy"/> - <property name="server.lib.dir" value="${server.dir}/lib"/> - + <property name="sample.jar.name" value="${ant.project.name}-${version}.jar" /> <target name="deploy"> @@ -32,12 +27,7 @@ <java classname="org.apache.ode.tools.sendsoap.cline.HttpSoapSender"> <arg value="http://localhost:8080/Quickstart_bpel_simple_pickWS"/> <arg value="messages/hello_request1.xml"/> - <classpath> - <fileset dir="../../common/lib"> - <include name="**/*.jar"/> - </fileset> - <pathelement path="${java.class.path}"/> - </classpath> + <classpath refid="rs-exec-classpath"/> </java> </target> @@ -46,12 +36,7 @@ <java classname="org.apache.ode.tools.sendsoap.cline.HttpSoapSender"> <arg value="http://localhost:8080/Quickstart_bpel_simple_pickWS"/> <arg value="messages/goodbye_request1.xml"/> - <classpath> - <fileset dir="../../common/lib"> - <include name="**/*.jar"/> - </fileset> - <pathelement path="${java.class.path}"/> - </classpath> + <classpath refid="rs-exec-classpath"/> </java> </target> </project> Modified: trunk/samples/tutorial/BPEL-BluePrint1/build.xml =================================================================== --- trunk/samples/tutorial/BPEL-BluePrint1/build.xml 2010-08-20 07:02:38 UTC (rev 918) +++ trunk/samples/tutorial/BPEL-BluePrint1/build.xml 2010-08-20 22:45:24 UTC (rev 919) @@ -5,16 +5,11 @@ ${line.separator} </description> -  <property file="../../../install/deployment.properties" /> + <import file="../../common/base-build.xml"/> <property name="version" value="1" /> - <property name="server.dir" value="${org.jboss.as.home}/server/${org.jboss.as.config}"/> - <property name="conf.dir" value="${server.dir}/conf"/> - <property name="deploy.dir" value="${server.dir}/deploy"/> - <property name="server.lib.dir" value="${server.dir}/lib"/> - <property name="sample.jar.name" value="${ant.project.name}-${version}.jar" /> <target name="deploy"> @@ -32,12 +27,7 @@ <java classname="org.apache.ode.tools.sendsoap.cline.HttpSoapSender"> <arg value="http://localhost:8080/BPEL_BluePrint1_PurchaseOrderService"/> <arg value="messages/valid.xml"/> - <classpath> - <fileset dir="../../common/lib"> - <include name="**/*.jar"/> - </fileset> - <pathelement path="${java.class.path}"/> - </classpath> + <classpath refid="rs-exec-classpath"/> </java> </target> @@ -46,12 +36,7 @@ <java classname="org.apache.ode.tools.sendsoap.cline.HttpSoapSender"> <arg value="http://localhost:8080/BPEL_BluePrint1_PurchaseOrderService"/> <arg value="messages/invalid.xml"/> - <classpath> - <fileset dir="../../common/lib"> - <include name="**/*.jar"/> - </fileset> - <pathelement path="${java.class.path}"/> - </classpath> + <classpath refid="rs-exec-classpath"/> </java> </target> </project> Modified: trunk/samples/tutorial/BPEL-BluePrint2/build.xml =================================================================== --- trunk/samples/tutorial/BPEL-BluePrint2/build.xml 2010-08-20 07:02:38 UTC (rev 918) +++ trunk/samples/tutorial/BPEL-BluePrint2/build.xml 2010-08-20 22:45:24 UTC (rev 919) @@ -5,16 +5,11 @@ ${line.separator} </description> -  <property file="../../../install/deployment.properties" /> + <import file="../../common/base-build.xml"/> <property name="version" value="1" /> - <property name="server.dir" value="${org.jboss.as.home}/server/${org.jboss.as.config}"/> - <property name="conf.dir" value="${server.dir}/conf"/> - <property name="deploy.dir" value="${server.dir}/deploy"/> - <property name="server.lib.dir" value="${server.dir}/lib"/> - <property name="sample.jar.name" value="${ant.project.name}-${version}.jar" /> <target name="deploy"> @@ -32,12 +27,7 @@ <java classname="org.apache.ode.tools.sendsoap.cline.HttpSoapSender"> <arg value="http://localhost:8080/BPEL_BluePrint2_PurchaseOrderService"/> <arg value="messages/valid.xml"/> - <classpath> - <fileset dir="../../common/lib"> - <include name="**/*.jar"/> - </fileset> - <pathelement path="${java.class.path}"/> - </classpath> + <classpath refid="rs-exec-classpath"/> </java> </target> @@ -46,12 +36,7 @@ <java classname="org.apache.ode.tools.sendsoap.cline.HttpSoapSender"> <arg value="http://localhost:8080/BPEL_BluePrint2_PurchaseOrderService"/> <arg value="messages/invalid.xml"/> - <classpath> - <fileset dir="../../common/lib"> - <include name="**/*.jar"/> - </fileset> - <pathelement path="${java.class.path}"/> - </classpath> + <classpath refid="rs-exec-classpath"/> </java> </target> @@ -60,12 +45,7 @@ <java classname="org.apache.ode.tools.sendsoap.cline.HttpSoapSender"> <arg value="http://localhost:8080/BPEL_BluePrint2_PurchaseOrderService"/> <arg value="messages/timeout.xml"/> - <classpath> - <fileset dir="../../common/lib"> - <include name="**/*.jar"/> - </fileset> - <pathelement path="${java.class.path}"/> - </classpath> + <classpath refid="rs-exec-classpath"/> </java> </target> </project> Modified: trunk/samples/tutorial/BPEL-BluePrint3/build.xml =================================================================== --- trunk/samples/tutorial/BPEL-BluePrint3/build.xml 2010-08-20 07:02:38 UTC (rev 918) +++ trunk/samples/tutorial/BPEL-BluePrint3/build.xml 2010-08-20 22:45:24 UTC (rev 919) @@ -5,16 +5,11 @@ ${line.separator} </description> -  <property file="../../../install/deployment.properties" /> + <import file="../../common/base-build.xml"/> <property name="version" value="1" /> - <property name="server.dir" value="${org.jboss.as.home}/server/${org.jboss.as.config}"/> - <property name="conf.dir" value="${server.dir}/conf"/> - <property name="deploy.dir" value="${server.dir}/deploy"/> - <property name="server.lib.dir" value="${server.dir}/lib"/> - <property name="sample.jar.name" value="${ant.project.name}-${version}.jar" /> <target name="deploy"> @@ -32,12 +27,7 @@ <java classname="org.apache.ode.tools.sendsoap.cline.HttpSoapSender"> <arg value="http://localhost:8080/BPEL_BluePrint3_PurchaseOrderService"/> <arg value="messages/valid.xml"/> - <classpath> - <fileset dir="../../common/lib"> - <include name="**/*.jar"/> - </fileset> - <pathelement path="${java.class.path}"/> - </classpath> + <classpath refid="rs-exec-classpath"/> </java> </target> @@ -46,12 +36,7 @@ <java classname="org.apache.ode.tools.sendsoap.cline.HttpSoapSender"> <arg value="http://localhost:8080/BPEL_BluePrint3_PurchaseOrderService"/> <arg value="messages/invalid.xml"/> - <classpath> - <fileset dir="../../common/lib"> - <include name="**/*.jar"/> - </fileset> - <pathelement path="${java.class.path}"/> - </classpath> + <classpath refid="rs-exec-classpath"/> </java> </target> @@ -60,12 +45,7 @@ <java classname="org.apache.ode.tools.sendsoap.cline.HttpSoapSender"> <arg value="http://localhost:8080/BPEL_BluePrint3_PurchaseOrderService"/> <arg value="messages/throw_po_fault.xml"/> - <classpath> - <fileset dir="../../common/lib"> - <include name="**/*.jar"/> - </fileset> - <pathelement path="${java.class.path}"/> - </classpath> + <classpath refid="rs-exec-classpath"/> </java> </target> @@ -74,12 +54,7 @@ <java classname="org.apache.ode.tools.sendsoap.cline.HttpSoapSender"> <arg value="http://localhost:8080/BPEL_BluePrint3_PurchaseOrderService"/> <arg value="messages/throw_inv_fault.xml"/> - <classpath> - <fileset dir="../../common/lib"> - <include name="**/*.jar"/> - </fileset> - <pathelement path="${java.class.path}"/> - </classpath> + <classpath refid="rs-exec-classpath"/> </java> </target> </project> Modified: trunk/samples/tutorial/BPEL-BluePrint4/build.xml =================================================================== --- trunk/samples/tutorial/BPEL-BluePrint4/build.xml 2010-08-20 07:02:38 UTC (rev 918) +++ trunk/samples/tutorial/BPEL-BluePrint4/build.xml 2010-08-20 22:45:24 UTC (rev 919) @@ -5,16 +5,11 @@ ${line.separator} </description> -  <property file="../../../install/deployment.properties" /> + <import file="../../common/base-build.xml"/> <property name="version" value="1" /> - <property name="server.dir" value="${org.jboss.as.home}/server/${org.jboss.as.config}"/> - <property name="conf.dir" value="${server.dir}/conf"/> - <property name="deploy.dir" value="${server.dir}/deploy"/> - <property name="server.lib.dir" value="${server.dir}/lib"/> - <property name="sample.jar.name" value="${ant.project.name}-${version}.jar" /> <target name="deploy"> @@ -32,12 +27,7 @@ <java classname="org.apache.ode.tools.sendsoap.cline.HttpSoapSender"> <arg value="http://localhost:8080/BPEL_BluePrint4_PurchaseOrderService"/> <arg value="messages/valid.xml"/> - <classpath> - <fileset dir="../../common/lib"> - <include name="**/*.jar"/> - </fileset> - <pathelement path="${java.class.path}"/> - </classpath> + <classpath refid="rs-exec-classpath"/> </java> </target> @@ -46,12 +36,7 @@ <java classname="org.apache.ode.tools.sendsoap.cline.HttpSoapSender"> <arg value="http://localhost:8080/BPEL_BluePrint4_PurchaseOrderService"/> <arg value="messages/invalid.xml"/> - <classpath> - <fileset dir="../../common/lib"> - <include name="**/*.jar"/> - </fileset> - <pathelement path="${java.class.path}"/> - </classpath> + <classpath refid="rs-exec-classpath"/> </java> </target> @@ -60,12 +45,7 @@ <java classname="org.apache.ode.tools.sendsoap.cline.HttpSoapSender"> <arg value="http://localhost:8080/BPEL_BluePrint4_PurchaseOrderConfirmService"/> <arg value="messages/valid.xml"/> - <classpath> - <fileset dir="../../common/lib"> - <include name="**/*.jar"/> - </fileset> - <pathelement path="${java.class.path}"/> - </classpath> + <classpath refid="rs-exec-classpath"/> </java> </target> @@ -74,12 +54,7 @@ <java classname="org.apache.ode.tools.sendsoap.cline.HttpSoapSender"> <arg value="http://localhost:8080/BPEL_BluePrint4_PurchaseOrderCancelService"/> <arg value="messages/valid.xml"/> - <classpath> - <fileset dir="../../common/lib"> - <include name="**/*.jar"/> - </fileset> - <pathelement path="${java.class.path}"/> - </classpath> + <classpath refid="rs-exec-classpath"/> </java> </target> </project> Modified: trunk/samples/tutorial/BPEL-BluePrint5/build.xml =================================================================== --- trunk/samples/tutorial/BPEL-BluePrint5/build.xml 2010-08-20 07:02:38 UTC (rev 918) +++ trunk/samples/tutorial/BPEL-BluePrint5/build.xml 2010-08-20 22:45:24 UTC (rev 919) @@ -5,16 +5,11 @@ ${line.separator} </description> -  <property file="../../../install/deployment.properties" /> + <import file="../../common/base-build.xml"/> <property name="version" value="1" /> - <property name="server.dir" value="${org.jboss.as.home}/server/${org.jboss.as.config}"/> - <property name="conf.dir" value="${server.dir}/conf"/> - <property name="deploy.dir" value="${server.dir}/deploy"/> - <property name="server.lib.dir" value="${server.dir}/lib"/> - <property name="sample.jar.name" value="${ant.project.name}-${version}.jar" /> <target name="deploy"> @@ -32,12 +27,7 @@ <java classname="org.apache.ode.tools.sendsoap.cline.HttpSoapSender"> <arg value="http://localhost:8080/BPEL_BluePrint5_ReservationService"/> <arg value="messages/book_airline.xml"/> - <classpath> - <fileset dir="../../common/lib"> - <include name="**/*.jar"/> - </fileset> - <pathelement path="${java.class.path}"/> - </classpath> + <classpath refid="rs-exec-classpath"/> </java> </target> @@ -46,12 +36,7 @@ <java classname="org.apache.ode.tools.sendsoap.cline.HttpSoapSender"> <arg value="http://localhost:8080/BPEL_BluePrint5_ReservationService"/> <arg value="messages/book_car.xml"/> - <classpath> - <fileset dir="../../common/lib"> - <include name="**/*.jar"/> - </fileset> - <pathelement path="${java.class.path}"/> - </classpath> + <classpath refid="rs-exec-classpath"/> </java> </target> @@ -60,12 +45,7 @@ <java classname="org.apache.ode.tools.sendsoap.cline.HttpSoapSender"> <arg value="http://localhost:8080/BPEL_BluePrint5_ReservationService"/> <arg value="messages/book_hotel.xml"/> - <classpath> - <fileset dir="../../common/lib"> - <include name="**/*.jar"/> - </fileset> - <pathelement path="${java.class.path}"/> - </classpath> + <classpath refid="rs-exec-classpath"/> </java> </target> @@ -74,12 +54,7 @@ <java classname="org.apache.ode.tools.sendsoap.cline.HttpSoapSender"> <arg value="http://localhost:8080/BPEL_BluePrint5_ReservationService"/> <arg value="messages/book_all.xml"/> - <classpath> - <fileset dir="../../common/lib"> - <include name="**/*.jar"/> - </fileset> - <pathelement path="${java.class.path}"/> - </classpath> + <classpath refid="rs-exec-classpath"/> </java> </target> </project> Modified: trunk/samples/tutorial/atm/build.xml =================================================================== --- trunk/samples/tutorial/atm/build.xml 2010-08-20 07:02:38 UTC (rev 918) +++ trunk/samples/tutorial/atm/build.xml 2010-08-20 22:45:24 UTC (rev 919) @@ -2,22 +2,17 @@ <description>${ant.project.name}</description> -  <property file="../../../install/deployment.properties" /> - + <import file="../../common/base-build.xml"/> + <property name="version" value="1" /> - - <property name="server.dir" - value="${org.jboss.as.home}/server/${org.jboss.as.config}" /> - <property name="conf.dir" value="${server.dir}/conf" /> - <property name="deploy.dir" value="${server.dir}/deploy" /> - <property name="server.lib.dir" value="${server.dir}/lib" /> - + <property name="sample.jar.name" value="${ant.project.name}-${version}.jar" /> + <property name="war.build.dir" location="build/war/classes" /> <path id="compile-classpath"> - <pathelement location="${org.jboss.as.home}/client/jboss-javaee.jar" /> + <pathelement location="${org_jboss_as_home}/client/jboss-javaee.jar" /> </path> <target name="makewar" description="make war"> Modified: trunk/samples/tutorial/purchase/build.xml =================================================================== --- trunk/samples/tutorial/purchase/build.xml 2010-08-20 07:02:38 UTC (rev 918) +++ trunk/samples/tutorial/purchase/build.xml 2010-08-20 22:45:24 UTC (rev 919) @@ -2,24 +2,19 @@ <description>${ant.project.name}</description> -  <property file="../../../install/deployment.properties" /> - + <import file="../../common/base-build.xml"/> + <property name="version" value="1" /> - - <property name="server.dir" - value="${org.jboss.as.home}/server/${org.jboss.as.config}" /> - <property name="conf.dir" value="${server.dir}/conf" /> - <property name="deploy.dir" value="${server.dir}/deploy" /> - <property name="server.lib.dir" value="${server.dir}/lib" /> - + <property name="sample.jar.name" value="${ant.project.name}-${version}.jar" /> + <property name="war.build.dir" location="build/war/classes" /> <property name="ejb.build.dir" location="build/ejb/classes" /> <path id="compile-classpath"> - <pathelement location="${org.jboss.as.home}/common/lib/servlet-api.jar" /> - <pathelement location="${org.jboss.as.home}/client/jboss-javaee.jar" /> + <pathelement location="${org_jboss_as_home}/common/lib/servlet-api.jar" /> + <pathelement location="${org_jboss_as_home}/client/jboss-javaee.jar" /> </path> <target name="deployq"> Modified: trunk/samples/tutorial/travel_agency/build.xml =================================================================== --- trunk/samples/tutorial/travel_agency/build.xml 2010-08-20 07:02:38 UTC (rev 918) +++ trunk/samples/tutorial/travel_agency/build.xml 2010-08-20 22:45:24 UTC (rev 919) @@ -2,22 +2,17 @@ <description>${ant.project.name}</description> -  <property file="../../../install/deployment.properties" /> - + <import file="../../common/base-build.xml"/> + <property name="version" value="1" /> - - <property name="server.dir" - value="${org.jboss.as.home}/server/${org.jboss.as.config}" /> - <property name="conf.dir" value="${server.dir}/conf" /> - <property name="deploy.dir" value="${server.dir}/deploy" /> - <property name="server.lib.dir" value="${server.dir}/lib" /> - + <property name="sample.jar.name" value="${ant.project.name}-${version}.jar" /> + <property name="war.build.dir" location="build/war/classes" /> <path id="compile-classpath"> - <pathelement location="${org.jboss.as.home}/client/jboss-javaee.jar" /> + <pathelement location="${org_jboss_as_home}/client/jboss-javaee.jar" /> </path> <target name="makewar" description="make war"> Modified: trunk/stress-tests/build.xml =================================================================== --- trunk/stress-tests/build.xml 2010-08-20 07:02:38 UTC (rev 918) +++ trunk/stress-tests/build.xml 2010-08-20 22:45:24 UTC (rev 919) @@ -45,9 +45,9 @@ <ant antfile="build.xml" target="deploy" dir="${basedir}/../distribution/target/dist/riftsaw-${riftsaw.engine.version}/install"> - <property name="org.jboss.as.home" value="${org.jboss.as.home}" /> - <property name="org.jboss.as.config" value="${org.jboss.as.config}" /> - <property name="org.jboss.esb.home" value="${org.jboss.esb.home}" /> + <property name="org_jboss_as_home" value="${org_jboss_as_home}" /> + <property name="org_jboss_as_config" value="${org_jboss_as_config}" /> + <property name="org_jboss_esb_home" value="${org_jboss_esb_home}" /> <property name="database" value="${database}" /> </ant> <ant antfile="src/test/resources/performance/build.xml" target="deploy"/> @@ -58,9 +58,9 @@ <ant antfile="build.xml" target="undeploy" dir="${basedir}/../distribution/target/dist/riftsaw-${riftsaw.engine.version}/install"> - <property name="org.jboss.as.home" value="${org.jboss.as.home}" /> - <property name="org.jboss.as.config" value="${org.jboss.as.config}" /> - <property name="org.jboss.esb.home" value="${org.jboss.esb.home}" /> + <property name="org_jboss_as_home" value="${org_jboss_as_home}" /> + <property name="org_jboss_as_config" value="${org_jboss_as_config}" /> + <property name="org_jboss_esb_home" value="${org_jboss_esb_home}" /> <property name="database" value="${database}" /> </ant> </target> @@ -69,14 +69,14 @@ <java classname="org.jboss.Main" fork="true" spawn="true" - dir="${org.jboss.as.home}/server/${org.jboss.as.config}" > - <arg line="-c ${org.jboss.as.config}"/> - <jvmarg value="-Djava.endorsed.dirs=${org.jboss.as.home}/lib/endorsed"/> + dir="${org_jboss_as_home}/server/${org_jboss_as_config}" > + <arg line="-c ${org_jboss_as_config}"/> + <jvmarg value="-Djava.endorsed.dirs=${org_jboss_as_home}/lib/endorsed"/> <jvmarg value="-Xms128m"/> <jvmarg value="-Xmx512m"/> <jvmarg value="-XX:MaxPermSize=256m"/> <classpath> - <pathelement path="${org.jboss.as.home}/bin/run.jar"/> + <pathelement path="${org_jboss_as_home}/bin/run.jar"/> <pathelement path="${JAVA_HOME}/lib/tools.jar"/> </classpath> </java> @@ -97,13 +97,13 @@ <target name="stop-server" > <echo>Stopping the server</echo> - <echo>Server is at ${org.jboss.as.home}</echo> + <echo>Server is at ${org_jboss_as_home}</echo> <java classname="org.jboss.Shutdown" fork="true" failonerror="false" resultproperty="shutdown.rc"> <arg line="-s jnp://localhost:1099 --shutdown"/> <classpath> - <pathelement path="${org.jboss.as.home}/bin/shutdown.jar"/> - <pathelement path="${org.jboss.as.home}/client/jbossall-client.jar"/> + <pathelement path="${org_jboss_as_home}/bin/shutdown.jar"/> + <pathelement path="${org_jboss_as_home}/client/jbossall-client.jar"/> <pathelement path="${JAVA_HOME}/lib/tools.jar"/> </classpath> </java> Modified: trunk/stress-tests/src/test/resources/performance/build.xml =================================================================== --- trunk/stress-tests/src/test/resources/performance/build.xml 2010-08-20 07:02:38 UTC (rev 918) +++ trunk/stress-tests/src/test/resources/performance/build.xml 2010-08-20 22:45:24 UTC (rev 919) @@ -10,7 +10,7 @@ <property name="version" value="1" /> - <property name="server.dir" value="${org.jboss.as.home}/server/${org.jboss.as.config}"/> + <property name="server.dir" value="${org_jboss_as_home}/server/${org_jboss_as_config}"/> <property name="conf.dir" value="${server.dir}/conf"/> <property name="deploy.dir" value="${server.dir}/deploy"/> <property name="server.lib.dir" value="${server.dir}/lib"/> @@ -21,7 +21,7 @@ <property name="war.build.dir" value="bin"/> <path id="compile-classpath"> - <fileset dir="${org.jboss.as.home}/client" includes="*.jar" />  + <fileset dir="${org_jboss_as_home}/client" includes="*.jar" />  </path> <property name="compile-classpath" refid="compile-classpath"/>

13 years, 8 months

1
0
0 / 0

Hudson build became unstable: RiftSaw-mysql #145

by jboss-qa-internal＠redhat.com

See <http://hudson.qa.jboss.com/hudson/job/RiftSaw-mysql/145/changes>

13 years, 8 months

1
0
0 / 0

riftsaw SVN: r918 - in branches/RiftSaw-ODE-2.1.x/dao-jpa-hibernate/src/main: scripts and 1 other directory.

by riftsaw-commits＠lists.jboss.org

Author: jeff.yuchang Date: 2010-08-20 03:02:38 -0400 (Fri, 20 Aug 2010) New Revision: 918 Added: branches/RiftSaw-ODE-2.1.x/dao-jpa-hibernate/src/main/files/hibernate.cfg/db2.properties branches/RiftSaw-ODE-2.1.x/dao-jpa-hibernate/src/main/scripts/simplesched-db2.sql Log: * RIFTSAW-269, added db2 scripts. Added: branches/RiftSaw-ODE-2.1.x/dao-jpa-hibernate/src/main/files/hibernate.cfg/db2.properties =================================================================== --- branches/RiftSaw-ODE-2.1.x/dao-jpa-hibernate/src/main/files/hibernate.cfg/db2.properties (rev 0) +++ branches/RiftSaw-ODE-2.1.x/dao-jpa-hibernate/src/main/files/hibernate.cfg/db2.properties 2010-08-20 07:02:38 UTC (rev 918) @@ -0,0 +1 @@ +dialect=org.hibernate.dialect.DB2Dialect \ No newline at end of file Added: branches/RiftSaw-ODE-2.1.x/dao-jpa-hibernate/src/main/scripts/simplesched-db2.sql =================================================================== --- branches/RiftSaw-ODE-2.1.x/dao-jpa-hibernate/src/main/scripts/simplesched-db2.sql (rev 0) +++ branches/RiftSaw-ODE-2.1.x/dao-jpa-hibernate/src/main/scripts/simplesched-db2.sql 2010-08-20 07:02:38 UTC (rev 918) @@ -0,0 +1,30 @@ +-- Apache ODE - SimpleScheduler Database Schema +-- +-- Apache Derby scripts by Maciej Szefler. +-- +-- + +CREATE TABLE ODE_JOB ( + jobid CHAR(64) NOT NULL DEFAULT '', + ts BIGINT NOT NULL DEFAULT 0, + nodeid char(64), + scheduled int NOT NULL DEFAULT 0, + transacted int NOT NULL DEFAULT 0, + + instanceId BIGINT, + mexId varchar(255), + processId varchar(255), + type varchar(255), + channel varchar(255), + correlatorId varchar(255), + correlationKeySet varchar(255), + retryCount int, + inMem int, + detailsExt blob(1073741823) NULL, + + PRIMARY KEY(jobid)); + +CREATE INDEX IDX_ODE_JOB_TS ON ODE_JOB(ts); +CREATE INDEX IDX_ODE_JOB_NODEID ON ODE_JOB(nodeid); + +

13 years, 8 months

1
0
0 / 0

riftsaw SVN: r917 - in branches/RiftSaw-2.1.x: distribution/src/main/release/db/jdbc and 2 other directories.

by riftsaw-commits＠lists.jboss.org

Author: jeff.yuchang Date: 2010-08-20 02:57:35 -0400 (Fri, 20 Aug 2010) New Revision: 917 Added: branches/RiftSaw-2.1.x/distribution/src/main/release/db/datasource/bpel-db2-ds.xml branches/RiftSaw-2.1.x/distribution/src/main/release/db/jdbc/db2.properties branches/RiftSaw-2.1.x/distribution/src/main/release/db/sql/db2.drop.sql branches/RiftSaw-2.1.x/runtime/engine-assembly/src/main/resources/bpel-sql/db2.sql Log: * RIFTSAW-269, Added db2 script. Added: branches/RiftSaw-2.1.x/distribution/src/main/release/db/datasource/bpel-db2-ds.xml =================================================================== --- branches/RiftSaw-2.1.x/distribution/src/main/release/db/datasource/bpel-db2-ds.xml (rev 0) +++ branches/RiftSaw-2.1.x/distribution/src/main/release/db/datasource/bpel-db2-ds.xml 2010-08-20 06:57:35 UTC (rev 917) @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<datasources> + <local-tx-datasource> + <jndi-name>BPELDB</jndi-name> + <connection-url>@connection.url@</connection-url> + <driver-class>@driver@</driver-class> + <user-name>@username@</user-name> + <password>@password@</password> + + <metadata> + <type-mapping>DB2</type-mapping> + </metadata> + </local-tx-datasource> + +</datasources> \ No newline at end of file Added: branches/RiftSaw-2.1.x/distribution/src/main/release/db/jdbc/db2.properties =================================================================== --- branches/RiftSaw-2.1.x/distribution/src/main/release/db/jdbc/db2.properties (rev 0) +++ branches/RiftSaw-2.1.x/distribution/src/main/release/db/jdbc/db2.properties 2010-08-20 06:57:35 UTC (rev 917) @@ -0,0 +1,5 @@ +connection.url=jdbc:db2://localhost/riftsaw +driver=com.ibm.db2.jcc.DB2Driver +username=riftsaw +password=riftsaw +dialect=org.hibernate.dialect.DB2Dialect \ No newline at end of file Added: branches/RiftSaw-2.1.x/distribution/src/main/release/db/sql/db2.drop.sql =================================================================== --- branches/RiftSaw-2.1.x/distribution/src/main/release/db/sql/db2.drop.sql (rev 0) +++ branches/RiftSaw-2.1.x/distribution/src/main/release/db/sql/db2.drop.sql 2010-08-20 06:57:35 UTC (rev 917) @@ -0,0 +1,24 @@ +drop table ODE_SCHEMA_VERSION; +drop table ODE_JOB; + +drop table BPEL_ACTIVITY_RECOVERY; +drop table BPEL_CORRELATION_SET; +drop table BPEL_CORRELATOR; +drop table BPEL_CORSET_PROP; +drop table BPEL_EVENT; +drop table BPEL_FAULT; +drop table BPEL_MESSAGE; +drop table BPEL_MESSAGE_EXCHANGE; +drop table BPEL_MESSAGE_ROUTE; +drop table BPEL_MEX_PROP; +drop table BPEL_PARTNER_LINK; +drop table BPEL_PROCESS; +drop table BPEL_PROCESS_INSTANCE; +drop table BPEL_SCOPE; +drop table BPEL_XML_DATA; +drop table BPEL_XML_DATA_PROP; +drop table STORE_DU; +drop table STORE_PROCESS; +drop table STORE_PROCESS_PROP; +drop table STORE_PROC_TO_PROP; +drop table STORE_VERSIONS; \ No newline at end of file Added: branches/RiftSaw-2.1.x/runtime/engine-assembly/src/main/resources/bpel-sql/db2.sql =================================================================== --- branches/RiftSaw-2.1.x/runtime/engine-assembly/src/main/resources/bpel-sql/db2.sql (rev 0) +++ branches/RiftSaw-2.1.x/runtime/engine-assembly/src/main/resources/bpel-sql/db2.sql 2010-08-20 06:57:35 UTC (rev 917) @@ -0,0 +1,245 @@ + +create table ODE_SCHEMA_VERSION(VERSION integer); +insert into ODE_SCHEMA_VERSION values (6); + +CREATE TABLE ODE_JOB ( + jobid CHAR(64) NOT NULL DEFAULT '', + ts BIGINT NOT NULL DEFAULT 0, + nodeid char(64), + scheduled int NOT NULL DEFAULT 0, + transacted int NOT NULL DEFAULT 0, + + instanceId BIGINT, + mexId varchar(255), + processId varchar(255), + type varchar(255), + channel varchar(255), + correlatorId varchar(255), + correlationKeySet varchar(255), + retryCount int, + inMem int, + detailsExt blob(1073741823) NULL, + + PRIMARY KEY(jobid)); + +CREATE INDEX IDX_ODE_JOB_TS ON ODE_JOB(ts); +CREATE INDEX IDX_ODE_JOB_NODEID ON ODE_JOB(nodeid); + +create table BPEL_ACTIVITY_RECOVERY ( + ID bigint generated by default as identity, + ACTIONS varchar(255), + ACTIVITY_ID bigint, + CHANNEL varchar(255), + DATE_TIME timestamp, + DETAILS clob(255), + INSTANCE_ID bigint, + REASON varchar(255), + RETRIES integer, + primary key (ID) +); + +create table BPEL_CORRELATION_SET ( + CORRELATION_SET_ID bigint generated by default as identity, + CORRELATION_KEY varchar(255), + NAME varchar(255), + SCOPE_ID bigint, + primary key (CORRELATION_SET_ID) +); + +create table BPEL_CORRELATOR ( + CORRELATOR_ID bigint generated by default as identity, + CORRELATOR_KEY varchar(255), + PROC_ID bigint, + primary key (CORRELATOR_ID) +); + +create table BPEL_CORSET_PROP ( + ID bigint generated by default as identity, + CORRSET_ID bigint, + PROP_KEY varchar(255), + PROP_VALUE varchar(255), + primary key (ID) +); + +create table BPEL_EVENT ( + EVENT_ID bigint generated by default as identity, + DETAIL varchar(255), + DATA blob(255), + SCOPE_ID bigint, + TSTAMP timestamp, + TYPE varchar(255), + INSTANCE_ID bigint, + PROCESS_ID bigint, + primary key (EVENT_ID) +); + +create table BPEL_FAULT ( + FAULT_ID bigint generated by default as identity, + ACTIVITY_ID integer, + DATA clob(255), + MESSAGE varchar(4000), + LINE_NUMBER integer, + NAME varchar(255), + primary key (FAULT_ID) +); + +create table BPEL_MESSAGE ( + MESSAGE_ID bigint generated by default as identity, + DATA clob(255), + HEADER clob(255), + TYPE varchar(255), + MESSAGE_EXCHANGE_ID varchar(255), + primary key (MESSAGE_ID) +); + +create table BPEL_MESSAGE_EXCHANGE ( + MESSAGE_EXCHANGE_ID varchar(255) not null, + CALLEE varchar(255), + CHANNEL varchar(255), + CORRELATION_ID varchar(255), + CORRELATION_KEYS varchar(255), + CORRELATION_STATUS varchar(255), + CREATE_TIME timestamp, + DIRECTION char(1), + EPR clob(255), + FAULT varchar(255), + FAULT_EXPLANATION varchar(255), + OPERATION varchar(255), + PARTNER_LINK_MODEL_ID integer, + PATTERN varchar(255), + PIPED_ID varchar(255), + PORT_TYPE varchar(255), + PROPAGATE_TRANS smallint, + STATUS varchar(255), + SUBSCRIBER_COUNT integer, + CORR_ID bigint, + PARTNER_LINK_ID bigint, + PROCESS_ID bigint, + PROCESS_INSTANCE_ID bigint, + REQUEST_MESSAGE_ID bigint, + RESPONSE_MESSAGE_ID bigint, + primary key (MESSAGE_EXCHANGE_ID) +); + +create table BPEL_MESSAGE_ROUTE ( + MESSAGE_ROUTE_ID bigint generated by default as identity, + CORRELATION_KEY varchar(255), + GROUP_ID varchar(255), + ROUTE_INDEX integer, + PROCESS_INSTANCE_ID bigint, + ROUTE_POLICY varchar(16), + CORR_ID bigint, + primary key (MESSAGE_ROUTE_ID) +); + +create table BPEL_MEX_PROP ( + ID bigint generated by default as identity, + MEX_ID varchar(255), + PROP_KEY varchar(255), + PROP_VALUE varchar(2000), + primary key (ID) +); + +create table BPEL_PARTNER_LINK ( + PARTNER_LINK_ID bigint generated by default as identity, + MY_EPR clob(255), + MY_ROLE_NAME varchar(255), + MY_ROLE_SERVICE_NAME varchar(255), + MY_SESSION_ID varchar(255), + PARTNER_EPR clob(255), + PARTNER_LINK_MODEL_ID integer, + PARTNER_LINK_NAME varchar(255), + PARTNER_ROLE_NAME varchar(255), + PARTNER_SESSION_ID varchar(255), + SCOPE_ID bigint, + primary key (PARTNER_LINK_ID) +); + +create table BPEL_PROCESS ( + ID bigint generated by default as identity, + GUID varchar(255), + PROCESS_ID varchar(255), + PROCESS_TYPE varchar(255), + VERSION bigint, + primary key (ID) +); + +create table BPEL_PROCESS_INSTANCE ( + ID bigint generated by default as identity, + DATE_CREATED timestamp, + EXECUTION_STATE blob(255), + FAULT_ID bigint, + LAST_ACTIVE_TIME timestamp, + LAST_RECOVERY_DATE timestamp, + PREVIOUS_STATE smallint, + SEQUENCE bigint, + INSTANCE_STATE smallint, + INSTANTIATING_CORRELATOR_ID bigint, + PROCESS_ID bigint, + ROOT_SCOPE_ID bigint, + primary key (ID) +); + +create table BPEL_SCOPE ( + SCOPE_ID bigint generated by default as identity, + MODEL_ID integer, + SCOPE_NAME varchar(255), + SCOPE_STATE varchar(255), + PARENT_SCOPE_ID bigint, + PROCESS_INSTANCE_ID bigint, + primary key (SCOPE_ID) +); + +create table BPEL_XML_DATA ( + XML_DATA_ID bigint generated by default as identity, + DATA clob(255), + IS_SIMPLE_TYPE smallint, + NAME varchar(255), + SCOPE_ID bigint, + primary key (XML_DATA_ID) +); + +create table BPEL_XML_DATA_PROP ( + ID bigint generated by default as identity, + XML_DATA_ID bigint, + PROP_KEY varchar(255), + PROP_VALUE varchar(255), + primary key (ID) +); + +create table STORE_DU ( + NAME varchar(255) not null, + DEPLOYDT timestamp, + DEPLOYER varchar(255), + DIR varchar(255), + primary key (NAME) +); + +create table STORE_PROCESS ( + PID varchar(255) not null, + STATE varchar(255), + TYPE varchar(255), + VERSION bigint, + DU varchar(255), + primary key (PID) +); + +create table STORE_PROCESS_PROP ( + ID bigint generated by default as identity, + PROP_KEY varchar(255), + PROP_VAL varchar(255), + primary key (ID) +); + +create table STORE_PROC_TO_PROP ( + STORE_PROCESS_PID varchar(255) not null, + STORE_PROPERTY_ID bigint not null, + primary key (STORE_PROCESS_PID, STORE_PROPERTY_ID), + unique (STORE_PROPERTY_ID) +); + +create table STORE_VERSIONS ( + ID bigint generated by default as identity, + VERSION bigint, + primary key (ID) +); \ No newline at end of file

13 years, 8 months

1
0
0 / 0

riftsaw SVN: r916 - in trunk: distribution/src/main/release/db/jdbc and 2 other directories.

by riftsaw-commits＠lists.jboss.org

Author: jeff.yuchang Date: 2010-08-20 02:52:41 -0400 (Fri, 20 Aug 2010) New Revision: 916 Added: trunk/distribution/src/main/release/db/datasource/bpel-db2-ds.xml trunk/distribution/src/main/release/db/jdbc/db2.properties trunk/distribution/src/main/release/db/sql/db2.drop.sql trunk/runtime/engine-assembly/src/main/resources/bpel-sql/db2.sql Log: * RIFTSAW-269, added db2 sql script. Added: trunk/distribution/src/main/release/db/datasource/bpel-db2-ds.xml =================================================================== --- trunk/distribution/src/main/release/db/datasource/bpel-db2-ds.xml (rev 0) +++ trunk/distribution/src/main/release/db/datasource/bpel-db2-ds.xml 2010-08-20 06:52:41 UTC (rev 916) @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<datasources> + <local-tx-datasource> + <jndi-name>BPELDB</jndi-name> + <connection-url>@connection.url@</connection-url> + <driver-class>@driver@</driver-class> + <user-name>@username@</user-name> + <password>@password@</password> + + <metadata> + <type-mapping>DB2</type-mapping> + </metadata> + </local-tx-datasource> + +</datasources> \ No newline at end of file Added: trunk/distribution/src/main/release/db/jdbc/db2.properties =================================================================== --- trunk/distribution/src/main/release/db/jdbc/db2.properties (rev 0) +++ trunk/distribution/src/main/release/db/jdbc/db2.properties 2010-08-20 06:52:41 UTC (rev 916) @@ -0,0 +1,5 @@ +connection.url=jdbc:db2://localhost/riftsaw +driver=com.ibm.db2.jcc.DB2Driver +username=riftsaw +password=riftsaw +dialect=org.hibernate.dialect.DB2Dialect \ No newline at end of file Added: trunk/distribution/src/main/release/db/sql/db2.drop.sql =================================================================== --- trunk/distribution/src/main/release/db/sql/db2.drop.sql (rev 0) +++ trunk/distribution/src/main/release/db/sql/db2.drop.sql 2010-08-20 06:52:41 UTC (rev 916) @@ -0,0 +1,24 @@ +drop table ODE_SCHEMA_VERSION; +drop table ODE_JOB; + +drop table BPEL_ACTIVITY_RECOVERY; +drop table BPEL_CORRELATION_SET; +drop table BPEL_CORRELATOR; +drop table BPEL_CORSET_PROP; +drop table BPEL_EVENT; +drop table BPEL_FAULT; +drop table BPEL_MESSAGE; +drop table BPEL_MESSAGE_EXCHANGE; +drop table BPEL_MESSAGE_ROUTE; +drop table BPEL_MEX_PROP; +drop table BPEL_PARTNER_LINK; +drop table BPEL_PROCESS; +drop table BPEL_PROCESS_INSTANCE; +drop table BPEL_SCOPE; +drop table BPEL_XML_DATA; +drop table BPEL_XML_DATA_PROP; +drop table STORE_DU; +drop table STORE_PROCESS; +drop table STORE_PROCESS_PROP; +drop table STORE_PROC_TO_PROP; +drop table STORE_VERSIONS; \ No newline at end of file Added: trunk/runtime/engine-assembly/src/main/resources/bpel-sql/db2.sql =================================================================== --- trunk/runtime/engine-assembly/src/main/resources/bpel-sql/db2.sql (rev 0) +++ trunk/runtime/engine-assembly/src/main/resources/bpel-sql/db2.sql 2010-08-20 06:52:41 UTC (rev 916) @@ -0,0 +1,245 @@ + +create table ODE_SCHEMA_VERSION(VERSION integer); +insert into ODE_SCHEMA_VERSION values (6); + +CREATE TABLE ODE_JOB ( + jobid CHAR(64) NOT NULL DEFAULT '', + ts BIGINT NOT NULL DEFAULT 0, + nodeid char(64), + scheduled int NOT NULL DEFAULT 0, + transacted int NOT NULL DEFAULT 0, + + instanceId BIGINT, + mexId varchar(255), + processId varchar(255), + type varchar(255), + channel varchar(255), + correlatorId varchar(255), + correlationKeySet varchar(255), + retryCount int, + inMem int, + detailsExt blob(1073741823) NULL, + + PRIMARY KEY(jobid)); + +CREATE INDEX IDX_ODE_JOB_TS ON ODE_JOB(ts); +CREATE INDEX IDX_ODE_JOB_NODEID ON ODE_JOB(nodeid); + +create table BPEL_ACTIVITY_RECOVERY ( + ID bigint generated by default as identity, + ACTIONS varchar(255), + ACTIVITY_ID bigint, + CHANNEL varchar(255), + DATE_TIME timestamp, + DETAILS clob(255), + INSTANCE_ID bigint, + REASON varchar(255), + RETRIES integer, + primary key (ID) +); + +create table BPEL_CORRELATION_SET ( + CORRELATION_SET_ID bigint generated by default as identity, + CORRELATION_KEY varchar(255), + NAME varchar(255), + SCOPE_ID bigint, + primary key (CORRELATION_SET_ID) +); + +create table BPEL_CORRELATOR ( + CORRELATOR_ID bigint generated by default as identity, + CORRELATOR_KEY varchar(255), + PROC_ID bigint, + primary key (CORRELATOR_ID) +); + +create table BPEL_CORSET_PROP ( + ID bigint generated by default as identity, + CORRSET_ID bigint, + PROP_KEY varchar(255), + PROP_VALUE varchar(255), + primary key (ID) +); + +create table BPEL_EVENT ( + EVENT_ID bigint generated by default as identity, + DETAIL varchar(255), + DATA blob(255), + SCOPE_ID bigint, + TSTAMP timestamp, + TYPE varchar(255), + INSTANCE_ID bigint, + PROCESS_ID bigint, + primary key (EVENT_ID) +); + +create table BPEL_FAULT ( + FAULT_ID bigint generated by default as identity, + ACTIVITY_ID integer, + DATA clob(255), + MESSAGE varchar(4000), + LINE_NUMBER integer, + NAME varchar(255), + primary key (FAULT_ID) +); + +create table BPEL_MESSAGE ( + MESSAGE_ID bigint generated by default as identity, + DATA clob(255), + HEADER clob(255), + TYPE varchar(255), + MESSAGE_EXCHANGE_ID varchar(255), + primary key (MESSAGE_ID) +); + +create table BPEL_MESSAGE_EXCHANGE ( + MESSAGE_EXCHANGE_ID varchar(255) not null, + CALLEE varchar(255), + CHANNEL varchar(255), + CORRELATION_ID varchar(255), + CORRELATION_KEYS varchar(255), + CORRELATION_STATUS varchar(255), + CREATE_TIME timestamp, + DIRECTION char(1), + EPR clob(255), + FAULT varchar(255), + FAULT_EXPLANATION varchar(255), + OPERATION varchar(255), + PARTNER_LINK_MODEL_ID integer, + PATTERN varchar(255), + PIPED_ID varchar(255), + PORT_TYPE varchar(255), + PROPAGATE_TRANS smallint, + STATUS varchar(255), + SUBSCRIBER_COUNT integer, + CORR_ID bigint, + PARTNER_LINK_ID bigint, + PROCESS_ID bigint, + PROCESS_INSTANCE_ID bigint, + REQUEST_MESSAGE_ID bigint, + RESPONSE_MESSAGE_ID bigint, + primary key (MESSAGE_EXCHANGE_ID) +); + +create table BPEL_MESSAGE_ROUTE ( + MESSAGE_ROUTE_ID bigint generated by default as identity, + CORRELATION_KEY varchar(255), + GROUP_ID varchar(255), + ROUTE_INDEX integer, + PROCESS_INSTANCE_ID bigint, + ROUTE_POLICY varchar(16), + CORR_ID bigint, + primary key (MESSAGE_ROUTE_ID) +); + +create table BPEL_MEX_PROP ( + ID bigint generated by default as identity, + MEX_ID varchar(255), + PROP_KEY varchar(255), + PROP_VALUE varchar(2000), + primary key (ID) +); + +create table BPEL_PARTNER_LINK ( + PARTNER_LINK_ID bigint generated by default as identity, + MY_EPR clob(255), + MY_ROLE_NAME varchar(255), + MY_ROLE_SERVICE_NAME varchar(255), + MY_SESSION_ID varchar(255), + PARTNER_EPR clob(255), + PARTNER_LINK_MODEL_ID integer, + PARTNER_LINK_NAME varchar(255), + PARTNER_ROLE_NAME varchar(255), + PARTNER_SESSION_ID varchar(255), + SCOPE_ID bigint, + primary key (PARTNER_LINK_ID) +); + +create table BPEL_PROCESS ( + ID bigint generated by default as identity, + GUID varchar(255), + PROCESS_ID varchar(255), + PROCESS_TYPE varchar(255), + VERSION bigint, + primary key (ID) +); + +create table BPEL_PROCESS_INSTANCE ( + ID bigint generated by default as identity, + DATE_CREATED timestamp, + EXECUTION_STATE blob(255), + FAULT_ID bigint, + LAST_ACTIVE_TIME timestamp, + LAST_RECOVERY_DATE timestamp, + PREVIOUS_STATE smallint, + SEQUENCE bigint, + INSTANCE_STATE smallint, + INSTANTIATING_CORRELATOR_ID bigint, + PROCESS_ID bigint, + ROOT_SCOPE_ID bigint, + primary key (ID) +); + +create table BPEL_SCOPE ( + SCOPE_ID bigint generated by default as identity, + MODEL_ID integer, + SCOPE_NAME varchar(255), + SCOPE_STATE varchar(255), + PARENT_SCOPE_ID bigint, + PROCESS_INSTANCE_ID bigint, + primary key (SCOPE_ID) +); + +create table BPEL_XML_DATA ( + XML_DATA_ID bigint generated by default as identity, + DATA clob(255), + IS_SIMPLE_TYPE smallint, + NAME varchar(255), + SCOPE_ID bigint, + primary key (XML_DATA_ID) +); + +create table BPEL_XML_DATA_PROP ( + ID bigint generated by default as identity, + XML_DATA_ID bigint, + PROP_KEY varchar(255), + PROP_VALUE varchar(255), + primary key (ID) +); + +create table STORE_DU ( + NAME varchar(255) not null, + DEPLOYDT timestamp, + DEPLOYER varchar(255), + DIR varchar(255), + primary key (NAME) +); + +create table STORE_PROCESS ( + PID varchar(255) not null, + STATE varchar(255), + TYPE varchar(255), + VERSION bigint, + DU varchar(255), + primary key (PID) +); + +create table STORE_PROCESS_PROP ( + ID bigint generated by default as identity, + PROP_KEY varchar(255), + PROP_VAL varchar(255), + primary key (ID) +); + +create table STORE_PROC_TO_PROP ( + STORE_PROCESS_PID varchar(255) not null, + STORE_PROPERTY_ID bigint not null, + primary key (STORE_PROCESS_PID, STORE_PROPERTY_ID), + unique (STORE_PROPERTY_ID) +); + +create table STORE_VERSIONS ( + ID bigint generated by default as identity, + VERSION bigint, + primary key (ID) +); \ No newline at end of file

13 years, 8 months

1
0
0 / 0

riftsaw SVN: r915 - in trunk: console/bpel2svg and 1 other directory.

by riftsaw-commits＠lists.jboss.org

Author: jeff.yuchang Date: 2010-08-20 00:32:04 -0400 (Fri, 20 Aug 2010) New Revision: 915 Modified: trunk/console/bpel2svg/pom.xml trunk/pom.xml Log: * add junit dependency into bpel2svg module. * upgrade junit to 4.4 version. Modified: trunk/console/bpel2svg/pom.xml =================================================================== --- trunk/console/bpel2svg/pom.xml 2010-08-20 03:11:46 UTC (rev 914) +++ trunk/console/bpel2svg/pom.xml 2010-08-20 04:32:04 UTC (rev 915) @@ -115,13 +115,12 @@ <artifactId>xercesImpl</artifactId> <version>2.9.1</version> </dependency> + --> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>3.8.1</version> <scope>test</scope> </dependency> - --> </dependencies> <build> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-08-20 03:11:46 UTC (rev 914) +++ trunk/pom.xml 2010-08-20 04:32:04 UTC (rev 915) @@ -77,7 +77,7 @@ <riftsaw.engine.version>2.2.0-SNAPSHOT</riftsaw.engine.version> <bpel.console.version>2.1.2</bpel.console.version> <commons.logging.version>1.1.1</commons.logging.version> - <junit.version>3.8.1</junit.version> + <junit.version>4.4</junit.version> <jboss.version>5.1.0.GA</jboss.version> <log4j.version>1.2.14</log4j.version> <jbossesb.version>4.8</jbossesb.version>

13 years, 8 months

1
0
0 / 0

riftsaw SVN: r914 - in branches/ODE/RiftSaw-ODE-trunk: dao-jpa-hibernate/src/main/files/hibernate.cfg and 3 other directories.

by riftsaw-commits＠lists.jboss.org

Author: jeff.yuchang Date: 2010-08-19 23:11:46 -0400 (Thu, 19 Aug 2010) New Revision: 914 Added: branches/ODE/RiftSaw-ODE-trunk/dao-jpa-hibernate/src/main/files/hibernate.cfg/db2.properties branches/ODE/RiftSaw-ODE-trunk/dao-jpa-hibernate/src/main/scripts/simplesched-db2.sql Modified: branches/ODE/RiftSaw-ODE-trunk/dao-jpa-hibernate/build.xml branches/ODE/RiftSaw-ODE-trunk/dao-jpa-hibernate/src/main/resources/META-INF/persistence.xml branches/ODE/RiftSaw-ODE-trunk/scheduler-simple/src/main/java/org/apache/ode/scheduler/simple/SimpleScheduler.java Log: * RIFTSAW-269, Add DB2 scripts. Modified: branches/ODE/RiftSaw-ODE-trunk/dao-jpa-hibernate/build.xml =================================================================== --- branches/ODE/RiftSaw-ODE-trunk/dao-jpa-hibernate/build.xml 2010-08-19 07:40:54 UTC (rev 913) +++ branches/ODE/RiftSaw-ODE-trunk/dao-jpa-hibernate/build.xml 2010-08-20 03:11:46 UTC (rev 914) @@ -33,7 +33,7 @@ <mkdir dir="target/db" /> <mkdir dir="${db.scripts.dir}" /> - <create-ddl db="postgres"/> + <create-ddl db="db2"/> </target> Added: branches/ODE/RiftSaw-ODE-trunk/dao-jpa-hibernate/src/main/files/hibernate.cfg/db2.properties =================================================================== --- branches/ODE/RiftSaw-ODE-trunk/dao-jpa-hibernate/src/main/files/hibernate.cfg/db2.properties (rev 0) +++ branches/ODE/RiftSaw-ODE-trunk/dao-jpa-hibernate/src/main/files/hibernate.cfg/db2.properties 2010-08-20 03:11:46 UTC (rev 914) @@ -0,0 +1 @@ +dialect=org.hibernate.dialect.DB2Dialect \ No newline at end of file Modified: branches/ODE/RiftSaw-ODE-trunk/dao-jpa-hibernate/src/main/resources/META-INF/persistence.xml =================================================================== --- branches/ODE/RiftSaw-ODE-trunk/dao-jpa-hibernate/src/main/resources/META-INF/persistence.xml 2010-08-19 07:40:54 UTC (rev 913) +++ branches/ODE/RiftSaw-ODE-trunk/dao-jpa-hibernate/src/main/resources/META-INF/persistence.xml 2010-08-20 03:11:46 UTC (rev 914) @@ -47,7 +47,7 @@ <properties> <property name="hibernate.show_sql" value="false" /> - <property name="hibernate.dialect" value="org.hibernate.dialect.PostgreSQLDialect" /> + <property name="hibernate.dialect" value="org.hibernate.dialect.DB2Dialect" /> <property name="hibernate.connection.datasource" value="java:BPELDB" /> <property name="hibernate.transaction.factory_class" value="org.hibernate.transaction.JTATransactionFactory" /> <property name="hibernate.transaction.manager_lookup_class" value="org.hibernate.transaction.JBossTransactionManagerLookup" /> Added: branches/ODE/RiftSaw-ODE-trunk/dao-jpa-hibernate/src/main/scripts/simplesched-db2.sql =================================================================== --- branches/ODE/RiftSaw-ODE-trunk/dao-jpa-hibernate/src/main/scripts/simplesched-db2.sql (rev 0) +++ branches/ODE/RiftSaw-ODE-trunk/dao-jpa-hibernate/src/main/scripts/simplesched-db2.sql 2010-08-20 03:11:46 UTC (rev 914) @@ -0,0 +1,30 @@ +-- Apache ODE - SimpleScheduler Database Schema +-- +-- Apache Derby scripts by Maciej Szefler. +-- +-- + +CREATE TABLE ODE_JOB ( + jobid CHAR(64) NOT NULL DEFAULT '', + ts BIGINT NOT NULL DEFAULT 0, + nodeid char(64), + scheduled int NOT NULL DEFAULT 0, + transacted int NOT NULL DEFAULT 0, + + instanceId BIGINT, + mexId varchar(255), + processId varchar(255), + type varchar(255), + channel varchar(255), + correlatorId varchar(255), + correlationKeySet varchar(255), + retryCount int, + inMem int, + detailsExt blob(1073741823) NULL, + + PRIMARY KEY(jobid)); + +CREATE INDEX IDX_ODE_JOB_TS ON ODE_JOB(ts); +CREATE INDEX IDX_ODE_JOB_NODEID ON ODE_JOB(nodeid); + + Modified: branches/ODE/RiftSaw-ODE-trunk/scheduler-simple/src/main/java/org/apache/ode/scheduler/simple/SimpleScheduler.java =================================================================== --- branches/ODE/RiftSaw-ODE-trunk/scheduler-simple/src/main/java/org/apache/ode/scheduler/simple/SimpleScheduler.java 2010-08-19 07:40:54 UTC (rev 913) +++ branches/ODE/RiftSaw-ODE-trunk/scheduler-simple/src/main/java/org/apache/ode/scheduler/simple/SimpleScheduler.java 2010-08-20 03:11:46 UTC (rev 914) @@ -155,7 +155,7 @@ _immediateTransactionRetryLimit = getIntProperty(conf, "ode.scheduler.immediateTransactionRetryLimit", _immediateTransactionRetryLimit); _immediateTransactionRetryInterval = getLongProperty(conf, "ode.scheduler.immediateTransactionRetryInterval", _immediateTransactionRetryInterval); - _todo = new SchedulerThread(this); + _todo = new SchedulerThread(this); } public void setPollIntervalForPolledRunnable(long pollIntervalForPolledRunnable) { @@ -313,7 +313,9 @@ } while( immediateRetryCount-- > 0 ); } finally { // 0 restores the default value - _txm.setTransactionTimeout(0); + if (_txm != null) { + _txm.setTransactionTimeout(0); + } } throw ex; @@ -915,3 +917,5 @@ } } } + + \ No newline at end of file

13 years, 8 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

riftsaw-commits August 2010