Author: rfeng
Date: Tue Nov 4 14:32:37 2008
New Revision: 711453
URL: http://svn.apache.org/viewvc?rev=711453&view=rev
Log:
Fix the access violations
Modified:
tuscany/branches/sca-equinox/modules/binding-ws-wsdlgen/META-INF/MANIFEST.MF
tuscany/branches/sca-equinox/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/BindingWSDLGeneratorTestCase.java
tuscany/branches/sca-equinox/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/Interface2WSDLGeneratorTestCase.java
tuscany/branches/sca-equinox/modules/core-databinding/META-INF/MANIFEST.MF
Modified:
tuscany/branches/sca-equinox/modules/binding-ws-wsdlgen/META-INF/MANIFEST.MF
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/binding-ws-wsdlgen/META-INF/MANIFEST.MF?rev=711453&r1=711452&r2=711453&view=diff
==============================================================================
---
tuscany/branches/sca-equinox/modules/binding-ws-wsdlgen/META-INF/MANIFEST.MF
(original)
+++
tuscany/branches/sca-equinox/modules/binding-ws-wsdlgen/META-INF/MANIFEST.MF
Tue Nov 4 14:32:37 2008
@@ -43,7 +43,8 @@
;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/
Modified:
tuscany/branches/sca-equinox/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/BindingWSDLGeneratorTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/BindingWSDLGeneratorTestCase.java?rev=711453&r1=711452&r2=711453&view=diff
==============================================================================
---
tuscany/branches/sca-equinox/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/BindingWSDLGeneratorTestCase.java
(original)
+++
tuscany/branches/sca-equinox/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/BindingWSDLGeneratorTestCase.java
Tue Nov 4 14:32:37 2008
@@ -28,6 +28,7 @@
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 @@
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();
Modified:
tuscany/branches/sca-equinox/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/Interface2WSDLGeneratorTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/Interface2WSDLGeneratorTestCase.java?rev=711453&r1=711452&r2=711453&view=diff
==============================================================================
---
tuscany/branches/sca-equinox/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/Interface2WSDLGeneratorTestCase.java
(original)
+++
tuscany/branches/sca-equinox/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/Interface2WSDLGeneratorTestCase.java
Tue Nov 4 14:32:37 2008
@@ -30,11 +30,14 @@
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 @@
@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);
Modified:
tuscany/branches/sca-equinox/modules/core-databinding/META-INF/MANIFEST.MF
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/core-databinding/META-INF/MANIFEST.MF?rev=711453&r1=711452&r2=711453&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/core-databinding/META-INF/MANIFEST.MF
(original)
+++ tuscany/branches/sca-equinox/modules/core-databinding/META-INF/MANIFEST.MF
Tue Nov 4 14:32:37 2008
@@ -43,4 +43,6 @@
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"
