You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by lr...@apache.org on 2010/02/15 18:35:02 UTC
svn commit: r910275 - in
/tuscany/sca-java-2.x/trunk/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode:
./ provider/
Author: lresende
Date: Mon Feb 15 17:34:56 2010
New Revision: 910275
URL: http://svn.apache.org/viewvc?rev=910275&view=rev
Log:
Formatting...
Modified:
tuscany/sca-java-2.x/trunk/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServer.java
tuscany/sca-java-2.x/trunk/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEEndpointReference.java
tuscany/sca-java-2.x/trunk/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELImplementationProvider.java
tuscany/sca-java-2.x/trunk/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELInvoker.java
Modified: tuscany/sca-java-2.x/trunk/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServer.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServer.java?rev=910275&r1=910274&r2=910275&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServer.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServer.java Mon Feb 15 17:34:56 2010
@@ -147,38 +147,37 @@
* @throws ODEInitializationException
* @throws URISyntaxException
*/
- private File getDatabaseLocationAsFile() throws ODEInitializationException,
- URISyntaxException {
- File locationFile = null;
- URL dbLocation = null;
-
- // An environment variable to set the path to the DB
- String dbFile = System.getenv("TUSCANY_IMPL_BPEL_DBLOCATION");
- if( dbFile != null ) {
- try {
- locationFile = new File(dbFile).getParentFile();
- } catch (Exception e ) {
- System.out.println("Environment variable TUSCANY_IMPL_BPEL_LOCATION has the wrong format: " + dbFile);
- System.out.println("Exception is: " + e.getClass().toString() + " " + e.getMessage());
- } // end try
- } else {
- dbLocation = getClass().getClassLoader().getResource("jpadb");
- if (dbLocation == null) {
- throw new ODEInitializationException("Couldn't find database in the classpath:" +
- " try setting the TUSCANY_IMPL_BPEL_LOCATION environment variable");
- }
- // Handle OSGI bundle case
- if( dbLocation.getProtocol() == "bundleresource" ) {
- try {
- dbLocation = FileLocator.toFileURL( dbLocation );
- } catch (Exception ce ) {
- throw new ODEInitializationException("Couldn't find database in the OSGi bundle");
- } // end try
- } // end if
- locationFile = new File(dbLocation.toURI()).getParentFile();
- } // end if
-
- return locationFile;
+ private File getDatabaseLocationAsFile() throws ODEInitializationException, URISyntaxException {
+ File locationFile = null;
+ URL dbLocation = null;
+
+ // An environment variable to set the path to the DB
+ String dbFile = System.getenv("TUSCANY_IMPL_BPEL_DBLOCATION");
+ if( dbFile != null ) {
+ try {
+ locationFile = new File(dbFile).getParentFile();
+ } catch (Exception e ) {
+ System.out.println("Environment variable TUSCANY_IMPL_BPEL_LOCATION has the wrong format: " + dbFile);
+ System.out.println("Exception is: " + e.getClass().toString() + " " + e.getMessage());
+ } // end try
+ } else {
+ dbLocation = getClass().getClassLoader().getResource("jpadb");
+ if (dbLocation == null) {
+ throw new ODEInitializationException("Couldn't find database in the classpath:" +
+ " try setting the TUSCANY_IMPL_BPEL_LOCATION environment variable");
+ }
+ // Handle OSGI bundle case
+ if( dbLocation.getProtocol() == "bundleresource" ) {
+ try {
+ dbLocation = FileLocator.toFileURL( dbLocation );
+ } catch (Exception ce ) {
+ throw new ODEInitializationException("Couldn't find database in the OSGi bundle");
+ } // end try
+ } // end if
+ locationFile = new File(dbLocation.toURI()).getParentFile();
+ } // end if
+
+ return locationFile;
} // end method getDatabaseLocationAsFile
private void initTxMgr() {
Modified: tuscany/sca-java-2.x/trunk/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEEndpointReference.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEEndpointReference.java?rev=910275&r1=910274&r2=910275&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEEndpointReference.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEEndpointReference.java Mon Feb 15 17:34:56 2010
@@ -31,10 +31,10 @@
*/
public class ODEEndpointReference implements EndpointReference {
-
- private Document doc = DOMUtils.newDocument();
+
+ private Document doc = DOMUtils.newDocument();
private Element serviceref;
-
+
/**
* Private constructor for the EndpointReference
*/
Modified: tuscany/sca-java-2.x/trunk/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELImplementationProvider.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELImplementationProvider.java?rev=910275&r1=910274&r2=910275&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELImplementationProvider.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELImplementationProvider.java Mon Feb 15 17:34:56 2010
@@ -159,9 +159,9 @@
throw new RuntimeException("BPEL Component Type Implementation : Error initializing embedded ODE server " + inite.getMessage(), inite);
} catch(Exception e) {
throw new RuntimeException("BPEL Component Type Implementation initialization failure : " + e.getMessage(), e);
- } finally {
- // Restore the TCCL if we changed it
- if( tccl != null ) Thread.currentThread().setContextClassLoader(tccl);
+ } finally {
+ // Restore the TCCL if we changed it
+ if( tccl != null ) Thread.currentThread().setContextClassLoader(tccl);
} // end try
} // end method start()
Modified: tuscany/sca-java-2.x/trunk/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELInvoker.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELInvoker.java?rev=910275&r1=910274&r2=910275&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELInvoker.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELInvoker.java Mon Feb 15 17:34:56 2010
@@ -58,7 +58,7 @@
* @version $Rev$ $Date$
*/
public class BPELInvoker implements Invoker {
- private final static long TIME_OUT = 10000L;
+ private final static long TIME_OUT = 10000L;
protected final Log __log = LogFactory.getLog(getClass());
@@ -114,10 +114,10 @@
public Message invoke(Message msg) {
try {
- if( isCallback ) {
- // Extract the callback endpoint metadata
- callbackEPR = msg.getFrom();
- } // end if
+ if( isCallback ) {
+ // Extract the callback endpoint metadata
+ callbackEPR = msg.getFrom();
+ } // end if
Object[] args = msg.getBody();
Object resp = doTheWork(args);
msg.setBody(resp);