diff options
Diffstat (limited to 'branches')
4 files changed, 14 insertions, 6 deletions
diff --git a/branches/sca-equinox/modules/binding-ws-wsdlgen/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/binding-ws-wsdlgen/META-INF/MANIFEST.MF index c8f2da9e1c..9a0c67a292 100644 --- a/branches/sca-equinox/modules/binding-ws-wsdlgen/META-INF/MANIFEST.MF +++ b/branches/sca-equinox/modules/binding-ws-wsdlgen/META-INF/MANIFEST.MF @@ -43,7 +43,8 @@ Import-Package: javax.wsdl,javax.wsdl.extensions,javax.wsdl.extensions ;resolution:=optional,org.apache.tuscany.sca.core.databinding.process
or;resolution:=optional,org.apache.tuscany.sca.xsd.xml;version="1.4";
resolution:=optional,javax.xml.bind.annotation;resolution:=optional,j
- avax.xml.ws;resolution:=optional
+ avax.xml.ws;resolution:=optional;org.apache.tuscany.sca.core.databind
+ ing.processor;resolution:=optional
Bundle-SymbolicName: org.apache.tuscany.sca.binding.ws.wsdlgen
Bundle-DocURL: http://www.apache.org/
diff --git a/branches/sca-equinox/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/BindingWSDLGeneratorTestCase.java b/branches/sca-equinox/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/BindingWSDLGeneratorTestCase.java index 23ba985ebb..14c319f44a 100644 --- a/branches/sca-equinox/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/BindingWSDLGeneratorTestCase.java +++ b/branches/sca-equinox/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/BindingWSDLGeneratorTestCase.java @@ -28,6 +28,7 @@ import org.apache.tuscany.sca.interfacedef.InvalidInterfaceException; import org.apache.tuscany.sca.interfacedef.java.DefaultJavaInterfaceFactory; import org.apache.tuscany.sca.interfacedef.java.JavaInterface; import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceContract; +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.wsdl.WSDLFactory; @@ -44,10 +45,10 @@ import org.osoa.sca.annotations.Remotable; public class BindingWSDLGeneratorTestCase extends TestCase { public void testCreateWSDLInterfaceContract() throws InvalidInterfaceException { - DefaultFactoryExtensionPoint modelFactories = new DefaultFactoryExtensionPoint(new DefaultExtensionPointRegistry()); + org.apache.tuscany.sca.core.FactoryExtensionPoint modelFactories = new DefaultFactoryExtensionPoint(new DefaultExtensionPointRegistry()); WSDLFactory wsdlFactory = modelFactories.getFactory(WSDLFactory.class); XSDFactory xsdFactory = modelFactories.getFactory(XSDFactory.class); - DefaultJavaInterfaceFactory factory = new DefaultJavaInterfaceFactory(); + JavaInterfaceFactory factory = new DefaultJavaInterfaceFactory(); JavaInterfaceContract javaIC = factory.createJavaInterfaceContract(); JavaInterface iface = factory.createJavaInterface(HelloWorld.class); DefaultDataBindingExtensionPoint dataBindings = new DefaultDataBindingExtensionPoint(); diff --git a/branches/sca-equinox/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/Interface2WSDLGeneratorTestCase.java b/branches/sca-equinox/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/Interface2WSDLGeneratorTestCase.java index 1b08255e46..670c3a4003 100644 --- a/branches/sca-equinox/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/Interface2WSDLGeneratorTestCase.java +++ b/branches/sca-equinox/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/Interface2WSDLGeneratorTestCase.java @@ -30,11 +30,14 @@ import org.apache.tuscany.sca.core.databinding.processor.DataBindingJavaInterfac import org.apache.tuscany.sca.databinding.DefaultDataBindingExtensionPoint; import org.apache.tuscany.sca.interfacedef.java.DefaultJavaInterfaceFactory; import org.apache.tuscany.sca.interfacedef.java.JavaInterface; +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.wsdl.DefaultWSDLFactory; import org.apache.tuscany.sca.interfacedef.wsdl.WSDLDefinition; +import org.apache.tuscany.sca.interfacedef.wsdl.WSDLFactory; import org.apache.tuscany.sca.xsd.DefaultXSDFactory; +import org.apache.tuscany.sca.xsd.XSDFactory; import org.apache.tuscany.sca.xsd.xml.XSDModelResolver; import org.junit.Test; @@ -45,15 +48,16 @@ public class Interface2WSDLGeneratorTestCase { @Test public void testGenerate() throws Exception { - DefaultJavaInterfaceFactory iFactory = new DefaultJavaInterfaceFactory(); + JavaInterfaceFactory iFactory = new DefaultJavaInterfaceFactory(); JavaInterface iface = iFactory.createJavaInterface(TestJavaInterface.class); DefaultDataBindingExtensionPoint dataBindings = new DefaultDataBindingExtensionPoint(); JAXWSFaultExceptionMapper faultExceptionMapper = new JAXWSFaultExceptionMapper(dataBindings, null); new JAXWSJavaInterfaceProcessor(dataBindings, faultExceptionMapper, null).visitInterface(iface); new DataBindingJavaInterfaceProcessor(dataBindings).visitInterface(iface); DefaultFactoryExtensionPoint modelFactories = new DefaultFactoryExtensionPoint(new DefaultExtensionPointRegistry()); - WSDLDefinition wsdlDefinition = new DefaultWSDLFactory(modelFactories).createWSDLDefinition(); - DefaultXSDFactory factory = new DefaultXSDFactory(); + WSDLFactory wFactory = new DefaultWSDLFactory(modelFactories); + WSDLDefinition wsdlDefinition = wFactory.createWSDLDefinition(); + XSDFactory factory = new DefaultXSDFactory(); Interface2WSDLGenerator generator = new Interface2WSDLGenerator(false, new XSDModelResolver(null, null), dataBindings, factory, null); Definition definition = generator.generate(iface, wsdlDefinition); diff --git a/branches/sca-equinox/modules/core-databinding/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/core-databinding/META-INF/MANIFEST.MF index 606ab02006..17695ced16 100644 --- a/branches/sca-equinox/modules/core-databinding/META-INF/MANIFEST.MF +++ b/branches/sca-equinox/modules/core-databinding/META-INF/MANIFEST.MF @@ -43,4 +43,6 @@ Import-Package: javax.xml.bind.annotation.adapters, org.w3c.dom;resolution:=optional
Bundle-SymbolicName: org.apache.tuscany.sca.core.databinding
Bundle-DocURL: http://www.apache.org/
+Export-Package: org.apache.tuscany.sca.core.databinding.processor;
+ version="1.4";uses:="org.w3c.dom"
|