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 2007/06/09 02:06:07 UTC
svn commit: r545664 - in
/incubator/tuscany/java/sca/modules/implementation-bpel/src:
main/java/org/apache/tuscany/sca/implementation/bpel/
main/java/org/apache/tuscany/sca/implementation/bpel/backend/
main/java/org/apache/tuscany/sca/implementation/bp...
Author: lresende
Date: Fri Jun 8 17:06:06 2007
New Revision: 545664
URL: http://svn.apache.org/viewvc?view=rev&rev=545664
Log:
Simplifying the implementation.bepl interface
Removed:
incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/backend/
Modified:
incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPEL.java
incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementation.java
incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELImplementationImpl.java
incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELImplementationProcessor.java
incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/provider/BPELImplementationProvider.java
incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/provider/BPELInvoker.java
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELTestCase.java
Modified: incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPEL.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPEL.java?view=diff&rev=545664&r1=545663&r2=545664
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPEL.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPEL.java Fri Jun 8 17:06:06 2007
@@ -26,31 +26,10 @@
public interface BPEL {
/**
- * Create a new resource.
- * @param resource
- * @return
+ * Invoke a bpel process
+ * @param object
+ * @return object
*/
- String create(Object resource);
-
- /**
- * Retrieve a resource.
- * @param id
- * @return
- */
- Object retrieve(String id);
-
- /**
- * Update a resource.
- * @param id
- * @param resource
- * @return
- */
- Object update(String id, Object resource);
-
- /**
- * Delete a resource.
- * @param id
- */
- void delete(String id);
+ Object invokeProcess(Object object);
}
Modified: incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementation.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementation.java?view=diff&rev=545664&r1=545663&r2=545664
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementation.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementation.java Fri Jun 8 17:06:06 2007
@@ -40,19 +40,5 @@
* @param BPEL process name
*/
public void setProcess(String process);
-
- /**
- * Returns the directory used by CRUD implementations to persist resources.
- *
- * @return the directory used to persist resources
- */
- public String getDirectory();
-
- /**
- * Sets the directory used by CRUD implementations to persist resources.
- *
- * @param directory the directory used to persist resources
- */
- public void setDirectory(String directory);
}
Modified: incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELImplementationImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELImplementationImpl.java?view=diff&rev=545664&r1=545663&r2=545664
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELImplementationImpl.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELImplementationImpl.java Fri Jun 8 17:06:06 2007
@@ -45,7 +45,6 @@
private Service bpelService;
private String process;
- private String directory;
/**
* Constructs a new BPEL implementation.
@@ -73,18 +72,8 @@
return process;
}
-
-
public void setProcess(String process) {
this.process = process;
- }
-
- public String getDirectory() {
- return directory;
- }
-
- public void setDirectory(String directory) {
- this.directory = directory;
}
public ConstrainingType getConstrainingType() {
Modified: incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELImplementationProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELImplementationProcessor.java?view=diff&rev=545664&r1=545663&r2=545664
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELImplementationProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELImplementationProcessor.java Fri Jun 8 17:06:06 2007
@@ -67,16 +67,12 @@
// Read an <implementation.bpel> element
try {
+ // Read the process attribute.
String process = reader.getAttributeValue(null, "process");
- // Read the directory attribute. This is where the sample
- // CRUD implementation will persist resources.
- String directory = reader.getAttributeValue(null, "directory");
-
// Create an initialize the BPEL implementation model
BPELImplementation implementation = bpelFactory.createBPELImplementation();
implementation.setProcess(process);
- implementation.setDirectory(directory);
// Skip to end element
while (reader.hasNext()) {
Modified: incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/provider/BPELImplementationProvider.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/provider/BPELImplementationProvider.java?view=diff&rev=545664&r1=545663&r2=545664
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/provider/BPELImplementationProvider.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/provider/BPELImplementationProvider.java Fri Jun 8 17:06:06 2007
@@ -19,7 +19,6 @@
package org.apache.tuscany.sca.implementation.bpel.provider;
import org.apache.tuscany.sca.implementation.bpel.BPELImplementation;
-import org.apache.tuscany.sca.implementation.bpel.backend.ResourceManager;
import org.apache.tuscany.sca.interfacedef.Operation;
import org.apache.tuscany.sca.invocation.Invoker;
import org.apache.tuscany.sca.provider.ImplementationProvider;
@@ -49,12 +48,12 @@
}
public Invoker createInvoker(RuntimeComponentService service, Operation operation) {
- BPELInvoker invoker = new BPELInvoker(operation, new ResourceManager(implementation.getDirectory()));
+ BPELInvoker invoker = new BPELInvoker(operation);
return invoker;
}
public Invoker createCallbackInvoker(Operation operation) {
- BPELInvoker invoker = new BPELInvoker(operation, new ResourceManager(implementation.getDirectory()));
+ BPELInvoker invoker = new BPELInvoker(operation);
return invoker;
}
Modified: incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/provider/BPELInvoker.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/provider/BPELInvoker.java?view=diff&rev=545664&r1=545663&r2=545664
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/provider/BPELInvoker.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/provider/BPELInvoker.java Fri Jun 8 17:06:06 2007
@@ -21,7 +21,6 @@
import java.lang.reflect.InvocationTargetException;
-import org.apache.tuscany.sca.implementation.bpel.backend.ResourceManager;
import org.apache.tuscany.sca.interfacedef.Operation;
import org.apache.tuscany.sca.invocation.Invoker;
import org.apache.tuscany.sca.invocation.Message;
@@ -36,11 +35,9 @@
*/
public class BPELInvoker implements Invoker {
private Operation operation;
- private ResourceManager resourceManager;
- public BPELInvoker(Operation operation, ResourceManager resourceManager) {
+ public BPELInvoker(Operation operation) {
this.operation = operation;
- this.resourceManager = resourceManager;
}
public Message invoke(Message msg) {
@@ -55,19 +52,8 @@
}
public Object doTheWork(Object[] args) throws InvocationTargetException {
- if (operation.getName().equals("create")) {
- return resourceManager.createResource(args[0]);
-
- } else if (operation.getName().equals("retrieve")) {
- return resourceManager.retrieveResource((String)args[0]);
-
- } else if (operation.getName().equals("update")) {
- return resourceManager.updateResource((String)args[0], args[1]);
-
- } else if (operation.getName().equals("delete")) {
- resourceManager.deleteResource((String)args[0]);
- return null;
-
+ if (operation.getName().equals("invokeProcess")) {
+ return args[0];
} else {
return null;
}
Modified: incubator/tuscany/java/sca/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELTestCase.java?view=diff&rev=545664&r1=545663&r2=545664
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELTestCase.java Fri Jun 8 17:06:06 2007
@@ -51,15 +51,8 @@
public void testCRUD() throws Exception {
- String id = bpelService.create("ABC");
- Object result = bpelService.retrieve(id);
- assertEquals("ABC", result);
- bpelService.update(id, "EFG");
- result = bpelService.retrieve(id);
- assertEquals("EFG", result);
- bpelService.delete(id);
- result = bpelService.retrieve(id);
- assertNull(result);
+ Object result = bpelService.invokeProcess("something");
+ assertEquals("something", result);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org