You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2008/09/01 22:42:07 UTC
svn commit: r691053 - in /tuscany/java/sca/modules:
implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/
implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/
implementation-bpel...
Author: jsdelfino
Date: Mon Sep 1 13:42:07 2008
New Revision: 691053
URL: http://svn.apache.org/viewvc?rev=691053&view=rev
Log:
Changed uri and location to strings instead of URI and URL in the BPEL implementation model as strings are more lightweight and that's what we've already done with other similar models as well. Added a pointer to the ModelResolver which can be used to resolve WSDLs and XSDs referenced by the BPEL process when it's deployed and started later, after the original model read/resolve phases.
Modified:
tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/BPELODEDeployFile.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/BPELImplementationProvider.java
tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementation.java
tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELProcessDefinition.java
tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELImplementationImpl.java
tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELProcessDefinitionImpl.java
tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELDocumentProcessor.java
tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELImplementationProcessor.java
tuscany/java/sca/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELDocumentProcessorTestCase.java
Modified: tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/BPELODEDeployFile.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/BPELODEDeployFile.java?rev=691053&r1=691052&r2=691053&view=diff
==============================================================================
--- tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/BPELODEDeployFile.java (original)
+++ tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/BPELODEDeployFile.java Mon Sep 1 13:42:07 2008
@@ -209,9 +209,8 @@
* @return - the File object containing the BPEL process
*/
private File getBPELFile() {
- URL fileURL = implementation.getProcessDefinition().getLocation();
try {
- File theProcess = new File( fileURL.toURI());
+ File theProcess = new File(implementation.getProcessDefinition().getLocation());
return theProcess;
} catch( Exception e ) {
if(__log.isDebugEnabled()) {
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=691053&r1=691052&r2=691053&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 Mon Sep 1 13:42:07 2008
@@ -95,9 +95,9 @@
*/
public String getBpelDocument() {
//System.out.println("getBPELDocument called");
- URL processURL = implementation.getProcessDefinition().getLocation();
+ String processURL = implementation.getProcessDefinition().getLocation();
try {
- return getRelativePath( getDirectory(), new File( processURL.toURI() ));
+ return getRelativePath( getDirectory(), new File(processURL));
} catch (Exception e) {
if(__log.isWarnEnabled()) {
__log.warn("Unable to resolve relative path of BPEL process" + processURL, e );
@@ -382,9 +382,8 @@
* @return - the File object containing the BPEL process
*/
private File getBPELFile() {
- URL fileURL = implementation.getProcessDefinition().getLocation();
try {
- File theProcess = new File( fileURL.toURI());
+ File theProcess = new File(implementation.getProcessDefinition().getLocation());
return theProcess;
} catch( Exception e ) {
if(__log.isDebugEnabled()) {
Modified: tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELImplementationProvider.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/BPELImplementationProvider.java?rev=691053&r1=691052&r2=691053&view=diff
==============================================================================
--- tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELImplementationProvider.java (original)
+++ tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELImplementationProvider.java Mon Sep 1 13:42:07 2008
@@ -19,7 +19,7 @@
package org.apache.tuscany.sca.implementation.bpel.ode.provider;
import java.io.File;
-import java.net.URL;
+import java.net.URI;
import javax.transaction.TransactionManager;
@@ -95,9 +95,9 @@
odeServer.init();
}
- URL deployURL = this.implementation.getProcessDefinition().getLocation();
+ URI deployURI = URI.create(this.implementation.getProcessDefinition().getLocation());
- File deploymentDir = new File(deployURL.toURI().getPath()).getParentFile();
+ File deploymentDir = new File(deployURI.getPath()).getParentFile();
if(__log.isInfoEnabled()) {
__log.info(">>> Deploying : " + deploymentDir.toString());
Modified: tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementation.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementation.java?rev=691053&r1=691052&r2=691053&view=diff
==============================================================================
--- tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementation.java (original)
+++ tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementation.java Mon Sep 1 13:42:07 2008
@@ -22,6 +22,7 @@
import org.apache.tuscany.sca.assembly.ComponentType;
import org.apache.tuscany.sca.assembly.Implementation;
+import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
/**
* The model representing the BPEL implementation in an SCA assembly model.
@@ -71,4 +72,20 @@
* @param componentType the component type to set
*/
public void setComponentType(ComponentType componentType);
+
+ /**
+ * Returns the model resolver that can be used to resolve WSDLs and XSDs
+ * referenced by the BPEL process.
+ *
+ * @return
+ */
+ ModelResolver getModelResolver();
+
+ /**
+ * Sets the model resolver that can be used to resolve WSDLs and XSDs referenced
+ * by the BPEL process.
+ *
+ * @param modelResolver
+ */
+ void setModelResolver(ModelResolver modelResolver);
}
Modified: tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELProcessDefinition.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELProcessDefinition.java?rev=691053&r1=691052&r2=691053&view=diff
==============================================================================
--- tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELProcessDefinition.java (original)
+++ tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELProcessDefinition.java Mon Sep 1 13:42:07 2008
@@ -57,28 +57,28 @@
*
* @return URI for the process
*/
- URI getURI();
+ String getURI();
/**
* Set the BPEL process URI
*
* @param uri for the process
*/
- void setURI(URI uri);
+ void setURI(String uri);
/**
* Get the URL for the process location
*
* @return
*/
- URL getLocation();
+ String getLocation();
/**
* Set the URL for the process location
*
* @param url
*/
- void setLocation(URL location);
+ void setLocation(String location);
/**
* Return the list of PartnerLinks for this process
Modified: tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELImplementationImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELImplementationImpl.java?rev=691053&r1=691052&r2=691053&view=diff
==============================================================================
--- tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELImplementationImpl.java (original)
+++ tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELImplementationImpl.java Mon Sep 1 13:42:07 2008
@@ -29,6 +29,7 @@
import org.apache.tuscany.sca.assembly.Reference;
import org.apache.tuscany.sca.assembly.Service;
import org.apache.tuscany.sca.assembly.impl.ImplementationImpl;
+import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
import org.apache.tuscany.sca.implementation.bpel.BPELImplementation;
import org.apache.tuscany.sca.implementation.bpel.BPELProcessDefinition;
@@ -42,6 +43,7 @@
private QName processName;
private BPELProcessDefinition processDefinition;
private ComponentType componentType;
+ private ModelResolver modelResolver;
public QName getProcess() {
return processName;
@@ -61,53 +63,49 @@
@Override
public String getURI() {
- // The sample BPEL implementation does not have a URI
+ // The BPEL implementation does not have a URI
return null;
}
@Override
public void setURI(String uri) {
- // The sample BPEL implementation does not have a URI
+ // The BPEL implementation does not have a URI
}
@Override
public ConstrainingType getConstrainingType() {
- // The sample BPEL implementation does not support constrainingTypes
+ // The BPEL implementation does not support constrainingTypes
return null;
}
@Override
public List<Property> getProperties() {
- // The sample BPEL implementation does not support properties
+ // The BPEL implementation does not support properties
return Collections.emptyList();
}
- /*
- * Returns the componentType for this BPEL process implementation
- */
public ComponentType getComponentType() {
return componentType;
}
- /*
- * Sets the componentType for this BPEL process implementation
- */
public void setComponentType(ComponentType componentType) {
this.componentType = componentType;
}
+ public ModelResolver getModelResolver() {
+ return modelResolver;
+ }
+
+ public void setModelResolver(ModelResolver modelResolver) {
+ this.modelResolver = modelResolver;
+ }
+
@Override
- /**
- * Returns a List of the services for this BPEL process implementation
- */
public List<Service> getServices() {
return componentType.getServices();
}
@Override
- /**
- * Returns a List of the references for this BPEL process implementation
- */
public List<Reference> getReferences() {
return componentType.getReferences();
}
Modified: tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELProcessDefinitionImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELProcessDefinitionImpl.java?rev=691053&r1=691052&r2=691053&view=diff
==============================================================================
--- tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELProcessDefinitionImpl.java (original)
+++ tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELProcessDefinitionImpl.java Mon Sep 1 13:42:07 2008
@@ -19,7 +19,6 @@
package org.apache.tuscany.sca.implementation.bpel.impl;
-import java.net.URI;
import java.net.URL;
import java.util.ArrayList;
import java.util.List;
@@ -39,8 +38,8 @@
*/
class BPELProcessDefinitionImpl implements BPELProcessDefinition {
private QName name;
- private URI uri;
- private URL location;
+ private String uri;
+ private String location;
private boolean unresolved;
private List<BPELPartnerLinkElement> partnerLinks = new ArrayList<BPELPartnerLinkElement>();
private List<BPELImportElement> imports = new ArrayList<BPELImportElement>();
@@ -55,19 +54,19 @@
this.name = name;
}
- public URI getURI() {
+ public String getURI() {
return uri;
}
- public void setURI(URI uri) {
+ public void setURI(String uri) {
this.uri = uri;
}
- public URL getLocation() {
+ public String getLocation() {
return location;
}
- public void setLocation(URL location) {
+ public void setLocation(String location) {
this.location = location;
}
Modified: tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELDocumentProcessor.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELDocumentProcessor.java?rev=691053&r1=691052&r2=691053&view=diff
==============================================================================
--- tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELDocumentProcessor.java (original)
+++ tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELDocumentProcessor.java Mon Sep 1 13:42:07 2008
@@ -109,7 +109,7 @@
// and relying on componentType file for service definition
// so it's OK to set resolved for now
processDefinition = readProcessDefinition(artifactURL);
- processDefinition.setURI(artifactURI);
+ processDefinition.setURI(artifactURI.toString());
processDefinition.setUnresolved(false);
} catch (Exception e) {
ContributionReadException ce = new ContributionReadException(e);
@@ -333,7 +333,7 @@
private BPELProcessDefinition readProcessDefinition(URL doc) throws Exception {
BPELProcessDefinition processDefinition = factory.createBPELProcessDefinition();
processDefinition.setUnresolved(true);
- processDefinition.setLocation(doc);
+ processDefinition.setLocation(doc.toString());
InputStream is = doc.openStream();
XMLStreamReader reader = null;
Modified: tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELImplementationProcessor.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELImplementationProcessor.java?rev=691053&r1=691052&r2=691053&view=diff
==============================================================================
--- tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELImplementationProcessor.java (original)
+++ tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELImplementationProcessor.java Mon Sep 1 13:42:07 2008
@@ -125,6 +125,8 @@
if( implementation != null && implementation.isUnresolved())
{
+ implementation.setModelResolver(resolver);
+
BPELProcessDefinition processDefinition = resolveBPELProcessDefinition(implementation, resolver);
if(processDefinition.isUnresolved()) {
error("BPELProcessNotFound", implementation, processDefinition.getName());
Modified: tuscany/java/sca/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELDocumentProcessorTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELDocumentProcessorTestCase.java?rev=691053&r1=691052&r2=691053&view=diff
==============================================================================
--- tuscany/java/sca/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELDocumentProcessorTestCase.java (original)
+++ tuscany/java/sca/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELDocumentProcessorTestCase.java Mon Sep 1 13:42:07 2008
@@ -54,6 +54,6 @@
assertNotNull(bpelProcessDefinition);
assertEquals(new QName("http://tuscany.apache.org/implementation/bpel/example/helloworld", "HelloWorld"), bpelProcessDefinition.getName());
- assertEquals(processLocation, bpelProcessDefinition.getLocation());
+ assertEquals(processLocation.toString(), bpelProcessDefinition.getLocation());
}
}