summaryrefslogtreecommitdiffstats
path: root/java/sca/modules/implementation-bpel-runtime
diff options
context:
space:
mode:
authorrfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68>2009-07-16 04:07:55 +0000
committerrfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68>2009-07-16 04:07:55 +0000
commita6a65ad2db2b466494a1526d2266931fc3c5fa76 (patch)
tree705677f6446508eed112b05095d0bcc6e3c3e325 /java/sca/modules/implementation-bpel-runtime
parent6d4696612dc9c701a40be66c446f99f5ff6bbacc (diff)
Turn SimpleTypeMapper into a utility so that the implementation-bepl can use it
Fix the OSGi MF git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@794517 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/sca/modules/implementation-bpel-runtime')
-rw-r--r--java/sca/modules/implementation-bpel-runtime/META-INF/MANIFEST.MF4
-rw-r--r--java/sca/modules/implementation-bpel-runtime/pom.xml153
-rw-r--r--java/sca/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyProcessConfImpl.java10
3 files changed, 10 insertions, 157 deletions
diff --git a/java/sca/modules/implementation-bpel-runtime/META-INF/MANIFEST.MF b/java/sca/modules/implementation-bpel-runtime/META-INF/MANIFEST.MF
index 339bfc5552..fe4e10184d 100644
--- a/java/sca/modules/implementation-bpel-runtime/META-INF/MANIFEST.MF
+++ b/java/sca/modules/implementation-bpel-runtime/META-INF/MANIFEST.MF
@@ -40,6 +40,8 @@ Import-Package: javax.resource.spi,
org.apache.ode.utils,
org.apache.tuscany.sca.assembly;version="2.0",
org.apache.tuscany.sca.core;version="2.0",
+ org.apache.tuscany.sca.databinding;version="2.0",
+ org.apache.tuscany.sca.databinding.impl;version="2.0",
org.apache.tuscany.sca.databinding.xml;version="2.0",
org.apache.tuscany.sca.implementation.bpel;version="2.0",
org.apache.tuscany.sca.interfacedef;version="2.0",
@@ -48,7 +50,7 @@ Import-Package: javax.resource.spi,
org.apache.tuscany.sca.policy;version="2.0.0",
org.apache.tuscany.sca.provider;version="2.0",
org.apache.tuscany.sca.runtime;version="2.0",
- org.eclipse.core.runtime;common="split",
+ org.eclipse.core.runtime;common=split,
org.oasisopen.sca.annotation;version="2.0",
org.w3c.dom;resolution:=optional
Bundle-SymbolicName: org.apache.tuscany.sca.implementation.bpel.ode
diff --git a/java/sca/modules/implementation-bpel-runtime/pom.xml b/java/sca/modules/implementation-bpel-runtime/pom.xml
index 452d4c0559..122896976d 100644
--- a/java/sca/modules/implementation-bpel-runtime/pom.xml
+++ b/java/sca/modules/implementation-bpel-runtime/pom.xml
@@ -177,7 +177,7 @@
<dependency>
<groupId>org.eclipse.equinox</groupId>
<artifactId>common</artifactId>
- <version>3.4.0-v20080421-2006</version>
+ <version>3.5.0-v20090520-1800</version>
</dependency>
<!-- ODE Dependencies -->
@@ -428,17 +428,6 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <!-- http://jira.codehaus.org/browse/SUREFIRE-322 -->
- <version>2.3.1</version>
- <configuration>
- <useFile>false</useFile>
- <trimStackTrace>false</trimStackTrace>
- <useSystemClassLoader>true</useSystemClassLoader>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
@@ -461,146 +450,6 @@
</artifactItems>
</configuration>
</execution>
- <execution>
- <!--
- Copy the set of dependency JARs that MUST be included within the implementation-bpel-runtime
- JAR for OSGi purposes. These JARs are placed in the Bundle-Classpath in the MANIFEST.MF of
- the JAR so that any required classes from them are all loaded by the classloader for the
- implementation-bpel-runtime bundle
- -->
- <id>copy</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.apache.ode</groupId>
- <artifactId>ode-agents</artifactId>
- <version>1.3.2</version>
- <type>jar</type>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.ode</groupId>
- <artifactId>ode-bpel-api</artifactId>
- <version>1.3.2</version>
- <type>jar</type>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.ode</groupId>
- <artifactId>ode-bpel-compiler</artifactId>
- <version>1.3.2</version>
- <type>jar</type>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.ode</groupId>
- <artifactId>ode-bpel-dao</artifactId>
- <version>1.3.2</version>
- <type>jar</type>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.ode</groupId>
- <artifactId>ode-bpel-epr</artifactId>
- <version>1.3.2</version>
- <type>jar</type>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.ode</groupId>
- <artifactId>ode-bpel-obj</artifactId>
- <version>1.3.2</version>
- <type>jar</type>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.ode</groupId>
- <artifactId>ode-bpel-runtime</artifactId>
- <version>1.3.2</version>
- <type>jar</type>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.ode</groupId>
- <artifactId>ode-bpel-schemas</artifactId>
- <version>1.3.2</version>
- <type>jar</type>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.ode</groupId>
- <artifactId>ode-bpel-store</artifactId>
- <version>1.3.2</version>
- <type>jar</type>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.ode</groupId>
- <artifactId>ode-dao-hibernate</artifactId>
- <version>1.3.2</version>
- <type>jar</type>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.ode</groupId>
- <artifactId>ode-dao-jpa</artifactId>
- <version>1.3.2</version>
- <type>jar</type>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.ode</groupId>
- <artifactId>ode-jacob</artifactId>
- <version>1.3.2</version>
- <type>jar</type>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.ode</groupId>
- <artifactId>ode-jacob-ap</artifactId>
- <version>1.3.2</version>
- <type>jar</type>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.ode</groupId>
- <artifactId>ode-scheduler-simple</artifactId>
- <version>1.3.2</version>
- <type>jar</type>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.ode</groupId>
- <artifactId>ode-utils</artifactId>
- <version>1.3.2</version>
- <type>jar</type>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.geronimo.components</groupId>
- <artifactId>geronimo-connector</artifactId>
- <version>2.0.1</version>
- <type>jar</type>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.1_spec</artifactId>
- <version>1.1</version>
- <type>jar</type>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.geronimo.components</groupId>
- <artifactId>geronimo-transaction</artifactId>
- <version>2.0.1</version>
- <type>jar</type>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa</artifactId>
- <version>1.3.0-SNAPSHOT</version>
- <type>jar</type>
- </artifactItem>
- <artifactItem>
- <groupId>javax.persistence</groupId>
- <artifactId>persistence-api</artifactId>
- <version>1.0</version>
- <type>jar</type>
- </artifactItem>
- </artifactItems>
- <outputDirectory>${project.build.directory}/classes</outputDirectory>
- <overWriteReleases>true</overWriteReleases>
- <overWriteSnapshots>true</overWriteSnapshots>
- </configuration>
- </execution>
</executions>
</plugin>
diff --git a/java/sca/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyProcessConfImpl.java b/java/sca/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyProcessConfImpl.java
index 97ee7ca5b1..89f3ad9568 100644
--- a/java/sca/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyProcessConfImpl.java
+++ b/java/sca/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyProcessConfImpl.java
@@ -56,14 +56,15 @@ import org.apache.ode.bpel.iapi.Endpoint;
import org.apache.ode.bpel.iapi.EndpointReference;
import org.apache.ode.bpel.iapi.ProcessConf;
import org.apache.ode.bpel.iapi.ProcessState;
-import org.apache.ode.bpel.iapi.ProcessConf.CLEANUP_CATEGORY;
+import org.apache.tuscany.sca.assembly.Base;
import org.apache.tuscany.sca.assembly.ComponentProperty;
import org.apache.tuscany.sca.assembly.Reference;
import org.apache.tuscany.sca.assembly.Service;
+import org.apache.tuscany.sca.databinding.SimpleTypeMapper;
+import org.apache.tuscany.sca.databinding.impl.SimpleTypeMapperImpl;
import org.apache.tuscany.sca.implementation.bpel.BPELImplementation;
import org.apache.tuscany.sca.interfacedef.wsdl.WSDLInterface;
import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.databinding.impl.SimpleTypeMapperImpl;
import org.w3c.dom.Attr;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -90,7 +91,8 @@ public class TuscanyProcessConfImpl implements ProcessConf {
// Marks whether the BPEL file was rewritten (eg for initializer statements)
private boolean rewritten = false;
- private final String TUSCANY_NAMESPACE = "http://tuscany.apache.org";
+ private final SimpleTypeMapper mapper = new SimpleTypeMapperImpl();
+ private final String TUSCANY_NAMESPACE = Base.SCA11_TUSCANY_NS;
/**
* Constructor for the ProcessConf implementation
@@ -495,7 +497,7 @@ public class TuscanyProcessConfImpl implements ProcessConf {
// <assign><copy><from><literal>value</literal></from><to variable="variableName"/></copy></assign>
QName type = property.getXSDType();
if( type != null ) {
- if( SimpleTypeMapperImpl.isSimpleXSDType( type ) ) {
+ if( mapper.isSimpleXSDType( type ) ) {
// Simple types
String NS_URI = bpelDOM.getDocumentElement().getNamespaceURI();
String valueText = getPropertyValueText( property.getValue() );
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-28 23:59:34 +0000