June 2010 - riftsaw-commits - Jboss List Archives

by riftsaw-commits＠lists.jboss.org

Author: jeff.yuchang Date: 2010-06-03 22:26:43 -0400 (Thu, 03 Jun 2010) New Revision: 706 Modified: trunk/qa/hudson-riftsaw-db.sh Log: * remove the db schema once its finished the integration tests. Modified: trunk/qa/hudson-riftsaw-db.sh =================================================================== --- trunk/qa/hudson-riftsaw-db.sh 2010-06-03 18:54:03 UTC (rev 705) +++ trunk/qa/hudson-riftsaw-db.sh 2010-06-04 02:26:43 UTC (rev 706) @@ -40,3 +40,6 @@ #build the RiftSaw and run integration tests cd ../integration-tests mvn $ANT_PROPERTIES clean install -U + +# clean up the database +ant $ANT_PROPERTIES drop.riftsaw.schema

14 years, 6 months

1
0
0 / 0

Hudson build became unstable: Riftsaw-soa-p #38

by jboss-qa-internal＠redhat.com

See <http://hudson.qa.jboss.com/hudson/job/Riftsaw-soa-p/38/changes>

14 years, 6 months

1
3
0 / 0

riftsaw SVN: r705 - trunk.

by riftsaw-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2010-06-03 14:54:03 -0400 (Thu, 03 Jun 2010) New Revision: 705 Modified: trunk/pom.xml Log: Fix RIFTSAW-220: Update to console 2.1 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-06-03 15:13:16 UTC (rev 704) +++ trunk/pom.xml 2010-06-03 18:54:03 UTC (rev 705) @@ -74,7 +74,7 @@ <properties> <riftsaw.ode.version>2.1.0-SNAPSHOT</riftsaw.ode.version> <riftsaw.engine.version>2.1.0-CR1</riftsaw.engine.version> - <bpm.console.version>2.1-SNAPSHOT</bpm.console.version> + <bpm.console.version>2.1</bpm.console.version> <commons.logging.version>1.1.1</commons.logging.version> <junit.version>3.8.1</junit.version> <jboss.version>5.1.0.GA</jboss.version>

14 years, 6 months

1
0
0 / 0

RiftSaw-jbossws-cxf - Build # 42 - Still Failing!

by jboss-qa-internal＠redhat.com

RiftSaw-jbossws-cxf Build number 42 status: Still Failing Details available at http://hudson.jboss.org/hudson/job/RiftSaw-jbossws-cxf/42/ JBoss server log can be found at workspace, http://hudson.qa.jboss.com/hudson/view/RiftSaw/job/RiftSaw/ws/

14 years, 6 months

1
0
0 / 0

RiftSaw-jbossws-cxf - Build # 41 - Failure!

by jboss-qa-internal＠redhat.com

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

14 years, 6 months

1
0
0 / 0

riftsaw SVN: r704 - in trunk: docs/docbook/userguide/src/main/module and 63 other directories.

by riftsaw-commits＠lists.jboss.org

Author: objectiser Date: 2010-06-03 11:13:16 -0400 (Thu, 03 Jun 2010) New Revision: 704 Added: trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELSecureInvokeTestCase.java trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/bpelContent/ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/bpelContent/SecureHelloWorldWS.wsdl trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/bpelContent/SecureInvoke.bpel trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/bpelContent/SecureInvoke.wsdl trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/bpelContent/bpel-deploy.xml trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/bpelContent/etc/ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/bpelContent/etc/Client_Encrypt.properties trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/bpelContent/etc/Client_Sign.properties trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/bpelContent/jbossws-cxf-SecureHelloWorldPort.xml trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/bpelContent/keystore/ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/bpelContent/keystore/client-keystore.jks trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/bpelContent/keystore/client-truststore.jks trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/build.xml trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/messages/ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/messages/hello_request1.xml trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/messages/hello_response1.xml trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/war/ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/war/resources/ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/war/resources/WEB-INF/ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/war/resources/WEB-INF/classes/ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/war/resources/WEB-INF/etc/ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/war/resources/WEB-INF/etc/Server_Decrypt.properties trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/war/resources/WEB-INF/etc/Server_SignVerf.properties trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/war/resources/WEB-INF/jbossws-cxf.xml trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/war/resources/WEB-INF/keystore/ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/war/resources/WEB-INF/keystore/server-keystore.jks trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/war/resources/WEB-INF/keystore/server-truststore.jks trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/war/resources/WEB-INF/lib/ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/war/resources/WEB-INF/web.xml trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/war/src/ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/war/src/jws_handlers.xml trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/war/src/org/ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/war/src/org/jboss/ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/war/src/org/jboss/soa/ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/war/src/org/jboss/soa/bpel/ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/war/src/org/jboss/soa/bpel/examples/ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/war/src/org/jboss/soa/bpel/examples/jaxws/ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/war/src/org/jboss/soa/bpel/examples/jaxws/JAXWSHandler.java trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/war/src/org/jboss/soa/bpel/samples/ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/war/src/org/jboss/soa/bpel/samples/quickstart/ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/war/src/org/jboss/soa/bpel/samples/quickstart/secure_invoke/ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/war/src/org/jboss/soa/bpel/samples/quickstart/secure_invoke/SecureHelloWorldWS.java trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/war/src/org/jboss/test/ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/war/src/org/jboss/test/ws/ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/war/src/org/jboss/test/ws/jaxws/ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/war/src/org/jboss/test/ws/jaxws/samples/ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/war/src/org/jboss/test/ws/jaxws/samples/wsse/ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/war/src/org/jboss/test/ws/jaxws/samples/wsse/ClientUsernamePasswordCallback.java trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/war/src/org/jboss/test/ws/jaxws/samples/wsse/ServerUsernamePasswordCallback.java trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/war/view/ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/war/view/index.jsp trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/bpelContent/ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/bpelContent/HelloWorld.bpel trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/bpelContent/HelloWorld.wsdl trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/bpelContent/bpel-deploy.xml trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/bpelContent/etc/ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/bpelContent/etc/Server_Decrypt.properties trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/bpelContent/etc/Server_SignVerf.properties trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/bpelContent/jbossws-cxf.xml trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/bpelContent/jws_handlers.xml trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/bpelContent/keystore/ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/bpelContent/keystore/server-keystore.jks trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/bpelContent/keystore/server-truststore.jks trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/build.xml trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/client/ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/client/resources/ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/client/resources/etc/ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/client/resources/etc/Client_Encrypt.properties trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/client/resources/etc/Client_Sign.properties trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/client/resources/keystore/ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/client/resources/keystore/client-keystore.jks trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/client/resources/keystore/client-truststore.jks trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/client/resources/wssec.xml trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/client/src/ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/client/src/org/ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/client/src/org/jboss/ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/client/src/org/jboss/soa/ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/client/src/org/jboss/soa/bpel/ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/client/src/org/jboss/soa/bpel/examples/ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/client/src/org/jboss/soa/bpel/examples/jaxws/ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/client/src/org/jboss/soa/bpel/examples/jaxws/JAXWSDispatcherClient.java trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/client/src/org/jboss/test/ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/client/src/org/jboss/test/ws/ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/client/src/org/jboss/test/ws/jaxws/ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/client/src/org/jboss/test/ws/jaxws/samples/ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/client/src/org/jboss/test/ws/jaxws/samples/wsse/ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/client/src/org/jboss/test/ws/jaxws/samples/wsse/ClientUsernamePasswordCallback.java trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/client/src/org/jboss/test/ws/jaxws/samples/wsse/ServerUsernamePasswordCallback.java trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/messages/ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/messages/hello_request1.xml trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/server/ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/server/src/ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/server/src/org/ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/server/src/org/jboss/ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/server/src/org/jboss/soa/ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/server/src/org/jboss/soa/bpel/ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/server/src/org/jboss/soa/bpel/examples/ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/server/src/org/jboss/soa/bpel/examples/jaxws/ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/server/src/org/jboss/soa/bpel/examples/jaxws/JAXWSHandler.java trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/server/src/org/jboss/test/ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/server/src/org/jboss/test/ws/ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/server/src/org/jboss/test/ws/jaxws/ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/server/src/org/jboss/test/ws/jaxws/samples/ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/server/src/org/jboss/test/ws/jaxws/samples/wsse/ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/server/src/org/jboss/test/ws/jaxws/samples/wsse/ClientUsernamePasswordCallback.java trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/server/src/org/jboss/test/ws/jaxws/samples/wsse/ServerUsernamePasswordCallback.java trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/wssec.xml Modified: trunk/docs/docbook/gettingstartedguide/src/main/module/installation.xml trunk/docs/docbook/userguide/src/main/module/uddi.xml trunk/integration-tests/build.xml trunk/integration-tests/pom.xml Log: Updates to documentation - db drop note and uddi defaults. Added integration test for security (secure invoke). Modified: trunk/docs/docbook/gettingstartedguide/src/main/module/installation.xml =================================================================== --- trunk/docs/docbook/gettingstartedguide/src/main/module/installation.xml 2010-06-03 13:09:24 UTC (rev 703) +++ trunk/docs/docbook/gettingstartedguide/src/main/module/installation.xml 2010-06-03 15:13:16 UTC (rev 704) @@ -40,10 +40,16 @@ <note> <para> - If you have previously installed RiftSaw-2.0-M1, then you will need to undeploy this version using the - <emphasis>ant undeploy</emphasis> command from the <filename>install</filename> folder of the M1 - distribution. This is due to database schema changes. + If you have previously installed RiftSaw-2.0.0.Final, then you will need to drop the database schema + due to changes in the ODE db schema for version 1.3.4. This can be achieved using the scripts in the + <filename>${riftsaw}/db/sql</filename> folder, or running: </para> + <para> + ant -D{database} drop.riftsaw.schema + </para> + <para> + from the <filename>${riftsaw}/db</filename> folder. + </para> </note> <orderedlist> Modified: trunk/docs/docbook/userguide/src/main/module/uddi.xml =================================================================== --- trunk/docs/docbook/userguide/src/main/module/uddi.xml 2010-06-03 13:09:24 UTC (rev 703) +++ trunk/docs/docbook/userguide/src/main/module/uddi.xml 2010-06-03 15:13:16 UTC (rev 704) @@ -105,10 +105,10 @@ </row> <row> <entry>bpel.uddi.lookup</entry> - <entry>boolean (false)</entry> + <entry>boolean (true)</entry> <entry> If set to true, the creating process of the partner channel will do a lookup by serviceName in the - UDDI, and a WSDL Endpoint is retrieved. This WSDL Endpoint is the then used to obtain the WSDL. This + UDDI, and a WSDL Endpoint is retrieved. This WSDL Endpoint is then used to obtain the WSDL. This process makes it easier to move Endpoints around within your deployment, without having to update the partnerlink WSDL files in your bpel deployments. Note that an it is still a requirement to deploy the initial partnerlink WSDL file for each partnerLink. @@ -122,38 +122,40 @@ <section> <title>Default configurations</title> - <para>When RiftSaw is deployed to a JBossAS-5.1.0, jUDDI v3 is not installed, and therefor + <para>When RiftSaw is deployed to a JBossAS-5.1.0, jUDDI v3 is not installed, and therefore the UDDI integration is turned off (bpel.uddi.registration=false).</para> <para>When RiftSaw is deployed to JBossAS-5.1.0 + JBossESB-4.7, the UDDI integration is turned on. By default we use the jUDDI client library which ships with the JBossESB, which - is configured in the jbossesb.sar/esb.uddi.client.xml, with manager name 'test-manager'. The bpel.uddi.client.impl is set - to org.jboss.soa.bpel.uddi300.UDDI300RegistrationImpl. + is configured in the <filename>jbossesb.sar/esb.uddi.client.xml</filename>, + with manager name 'test-manager'. The <emphasis>bpel.uddi.client.impl</emphasis> is set + to <emphasis>org.jboss.soa.bpel.uddi300.UDDI300RegistrationImpl</emphasis>. </para> <para>When RiftSaw is deployed to SOA-P-5.0.0 (or JBossESB > 4.7) UDDI integration is - turned on and the bpel.uddi.client.impl is set to org.jboss.soa.bpel.uddi.UDDIRegistrationImpl. - Again the jbossesb.sar/esb.uddi.client.xml is used, with manager name 'esb.registry'. + turned on and the <emphasis>bpel.uddi.client.impl</emphasis> is set to + <emphasis>org.jboss.soa.bpel.uddi.UDDIRegistrationImpl</emphasis>. + Again the <filename>jbossesb.sar/esb.uddi.client.xml</filename> is used, with manager name 'esb.registry'. </para> </section> <section> <title>Other UDDI v3 Registries</title> - <para>Other UDDI v3 complaint registries can be used, however the UDDIv3 spec only requires + <para>Other UDDI v3 compliant registries can be used, however the UDDIv3 spec only requires communication using the UDDI WebServices. To set up SOAP based communication specify the JAXWS-Transport. At this point it makes sense to no longer use the the esb.uddi.client.xml, but rather use your - own bpel.uddi.client.xml. For more details please see the jUDDI v3 documentain. + own <emphasis>bpel.uddi.client.xml</emphasis>. For more details please see the jUDDI v3 documentation. </para> </section> <section> <title>UDDI Registry Entities and UDDI Seed Data</title> - <para>In the esb.uddi.client.xml a few properties are defined that are used by the Clerk at + <para>In the <filename>esb.uddi.client.xml</filename> a few properties are defined that are used by the Clerk at registration time. These settings of these values can be customized, however they must correspond to the UDDI seed data specified for the jbossesb publisher, in the - jbossesb-registry.sar/juddi_custom_install_data. So you will need to change it there as well. + <filename>jbossesb-registry.sar/juddi_custom_install_data</filename>. So you will need to change it there as well. </para> <para>The clerk is configured to use the jbossesb publisher and the <emphasis>keyDomain @@ -166,7 +168,7 @@ <para>The <emphasis>bindingDescription</emphasis> is set to "BPEL Endpoint deployed by Riftsaw".</para> - <para>Note that in SOA-P-5 the jbossesb-registry.sar/esb.uddi.xml contains a property + <para>Note that in SOA-P-5 the <filename>jbossesb-registry.sar/esb.uddi.xml</filename> contains a property <emphasis>juddi.seed.always</emphasis> which is set to "true". This means that that it is always trying to load the root seed data on startup of the server. It is recommended to turn this value to "false" once you are content with the UDDI Seed Data. Modified: trunk/integration-tests/build.xml =================================================================== --- trunk/integration-tests/build.xml 2010-06-03 13:09:24 UTC (rev 703) +++ trunk/integration-tests/build.xml 2010-06-03 15:13:16 UTC (rev 704) @@ -127,6 +127,7 @@ <ant antfile="src/test/resources/samples/Quickstart_bpel_hello_world_extended_timeout/build.xml" /> <ant antfile="src/test/resources/samples/Quickstart_bpel_hello_world_header_ode/build.xml" /> <ant antfile="src/test/resources/samples/Quickstart_bpel_hello_world_header_wsdl/build.xml" /> + <ant antfile="src/test/resources/samples/Quickstart_bpel_secure_invoke/build.xml" /> <ant antfile="src/test/resources/samples/Quickstart_bpel_simple_correlation/build.xml" /> <ant antfile="src/test/resources/samples/Quickstart_bpel_simple_correlation_with_oneway/build.xml" /> <ant antfile="src/test/resources/samples/Quickstart_bpel_simple_invoke/build.xml" /> Modified: trunk/integration-tests/pom.xml =================================================================== --- trunk/integration-tests/pom.xml 2010-06-03 13:09:24 UTC (rev 703) +++ trunk/integration-tests/pom.xml 2010-06-03 15:13:16 UTC (rev 704) @@ -252,6 +252,10 @@ <value>${basedir}/target/tests</value> </property> <property> + <name>ws.stack</name> + <value>${ws.stack}</value> + </property> + <property> <name>java.naming.factory.initial</name> <value>org.jnp.interfaces.NamingContextFactory</value> </property> Added: trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELSecureInvokeTestCase.java =================================================================== --- trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELSecureInvokeTestCase.java (rev 0) +++ trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELSecureInvokeTestCase.java 2010-06-03 15:13:16 UTC (rev 704) @@ -0,0 +1,67 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.soa.bpel.tests.samples; + +import org.jboss.soa.bpel.tests.RiftSawTest; +import org.jboss.soa.bpel.tests.RiftSawTestSetup; + +import junit.framework.Test; + +/** + * Test case for running the Quickstart_bpel_secure_invoke sample. + */ +public class QuickstartBPELSecureInvokeTestCase extends RiftSawTest { + + private static final String TEST_NAME = "Quickstart_bpel_secure_invoke"; + + public QuickstartBPELSecureInvokeTestCase() { + super(TEST_NAME); + } + + public static Test suite() { + if (System.getProperty("ws.stack","native").equals("cxf")) { + return(new RiftSawTestSetup(QuickstartBPELSecureInvokeTestCase.class, + TEST_NAME, "Quickstart_bpel_secure_invoke-1.jar,Quickstart_bpel_secure_invoke.war")); + } else { + return(null); + } + } + + public void testSendHello() throws Exception { + if (System.getProperty("ws.stack","native").equals("cxf") == false) { + return; + } + + String result=sendSOAPMessage("hello_request1.xml", + "http://localhost:8080/Quickstart_bpel_secure_invokeWS"); + + // If testing against cxf, then result is presented slightly differently + if (result.indexOf("SOAP-ENV") != -1) { + result = result.replaceAll("SOAP-ENV", "env"); + result = result.replaceAll(" xmlns=\"\"",""); + result = result.replaceAll("\"","'"); + result = result.replaceAll("<env:Header />","<env:Header></env:Header>"); + } + + assertMessageFromFile(result, "hello_response1.xml"); + } +} Added: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/bpelContent/SecureHelloWorldWS.wsdl =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/bpelContent/SecureHelloWorldWS.wsdl (rev 0) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/bpelContent/SecureHelloWorldWS.wsdl 2010-06-03 15:13:16 UTC (rev 704) @@ -0,0 +1,89 @@ +<?xml version="1.0" encoding="utf-8" ?> +<definitions name='SecureHelloWorldWSService' +targetNamespace='http://secure_invoke/helloworld' +xmlns='http://schemas.xmlsoap.org/wsdl/' +xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' +xmlns:tns='http://secure_invoke/helloworld' +xmlns:xsd='http://www.w3.org/2001/XMLSchema' +xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype" +> + <types> + <xs:schema targetNamespace='http://secure_invoke/helloworld' version='1.0' xmlns:tns='http://secure_invoke/helloworld' xmlns:xs='http://www.w3.org/2001/XMLSchema'> + <xs:element name='sayGoodbye' type='tns:sayGoodbye'/> + <xs:element name='sayGoodbyeResponse' type='tns:sayGoodbyeResponse'/> + <xs:element name='sayHello' type='tns:sayHello'/> + <xs:element name='sayHelloResponse' type='tns:sayHelloResponse'/> + <xs:complexType name='sayGoodbye'> + <xs:sequence> + <xs:element minOccurs='0' name='toWhom' type='xs:string'/> + </xs:sequence> + </xs:complexType> + <xs:complexType name='sayGoodbyeResponse'> + <xs:sequence> + <xs:element minOccurs='0' name='return' type='xs:string'/> + </xs:sequence> + </xs:complexType> + <xs:complexType name='sayHello'> + <xs:sequence> + <xs:element minOccurs='0' name='toWhom' type='xs:string'/> + </xs:sequence> + </xs:complexType> + <xs:complexType name='sayHelloResponse'> + <xs:sequence> + <xs:element minOccurs='0' name='return' type='xs:string'/> + </xs:sequence> + </xs:complexType> + </xs:schema> + </types> + <message name='HelloWorld_sayGoodbye'> + <part element='tns:sayGoodbye' name='sayGoodbye'></part> + </message> + <message name='HelloWorld_sayHello'> + <part element='tns:sayHello' name='sayHello'></part> + </message> + <message name='HelloWorld_sayHelloResponse'> + <part element='tns:sayHelloResponse' name='sayHelloResponse'></part> + </message> + <message name='HelloWorld_sayGoodbyeResponse'> + <part element='tns:sayGoodbyeResponse' name='sayGoodbyeResponse'></part> + </message> + <portType name='SecureHelloWorld'> + <operation name='sayGoodbye' parameterOrder='sayGoodbye'> + <input message='tns:HelloWorld_sayGoodbye'></input> + <output message='tns:HelloWorld_sayGoodbyeResponse'></output> + </operation> + <operation name='sayHello' parameterOrder='sayHello'> + <input message='tns:HelloWorld_sayHello'></input> + <output message='tns:HelloWorld_sayHelloResponse'></output> + </operation> + </portType> + <binding name='SecureHelloWorldBinding' type='tns:SecureHelloWorld'> + <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> + <operation name='sayGoodbye'> + <soap:operation soapAction=''/> + <input> + <soap:body use='literal'/> + </input> + <output> + <soap:body use='literal'/> + </output> + </operation> + <operation name='sayHello'> + <soap:operation soapAction=''/> + <input> + <soap:body use='literal'/> + </input> + <output> + <soap:body use='literal'/> + </output> + </operation> + </binding> + <service name='SecureHelloWorldWSService'> + <port binding='tns:SecureHelloWorldBinding' name='SecureHelloWorldPort'> + <soap:address location='http://127.0.0.1:8080/Quickstart_bpel_secure_invoke/SecureHelloWorldWS'/> + </port> + </service> + <plnk:partnerLinkType name="theExternalService_PartnerLinkType"> + <plnk:role name="callingTheExternalService" portType="tns:SecureHelloWorld"/> + </plnk:partnerLinkType> +</definitions> Added: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/bpelContent/SecureInvoke.bpel =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/bpelContent/SecureInvoke.bpel (rev 0) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/bpelContent/SecureInvoke.bpel 2010-06-03 15:13:16 UTC (rev 704) @@ -0,0 +1,96 @@ + +<process name="SecureInvoke" + targetNamespace="http://www.jboss.org/bpel/examples" + xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable" + xmlns:tns="http://www.jboss.org/bpel/examples" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:intf="http://www.jboss.org/bpel/examples/wsdl" + xmlns:intf2="http://secure_invoke/helloworld" + queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0" + expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"> + + <import location="SecureInvoke.wsdl" + namespace="http://www.jboss.org/bpel/examples/wsdl" + importType="http://schemas.xmlsoap.org/wsdl/" /> + + <import location="SecureHelloWorldWS.wsdl" + namespace="http://secure_invoke/helloworld" + importType="http://schemas.xmlsoap.org/wsdl/" /> + + <partnerLinks> + <partnerLink name="theClient_PartnerLink" + partnerLinkType="intf:myClientCalling_PartnerLinkType" + myRole="me" /> + <partnerLink name="theExternalService_PartnerLink" + partnerLinkType="intf2:theExternalService_PartnerLinkType" + partnerRole="callingTheExternalService" + initializePartnerRole="yes"/> + </partnerLinks> + + <variables> + <variable name="myVar" messageType="intf:GreetingTarget_Message"/> + <variable name="inVar" messageType="intf2:HelloWorld_sayHello"/> + <variable name="outVar" messageType="intf2:HelloWorld_sayHelloResponse"/> + <variable name="tempVar" type="xsd:string"/> + </variables> + + <sequence> + <receive + name="request" + partnerLink="theClient_PartnerLink" + portType="intf:SecureInvoke_PortType" + operation="sayHelloTo" + variable="myVar" + createInstance="yes"/> + + <assign name="assignRequestToHelloWorldWS"> +  + <copy> + <from><literal><intf2:sayHello><toWhom xmlns=""/></intf2:sayHello></literal></from> + <to variable="inVar" part="sayHello"/> + </copy> +  + <copy> + <from variable="myVar" part="ToWhom"/> + <to>$inVar.sayHello/toWhom</to> + </copy> + </assign> + + <invoke name="ICallTheExternalService" + partnerLink="theExternalService_PartnerLink" + portType="intf2:SecureHelloWorld" + operation="sayHello" + inputVariable="inVar" + outputVariable="outVar" + /> + + <assign name="assignResponseOfHelloWorldWS"> + <copy> + <from>concat($outVar.sayHelloResponse/return,' and BPEL')</from> + <to variable="myVar" part="ToWhom"/> + </copy> + </assign> + + <reply name="response" + partnerLink="theClient_PartnerLink" + portType="intf:SecureInvoke_PortType" + operation="sayHelloTo" + variable="myVar"/> + </sequence> +</process> Added: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/bpelContent/SecureInvoke.wsdl =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/bpelContent/SecureInvoke.wsdl (rev 0) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/bpelContent/SecureInvoke.wsdl 2010-06-03 15:13:16 UTC (rev 704) @@ -0,0 +1,66 @@ +<?xml version="1.0" encoding="utf-8" ?> + +<wsdl:definitions + targetNamespace="http://www.jboss.org/bpel/examples/wsdl" + xmlns="http://schemas.xmlsoap.org/wsdl/" + xmlns:tns="http://www.jboss.org/bpel/examples/wsdl" + xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" + xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype"> + + <wsdl:message name="GreetingTarget_Message"> + <wsdl:part name="ToWhom" type="xsd:string"/> + </wsdl:message> + + <wsdl:portType name="SecureInvoke_PortType"> + <wsdl:operation name="sayHelloTo"> + <wsdl:input message="tns:GreetingTarget_Message" name="TestIn"/> + <wsdl:output message="tns:GreetingTarget_Message" name="TestOut"/> + </wsdl:operation> + </wsdl:portType> + + <wsdl:binding name="SecureInvoke_SoapBinding" type="tns:SecureInvoke_PortType"> + <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/> + <wsdl:operation name="sayHelloTo"> + <soap:operation soapAction="" style="rpc"/> + <wsdl:input> + <soap:body + namespace="http://www.jboss.org/bpel/examples/wsdl" + use="literal"/> + </wsdl:input> + <wsdl:output> + <soap:body + namespace="http://www.jboss.org/bpel/examples/wsdl" + use="literal"/> + </wsdl:output> + </wsdl:operation> + </wsdl:binding> + <wsdl:service name="SecureInvoke_Service"> + <wsdl:port name="SecureInvoke_Port" binding="tns:SecureInvoke_SoapBinding"> + <soap:address location="http://localhost:8080/Quickstart_bpel_secure_invokeWS"/> + </wsdl:port> + </wsdl:service> + + <plnk:partnerLinkType name="myClientCalling_PartnerLinkType"> + <plnk:role name="me" portType="tns:SecureInvoke_PortType"/> + <plnk:role name="you" portType="tns:SecureInvoke_PortType"/> + </plnk:partnerLinkType> +</wsdl:definitions> + Added: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/bpelContent/bpel-deploy.xml =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/bpelContent/bpel-deploy.xml (rev 0) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/bpelContent/bpel-deploy.xml 2010-06-03 15:13:16 UTC (rev 704) @@ -0,0 +1,32 @@ + +<deploy xmlns="http://www.apache.org/ode/schemas/dd/2007/03" + xmlns:bpl="http://www.jboss.org/bpel/examples" + xmlns:intf="http://www.jboss.org/bpel/examples/wsdl" + xmlns:intf2="http://secure_invoke/helloworld"> + + <process name="bpl:SecureInvoke"> + <active>true</active> + <provide partnerLink="theClient_PartnerLink"> + <service name="intf:SecureInvoke_Service" port="SecureInvoke_Port"/> + </provide> + <invoke partnerLink="theExternalService_PartnerLink"> + <service name="intf2:SecureHelloWorldWSService" port="SecureHelloWorldPort"/> + </invoke> + </process> +</deploy> Added: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/bpelContent/etc/Client_Encrypt.properties =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/bpelContent/etc/Client_Encrypt.properties (rev 0) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/bpelContent/etc/Client_Encrypt.properties 2010-06-03 15:13:16 UTC (rev 704) @@ -0,0 +1,5 @@ +org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin +org.apache.ws.security.crypto.merlin.keystore.type=jks +org.apache.ws.security.crypto.merlin.keystore.password=storepassword +org.apache.ws.security.crypto.merlin.keystore.alias=serverx509v1 +org.apache.ws.security.crypto.merlin.file=keystore/client-truststore.jks \ No newline at end of file Added: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/bpelContent/etc/Client_Sign.properties =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/bpelContent/etc/Client_Sign.properties (rev 0) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/bpelContent/etc/Client_Sign.properties 2010-06-03 15:13:16 UTC (rev 704) @@ -0,0 +1,6 @@ +org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin +org.apache.ws.security.crypto.merlin.keystore.type=jks +org.apache.ws.security.crypto.merlin.keystore.password=storepassword +org.apache.ws.security.crypto.merlin.keystore.alias=clientx509v1 +org.apache.ws.security.crypto.merlin.file=keystore/client-keystore.jks + Added: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/bpelContent/jbossws-cxf-SecureHelloWorldPort.xml =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/bpelContent/jbossws-cxf-SecureHelloWorldPort.xml (rev 0) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/bpelContent/jbossws-cxf-SecureHelloWorldPort.xml 2010-06-03 15:13:16 UTC (rev 704) @@ -0,0 +1,79 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<beans xmlns="http://www.springframework.org/schema/beans" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:cxf="http://cxf.apache.org/core" + xmlns:wsa="http://cxf.apache.org/ws/addressing" + xmlns:http="http://cxf.apache.org/transports/http/configuration" + xmlns:wsrm-policy="http://schemas.xmlsoap.org/ws/2005/02/rm/policy" + xmlns:wsrm-mgr="http://cxf.apache.org/ws/rm/manager" + xmlns:beans='http://www.springframework.org/schema/beans' + xmlns:jaxws='http://cxf.apache.org/jaxws' + xmlns:ns1='http://secure_invoke/helloworld' + xsi:schemaLocation=" + http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd + http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd + http://schemas.xmlsoap.org/ws/2005/02/rm/policy http://schemas.xmlsoap.org/ws/2005/02/rm/wsrm-policy.xsd + http://cxf.apache.org/ws/rm/manager http://cxf.apache.org/schemas/configuration/wsrm-manager.xsd + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd"> + + <bean id="UsernameTokenSign_Request" class="org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor" + name="{http://secure_invoke/helloworld}SecureHelloWorldPort.Request" > + <constructor-arg> + <map> + <entry key="action" value="UsernameToken Timestamp Signature"/> + <entry key="passwordType" value="PasswordDigest"/> + <entry key="user" value="clientx509v1"/> + <entry key="passwordCallbackClass" value="org.jboss.test.ws.jaxws.samples.wsse.ClientUsernamePasswordCallback"/> + <entry key="signaturePropFile" value="etc/Client_Sign.properties"/> + <entry key="signatureKeyIdentifier" value="DirectReference"/> + <entry key="signatureParts" value="{Element}{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}Timestamp;{Element}{http://schemas.xmlsoap.org/soap/envelope/}Body"/> + </map> + </constructor-arg> + </bean> + + <bean id="UsernameTokenSign_Response" class="org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor" + name="{http://secure_invoke/helloworld}SecureHelloWorldPort.Response" > + <constructor-arg> + <map> + <entry key="action" value="UsernameToken Timestamp Signature"/> + <entry key="passwordType" value="PasswordText"/> + <entry key="user" value="serverx509v1"/> + <entry key="passwordCallbackClass" value="org.jboss.test.ws.jaxws.samples.wsse.ClientUsernamePasswordCallback"/> + <entry key="signaturePropFile" value="etc/Client_Encrypt.properties"/> + <entry key="signatureKeyIdentifier" value="DirectReference"/> + </map> + </constructor-arg> + </bean> + + + <cxf:bus> + <cxf:outInterceptors> + <ref bean="UsernameTokenSign_Request"/> + <bean class="org.apache.cxf.binding.soap.saaj.SAAJOutInterceptor"/> + </cxf:outInterceptors> + <cxf:inInterceptors> + <ref bean="UsernameTokenSign_Response"/> + <bean class="org.apache.cxf.binding.soap.saaj.SAAJInInterceptor"/> + </cxf:inInterceptors> + </cxf:bus> + +</beans> Added: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/bpelContent/keystore/client-keystore.jks =================================================================== (Binary files differ) Property changes on: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/bpelContent/keystore/client-keystore.jks ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/bpelContent/keystore/client-truststore.jks =================================================================== (Binary files differ) Property changes on: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/bpelContent/keystore/client-truststore.jks ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: 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 (rev 0) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/build.xml 2010-06-03 15:13:16 UTC (rev 704) @@ -0,0 +1,92 @@ +<project name="Quickstart_bpel_secure_invoke" default="deploy" basedir="."> + + <description> + ${ant.project.name} + ${line.separator} + </description> + + <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="deployers.dir" value="${server.dir}/deployers"/> + <property name="server.lib.dir" value="${server.dir}/lib"/> + + <property name="deploy.dir" value="${basedir}/target/tests"/> + <property name="test.dir" value="${basedir}/src/test/resources/samples/${ant.project.name}" /> + + <property name="sample.jar.name" value="${ant.project.name}-${version}.jar" /> + + <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="${deployers.dir}/jbossws.deployer" includes="*.jar" /> + </path> + <property name="compile-classpath" refid="compile-classpath"/> + + <copy file="${test.dir}/war/src/jws_handlers.xml" todir="${war.build.dir}" /> + + <condition property="cxf-ws-stack" > + <equals arg1="${ws.stack}" arg2="cxf" /> + </condition> + + <target name="deploywar" description="make war" if="cxf-ws-stack" > +  + <mkdir dir="${deploy.dir}/${ant.project.name}" /> + + <mkdir dir="${war.build.dir}" /> + <javac fork="true" srcdir="${test.dir}/war/src" destdir="${war.build.dir}" debug="true"> + <classpath> + <path refid="compile-classpath" /> + <fileset dir="${test.dir}/war/resources/WEB-INF/lib" includes="*.jar" /> + </classpath> + </javac> + +  + <war warfile="${deploy.dir}/${ant.project.name}/${ant.project.name}.war" + webxml="${test.dir}/war/resources/WEB-INF/web.xml"> + <webinf dir="${test.dir}/war/resources/WEB-INF"> + <include name="jboss-web.xml"/> + <include name="jbossws-cxf.xml"/> + </webinf> + <classes dir="${war.build.dir}"> + <include name="**/*.class" /> + <include name="**/*.xml" /> + </classes> + <classes dir="${test.dir}/war/resources/WEB-INF"> + <include name="etc/*"/> + <include name="keystore/*"/> + </classes> + <fileset dir="${test.dir}/war/view"> + <include name="**/*"/> + </fileset> + <classes dir="${test.dir}"> + <include name="juddi.properties"/> + </classes> + </war> + </target> + + <target name="undeploywar"> + <echo>Undeploy WAR</echo> + <delete file="${deploy.dir}/${ant.project.name}/${ant.project.name}.war"/> + </target> + + <target name="deploy" depends="deploywar" > + <echo>Deploy ${ant.project.name}</echo> + <jar destfile="${deploy.dir}/${ant.project.name}/${sample.jar.name}" > + <fileset dir="${test.dir}/bpelContent"/> + <fileset dir="${war.build.dir}"/> + </jar> + + <copy todir="${deploy.dir}/${ant.project.name}"> + <fileset dir="${test.dir}/messages"/> + </copy> + </target> + + <target name="undeploy" depends="undeploywar" > + <echo>Undeploy ${ant.project.name}</echo> + <delete file="${deploy.dir}/${sample.jar.name}" /> + </target> + +</project> Added: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/messages/hello_request1.xml =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/messages/hello_request1.xml (rev 0) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/messages/hello_request1.xml 2010-06-03 15:13:16 UTC (rev 704) @@ -0,0 +1,8 @@ +<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:wsdl="http://www.jboss.org/bpel/examples/wsdl"> + <soapenv:Header/> + <soapenv:Body> + <wsdl:sayHelloTo> + <ToWhom>ME</ToWhom> + </wsdl:sayHelloTo> + </soapenv:Body> +</soapenv:Envelope> Added: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/messages/hello_response1.xml =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/messages/hello_response1.xml (rev 0) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/messages/hello_response1.xml 2010-06-03 15:13:16 UTC (rev 704) @@ -0,0 +1 @@ +<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'><env:Header></env:Header><env:Body><odens:sayHelloToResponse xmlns:odens='http://www.jboss.org/bpel/examples/wsdl'><ToWhom>Secure Hello ME. Sincerely, JBossWS and BPEL</ToWhom></odens:sayHelloToResponse></env:Body></env:Envelope> \ No newline at end of file Added: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/war/resources/WEB-INF/etc/Server_Decrypt.properties =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/war/resources/WEB-INF/etc/Server_Decrypt.properties (rev 0) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/war/resources/WEB-INF/etc/Server_Decrypt.properties 2010-06-03 15:13:16 UTC (rev 704) @@ -0,0 +1,5 @@ +org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin +org.apache.ws.security.crypto.merlin.keystore.type=jks +org.apache.ws.security.crypto.merlin.keystore.password=storepassword +org.apache.ws.security.crypto.merlin.keystore.alias=serverx509v1 +org.apache.ws.security.crypto.merlin.file=keystore/server-keystore.jks Added: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/war/resources/WEB-INF/etc/Server_SignVerf.properties =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/war/resources/WEB-INF/etc/Server_SignVerf.properties (rev 0) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/war/resources/WEB-INF/etc/Server_SignVerf.properties 2010-06-03 15:13:16 UTC (rev 704) @@ -0,0 +1,5 @@ +org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin +org.apache.ws.security.crypto.merlin.keystore.type=jks +org.apache.ws.security.crypto.merlin.keystore.password=storepassword +org.apache.ws.security.crypto.merlin.keystore.alias=clientx509v1 +org.apache.ws.security.crypto.merlin.file=keystore/server-truststore.jks Added: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/war/resources/WEB-INF/jbossws-cxf.xml =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/war/resources/WEB-INF/jbossws-cxf.xml (rev 0) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/war/resources/WEB-INF/jbossws-cxf.xml 2010-06-03 15:13:16 UTC (rev 704) @@ -0,0 +1,55 @@ +<beans + xmlns='http://www.springframework.org/schema/beans' + xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' + xmlns:beans='http://www.springframework.org/schema/beans' + xmlns:jaxws='http://cxf.apache.org/jaxws' + xsi:schemaLocation='http://cxf.apache.org/core + http://cxf.apache.org/schemas/core.xsd + http://www.springframework.org/schema/beans + http://www.springframework.org/schema/beans/spring-beans-2.0.xsd + http://cxf.apache.org/jaxws + http://cxf.apache.org/schemas/jaxws.xsd'> + + <bean id="UsernameTokenSign_Request" class="org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor"> + <constructor-arg> + <map> + <entry key="action" value="UsernameToken Timestamp Signature"/> + <entry key="passwordType" value="PasswordDigest"/> + <entry key="user" value="serverx509v1"/> + <entry key="passwordCallbackClass" value="org.jboss.test.ws.jaxws.samples.wsse.ServerUsernamePasswordCallback"/> + <entry key="signaturePropFile" value="etc/Server_SignVerf.properties"/> + <entry key="signatureKeyIdentifier" value="DirectReference"/> + </map> + </constructor-arg> + </bean> + + <bean id="UsernameTokenSign_Response" class="org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor"> + <constructor-arg> + <map> + <entry key="action" value="UsernameToken Timestamp Signature"/> + <entry key="passwordType" value="PasswordText"/> + <entry key="user" value="serverx509v1"/> + <entry key="passwordCallbackClass" value="org.jboss.test.ws.jaxws.samples.wsse.ServerUsernamePasswordCallback"/> + <entry key="signaturePropFile" value="etc/Server_Decrypt.properties"/> + <entry key="signatureKeyIdentifier" value="DirectReference"/> + <entry key="signatureParts" value="{Element}{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}Timestamp;{Element}{http://schemas.xmlsoap.org/soap/envelope/}Body"/> + </map> + </constructor-arg> + </bean> + + <jaxws:endpoint + id='SecureHelloWorldWS' + address='http://@jboss.bind.address@:8080/Quickstart_bpel_secure_invoke/SecureHelloWorldWS' + implementor='org.jboss.soa.bpel.samples.quickstart.secure_invoke.SecureHelloWorldWS'> + <jaxws:inInterceptors> + <ref bean="UsernameTokenSign_Request"/> + <bean class="org.apache.cxf.binding.soap.saaj.SAAJInInterceptor"/> + </jaxws:inInterceptors> + <jaxws:outInterceptors> + <ref bean="UsernameTokenSign_Response"/> + <bean class="org.apache.cxf.binding.soap.saaj.SAAJOutInterceptor"/> + </jaxws:outInterceptors> + </jaxws:endpoint> + + +</beans> Added: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/war/resources/WEB-INF/keystore/server-keystore.jks =================================================================== (Binary files differ) Property changes on: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/war/resources/WEB-INF/keystore/server-keystore.jks ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/war/resources/WEB-INF/keystore/server-truststore.jks =================================================================== (Binary files differ) Property changes on: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/war/resources/WEB-INF/keystore/server-truststore.jks ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/war/resources/WEB-INF/web.xml =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/war/resources/WEB-INF/web.xml (rev 0) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/war/resources/WEB-INF/web.xml 2010-06-03 15:13:16 UTC (rev 704) @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" + version="2.4"> + + <servlet> + <servlet-name>SecureHelloWorldWS</servlet-name> + <servlet-class>org.jboss.soa.bpel.samples.quickstart.secure_invoke.SecureHelloWorldWS</servlet-class> + </servlet> + + <servlet-mapping> + <servlet-name>SecureHelloWorldWS</servlet-name> + <url-pattern>/SecureHelloWorldWS</url-pattern> + </servlet-mapping> + +</web-app> Added: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/war/src/jws_handlers.xml =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/war/src/jws_handlers.xml (rev 0) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/war/src/jws_handlers.xml 2010-06-03 15:13:16 UTC (rev 704) @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<handler-chains xmlns="http://java.sun.com/xml/ns/javaee" +xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" +xsi:schemaLocation="http://java.sun.com/xml/ns/javaee"> + <handler-chain> + <handler> + <handler-name>JAXWSHandler</handler-name> + <handler-class>org.jboss.soa.bpel.examples.jaxws.JAXWSHandler</handler-class> + <init-param> + <param-name>TestParam</param-name> + <param-value>TestValue</param-value> + </init-param> + </handler> + </handler-chain> +</handler-chains> Added: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/war/src/org/jboss/soa/bpel/examples/jaxws/JAXWSHandler.java =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/war/src/org/jboss/soa/bpel/examples/jaxws/JAXWSHandler.java (rev 0) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/war/src/org/jboss/soa/bpel/examples/jaxws/JAXWSHandler.java 2010-06-03 15:13:16 UTC (rev 704) @@ -0,0 +1,101 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2009, Red Hat Middleware LLC, and others contributors as indicated + * by the @authors tag. All rights reserved. + * See the copyright.txt in the distribution for a + * full listing of individual contributors. + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License, v. 2.1. + * This program is distributed in the hope that it will be useful, but WITHOUT A + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. + * You should have received a copy of the GNU Lesser General Public License, + * v.2.1 along with this distribution; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + */ +package org.jboss.soa.bpel.examples.jaxws; + +import java.io.PrintStream; +import java.util.Map; +import java.util.Set; + +import javax.xml.namespace.QName; +import javax.xml.soap.SOAPMessage; +import javax.xml.ws.handler.MessageContext; +import javax.xml.ws.handler.soap.SOAPHandler; +import javax.xml.ws.handler.soap.SOAPMessageContext; + +/** + * This class provides an example jaxws handler that can be deployed with + * a BPEL process, to provide visibility of messages inbound and outbound + * from the web service interface. + * + * @author gbrown + * + */ +public class JAXWSHandler implements SOAPHandler<SOAPMessageContext> { + + private PrintStream out; + + public JAXWSHandler() { + setLogStream(System.out); + } + + protected final void setLogStream(PrintStream ps) { + out = ps; + } + + public void init(Map c) { + System.out.println("JAXWSHandler : init() Called....:"+c); + } + + public Set<QName> getHeaders() { + return null; + } + + public boolean handleMessage(SOAPMessageContext smc) { + System.out.println("JAXWSHandler : handleMessage Called...."); + logToSystemOut(smc); + return true; + } + + public boolean handleFault(SOAPMessageContext smc) { + System.out.println("JAXWSHandler : handleFault Called...."); + logToSystemOut(smc); + return true; + } + + public void close(MessageContext messageContext) { + System.out.println("JAXWSHandler : close() Called...."); + } + + public void destroy() { + System.out.println("JAXWSHandler : destroy() Called...."); + } + + protected void logToSystemOut(SOAPMessageContext smc) { + Boolean outboundProperty = (Boolean) + smc.get(MessageContext.MESSAGE_OUTBOUND_PROPERTY); + + if (outboundProperty.booleanValue()) { + out.println("\nOutbound message:"); + } else { + out.println("\nInbound message:"); + } + + SOAPMessage message = smc.getMessage(); + try { + message.writeTo(out); + out.println(); + } catch (Exception e) { + out.println("Exception in handler: " + e); + } + + out.println("WSDL_SERVICE = "+smc.get(MessageContext.WSDL_SERVICE)); + out.println("WSDL_INTERFACE = "+smc.get(MessageContext.WSDL_INTERFACE)); + out.println("WSDL_PORT = "+smc.get(MessageContext.WSDL_PORT)); + out.println("WSDL_OPERATION = "+smc.get(MessageContext.WSDL_OPERATION)); + } +} Added: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/war/src/org/jboss/soa/bpel/samples/quickstart/secure_invoke/SecureHelloWorldWS.java =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/war/src/org/jboss/soa/bpel/samples/quickstart/secure_invoke/SecureHelloWorldWS.java (rev 0) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/war/src/org/jboss/soa/bpel/samples/quickstart/secure_invoke/SecureHelloWorldWS.java 2010-06-03 15:13:16 UTC (rev 704) @@ -0,0 +1,58 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2006, JBoss Inc., and others contributors as indicated + * by the @authors tag. All rights reserved. + * See the copyright.txt in the distribution for a + * full listing of individual contributors. + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License, v. 2.1. + * This program is distributed in the hope that it will be useful, but WITHOUT A + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. + * You should have received a copy of the GNU Lesser General Public License, + * v.2.1 along with this distribution; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + * + * (C) 2005-2006, + * @author JBoss Inc. + */ + +package org.jboss.soa.bpel.samples.quickstart.secure_invoke; + +import javax.jws.WebMethod; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; +import javax.jws.WebParam; +import javax.jws.*; + +@WebService(name = "SecureHelloWorld", targetNamespace = "http://secure_invoke/helloworld") +@HandlerChain(file="/jws_handlers.xml") +public class SecureHelloWorldWS +{ + @WebMethod + public String sayHello(@WebParam(name = "toWhom") + String toWhom) + { + System.out.println("\n"); + System.out.println("*************************************************"); + System.out.println("toWhom Parameter: " + toWhom ); + System.out.println("*************************************************"); + System.out.println("\n"); + String greeting = "Secure Hello " + toWhom + ". Sincerely, JBossWS"; + return greeting; + + } + + @WebMethod + public String sayGoodbye(@WebParam(name = "toWhom") + String toWhom) + { + + String greeting = "Secure Goodbye Cruel World, sincerely '" + toWhom + "' at " + new java.util.Date(); + + return greeting; + + } +} Added: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/war/src/org/jboss/test/ws/jaxws/samples/wsse/ClientUsernamePasswordCallback.java =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/war/src/org/jboss/test/ws/jaxws/samples/wsse/ClientUsernamePasswordCallback.java (rev 0) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/war/src/org/jboss/test/ws/jaxws/samples/wsse/ClientUsernamePasswordCallback.java 2010-06-03 15:13:16 UTC (rev 704) @@ -0,0 +1,75 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.jboss.test.ws.jaxws.samples.wsse; + +import java.io.IOException; +import java.util.HashMap; +import java.util.Map; + +import javax.security.auth.callback.Callback; +import javax.security.auth.callback.CallbackHandler; +import javax.security.auth.callback.UnsupportedCallbackException; + +import org.apache.ws.security.WSPasswordCallback; + +/** + */ + +public class ClientUsernamePasswordCallback implements CallbackHandler { + + private Map<String, String> passwords = + new HashMap<String, String>(); + + public ClientUsernamePasswordCallback() { + passwords.put("Alice", "ecilA"); + passwords.put("abcd", "dcba"); + passwords.put("clientx509v1", "storepassword"); + passwords.put("serverx509v1", "storepassword"); + } + + /** + * Here, we attempt to get the password from the private + * alias/passwords map. + */ + public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException { + for (int i = 0; i < callbacks.length; i++) { + WSPasswordCallback pc = (WSPasswordCallback)callbacks[i]; + + System.out.println("**************** Client checking id: "+pc.getIdentifer()); + + String pass = passwords.get(pc.getIdentifier()); + if (pass != null) { + pc.setPassword(pass); + return; + } + } + + // + // Password not found + // + throw new IOException(); + } + + /** + * Add an alias/password pair to the callback mechanism. + */ + public void setAliasPassword(String alias, String password) { + passwords.put(alias, password); + } +} Added: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/war/src/org/jboss/test/ws/jaxws/samples/wsse/ServerUsernamePasswordCallback.java =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/war/src/org/jboss/test/ws/jaxws/samples/wsse/ServerUsernamePasswordCallback.java (rev 0) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/war/src/org/jboss/test/ws/jaxws/samples/wsse/ServerUsernamePasswordCallback.java 2010-06-03 15:13:16 UTC (rev 704) @@ -0,0 +1,73 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.samples.wsse; + +import java.io.IOException; +import java.util.*; + +import javax.security.auth.callback.Callback; +import javax.security.auth.callback.CallbackHandler; +import javax.security.auth.callback.UnsupportedCallbackException; +import org.apache.ws.security.WSPasswordCallback; + +public class ServerUsernamePasswordCallback implements CallbackHandler +{ + private Map<String, String> passwords = + new HashMap<String, String>(); + + public ServerUsernamePasswordCallback() { + passwords.put("Alice", "ecilA"); + passwords.put("abcd", "dcba"); + passwords.put("clientx509v1", "storepassword"); + passwords.put("serverx509v1", "storepassword"); + } + + /** + * Here, we attempt to get the password from the private + * alias/passwords map. + */ + public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException { + for (int i = 0; i < callbacks.length; i++) { + WSPasswordCallback pc = (WSPasswordCallback)callbacks[i]; + + System.out.println("**************** Server checking id: "+pc.getIdentifer()); + + String pass = passwords.get(pc.getIdentifier()); + if (pass != null) { + pc.setPassword(pass); + return; + } + } + + // + // Password not found + // + throw new IOException(); + } + + /** + * Add an alias/password pair to the callback mechanism. + */ + public void setAliasPassword(String alias, String password) { + passwords.put(alias, password); + } +} Added: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/war/view/index.jsp =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/war/view/index.jsp (rev 0) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/war/view/index.jsp 2010-06-03 15:13:16 UTC (rev 704) @@ -0,0 +1,9 @@ +<html> + <body> + This is just a place holder.<br> + Verify the that the WS has been deployed by hitting + <a href="http://localhost:8080/jbossws"> + http://localhost:8080/jbossws + </a> + </body> +</html> \ No newline at end of file Added: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/bpelContent/HelloWorld.bpel =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/bpelContent/HelloWorld.bpel (rev 0) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/bpelContent/HelloWorld.bpel 2010-06-03 15:13:16 UTC (rev 704) @@ -0,0 +1,69 @@ + +<process name="SecureHelloWorld" + targetNamespace="http://www.jboss.org/bpel/examples" + xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable" + xmlns:tns="http://www.jboss.org/bpel/examples" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:intf="http://www.jboss.org/bpel/examples/wsdl" + queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0" + expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0" xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable"> + + <import location="HelloWorld.wsdl" + namespace="http://www.jboss.org/bpel/examples/wsdl" + importType="http://schemas.xmlsoap.org/wsdl/" /> + + <partnerLinks> + <partnerLink name="helloPartnerLink" + partnerLinkType="intf:SecureHelloPartnerLinkType" + myRole="me" /> + </partnerLinks> + + <variables> + <variable name="reqVar" messageType="intf:HelloMessage"/> + <variable name="respVar" messageType="intf:HelloMessage"/> + <variable name="mesgVar" type="xsd:string"/> + </variables> + + <sequence> + <receive + name="start" + partnerLink="helloPartnerLink" + portType="intf:SecureHelloPortType" + operation="hello" + variable="reqVar" + createInstance="yes"/> + + <assign name="assignHelloMesg"> + <copy> + <from variable="reqVar" part="TestPart"/> + <to variable="mesgVar"/> + </copy> + <copy> + <from>concat($mesgVar,' World')</from> + <to variable="respVar" part="TestPart"/> + </copy> + </assign> + <reply name="end" + partnerLink="helloPartnerLink" + portType="intf:SecureHelloPortType" + operation="hello" + variable="respVar"/> + </sequence> +</process> Added: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/bpelContent/HelloWorld.wsdl =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/bpelContent/HelloWorld.wsdl (rev 0) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/bpelContent/HelloWorld.wsdl 2010-06-03 15:13:16 UTC (rev 704) @@ -0,0 +1,67 @@ +<?xml version="1.0" encoding="utf-8" ?> + +<wsdl:definitions + targetNamespace="http://www.jboss.org/bpel/examples/wsdl" + xmlns="http://schemas.xmlsoap.org/wsdl/" + xmlns:tns="http://www.jboss.org/bpel/examples/wsdl" + xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" + xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype"> + + <wsdl:message name="HelloMessage"> + <wsdl:part name="TestPart" type="xsd:string"/> + </wsdl:message> + + <wsdl:portType name="SecureHelloPortType"> + <wsdl:operation name="hello"> + <wsdl:input message="tns:HelloMessage" name="TestIn"/> + <wsdl:output message="tns:HelloMessage" name="TestOut"/> + </wsdl:operation> + </wsdl:portType> + + <wsdl:binding name="SecureHelloSoapBinding" type="tns:SecureHelloPortType"> + <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/> + <wsdl:operation name="hello"> + <soap:operation soapAction="" style="rpc"/> + <wsdl:input> + <soap:body + namespace="http://www.jboss.org/bpel/examples/wsdl" + use="literal"/> + </wsdl:input> + <wsdl:output> + <soap:body + namespace="http://www.jboss.org/bpel/examples/wsdl" + use="literal"/> + </wsdl:output> + </wsdl:operation> + </wsdl:binding> + <wsdl:service name="SecureHelloService"> + <wsdl:port name="SecureHelloPort" binding="tns:SecureHelloSoapBinding"> + <soap:address location="http://localhost:8080/Quickstart_bpel_secure_serviceWS"/> + </wsdl:port> + </wsdl:service> + + <plnk:partnerLinkType name="SecureHelloPartnerLinkType"> + <plnk:role name="me" portType="tns:SecureHelloPortType"/> + <plnk:role name="you" portType="tns:SecureHelloPortType"/> + </plnk:partnerLinkType> +</wsdl:definitions> + Added: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/bpelContent/bpel-deploy.xml =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/bpelContent/bpel-deploy.xml (rev 0) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/bpelContent/bpel-deploy.xml 2010-06-03 15:13:16 UTC (rev 704) @@ -0,0 +1,30 @@ + +<deploy xmlns="http://www.apache.org/ode/schemas/dd/2007/03" + xmlns:bpl="http://www.jboss.org/bpel/examples" + xmlns:intf="http://www.jboss.org/bpel/examples/wsdl"> + + + <process name="bpl:SecureHelloWorld"> + <active>true</active> + <provide partnerLink="helloPartnerLink"> + <service name="intf:SecureHelloService" port="SecureHelloPort"/> + </provide> + </process> +</deploy> Added: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/bpelContent/etc/Server_Decrypt.properties =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/bpelContent/etc/Server_Decrypt.properties (rev 0) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/bpelContent/etc/Server_Decrypt.properties 2010-06-03 15:13:16 UTC (rev 704) @@ -0,0 +1,5 @@ +org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin +org.apache.ws.security.crypto.merlin.keystore.type=jks +org.apache.ws.security.crypto.merlin.keystore.password=storepassword +org.apache.ws.security.crypto.merlin.keystore.alias=serverx509v1 +org.apache.ws.security.crypto.merlin.file=keystore/server-keystore.jks \ No newline at end of file Added: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/bpelContent/etc/Server_SignVerf.properties =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/bpelContent/etc/Server_SignVerf.properties (rev 0) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/bpelContent/etc/Server_SignVerf.properties 2010-06-03 15:13:16 UTC (rev 704) @@ -0,0 +1,5 @@ +org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin +org.apache.ws.security.crypto.merlin.keystore.type=jks +org.apache.ws.security.crypto.merlin.keystore.password=storepassword +org.apache.ws.security.crypto.merlin.keystore.alias=clientx509v1 +org.apache.ws.security.crypto.merlin.file=keystore/server-truststore.jks Added: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/bpelContent/jbossws-cxf.xml =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/bpelContent/jbossws-cxf.xml (rev 0) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/bpelContent/jbossws-cxf.xml 2010-06-03 15:13:16 UTC (rev 704) @@ -0,0 +1,55 @@ +<beans + xmlns='http://www.springframework.org/schema/beans' + xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' + xmlns:beans='http://www.springframework.org/schema/beans' + xmlns:jaxws='http://cxf.apache.org/jaxws' + xsi:schemaLocation='http://cxf.apache.org/core + http://cxf.apache.org/schemas/core.xsd + http://www.springframework.org/schema/beans + http://www.springframework.org/schema/beans/spring-beans-2.0.xsd + http://cxf.apache.org/jaxws + http://cxf.apache.org/schemas/jaxws.xsd'> + + <bean id="UsernameTokenSign_Request" class="org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor"> + <constructor-arg> + <map> + <entry key="action" value="UsernameToken Timestamp Signature"/> + <entry key="passwordType" value="PasswordDigest"/> + <entry key="user" value="serverx509v1"/> + <entry key="passwordCallbackClass" value="org.jboss.test.ws.jaxws.samples.wsse.ServerUsernamePasswordCallback"/> + <entry key="signaturePropFile" value="etc/Server_SignVerf.properties"/> + <entry key="signatureKeyIdentifier" value="DirectReference"/> + </map> + </constructor-arg> + </bean> + + <bean id="UsernameTokenSign_Response" class="org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor"> + <constructor-arg> + <map> + <entry key="action" value="UsernameToken Timestamp Signature"/> + <entry key="passwordType" value="PasswordText"/> + <entry key="user" value="serverx509v1"/> + <entry key="passwordCallbackClass" value="org.jboss.test.ws.jaxws.samples.wsse.ServerUsernamePasswordCallback"/> + <entry key="signaturePropFile" value="etc/Server_Decrypt.properties"/> + <entry key="signatureKeyIdentifier" value="DirectReference"/> + <entry key="signatureParts" value="{Element}{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}Timestamp;{Element}{http://schemas.xmlsoap.org/soap/envelope/}Body"/> + </map> + </constructor-arg> + </bean> + + <jaxws:endpoint + id='SecureHelloWorldWS' + address='http://@jboss.bind.address@:8080/Quickstart_bpel_secure_serviceWS' + implementor='@provider@'> + <jaxws:inInterceptors> + <ref bean="UsernameTokenSign_Request"/> + <bean class="org.apache.cxf.binding.soap.saaj.SAAJInInterceptor"/> + </jaxws:inInterceptors> + <jaxws:outInterceptors> + <ref bean="UsernameTokenSign_Response"/> + <bean class="org.apache.cxf.binding.soap.saaj.SAAJOutInterceptor"/> + </jaxws:outInterceptors> + </jaxws:endpoint> + + +</beans> Added: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/bpelContent/jws_handlers.xml =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/bpelContent/jws_handlers.xml (rev 0) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/bpelContent/jws_handlers.xml 2010-06-03 15:13:16 UTC (rev 704) @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<handler-chains xmlns="http://java.sun.com/xml/ns/javaee" +xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" +xsi:schemaLocation="http://java.sun.com/xml/ns/javaee"> + <handler-chain> + <handler> + <handler-name>JAXWSHandler</handler-name> + <handler-class>org.jboss.soa.bpel.examples.jaxws.JAXWSHandler</handler-class> + <init-param> + <param-name>TestParam</param-name> + <param-value>TestValue</param-value> + </init-param> + </handler> + </handler-chain> +</handler-chains> Added: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/bpelContent/keystore/server-keystore.jks =================================================================== (Binary files differ) Property changes on: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/bpelContent/keystore/server-keystore.jks ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/bpelContent/keystore/server-truststore.jks =================================================================== (Binary files differ) Property changes on: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/bpelContent/keystore/server-truststore.jks ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: 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 (rev 0) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/build.xml 2010-06-03 15:13:16 UTC (rev 704) @@ -0,0 +1,76 @@ +<project name="Quickstart_bpel_secure_service" default="deploy" basedir="."> + + <description> + ${ant.project.name} + ${line.separator} + </description> + + <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="deployers.dir" value="${server.dir}/deployers"/> + <property name="server.lib.dir" value="${server.dir}/lib"/> + + <property name="deploy.dir" value="${basedir}/target/tests"/> + <property name="test.dir" value="${basedir}/src/test/resources/samples/${ant.project.name}" /> + + <property name="sample.jar.name" value="${ant.project.name}-${version}.jar" /> + + <property name="server.build.dir" location="${deploy.dir}/${ant.project.name}/build/server"/> + <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="${deployers.dir}/jbossws.deployer" includes="*.jar" /> + </path> + <property name="compile-classpath" refid="compile-classpath"/> + + <target name="compileserver" description="build server code"> +  + <mkdir dir="${server.build.dir}" /> + <javac fork="true" srcdir="${test.dir}/server/src" destdir="${server.build.dir}" debug="true"> + <classpath> + <path refid="compile-classpath" /> + </classpath> + </javac> + </target> + + <target name="deploy" depends="compileserver" > + <echo>Deploy ${ant.project.name}</echo> + <jar destfile="${deploy.dir}/${sample.jar.name}" > + <fileset dir="${test.dir}/bpelContent"/> + <fileset dir="${server.build.dir}"/> + </jar> + </target> + + <target name="undeploy"> + <echo>Undeploy ${ant.project.name}</echo> + <delete file="${deploy.dir}/${sample.jar.name}" /> + </target> + + <target name="makeclient" description="make client"> +  + <mkdir dir="${client.build.dir}" /> + <javac fork="true" srcdir="${test.dir}/client/src" destdir="${client.build.dir}" debug="true"> + <classpath> + <path refid="compile-classpath" /> + </classpath> + </javac> + </target> + + <target name="sendhello" description="run jaxws static client" depends="makeclient" > + <java classname="org.jboss.soa.bpel.examples.jaxws.JAXWSDispatcherClient" fork="yes" > + <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> + </java> + </target> + +</project> Added: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/client/resources/etc/Client_Encrypt.properties =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/client/resources/etc/Client_Encrypt.properties (rev 0) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/client/resources/etc/Client_Encrypt.properties 2010-06-03 15:13:16 UTC (rev 704) @@ -0,0 +1,5 @@ +org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin +org.apache.ws.security.crypto.merlin.keystore.type=jks +org.apache.ws.security.crypto.merlin.keystore.password=storepassword +org.apache.ws.security.crypto.merlin.keystore.alias=serverx509v1 +org.apache.ws.security.crypto.merlin.file=keystore/client-truststore.jks \ No newline at end of file Added: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/client/resources/etc/Client_Sign.properties =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/client/resources/etc/Client_Sign.properties (rev 0) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/client/resources/etc/Client_Sign.properties 2010-06-03 15:13:16 UTC (rev 704) @@ -0,0 +1,6 @@ +org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin +org.apache.ws.security.crypto.merlin.keystore.type=jks +org.apache.ws.security.crypto.merlin.keystore.password=storepassword +org.apache.ws.security.crypto.merlin.keystore.alias=clientx509v1 +org.apache.ws.security.crypto.merlin.file=keystore/client-keystore.jks + Added: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/client/resources/keystore/client-keystore.jks =================================================================== (Binary files differ) Property changes on: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/client/resources/keystore/client-keystore.jks ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/client/resources/keystore/client-truststore.jks =================================================================== (Binary files differ) Property changes on: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/client/resources/keystore/client-truststore.jks ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/client/resources/wssec.xml =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/client/resources/wssec.xml (rev 0) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/client/resources/wssec.xml 2010-06-03 15:13:16 UTC (rev 704) @@ -0,0 +1,79 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<beans xmlns="http://www.springframework.org/schema/beans" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:cxf="http://cxf.apache.org/core" + xmlns:wsa="http://cxf.apache.org/ws/addressing" + xmlns:http="http://cxf.apache.org/transports/http/configuration" + xmlns:wsrm-policy="http://schemas.xmlsoap.org/ws/2005/02/rm/policy" + xmlns:wsrm-mgr="http://cxf.apache.org/ws/rm/manager" + xmlns:beans='http://www.springframework.org/schema/beans' + xmlns:jaxws='http://cxf.apache.org/jaxws' + xmlns:ns1='http://secure_invoke/helloworld' + xsi:schemaLocation=" + http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd + http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd + http://schemas.xmlsoap.org/ws/2005/02/rm/policy http://schemas.xmlsoap.org/ws/2005/02/rm/wsrm-policy.xsd + http://cxf.apache.org/ws/rm/manager http://cxf.apache.org/schemas/configuration/wsrm-manager.xsd + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd"> + + <bean id="UsernameTokenSign_Request" class="org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor" + name="{http://secure_invoke/helloworld}SecureHelloWorldPort.Request" > + <constructor-arg> + <map> + <entry key="action" value="UsernameToken Timestamp Signature"/> + <entry key="passwordType" value="PasswordDigest"/> + <entry key="user" value="clientx509v1"/> + <entry key="passwordCallbackClass" value="org.jboss.test.ws.jaxws.samples.wsse.ClientUsernamePasswordCallback"/> + <entry key="signaturePropFile" value="etc/Client_Sign.properties"/> + <entry key="signatureKeyIdentifier" value="DirectReference"/> + <entry key="signatureParts" value="{Element}{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}Timestamp;{Element}{http://schemas.xmlsoap.org/soap/envelope/}Body"/> + </map> + </constructor-arg> + </bean> + + <bean id="UsernameTokenSign_Response" class="org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor" + name="{http://secure_invoke/helloworld}SecureHelloWorldPort.Response" > + <constructor-arg> + <map> + <entry key="action" value="UsernameToken Timestamp Signature"/> + <entry key="passwordType" value="PasswordText"/> + <entry key="user" value="serverx509v1"/> + <entry key="passwordCallbackClass" value="org.jboss.test.ws.jaxws.samples.wsse.ClientUsernamePasswordCallback"/> + <entry key="signaturePropFile" value="etc/Client_Encrypt.properties"/> + <entry key="signatureKeyIdentifier" value="DirectReference"/> + </map> + </constructor-arg> + </bean> + + + <cxf:bus> + <cxf:outInterceptors> + <ref bean="UsernameTokenSign_Request"/> + <bean class="org.apache.cxf.binding.soap.saaj.SAAJOutInterceptor"/> + </cxf:outInterceptors> + <cxf:inInterceptors> + <ref bean="UsernameTokenSign_Response"/> + <bean class="org.apache.cxf.binding.soap.saaj.SAAJInInterceptor"/> + </cxf:inInterceptors> + </cxf:bus> + +</beans> Added: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/client/src/org/jboss/soa/bpel/examples/jaxws/JAXWSDispatcherClient.java =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/client/src/org/jboss/soa/bpel/examples/jaxws/JAXWSDispatcherClient.java (rev 0) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/client/src/org/jboss/soa/bpel/examples/jaxws/JAXWSDispatcherClient.java 2010-06-03 15:13:16 UTC (rev 704) @@ -0,0 +1,90 @@ + +package org.jboss.soa.bpel.examples.jaxws; + +/** + * Please modify this class to meet your needs + * This class is not complete + */ + +import java.io.File; +import java.net.MalformedURLException; +import java.net.URL; +import java.util.HashMap; +import java.util.Map; + +import javax.xml.namespace.QName; +import javax.xml.soap.MessageFactory; +import javax.xml.soap.SOAPMessage; +import javax.xml.ws.Dispatch; +import javax.xml.ws.Service; + +import org.apache.cxf.Bus; +import org.apache.cxf.bus.spring.SpringBusFactory; +import org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor; +import org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor; + +/** + * This class was generated by Apache CXF 2.2.6 + * Thu May 06 14:29:08 BST 2010 + * Generated source version: 2.2.6 + * + */ + +public final class JAXWSDispatcherClient { + + private static final QName SERVICE_NAME = new QName("http://www.jboss.org/bpel/examples/wsdl", "SecureHelloService"); + + private JAXWSDispatcherClient() { + } + + public static void main(String args[]) throws Exception { + URL wsdlURL = null; + + if (args.length != 2) { + System.err.println("Usage: JAXWSDispatcherClient wsdlURL messageFile"); + System.exit(1); + } + + File wsdlFile = new File(args[0]); + try { + if (wsdlFile.exists()) { + wsdlURL = wsdlFile.toURI().toURL(); + } else { + wsdlURL = new URL(args[0]); + } + } catch (MalformedURLException e) { + e.printStackTrace(); + System.exit(2); + } + + SpringBusFactory bf = new SpringBusFactory(); + URL busFile = ClassLoader.getSystemResource("wssec.xml"); + Bus bus = bf.createBus(busFile.toString()); + bf.setDefaultBus(bus); + + QName portName=new QName("http://www.jboss.org/bpel/examples/wsdl", "SecureHelloPort"); + + + Service service = Service.create(wsdlURL, SERVICE_NAME); + Dispatch<SOAPMessage> dispatcher = service.createDispatch( + portName, + SOAPMessage.class, + Service.Mode.MESSAGE + ); + + MessageFactory factory = MessageFactory.newInstance(); + + String str="<soapenv:Envelope xmlns:soapenv=\"http://schemas.xmlsoap.org/soap/envelope/\" xmlns:wsdl=\"http://www.jboss.org/bpel/examples/wsdl\">"+ + "<soapenv:Header/><soapenv:Body><wsdl:hello><TestPart>Hello</TestPart></wsdl:hello></soapenv:Body></soapenv:Envelope>"; + java.io.InputStream is=new java.io.ByteArrayInputStream(str.getBytes()); + + SOAPMessage soapReq1 = factory.createMessage(null, is); + + System.out.println("Invoking server through Dispatch interface using SOAPMessage"); + SOAPMessage soapResp = dispatcher.invoke(soapReq1); + System.out.println("Response from server: " + soapResp.getSOAPBody().getTextContent()); + + System.exit(0); + } + +} Added: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/client/src/org/jboss/test/ws/jaxws/samples/wsse/ClientUsernamePasswordCallback.java =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/client/src/org/jboss/test/ws/jaxws/samples/wsse/ClientUsernamePasswordCallback.java (rev 0) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/client/src/org/jboss/test/ws/jaxws/samples/wsse/ClientUsernamePasswordCallback.java 2010-06-03 15:13:16 UTC (rev 704) @@ -0,0 +1,73 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.jboss.test.ws.jaxws.samples.wsse; + +import java.io.IOException; +import java.util.HashMap; +import java.util.Map; + +import javax.security.auth.callback.Callback; +import javax.security.auth.callback.CallbackHandler; +import javax.security.auth.callback.UnsupportedCallbackException; + +import org.apache.ws.security.WSPasswordCallback; + +/** + */ + +public class ClientUsernamePasswordCallback implements CallbackHandler { + + private Map<String, String> passwords = + new HashMap<String, String>(); + + public ClientUsernamePasswordCallback() { + passwords.put("Alice", "ecilA"); + passwords.put("abcd", "dcba"); + passwords.put("clientx509v1", "storepassword"); + passwords.put("serverx509v1", "storepassword"); + } + + /** + * Here, we attempt to get the password from the private + * alias/passwords map. + */ + public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException { + for (int i = 0; i < callbacks.length; i++) { + WSPasswordCallback pc = (WSPasswordCallback)callbacks[i]; + + String pass = passwords.get(pc.getIdentifier()); + if (pass != null) { + pc.setPassword(pass); + return; + } + } + + // + // Password not found + // + throw new IOException(); + } + + /** + * Add an alias/password pair to the callback mechanism. + */ + public void setAliasPassword(String alias, String password) { + passwords.put(alias, password); + } +} Added: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/client/src/org/jboss/test/ws/jaxws/samples/wsse/ServerUsernamePasswordCallback.java =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/client/src/org/jboss/test/ws/jaxws/samples/wsse/ServerUsernamePasswordCallback.java (rev 0) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/client/src/org/jboss/test/ws/jaxws/samples/wsse/ServerUsernamePasswordCallback.java 2010-06-03 15:13:16 UTC (rev 704) @@ -0,0 +1,73 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.samples.wsse; + +import java.io.IOException; +import java.util.*; + +import javax.security.auth.callback.Callback; +import javax.security.auth.callback.CallbackHandler; +import javax.security.auth.callback.UnsupportedCallbackException; +import org.apache.ws.security.WSPasswordCallback; + +public class ServerUsernamePasswordCallback implements CallbackHandler +{ + private Map<String, String> passwords = + new HashMap<String, String>(); + + public ServerUsernamePasswordCallback() { + passwords.put("Alice", "ecilA"); + passwords.put("abcd", "dcba"); + passwords.put("clientx509v1", "storepassword"); + passwords.put("serverx509v1", "storepassword"); + } + + /** + * Here, we attempt to get the password from the private + * alias/passwords map. + */ + public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException { + for (int i = 0; i < callbacks.length; i++) { + WSPasswordCallback pc = (WSPasswordCallback)callbacks[i]; + + System.out.println("**************** Server check id: "+pc.getIdentifer()); + + String pass = passwords.get(pc.getIdentifier()); + if (pass != null) { + pc.setPassword(pass); + return; + } + } + + // + // Password not found + // + throw new IOException(); + } + + /** + * Add an alias/password pair to the callback mechanism. + */ + public void setAliasPassword(String alias, String password) { + passwords.put(alias, password); + } +} Added: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/messages/hello_request1.xml =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/messages/hello_request1.xml (rev 0) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/messages/hello_request1.xml 2010-06-03 15:13:16 UTC (rev 704) @@ -0,0 +1,8 @@ +<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:wsdl="http://www.jboss.org/bpel/examples/wsdl"> + <soapenv:Header/> + <soapenv:Body> + <wsdl:hello> + <TestPart>Hello</TestPart> + </wsdl:hello> + </soapenv:Body> +</soapenv:Envelope> \ No newline at end of file Added: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/server/src/org/jboss/soa/bpel/examples/jaxws/JAXWSHandler.java =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/server/src/org/jboss/soa/bpel/examples/jaxws/JAXWSHandler.java (rev 0) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/server/src/org/jboss/soa/bpel/examples/jaxws/JAXWSHandler.java 2010-06-03 15:13:16 UTC (rev 704) @@ -0,0 +1,109 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.jboss.soa.bpel.examples.jaxws; + + +import java.io.PrintStream; +import java.util.Map; +import java.util.Set; + +import javax.xml.namespace.QName; +import javax.xml.soap.SOAPMessage; +import javax.xml.ws.handler.MessageContext; +import javax.xml.ws.handler.soap.SOAPHandler; +import javax.xml.ws.handler.soap.SOAPMessageContext; + +/* + * This simple SOAPHandler will output the contents of incoming + * and outgoing messages. + */ +public class JAXWSHandler implements SOAPHandler<SOAPMessageContext> { + + private PrintStream out; + + public JAXWSHandler() { + setLogStream(System.out); + } + + protected final void setLogStream(PrintStream ps) { + out = ps; + } + + public void init(Map c) { + System.out.println("JAXWSHandler : init() Called....:"+c); + } + + public Set<QName> getHeaders() { + return null; + } + + public boolean handleMessage(SOAPMessageContext smc) { + System.out.println("JAXWSHandler : handleMessage Called...."); + logToSystemOut(smc); + return true; + } + + public boolean handleFault(SOAPMessageContext smc) { + System.out.println("JAXWSHandler : handleFault Called...."); + logToSystemOut(smc); + return true; + } + + // nothing to clean up + public void close(MessageContext messageContext) { + System.out.println("JAXWSHandler : close() Called...."); + } + + // nothing to clean up + public void destroy() { + System.out.println("LoggingHandler : destroy() Called...."); + } + + /* + * Check the MESSAGE_OUTBOUND_PROPERTY in the context + * to see if this is an outgoing or incoming message. + * Write a brief message to the print stream and + * output the message. The writeTo() method can throw + * SOAPException or IOException + */ + protected void logToSystemOut(SOAPMessageContext smc) { + Boolean outboundProperty = (Boolean) + smc.get(MessageContext.MESSAGE_OUTBOUND_PROPERTY); + + if (outboundProperty.booleanValue()) { + out.println("\nOutbound message:"); + } else { + out.println("\nInbound message:"); + } + + SOAPMessage message = smc.getMessage(); + try { + message.writeTo(out); + out.println(); + } catch (Exception e) { + out.println("Exception in handler: " + e); + } + + out.println("WSDL_SERVICE = "+smc.get(MessageContext.WSDL_SERVICE)); + out.println("WSDL_INTERFACE = "+smc.get(MessageContext.WSDL_INTERFACE)); + out.println("WSDL_PORT = "+smc.get(MessageContext.WSDL_PORT)); + out.println("WSDL_OPERATION = "+smc.get(MessageContext.WSDL_OPERATION)); + } +} Added: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/server/src/org/jboss/test/ws/jaxws/samples/wsse/ClientUsernamePasswordCallback.java =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/server/src/org/jboss/test/ws/jaxws/samples/wsse/ClientUsernamePasswordCallback.java (rev 0) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/server/src/org/jboss/test/ws/jaxws/samples/wsse/ClientUsernamePasswordCallback.java 2010-06-03 15:13:16 UTC (rev 704) @@ -0,0 +1,73 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.jboss.test.ws.jaxws.samples.wsse; + +import java.io.IOException; +import java.util.HashMap; +import java.util.Map; + +import javax.security.auth.callback.Callback; +import javax.security.auth.callback.CallbackHandler; +import javax.security.auth.callback.UnsupportedCallbackException; + +import org.apache.ws.security.WSPasswordCallback; + +/** + */ + +public class ClientUsernamePasswordCallback implements CallbackHandler { + + private Map<String, String> passwords = + new HashMap<String, String>(); + + public ClientUsernamePasswordCallback() { + passwords.put("Alice", "ecilA"); + passwords.put("abcd", "dcba"); + passwords.put("clientx509v1", "storepassword"); + passwords.put("serverx509v1", "storepassword"); + } + + /** + * Here, we attempt to get the password from the private + * alias/passwords map. + */ + public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException { + for (int i = 0; i < callbacks.length; i++) { + WSPasswordCallback pc = (WSPasswordCallback)callbacks[i]; + + String pass = passwords.get(pc.getIdentifier()); + if (pass != null) { + pc.setPassword(pass); + return; + } + } + + // + // Password not found + // + throw new IOException(); + } + + /** + * Add an alias/password pair to the callback mechanism. + */ + public void setAliasPassword(String alias, String password) { + passwords.put(alias, password); + } +} Added: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/server/src/org/jboss/test/ws/jaxws/samples/wsse/ServerUsernamePasswordCallback.java =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/server/src/org/jboss/test/ws/jaxws/samples/wsse/ServerUsernamePasswordCallback.java (rev 0) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/server/src/org/jboss/test/ws/jaxws/samples/wsse/ServerUsernamePasswordCallback.java 2010-06-03 15:13:16 UTC (rev 704) @@ -0,0 +1,73 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.samples.wsse; + +import java.io.IOException; +import java.util.*; + +import javax.security.auth.callback.Callback; +import javax.security.auth.callback.CallbackHandler; +import javax.security.auth.callback.UnsupportedCallbackException; +import org.apache.ws.security.WSPasswordCallback; + +public class ServerUsernamePasswordCallback implements CallbackHandler +{ + private Map<String, String> passwords = + new HashMap<String, String>(); + + public ServerUsernamePasswordCallback() { + passwords.put("Alice", "ecilA"); + passwords.put("abcd", "dcba"); + passwords.put("clientx509v1", "storepassword"); + passwords.put("serverx509v1", "storepassword"); + } + + /** + * Here, we attempt to get the password from the private + * alias/passwords map. + */ + public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException { + for (int i = 0; i < callbacks.length; i++) { + WSPasswordCallback pc = (WSPasswordCallback)callbacks[i]; + + System.out.println("**************** Server check id: "+pc.getIdentifer()); + + String pass = passwords.get(pc.getIdentifier()); + if (pass != null) { + pc.setPassword(pass); + return; + } + } + + // + // Password not found + // + throw new IOException(); + } + + /** + * Add an alias/password pair to the callback mechanism. + */ + public void setAliasPassword(String alias, String password) { + passwords.put(alias, password); + } +} \ No newline at end of file Added: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/wssec.xml =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/wssec.xml (rev 0) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/wssec.xml 2010-06-03 15:13:16 UTC (rev 704) @@ -0,0 +1,79 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<beans xmlns="http://www.springframework.org/schema/beans" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:cxf="http://cxf.apache.org/core" + xmlns:wsa="http://cxf.apache.org/ws/addressing" + xmlns:http="http://cxf.apache.org/transports/http/configuration" + xmlns:wsrm-policy="http://schemas.xmlsoap.org/ws/2005/02/rm/policy" + xmlns:wsrm-mgr="http://cxf.apache.org/ws/rm/manager" + xmlns:beans='http://www.springframework.org/schema/beans' + xmlns:jaxws='http://cxf.apache.org/jaxws' + xmlns:ns1='http://secure_invoke/helloworld' + xsi:schemaLocation=" + http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd + http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd + http://schemas.xmlsoap.org/ws/2005/02/rm/policy http://schemas.xmlsoap.org/ws/2005/02/rm/wsrm-policy.xsd + http://cxf.apache.org/ws/rm/manager http://cxf.apache.org/schemas/configuration/wsrm-manager.xsd + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd"> + + <bean id="UsernameTokenSign_Request" class="org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor" + name="{http://secure_invoke/helloworld}SecureHelloWorldPort.Request" > + <constructor-arg> + <map> + <entry key="action" value="UsernameToken Timestamp Signature"/> + <entry key="passwordType" value="PasswordDigest"/> + <entry key="user" value="clientx509v1"/> + <entry key="passwordCallbackClass" value="org.jboss.test.ws.jaxws.samples.wsse.ClientUsernamePasswordCallback"/> + <entry key="signaturePropFile" value="etc/Client_Sign.properties"/> + <entry key="signatureKeyIdentifier" value="DirectReference"/> + <entry key="signatureParts" value="{Element}{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}Timestamp;{Element}{http://schemas.xmlsoap.org/soap/envelope/}Body"/> + </map> + </constructor-arg> + </bean> + + <bean id="UsernameTokenSign_Response" class="org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor" + name="{http://secure_invoke/helloworld}SecureHelloWorldPort.Response" > + <constructor-arg> + <map> + <entry key="action" value="UsernameToken Timestamp Signature"/> + <entry key="passwordType" value="PasswordText"/> + <entry key="user" value="serverx509v1"/> + <entry key="passwordCallbackClass" value="org.jboss.test.ws.jaxws.samples.wsse.ClientUsernamePasswordCallback"/> + <entry key="signaturePropFile" value="etc/Client_Encrypt.properties"/> + <entry key="signatureKeyIdentifier" value="DirectReference"/> + </map> + </constructor-arg> + </bean> + + + <cxf:bus> + <cxf:outInterceptors> + <ref bean="UsernameTokenSign_Request"/> + <bean class="org.apache.cxf.binding.soap.saaj.SAAJOutInterceptor"/> + </cxf:outInterceptors> + <cxf:inInterceptors> + <ref bean="UsernameTokenSign_Response"/> + <bean class="org.apache.cxf.binding.soap.saaj.SAAJInInterceptor"/> + </cxf:inInterceptors> + </cxf:bus> + +</beans>

14 years, 6 months

1
0
0 / 0

riftsaw SVN: r703 - in trunk: runtime/engine-assembly/src/main/resources/bpel-sql and 1 other directory.

by riftsaw-commits＠lists.jboss.org

Author: jeff.yuchang Date: 2010-06-03 09:09:24 -0400 (Thu, 03 Jun 2010) New Revision: 703 Modified: trunk/distribution/src/main/release/db/sql/mysql.drop.sql trunk/distribution/src/main/release/db/sql/postgres.drop.sql trunk/runtime/engine-assembly/src/main/resources/bpel-sql/mysql.sql trunk/runtime/engine-assembly/src/main/resources/bpel-sql/oracle.sql trunk/runtime/engine-assembly/src/main/resources/bpel-sql/postgres.sql trunk/runtime/engine-assembly/src/main/resources/bpel-sql/sqlserver.sql Log: * update the DDL script for various DB, updated drop DDL script as well. Modified: trunk/distribution/src/main/release/db/sql/mysql.drop.sql =================================================================== --- trunk/distribution/src/main/release/db/sql/mysql.drop.sql 2010-06-03 10:48:29 UTC (rev 702) +++ trunk/distribution/src/main/release/db/sql/mysql.drop.sql 2010-06-03 13:09:24 UTC (rev 703) @@ -1,159 +1,24 @@ drop table ODE_SCHEMA_VERSION; drop table ODE_JOB; - - alter table ODE_ACTIVITY_RECOVERY - drop - foreign key FK5274B556E38CB1C9; - - alter table ODE_CORRELATION_SET - drop - foreign key FK399D7EB621712AFA; - - alter table ODE_CORRELATOR - drop - foreign key FKC4413FB8748734BD; - - alter table ODE_CORSET_PROP - drop - foreign key FK3B13A3F744AFA280; - - alter table ODE_EVENT - drop - foreign key FK410D028BA0243704; - - alter table ODE_EVENT - drop - foreign key FK410D028BE38CB1C9; - - alter table ODE_MESSAGE - drop - foreign key FKBCCD53B81291B75D; - - alter table ODE_MESSAGE_EXCHANGE - drop - foreign key FK68EE0ACA57B8F584; - - alter table ODE_MESSAGE_EXCHANGE - drop - foreign key FK68EE0ACA8618FFF9; - - alter table ODE_MESSAGE_EXCHANGE - drop - foreign key FK68EE0ACADB5AB781; - - alter table ODE_MESSAGE_EXCHANGE - drop - foreign key FK68EE0ACA7B80504F; - - alter table ODE_MESSAGE_EXCHANGE - drop - foreign key FK68EE0ACADC273092; - - alter table ODE_MESSAGE_EXCHANGE - drop - foreign key FK68EE0ACAA0243704; - - alter table ODE_MESSAGE_ROUTE - drop - foreign key FK8082C6E28618FFF9; - - alter table ODE_MESSAGE_ROUTE - drop - foreign key FK8082C6E2DB5AB781; - - alter table ODE_MEX_PROP - drop - foreign key FKE61574D1AA079EB8; - - alter table ODE_PARTNER_LINK - drop - foreign key FK7337940021712AFA; - - alter table ODE_PROCESS_INSTANCE - drop - foreign key FK4E20A7D4F3A6B9B7; - - alter table ODE_PROCESS_INSTANCE - drop - foreign key FK4E20A7D4F0BBEFCC; - - alter table ODE_PROCESS_INSTANCE - drop - foreign key FK4E20A7D46C4AB4DE; - - alter table ODE_PROCESS_INSTANCE - drop - foreign key FK4E20A7D4A0243704; - - alter table ODE_SCOPE - drop - foreign key FK41C9CE458618FFF9; - - alter table ODE_SCOPE - drop - foreign key FK41C9CE45F6D972EF; - - alter table ODE_XML_DATA - drop - foreign key FKEF74614121712AFA; - - alter table ODE_XML_DATA_PROP - drop - foreign key FK936B93A181C9218F; - - alter table STORE_PROCESS - drop - foreign key FKA83900D1BAFA89CA; - - alter table STORE_PROC_TO_PROP - drop - foreign key FKB85D957C891ECF61; - - alter table STORE_PROC_TO_PROP - drop - foreign key FKB85D957C3C8753EC; - - drop table if exists ODE_ACTIVITY_RECOVERY; - - drop table if exists ODE_CORRELATION_SET; - - drop table if exists ODE_CORRELATOR; - - drop table if exists ODE_CORSET_PROP; - - drop table if exists ODE_EVENT; - - drop table if exists ODE_FAULT; - - drop table if exists ODE_MESSAGE; - - drop table if exists ODE_MESSAGE_EXCHANGE; - - drop table if exists ODE_MESSAGE_ROUTE; - - drop table if exists ODE_MEX_PROP; - - drop table if exists ODE_PARTNER_LINK; - - drop table if exists ODE_PROCESS; - - drop table if exists ODE_PROCESS_INSTANCE; - - drop table if exists ODE_SCOPE; - - drop table if exists ODE_XML_DATA; - - drop table if exists ODE_XML_DATA_PROP; - - drop table if exists STORE_DU; - - drop table if exists STORE_PROCESS; - - drop table if exists STORE_PROCESS_PROP; - - drop table if exists STORE_PROC_TO_PROP; - - drop table if exists STORE_VERSIONS; - - - +drop table BPEL_ACTIVITY_RECOVERY; +drop table BPEL_CORRELATION_PROP; +drop table BPEL_CORRELATION_SET; +drop table BPEL_CORRELATOR; +drop table BPEL_CORRELATOR_MESSAGE_CKEY; +drop table BPEL_EVENT; +drop table BPEL_FAULT; +drop table BPEL_INSTANCE; +drop table BPEL_MESSAGE; +drop table BPEL_MEX_PROPS; +drop table BPEL_PLINK_VAL; +drop table BPEL_PROCESS; +drop table BPEL_SCOPE; +drop table BPEL_SELECTORS; +drop table BPEL_UNMATCHED; +drop table BPEL_XML_DATA; +drop table VAR_PROPERTY; +drop table STORE_DU; +drop table STORE_PROCESS; +drop table STORE_PROCESS_PROP; +drop table STORE_VERSIONS; +drop table BPEL_MESSAGE_EXCHANGE; \ No newline at end of file Modified: trunk/distribution/src/main/release/db/sql/postgres.drop.sql =================================================================== --- trunk/distribution/src/main/release/db/sql/postgres.drop.sql 2010-06-03 10:48:29 UTC (rev 702) +++ trunk/distribution/src/main/release/db/sql/postgres.drop.sql 2010-06-03 13:09:24 UTC (rev 703) @@ -1,130 +1,25 @@ drop table ODE_SCHEMA_VERSION; drop table ODE_JOB; - - alter table ODE_ACTIVITY_RECOVERY - drop constraint FK5274B556E38CB1C9; - - alter table ODE_CORRELATION_SET - drop constraint FK399D7EB621712AFA; - - alter table ODE_CORRELATOR - drop constraint FKC4413FB8748734BD; - - alter table ODE_CORSET_PROP - drop constraint FK3B13A3F744AFA280; - - alter table ODE_EVENT - drop constraint FK410D028BA0243704; - - alter table ODE_EVENT - drop constraint FK410D028BE38CB1C9; - - alter table ODE_MESSAGE - drop constraint FKBCCD53B81291B75D; - - alter table ODE_MESSAGE_EXCHANGE - drop constraint FK68EE0ACA57B8F584; - - alter table ODE_MESSAGE_EXCHANGE - drop constraint FK68EE0ACA8618FFF9; - - alter table ODE_MESSAGE_EXCHANGE - drop constraint FK68EE0ACADB5AB781; - - alter table ODE_MESSAGE_EXCHANGE - drop constraint FK68EE0ACA7B80504F; - - alter table ODE_MESSAGE_EXCHANGE - drop constraint FK68EE0ACADC273092; - - alter table ODE_MESSAGE_EXCHANGE - drop constraint FK68EE0ACAA0243704; - - alter table ODE_MESSAGE_ROUTE - drop constraint FK8082C6E28618FFF9; - - alter table ODE_MESSAGE_ROUTE - drop constraint FK8082C6E2DB5AB781; - - alter table ODE_MEX_PROP - drop constraint FKE61574D1AA079EB8; - - alter table ODE_PARTNER_LINK - drop constraint FK7337940021712AFA; - - alter table ODE_PROCESS_INSTANCE - drop constraint FK4E20A7D4F3A6B9B7; - - alter table ODE_PROCESS_INSTANCE - drop constraint FK4E20A7D4F0BBEFCC; - - alter table ODE_PROCESS_INSTANCE - drop constraint FK4E20A7D46C4AB4DE; - - alter table ODE_PROCESS_INSTANCE - drop constraint FK4E20A7D4A0243704; - - alter table ODE_SCOPE - drop constraint FK41C9CE458618FFF9; - - alter table ODE_SCOPE - drop constraint FK41C9CE45F6D972EF; - - alter table ODE_XML_DATA - drop constraint FKEF74614121712AFA; - - alter table ODE_XML_DATA_PROP - drop constraint FK936B93A181C9218F; - - alter table STORE_PROCESS - drop constraint FKA83900D1BAFA89CA; - - alter table STORE_PROC_TO_PROP - drop constraint FKB85D957C891ECF61; - - alter table STORE_PROC_TO_PROP - drop constraint FKB85D957C3C8753EC; - - drop table ODE_ACTIVITY_RECOVERY; - - drop table ODE_CORRELATION_SET; - - drop table ODE_CORRELATOR; - - drop table ODE_CORSET_PROP; - - drop table ODE_EVENT; - - drop table ODE_FAULT; - - drop table ODE_MESSAGE; - - drop table ODE_MESSAGE_EXCHANGE; - - drop table ODE_MESSAGE_ROUTE; - - drop table ODE_MEX_PROP; - - drop table ODE_PARTNER_LINK; - - drop table ODE_PROCESS; - - drop table ODE_PROCESS_INSTANCE; - - drop table ODE_SCOPE; - - drop table ODE_XML_DATA; - - drop table ODE_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; - - drop sequence hibernate_sequence; +drop table BPEL_ACTIVITY_RECOVERY; +drop table BPEL_CORRELATION_PROP; +drop table BPEL_CORRELATION_SET; +drop table BPEL_CORRELATOR; +drop table BPEL_CORRELATOR_MESSAGE_CKEY; +drop table BPEL_EVENT; +drop table BPEL_FAULT; +drop table BPEL_INSTANCE; +drop table BPEL_MESSAGE; +drop table BPEL_MEX_PROPS; +drop table BPEL_PLINK_VAL; +drop table BPEL_PROCESS; +drop table BPEL_SCOPE; +drop table BPEL_SELECTORS; +drop table BPEL_UNMATCHED; +drop table BPEL_XML_DATA; +drop table VAR_PROPERTY; +drop sequence hibernate_seqhilo; +drop table STORE_DU; +drop table STORE_PROCESS; +drop table STORE_PROCESS_PROP; +drop table STORE_VERSIONS; +drop table BPEL_MESSAGE_EXCHANGE; \ No newline at end of file Modified: trunk/runtime/engine-assembly/src/main/resources/bpel-sql/mysql.sql =================================================================== --- trunk/runtime/engine-assembly/src/main/resources/bpel-sql/mysql.sql 2010-06-03 10:48:29 UTC (rev 702) +++ trunk/runtime/engine-assembly/src/main/resources/bpel-sql/mysql.sql 2010-06-03 13:09:24 UTC (rev 703) @@ -1,25 +1,5 @@ --- --- Licensed to the Apache Software Foundation (ASF) under one --- or more contributor license agreements. See the NOTICE file --- distributed with this work for additional information --- regarding copyright ownership. The ASF licenses this file --- to you under the Apache License, Version 2.0 (the --- "License"); you may not use this file except in compliance --- with the License. You may obtain a copy of the License at --- --- http://www.apache.org/licenses/LICENSE-2.0 --- --- Unless required by applicable law or agreed to in writing, --- software distributed under the License is distributed on an --- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY --- KIND, either express or implied. See the License for the --- specific language governing permissions and limitations --- under the License. --- - create table ODE_SCHEMA_VERSION(VERSION integer); insert into ODE_SCHEMA_VERSION values (6); - -- Apache ODE - SimpleScheduler Database Schema -- -- MySQL scripts by Maciej Szefler. @@ -43,7 +23,7 @@ correlationKeySet varchar(255), retryCount int, inMem int, - detailsExt blob(4096), + detailsExt blob(4096) NULL, PRIMARY KEY(jobid), INDEX IDX_ODE_JOB_TS(ts), @@ -53,222 +33,35 @@ COMMIT; +create table BPEL_ACTIVITY_RECOVERY (ID bigint not null, PIID bigint, AID bigint, CHANNEL varchar(255), REASON varchar(255), DATE_TIME datetime, DETAILS blob, ACTIONS varchar(255), RETRIES integer, INSERT_TIME datetime, MLOCK integer not null, primary key (ID)); +create table BPEL_CORRELATION_PROP (ID bigint not null, NAME varchar(255), NAMESPACE varchar(255), VALUE varchar(255), CORR_SET_ID bigint, INSERT_TIME datetime, MLOCK integer not null, primary key (ID)); +create table BPEL_CORRELATION_SET (ID bigint not null, VALUE varchar(255), CORR_SET_NAME varchar(255), SCOPE_ID bigint, PIID bigint, PROCESS_ID bigint, INSERT_TIME datetime, MLOCK integer not null, primary key (ID)); +create table BPEL_CORRELATOR (ID bigint not null, CID varchar(255), PROCESS_ID bigint, INSERT_TIME datetime, MLOCK integer not null, primary key (ID)); +create table BPEL_CORRELATOR_MESSAGE_CKEY (ID bigint not null, CKEY varchar(255), CORRELATOR_MESSAGE_ID bigint, INSERT_TIME datetime, MLOCK integer not null, primary key (ID)); +create table BPEL_EVENT (ID bigint not null, IID bigint, PID bigint, TSTAMP datetime, TYPE varchar(255), DETAIL longtext, DATA blob, SID bigint, INSERT_TIME datetime, MLOCK integer not null, primary key (ID)); +create table BPEL_FAULT (ID bigint not null, FAULTNAME varchar(255), DATA blob, EXPLANATION varchar(4000), LINE_NUM integer, AID integer, INSERT_TIME datetime, MLOCK integer not null, primary key (ID)); +create table BPEL_INSTANCE (ID bigint not null, INSTANTIATING_CORRELATOR bigint, FAULT bigint, JACOB_STATE_DATA blob, PREVIOUS_STATE smallint, PROCESS_ID bigint, STATE smallint, LAST_ACTIVE_DT datetime, SEQUENCE bigint, FAILURE_COUNT integer, FAILURE_DT datetime, INSERT_TIME datetime, MLOCK integer not null, primary key (ID)); +create table BPEL_MESSAGE (ID bigint not null, MEX bigint, TYPE varchar(255), MESSAGE_DATA blob, MESSAGE_HEADER blob, INSERT_TIME datetime, MLOCK integer not null, primary key (ID)); +create table BPEL_MESSAGE_EXCHANGE (ID bigint not null, PORT_TYPE varchar(255), CHANNEL_NAME varchar(255), CLIENTKEY varchar(255), ENDPOINT blob, CALLBACK_ENDPOINT blob, REQUEST bigint, RESPONSE bigint, INSERT_DT datetime, OPERATION varchar(255), STATE varchar(255), PROCESS bigint, PIID bigint, DIR char(1), PLINK_MODELID integer, PATTERN varchar(255), CORR_STATUS varchar(255), FAULT_TYPE varchar(255), FAULT_EXPL varchar(255), CALLEE varchar(255), PARTNERLINK bigint, PIPED_ID varchar(255), SUBSCRIBER_COUNT integer, INSERT_TIME datetime, MLOCK integer not null, primary key (ID)); +create table BPEL_MEX_PROPS (MEX bigint not null, VALUE varchar(8000), NAME varchar(255) not null, primary key (MEX, NAME)); +create table BPEL_PLINK_VAL (ID bigint not null, PARTNER_LINK varchar(100) not null, PARTNERROLE varchar(100), MYROLE_EPR_DATA blob, PARTNERROLE_EPR_DATA blob, PROCESS bigint, SCOPE bigint, SVCNAME varchar(255), MYROLE varchar(100), MODELID integer, MYSESSIONID varchar(255), PARTNERSESSIONID varchar(255), INSERT_TIME datetime, MLOCK integer not null, primary key (ID)); +create table BPEL_PROCESS (ID bigint not null, PROCID varchar(255) not null unique, deployer varchar(255), deploydate datetime, type_name varchar(255), type_ns varchar(255), version bigint, ACTIVE_ bit, guid varchar(255), INSERT_TIME datetime, MLOCK integer not null, primary key (ID)); +create table BPEL_SCOPE (ID bigint not null, PIID bigint, PARENT_SCOPE_ID bigint, STATE varchar(255) not null, NAME varchar(255) not null, MODELID integer, INSERT_TIME datetime, MLOCK integer not null, primary key (ID)); +create table BPEL_SELECTORS (ID bigint not null, PIID bigint not null, SELGRPID varchar(255) not null, IDX integer not null, CORRELATION_KEY varchar(255) not null, PROC_TYPE varchar(255) not null, ROUTE_POLICY varchar(255), CORRELATOR bigint not null, INSERT_TIME datetime, MLOCK integer not null, primary key (ID), unique (CORRELATION_KEY, CORRELATOR)); +create table BPEL_UNMATCHED (ID bigint not null, MEX bigint, CORRELATION_KEY varchar(255), CORRELATOR bigint not null, INSERT_TIME datetime, MLOCK integer not null, primary key (ID)); +create table BPEL_XML_DATA (ID bigint not null, DATA blob, NAME varchar(255) not null, SIMPLE_VALUE varchar(255), SCOPE_ID bigint, PIID bigint, IS_SIMPLE_TYPE bit, INSERT_TIME datetime, MLOCK integer not null, primary key (ID)); +create table STORE_DU (NAME varchar(255) not null, deployer varchar(255), DEPLOYDT datetime, DIR varchar(255), primary key (NAME)); +create table STORE_PROCESS (PID varchar(255) not null, DU varchar(255), TYPE varchar(255), version bigint, STATE varchar(255), primary key (PID)); +create table STORE_PROCESS_PROP (propId varchar(255) not null, value varchar(255), name varchar(255) not null, primary key (propId, name)); +create table STORE_VERSIONS (ID integer not null, VERSION bigint, primary key (ID)); +create table VAR_PROPERTY (ID bigint not null, XML_DATA_ID bigint, PROP_VALUE varchar(255), PROP_NAME varchar(255) not null, INSERT_TIME datetime, MLOCK integer not null, primary key (ID)); - create table ODE_ACTIVITY_RECOVERY ( - ID bigint not null auto_increment, - ACTIONS varchar(255), - ACTIVITY_ID bigint, - CHANNEL varchar(255), - DATE_TIME datetime, - DETAILS longtext, - INSTANCE_ID bigint, - REASON varchar(255), - RETRIES integer, - primary key (ID) - ) type=InnoDB; - - create table ODE_CORRELATION_SET ( - CORRELATION_SET_ID bigint not null auto_increment, - CORRELATION_KEY varchar(255), - NAME varchar(255), - SCOPE_ID bigint, - primary key (CORRELATION_SET_ID) - ) type=InnoDB; - - create table ODE_CORRELATOR ( - CORRELATOR_ID bigint not null auto_increment, - CORRELATOR_KEY varchar(255), - PROC_ID bigint, - primary key (CORRELATOR_ID) - ) type=InnoDB; - - create table ODE_CORSET_PROP ( - ID bigint not null auto_increment, - CORRSET_ID bigint, - PROP_KEY varchar(255), - PROP_VALUE varchar(255), - primary key (ID) - ) type=InnoDB; - - create table ODE_EVENT ( - EVENT_ID bigint not null auto_increment, - DETAIL varchar(255), - DATA longblob, - SCOPE_ID bigint, - TSTAMP datetime, - TYPE varchar(255), - INSTANCE_ID bigint, - PROCESS_ID bigint, - primary key (EVENT_ID) - ) type=InnoDB; - - create table ODE_FAULT ( - FAULT_ID bigint not null auto_increment, - ACTIVITY_ID integer, - DATA longtext, - MESSAGE longtext, - LINE_NUMBER integer, - NAME varchar(255), - primary key (FAULT_ID) - ) type=InnoDB; - - create table ODE_MESSAGE ( - MESSAGE_ID bigint not null auto_increment, - DATA longtext, - HEADER longtext, - TYPE varchar(255), - MESSAGE_EXCHANGE_ID varchar(255), - primary key (MESSAGE_ID) - ) type=InnoDB; - - create table ODE_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 datetime, - DIRECTION char(1), - EPR longtext, - 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 bit, - 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) - ) type=InnoDB; - - create table ODE_MESSAGE_ROUTE ( - MESSAGE_ROUTE_ID bigint not null auto_increment, - 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) - ) type=InnoDB; - - create table ODE_MEX_PROP ( - ID bigint not null auto_increment, - MEX_ID varchar(255), - PROP_KEY varchar(255), - PROP_VALUE longtext, - primary key (ID) - ) type=InnoDB; - - create table ODE_PARTNER_LINK ( - PARTNER_LINK_ID bigint not null auto_increment, - MY_EPR longtext, - MY_ROLE_NAME varchar(255), - MY_ROLE_SERVICE_NAME varchar(255), - MY_SESSION_ID varchar(255), - PARTNER_EPR longtext, - 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) - ) type=InnoDB; - - create table ODE_PROCESS ( - ID bigint not null auto_increment, - GUID varchar(255), - PROCESS_ID varchar(255), - PROCESS_TYPE varchar(255), - VERSION bigint, - primary key (ID) - ) type=InnoDB; - - create table ODE_PROCESS_INSTANCE ( - ID bigint not null auto_increment, - DATE_CREATED datetime, - EXECUTION_STATE longblob, - FAULT_ID bigint, - LAST_ACTIVE_TIME datetime, - LAST_RECOVERY_DATE datetime, - PREVIOUS_STATE smallint, - SEQUENCE bigint, - INSTANCE_STATE smallint, - INSTANTIATING_CORRELATOR_ID bigint, - PROCESS_ID bigint, - ROOT_SCOPE_ID bigint, - primary key (ID) - ) type=InnoDB; - - create table ODE_SCOPE ( - SCOPE_ID bigint not null auto_increment, - MODEL_ID integer, - SCOPE_NAME varchar(255), - SCOPE_STATE varchar(255), - PARENT_SCOPE_ID bigint, - PROCESS_INSTANCE_ID bigint, - primary key (SCOPE_ID) - ) type=InnoDB; - - create table ODE_XML_DATA ( - XML_DATA_ID bigint not null auto_increment, - DATA longtext, - IS_SIMPLE_TYPE bit, - NAME varchar(255), - SCOPE_ID bigint, - primary key (XML_DATA_ID) - ) type=InnoDB; - - create table ODE_XML_DATA_PROP ( - ID bigint not null auto_increment, - XML_DATA_ID bigint, - PROP_KEY varchar(255), - PROP_VALUE varchar(255), - primary key (ID) - ) type=InnoDB; - - create table STORE_DU ( - NAME varchar(255) not null, - DEPLOYDT datetime, - DEPLOYER varchar(255), - DIR varchar(255), - primary key (NAME) - ) type=InnoDB; - - create table STORE_PROCESS ( - PID varchar(255) not null, - STATE varchar(255), - TYPE varchar(255), - VERSION bigint, - DU varchar(255), - primary key (PID) - ) type=InnoDB; - - create table STORE_PROCESS_PROP ( - ID bigint not null auto_increment, - PROP_KEY varchar(255), - PROP_VAL varchar(255), - primary key (ID) - ) type=InnoDB; - - 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) - ) type=InnoDB; - - create table STORE_VERSIONS ( - ID bigint not null auto_increment, - VERSION bigint, - primary key (ID) - ) type=InnoDB; \ No newline at end of file +create index IDX_CORRELATOR_CID on BPEL_CORRELATOR (CID); +create index IDX_BPEL_CORRELATOR_MESSAGE_CKEY on BPEL_CORRELATOR_MESSAGE_CKEY (CKEY); +create index IDX_SELECTOR_CORRELATOR on BPEL_SELECTORS (CORRELATOR); +create index IDX_SELECTOR_CKEY on BPEL_SELECTORS (CORRELATION_KEY); +create index IDX_SELECTOR_SELGRPID on BPEL_SELECTORS (SELGRPID); +create index IDX_UNMATCHED_CKEY on BPEL_UNMATCHED (CORRELATION_KEY); +create index IDX_UNMATCHED_CORRELATOR on BPEL_UNMATCHED (CORRELATOR); +create table hibernate_unique_key ( next_hi integer ); +insert into hibernate_unique_key values ( 0 ); \ No newline at end of file Modified: trunk/runtime/engine-assembly/src/main/resources/bpel-sql/oracle.sql =================================================================== --- trunk/runtime/engine-assembly/src/main/resources/bpel-sql/oracle.sql 2010-06-03 10:48:29 UTC (rev 702) +++ trunk/runtime/engine-assembly/src/main/resources/bpel-sql/oracle.sql 2010-06-03 13:09:24 UTC (rev 703) @@ -1,33 +1,11 @@ --- --- Licensed to the Apache Software Foundation (ASF) under one --- or more contributor license agreements. See the NOTICE file --- distributed with this work for additional information --- regarding copyright ownership. The ASF licenses this file --- to you under the Apache License, Version 2.0 (the --- "License"); you may not use this file except in compliance --- with the License. You may obtain a copy of the License at --- --- http://www.apache.org/licenses/LICENSE-2.0 --- --- Unless required by applicable law or agreed to in writing, --- software distributed under the License is distributed on an --- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY --- KIND, either express or implied. See the License for the --- specific language governing permissions and limitations --- under the License. --- - create table ODE_SCHEMA_VERSION(VERSION integer); insert into ODE_SCHEMA_VERSION values (6); - -- Apache ODE - SimpleScheduler Database Schema -- -- Apache Derby scripts by Maciej Szefler. -- -- -DROP TABLE ODE_JOB; - CREATE TABLE ODE_JOB ( jobid VARCHAR(64) NOT NULL, ts number(37) NOT NULL, @@ -52,224 +30,33 @@ CREATE INDEX IDX_ODE_JOB_NODEID ON ODE_JOB(nodeid); - - create table ODE_ACTIVITY_RECOVERY ( - ID number(19,0) not null, - ACTIONS varchar2(255), - ACTIVITY_ID number(19,0), - CHANNEL varchar2(255), - DATE_TIME date, - DETAILS clob, - INSTANCE_ID number(19,0), - REASON varchar2(255), - RETRIES number(10,0), - primary key (ID) - ); - - create table ODE_CORRELATION_SET ( - CORRELATION_SET_ID number(19,0) not null, - CORRELATION_KEY varchar2(255), - NAME varchar2(255), - SCOPE_ID number(19,0), - primary key (CORRELATION_SET_ID) - ); - - create table ODE_CORRELATOR ( - CORRELATOR_ID number(19,0) not null, - CORRELATOR_KEY varchar2(255), - PROC_ID number(19,0), - primary key (CORRELATOR_ID) - ); - - create table ODE_CORSET_PROP ( - ID number(19,0) not null, - CORRSET_ID number(19,0), - PROP_KEY varchar2(255), - PROP_VALUE varchar2(255), - primary key (ID) - ); - - create table ODE_EVENT ( - EVENT_ID number(19,0) not null, - DETAIL varchar2(255), - DATA blob, - SCOPE_ID number(19,0), - TSTAMP date, - TYPE varchar2(255), - INSTANCE_ID number(19,0), - PROCESS_ID number(19,0), - primary key (EVENT_ID) - ); - - create table ODE_FAULT ( - FAULT_ID number(19,0) not null, - ACTIVITY_ID number(10,0), - DATA clob, - MESSAGE varchar2(4000), - LINE_NUMBER number(10,0), - NAME varchar2(255), - primary key (FAULT_ID) - ); - - create table ODE_MESSAGE ( - MESSAGE_ID number(19,0) not null, - DATA clob, - HEADER clob, - TYPE varchar2(255), - MESSAGE_EXCHANGE_ID varchar2(255), - primary key (MESSAGE_ID) - ); - - create table ODE_MESSAGE_EXCHANGE ( - MESSAGE_EXCHANGE_ID varchar2(255) not null, - CALLEE varchar2(255), - CHANNEL varchar2(255), - CORRELATION_ID varchar2(255), - CORRELATION_KEYS varchar2(255), - CORRELATION_STATUS varchar2(255), - CREATE_TIME date, - DIRECTION char(1), - EPR clob, - FAULT varchar2(255), - FAULT_EXPLANATION varchar2(255), - OPERATION varchar2(255), - PARTNER_LINK_MODEL_ID number(10,0), - PATTERN varchar2(255), - PIPED_ID varchar2(255), - PORT_TYPE varchar2(255), - PROPAGATE_TRANS number(1,0), - STATUS varchar2(255), - SUBSCRIBER_COUNT number(10,0), - CORR_ID number(19,0), - PARTNER_LINK_ID number(19,0), - PROCESS_ID number(19,0), - PROCESS_INSTANCE_ID number(19,0), - REQUEST_MESSAGE_ID number(19,0), - RESPONSE_MESSAGE_ID number(19,0), - primary key (MESSAGE_EXCHANGE_ID) - ); - - create table ODE_MESSAGE_ROUTE ( - MESSAGE_ROUTE_ID number(19,0) not null, - CORRELATION_KEY varchar2(255), - GROUP_ID varchar2(255), - ROUTE_INDEX number(10,0), - PROCESS_INSTANCE_ID number(19,0), - ROUTE_POLICY varchar2(16), - CORR_ID number(19,0), - primary key (MESSAGE_ROUTE_ID) - ); - - create table ODE_MEX_PROP ( - ID number(19,0) not null, - MEX_ID varchar2(255), - PROP_KEY varchar2(255), - PROP_VALUE varchar2(2000), - primary key (ID) - ); - - create table ODE_PARTNER_LINK ( - PARTNER_LINK_ID number(19,0) not null, - MY_EPR clob, - MY_ROLE_NAME varchar2(255), - MY_ROLE_SERVICE_NAME varchar2(255), - MY_SESSION_ID varchar2(255), - PARTNER_EPR clob, - PARTNER_LINK_MODEL_ID number(10,0), - PARTNER_LINK_NAME varchar2(255), - PARTNER_ROLE_NAME varchar2(255), - PARTNER_SESSION_ID varchar2(255), - SCOPE_ID number(19,0), - primary key (PARTNER_LINK_ID) - ); - - create table ODE_PROCESS ( - ID number(19,0) not null, - GUID varchar2(255), - PROCESS_ID varchar2(255), - PROCESS_TYPE varchar2(255), - VERSION number(19,0), - primary key (ID) - ); - - create table ODE_PROCESS_INSTANCE ( - ID number(19,0) not null, - DATE_CREATED date, - EXECUTION_STATE blob, - FAULT_ID number(19,0), - LAST_ACTIVE_TIME date, - LAST_RECOVERY_DATE date, - PREVIOUS_STATE number(5,0), - SEQUENCE number(19,0), - INSTANCE_STATE number(5,0), - INSTANTIATING_CORRELATOR_ID number(19,0), - PROCESS_ID number(19,0), - ROOT_SCOPE_ID number(19,0), - primary key (ID) - ); - - create table ODE_SCOPE ( - SCOPE_ID number(19,0) not null, - MODEL_ID number(10,0), - SCOPE_NAME varchar2(255), - SCOPE_STATE varchar2(255), - PARENT_SCOPE_ID number(19,0), - PROCESS_INSTANCE_ID number(19,0), - primary key (SCOPE_ID) - ); - - create table ODE_XML_DATA ( - XML_DATA_ID number(19,0) not null, - DATA clob, - IS_SIMPLE_TYPE number(1,0), - NAME varchar2(255), - SCOPE_ID number(19,0), - primary key (XML_DATA_ID) - ); - - create table ODE_XML_DATA_PROP ( - ID number(19,0) not null, - XML_DATA_ID number(19,0), - PROP_KEY varchar2(255), - PROP_VALUE varchar2(255), - primary key (ID) - ); - - create table STORE_DU ( - NAME varchar2(255) not null, - DEPLOYDT date, - DEPLOYER varchar2(255), - DIR varchar2(255), - primary key (NAME) - ); - - create table STORE_PROCESS ( - PID varchar2(255) not null, - STATE varchar2(255), - TYPE varchar2(255), - VERSION number(19,0), - DU varchar2(255), - primary key (PID) - ); - - create table STORE_PROCESS_PROP ( - ID number(19,0) not null, - PROP_KEY varchar2(255), - PROP_VAL varchar2(255), - primary key (ID) - ); - - create table STORE_PROC_TO_PROP ( - STORE_PROCESS_PID varchar2(255) not null, - STORE_PROPERTY_ID number(19,0) not null, - primary key (STORE_PROCESS_PID, STORE_PROPERTY_ID), - unique (STORE_PROPERTY_ID) - ); - - create table STORE_VERSIONS ( - ID number(19,0) not null, - VERSION number(19,0), - primary key (ID) - ); - - create sequence hibernate_sequence; \ No newline at end of file +create table BPEL_ACTIVITY_RECOVERY (ID number(19,0) not null, PIID number(19,0), AID number(19,0), CHANNEL varchar2(255 char), REASON varchar2(255 char), DATE_TIME timestamp, DETAILS blob, ACTIONS varchar2(255 char), RETRIES number(10,0), INSERT_TIME timestamp, MLOCK number(10,0) not null, primary key (ID)); +create table BPEL_CORRELATION_PROP (ID number(19,0) not null, NAME varchar2(255 char), NAMESPACE varchar2(255 char), VALUE varchar2(255 char), CORR_SET_ID number(19,0), INSERT_TIME timestamp, MLOCK number(10,0) not null, primary key (ID)); +create table BPEL_CORRELATION_SET (ID number(19,0) not null, VALUE varchar2(255 char), CORR_SET_NAME varchar2(255 char), SCOPE_ID number(19,0), PIID number(19,0), PROCESS_ID number(19,0), INSERT_TIME timestamp, MLOCK number(10,0) not null, primary key (ID)); +create table BPEL_CORRELATOR (ID number(19,0) not null, CID varchar2(255 char), PROCESS_ID number(19,0), INSERT_TIME timestamp, MLOCK number(10,0) not null, primary key (ID)); +create table BPEL_CORRELATOR_MESSAGE_CKEY (ID number(19,0) not null, CKEY varchar2(255 char), CORRELATOR_MESSAGE_ID number(19,0), INSERT_TIME timestamp, MLOCK number(10,0) not null, primary key (ID)); +create table BPEL_EVENT (ID number(19,0) not null, IID number(19,0), PID number(19,0), TSTAMP timestamp, TYPE varchar2(255 char), DETAIL clob, DATA blob, SID number(19,0), INSERT_TIME timestamp, MLOCK number(10,0) not null, primary key (ID)); +create table BPEL_FAULT (ID number(19,0) not null, FAULTNAME varchar2(255 char), DATA blob, EXPLANATION varchar2(4000 char), LINE_NUM number(10,0), AID number(10,0), INSERT_TIME timestamp, MLOCK number(10,0) not null, primary key (ID)); +create table BPEL_INSTANCE (ID number(19,0) not null, INSTANTIATING_CORRELATOR number(19,0), FAULT number(19,0), JACOB_STATE_DATA blob, PREVIOUS_STATE number(5,0), PROCESS_ID number(19,0), STATE number(5,0), LAST_ACTIVE_DT timestamp, SEQUENCE number(19,0), FAILURE_COUNT number(10,0), FAILURE_DT timestamp, INSERT_TIME timestamp, MLOCK number(10,0) not null, primary key (ID)); +create table BPEL_MESSAGE (ID number(19,0) not null, MEX number(19,0), TYPE varchar2(255 char), MESSAGE_DATA blob, MESSAGE_HEADER blob, INSERT_TIME timestamp, MLOCK number(10,0) not null, primary key (ID)); +create table BPEL_MESSAGE_EXCHANGE (ID number(19,0) not null, PORT_TYPE varchar2(255 char), CHANNEL_NAME varchar2(255 char), CLIENTKEY varchar2(255 char), ENDPOINT blob, CALLBACK_ENDPOINT blob, REQUEST number(19,0), RESPONSE number(19,0), INSERT_DT timestamp, OPERATION varchar2(255 char), STATE varchar2(255 char), PROCESS number(19,0), PIID number(19,0), DIR char(1 char), PLINK_MODELID number(10,0), PATTERN varchar2(255 char), CORR_STATUS varchar2(255 char), FAULT_TYPE varchar2(255 char), FAULT_EXPL varchar2(255 char), CALLEE varchar2(255 char), PARTNERLINK number(19,0), PIPED_ID varchar2(255 char), SUBSCRIBER_COUNT number(10,0), INSERT_TIME timestamp, MLOCK number(10,0) not null, primary key (ID)); +create table BPEL_MEX_PROPS (MEX number(19,0) not null, VALUE long, NAME varchar2(255 char) not null, primary key (MEX, NAME)); +create table BPEL_PLINK_VAL (ID number(19,0) not null, PARTNER_LINK varchar2(100 char) not null, PARTNERROLE varchar2(100 char), MYROLE_EPR_DATA blob, PARTNERROLE_EPR_DATA blob, PROCESS number(19,0), SCOPE number(19,0), SVCNAME varchar2(255 char), MYROLE varchar2(100 char), MODELID number(10,0), MYSESSIONID varchar2(255 char), PARTNERSESSIONID varchar2(255 char), INSERT_TIME timestamp, MLOCK number(10,0) not null, primary key (ID)); +create table BPEL_PROCESS (ID number(19,0) not null, PROCID varchar2(255 char) not null unique, deployer varchar2(255 char), deploydate timestamp, type_name varchar2(255 char), type_ns varchar2(255 char), version number(19,0), ACTIVE_ number(1,0), guid varchar2(255 char), INSERT_TIME timestamp, MLOCK number(10,0) not null, primary key (ID)); +create table BPEL_SCOPE (ID number(19,0) not null, PIID number(19,0), PARENT_SCOPE_ID number(19,0), STATE varchar2(255 char) not null, NAME varchar2(255 char) not null, MODELID number(10,0), INSERT_TIME timestamp, MLOCK number(10,0) not null, primary key (ID)); +create table BPEL_SELECTORS (ID number(19,0) not null, PIID number(19,0) not null, SELGRPID varchar2(255 char) not null, IDX number(10,0) not null, CORRELATION_KEY varchar2(255 char) not null, PROC_TYPE varchar2(255 char) not null, ROUTE_POLICY varchar2(255 char), CORRELATOR number(19,0) not null, INSERT_TIME timestamp, MLOCK number(10,0) not null, primary key (ID), unique (CORRELATION_KEY, CORRELATOR)); +create table BPEL_UNMATCHED (ID number(19,0) not null, MEX number(19,0), CORRELATION_KEY varchar2(255 char), CORRELATOR number(19,0) not null, INSERT_TIME timestamp, MLOCK number(10,0) not null, primary key (ID)); +create table BPEL_XML_DATA (ID number(19,0) not null, DATA blob, NAME varchar2(255 char) not null, SIMPLE_VALUE varchar2(255 char), SCOPE_ID number(19,0), PIID number(19,0), IS_SIMPLE_TYPE number(1,0), INSERT_TIME timestamp, MLOCK number(10,0) not null, primary key (ID)); +create table STORE_DU (NAME varchar2(255 char) not null, deployer varchar2(255 char), DEPLOYDT timestamp, DIR varchar2(255 char), primary key (NAME)); +create table STORE_PROCESS (PID varchar2(255 char) not null, DU varchar2(255 char), TYPE varchar2(255 char), version number(19,0), STATE varchar2(255 char), primary key (PID)); +create table STORE_PROCESS_PROP (propId varchar2(255 char) not null, value varchar2(255 char), name varchar2(255 char) not null, primary key (propId, name)); +create table STORE_VERSIONS (ID number(10,0) not null, VERSION number(19,0), primary key (ID)); +create table VAR_PROPERTY (ID number(19,0) not null, XML_DATA_ID number(19,0), PROP_VALUE varchar2(255 char), PROP_NAME varchar2(255 char) not null, INSERT_TIME timestamp, MLOCK number(10,0) not null, primary key (ID)); +create index IDX_CORRELATOR_CID on BPEL_CORRELATOR (CID); +create index IDX_BPEL_CORRELATOR_MESSAGE_CKEY on BPEL_CORRELATOR_MESSAGE_CKEY (CKEY); +create index IDX_SELECTOR_CORRELATOR on BPEL_SELECTORS (CORRELATOR); +create index IDX_SELECTOR_CKEY on BPEL_SELECTORS (CORRELATION_KEY); +create index IDX_SELECTOR_SELGRPID on BPEL_SELECTORS (SELGRPID); +create index IDX_UNMATCHED_CKEY on BPEL_UNMATCHED (CORRELATION_KEY); +create index IDX_UNMATCHED_CORRELATOR on BPEL_UNMATCHED (CORRELATOR); +create sequence hibernate_seqhilo; \ No newline at end of file Modified: trunk/runtime/engine-assembly/src/main/resources/bpel-sql/postgres.sql =================================================================== --- trunk/runtime/engine-assembly/src/main/resources/bpel-sql/postgres.sql 2010-06-03 10:48:29 UTC (rev 702) +++ trunk/runtime/engine-assembly/src/main/resources/bpel-sql/postgres.sql 2010-06-03 13:09:24 UTC (rev 703) @@ -1,25 +1,5 @@ --- --- Licensed to the Apache Software Foundation (ASF) under one --- or more contributor license agreements. See the NOTICE file --- distributed with this work for additional information --- regarding copyright ownership. The ASF licenses this file --- to you under the Apache License, Version 2.0 (the --- "License"); you may not use this file except in compliance --- with the License. You may obtain a copy of the License at --- --- http://www.apache.org/licenses/LICENSE-2.0 --- --- Unless required by applicable law or agreed to in writing, --- software distributed under the License is distributed on an --- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY --- KIND, either express or implied. See the License for the --- specific language governing permissions and limitations --- under the License. --- - create table ODE_SCHEMA_VERSION(VERSION integer); insert into ODE_SCHEMA_VERSION values (6); - -- Apache ODE - SimpleScheduler Database Schema -- -- Apache Derby scripts by Maciej Szefler. @@ -50,224 +30,33 @@ CREATE INDEX IDX_ODE_JOB_NODEID ON ODE_JOB(nodeid); - - create table ODE_ACTIVITY_RECOVERY ( - ID int8 not null, - ACTIONS varchar(255), - ACTIVITY_ID int8, - CHANNEL varchar(255), - DATE_TIME timestamp, - DETAILS text, - INSTANCE_ID int8, - REASON varchar(255), - RETRIES int4, - primary key (ID) - ); - - create table ODE_CORRELATION_SET ( - CORRELATION_SET_ID int8 not null, - CORRELATION_KEY varchar(255), - NAME varchar(255), - SCOPE_ID int8, - primary key (CORRELATION_SET_ID) - ); - - create table ODE_CORRELATOR ( - CORRELATOR_ID int8 not null, - CORRELATOR_KEY varchar(255), - PROC_ID int8, - primary key (CORRELATOR_ID) - ); - - create table ODE_CORSET_PROP ( - ID int8 not null, - CORRSET_ID int8, - PROP_KEY varchar(255), - PROP_VALUE varchar(255), - primary key (ID) - ); - - create table ODE_EVENT ( - EVENT_ID int8 not null, - DETAIL varchar(255), - DATA oid, - SCOPE_ID int8, - TSTAMP timestamp, - TYPE varchar(255), - INSTANCE_ID int8, - PROCESS_ID int8, - primary key (EVENT_ID) - ); - - create table ODE_FAULT ( - FAULT_ID int8 not null, - ACTIVITY_ID int4, - DATA text, - MESSAGE varchar(4000), - LINE_NUMBER int4, - NAME varchar(255), - primary key (FAULT_ID) - ); - - create table ODE_MESSAGE ( - MESSAGE_ID int8 not null, - DATA text, - HEADER text, - TYPE varchar(255), - MESSAGE_EXCHANGE_ID varchar(255), - primary key (MESSAGE_ID) - ); - - create table ODE_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 text, - FAULT varchar(255), - FAULT_EXPLANATION varchar(255), - OPERATION varchar(255), - PARTNER_LINK_MODEL_ID int4, - PATTERN varchar(255), - PIPED_ID varchar(255), - PORT_TYPE varchar(255), - PROPAGATE_TRANS bool, - STATUS varchar(255), - SUBSCRIBER_COUNT int4, - CORR_ID int8, - PARTNER_LINK_ID int8, - PROCESS_ID int8, - PROCESS_INSTANCE_ID int8, - REQUEST_MESSAGE_ID int8, - RESPONSE_MESSAGE_ID int8, - primary key (MESSAGE_EXCHANGE_ID) - ); - - create table ODE_MESSAGE_ROUTE ( - MESSAGE_ROUTE_ID int8 not null, - CORRELATION_KEY varchar(255), - GROUP_ID varchar(255), - ROUTE_INDEX int4, - PROCESS_INSTANCE_ID int8, - ROUTE_POLICY varchar(16), - CORR_ID int8, - primary key (MESSAGE_ROUTE_ID) - ); - - create table ODE_MEX_PROP ( - ID int8 not null, - MEX_ID varchar(255), - PROP_KEY varchar(255), - PROP_VALUE varchar(2000), - primary key (ID) - ); - - create table ODE_PARTNER_LINK ( - PARTNER_LINK_ID int8 not null, - MY_EPR text, - MY_ROLE_NAME varchar(255), - MY_ROLE_SERVICE_NAME varchar(255), - MY_SESSION_ID varchar(255), - PARTNER_EPR text, - PARTNER_LINK_MODEL_ID int4, - PARTNER_LINK_NAME varchar(255), - PARTNER_ROLE_NAME varchar(255), - PARTNER_SESSION_ID varchar(255), - SCOPE_ID int8, - primary key (PARTNER_LINK_ID) - ); - - create table ODE_PROCESS ( - ID int8 not null, - GUID varchar(255), - PROCESS_ID varchar(255), - PROCESS_TYPE varchar(255), - VERSION int8, - primary key (ID) - ); - - create table ODE_PROCESS_INSTANCE ( - ID int8 not null, - DATE_CREATED timestamp, - EXECUTION_STATE oid, - FAULT_ID int8, - LAST_ACTIVE_TIME timestamp, - LAST_RECOVERY_DATE timestamp, - PREVIOUS_STATE int2, - SEQUENCE int8, - INSTANCE_STATE int2, - INSTANTIATING_CORRELATOR_ID int8, - PROCESS_ID int8, - ROOT_SCOPE_ID int8, - primary key (ID) - ); - - create table ODE_SCOPE ( - SCOPE_ID int8 not null, - MODEL_ID int4, - SCOPE_NAME varchar(255), - SCOPE_STATE varchar(255), - PARENT_SCOPE_ID int8, - PROCESS_INSTANCE_ID int8, - primary key (SCOPE_ID) - ); - - create table ODE_XML_DATA ( - XML_DATA_ID int8 not null, - DATA text, - IS_SIMPLE_TYPE bool, - NAME varchar(255), - SCOPE_ID int8, - primary key (XML_DATA_ID) - ); - - create table ODE_XML_DATA_PROP ( - ID int8 not null, - XML_DATA_ID int8, - 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 int8, - DU varchar(255), - primary key (PID) - ); - - create table STORE_PROCESS_PROP ( - ID int8 not null, - 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 int8 not null, - primary key (STORE_PROCESS_PID, STORE_PROPERTY_ID), - unique (STORE_PROPERTY_ID) - ); - - create table STORE_VERSIONS ( - ID int8 not null, - VERSION int8, - primary key (ID) - ); - - create sequence hibernate_sequence; \ No newline at end of file +create table BPEL_ACTIVITY_RECOVERY (ID int8 not null, PIID int8, AID int8, CHANNEL varchar(255), REASON varchar(255), DATE_TIME timestamp, DETAILS bytea, ACTIONS varchar(255), RETRIES int4, INSERT_TIME timestamp, MLOCK int4 not null, primary key (ID)); +create table BPEL_CORRELATION_PROP (ID int8 not null, NAME varchar(255), NAMESPACE varchar(255), VALUE varchar(255), CORR_SET_ID int8, INSERT_TIME timestamp, MLOCK int4 not null, primary key (ID)); +create table BPEL_CORRELATION_SET (ID int8 not null, VALUE varchar(255), CORR_SET_NAME varchar(255), SCOPE_ID int8, PIID int8, PROCESS_ID int8, INSERT_TIME timestamp, MLOCK int4 not null, primary key (ID)); +create table BPEL_CORRELATOR (ID int8 not null, CID varchar(255), PROCESS_ID int8, INSERT_TIME timestamp, MLOCK int4 not null, primary key (ID)); +create table BPEL_CORRELATOR_MESSAGE_CKEY (ID int8 not null, CKEY varchar(255), CORRELATOR_MESSAGE_ID int8, INSERT_TIME timestamp, MLOCK int4 not null, primary key (ID)); +create table BPEL_EVENT (ID int8 not null, IID int8, PID int8, TSTAMP timestamp, TYPE varchar(255), DETAIL text, DATA bytea, SID int8, INSERT_TIME timestamp, MLOCK int4 not null, primary key (ID)); +create table BPEL_FAULT (ID int8 not null, FAULTNAME varchar(255), DATA bytea, EXPLANATION varchar(4000), LINE_NUM int4, AID int4, INSERT_TIME timestamp, MLOCK int4 not null, primary key (ID)); +create table BPEL_INSTANCE (ID int8 not null, INSTANTIATING_CORRELATOR int8, FAULT int8, JACOB_STATE_DATA bytea, PREVIOUS_STATE int2, PROCESS_ID int8, STATE int2, LAST_ACTIVE_DT timestamp, SEQUENCE int8, FAILURE_COUNT int4, FAILURE_DT timestamp, INSERT_TIME timestamp, MLOCK int4 not null, primary key (ID)); +create table BPEL_MESSAGE (ID int8 not null, MEX int8, TYPE varchar(255), MESSAGE_DATA bytea, MESSAGE_HEADER bytea, INSERT_TIME timestamp, MLOCK int4 not null, primary key (ID)); +create table BPEL_MESSAGE_EXCHANGE (ID int8 not null, PORT_TYPE varchar(255), CHANNEL_NAME varchar(255), CLIENTKEY varchar(255), ENDPOINT bytea, CALLBACK_ENDPOINT bytea, REQUEST int8, RESPONSE int8, INSERT_DT timestamp, OPERATION varchar(255), STATE varchar(255), PROCESS int8, PIID int8, DIR char(1), PLINK_MODELID int4, PATTERN varchar(255), CORR_STATUS varchar(255), FAULT_TYPE varchar(255), FAULT_EXPL varchar(255), CALLEE varchar(255), PARTNERLINK int8, PIPED_ID varchar(255), SUBSCRIBER_COUNT int4, INSERT_TIME timestamp, MLOCK int4 not null, primary key (ID)); +create table BPEL_MEX_PROPS (MEX int8 not null, VALUE varchar(8000), NAME varchar(255) not null, primary key (MEX, NAME)); +create table BPEL_PLINK_VAL (ID int8 not null, PARTNER_LINK varchar(100) not null, PARTNERROLE varchar(100), MYROLE_EPR_DATA bytea, PARTNERROLE_EPR_DATA bytea, PROCESS int8, SCOPE int8, SVCNAME varchar(255), MYROLE varchar(100), MODELID int4, MYSESSIONID varchar(255), PARTNERSESSIONID varchar(255), INSERT_TIME timestamp, MLOCK int4 not null, primary key (ID)); +create table BPEL_PROCESS (ID int8 not null, PROCID varchar(255) not null unique, deployer varchar(255), deploydate timestamp, type_name varchar(255), type_ns varchar(255), version int8, ACTIVE_ bool, guid varchar(255), INSERT_TIME timestamp, MLOCK int4 not null, primary key (ID)); +create table BPEL_SCOPE (ID int8 not null, PIID int8, PARENT_SCOPE_ID int8, STATE varchar(255) not null, NAME varchar(255) not null, MODELID int4, INSERT_TIME timestamp, MLOCK int4 not null, primary key (ID)); +create table BPEL_SELECTORS (ID int8 not null, PIID int8 not null, SELGRPID varchar(255) not null, IDX int4 not null, CORRELATION_KEY varchar(255) not null, PROC_TYPE varchar(255) not null, ROUTE_POLICY varchar(255), CORRELATOR int8 not null, INSERT_TIME timestamp, MLOCK int4 not null, primary key (ID), unique (CORRELATION_KEY, CORRELATOR)); +create table BPEL_UNMATCHED (ID int8 not null, MEX int8, CORRELATION_KEY varchar(255), CORRELATOR int8 not null, INSERT_TIME timestamp, MLOCK int4 not null, primary key (ID)); +create table BPEL_XML_DATA (ID int8 not null, DATA bytea, NAME varchar(255) not null, SIMPLE_VALUE varchar(255), SCOPE_ID int8, PIID int8, IS_SIMPLE_TYPE bool, INSERT_TIME timestamp, MLOCK int4 not null, primary key (ID)); +create table STORE_DU (NAME varchar(255) not null, deployer varchar(255), DEPLOYDT timestamp, DIR varchar(255), primary key (NAME)); +create table STORE_PROCESS (PID varchar(255) not null, DU varchar(255), TYPE varchar(255), version int8, STATE varchar(255), primary key (PID)); +create table STORE_PROCESS_PROP (propId varchar(255) not null, value varchar(255), name varchar(255) not null, primary key (propId, name)); +create table STORE_VERSIONS (ID int4 not null, VERSION int8, primary key (ID)); +create table VAR_PROPERTY (ID int8 not null, XML_DATA_ID int8, PROP_VALUE varchar(255), PROP_NAME varchar(255) not null, INSERT_TIME timestamp, MLOCK int4 not null, primary key (ID)); +create index IDX_CORRELATOR_CID on BPEL_CORRELATOR (CID); +create index IDX_BPEL_CORRELATOR_MESSAGE_CKEY on BPEL_CORRELATOR_MESSAGE_CKEY (CKEY); +create index IDX_SELECTOR_CORRELATOR on BPEL_SELECTORS (CORRELATOR); +create index IDX_SELECTOR_CKEY on BPEL_SELECTORS (CORRELATION_KEY); +create index IDX_SELECTOR_SELGRPID on BPEL_SELECTORS (SELGRPID); +create index IDX_UNMATCHED_CKEY on BPEL_UNMATCHED (CORRELATION_KEY); +create index IDX_UNMATCHED_CORRELATOR on BPEL_UNMATCHED (CORRELATOR); +create sequence hibernate_seqhilo; \ No newline at end of file Modified: trunk/runtime/engine-assembly/src/main/resources/bpel-sql/sqlserver.sql =================================================================== --- trunk/runtime/engine-assembly/src/main/resources/bpel-sql/sqlserver.sql 2010-06-03 10:48:29 UTC (rev 702) +++ trunk/runtime/engine-assembly/src/main/resources/bpel-sql/sqlserver.sql 2010-06-03 13:09:24 UTC (rev 703) @@ -1,42 +1,58 @@ create table ODE_SCHEMA_VERSION(VERSION integer); -insert into ODE_SCHEMA_VERSION values (5); +insert into ODE_SCHEMA_VERSION values (6); -- Apache ODE - SimpleScheduler Database Schema -- -- Apache Derby scripts by Maciej Szefler. -- -- -CREATE TABLE ode_job ( +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, - details image null, + + 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(4096), + PRIMARY KEY(jobid)); -CREATE INDEX IDX_ODE_JOB_TS ON ode_job(ts); -CREATE INDEX IDX_ODE_JOB_NODEID ON ode_job(nodeid); +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 numeric(19,0) not null, PIID numeric(19,0) null, AID numeric(19,0) null, CHANNEL varchar(255) null, REASON varchar(255) null, DATE_TIME datetime null, DETAILS image null, ACTIONS varchar(255) null, RETRIES int null, INSERT_TIME datetime null, MLOCK int not null, primary key (ID)); +create table BPEL_ACTIVITY_RECOVERY (ID numeric(19,0) not null, PIID numeric(19,0) null, AID numeric(19,0) null, CHANNEL varchar(255) null, REASON varchar(255) null, DATE_TIME datetime null, DETAILS blob(2G) null, ACTIONS varchar(255) null, RETRIES int null, INSERT_TIME datetime null, MLOCK int not null, primary key (ID)); create table BPEL_CORRELATION_PROP (ID numeric(19,0) not null, NAME varchar(255) null, NAMESPACE varchar(255) null, VALUE varchar(255) null, CORR_SET_ID numeric(19,0) null, INSERT_TIME datetime null, MLOCK int not null, primary key (ID)); create table BPEL_CORRELATION_SET (ID numeric(19,0) not null, VALUE varchar(255) null, CORR_SET_NAME varchar(255) null, SCOPE_ID numeric(19,0) null, PIID numeric(19,0) null, PROCESS_ID numeric(19,0) null, INSERT_TIME datetime null, MLOCK int not null, primary key (ID)); create table BPEL_CORRELATOR (ID numeric(19,0) not null, CID varchar(255) null, PROCESS_ID numeric(19,0) null, INSERT_TIME datetime null, MLOCK int not null, primary key (ID)); create table BPEL_CORRELATOR_MESSAGE_CKEY (ID numeric(19,0) not null, CKEY varchar(255) null, CORRELATOR_MESSAGE_ID numeric(19,0) null, INSERT_TIME datetime null, MLOCK int not null, primary key (ID)); -create table BPEL_EVENT (ID numeric(19,0) not null, IID numeric(19,0) null, PID numeric(19,0) null, TSTAMP datetime null, TYPE varchar(255) null, DETAIL text null, DATA image null, SID numeric(19,0) null, INSERT_TIME datetime null, MLOCK int not null, primary key (ID)); -create table BPEL_FAULT (ID numeric(19,0) not null, FAULTNAME varchar(255) null, DATA image null, EXPLANATION varchar(4000) null, LINE_NUM int null, AID int null, INSERT_TIME datetime null, MLOCK int not null, primary key (ID)); -create table BPEL_INSTANCE (ID numeric(19,0) not null, INSTANTIATING_CORRELATOR numeric(19,0) null, FAULT numeric(19,0) null, JACOB_STATE_DATA image null, PREVIOUS_STATE smallint null, PROCESS_ID numeric(19,0) null, STATE smallint null, LAST_ACTIVE_DT datetime null, SEQUENCE numeric(19,0) null, FAILURE_COUNT int null, FAILURE_DT datetime null, INSERT_TIME datetime null, MLOCK int not null, primary key (ID)); -create table BPEL_MESSAGE (ID numeric(19,0) not null, MEX numeric(19,0) null, TYPE varchar(255) null, MESSAGE_DATA image null, MESSAGE_HEADER image null, INSERT_TIME datetime null, MLOCK int not null, primary key (ID)); -create table BPEL_MESSAGE_EXCHANGE (ID numeric(19,0) not null, PORT_TYPE varchar(255) null, CHANNEL_NAME varchar(255) null, CLIENTKEY varchar(255) null, ENDPOINT image null, CALLBACK_ENDPOINT image null, REQUEST numeric(19,0) null, RESPONSE numeric(19,0) null, INSERT_DT datetime null, OPERATION varchar(255) null, STATE varchar(255) null, PROCESS numeric(19,0) null, PIID numeric(19,0) null, DIR char(1) null, PLINK_MODELID int null, PATTERN varchar(255) null, CORR_STATUS varchar(255) null, FAULT_TYPE varchar(255) null, FAULT_EXPL varchar(255) null, CALLEE varchar(255) null, PARTNERLINK numeric(19,0) null, PIPED_ID varchar(255) null, SUBSCRIBER_COUNT int null, INSERT_TIME datetime null, MLOCK int not null, primary key (ID)); +create table BPEL_EVENT (ID numeric(19,0) not null, IID numeric(19,0) null, PID numeric(19,0) null, TSTAMP datetime null, TYPE varchar(255) null, DETAIL text null, DATA blob(2G) null, SID numeric(19,0) null, INSERT_TIME datetime null, MLOCK int not null, primary key (ID)); +create table BPEL_FAULT (ID numeric(19,0) not null, FAULTNAME varchar(255) null, DATA blob(2G) null, EXPLANATION varchar(4000) null, LINE_NUM int null, AID int null, INSERT_TIME datetime null, MLOCK int not null, primary key (ID)); +create table BPEL_INSTANCE (ID numeric(19,0) not null, INSTANTIATING_CORRELATOR numeric(19,0) null, FAULT numeric(19,0) null, JACOB_STATE_DATA blob(2G) null, PREVIOUS_STATE smallint null, PROCESS_ID numeric(19,0) null, STATE smallint null, LAST_ACTIVE_DT datetime null, SEQUENCE numeric(19,0) null, FAILURE_COUNT int null, FAILURE_DT datetime null, INSERT_TIME datetime null, MLOCK int not null, primary key (ID)); +create table BPEL_MESSAGE (ID numeric(19,0) not null, MEX numeric(19,0) null, TYPE varchar(255) null, MESSAGE_DATA blob(2G) null, MESSAGE_HEADER blob(2G) null, INSERT_TIME datetime null, MLOCK int not null, primary key (ID)); +create table BPEL_MESSAGE_EXCHANGE (ID numeric(19,0) not null, PORT_TYPE varchar(255) null, CHANNEL_NAME varchar(255) null, CLIENTKEY varchar(255) null, ENDPOINT blob(2G) null, CALLBACK_ENDPOINT blob(2G) null, REQUEST numeric(19,0) null, RESPONSE numeric(19,0) null, INSERT_DT datetime null, OPERATION varchar(255) null, STATE varchar(255) null, PROCESS numeric(19,0) null, PIID numeric(19,0) null, DIR char(1) null, PLINK_MODELID int null, PATTERN varchar(255) null, CORR_STATUS varchar(255) null, FAULT_TYPE varchar(255) null, FAULT_EXPL varchar(255) null, CALLEE varchar(255) null, PARTNERLINK numeric(19,0) null, PIPED_ID varchar(255) null, SUBSCRIBER_COUNT int null, INSERT_TIME datetime null, MLOCK int not null, primary key (ID)); create table BPEL_MEX_PROPS (MEX numeric(19,0) not null, VALUE varchar(8000) null, NAME varchar(255) not null, primary key (MEX, NAME)); -create table BPEL_PLINK_VAL (ID numeric(19,0) not null, PARTNER_LINK varchar(100) not null, PARTNERROLE varchar(100) null, MYROLE_EPR_DATA image null, PARTNERROLE_EPR_DATA image null, PROCESS numeric(19,0) null, SCOPE numeric(19,0) null, SVCNAME varchar(255) null, MYROLE varchar(100) null, MODELID int null, MYSESSIONID varchar(255) null, PARTNERSESSIONID varchar(255) null, INSERT_TIME datetime null, MLOCK int not null, primary key (ID)); +create table BPEL_PLINK_VAL (ID numeric(19,0) not null, PARTNER_LINK varchar(100) not null, PARTNERROLE varchar(100) null, MYROLE_EPR_DATA blob(2G) null, PARTNERROLE_EPR_DATA blob(2G) null, PROCESS numeric(19,0) null, SCOPE numeric(19,0) null, SVCNAME varchar(255) null, MYROLE varchar(100) null, MODELID int null, MYSESSIONID varchar(255) null, PARTNERSESSIONID varchar(255) null, INSERT_TIME datetime null, MLOCK int not null, primary key (ID)); create table BPEL_PROCESS (ID numeric(19,0) not null, PROCID varchar(255) not null unique, deployer varchar(255) null, deploydate datetime null, type_name varchar(255) null, type_ns varchar(255) null, version numeric(19,0) null, ACTIVE_ tinyint null, guid varchar(255) null, INSERT_TIME datetime null, MLOCK int not null, primary key (ID)); create table BPEL_SCOPE (ID numeric(19,0) not null, PIID numeric(19,0) null, PARENT_SCOPE_ID numeric(19,0) null, STATE varchar(255) not null, NAME varchar(255) not null, MODELID int null, INSERT_TIME datetime null, MLOCK int not null, primary key (ID)); create table BPEL_SELECTORS (ID numeric(19,0) not null, PIID numeric(19,0) not null, SELGRPID varchar(255) not null, IDX int not null, CORRELATION_KEY varchar(255) not null, PROC_TYPE varchar(255) not null, ROUTE_POLICY varchar(255) null, CORRELATOR numeric(19,0) not null, INSERT_TIME datetime null, MLOCK int not null, primary key (ID), unique (CORRELATION_KEY, CORRELATOR)); create table BPEL_UNMATCHED (ID numeric(19,0) not null, MEX numeric(19,0) null, CORRELATION_KEY varchar(255) null, CORRELATOR numeric(19,0) not null, INSERT_TIME datetime null, MLOCK int not null, primary key (ID)); -create table BPEL_XML_DATA (ID numeric(19,0) not null, DATA image null, NAME varchar(255) not null, SCOPE_ID numeric(19,0) null, PIID numeric(19,0) null, IS_SIMPLE_TYPE tinyint null, INSERT_TIME datetime null, MLOCK int not null, primary key (ID)); +create table BPEL_XML_DATA (ID numeric(19,0) not null, DATA blob(2G) null, NAME varchar(255) not null, SIMPLE_VALUE varchar(255) null, SCOPE_ID numeric(19,0) null, PIID numeric(19,0) null, IS_SIMPLE_TYPE tinyint null, INSERT_TIME datetime null, MLOCK int not null, primary key (ID)); +create table STORE_DU (NAME varchar(255) not null, deployer varchar(255) null, DEPLOYDT datetime null, DIR varchar(255) null, primary key (NAME)); +create table STORE_PROCESS (PID varchar(255) not null, DU varchar(255) null, TYPE varchar(255) null, version numeric(19,0) null, STATE varchar(255) null, primary key (PID)); +create table STORE_PROCESS_PROP (propId varchar(255) not null, value varchar(255) null, name varchar(255) not null, primary key (propId, name)); +create table STORE_VERSIONS (ID int not null, VERSION numeric(19,0) null, primary key (ID)); create table VAR_PROPERTY (ID numeric(19,0) not null, XML_DATA_ID numeric(19,0) null, PROP_VALUE varchar(255) null, PROP_NAME varchar(255) not null, INSERT_TIME datetime null, MLOCK int not null, primary key (ID)); + create index IDX_CORRELATOR_CID on BPEL_CORRELATOR (CID); create index IDX_BPEL_CORRELATOR_MESSAGE_CKEY on BPEL_CORRELATOR_MESSAGE_CKEY (CKEY); create index IDX_SELECTOR_CORRELATOR on BPEL_SELECTORS (CORRELATOR); @@ -45,34 +61,4 @@ create index IDX_UNMATCHED_CKEY on BPEL_UNMATCHED (CORRELATION_KEY); create index IDX_UNMATCHED_CORRELATOR on BPEL_UNMATCHED (CORRELATOR); create table hibernate_unique_key ( next_hi int ); -insert into hibernate_unique_key values ( 0 ); - ---create indexes - -create index IDX_XMLDATA_IID on BPEL_XML_DATA (PIID) ; -create index IDX_XMLDATA_SID on BPEL_XML_DATA (SCOPE_ID) ; -create index IDX_XMLDATA_NAME on BPEL_XML_DATA (NAME) ; -create index IDX_XMLDATA_NAME_SID on BPEL_XML_DATA (NAME, SCOPE_ID) ; -create index IDX_EVENT_IID on BPEL_EVENT (IID) ; -create index IDX_EVENT_PID on BPEL_EVENT (PID) ; -create index IDX_CORR_SET_NAME on BPEL_CORRELATION_SET (CORR_SET_NAME) ; -create index IDX_CORR_SET_SCOPE_ID on BPEL_CORRELATION_SET (SCOPE_ID) ; -create index IDX_BPEL_INSTANCE_PROCESS_ID on BPEL_INSTANCE (PROCESS_ID) ; -create index IDX_BPEL_INSTANCE_STATE on BPEL_INSTANCE (STATE) ; -create index IDX_BPEL_PROCESS_TYPE_NAME on BPEL_PROCESS (type_name) ; -create index IDX_BPEL_PROCESS_TYPE_NS on BPEL_PROCESS (type_ns) ; -create index IDX_BPEL_CORRELATOR_PROCESS_ID on BPEL_CORRELATOR (PROCESS_ID) ; -create index IDX_UNMATCHED_CORRELATOR_CKEY on BPEL_UNMATCHED (CORRELATOR,CORRELATION_KEY) ; -create index IDX_PLINK_VAL_PROCESS_IDX on BPEL_PLINK_VAL (PROCESS) ; -create index IDX_PLINK_VAL_SCOPE on BPEL_PLINK_VAL (SCOPE) ; -create index IDX_PLINK_VAL_MODELID on BPEL_PLINK_VAL (MODELID) ; -create index IDX_SELECTOR_INSTANCE on BPEL_SELECTORS (PIID) ; -create index IDX_VARPROP_XMLDATA on VAR_PROPERTY (XML_DATA_ID) ; -create index IDX_VARPROP_NAME on VAR_PROPERTY (PROP_NAME) ; -create index IDX_VARPROP_VALUE on VAR_PROPERTY (PROP_VALUE) ; -create index IDX_UNMATCHED_MEX on BPEL_UNMATCHED (MEX) ; - ---Indexes for instance deletion -create index IDX_MESSAGE_MEX on BPEL_MESSAGE(MEX) ; -create index IDX_MESSAGE_EXCHANGE_PIID on BPEL_MESSAGE_EXCHANGE(PIID) ; -create index IDX_SCOPE_PIID on BPEL_SCOPE(PIID) ; +insert into hibernate_unique_key values ( 0 ); \ No newline at end of file

14 years, 6 months

1
0
0 / 0

Hudson build became unstable: RiftSaw #184

by jboss-qa-internal＠redhat.com

See <http://hudson.qa.jboss.com/hudson/job/RiftSaw/184/changes>

14 years, 6 months

1
13
0 / 0

riftsaw SVN: r702 - branches/ODE/ODE-1.x-fixes/scheduler-simple/src/main/java/org/apache/ode/scheduler/simple.

by riftsaw-commits＠lists.jboss.org

Author: jeff.yuchang Date: 2010-06-03 06:48:29 -0400 (Thu, 03 Jun 2010) New Revision: 702 Modified: branches/ODE/ODE-1.x-fixes/scheduler-simple/src/main/java/org/apache/ode/scheduler/simple/JdbcDelegate.java Log: * update the data type. Modified: branches/ODE/ODE-1.x-fixes/scheduler-simple/src/main/java/org/apache/ode/scheduler/simple/JdbcDelegate.java =================================================================== --- branches/ODE/ODE-1.x-fixes/scheduler-simple/src/main/java/org/apache/ode/scheduler/simple/JdbcDelegate.java 2010-06-03 10:44:38 UTC (rev 701) +++ branches/ODE/ODE-1.x-fixes/scheduler-simple/src/main/java/org/apache/ode/scheduler/simple/JdbcDelegate.java 2010-06-03 10:48:29 UTC (rev 702) @@ -318,7 +318,7 @@ details.instanceId = (Long) detailsExt.get("iid"); } if (detailsExt.get("pid") != null) { - details.processId = (String) detailsExt.get("pid"); + details.processId = detailsExt.get("pid").toString(); } if (detailsExt.get("inmem") != null) { details.inMem = (Boolean) detailsExt.get("inmem");

14 years, 6 months

1
0
0 / 0

riftsaw SVN: r701 - in trunk: distribution/src/main/release/db and 7 other directories.

by riftsaw-commits＠lists.jboss.org

Author: jeff.yuchang Date: 2010-06-03 06:44:38 -0400 (Thu, 03 Jun 2010) New Revision: 701 Modified: trunk/distribution/src/main/release/db/bpel.properties trunk/pom.xml trunk/runtime/engine-assembly/pom.xml trunk/runtime/engine-assembly/src/main/assembly/sar.xml trunk/runtime/engine-assembly/src/main/resources/bpel-sql/hsql.sql trunk/runtime/engine-assembly/src/main/resources/bpel.properties trunk/runtime/engine/src/main/java/org/apache/ode/store/RiftSawProcessStore.java trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/BPELEngineImpl.java trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/WebServiceClient.java Log: * update the riftsaw to use the ODE-1.x-fixes branch, which is using the native Hibernate Implementation. * Had the exception when do the undeploy. Modified: trunk/distribution/src/main/release/db/bpel.properties =================================================================== --- trunk/distribution/src/main/release/db/bpel.properties 2010-06-03 10:11:45 UTC (rev 700) +++ trunk/distribution/src/main/release/db/bpel.properties 2010-06-03 10:44:38 UTC (rev 701) @@ -53,10 +53,8 @@ ## DAO Connection Factory class. ## uncomment the following for hibernate. +bpel.dao.factory=org.apache.ode.daohib.bpel.BpelDAOConnectionFactoryImpl -bpel.dao.factory=org.apache.ode.dao.jpa.hibernate.BpelDAOConnectionFactoryImpl -bpel.dao.factory.store=org.apache.ode.dao.jpa.hibernate.ConfStoreDAOConnectionFactoryImpl - ## Transaction Factory ## default is org.apache.ode.il.EmbeddedGeronimoFactory ## available alternatives are: Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-06-03 10:11:45 UTC (rev 700) +++ trunk/pom.xml 2010-06-03 10:44:38 UTC (rev 701) @@ -72,7 +72,7 @@ </profiles> <properties> - <riftsaw.ode.version>2.1.0.CR1-SNAPSHOT</riftsaw.ode.version> + <riftsaw.ode.version>2.1.0-SNAPSHOT</riftsaw.ode.version> <riftsaw.engine.version>2.1.0-CR1</riftsaw.engine.version> <bpm.console.version>2.1-SNAPSHOT</bpm.console.version> <commons.logging.version>1.1.1</commons.logging.version> @@ -209,16 +209,11 @@ </dependency> <dependency> <groupId>org.jboss.soa.bpel</groupId> - <artifactId>riftsaw-dao-jpa</artifactId> + <artifactId>riftsaw-dao-hibernate</artifactId> <version>${riftsaw.ode.version}</version> </dependency> <dependency> <groupId>org.jboss.soa.bpel</groupId> - <artifactId>riftsaw-dao-jpa-hibernate</artifactId> - <version>${riftsaw.ode.version}</version> - </dependency> - <dependency> - <groupId>org.jboss.soa.bpel</groupId> <artifactId>riftsaw-jacob</artifactId> <version>${riftsaw.ode.version}</version> </dependency> Modified: trunk/runtime/engine/src/main/java/org/apache/ode/store/RiftSawProcessStore.java =================================================================== --- trunk/runtime/engine/src/main/java/org/apache/ode/store/RiftSawProcessStore.java 2010-06-03 10:11:45 UTC (rev 700) +++ trunk/runtime/engine/src/main/java/org/apache/ode/store/RiftSawProcessStore.java 2010-06-03 10:44:38 UTC (rev 701) @@ -22,7 +22,7 @@ import java.util.regex.Pattern; import javax.naming.InitialContext; -import javax.transaction.TransactionManager; +import javax.sql.DataSource; import javax.xml.namespace.QName; import org.apache.commons.logging.Log; @@ -32,9 +32,7 @@ import org.apache.ode.bpel.iapi.EndpointReferenceContext; import org.apache.ode.bpel.iapi.ProcessState; import org.apache.ode.bpel.iapi.ProcessStoreEvent; -import org.apache.ode.dao.store.ConfStoreDAOConnection; -import org.apache.ode.dao.store.ConfStoreDAOConnectionFactory; -import org.apache.ode.dao.store.DeploymentUnitDAO; +import org.apache.ode.il.config.OdeConfigProperties; import org.jboss.soa.bpel.deployer.BPELDeployer; import org.jboss.soa.bpel.deployer.BPELDeploymentUnit; @@ -44,8 +42,8 @@ private static final Log __log = LogFactory.getLog(RiftSawProcessStore.class); private DeployScheduler m_deployScheduler=new DeployScheduler(); - public RiftSawProcessStore(EndpointReferenceContext eprContext, TransactionManager txm, ConfStoreDAOConnectionFactory cf) { - super(eprContext, txm, cf); + public RiftSawProcessStore(EndpointReferenceContext eprContext, DataSource ds, String persistenceType, OdeConfigProperties props, boolean createDatamodel) { + super(eprContext, ds, persistenceType, props, createDatamodel); } public void loadAll() { @@ -138,7 +136,7 @@ // Check for the deployment unit associated with the name boolean deploy=exec(new ProcessStoreImpl.Callable<Boolean>() { - public Boolean call(ConfStoreDAOConnection conn) { + public Boolean call(ConfStoreConnection conn) { boolean ret=false; DeploymentUnitDAO dudao = conn.getDeploymentUnit(bdu.getName()); if (dudao == null) Modified: trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/BPELEngineImpl.java =================================================================== --- trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/BPELEngineImpl.java 2010-06-03 10:11:45 UTC (rev 700) +++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/BPELEngineImpl.java 2010-06-03 10:44:38 UTC (rev 701) @@ -20,6 +20,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.ode.bpel.common.evt.DebugBpelEventListener; +import org.apache.ode.bpel.dao.BpelDAOConnectionFactory; import org.apache.ode.bpel.engine.BpelManagementFacadeImpl; import org.apache.ode.bpel.engine.BpelServerImpl; import org.apache.ode.bpel.engine.CountLRUDehydrationPolicy; @@ -28,8 +29,6 @@ import org.apache.ode.bpel.iapi.*; import org.apache.ode.bpel.intercept.MessageExchangeInterceptor; import org.apache.ode.bpel.memdao.BpelDAOConnectionFactoryImpl; -import org.apache.ode.dao.bpel.BpelDAOConnectionFactory; -import org.apache.ode.dao.store.ConfStoreDAOConnectionFactory; import org.apache.ode.il.config.OdeConfigProperties; import org.apache.ode.il.dbutil.Database; import org.apache.ode.scheduler.simple.JdbcDelegate; @@ -66,7 +65,6 @@ protected OdeConfigProperties _odeConfig; protected TransactionManager _txMgr; protected BpelDAOConnectionFactory _daoCF; - protected ConfStoreDAOConnectionFactory _storeCF; protected Scheduler _scheduler; protected Database _db; protected ExecutorService _executorService; @@ -365,15 +363,6 @@ } finally { _daoCF = null; } - - if (_storeCF != null) - try { - _storeCF.shutdown(); - } catch (Throwable ex) { - __log.debug("Store DAO shutdown failed.", ex); - } finally { - _storeCF = null; - } if (_db != null) try { @@ -433,9 +422,8 @@ __log.debug("USING DAO: "+_odeConfig.getDAOConnectionFactory()); try { _daoCF = _db.createDaoCF(); - _storeCF = _db.createDaoStoreCF(); } catch (Exception ex) { - String errmsg = "DAO INSTANTIATION FAILED: "+_odeConfig.getDAOConnectionFactory() + " and " + _odeConfig.getDAOConfStoreConnectionFactory(); + String errmsg = "DAO INSTANTIATION FAILED: "+_odeConfig.getDAOConnectionFactory(); __log.error(errmsg, ex); throw new Exception(errmsg, ex); @@ -443,14 +431,15 @@ } protected void initProcessStore(EndpointReferenceContext eprContext) { - _store = createProcessStore(eprContext, _txMgr, _storeCF); + _store = createProcessStore(eprContext, _db.getDataSource()); _store.registerListener(new ProcessStoreListenerImpl()); } - protected ProcessStoreImpl createProcessStore(EndpointReferenceContext eprContext, TransactionManager txm, ConfStoreDAOConnectionFactory cf) { - return new RiftSawProcessStore(eprContext, txm, cf); + protected ProcessStoreImpl createProcessStore(EndpointReferenceContext eprContext, DataSource ds) { + return new RiftSawProcessStore(eprContext, ds, _odeConfig.getDAOConnectionFactory(), _odeConfig, false); } + protected Scheduler createScheduler() { SimpleScheduler scheduler = new SimpleScheduler(new GUID().toString(),new JdbcDelegate(_db.getDataSource()), _odeConfig.getProperties()); scheduler.setExecutorService(_executorService); Modified: trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/WebServiceClient.java =================================================================== --- trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/WebServiceClient.java 2010-06-03 10:11:45 UTC (rev 700) +++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/WebServiceClient.java 2010-06-03 10:44:38 UTC (rev 701) @@ -140,6 +140,7 @@ wsdlDefinition = wsdlReference.getDefinition(); wsdlUrl = wsdlReference.getWsdlURL(); } + this.messageAdapter = new SOAPMessageAdapter(this.wsdlDefinition, serviceName, port.getLocalPart()); isInitialized=true; } @@ -158,13 +159,10 @@ boolean isTwoWay = mex.getMessageExchangePattern() == org.apache.ode.bpel.iapi.MessageExchange.MessageExchangePattern.REQUEST_RESPONSE; - final Callable executionCallable; - if(isTwoWay) { // Defer the invoke until the transaction commits. Scheduler scheduler = executionEnvironment.getScheduler(); - executionCallable = new TwoWayCallable(mex); scheduler.registerSynchronizer(new Scheduler.Synchronizer() { public void afterCompletion(boolean success) @@ -175,7 +173,78 @@ // The invocation must happen in a separate thread, holding on the afterCompletion // blocks other operations that could have been listed there as well. ExecutorService executorService = executionEnvironment.getExecutorService(); - executorService.submit(executionCallable); + executorService.submit(new Callable<Object>(){ + + public Object call() throws Exception { + UserTransaction tx = getUserTransaction(); + tx.begin(); + try + { + // Create SOAPMessage + SOAPMessage soapRequestMessage = MessageFactory.newInstance().createMessage(); + if(log.isDebugEnabled()) + log.debug( "ODE outbound message: \n" +DOMWriter.printNode(mex.getRequest().getMessage(), true) ); + + messageAdapter.createSoapRequest(soapRequestMessage, mex.getRequest(), mex.getOperation()); + + if (log.isDebugEnabled()) { + log.debug("Riftsaw soap request message: \n" + JavaUtils.getSoapMessageASString(soapRequestMessage)); + } + + // The actual WS invocation + Dispatch proxy = getDispatcher(port); + + try { + SOAPMessage soapResponseMessage = (SOAPMessage)proxy.invoke(soapRequestMessage); + + // Create ODE response + Message odeResponse = mex.createMessage(mex.getOperation().getOutput().getMessage().getQName()); + if(soapResponseMessage.getSOAPBody().hasFault()) + { + // fault handling + Document odeMsg = DOMUtils.newDocument(); + Element odeMsgEl = odeMsg.createElementNS(null, "message"); + odeMsg.appendChild(odeMsgEl); + + Fault fault = messageAdapter.parseSoapFault(odeMsgEl, soapResponseMessage, mex.getOperation()); + + handleFault(mex, fault, soapResponseMessage.getSOAPBody().getFault(), odeMsgEl); + + } + else + { + messageAdapter.parseSoapResponse(odeResponse,soapResponseMessage,mex.getOperation()); + mex.reply(odeResponse); + } + + if(log.isDebugEnabled()) + log.debug( "ODE inbound message: \n" +DOMWriter.printNode(odeResponse.getMessage(), true) ); + + + } catch(javax.xml.ws.soap.SOAPFaultException fe) { + + // fault handling + Document odeMsg = DOMUtils.newDocument(); + Element odeMsgEl = odeMsg.createElementNS(null, "message"); + odeMsg.appendChild(odeMsgEl); + + Fault fault=messageAdapter.parseSoapFault(odeMsgEl, fe.getFault(), + mex.getOperation()); + + handleFault(mex, fault, fe.getFault(), odeMsgEl); + } + tx.commit(); + } + catch (Throwable e) + { + log.error("WS invocation failed", e); + tx.rollback(); + mex.replyWithFailure(MessageExchange.FailureType.COMMUNICATION_ERROR, e.getMessage(), null); + } + return null; + } + + }); } public void beforeCompletion(){} @@ -188,136 +257,44 @@ { // one-way invocation ExecutorService executorService = executionEnvironment.getExecutorService(); - executionCallable = new OneWayCallable(mex); - executorService.submit(executionCallable); + executorService.submit(new Callable<Object>(){ - mex.replyOneWayOk(); - } - } - - private class TwoWayCallable implements Callable<Object> { - - private PartnerRoleMessageExchange mex; - - public TwoWayCallable(PartnerRoleMessageExchange mex) { - this.mex = mex; - } - - public Object call() throws Exception { - - return executionEnvironment.getScheduler().execTransaction(new Callable<Object>(){ + public Object call() throws Exception { + UserTransaction tx = getUserTransaction(); + tx.begin(); + try + { + // Create SOAPMessage + SOAPMessage soapRequestMessage = MessageFactory.newInstance().createMessage(); + if(log.isDebugEnabled()) + log.debug( "ODE outbound message: \n" +DOMWriter.printNode(mex.getRequest().getMessage(), true) ); + + messageAdapter.createSoapRequest(soapRequestMessage, mex.getRequest(), mex.getOperation()); - public Object call() throws Exception { - try - { - // Create SOAPMessage - SOAPMessage soapRequestMessage = MessageFactory.newInstance().createMessage(); - if(log.isDebugEnabled()) - log.debug( "ODE outbound message: \n" +DOMWriter.printNode(mex.getRequest().getMessage(), true) ); - - messageAdapter.createSoapRequest(soapRequestMessage, mex.getRequest(), mex.getOperation()); - - if (log.isDebugEnabled()) { - log.debug("Riftsaw soap request message: \n" + JavaUtils.getSoapMessageASString(soapRequestMessage)); - } - - // The actual WS invocation - Dispatch proxy = getDispatcher(port); - - try { - SOAPMessage soapResponseMessage = (SOAPMessage)proxy.invoke(soapRequestMessage); + if (log.isDebugEnabled()) { + log.debug("Riftsaw soap request message: \n" + JavaUtils.getSoapMessageASString(soapRequestMessage)); + } + + // The actual WS invocation + Dispatch proxy = getDispatcher(port); + proxy.invokeOneWay(soapRequestMessage); + tx.commit(); + } + catch (Throwable e) + { + log.error("WS invocation failed", e); + tx.rollback(); + mex.replyWithFailure(MessageExchange.FailureType.COMMUNICATION_ERROR, e.getMessage(), null); + } - // Create ODE response - Message odeResponse = mex.createMessage(mex.getOperation().getOutput().getMessage().getQName()); - if(soapResponseMessage.getSOAPBody().hasFault()) - { - // fault handling - Document odeMsg = DOMUtils.newDocument(); - Element odeMsgEl = odeMsg.createElementNS(null, "message"); - odeMsg.appendChild(odeMsgEl); - - Fault fault = messageAdapter.parseSoapFault(odeMsgEl, soapResponseMessage, mex.getOperation()); + return null; + } + + + }); - handleFault(mex, fault, soapResponseMessage.getSOAPBody().getFault(), odeMsgEl); - - } - else - { - messageAdapter.parseSoapResponse(odeResponse,soapResponseMessage,mex.getOperation()); - mex.reply(odeResponse); - } - - if(log.isDebugEnabled()) - log.debug( "ODE inbound message: \n" +DOMWriter.printNode(odeResponse.getMessage(), true) ); - - } catch(javax.xml.ws.soap.SOAPFaultException fe) { - - // fault handling - Document odeMsg = DOMUtils.newDocument(); - Element odeMsgEl = odeMsg.createElementNS(null, "message"); - odeMsg.appendChild(odeMsgEl); - - Fault fault=messageAdapter.parseSoapFault(odeMsgEl, fe.getFault(), - mex.getOperation()); - - handleFault(mex, fault, fe.getFault(), odeMsgEl); - } - } - catch (Throwable e) - { - log.error("WS invocation failed", e); - mex.replyWithFailure(MessageExchange.FailureType.COMMUNICATION_ERROR, e.getMessage(), null); - } - return null; - } - - }); - } - } - - - private class OneWayCallable implements Callable<Object> { - - private PartnerRoleMessageExchange mex; - - public OneWayCallable(PartnerRoleMessageExchange mex) { - this.mex = mex; - } - - public Object call() throws Exception { - return executionEnvironment.getScheduler().execTransaction(new Callable<Object>(){ - - public Object call() throws Exception { - try - { - // Create SOAPMessage - SOAPMessage soapRequestMessage = MessageFactory.newInstance().createMessage(); - if(log.isDebugEnabled()) - log.debug( "ODE outbound message: \n" +DOMWriter.printNode(mex.getRequest().getMessage(), true) ); - - messageAdapter.createSoapRequest(soapRequestMessage, mex.getRequest(), mex.getOperation()); - - if (log.isDebugEnabled()) { - log.debug("Riftsaw soap request message: \n" + JavaUtils.getSoapMessageASString(soapRequestMessage)); - } - - // The actual WS invocation - Dispatch proxy = getDispatcher(port); - proxy.invokeOneWay(soapRequestMessage); - - } - catch (Throwable e) - { - log.error("WS invocation failed", e); - mex.replyWithFailure(MessageExchange.FailureType.COMMUNICATION_ERROR, e.getMessage(), null); - } - - return null; - } - - }); - } - + mex.replyOneWayOk(); + } } @@ -365,7 +342,6 @@ if(null==dispatcher) { log.debug("Creating Dispatcher ("+this.id+") on " + wsdlUrl + ": "+serviceName); - this.messageAdapter = new SOAPMessageAdapter(this.wsdlDefinition, serviceName, port.getLocalPart()); initializeStack(portName); Service service = Service.create(this.wsdlUrl, serviceName); Modified: trunk/runtime/engine-assembly/pom.xml =================================================================== --- trunk/runtime/engine-assembly/pom.xml 2010-06-03 10:11:45 UTC (rev 700) +++ trunk/runtime/engine-assembly/pom.xml 2010-06-03 10:44:38 UTC (rev 701) @@ -48,14 +48,10 @@ </dependency> <dependency> <groupId>org.jboss.soa.bpel</groupId> - <artifactId>riftsaw-dao-jpa</artifactId> + <artifactId>riftsaw-dao-hibernate</artifactId> </dependency> <dependency> <groupId>org.jboss.soa.bpel</groupId> - <artifactId>riftsaw-dao-jpa-hibernate</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.soa.bpel</groupId> <artifactId>riftsaw-jacob</artifactId> </dependency> <dependency> Modified: trunk/runtime/engine-assembly/src/main/assembly/sar.xml =================================================================== --- trunk/runtime/engine-assembly/src/main/assembly/sar.xml 2010-06-03 10:11:45 UTC (rev 700) +++ trunk/runtime/engine-assembly/src/main/assembly/sar.xml 2010-06-03 10:44:38 UTC (rev 701) @@ -53,9 +53,7 @@ <include>org.jboss.soa.bpel:riftsaw-bpel-runtime</include> <include>org.jboss.soa.bpel:riftsaw-bpel-schemas</include> <include>org.jboss.soa.bpel:riftsaw-bpel-store</include> - <include>org.jboss.soa.bpel:riftsaw-dao-jpa</include> - <include>org.jboss.soa.bpel:riftsaw-dao-jpa-hibernate</include> -  + <include>org.jboss.soa.bpel:riftsaw-dao-hibernate</include> <include>org.jboss.soa.bpel.runtime:riftsaw-engine</include> <include>org.jboss.soa.bpel:riftsaw-jacob</include> <include>org.jboss.soa.bpel:riftsaw-scheduler-simple</include> Modified: trunk/runtime/engine-assembly/src/main/resources/bpel-sql/hsql.sql =================================================================== --- trunk/runtime/engine-assembly/src/main/resources/bpel-sql/hsql.sql 2010-06-03 10:11:45 UTC (rev 700) +++ trunk/runtime/engine-assembly/src/main/resources/bpel-sql/hsql.sql 2010-06-03 10:44:38 UTC (rev 701) @@ -1,12 +1,12 @@ create table ODE_SCHEMA_VERSION(VERSION integer); insert into ODE_SCHEMA_VERSION values (6); - -- Apache ODE - SimpleScheduler Database Schema -- --- MySQL scripts by Maciej Szefler. +-- Apache Derby scripts by Maciej Szefler. -- -- -CREATE TABLE ode_job ( + +CREATE TABLE ODE_JOB ( jobid CHAR(64) NOT NULL DEFAULT '', ts BIGINT NOT NULL DEFAULT 0, nodeid char(64), @@ -26,225 +26,37 @@ PRIMARY KEY(jobid)); -CREATE INDEX IDX_ODE_JOB_TS ON ode_job(ts); -CREATE INDEX IDX_ODE_JOB_NODEID ON ode_job(nodeid); +CREATE INDEX IDX_ODE_JOB_TS ON ODE_JOB(ts); +CREATE INDEX IDX_ODE_JOB_NODEID ON ODE_JOB(nodeid); - create table ODE_ACTIVITY_RECOVERY ( - ID bigint generated by default as identity, - ACTIONS varchar(255), - ACTIVITY_ID bigint, - CHANNEL varchar(255), - DATE_TIME timestamp, - DETAILS clob, - INSTANCE_ID bigint, - REASON varchar(255), - RETRIES integer, - primary key (ID) - ); - - create table ODE_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 ODE_CORRELATOR ( - CORRELATOR_ID bigint generated by default as identity, - CORRELATOR_KEY varchar(255), - PROC_ID bigint, - primary key (CORRELATOR_ID) - ); - - create table ODE_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 ODE_EVENT ( - EVENT_ID bigint generated by default as identity, - DETAIL varchar(255), - DATA blob, - SCOPE_ID bigint, - TSTAMP timestamp, - TYPE varchar(255), - INSTANCE_ID bigint, - PROCESS_ID bigint, - primary key (EVENT_ID) - ); - - create table ODE_FAULT ( - FAULT_ID bigint generated by default as identity, - ACTIVITY_ID integer, - DATA clob, - MESSAGE varchar(4000), - LINE_NUMBER integer, - NAME varchar(255), - primary key (FAULT_ID) - ); - - create table ODE_MESSAGE ( - MESSAGE_ID bigint generated by default as identity, - DATA clob, - HEADER clob, - TYPE varchar(255), - MESSAGE_EXCHANGE_ID varchar(255), - primary key (MESSAGE_ID) - ); - - create table ODE_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(255), - EPR clob, - 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 boolean, - 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 ODE_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 ODE_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 ODE_PARTNER_LINK ( - PARTNER_LINK_ID bigint generated by default as identity, - MY_EPR clob, - MY_ROLE_NAME varchar(255), - MY_ROLE_SERVICE_NAME varchar(255), - MY_SESSION_ID varchar(255), - PARTNER_EPR clob, - 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 ODE_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 ODE_PROCESS_INSTANCE ( - ID bigint generated by default as identity, - DATE_CREATED timestamp, - EXECUTION_STATE blob, - 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 ODE_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 ODE_XML_DATA ( - XML_DATA_ID bigint generated by default as identity, - DATA clob, - IS_SIMPLE_TYPE boolean, - NAME varchar(255), - SCOPE_ID bigint, - primary key (XML_DATA_ID) - ); - - create table ODE_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 +create table BPEL_ACTIVITY_RECOVERY (ID bigint not null, PIID bigint, AID bigint, CHANNEL varchar(255), REASON varchar(255), DATE_TIME timestamp, DETAILS varbinary, ACTIONS varchar(255), RETRIES integer, INSERT_TIME timestamp, MLOCK integer not null, primary key (ID)); +create table BPEL_CORRELATION_PROP (ID bigint not null, NAME varchar(255), NAMESPACE varchar(255), VALUE varchar(255), CORR_SET_ID bigint, INSERT_TIME timestamp, MLOCK integer not null, primary key (ID)); +create table BPEL_CORRELATION_SET (ID bigint not null, VALUE varchar(255), CORR_SET_NAME varchar(255), SCOPE_ID bigint, PIID bigint, PROCESS_ID bigint, INSERT_TIME timestamp, MLOCK integer not null, primary key (ID)); +create table BPEL_CORRELATOR (ID bigint not null, CID varchar(255), PROCESS_ID bigint, INSERT_TIME timestamp, MLOCK integer not null, primary key (ID)); +create table BPEL_CORRELATOR_MESSAGE_CKEY (ID bigint not null, CKEY varchar(255), CORRELATOR_MESSAGE_ID bigint, INSERT_TIME timestamp, MLOCK integer not null, primary key (ID)); +create table BPEL_EVENT (ID bigint not null, IID bigint, PID bigint, TSTAMP timestamp, TYPE varchar(255), DETAIL longvarchar, DATA varbinary, SID bigint, INSERT_TIME timestamp, MLOCK integer not null, primary key (ID)); +create table BPEL_FAULT (ID bigint not null, FAULTNAME varchar(255), DATA varbinary, EXPLANATION varchar(4000), LINE_NUM integer, AID integer, INSERT_TIME timestamp, MLOCK integer not null, primary key (ID)); +create table BPEL_INSTANCE (ID bigint not null, INSTANTIATING_CORRELATOR bigint, FAULT bigint, JACOB_STATE_DATA varbinary, PREVIOUS_STATE smallint, PROCESS_ID bigint, STATE smallint, LAST_ACTIVE_DT timestamp, SEQUENCE bigint, FAILURE_COUNT integer, FAILURE_DT timestamp, INSERT_TIME timestamp, MLOCK integer not null, primary key (ID)); +create table BPEL_MESSAGE (ID bigint not null, MEX bigint, TYPE varchar(255), MESSAGE_DATA varbinary, MESSAGE_HEADER varbinary, INSERT_TIME timestamp, MLOCK integer not null, primary key (ID)); +create table BPEL_MESSAGE_EXCHANGE (ID bigint not null, PORT_TYPE varchar(255), CHANNEL_NAME varchar(255), CLIENTKEY varchar(255), ENDPOINT varbinary, CALLBACK_ENDPOINT varbinary, REQUEST bigint, RESPONSE bigint, INSERT_DT timestamp, OPERATION varchar(255), STATE varchar(255), PROCESS bigint, PIID bigint, DIR char(1), PLINK_MODELID integer, PATTERN varchar(255), CORR_STATUS varchar(255), FAULT_TYPE varchar(255), FAULT_EXPL varchar(255), CALLEE varchar(255), PARTNERLINK bigint, PIPED_ID varchar(255), SUBSCRIBER_COUNT integer, INSERT_TIME timestamp, MLOCK integer not null, primary key (ID)); +create table BPEL_MEX_PROPS (MEX bigint not null, VALUE varchar(8000), NAME varchar(255) not null, primary key (MEX, NAME)); +create table BPEL_PLINK_VAL (ID bigint not null, PARTNER_LINK varchar(100) not null, PARTNERROLE varchar(100), MYROLE_EPR_DATA varbinary, PARTNERROLE_EPR_DATA varbinary, PROCESS bigint, SCOPE bigint, SVCNAME varchar(255), MYROLE varchar(100), MODELID integer, MYSESSIONID varchar(255), PARTNERSESSIONID varchar(255), INSERT_TIME timestamp, MLOCK integer not null, primary key (ID)); +create table BPEL_PROCESS (ID bigint not null, PROCID varchar(255) not null, deployer varchar(255), deploydate timestamp, type_name varchar(255), type_ns varchar(255), version bigint, ACTIVE_ bit, guid varchar(255), INSERT_TIME timestamp, MLOCK integer not null, primary key (ID), unique (PROCID)); +create table BPEL_SCOPE (ID bigint not null, PIID bigint, PARENT_SCOPE_ID bigint, STATE varchar(255) not null, NAME varchar(255) not null, MODELID integer, INSERT_TIME timestamp, MLOCK integer not null, primary key (ID)); +create table BPEL_SELECTORS (ID bigint not null, PIID bigint not null, SELGRPID varchar(255) not null, IDX integer not null, CORRELATION_KEY varchar(255) not null, PROC_TYPE varchar(255) not null, ROUTE_POLICY varchar(255), CORRELATOR bigint not null, INSERT_TIME timestamp, MLOCK integer not null, primary key (ID), unique (CORRELATION_KEY, CORRELATOR)); +create table BPEL_UNMATCHED (ID bigint not null, MEX bigint, CORRELATION_KEY varchar(255), CORRELATOR bigint not null, INSERT_TIME timestamp, MLOCK integer not null, primary key (ID)); +create table BPEL_XML_DATA (ID bigint not null, DATA varbinary, NAME varchar(255) not null, SIMPLE_VALUE varchar(255), SCOPE_ID bigint, PIID bigint, IS_SIMPLE_TYPE bit, INSERT_TIME timestamp, MLOCK integer not null, primary key (ID)); +create table STORE_DU (NAME varchar(255) not null, deployer varchar(255), DEPLOYDT timestamp, DIR varchar(255), primary key (NAME)); +create table STORE_PROCESS (PID varchar(255) not null, DU varchar(255), TYPE varchar(255), version bigint, STATE varchar(255), primary key (PID)); +create table STORE_PROCESS_PROP (propId varchar(255) not null, value varchar(255), name varchar(255) not null, primary key (propId, name)); +create table STORE_VERSIONS (ID integer not null, VERSION bigint, primary key (ID)); +create table VAR_PROPERTY (ID bigint not null, XML_DATA_ID bigint, PROP_VALUE varchar(255), PROP_NAME varchar(255) not null, INSERT_TIME timestamp, MLOCK integer not null, primary key (ID)); +create index IDX_CORRELATOR_CID on BPEL_CORRELATOR (CID); +create index IDX_BPEL_CORRELATOR_MESSAGE_CKEY on BPEL_CORRELATOR_MESSAGE_CKEY (CKEY); +create index IDX_SELECTOR_CORRELATOR on BPEL_SELECTORS (CORRELATOR); +create index IDX_SELECTOR_CKEY on BPEL_SELECTORS (CORRELATION_KEY); +create index IDX_SELECTOR_SELGRPID on BPEL_SELECTORS (SELGRPID); +create index IDX_UNMATCHED_CKEY on BPEL_UNMATCHED (CORRELATION_KEY); +create index IDX_UNMATCHED_CORRELATOR on BPEL_UNMATCHED (CORRELATOR); +create sequence hibernate_seqhilo; \ No newline at end of file Modified: trunk/runtime/engine-assembly/src/main/resources/bpel.properties =================================================================== --- trunk/runtime/engine-assembly/src/main/resources/bpel.properties 2010-06-03 10:11:45 UTC (rev 700) +++ trunk/runtime/engine-assembly/src/main/resources/bpel.properties 2010-06-03 10:44:38 UTC (rev 701) @@ -53,9 +53,9 @@ ## DAO Connection Factory class. ## uncomment the following for hibernate. -bpel.dao.factory=org.apache.ode.dao.jpa.hibernate.BpelDAOConnectionFactoryImpl -bpel.dao.factory.store=org.apache.ode.dao.jpa.hibernate.ConfStoreDAOConnectionFactoryImpl +bpel.dao.factory=org.apache.ode.daohib.bpel.BpelDAOConnectionFactoryImpl + ## Transaction Factory ## default is org.apache.ode.il.EmbeddedGeronimoFactory ## available alternatives are:

14 years, 6 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

riftsaw-commits June 2010