tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From antel...@apache.org
Subject svn commit: r747322 - in /tuscany/java/sca/modules/implementation-bpel-ode: ./ src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/
Date Tue, 24 Feb 2009 10:03:03 GMT
Author: antelder
Date: Tue Feb 24 10:03:02 2009
New Revision: 747322

URL: http://svn.apache.org/viewvc?rev=747322&view=rev
Log:
Start to bring up the implementation.bpel runtime in 2.x

Added:
    tuscany/java/sca/modules/implementation-bpel-ode/   (props changed)
      - copied from r746975, tuscany/branches/sca-equinox/modules/implementation-bpel-ode/
Modified:
    tuscany/java/sca/modules/implementation-bpel-ode/pom.xml
    tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServer.java
    tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyProcessConfImpl.java
    tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELImplementationProviderFactory.java
    tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELInvoker.java

Propchange: tuscany/java/sca/modules/implementation-bpel-ode/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Feb 24 10:03:02 2009
@@ -0,0 +1,20 @@
+target
+work
+dojo
+*.iws
+*.ipr
+*.iml
+derby.log
+maven.log
+maven-eclipse.xml
+build.xml
+build-dependency.xml
+velocity.log*
+junit*.properties
+surefire*.properties
+.project
+.classpath
+.settings
+.deployables
+.wtpmodules
+.externalToolBuilders

Propchange: tuscany/java/sca/modules/implementation-bpel-ode/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Feb 24 10:03:02 2009
@@ -0,0 +1,2 @@
+/tuscany/branches/sca-java-1.3/modules/implementation-bpel-ode:671193
+/tuscany/java/sca/modules/implementation-bpel-ode:694855

Modified: tuscany/java/sca/modules/implementation-bpel-ode/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-bpel-ode/pom.xml?rev=747322&r1=746975&r2=747322&view=diff
==============================================================================
--- tuscany/java/sca/modules/implementation-bpel-ode/pom.xml (original)
+++ tuscany/java/sca/modules/implementation-bpel-ode/pom.xml Tue Feb 24 10:03:02 2009
@@ -1,20 +1,28 @@
 <?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.
-    -->
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
 <project>
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.4-EQUINOX-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-implementation-bpel-ode</artifactId>
@@ -23,69 +31,69 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>1.4-EQUINOX-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-bpel</artifactId>
-            <version>1.4-EQUINOX-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core</artifactId>
-            <version>1.4-EQUINOX-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface</artifactId>
-            <version>1.4-EQUINOX-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>1.4-EQUINOX-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>1.4-EQUINOX-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>1.4-EQUINOX-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding</artifactId>
-            <version>1.4-EQUINOX-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
-        <dependency>
+        <!--  dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-sdo</artifactId>
-            <version>1.4-EQUINOX-SNAPSHOT</version>
-        </dependency>
+            <version>2.0-SNAPSHOT</version>
+        </dependency -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-EQUINOX-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>1.4-EQUINOX-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-wsdl</artifactId>
-            <version>1.4-EQUINOX-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-wsdl-xml</artifactId>
-            <version>1.4-EQUINOX-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
-        <dependency>
+        <!--  dependency>
             <groupId>org.apache.tuscany.sdo</groupId>
             <artifactId>tuscany-sdo-impl</artifactId>
             <version>1.1.1</version>
@@ -96,7 +104,7 @@
                     <artifactId>stax-api</artifactId>
                 </exclusion>
             </exclusions>
-        </dependency>
+        </dependency -->
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>

Modified: tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServer.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServer.java?rev=747322&r1=746975&r2=747322&view=diff
==============================================================================
--- tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServer.java
(original)
+++ tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServer.java
Tue Feb 24 10:03:02 2009
@@ -239,7 +239,7 @@
         try {
         	TuscanyProcessConfImpl processConf = new TuscanyProcessConfImpl( implementation
);
         	_bpelServer.register(processConf);
-        	System.out.println("Completed calling new Process deployment code...");
+        	__log.debug("Completed calling new Process deployment code...");
         } catch (Exception ex) {
             String errMsg = ">>> DEPLOY: Unexpected exception: " + ex.getMessage();
             __log.debug(errMsg, ex);

Modified: tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyProcessConfImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyProcessConfImpl.java?rev=747322&r1=746975&r2=747322&view=diff
==============================================================================
--- tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyProcessConfImpl.java
(original)
+++ tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyProcessConfImpl.java
Tue Feb 24 10:03:02 2009
@@ -416,12 +416,12 @@
     // other public APIs which ProcessConfImpl displays which are not in ProcessConf interface
 
     public List<String> getMexInterceptors(QName processId) {
-        System.out.println("getMexInterceptors for processID: " + processId );
+//        System.out.println("getMexInterceptors for processID: " + processId );
         return null;
     }
 
     public void setTransient(boolean t) {
-        System.out.println("setTransient called with boolean: " + t );
+//        System.out.println("setTransient called with boolean: " + t );
     }
 
     public List<Element> getExtensionElement(QName arg0) {

Modified: tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELImplementationProviderFactory.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELImplementationProviderFactory.java?rev=747322&r1=746975&r2=747322&view=diff
==============================================================================
--- tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELImplementationProviderFactory.java
(original)
+++ tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELImplementationProviderFactory.java
Tue Feb 24 10:03:02 2009
@@ -27,7 +27,7 @@
 import org.apache.tuscany.sca.provider.ImplementationProvider;
 import org.apache.tuscany.sca.provider.ImplementationProviderFactory;
 import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.osoa.sca.annotations.Destroy;
+import org.oasisopen.sca.annotation.Destroy;
 
 /**
  * BPEL Implementation provider factory

Modified: tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELInvoker.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELInvoker.java?rev=747322&r1=746975&r2=747322&view=diff
==============================================================================
--- tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELInvoker.java
(original)
+++ tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELInvoker.java
Tue Feb 24 10:03:02 2009
@@ -82,9 +82,8 @@
     
     private void initializeInvocation() {
       
-        if(true){
-            __log.debug("Initializing BPELInvoker");
-        }
+        __log.debug("Initializing BPELInvoker");
+
         Interface interfaze = operation.getInterface();
         if(interfaze instanceof WSDLInterface){
             WSDLInterface wsdlInterface = null;
@@ -96,7 +95,6 @@
             //
             // Fetch the service name from the service object
             bpelServiceName = new QName( "http://tuscany.apache.org", service.getName() );
-            //System.out.println("Actual service QName: " + bpelServiceName );
                 
             bpelOperationInputPart = (Part) wsdlInterface.getPortType().getOperation(bpelOperationName,null,null).getInput().getMessage().getParts().values().iterator().next();
             bpelOperationOutputPart = (Part) wsdlInterface.getPortType().getOperation(bpelOperationName,null,null).getOutput().getMessage().getParts().values().iterator().next();
@@ -121,10 +119,6 @@
             throw new InvocationTargetException(null,"Unsupported service contract");
         }
         
-        if(true) {
-            System.out.println("Invoking bpel component : " + bpelServiceName + "#" + bpelOperationName);
-        }
-        
         org.apache.ode.bpel.iapi.MyRoleMessageExchange mex = null;
         Future onhold = null;
         
@@ -164,14 +158,14 @@
             // be sure we have the "freshest" one.
             mex = (MyRoleMessageExchange)odeServer.getBpelServer().getEngine().getMessageExchange(mex.getMessageExchangeId());
 
-            if(true) {
+            if (__log.isDebugEnabled()) {
                 Status status = mex.getStatus();
                 Element invocationResponse = mex.getResponse().getMessage();
-
-                System.out.println(">>>Invocation status:" + status.name());
-                System.out.println(">>>Response:\n" + DOMUtils.domToString(invocationResponse));
-                System.out.println(">>>Response:\n" + DOMUtils.domToString(invocationResponse));
+                __log.debug(">>>Invocation status:" + status.name());
+                __log.debug(">>>Response:\n" + DOMUtils.domToString(invocationResponse));
+                __log.debug(">>>Response:\n" + DOMUtils.domToString(invocationResponse));
             }
+                
             //process the method invocation result
             response = processResponse(mex.getResponse().getMessage());
             
@@ -220,10 +214,10 @@
         contentMessage.appendChild(contentPart);
         dom.appendChild(contentMessage);
         
-        if(true) {
-            System.out.println("Creating invocation message:");
-            System.out.println(">> args.....: " + DOMUtils.domToString(payload));
-            System.out.println(">> message..:" + DOMUtils.domToString(dom.getDocumentElement()));
+        if (__log.isDebugEnabled()) {
+            __log.debug("Creating invocation message:");
+            __log.debug(">> args.....: " + DOMUtils.domToString(payload));
+            __log.debug(">> message..:" + DOMUtils.domToString(dom.getDocumentElement()));
         }
 
         org.apache.ode.bpel.iapi.Message request = mex.createMessage(new QName("", ""));



Mime
View raw message