Turn FaultExceptionMapper into a declarative system utility

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@771357 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 30 insertions, 12 deletions

diff --git a/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/module/DataBindingModuleActivator.java b/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/module/DataBindingModuleActivator.java
index 782a6fc3d3..dc7be4dcb4 100644
--- a/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/module/DataBindingModuleActivator.java
+++ b/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/module/DataBindingModuleActivator.java
@@ -38,7 +38,6 @@ import org.apache.tuscany.sca.databinding.impl.Group2GroupTransformer;
 import org.apache.tuscany.sca.databinding.jaxb.XMLAdapterExtensionPoint;
 import org.apache.tuscany.sca.interfacedef.FaultExceptionMapper;
 import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory;
-import org.apache.tuscany.sca.interfacedef.java.jaxws.JAXWSFaultExceptionMapper;
 import org.apache.tuscany.sca.interfacedef.java.jaxws.JAXWSJavaInterfaceProcessor;
 import org.apache.tuscany.sca.interfacedef.java.jaxws.WebServiceInterfaceProcessor;
 import org.apache.tuscany.sca.runtime.RuntimeWireProcessorExtensionPoint;
@@ -55,9 +54,9 @@ public class DataBindingModuleActivator implements ModuleActivator {
 
         XMLAdapterExtensionPoint xmlAdapterExtensionPoint = registry.getExtensionPoint(XMLAdapterExtensionPoint.class);
         xmlAdapterExtensionPoint.addAdapter(CallableReference.class, CallableReferenceXMLAdapter.class);
-        FaultExceptionMapper faultExceptionMapper = new JAXWSFaultExceptionMapper(dataBindings, xmlAdapterExtensionPoint);
-        registry.getExtensionPoint(UtilityExtensionPoint.class).addUtility(faultExceptionMapper);
-
+        
+        FaultExceptionMapper faultExceptionMapper = registry.getExtensionPoint(UtilityExtensionPoint.class).getUtility(FaultExceptionMapper.class);
+        
         Mediator mediator = registry.getExtensionPoint(UtilityExtensionPoint.class).getUtility(Mediator.class);
 
         Input2InputTransformer input2InputTransformer = new Input2InputTransformer();
diff --git a/java/sca/modules/interface-java-jaxws/META-INF/MANIFEST.MF b/java/sca/modules/interface-java-jaxws/META-INF/MANIFEST.MF
index 05ecfa9ef0..4fa91e0b45 100644
--- a/java/sca/modules/interface-java-jaxws/META-INF/MANIFEST.MF
+++ b/java/sca/modules/interface-java-jaxws/META-INF/MANIFEST.MF
@@ -28,6 +28,7 @@ Import-Package: javax.jws,
  javax.xml.transform.stream;resolution:=optional,

  javax.xml.ws,

  org.apache.tuscany.sca.assembly;version="2.0.0",

+ org.apache.tuscany.sca.core;version="2.0.0",

  org.apache.tuscany.sca.databinding;version="2.0.0",

  org.apache.tuscany.sca.databinding.annotation;version="2.0.0",

  org.apache.tuscany.sca.databinding.javabeans;version="2.0.0",

@@ -40,10 +41,10 @@ Import-Package: javax.jws,
  org.apache.tuscany.sca.interfacedef.java.jaxws;version="2.0.0",

  org.apache.tuscany.sca.interfacedef.util;version="2.0.0",

  org.apache.tuscany.sca.policy;version="2.0.0",

- org.objectweb.asm;version="3.1",

- org.objectweb.asm.util;version="3.1";resolution:=optional,

  org.oasisopen.sca;version="2.0.0",

- org.oasisopen.sca.annotation;version="2.0.0";resolution:=optional

+ org.oasisopen.sca.annotation;version="2.0.0";resolution:=optional,

+ org.objectweb.asm;version="3.1",

+ org.objectweb.asm.util;version="3.1";resolution:=optional

 Bundle-SymbolicName: org.apache.tuscany.sca.interface.java.jaxws

 Bundle-DocURL: http://www.apache.org/

 Bundle-RequiredExecutionEnvironment: J2SE-1.5,JavaSE-1.6
diff --git a/java/sca/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSFaultExceptionMapper.java b/java/sca/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSFaultExceptionMapper.java
index 242da0ebd4..1733b02aba 100644
--- a/java/sca/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSFaultExceptionMapper.java
+++ b/java/sca/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSFaultExceptionMapper.java
@@ -30,6 +30,7 @@ import java.security.PrivilegedAction;
 import javax.xml.namespace.QName;
 import javax.xml.ws.WebFault;
 
+import org.apache.tuscany.sca.core.ExtensionPointRegistry;
 import org.apache.tuscany.sca.databinding.DataBindingExtensionPoint;
 import org.apache.tuscany.sca.databinding.jaxb.XMLAdapterExtensionPoint;
 import org.apache.tuscany.sca.interfacedef.DataType;
@@ -62,6 +63,11 @@ public class JAXWSFaultExceptionMapper implements FaultExceptionMapper {
         this.dataBindingExtensionPoint = dataBindingExtensionPoint;
         this.xmlAdapterExtensionPoint = xmlAdapters;
     }
+    
+    public JAXWSFaultExceptionMapper(ExtensionPointRegistry registry) {
+        this.dataBindingExtensionPoint = registry.getExtensionPoint(DataBindingExtensionPoint.class);
+        this.xmlAdapterExtensionPoint = registry.getExtensionPoint(XMLAdapterExtensionPoint.class);
+    }
 
     /**
      * The following is quoted from the JAX-WS Specification v2.1
@@ -362,9 +368,4 @@ public class JAXWSFaultExceptionMapper implements FaultExceptionMapper {
             return Character.toUpperCase(name.charAt(0)) + name.substring(1);
         }
     }
-
-    public void setDataBindingExtensionPoint(DataBindingExtensionPoint dataBindingExtensionPoint) {
-        this.dataBindingExtensionPoint = dataBindingExtensionPoint;
-    }
-
 }
diff --git a/java/sca/modules/interface-java-jaxws/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.FaultExceptionMapper b/java/sca/modules/interface-java-jaxws/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.FaultExceptionMapper
new file mode 100644
index 0000000000..207381d72f
--- /dev/null
+++ b/java/sca/modules/interface-java-jaxws/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.FaultExceptionMapper
@@ -0,0 +1,17 @@
+# Licensed to the Apache Software Foundation (ASF) under one

+# or more contributor license agreements.  See the NOTICE file

+# distributed with this work for additional information

+# regarding copyright ownership.  The ASF licenses this file

+# to you under the Apache License, Version 2.0 (the

+# "License"); you may not use this file except in compliance

+# with the License.  You may obtain a copy of the License at

+# 

+#   http://www.apache.org/licenses/LICENSE-2.0

+# 

+# Unless required by applicable law or agreed to in writing,

+# software distributed under the License is distributed on an

+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+# KIND, either express or implied.  See the License for the

+# specific language governing permissions and limitations

+# under the License. 

+org.apache.tuscany.sca.interfacedef.java.jaxws.JAXWSFaultExceptionMapper
\ No newline at end of file