riftsaw SVN: r338 - in trunk: integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples and 8 other directories.
by riftsaw-commits＠lists.jboss.org
Author: objectiser
Date: 2009-11-26 10:09:40 -0500 (Thu, 26 Nov 2009)
New Revision: 338
Added:
trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELHelloWorldHeaderODETestCase.java
trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_hello_world_header_ode/
trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_hello_world_header_ode/bpel/
trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_hello_world_header_ode/bpel/HelloWorld.bpel
trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_hello_world_header_ode/bpel/HelloWorld.wsdl
trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_hello_world_header_ode/bpel/bpel-deploy.xml
trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_hello_world_header_ode/build.xml
trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_hello_world_header_ode/messages/
trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_hello_world_header_ode/messages/hello_request1.xml
trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_hello_world_header_ode/messages/hello_response1.xml
trunk/samples/quickstart/hello_world_header_ode/
trunk/samples/quickstart/hello_world_header_ode/bpel/
trunk/samples/quickstart/hello_world_header_ode/bpel/HelloWorld.bpel
trunk/samples/quickstart/hello_world_header_ode/bpel/HelloWorld.wsdl
trunk/samples/quickstart/hello_world_header_ode/bpel/bpel-deploy.xml
trunk/samples/quickstart/hello_world_header_ode/build.xml
trunk/samples/quickstart/hello_world_header_ode/messages/
trunk/samples/quickstart/hello_world_header_ode/messages/hello_request1.xml
trunk/samples/quickstart/hello_world_header_ode/readme.txt
Modified:
trunk/integration-tests/build.xml
trunk/samples/quickstart/readme.txt
Log:
Added new quickstart example, and associated integration test, associated with RIFTSAW-74. The test shows up a ClassCastException in the SOAP header processing - the assertion in the unit test has been temporarily commented out until the problem is resolved.
Modified: trunk/integration-tests/build.xml
===================================================================
--- trunk/integration-tests/build.xml 2009-11-26 15:02:07 UTC (rev 337)
+++ trunk/integration-tests/build.xml 2009-11-26 15:09:40 UTC (rev 338)
@@ -118,6 +118,7 @@
<mkdir dir="target/tests"/>
<ant antfile="src/test/resources/samples/Quickstart_bpel_hello_world/build.xml" />
+ <ant antfile="src/test/resources/samples/Quickstart_bpel_hello_world_header_ode/build.xml" />
<ant antfile="src/test/resources/samples/Quickstart_bpel_simple_correlation/build.xml" />
<ant antfile="src/test/resources/samples/Quickstart_bpel_simple_invoke/build.xml" />
<ant antfile="src/test/resources/samples/Quickstart_bpel_loan_approval/build.xml" />
Added: trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELHelloWorldHeaderODETestCase.java
===================================================================
--- trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELHelloWorldHeaderODETestCase.java (rev 0)
+++ trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELHelloWorldHeaderODETestCase.java 2009-11-26 15:09:40 UTC (rev 338)
@@ -0,0 +1,52 @@
+/*
+ * 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_hello_world_header_ode sample.
+ */
+public class QuickstartBPELHelloWorldHeaderODETestCase extends RiftSawTest {
+
+ private static final String TEST_NAME = "Quickstart_bpel_hello_world_header_ode";
+
+ public QuickstartBPELHelloWorldHeaderODETestCase() {
+ super(TEST_NAME);
+ }
+
+ public static Test suite() {
+ return(new RiftSawTestSetup(QuickstartBPELHelloWorldHeaderODETestCase.class,
+ TEST_NAME, "Quickstart_bpel_hello_world_header_ode-1.jar"));
+ }
+
+ public void testSendHello() throws Exception {
+ String result=sendSOAPMessage("hello_request1.xml",
+ "http://localhost:8080/Quickstart_bpel_hello_world_header_odeWS");
+
+ // TODO: Commented out until fixed
+ //assertMessageFromFile(result, "hello_response1.xml");
+ }
+}
Added: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_hello_world_header_ode/bpel/HelloWorld.bpel
===================================================================
--- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_hello_world_header_ode/bpel/HelloWorld.bpel (rev 0)
+++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_hello_world_header_ode/bpel/HelloWorld.bpel 2009-11-26 15:09:40 UTC (rev 338)
@@ -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.
+ -->
+<process name="HelloWorldHeaderODE"
+ 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:HelloPartnerLinkType"
+ myRole="me" />
+ </partnerLinks>
+
+ <variables>
+ <variable name="myVar" messageType="intf:HelloMessage"/>
+ <variable name="mesgVar" type="xsd:string"/>
+ <variable name="conversationId" type="xsd:string"/>
+ </variables>
+
+ <sequence>
+ <receive
+ name="start"
+ partnerLink="helloPartnerLink"
+ portType="intf:HelloPortType"
+ operation="hello"
+ variable="myVar"
+ createInstance="yes"/>
+
+ <assign name="assignHelloMesg">
+ <copy>
+ <from variable="myVar" part="TestPart"/>
+ <to variable="mesgVar"/>
+ </copy>
+ <copy>
+ <from variable="myVar" header="conversationId"/>
+ <to variable="conversationId" />
+ </copy>
+ <copy>
+ <from>concat($mesgVar,' World', ' conversationId=', $conversationId)</from>
+ <to variable="myVar" part="TestPart"/>
+ </copy>
+ </assign>
+ <reply name="end"
+ partnerLink="helloPartnerLink"
+ portType="intf:HelloPortType"
+ operation="hello"
+ variable="myVar"/>
+ </sequence>
+</process>
Added: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_hello_world_header_ode/bpel/HelloWorld.wsdl
===================================================================
--- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_hello_world_header_ode/bpel/HelloWorld.wsdl (rev 0)
+++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_hello_world_header_ode/bpel/HelloWorld.wsdl 2009-11-26 15:09:40 UTC (rev 338)
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+<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="HelloPortType">
+ <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="HelloSoapBinding" type="tns:HelloPortType">
+ <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="HelloService">
+ <wsdl:port name="HelloPort" binding="tns:HelloSoapBinding">
+ <soap:address location="http://localhost:8080/Quickstart_bpel_hello_world_header_odeWS"/>
+ </wsdl:port>
+ </wsdl:service>
+
+ <plnk:partnerLinkType name="HelloPartnerLinkType">
+ <plnk:role name="me" portType="tns:HelloPortType"/>
+ <plnk:role name="you" portType="tns:HelloPortType"/>
+ </plnk:partnerLinkType>
+</wsdl:definitions>
+
Added: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_hello_world_header_ode/bpel/bpel-deploy.xml
===================================================================
--- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_hello_world_header_ode/bpel/bpel-deploy.xml (rev 0)
+++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_hello_world_header_ode/bpel/bpel-deploy.xml 2009-11-26 15:09:40 UTC (rev 338)
@@ -0,0 +1,30 @@
+<!--
+ ~ 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.
+ -->
+<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:HelloWorldHeaderODE">
+ <active>true</active>
+ <provide partnerLink="helloPartnerLink">
+ <service name="intf:HelloService" port="HelloPort"/>
+ </provide>
+ </process>
+</deploy>
Added: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_hello_world_header_ode/build.xml
===================================================================
--- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_hello_world_header_ode/build.xml (rev 0)
+++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_hello_world_header_ode/build.xml 2009-11-26 15:09:40 UTC (rev 338)
@@ -0,0 +1,30 @@
+<project name="Quickstart_bpel_hello_world_header_ode" default="deploy" basedir=".">
+
+ <description>
+ ${ant.project.name}
+ ${line.separator}
+ </description>
+
+ <property name="version" value="1" />
+
+ <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" />
+
+ <target name="deploy">
+ <echo>Deploy ${ant.project.name}</echo>
+ <mkdir dir="${deploy.dir}/${ant.project.name}" />
+ <jar basedir="${test.dir}/bpel" destfile="${deploy.dir}/${ant.project.name}/${sample.jar.name}" />
+
+ <copy todir="${deploy.dir}/${ant.project.name}">
+ <fileset dir="${test.dir}/messages"/>
+ </copy>
+ </target>
+
+ <target name="undeploy">
+ <echo>Undeploy ${ant.project.name}</echo>
+ <delete file="${deploy.dir}/${sample.jar.name}" />
+ </target>
+
+</project>
Added: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_hello_world_header_ode/messages/hello_request1.xml
===================================================================
--- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_hello_world_header_ode/messages/hello_request1.xml (rev 0)
+++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_hello_world_header_ode/messages/hello_request1.xml 2009-11-26 15:09:40 UTC (rev 338)
@@ -0,0 +1,10 @@
+<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:wsdl="http://www.jboss.org/bpel/examples/wsdl" xmlns:exx="http://www.jboss.org/bpel/examples/xsd">
+ <soapenv:Header>
+ <ns:conversationId xmlns:ns="http://www.jboss.org/cid">12345</ns:conversationId>
+ </soapenv:Header>
+ <soapenv:Body>
+ <wsdl:hello>
+ <TestPart>Hello</TestPart>
+ </wsdl:hello>
+ </soapenv:Body>
+</soapenv:Envelope>
Added: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_hello_world_header_ode/messages/hello_response1.xml
===================================================================
--- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_hello_world_header_ode/messages/hello_response1.xml (rev 0)
+++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_hello_world_header_ode/messages/hello_response1.xml 2009-11-26 15:09:40 UTC (rev 338)
@@ -0,0 +1 @@
+<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'><env:Header></env:Header><env:Body><odens:helloResponse xmlns:odens='http://www.jboss.org/bpel/examples/wsdl'><TestPart>Hello World conversationId=12345</TestPart></odens:helloResponse></env:Body></env:Envelope>
\ No newline at end of file
Added: trunk/samples/quickstart/hello_world_header_ode/bpel/HelloWorld.bpel
===================================================================
--- trunk/samples/quickstart/hello_world_header_ode/bpel/HelloWorld.bpel (rev 0)
+++ trunk/samples/quickstart/hello_world_header_ode/bpel/HelloWorld.bpel 2009-11-26 15:09:40 UTC (rev 338)
@@ -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.
+ -->
+<process name="HelloWorldHeaderODE"
+ 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:HelloPartnerLinkType"
+ myRole="me" />
+ </partnerLinks>
+
+ <variables>
+ <variable name="myVar" messageType="intf:HelloMessage"/>
+ <variable name="mesgVar" type="xsd:string"/>
+ <variable name="conversationId" type="xsd:string"/>
+ </variables>
+
+ <sequence>
+ <receive
+ name="start"
+ partnerLink="helloPartnerLink"
+ portType="intf:HelloPortType"
+ operation="hello"
+ variable="myVar"
+ createInstance="yes"/>
+
+ <assign name="assignHelloMesg">
+ <copy>
+ <from variable="myVar" part="TestPart"/>
+ <to variable="mesgVar"/>
+ </copy>
+ <copy>
+ <from variable="myVar" header="conversationId"/>
+ <to variable="conversationId" />
+ </copy>
+ <copy>
+ <from>concat($mesgVar,' World', ' conversationId=', $conversationId)</from>
+ <to variable="myVar" part="TestPart"/>
+ </copy>
+ </assign>
+ <reply name="end"
+ partnerLink="helloPartnerLink"
+ portType="intf:HelloPortType"
+ operation="hello"
+ variable="myVar"/>
+ </sequence>
+</process>
Added: trunk/samples/quickstart/hello_world_header_ode/bpel/HelloWorld.wsdl
===================================================================
--- trunk/samples/quickstart/hello_world_header_ode/bpel/HelloWorld.wsdl (rev 0)
+++ trunk/samples/quickstart/hello_world_header_ode/bpel/HelloWorld.wsdl 2009-11-26 15:09:40 UTC (rev 338)
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+<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="HelloPortType">
+ <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="HelloSoapBinding" type="tns:HelloPortType">
+ <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="HelloService">
+ <wsdl:port name="HelloPort" binding="tns:HelloSoapBinding">
+ <soap:address location="http://localhost:8080/Quickstart_bpel_hello_world_header_odeWS"/>
+ </wsdl:port>
+ </wsdl:service>
+
+ <plnk:partnerLinkType name="HelloPartnerLinkType">
+ <plnk:role name="me" portType="tns:HelloPortType"/>
+ <plnk:role name="you" portType="tns:HelloPortType"/>
+ </plnk:partnerLinkType>
+</wsdl:definitions>
+
Added: trunk/samples/quickstart/hello_world_header_ode/bpel/bpel-deploy.xml
===================================================================
--- trunk/samples/quickstart/hello_world_header_ode/bpel/bpel-deploy.xml (rev 0)
+++ trunk/samples/quickstart/hello_world_header_ode/bpel/bpel-deploy.xml 2009-11-26 15:09:40 UTC (rev 338)
@@ -0,0 +1,30 @@
+<!--
+ ~ 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.
+ -->
+<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:HelloWorldHeaderODE">
+ <active>true</active>
+ <provide partnerLink="helloPartnerLink">
+ <service name="intf:HelloService" port="HelloPort"/>
+ </provide>
+ </process>
+</deploy>
Added: trunk/samples/quickstart/hello_world_header_ode/build.xml
===================================================================
--- trunk/samples/quickstart/hello_world_header_ode/build.xml (rev 0)
+++ trunk/samples/quickstart/hello_world_header_ode/build.xml 2009-11-26 15:09:40 UTC (rev 338)
@@ -0,0 +1,43 @@
+<project name="Quickstart_bpel_hello_world_header_ode" default="deploy" basedir=".">
+
+ <description>
+ ${ant.project.name}
+ ${line.separator}
+ </description>
+
+ <!-- Import the base Ant build script... -->
+ <property file="../../../install/deployment.properties" />
+
+ <property name="version" value="1" />
+
+ <property name="server.dir" value="${org.jboss.as.home}/server/${org.jboss.as.config}"/>
+ <property name="conf.dir" value="${server.dir}/conf"/>
+ <property name="deploy.dir" value="${server.dir}/deploy"/>
+ <property name="server.lib.dir" value="${server.dir}/lib"/>
+
+ <property name="sample.jar.name" value="${ant.project.name}-${version}.jar" />
+
+ <target name="deploy">
+ <echo>Deploy ${ant.project.name}</echo>
+ <jar basedir="bpel" destfile="${deploy.dir}/${sample.jar.name}" />
+ </target>
+
+ <target name="undeploy">
+ <echo>Undeploy ${ant.project.name}</echo>
+ <delete file="${deploy.dir}/${sample.jar.name}" />
+ </target>
+
+ <target name="sendhello">
+ <echo>Send test message to: ${ant.project.name}</echo>
+ <java classname="org.apache.ode.tools.sendsoap.cline.HttpSoapSender">
+ <arg value="http://localhost:8080/Quickstart_bpel_hello_world_header_odeWS"/>
+ <arg value="messages/hello_request1.xml"/>
+ <classpath>
+ <fileset dir="../../common/lib">
+ <include name="**/*.jar"/>
+ </fileset>
+ <pathelement path="${java.class.path}"/>
+ </classpath>
+ </java>
+ </target>
+</project>
Added: trunk/samples/quickstart/hello_world_header_ode/messages/hello_request1.xml
===================================================================
--- trunk/samples/quickstart/hello_world_header_ode/messages/hello_request1.xml (rev 0)
+++ trunk/samples/quickstart/hello_world_header_ode/messages/hello_request1.xml 2009-11-26 15:09:40 UTC (rev 338)
@@ -0,0 +1,10 @@
+<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:wsdl="http://www.jboss.org/bpel/examples/wsdl" xmlns:exx="http://www.jboss.org/bpel/examples/xsd">
+ <soapenv:Header>
+ <ns:conversationId xmlns:ns="http://www.jboss.org/cid">12345</ns:conversationId>
+ </soapenv:Header>
+ <soapenv:Body>
+ <wsdl:hello>
+ <TestPart>Hello</TestPart>
+ </wsdl:hello>
+ </soapenv:Body>
+</soapenv:Envelope>
Added: trunk/samples/quickstart/hello_world_header_ode/readme.txt
===================================================================
--- trunk/samples/quickstart/hello_world_header_ode/readme.txt (rev 0)
+++ trunk/samples/quickstart/hello_world_header_ode/readme.txt 2009-11-26 15:09:40 UTC (rev 338)
@@ -0,0 +1,26 @@
+Quickstart Examples - Hello World Header ODE
+============================================
+
+This is a simple variation of the hello_world quickstart, where the BPEL
+process additionally accesses a SOAP header element using an Apache
+ODE specific extension to the BPEL copy construct.
+
+To deploy the example, open a command line window in the example's folder,
+and simply type 'ant deploy'. To undeploy, use the command 'ant undeploy'.
+
+To test the example, for example using the SOAPUI client, an example message
+can be found in the messages sub-folder, with the relevant WSDL being
+located in the bpel sub-folder.
+
+Alternatively, use the 'ant sendhello' command (from a command line window)
+to send the example message directly to the deployed process.
+
+NOTE: The "ant deploy" command will by default deploy version 1 of the
+example to the server. If you wish to change the example, and redeploy,
+then you will need to update the version number in the build.xml, or
+override the version property, e.g. "ant -Dversion=2 deploy" (and similarly
+when undeploying "ant -Dversion=2 undeploy").
+
+Some handy URLs:
+http://localhost:8080/bpel-console is the BPEL console
+http://localhost:8080/Quickstart_bpel_hello_world_header_odeWS?wsdl is the URL to the BPEL process' WSDL
Modified: trunk/samples/quickstart/readme.txt
===================================================================
--- trunk/samples/quickstart/readme.txt 2009-11-26 15:02:07 UTC (rev 337)
+++ trunk/samples/quickstart/readme.txt 2009-11-26 15:09:40 UTC (rev 338)
@@ -11,30 +11,3 @@
Each example has a selection of messages that can be sent using your
preferred SOAP client (e.g. soapui), or an ant target specific for
each project.
-
-
-hello_world
------------
-
-This is a simple echo example, used to respond to a sent message with a
-modified version of the request message being returned in a response.
-
-To send the test message to the process, use the 'ant sendhello' command
-from a command line window.
-
-
-simple_correlation
-------------------
-
-This example builds on the previous 'hello_world' example, to show a
-simple example of how two separate interactions can be correlated to the
-same BPEL process instance.
-
-In this case, a 'hello' message must be sent first, and then a 'goodbye'
-message must follow, where both messages must have the same ID field to
-enable them to be correlated to the same process instance.
-
-To send the test messages to the process, use the 'ant sendhello' command
-(from a command line window) to send the initial message, and then
-'ant sendgoodbye' to send the last message correlated to the same session.
-
14 years, 5 months
- 1
- 0
riftsaw SVN: r337 - in branches/ODE/ODE-1.x-jpa: bpel-runtime/src/test/java/org/apache/ode/bpel/runtime and 26 other directories.
by riftsaw-commits＠lists.jboss.org
Author: jeff.yuchang
Date: 2009-11-26 10:02:07 -0500 (Thu, 26 Nov 2009)
New Revision: 337
Added:
branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/
branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/src/
branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/src/main/
branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/src/main/java/
branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/src/main/java/org/
branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/src/main/java/org/apache/
branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/src/main/java/org/apache/ode/
branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/src/main/java/org/apache/ode/dao/
branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/src/main/java/org/apache/ode/dao/jpa/
branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/src/main/java/org/apache/ode/dao/jpa/openjpa/
branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/src/main/java/org/apache/ode/dao/jpa/openjpa/HibernateDaoOperator.java
branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/src/main/resources/
branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/src/main/resources/META-INF/
branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/src/main/resources/META-INF/persistence.xml
branches/ODE/ODE-1.x-jpa/dao-jpa-ojpa/
branches/ODE/ODE-1.x-jpa/dao-jpa-ojpa/src/
branches/ODE/ODE-1.x-jpa/dao-jpa-ojpa/src/main/
branches/ODE/ODE-1.x-jpa/dao-jpa-ojpa/src/main/java/
branches/ODE/ODE-1.x-jpa/dao-jpa-ojpa/src/main/java/org/
branches/ODE/ODE-1.x-jpa/dao-jpa-ojpa/src/main/java/org/apache/
branches/ODE/ODE-1.x-jpa/dao-jpa-ojpa/src/main/java/org/apache/ode/
branches/ODE/ODE-1.x-jpa/dao-jpa-ojpa/src/main/java/org/apache/ode/dao/
branches/ODE/ODE-1.x-jpa/dao-jpa-ojpa/src/main/java/org/apache/ode/dao/jpa/
branches/ODE/ODE-1.x-jpa/dao-jpa-ojpa/src/main/java/org/apache/ode/dao/jpa/openjpa/
branches/ODE/ODE-1.x-jpa/dao-jpa-ojpa/src/main/java/org/apache/ode/dao/jpa/openjpa/JpaTxMgrProvider.java
branches/ODE/ODE-1.x-jpa/dao-jpa-ojpa/src/main/java/org/apache/ode/dao/jpa/openjpa/OpenJPADaoOperator.java
branches/ODE/ODE-1.x-jpa/dao-jpa-ojpa/src/main/resources/
branches/ODE/ODE-1.x-jpa/dao-jpa-ojpa/src/main/resources/META-INF/
branches/ODE/ODE-1.x-jpa/dao-jpa-ojpa/src/main/resources/META-INF/persistence.xml
branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/JPADAO.java
branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/JPADaoOperator.java
branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/JPADaoOperatorFactory.java
Removed:
branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/JpaTxMgrProvider.java
branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/OpenJPADAO.java
Modified:
branches/ODE/ODE-1.x-jpa/bpel-runtime/src/test/java/org/apache/ode/bpel/runtime/MockBpelServer.java
branches/ODE/ODE-1.x-jpa/bpel-store/src/main/java/org/apache/ode/store/jpa/DbConfStoreConnectionFactory.java
branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/BPELDAOConnectionFactoryImpl.java
branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/BPELDAOConnectionImpl.java
branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/CorrelatorDAOImpl.java
branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/EventDAOImpl.java
branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/MessageExchangeDAOImpl.java
branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ProcessDAOImpl.java
branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ProcessInstanceDAOImpl.java
branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ScopeDAOImpl.java
Log:
* add dao-jpa-ojpa and dao-jpa-hibernate modules.
Modified: branches/ODE/ODE-1.x-jpa/bpel-runtime/src/test/java/org/apache/ode/bpel/runtime/MockBpelServer.java
===================================================================
--- branches/ODE/ODE-1.x-jpa/bpel-runtime/src/test/java/org/apache/ode/bpel/runtime/MockBpelServer.java 2009-11-26 10:45:02 UTC (rev 336)
+++ branches/ODE/ODE-1.x-jpa/bpel-runtime/src/test/java/org/apache/ode/bpel/runtime/MockBpelServer.java 2009-11-26 15:02:07 UTC (rev 337)
@@ -34,7 +34,7 @@
import org.apache.ode.bpel.iapi.Scheduler;
import org.apache.ode.bpel.iapi.Scheduler.MapSerializableRunnable;
import org.apache.ode.bpel.memdao.BpelDAOConnectionFactoryImpl;
-import org.apache.ode.dao.jpa.BPELDAOConnectionFactoryImpl;
+import org.apache.ode.dao.jpa.openjpa.BPELDAOConnectionFactoryImpl;
import org.apache.ode.il.EmbeddedGeronimoFactory;
import org.apache.ode.il.MockScheduler;
import org.apache.ode.il.config.OdeConfigProperties;
Modified: branches/ODE/ODE-1.x-jpa/bpel-store/src/main/java/org/apache/ode/store/jpa/DbConfStoreConnectionFactory.java
===================================================================
--- branches/ODE/ODE-1.x-jpa/bpel-store/src/main/java/org/apache/ode/store/jpa/DbConfStoreConnectionFactory.java 2009-11-26 10:45:02 UTC (rev 336)
+++ branches/ODE/ODE-1.x-jpa/bpel-store/src/main/java/org/apache/ode/store/jpa/DbConfStoreConnectionFactory.java 2009-11-26 15:02:07 UTC (rev 337)
@@ -21,7 +21,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.ode.dao.jpa.JpaTxMgrProvider;
+import org.apache.ode.dao.jpa.JPADaoOperatorFactory;
import org.apache.ode.store.ConfStoreConnection;
import org.apache.ode.store.ConfStoreConnectionFactory;
@@ -31,6 +31,7 @@
import javax.transaction.TransactionManager;
import java.util.HashMap;
+import java.util.Map;
/**
* @author Matthieu Riou <mriou at apache dot org>
@@ -47,18 +48,9 @@
public DbConfStoreConnectionFactory(DataSource ds, boolean createDatamodel, String txFactoryClassName) {
_ds = ds;
initTxMgr(txFactoryClassName);
-
- HashMap<String, Object> propMap = new HashMap<String,Object>();
- propMap.put("openjpa.Log", "log4j");
- propMap.put("openjpa.ManagedRuntime", new JpaTxMgrProvider(_txMgr));
- propMap.put("openjpa.ConnectionFactory", _ds);
- propMap.put("openjpa.ConnectionFactoryMode", "managed");
- propMap.put("openjpa.FlushBeforeQueries", "false");
- propMap.put("openjpa.FetchBatchSize", 1000);
- propMap.put("openjpa.jdbc.TransactionIsolation", "read-committed");
-
- if (createDatamodel) propMap.put("openjpa.jdbc.SynchronizeMappings", "buildSchema(ForeignKeys=false)");
-
+
+ Map<String, Object> propMap = JPADaoOperatorFactory.getJPADaoOperator().getInitializeProperties(_ds, createDatamodel, _txMgr);
+
_emf = Persistence.createEntityManagerFactory("ode-store", propMap);
}
Modified: branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/BPELDAOConnectionFactoryImpl.java
===================================================================
--- branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/BPELDAOConnectionFactoryImpl.java 2009-11-26 10:45:02 UTC (rev 336)
+++ branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/BPELDAOConnectionFactoryImpl.java 2009-11-26 15:02:07 UTC (rev 337)
@@ -18,27 +18,24 @@
*/
package org.apache.ode.dao.jpa;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.ode.bpel.dao.BpelDAOConnection;
-import org.apache.ode.bpel.dao.BpelDAOConnectionFactoryJDBC;
-import org.apache.openjpa.ee.ManagedRuntime;
-import org.apache.openjpa.util.GeneralException;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
import javax.persistence.EntityManager;
import javax.persistence.EntityManagerFactory;
import javax.persistence.Persistence;
import javax.sql.DataSource;
-import javax.transaction.NotSupportedException;
import javax.transaction.RollbackException;
import javax.transaction.Synchronization;
import javax.transaction.SystemException;
-import javax.transaction.Transaction;
import javax.transaction.TransactionManager;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.ode.bpel.dao.BpelDAOConnection;
+import org.apache.ode.bpel.dao.BpelDAOConnectionFactoryJDBC;
+
/**
* @author Matthieu Riou <mriou at apache dot org>
*/
@@ -49,10 +46,12 @@
private TransactionManager _tm;
private DataSource _ds;
private Object _dbdictionary;
+ private JPADaoOperator operator;
static ThreadLocal<BPELDAOConnectionImpl> _connections = new ThreadLocal<BPELDAOConnectionImpl>();
public BPELDAOConnectionFactoryImpl() {
+ operator = JPADaoOperatorFactory.getJPADaoOperator();
}
@SuppressWarnings("unchecked")
@@ -90,26 +89,14 @@
@SuppressWarnings("unchecked")
public void init(Properties properties) {
- HashMap<String, Object> propMap = new HashMap<String,Object>();
-
-// propMap.put("openjpa.Log", "DefaultLevel=TRACE");
- propMap.put("openjpa.Log", "log4j");
-// propMap.put("openjpa.jdbc.DBDictionary", "org.apache.openjpa.jdbc.sql.DerbyDictionary");
-
- propMap.put("openjpa.ManagedRuntime", new JpaTxMgrProvider(_tm));
- propMap.put("openjpa.ConnectionFactory", _ds);
- propMap.put("openjpa.ConnectionFactoryMode", "managed");
- propMap.put("openjpa.FlushBeforeQueries", "false");
- propMap.put("openjpa.FetchBatchSize", 1000);
- propMap.put("openjpa.jdbc.TransactionIsolation", "read-committed");
-
- if (_dbdictionary != null)
- propMap.put("openjpa.jdbc.DBDictionary", _dbdictionary);
-
- if (properties != null)
- for (Map.Entry me : properties.entrySet())
+
+ Map<String, Object> propMap = operator.getInitializeProperties(_ds, false, _tm);
+
+ if (properties != null) {
+ for (Map.Entry me : properties.entrySet()) {
propMap.put((String)me.getKey(),me.getValue());
-
+ }
+ }
_emf = Persistence.createEntityManagerFactory("ode-dao", propMap);
}
Modified: branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/BPELDAOConnectionImpl.java
===================================================================
--- branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/BPELDAOConnectionImpl.java 2009-11-26 10:45:02 UTC (rev 336)
+++ branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/BPELDAOConnectionImpl.java 2009-11-26 15:02:07 UTC (rev 337)
@@ -50,8 +50,6 @@
import org.apache.ode.bpel.evt.BpelEvent;
import org.apache.ode.bpel.evt.ScopeEvent;
import org.apache.ode.utils.ISO8601DateParser;
-import org.apache.openjpa.persistence.OpenJPAPersistence;
-import org.apache.openjpa.persistence.OpenJPAQuery;
/**
* @author Matthieu Riou <mriou at apache dot org>
@@ -300,8 +298,7 @@
// criteria limit
Query pq = _em.createQuery(query.toString());
- OpenJPAQuery kq = OpenJPAPersistence.cast(pq);
- kq.getFetchPlan().setFetchBatchSize(criteria.getLimit());
+ JPADaoOperatorFactory.getJPADaoOperator().setBatchSize(pq, criteria.getLimit());
List<ProcessInstanceDAO> ql = pq.getResultList();
Collection<ProcessInstanceDAO> list = new ArrayList<ProcessInstanceDAO>();
Modified: branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/CorrelatorDAOImpl.java
===================================================================
--- branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/CorrelatorDAOImpl.java 2009-11-26 10:45:02 UTC (rev 336)
+++ branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/CorrelatorDAOImpl.java 2009-11-26 15:02:07 UTC (rev 337)
@@ -33,7 +33,7 @@
@NamedQueries({
@NamedQuery(name=CorrelatorDAOImpl.DELETE_CORRELATORS_BY_PROCESS, query="delete from CorrelatorDAOImpl as c where c._process = :process")
})
-public class CorrelatorDAOImpl extends OpenJPADAO implements CorrelatorDAO {
+public class CorrelatorDAOImpl extends JPADAO implements CorrelatorDAO {
public final static String DELETE_CORRELATORS_BY_PROCESS = "DELETE_CORRELATORS_BY_PROCESS";
private final static String ROUTE_BY_CKEY_HEADER = "select route from MessageRouteDAOImpl as route where route._correlator._process._processType = :ptype and route._correlator._correlatorKey = :corrkey";
Modified: branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/EventDAOImpl.java
===================================================================
--- branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/EventDAOImpl.java 2009-11-26 10:45:02 UTC (rev 336)
+++ branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/EventDAOImpl.java 2009-11-26 15:02:07 UTC (rev 337)
@@ -46,7 +46,7 @@
@NamedQuery(name=EventDAOImpl.DELETE_EVENTS_BY_IDS, query="delete from EventDAOImpl as e where e._id in (:ids)"),
@NamedQuery(name=EventDAOImpl.DELETE_EVENTS_BY_INSTANCE, query="delete from EventDAOImpl as e where e._instance = :instance")
})
-public class EventDAOImpl extends OpenJPADAO {
+public class EventDAOImpl extends JPADAO {
public final static String SELECT_EVENT_IDS_BY_PROCESS = "SELECT_EVENT_IDS_BY_PROCESS";
public final static String DELETE_EVENTS_BY_IDS = "DELETE_EVENTS_BY_IDS";
public final static String DELETE_EVENTS_BY_INSTANCE = "DELETE_EVENTS_BY_INSTANCE";
Added: branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/JPADAO.java
===================================================================
--- branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/JPADAO.java (rev 0)
+++ branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/JPADAO.java 2009-11-26 15:02:07 UTC (rev 337)
@@ -0,0 +1,66 @@
+/*
+ * 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.apache.ode.dao.jpa;
+
+import java.util.Iterator;
+import java.util.List;
+
+import javax.persistence.EntityManager;
+import javax.persistence.Query;
+
+import org.apache.ode.bpel.dao.BpelDAOConnection;
+
+/**
+ * @author Matthieu Riou <mriou at apache dot org>
+ * @author Jeff Yu
+ */
+public class JPADAO {
+
+ private JPADaoOperator operator;
+
+ public JPADAO() {
+ operator = JPADaoOperatorFactory.getJPADaoOperator();
+ }
+
+ protected BpelDAOConnection getConn() {
+ return BPELDAOConnectionFactoryImpl._connections.get();
+ }
+
+ protected EntityManager getEM() {
+ return operator.getEM();
+ }
+
+ /**
+ * javax.persistence.Query either let you query for a collection or a single
+ * value throwing an exception if nothing is found. Just a convenient shortcut
+ * for single results allowing null values
+ * @param qry query to execute
+ * @return whatever you assign it to
+ */
+ @SuppressWarnings("unchecked")
+ protected <T> T getSingleResult(Query qry) {
+ List res = qry.getResultList();
+ if (res.size() == 0) return null;
+ return (T) res.get(0);
+ }
+
+ protected <T> void batchUpdateByIds(Iterator<T> ids, Query query, String parameterName) {
+ operator.batchUpdateByIds(ids, query, parameterName);
+ }
+}
\ No newline at end of file
Added: branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/JPADaoOperator.java
===================================================================
--- branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/JPADaoOperator.java (rev 0)
+++ branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/JPADaoOperator.java 2009-11-26 15:02:07 UTC (rev 337)
@@ -0,0 +1,30 @@
+package org.apache.ode.dao.jpa;
+
+import java.util.Iterator;
+import java.util.Map;
+
+import javax.persistence.EntityManager;
+import javax.persistence.Query;
+import javax.sql.DataSource;
+import javax.transaction.TransactionManager;
+
+import org.apache.ode.bpel.dao.BpelDAOConnection;
+
+/**
+ * These is interfaces that will include the methods that will be used in JPA DAO,
+ * But the implementation should be different from various JPA vendor, like OpenJPA, Hibernate etc.
+ *
+ * @author Jeff Yu
+ *
+ */
+public interface JPADaoOperator {
+
+ public EntityManager getEM() ;
+
+ public <T> void batchUpdateByIds(Iterator<T> ids, Query query, String parameterName);
+
+ public void setBatchSize(Query query, int limit);
+
+ public Map<String, Object> getInitializeProperties(DataSource ds, boolean createDatamodel, TransactionManager tx);
+
+}
\ No newline at end of file
Added: branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/JPADaoOperatorFactory.java
===================================================================
--- branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/JPADaoOperatorFactory.java (rev 0)
+++ branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/JPADaoOperatorFactory.java 2009-11-26 15:02:07 UTC (rev 337)
@@ -0,0 +1,20 @@
+/**
+ *
+ */
+package org.apache.ode.dao.jpa;
+
+/**
+ *
+ * @author Jeff Yu
+ *
+ */
+public class JPADaoOperatorFactory {
+
+ private JPADaoOperatorFactory(){
+ }
+
+ public static JPADaoOperator getJPADaoOperator() {
+ return null;
+ }
+
+}
Deleted: branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/JpaTxMgrProvider.java
===================================================================
--- branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/JpaTxMgrProvider.java 2009-11-26 10:45:02 UTC (rev 336)
+++ branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/JpaTxMgrProvider.java 2009-11-26 15:02:07 UTC (rev 337)
@@ -1,86 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.ode.dao.jpa;
-
-import javax.transaction.NotSupportedException;
-import javax.transaction.SystemException;
-import javax.transaction.Transaction;
-import javax.transaction.TransactionManager;
-
-import org.apache.openjpa.ee.ManagedRuntime;
-import org.apache.openjpa.util.GeneralException;
-
-public class JpaTxMgrProvider implements ManagedRuntime {
- private TransactionManager _txMgr;
-
- public JpaTxMgrProvider(TransactionManager txMgr) {
- _txMgr = txMgr;
- }
-
- public TransactionManager getTransactionManager() throws Exception {
- return _txMgr;
- }
-
- public void setRollbackOnly(Throwable cause) throws Exception {
- // there is no generic support for setting the rollback cause
- getTransactionManager().getTransaction().setRollbackOnly();
- }
-
- public Throwable getRollbackCause() throws Exception {
- // there is no generic support for setting the rollback cause
- return null;
- }
-
- public Object getTransactionKey() throws Exception, SystemException {
- return _txMgr.getTransaction();
- }
-
- public void doNonTransactionalWork(java.lang.Runnable runnable) throws NotSupportedException {
- TransactionManager tm = null;
- Transaction transaction = null;
-
- try {
- tm = getTransactionManager();
- transaction = tm.suspend();
- } catch (Exception e) {
- NotSupportedException nse =
- new NotSupportedException(e.getMessage());
- nse.initCause(e);
- throw nse;
- }
-
- runnable.run();
-
- try {
- tm.resume(transaction);
- } catch (Exception e) {
- try {
- transaction.setRollbackOnly();
- }
- catch(SystemException se2) {
- throw new GeneralException(se2);
- }
- NotSupportedException nse =
- new NotSupportedException(e.getMessage());
- nse.initCause(e);
- throw nse;
- }
- }
-}
\ No newline at end of file
Modified: branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/MessageExchangeDAOImpl.java
===================================================================
--- branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/MessageExchangeDAOImpl.java 2009-11-26 10:45:02 UTC (rev 336)
+++ branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/MessageExchangeDAOImpl.java 2009-11-26 15:02:07 UTC (rev 337)
@@ -55,7 +55,7 @@
@NamedQuery(name=MessageExchangeDAOImpl.DELETE_MEXS_BY_PROCESS, query="delete from MessageExchangeDAOImpl as m where m._process = :process"),
@NamedQuery(name=MessageExchangeDAOImpl.SELECT_MEX_IDS_BY_PROCESS, query="select m._id from MessageExchangeDAOImpl as m where m._process = :process")
})
-public class MessageExchangeDAOImpl extends OpenJPADAO implements MessageExchangeDAO, CorrelatorMessageDAO {
+public class MessageExchangeDAOImpl extends JPADAO implements MessageExchangeDAO, CorrelatorMessageDAO {
private static final Log __log = LogFactory.getLog(MessageExchangeDAOImpl.class);
public final static String DELETE_MEXS_BY_PROCESS = "DELETE_MEXS_BY_PROCESS";
Deleted: branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/OpenJPADAO.java
===================================================================
--- branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/OpenJPADAO.java 2009-11-26 10:45:02 UTC (rev 336)
+++ branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/OpenJPADAO.java 2009-11-26 15:02:07 UTC (rev 337)
@@ -1,78 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.ode.dao.jpa;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.openjpa.persistence.OpenJPAPersistence;
-import org.apache.openjpa.persistence.OpenJPAQuery;
-
-import javax.persistence.EntityManager;
-import javax.persistence.Query;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-/**
- * @author Matthieu Riou <mriou at apache dot org>
- */
-public class OpenJPADAO {
- private static final Log __log = LogFactory.getLog(OpenJPADAO.class);
-
- protected BPELDAOConnectionImpl getConn() {
- return BPELDAOConnectionFactoryImpl._connections.get();
- }
-
- protected EntityManager getEM() {
- return OpenJPAPersistence.getEntityManager(this);
- }
-
- /**
- * javax.persistence.Query either let you query for a collection or a single
- * value throwing an exception if nothing is found. Just a convenient shortcut
- * for single results allowing null values
- * @param qry query to execute
- * @return whatever you assign it to
- */
- @SuppressWarnings("unchecked")
- protected <T> T getSingleResult(Query qry) {
- List res = qry.getResultList();
- if (res.size() == 0) return null;
- return (T) res.get(0);
- }
-
- protected <T> void batchUpdateByIds(Iterator<T> ids, Query query, String parameterName) {
- if( query instanceof OpenJPAQuery ) {
- OpenJPAQuery openJpaQuery = (OpenJPAQuery)query;
- int batchSize = openJpaQuery.getFetchPlan().getFetchBatchSize();
- if( __log.isTraceEnabled() ) __log.trace("BATCH fetchBatchSize = " + batchSize);
- List<T> batch = new ArrayList<T>();
- while( ids.hasNext() ) {
- for( int i = 0; i < batchSize && ids.hasNext(); i++ ) {
- batch.add(ids.next());
- }
- if( __log.isTraceEnabled() ) __log.trace("BATCH updating " + batch.size() + " objects.");
- query.setParameter(parameterName, batch);
- query.executeUpdate();
- batch.clear();
- }
- }
- }
-}
\ No newline at end of file
Modified: branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ProcessDAOImpl.java
===================================================================
--- branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ProcessDAOImpl.java 2009-11-26 10:45:02 UTC (rev 336)
+++ branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ProcessDAOImpl.java 2009-11-26 15:02:07 UTC (rev 337)
@@ -46,7 +46,7 @@
@NamedQuery(name="InstanceByCKey", query="select cs._scope._processInstance from CorrelationSetDAOImpl as cs where cs._correlationKey = :ckey"),
@NamedQuery(name="CorrelatorByKey", query="select c from CorrelatorDAOImpl as c where c._correlatorKey = :ckey and c._process = :process")
})
-public class ProcessDAOImpl extends OpenJPADAO implements ProcessDAO {
+public class ProcessDAOImpl extends JPADAO implements ProcessDAO {
private static final Log __log = LogFactory.getLog(ProcessDAOImpl.class);
@Id @Column(name="ID")
Modified: branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ProcessInstanceDAOImpl.java
===================================================================
--- branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ProcessInstanceDAOImpl.java 2009-11-26 10:45:02 UTC (rev 336)
+++ branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ProcessInstanceDAOImpl.java 2009-11-26 15:02:07 UTC (rev 337)
@@ -70,7 +70,7 @@
@NamedQuery(name=ProcessInstanceDAOImpl.COUNT_FAILED_INSTANCES_BY_STATUS_AND_PROCESS_ID,
query="select count(i._instanceId), max(i._lastRecovery) from ProcessInstanceDAOImpl as i where i._process._processId = :processId and i._state in(:states) and exists(select r from ActivityRecoveryDAOImpl r where i = r._instance)")
})
-public class ProcessInstanceDAOImpl extends OpenJPADAO implements ProcessInstanceDAO {
+public class ProcessInstanceDAOImpl extends JPADAO implements ProcessInstanceDAO {
private static final Log __log = LogFactory.getLog(ProcessInstanceDAOImpl.class);
public final static String DELETE_INSTANCES_BY_PROCESS = "DELETE_INSTANCES_BY_PROCESS";
Modified: branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ScopeDAOImpl.java
===================================================================
--- branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ScopeDAOImpl.java 2009-11-26 10:45:02 UTC (rev 336)
+++ branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ScopeDAOImpl.java 2009-11-26 15:02:07 UTC (rev 337)
@@ -53,7 +53,7 @@
@NamedQuery(name=ScopeDAOImpl.SELECT_SCOPE_IDS_BY_INSTANCE, query="select s._scopeInstanceId from ScopeDAOImpl as s where s._processInstance = :instance"),
@NamedQuery(name=ScopeDAOImpl.DELETE_SCOPES_BY_SCOPE_IDS, query="delete from ScopeDAOImpl as s where s._scopeInstanceId in(:ids)")
})
-public class ScopeDAOImpl extends OpenJPADAO implements ScopeDAO {
+public class ScopeDAOImpl extends JPADAO implements ScopeDAO {
public final static String SELECT_SCOPE_IDS_BY_PROCESS = "SELECT_SCOPE_IDS_BY_PROCESS";
public final static String SELECT_SCOPE_IDS_BY_INSTANCE = "SELECT_SCOPE_IDS_BY_INSTANCE";
public final static String DELETE_SCOPES_BY_SCOPE_IDS = "DELETE_SCOPES_BY_SCOPE_IDS";
Added: branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/src/main/java/org/apache/ode/dao/jpa/openjpa/HibernateDaoOperator.java
===================================================================
--- branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/src/main/java/org/apache/ode/dao/jpa/openjpa/HibernateDaoOperator.java (rev 0)
+++ branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/src/main/java/org/apache/ode/dao/jpa/openjpa/HibernateDaoOperator.java 2009-11-26 15:02:07 UTC (rev 337)
@@ -0,0 +1,60 @@
+/*
+ * 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.apache.ode.dao.jpa.openjpa;
+
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+import javax.persistence.EntityManager;
+import javax.persistence.Persistence;
+import javax.persistence.Query;
+import javax.sql.DataSource;
+import javax.transaction.TransactionManager;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.ode.dao.jpa.JPADaoOperator;
+
+/**
+ *
+ * @author Jeff Yu
+ */
+public class HibernateDaoOperator implements JPADaoOperator {
+ private static final Log __log = LogFactory.getLog(HibernateDaoOperator.class);
+
+
+ public EntityManager getEM() {
+ return Persistence.createEntityManagerFactory("ode-dao").createEntityManager();
+ }
+
+ public <T> void batchUpdateByIds(Iterator<T> ids, Query query, String parameterName) {
+ //TODO
+ }
+
+ public Map<String, Object> getInitializeProperties(DataSource ds, boolean createDatamodel, TransactionManager tx) {
+ HashMap<String, Object> propMap = new HashMap<String,Object>();
+ //TODO
+ return propMap;
+ }
+
+ public void setBatchSize(Query query, int limit) {
+ //TODO
+ }
+}
\ No newline at end of file
Added: branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/src/main/resources/META-INF/persistence.xml
===================================================================
--- branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/src/main/resources/META-INF/persistence.xml (rev 0)
+++ branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/src/main/resources/META-INF/persistence.xml 2009-11-26 15:02:07 UTC (rev 337)
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+<persistence xmlns="http://java.sun.com/xml/ns/persistence"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ version="1.0">
+ <persistence-unit name="ode-dao">
+ <!--
+ This properties file is used specifically by the
+ OpenJPA Enhancer.
+ -->
+ <provider>org.hibernate.ejb.HibernatePersistence</provider>
+ <class>org.apache.ode.dao.jpa.ActivityRecoveryDAOImpl</class>
+ <class>org.apache.ode.dao.jpa.CorrelationSetDAOImpl</class>
+ <class>org.apache.ode.dao.jpa.CorrelatorDAOImpl</class>
+ <class>org.apache.ode.dao.jpa.EventDAOImpl</class>
+ <class>org.apache.ode.dao.jpa.FaultDAOImpl</class>
+ <class>org.apache.ode.dao.jpa.MessageDAOImpl</class>
+ <class>org.apache.ode.dao.jpa.MessageExchangeDAOImpl</class>
+ <class>org.apache.ode.dao.jpa.MessageRouteDAOImpl</class>
+ <class>org.apache.ode.dao.jpa.PartnerLinkDAOImpl</class>
+ <class>org.apache.ode.dao.jpa.ProcessDAOImpl</class>
+ <class>org.apache.ode.dao.jpa.ProcessInstanceDAOImpl</class>
+ <class>org.apache.ode.dao.jpa.ScopeDAOImpl</class>
+ <class>org.apache.ode.dao.jpa.XmlDataDAOImpl</class>
+ <class>org.apache.ode.dao.jpa.CorrSetProperty</class>
+ <class>org.apache.ode.dao.jpa.MexProperty</class>
+ <class>org.apache.ode.dao.jpa.XmlDataProperty</class>
+ </persistence-unit>
+</persistence>
\ No newline at end of file
Added: branches/ODE/ODE-1.x-jpa/dao-jpa-ojpa/src/main/java/org/apache/ode/dao/jpa/openjpa/JpaTxMgrProvider.java
===================================================================
--- branches/ODE/ODE-1.x-jpa/dao-jpa-ojpa/src/main/java/org/apache/ode/dao/jpa/openjpa/JpaTxMgrProvider.java (rev 0)
+++ branches/ODE/ODE-1.x-jpa/dao-jpa-ojpa/src/main/java/org/apache/ode/dao/jpa/openjpa/JpaTxMgrProvider.java 2009-11-26 15:02:07 UTC (rev 337)
@@ -0,0 +1,86 @@
+/*
+ * 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.apache.ode.dao.jpa.openjpa;
+
+import javax.transaction.NotSupportedException;
+import javax.transaction.SystemException;
+import javax.transaction.Transaction;
+import javax.transaction.TransactionManager;
+
+import org.apache.openjpa.ee.ManagedRuntime;
+import org.apache.openjpa.util.GeneralException;
+
+public class JpaTxMgrProvider implements ManagedRuntime {
+ private TransactionManager _txMgr;
+
+ public JpaTxMgrProvider(TransactionManager txMgr) {
+ _txMgr = txMgr;
+ }
+
+ public TransactionManager getTransactionManager() throws Exception {
+ return _txMgr;
+ }
+
+ public void setRollbackOnly(Throwable cause) throws Exception {
+ // there is no generic support for setting the rollback cause
+ getTransactionManager().getTransaction().setRollbackOnly();
+ }
+
+ public Throwable getRollbackCause() throws Exception {
+ // there is no generic support for setting the rollback cause
+ return null;
+ }
+
+ public Object getTransactionKey() throws Exception, SystemException {
+ return _txMgr.getTransaction();
+ }
+
+ public void doNonTransactionalWork(java.lang.Runnable runnable) throws NotSupportedException {
+ TransactionManager tm = null;
+ Transaction transaction = null;
+
+ try {
+ tm = getTransactionManager();
+ transaction = tm.suspend();
+ } catch (Exception e) {
+ NotSupportedException nse =
+ new NotSupportedException(e.getMessage());
+ nse.initCause(e);
+ throw nse;
+ }
+
+ runnable.run();
+
+ try {
+ tm.resume(transaction);
+ } catch (Exception e) {
+ try {
+ transaction.setRollbackOnly();
+ }
+ catch(SystemException se2) {
+ throw new GeneralException(se2);
+ }
+ NotSupportedException nse =
+ new NotSupportedException(e.getMessage());
+ nse.initCause(e);
+ throw nse;
+ }
+ }
+}
\ No newline at end of file
Added: branches/ODE/ODE-1.x-jpa/dao-jpa-ojpa/src/main/java/org/apache/ode/dao/jpa/openjpa/OpenJPADaoOperator.java
===================================================================
--- branches/ODE/ODE-1.x-jpa/dao-jpa-ojpa/src/main/java/org/apache/ode/dao/jpa/openjpa/OpenJPADaoOperator.java (rev 0)
+++ branches/ODE/ODE-1.x-jpa/dao-jpa-ojpa/src/main/java/org/apache/ode/dao/jpa/openjpa/OpenJPADaoOperator.java 2009-11-26 15:02:07 UTC (rev 337)
@@ -0,0 +1,88 @@
+/*
+ * 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.apache.ode.dao.jpa.openjpa;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import javax.persistence.EntityManager;
+import javax.persistence.Query;
+import javax.sql.DataSource;
+import javax.transaction.TransactionManager;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.ode.dao.jpa.JPADaoOperator;
+import org.apache.openjpa.persistence.OpenJPAPersistence;
+import org.apache.openjpa.persistence.OpenJPAQuery;
+
+/**
+ * @author Matthieu Riou <mriou at apache dot org>
+ * @author Jeff Yu
+ */
+public class OpenJPADaoOperator implements JPADaoOperator {
+ private static final Log __log = LogFactory.getLog(OpenJPADaoOperator.class);
+
+ public EntityManager getEM() {
+ return OpenJPAPersistence.getEntityManager(this);
+ }
+
+ public <T> void batchUpdateByIds(Iterator<T> ids, Query query, String parameterName) {
+ if( query instanceof OpenJPAQuery ) {
+ OpenJPAQuery openJpaQuery = (OpenJPAQuery)query;
+ int batchSize = openJpaQuery.getFetchPlan().getFetchBatchSize();
+ if( __log.isTraceEnabled() ) __log.trace("BATCH fetchBatchSize = " + batchSize);
+ List<T> batch = new ArrayList<T>();
+ while( ids.hasNext() ) {
+ for( int i = 0; i < batchSize && ids.hasNext(); i++ ) {
+ batch.add(ids.next());
+ }
+ if( __log.isTraceEnabled() ) __log.trace("BATCH updating " + batch.size() + " objects.");
+ query.setParameter(parameterName, batch);
+ query.executeUpdate();
+ batch.clear();
+ }
+ }
+ }
+
+ public Map<String, Object> getInitializeProperties(DataSource ds, boolean createDatamodel, TransactionManager tx) {
+ HashMap<String, Object> propMap = new HashMap<String,Object>();
+ propMap.put("openjpa.Log", "log4j");
+ propMap.put("openjpa.ManagedRuntime", new JpaTxMgrProvider(tx));
+ propMap.put("openjpa.ConnectionFactory", ds);
+ propMap.put("openjpa.ConnectionFactoryMode", "managed");
+ propMap.put("openjpa.FlushBeforeQueries", "false");
+ propMap.put("openjpa.FetchBatchSize", 1000);
+ propMap.put("openjpa.jdbc.TransactionIsolation", "read-committed");
+
+ if (createDatamodel) {
+ propMap.put("openjpa.jdbc.SynchronizeMappings", "buildSchema(ForeignKeys=false)");
+ }
+
+ return propMap;
+ }
+
+ public void setBatchSize(Query query, int limit) {
+ OpenJPAQuery kq = OpenJPAPersistence.cast(query);
+ kq.getFetchPlan().setFetchBatchSize(limit);
+ }
+}
\ No newline at end of file
Added: branches/ODE/ODE-1.x-jpa/dao-jpa-ojpa/src/main/resources/META-INF/persistence.xml
===================================================================
--- branches/ODE/ODE-1.x-jpa/dao-jpa-ojpa/src/main/resources/META-INF/persistence.xml (rev 0)
+++ branches/ODE/ODE-1.x-jpa/dao-jpa-ojpa/src/main/resources/META-INF/persistence.xml 2009-11-26 15:02:07 UTC (rev 337)
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+<persistence xmlns="http://java.sun.com/xml/ns/persistence"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ version="1.0">
+ <persistence-unit name="ode-dao">
+ <!--
+ This properties file is used specifically by the
+ OpenJPA Enhancer.
+ -->
+ <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
+ <class>org.apache.ode.dao.jpa.ActivityRecoveryDAOImpl</class>
+ <class>org.apache.ode.dao.jpa.CorrelationSetDAOImpl</class>
+ <class>org.apache.ode.dao.jpa.CorrelatorDAOImpl</class>
+ <class>org.apache.ode.dao.jpa.EventDAOImpl</class>
+ <class>org.apache.ode.dao.jpa.FaultDAOImpl</class>
+ <class>org.apache.ode.dao.jpa.MessageDAOImpl</class>
+ <class>org.apache.ode.dao.jpa.MessageExchangeDAOImpl</class>
+ <class>org.apache.ode.dao.jpa.MessageRouteDAOImpl</class>
+ <class>org.apache.ode.dao.jpa.PartnerLinkDAOImpl</class>
+ <class>org.apache.ode.dao.jpa.ProcessDAOImpl</class>
+ <class>org.apache.ode.dao.jpa.ProcessInstanceDAOImpl</class>
+ <class>org.apache.ode.dao.jpa.ScopeDAOImpl</class>
+ <class>org.apache.ode.dao.jpa.XmlDataDAOImpl</class>
+ <class>org.apache.ode.dao.jpa.CorrSetProperty</class>
+ <class>org.apache.ode.dao.jpa.MexProperty</class>
+ <class>org.apache.ode.dao.jpa.XmlDataProperty</class>
+ </persistence-unit>
+</persistence>
\ No newline at end of file
14 years, 5 months
- 1
- 0
riftsaw SVN: r336 - trunk.
by riftsaw-commits＠lists.jboss.org
Author: objectiser
Date: 2009-11-26 05:45:02 -0500 (Thu, 26 Nov 2009)
New Revision: 336
Modified:
trunk/pom.xml
Log:
All tests pass with new ODE 2.0 snapshot based on hibernate 3.3.2.GA.
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2009-11-26 10:21:31 UTC (rev 335)
+++ trunk/pom.xml 2009-11-26 10:45:02 UTC (rev 336)
@@ -66,7 +66,7 @@
</profiles>
<properties>
- <riftsaw.ode.version>2.0-M2</riftsaw.ode.version>
+ <riftsaw.ode.version>2.0-SNAPSHOT</riftsaw.ode.version>
<riftsaw.engine.version>2.0-SNAPSHOT</riftsaw.engine.version>
<bpm.console.version>1.2.0</bpm.console.version>
<commons.logging.version>1.1.1</commons.logging.version>
14 years, 5 months
- 1
- 0
riftsaw SVN: r335 - branches/ODE.
by riftsaw-commits＠lists.jboss.org
Author: jeff.yuchang
Date: 2009-11-26 05:21:31 -0500 (Thu, 26 Nov 2009)
New Revision: 335
Added:
branches/ODE/ODE-1.x-jpa/
Log:
* create a branch for ODE-jpa refactoring.
Copied: branches/ODE/ODE-1.x-jpa (from rev 334, branches/ODE/ODE-1.x-fixes)
14 years, 5 months
- 1
- 0
Hudson build is unstable: RiftSaw-postgres #12
by jboss-qa-internal＠redhat.com
See http://hudson.qa.jboss.com/hudson/job/RiftSaw-postgres/12/changes
14 years, 5 months
- 1
- 3
riftsaw SVN: r334 - in trunk: qa and 1 other directory.
by riftsaw-commits＠lists.jboss.org
Author: jeff.yuchang
Date: 2009-11-26 04:21:04 -0500 (Thu, 26 Nov 2009)
New Revision: 334
Modified:
trunk/integration-tests/build.xml
trunk/qa/build.xml
Log:
* add overwrite attribute for copying jdbc files.
Modified: trunk/integration-tests/build.xml
===================================================================
--- trunk/integration-tests/build.xml 2009-11-26 06:01:31 UTC (rev 333)
+++ trunk/integration-tests/build.xml 2009-11-26 09:21:04 UTC (rev 334)
@@ -20,7 +20,7 @@
<target name="replace.jdbc.files" if="is.replace.qa.jdbc">
<echo>Replacing the QA's Lab jdbc files</echo>
- <copy todir="${basedir}/../distribution/target/dist/riftsaw-${riftsaw.engine.version}/db/jdbc">
+ <copy todir="${basedir}/../distribution/target/dist/riftsaw-${riftsaw.engine.version}/db/jdbc" overwrite="true">
<fileset dir="${basedir}/../qa/jdbc">
<include name="*.properties" />
</fileset>
Modified: trunk/qa/build.xml
===================================================================
--- trunk/qa/build.xml 2009-11-26 06:01:31 UTC (rev 333)
+++ trunk/qa/build.xml 2009-11-26 09:21:04 UTC (rev 334)
@@ -141,7 +141,7 @@
<target name="replace.jdbc.files" if="is.replace.qa.jdbc">
<echo>Replacing the QA's Lab jdbc files</echo>
- <copy todir="${basedir}/../distribution/target/riftsaw-${riftsaw.version}/db/jdbc">
+ <copy todir="${basedir}/../distribution/target/riftsaw-${riftsaw.version}/db/jdbc" overwrite="true">
<fileset dir="${basedir}/../qa/jdbc">
<include name="*.properties" />
</fileset>
14 years, 5 months
- 1
- 0
riftsaw SVN: r333 - trunk/qa.
by riftsaw-commits＠lists.jboss.org
Author: jeff.yuchang
Date: 2009-11-26 01:01:31 -0500 (Thu, 26 Nov 2009)
New Revision: 333
Modified:
trunk/qa/build.xml
Log:
* fix the property
Modified: trunk/qa/build.xml
===================================================================
--- trunk/qa/build.xml 2009-11-25 21:39:25 UTC (rev 332)
+++ trunk/qa/build.xml 2009-11-26 06:01:31 UTC (rev 333)
@@ -141,7 +141,7 @@
<target name="replace.jdbc.files" if="is.replace.qa.jdbc">
<echo>Replacing the QA's Lab jdbc files</echo>
- <copy todir="${basedir}/../distribution/target/riftsaw-${riftsaw.engine.version}/db/jdbc">
+ <copy todir="${basedir}/../distribution/target/riftsaw-${riftsaw.version}/db/jdbc">
<fileset dir="${basedir}/../qa/jdbc">
<include name="*.properties" />
</fileset>
14 years, 5 months
- 1
- 0
RiftSaw-sqlserver - Build # 8 - Still Failing!
by jboss-qa-internal＠redhat.com
RiftSaw-sqlserver - Build # 8 - Still Failing:
Check console output at http://hudson.qa.jboss.com/hudson/job/RiftSaw-sqlserver/8/ to view the results.
14 years, 5 months
- 1
- 0
RiftSaw-JDK5 - Build # 6 - Still Failing!
by jboss-qa-internal＠redhat.com
RiftSaw-JDK5 Build number 6 status: Still Failing
Details available at http://hudson.jboss.org/hudson/job/RiftSaw-JDK5/6/
JBoss server log can be found at workspace, http://hudson.qa.jboss.com/hudson/view/RiftSaw/job/RiftSaw/ws/
14 years, 5 months
- 1
- 0
RiftSaw-jbossws-native - Build # 9 - Still Failing!
by jboss-qa-internal＠redhat.com
RiftSaw-jbossws-native Build number 9 status: Still Failing
Details available at http://hudson.jboss.org/hudson/job/RiftSaw-jbossws-native/9/
JBoss server log can be found at workspace, http://hudson.qa.jboss.com/hudson/view/RiftSaw/job/RiftSaw/ws/
14 years, 5 months
- 1
- 0