Author: lresende
Date: Tue Nov 6 15:24:37 2007
New Revision: 592582
URL: http://svn.apache.org/viewvc?rev=592582&view=rev
Log:
Fix how we create componentType URI in implementation.bpel to support
componentTypes stored in sub folders.
Added:
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/resources/helloworld/
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/resources/helloworld/deploy.xml
- copied unchanged from r592307,
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/resources/deploy.xml
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/resources/helloworld/helloworld.bpel
- copied unchanged from r592307,
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/resources/helloworld.bpel
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/resources/helloworld/helloworld.componentType
- copied unchanged from r592307,
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/resources/helloworld.componentType
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/resources/helloworld/helloworld.composite
- copied unchanged from r592307,
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/resources/helloworld.composite
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/resources/helloworld/helloworld.wsdl
- copied unchanged from r592307,
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/resources/helloworld.wsdl
Removed:
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/resources/deploy.xml
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/resources/helloworld.bpel
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/resources/helloworld.componentType
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/resources/helloworld.composite
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/resources/helloworld.wsdl
Modified:
incubator/tuscany/java/sca/modules/implementation-bpel/pom.xml
incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELProcessDefinition.java
incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELDocumentProcessor.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/impl/BPELProcessDefinitionImpl.java
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELDocumentProcessorTestCase.java
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELHelloWorldTestCase.java
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/EmbeddedODEServerTestCase.java
Modified: incubator/tuscany/java/sca/modules/implementation-bpel/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-bpel/pom.xml?rev=592582&r1=592581&r2=592582&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-bpel/pom.xml (original)
+++ incubator/tuscany/java/sca/modules/implementation-bpel/pom.xml Tue Nov 6
15:24:37 2007
@@ -376,7 +376,7 @@
<id>generate-bpel-helloworld</id>
<phase>generate-sources</phase>
<configuration>
-
<schemaFile>${basedir}/src/test/resources/helloworld.wsdl</schemaFile>
+
<schemaFile>${basedir}/src/test/resources/helloworld/helloworld.wsdl</schemaFile>
<targetDirectory>${basedir}/target/wsdl2java-source</targetDirectory>
<prefix>HelloWorld</prefix>
<noNotification>true</noNotification>
@@ -387,6 +387,7 @@
<goal>generate</goal>
</goals>
</execution>
+
</executions>
</plugin>
<plugin>
@@ -398,8 +399,8 @@
<configuration>
<wsdlFiles>
<wsdlFile>
-
<fileName>${basedir}/src/test/resources/helloworld.wsdl</fileName>
- </wsdlFile>
+
<fileName>${basedir}/src/test/resources/helloworld/helloworld.wsdl</fileName>
+ </wsdlFile>
</wsdlFiles>
</configuration>
<goals>
Modified:
incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELProcessDefinition.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELProcessDefinition.java?rev=592582&r1=592581&r2=592582&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELProcessDefinition.java
(original)
+++
incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELProcessDefinition.java
Tue Nov 6 15:24:37 2007
@@ -19,6 +19,7 @@
package org.apache.tuscany.sca.implementation.bpel;
+import java.net.URI;
import java.net.URL;
import javax.xml.namespace.QName;
@@ -45,13 +46,25 @@
public void setName(QName name);
/**
- * Get the URI for the process location
+ * Get BPEL process URI
+ * @return uri for the process
+ */
+ public URI getURI();
+
+ /**
+ * Set the BPEL process URI
+ * @param uri for the process
+ */
+ public void setURI(URI uri);
+
+ /**
+ * Get the URL for the process location
* @return
*/
URL getLocation();
/**
- * Set the URI for the process location
+ * Set the URL for the process location
* @param url
*/
void setLocation(URL location);
Modified:
incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELDocumentProcessor.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELDocumentProcessor.java?rev=592582&r1=592581&r2=592582&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELDocumentProcessor.java
(original)
+++
incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELDocumentProcessor.java
Tue Nov 6 15:24:37 2007
@@ -71,6 +71,7 @@
//and relying on componentType file for service definition
//so it's ok to set resolved for now
processDefinition = indexRead(artifactURL);
+ processDefinition.setURI(artifactURI);
processDefinition.setUnresolved(false);
} catch (Exception e) {
throw new ContributionReadException(e);
@@ -81,7 +82,7 @@
public void resolve(BPELProcessDefinition model, ModelResolver resolver)
throws ContributionResolveException {
- // TODO Auto-generated method stub
+
}
/**
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?rev=592582&r1=592581&r2=592582&view=diff
==============================================================================
---
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
Tue Nov 6 15:24:37 2007
@@ -196,8 +196,8 @@
private ComponentType getComponentType(ModelResolver resolver,
BPELImplementation impl) {
- String bpelName = impl.getProcess().getLocalPart().toLowerCase();
- String componentTypeURI = bpelName.replace('.', '/') +
".componentType";
+ String bpelProcessURI =
impl.getProcessDefinition().getURI().toString();
+ String componentTypeURI = bpelProcessURI.replace(".bpel",
".componentType");
ComponentType componentType = assemblyFactory.createComponentType();
componentType.setUnresolved(true);
componentType.setURI(componentTypeURI);
Modified:
incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELProcessDefinitionImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELProcessDefinitionImpl.java?rev=592582&r1=592581&r2=592582&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELProcessDefinitionImpl.java
(original)
+++
incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELProcessDefinitionImpl.java
Tue Nov 6 15:24:37 2007
@@ -19,6 +19,7 @@
package org.apache.tuscany.sca.implementation.bpel.impl;
+import java.net.URI;
import java.net.URL;
import javax.xml.namespace.QName;
@@ -32,6 +33,7 @@
*/
public class BPELProcessDefinitionImpl implements BPELProcessDefinition {
private QName name;
+ private URI uri;
private URL location;
private boolean unresolved;
@@ -43,8 +45,16 @@
this.name = name;
}
+ public URI getURI() {
+ return uri;
+ }
+
+ public void setURI(URI uri) {
+ this.uri = uri;
+ }
+
public URL getLocation() {
- return this.location;
+ return location;
}
public void setLocation(URL location) {
Modified:
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELDocumentProcessorTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELDocumentProcessorTestCase.java?rev=592582&r1=592581&r2=592582&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELDocumentProcessorTestCase.java
(original)
+++
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELDocumentProcessorTestCase.java
Tue Nov 6 15:24:37 2007
@@ -37,7 +37,7 @@
*/
public class BPELDocumentProcessorTestCase extends TestCase {
- protected static final String BPEL_PROCESS_FILE = "helloworld.bpel";
+ protected static final String BPEL_PROCESS_FILE =
"helloworld/helloworld.bpel";
private ModelFactoryExtensionPoint modelFactories;
Modified:
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELHelloWorldTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELHelloWorldTestCase.java?rev=592582&r1=592581&r2=592582&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELHelloWorldTestCase.java
(original)
+++
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELHelloWorldTestCase.java
Tue Nov 6 15:24:37 2007
@@ -39,7 +39,7 @@
*/
@Override
protected void setUp() throws Exception {
- scaDomain = SCADomain.newInstance("helloworld.composite");
+ scaDomain = SCADomain.newInstance("helloworld/helloworld.composite");
bpelService = scaDomain.getService(HelloPortType.class,
"BPELHelloWorldComponent");
}
Modified:
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/EmbeddedODEServerTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/EmbeddedODEServerTestCase.java?rev=592582&r1=592581&r2=592582&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/EmbeddedODEServerTestCase.java
(original)
+++
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/EmbeddedODEServerTestCase.java
Tue Nov 6 15:24:37 2007
@@ -68,7 +68,7 @@
fail("Server did not start !");
}
- URL deployURL = getClass().getClassLoader().getResource("deploy.xml");
+ URL deployURL =
getClass().getClassLoader().getResource("helloworld/deploy.xml");
File deploymentDir = new
File(deployURL.toURI().getPath()).getParentFile();
System.out.println("Deploying : " + deploymentDir.toString());
System.out.println(deploymentDir);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
