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, 7 insertions, 4 deletions

diff --git a/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/JavaPropertyValueObjectFactory.java b/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/JavaPropertyValueObjectFactory.java
index 57d6d199ea..e681af7217 100644
--- a/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/JavaPropertyValueObjectFactory.java
+++ b/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/JavaPropertyValueObjectFactory.java
@@ -52,10 +52,13 @@ import org.w3c.dom.NodeList;
  */

 public class JavaPropertyValueObjectFactory implements PropertyValueFactory {

     private Mediator mediator = null;

+    private SimpleTypeMapper simpleTypeMapper;

     private boolean isSimpleType;

 

     public JavaPropertyValueObjectFactory(ExtensionPointRegistry registry) {

-        this.mediator = registry.getExtensionPoint(UtilityExtensionPoint.class).getUtility(Mediator.class);

+        UtilityExtensionPoint utilityExtensionPoint = registry.getExtensionPoint(UtilityExtensionPoint.class);

+        this.mediator = utilityExtensionPoint.getUtility(Mediator.class);

+        this.simpleTypeMapper = utilityExtensionPoint.getUtility(SimpleTypeMapper.class);

     }

 

     public JavaPropertyValueObjectFactory(Mediator mediator) {

@@ -130,7 +133,7 @@ public class JavaPropertyValueObjectFactory implements PropertyValueFactory {
                                           new XMLType(null, this.property.getXSDType()));

             TypeInfo typeInfo = null;

             if (this.property.getXSDType() != null) {

-                if (SimpleTypeMapperImpl.isSimpleXSDType(this.property.getXSDType())) {

+                if (simpleTypeMapper.isSimpleXSDType(this.property.getXSDType())) {

                     typeInfo = new TypeInfo(property.getXSDType(), true, null);

                 } else {

                     typeInfo = new TypeInfo(property.getXSDType(), false, null);

@@ -264,9 +267,9 @@ public class JavaPropertyValueObjectFactory implements PropertyValueFactory {
      * @param property

      * @return

      */

-    private static boolean isSimpleType(Property property) {

+    private boolean isSimpleType(Property property) {

         if (property.getXSDType() != null) {

-            return SimpleTypeMapperImpl.isSimpleXSDType(property.getXSDType());

+            return simpleTypeMapper.isSimpleXSDType(property.getXSDType());

         } else {

             if (property instanceof Document) {

                 Document doc = (Document)property;