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

1 files changed, 6 insertions, 4 deletions

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() );