You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2007/04/14 23:20:15 UTC
svn commit: r528877 [2/2] - in /incubator/tuscany/java/sca: modules/
modules/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/
modules/binding-ws-axis2/src/main/java/org/apache/tuscany/binding/axis2/
modules/binding-ws-xml/src/test/java/org/a...
Modified: incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/implementation/java/xml/ReadTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/implementation/java/xml/ReadTestCase.java?view=diff&rev=528877&r1=528876&r2=528877
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/implementation/java/xml/ReadTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/implementation/java/xml/ReadTestCase.java Sat Apr 14 14:20:13 2007
@@ -29,7 +29,7 @@
import org.apache.tuscany.assembly.Composite;
import org.apache.tuscany.assembly.util.CompositeUtil;
import org.apache.tuscany.assembly.xml.CompositeProcessor;
-import org.apache.tuscany.contribution.processor.DefaultStAXArtifactProcessorRegistry;
+import org.apache.tuscany.contribution.processor.DefaultStAXArtifactProcessorExtensionPoint;
import org.apache.tuscany.contribution.resolver.ArtifactResolver;
import org.apache.tuscany.contribution.resolver.DefaultArtifactResolver;
@@ -41,26 +41,26 @@
public class ReadTestCase extends TestCase {
XMLInputFactory inputFactory;
- DefaultStAXArtifactProcessorRegistry registry;
+ DefaultStAXArtifactProcessorExtensionPoint staxProcessors;
public void setUp() throws Exception {
inputFactory = XMLInputFactory.newInstance();
- registry = new DefaultStAXArtifactProcessorRegistry();
+ staxProcessors = new DefaultStAXArtifactProcessorExtensionPoint();
- CompositeProcessor compositeProcessor = new CompositeProcessor(registry);
- registry.addArtifactProcessor(compositeProcessor);
+ CompositeProcessor compositeProcessor = new CompositeProcessor(staxProcessors);
+ staxProcessors.addExtension(compositeProcessor);
JavaImplementationProcessor javaProcessor = new JavaImplementationProcessor();
- registry.addArtifactProcessor(javaProcessor);
+ staxProcessors.addExtension(javaProcessor);
}
public void tearDown() throws Exception {
inputFactory = null;
- registry = null;
+ staxProcessors = null;
}
public void testReadComposite() throws Exception {
- CompositeProcessor compositeProcessor = new CompositeProcessor(registry);
+ CompositeProcessor compositeProcessor = new CompositeProcessor(staxProcessors);
InputStream is = getClass().getResourceAsStream("Calculator.composite");
XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
Composite composite = compositeProcessor.read(reader);
@@ -72,14 +72,14 @@
}
public void testReadAndResolveComposite() throws Exception {
- CompositeProcessor compositeProcessor = new CompositeProcessor(registry);
+ CompositeProcessor compositeProcessor = new CompositeProcessor(staxProcessors);
InputStream is = getClass().getResourceAsStream("Calculator.composite");
XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
Composite composite = compositeProcessor.read(reader);
assertNotNull(composite);
ArtifactResolver resolver = new DefaultArtifactResolver();
- registry.resolve(composite, resolver);
+ staxProcessors.resolve(composite, resolver);
new CompositeUtil(composite).configure(null);
Modified: incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/implementation/java/xml/WriteTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/implementation/java/xml/WriteTestCase.java?view=diff&rev=528877&r1=528876&r2=528877
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/implementation/java/xml/WriteTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/implementation/java/xml/WriteTestCase.java Sat Apr 14 14:20:13 2007
@@ -30,7 +30,7 @@
import org.apache.tuscany.assembly.xml.ComponentTypeProcessor;
import org.apache.tuscany.assembly.xml.CompositeProcessor;
import org.apache.tuscany.assembly.xml.ConstrainingTypeProcessor;
-import org.apache.tuscany.contribution.processor.DefaultStAXArtifactProcessorRegistry;
+import org.apache.tuscany.contribution.processor.DefaultStAXArtifactProcessorExtensionPoint;
/**
* Test writing Java implementations.
@@ -40,31 +40,31 @@
public class WriteTestCase extends TestCase {
XMLInputFactory inputFactory;
- DefaultStAXArtifactProcessorRegistry registry;
+ DefaultStAXArtifactProcessorExtensionPoint staxProcessors;
public void setUp() throws Exception {
inputFactory = XMLInputFactory.newInstance();
- registry = new DefaultStAXArtifactProcessorRegistry();
+ staxProcessors = new DefaultStAXArtifactProcessorExtensionPoint();
- registry.addArtifactProcessor(new CompositeProcessor(registry));
- registry.addArtifactProcessor(new ComponentTypeProcessor(registry));
- registry.addArtifactProcessor(new ConstrainingTypeProcessor(registry));
+ staxProcessors.addExtension(new CompositeProcessor(staxProcessors));
+ staxProcessors.addExtension(new ComponentTypeProcessor(staxProcessors));
+ staxProcessors.addExtension(new ConstrainingTypeProcessor(staxProcessors));
JavaImplementationProcessor javaProcessor = new JavaImplementationProcessor();
- registry.addArtifactProcessor(javaProcessor);
+ staxProcessors.addExtension(javaProcessor);
}
public void tearDown() throws Exception {
inputFactory = null;
- registry = null;
+ staxProcessors = null;
}
public void testReadWriteComposite() throws Exception {
InputStream is = getClass().getResourceAsStream("Calculator.composite");
- Composite composite = registry.read(is, Composite.class);
+ Composite composite = staxProcessors.read(is, Composite.class);
assertNotNull(composite);
ByteArrayOutputStream bos = new ByteArrayOutputStream();
- registry.write(composite, bos);
+ staxProcessors.write(composite, bos);
}
}
Modified: incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/implementation/script/ScriptModuleActivator.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/implementation/script/ScriptModuleActivator.java?view=diff&rev=528877&r1=528876&r2=528877
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/implementation/script/ScriptModuleActivator.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/implementation/script/ScriptModuleActivator.java Sat Apr 14 14:20:13 2007
@@ -21,7 +21,7 @@
import java.util.Map;
-import org.apache.tuscany.contribution.processor.StAXArtifactProcessorRegistry;
+import org.apache.tuscany.contribution.processor.StAXArtifactProcessorExtensionPoint;
import org.apache.tuscany.spi.bootstrap.ExtensionPointRegistry;
import org.apache.tuscany.spi.bootstrap.ModuleActivator;
import org.apache.tuscany.spi.builder.BuilderRegistry;
@@ -32,11 +32,11 @@
private ScriptComponentBuilder builder;
public void start(ExtensionPointRegistry registry) {
- StAXArtifactProcessorRegistry processors = registry.getExtensionPoint(StAXArtifactProcessorRegistry.class);
+ StAXArtifactProcessorExtensionPoint processors = registry.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
BuilderRegistry builderRegistry = registry.getExtensionPoint(BuilderRegistry.class);
scriptArtifactProcessor = new ScriptArtifactProcessor();
- processors.addArtifactProcessor(scriptArtifactProcessor);
+ processors.addExtension(scriptArtifactProcessor);
builder = new ScriptComponentBuilder();
builder.setBuilderRegistry(builderRegistry);
Modified: incubator/tuscany/java/sca/modules/interface-java-xml/src/test/java/org/apache/tuscany/interfacedef/java/xml/ReadTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/interface-java-xml/src/test/java/org/apache/tuscany/interfacedef/java/xml/ReadTestCase.java?view=diff&rev=528877&r1=528876&r2=528877
==============================================================================
--- incubator/tuscany/java/sca/modules/interface-java-xml/src/test/java/org/apache/tuscany/interfacedef/java/xml/ReadTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/interface-java-xml/src/test/java/org/apache/tuscany/interfacedef/java/xml/ReadTestCase.java Sat Apr 14 14:20:13 2007
@@ -33,7 +33,7 @@
import org.apache.tuscany.assembly.xml.ComponentTypeProcessor;
import org.apache.tuscany.assembly.xml.CompositeProcessor;
import org.apache.tuscany.assembly.xml.ConstrainingTypeProcessor;
-import org.apache.tuscany.contribution.processor.DefaultStAXArtifactProcessorRegistry;
+import org.apache.tuscany.contribution.processor.DefaultStAXArtifactProcessorExtensionPoint;
/**
* Test reading Java interfaces.
@@ -43,23 +43,23 @@
public class ReadTestCase extends TestCase {
XMLInputFactory inputFactory;
- DefaultStAXArtifactProcessorRegistry registry;
+ DefaultStAXArtifactProcessorExtensionPoint staxProcessors;
public void setUp() throws Exception {
inputFactory = XMLInputFactory.newInstance();
- registry = new DefaultStAXArtifactProcessorRegistry();
+ staxProcessors = new DefaultStAXArtifactProcessorExtensionPoint();
JavaInterfaceProcessor javaProcessor = new JavaInterfaceProcessor();
- registry.addArtifactProcessor(javaProcessor);
+ staxProcessors.addExtension(javaProcessor);
}
public void tearDown() throws Exception {
inputFactory = null;
- registry = null;
+ staxProcessors = null;
}
public void testReadComponentType() throws Exception {
- ComponentTypeProcessor componentTypeReader = new ComponentTypeProcessor(registry);
+ ComponentTypeProcessor componentTypeReader = new ComponentTypeProcessor(staxProcessors);
InputStream is = getClass().getResourceAsStream("CalculatorImpl.componentType");
XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
ComponentType componentType = componentTypeReader.read(reader);
@@ -69,7 +69,7 @@
}
public void testReadConstrainingType() throws Exception {
- ConstrainingTypeProcessor constrainingTypeProcessor = new ConstrainingTypeProcessor(registry);
+ ConstrainingTypeProcessor constrainingTypeProcessor = new ConstrainingTypeProcessor(staxProcessors);
InputStream is = getClass().getResourceAsStream("CalculatorComponent.constrainingType");
XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
ConstrainingType constrainingType = constrainingTypeProcessor.read(reader);
@@ -79,7 +79,7 @@
}
public void testReadComposite() throws Exception {
- CompositeProcessor compositeProcessor = new CompositeProcessor(registry);
+ CompositeProcessor compositeProcessor = new CompositeProcessor(staxProcessors);
InputStream is = getClass().getResourceAsStream("Calculator.composite");
XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
Composite composite = compositeProcessor.read(reader);
Modified: incubator/tuscany/java/sca/modules/interface-java-xml/src/test/java/org/apache/tuscany/interfacedef/java/xml/WriteTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/interface-java-xml/src/test/java/org/apache/tuscany/interfacedef/java/xml/WriteTestCase.java?view=diff&rev=528877&r1=528876&r2=528877
==============================================================================
--- incubator/tuscany/java/sca/modules/interface-java-xml/src/test/java/org/apache/tuscany/interfacedef/java/xml/WriteTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/interface-java-xml/src/test/java/org/apache/tuscany/interfacedef/java/xml/WriteTestCase.java Sat Apr 14 14:20:13 2007
@@ -32,7 +32,7 @@
import org.apache.tuscany.assembly.xml.ComponentTypeProcessor;
import org.apache.tuscany.assembly.xml.CompositeProcessor;
import org.apache.tuscany.assembly.xml.ConstrainingTypeProcessor;
-import org.apache.tuscany.contribution.processor.DefaultStAXArtifactProcessorRegistry;
+import org.apache.tuscany.contribution.processor.DefaultStAXArtifactProcessorExtensionPoint;
/**
* Test writing Java interfaces.
@@ -42,47 +42,47 @@
public class WriteTestCase extends TestCase {
XMLInputFactory inputFactory;
- DefaultStAXArtifactProcessorRegistry registry;
+ DefaultStAXArtifactProcessorExtensionPoint staxProcessors;
public void setUp() throws Exception {
inputFactory = XMLInputFactory.newInstance();
- registry = new DefaultStAXArtifactProcessorRegistry();
+ staxProcessors = new DefaultStAXArtifactProcessorExtensionPoint();
- registry.addArtifactProcessor(new CompositeProcessor(registry));
- registry.addArtifactProcessor(new ComponentTypeProcessor(registry));
- registry.addArtifactProcessor(new ConstrainingTypeProcessor(registry));
+ staxProcessors.addExtension(new CompositeProcessor(staxProcessors));
+ staxProcessors.addExtension(new ComponentTypeProcessor(staxProcessors));
+ staxProcessors.addExtension(new ConstrainingTypeProcessor(staxProcessors));
JavaInterfaceProcessor javaProcessor = new JavaInterfaceProcessor();
- registry.addArtifactProcessor(javaProcessor);
+ staxProcessors.addExtension(javaProcessor);
}
public void tearDown() throws Exception {
inputFactory = null;
- registry = null;
+ staxProcessors = null;
}
public void testReadWriteComponentType() throws Exception {
InputStream is = getClass().getResourceAsStream("CalculatorImpl.componentType");
- ComponentType componentType = registry.read(is, ComponentType.class);
+ ComponentType componentType = staxProcessors.read(is, ComponentType.class);
assertNotNull(componentType);
ByteArrayOutputStream bos = new ByteArrayOutputStream();
- registry.write(componentType, bos);
+ staxProcessors.write(componentType, bos);
}
public void testReadWriteConstrainingType() throws Exception {
InputStream is = getClass().getResourceAsStream("CalculatorComponent.constrainingType");
- ConstrainingType constrainingType = registry.read(is, ConstrainingType.class);
+ ConstrainingType constrainingType = staxProcessors.read(is, ConstrainingType.class);
assertNotNull(constrainingType);
ByteArrayOutputStream bos = new ByteArrayOutputStream();
- registry.write(constrainingType, bos);
+ staxProcessors.write(constrainingType, bos);
}
public void testReadWriteComposite() throws Exception {
InputStream is = getClass().getResourceAsStream("Calculator.composite");
- Composite composite = registry.read(is, Composite.class);
+ Composite composite = staxProcessors.read(is, Composite.class);
assertNotNull(composite);
ByteArrayOutputStream bos = new ByteArrayOutputStream();
- registry.write(composite, bos);
+ staxProcessors.write(composite, bos);
}
}
Modified: incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/interfacedef/wsdl/xml/ReadTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/interfacedef/wsdl/xml/ReadTestCase.java?view=diff&rev=528877&r1=528876&r2=528877
==============================================================================
--- incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/interfacedef/wsdl/xml/ReadTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/interfacedef/wsdl/xml/ReadTestCase.java Sat Apr 14 14:20:13 2007
@@ -33,7 +33,7 @@
import org.apache.tuscany.assembly.xml.ComponentTypeProcessor;
import org.apache.tuscany.assembly.xml.CompositeProcessor;
import org.apache.tuscany.assembly.xml.ConstrainingTypeProcessor;
-import org.apache.tuscany.contribution.processor.DefaultStAXArtifactProcessorRegistry;
+import org.apache.tuscany.contribution.processor.DefaultStAXArtifactProcessorExtensionPoint;
/**
* Test reading WSDL interfaces.
@@ -43,23 +43,23 @@
public class ReadTestCase extends TestCase {
XMLInputFactory inputFactory;
- DefaultStAXArtifactProcessorRegistry registry;
+ DefaultStAXArtifactProcessorExtensionPoint staxProcessors;
public void setUp() throws Exception {
inputFactory = XMLInputFactory.newInstance();
- registry = new DefaultStAXArtifactProcessorRegistry();
+ staxProcessors = new DefaultStAXArtifactProcessorExtensionPoint();
WSDLInterfaceProcessor wsdlProcessor = new WSDLInterfaceProcessor();
- registry.addArtifactProcessor(wsdlProcessor);
+ staxProcessors.addExtension(wsdlProcessor);
}
public void tearDown() throws Exception {
inputFactory = null;
- registry = null;
+ staxProcessors = null;
}
public void testReadComponentType() throws Exception {
- ComponentTypeProcessor componentTypeProcessor = new ComponentTypeProcessor(registry);
+ ComponentTypeProcessor componentTypeProcessor = new ComponentTypeProcessor(staxProcessors);
InputStream is = getClass().getResourceAsStream("CalculatorImpl.componentType");
XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
ComponentType componentType = componentTypeProcessor.read(reader);
@@ -69,7 +69,7 @@
}
public void testReadConstrainingType() throws Exception {
- ConstrainingTypeProcessor constrainingTypeProcessor = new ConstrainingTypeProcessor(registry);
+ ConstrainingTypeProcessor constrainingTypeProcessor = new ConstrainingTypeProcessor(staxProcessors);
InputStream is = getClass().getResourceAsStream("CalculatorComponent.constrainingType");
XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
ConstrainingType constrainingType = constrainingTypeProcessor.read(reader);
@@ -79,7 +79,7 @@
}
public void testReadComposite() throws Exception {
- CompositeProcessor compositeProcessor = new CompositeProcessor(registry);
+ CompositeProcessor compositeProcessor = new CompositeProcessor(staxProcessors);
InputStream is = getClass().getResourceAsStream("Calculator.composite");
XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
Composite composite = compositeProcessor.read(reader);
Modified: incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/interfacedef/wsdl/xml/WSDLTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/interfacedef/wsdl/xml/WSDLTestCase.java?view=diff&rev=528877&r1=528876&r2=528877
==============================================================================
--- incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/interfacedef/wsdl/xml/WSDLTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/interfacedef/wsdl/xml/WSDLTestCase.java Sat Apr 14 14:20:13 2007
@@ -25,7 +25,7 @@
import junit.framework.TestCase;
-import org.apache.tuscany.contribution.processor.DefaultURLArtifactProcessorRegistry;
+import org.apache.tuscany.contribution.processor.DefaultURLArtifactProcessorExtensionPoint;
import org.apache.tuscany.interfacedef.wsdl.WSDLDefinition;
/**
@@ -36,24 +36,24 @@
public class WSDLTestCase extends TestCase {
XMLInputFactory inputFactory;
- DefaultURLArtifactProcessorRegistry registry;
+ DefaultURLArtifactProcessorExtensionPoint documentProcessors;
public void setUp() throws Exception {
inputFactory = XMLInputFactory.newInstance();
- registry = new DefaultURLArtifactProcessorRegistry();
+ documentProcessors = new DefaultURLArtifactProcessorExtensionPoint();
WSDLDocumentProcessor wsdlProcessor = new WSDLDocumentProcessor();
- registry.addArtifactProcessor(wsdlProcessor);
+ documentProcessors.addExtension(wsdlProcessor);
}
public void tearDown() throws Exception {
inputFactory = null;
- registry = null;
+ documentProcessors = null;
}
public void testReadWSDLDocument() throws Exception {
URL url = getClass().getResource("example.wsdl");
- WSDLDefinition definition = registry.read(url, WSDLDefinition.class);
+ WSDLDefinition definition = documentProcessors.read(url, WSDLDefinition.class);
assertNotNull(definition);
assertNotNull(definition.getDefinition());
assertEquals(definition.getNamespace(), "http://www.example.org");
Modified: incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/interfacedef/wsdl/xml/WriteTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/interfacedef/wsdl/xml/WriteTestCase.java?view=diff&rev=528877&r1=528876&r2=528877
==============================================================================
--- incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/interfacedef/wsdl/xml/WriteTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/interfacedef/wsdl/xml/WriteTestCase.java Sat Apr 14 14:20:13 2007
@@ -32,7 +32,7 @@
import org.apache.tuscany.assembly.xml.ComponentTypeProcessor;
import org.apache.tuscany.assembly.xml.CompositeProcessor;
import org.apache.tuscany.assembly.xml.ConstrainingTypeProcessor;
-import org.apache.tuscany.contribution.processor.DefaultStAXArtifactProcessorRegistry;
+import org.apache.tuscany.contribution.processor.DefaultStAXArtifactProcessorExtensionPoint;
/**
* Test reading/write WSDL interfaces.
@@ -42,47 +42,47 @@
public class WriteTestCase extends TestCase {
XMLInputFactory inputFactory;
- DefaultStAXArtifactProcessorRegistry registry;
+ DefaultStAXArtifactProcessorExtensionPoint staxProcessors;
public void setUp() throws Exception {
inputFactory = XMLInputFactory.newInstance();
- registry = new DefaultStAXArtifactProcessorRegistry();
+ staxProcessors = new DefaultStAXArtifactProcessorExtensionPoint();
- registry.addArtifactProcessor(new CompositeProcessor(registry));
- registry.addArtifactProcessor(new ComponentTypeProcessor(registry));
- registry.addArtifactProcessor(new ConstrainingTypeProcessor(registry));
+ staxProcessors.addExtension(new CompositeProcessor(staxProcessors));
+ staxProcessors.addExtension(new ComponentTypeProcessor(staxProcessors));
+ staxProcessors.addExtension(new ConstrainingTypeProcessor(staxProcessors));
WSDLInterfaceProcessor wsdlProcessor = new WSDLInterfaceProcessor();
- registry.addArtifactProcessor(wsdlProcessor);
+ staxProcessors.addExtension(wsdlProcessor);
}
public void tearDown() throws Exception {
inputFactory = null;
- registry = null;
+ staxProcessors = null;
}
public void testReadWriteComponentType() throws Exception {
InputStream is = getClass().getResourceAsStream("CalculatorImpl.componentType");
- ComponentType componentType = registry.read(is, ComponentType.class);
+ ComponentType componentType = staxProcessors.read(is, ComponentType.class);
assertNotNull(componentType);
ByteArrayOutputStream bos = new ByteArrayOutputStream();
- registry.write(componentType, bos);
+ staxProcessors.write(componentType, bos);
}
public void testReadWriteConstrainingType() throws Exception {
InputStream is = getClass().getResourceAsStream("CalculatorComponent.constrainingType");
- ConstrainingType constrainingType = registry.read(is, ConstrainingType.class);
+ ConstrainingType constrainingType = staxProcessors.read(is, ConstrainingType.class);
assertNotNull(constrainingType);
ByteArrayOutputStream bos = new ByteArrayOutputStream();
- registry.write(constrainingType, bos);
+ staxProcessors.write(constrainingType, bos);
}
public void testReadWriteComposite() throws Exception {
InputStream is = getClass().getResourceAsStream("Calculator.composite");
- Composite composite = registry.read(is, Composite.class);
+ Composite composite = staxProcessors.read(is, Composite.class);
assertNotNull(composite);
ByteArrayOutputStream bos = new ByteArrayOutputStream();
- registry.write(composite, bos);
+ staxProcessors.write(composite, bos);
}
}
Modified: incubator/tuscany/java/sca/modules/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/pom.xml?view=diff&rev=528877&r1=528876&r2=528877
==============================================================================
--- incubator/tuscany/java/sca/modules/pom.xml (original)
+++ incubator/tuscany/java/sca/modules/pom.xml Sat Apr 14 14:20:13 2007
@@ -57,7 +57,9 @@
<module>core-spring</module>
<module>databinding</module>
<module>databinding-axiom</module>
+ <!--
<module>core-databinding</module>
+ -->
<module>databinding-jaxb</module>
<module>databinding-sdo</module>
<module>databinding-sdo-axiom</module>
Modified: incubator/tuscany/java/sca/samples/echo-binding/src/main/java/echo/EchoModuleActivator.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/echo-binding/src/main/java/echo/EchoModuleActivator.java?view=diff&rev=528877&r1=528876&r2=528877
==============================================================================
--- incubator/tuscany/java/sca/samples/echo-binding/src/main/java/echo/EchoModuleActivator.java (original)
+++ incubator/tuscany/java/sca/samples/echo-binding/src/main/java/echo/EchoModuleActivator.java Sat Apr 14 14:20:13 2007
@@ -21,7 +21,7 @@
import java.util.Map;
-import org.apache.tuscany.contribution.processor.StAXArtifactProcessorRegistry;
+import org.apache.tuscany.contribution.processor.StAXArtifactProcessorExtensionPoint;
import org.apache.tuscany.spi.bootstrap.ExtensionPointRegistry;
import org.apache.tuscany.spi.bootstrap.ModuleActivator;
import org.apache.tuscany.spi.builder.BuilderRegistry;
@@ -39,8 +39,8 @@
public void start(ExtensionPointRegistry registry) {
// Add the EchoProcessor to the proper registry
- StAXArtifactProcessorRegistry artifactProcessorRegistry = registry.getExtensionPoint(StAXArtifactProcessorRegistry.class);
- artifactProcessorRegistry.addArtifactProcessor(echoBindingProcessor);
+ StAXArtifactProcessorExtensionPoint artifactProcessorRegistry = registry.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
+ artifactProcessorRegistry.addExtension(echoBindingProcessor);
// Add the EchoBuilder to the proper registry
BuilderRegistry builderRegistry = registry.getExtensionPoint(BuilderRegistry.class);
@@ -54,8 +54,8 @@
public void stop(ExtensionPointRegistry registry) {
// Remove the EchoProcessor from the proper registry
- StAXArtifactProcessorRegistry artifactProcessorRegistry = registry.getExtensionPoint(StAXArtifactProcessorRegistry.class);
- artifactProcessorRegistry.removeArtifactProcessor(echoBindingProcessor);
+ StAXArtifactProcessorExtensionPoint artifactProcessorRegistry = registry.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
+ artifactProcessorRegistry.removeExtension(echoBindingProcessor);
EchoServer.stop();
}
Modified: incubator/tuscany/java/sca/samples/echo-databinding/src/main/java/echo/EchoModuleActivator.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/echo-databinding/src/main/java/echo/EchoModuleActivator.java?view=diff&rev=528877&r1=528876&r2=528877
==============================================================================
--- incubator/tuscany/java/sca/samples/echo-databinding/src/main/java/echo/EchoModuleActivator.java (original)
+++ incubator/tuscany/java/sca/samples/echo-databinding/src/main/java/echo/EchoModuleActivator.java Sat Apr 14 14:20:13 2007
@@ -21,7 +21,7 @@
import java.util.Map;
-import org.apache.tuscany.contribution.processor.StAXArtifactProcessorRegistry;
+import org.apache.tuscany.contribution.processor.StAXArtifactProcessorExtensionPoint;
import org.apache.tuscany.spi.bootstrap.ExtensionPointRegistry;
import org.apache.tuscany.spi.bootstrap.ModuleActivator;
import org.apache.tuscany.spi.builder.BuilderRegistry;
@@ -39,8 +39,8 @@
public void start(ExtensionPointRegistry registry) {
// Add the EchoProcessor to the proper registry
- StAXArtifactProcessorRegistry artifactProcessorRegistry = registry.getExtensionPoint(StAXArtifactProcessorRegistry.class);
- artifactProcessorRegistry.addArtifactProcessor(echoBindingProcessor);
+ StAXArtifactProcessorExtensionPoint artifactProcessorRegistry = registry.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
+ artifactProcessorRegistry.addExtension(echoBindingProcessor);
// Add the EchoBuilder to the proper registry
BuilderRegistry builderRegistry = registry.getExtensionPoint(BuilderRegistry.class);
@@ -54,8 +54,8 @@
public void stop(ExtensionPointRegistry registry) {
// Remove the EchoProcessor from the proper registry
- StAXArtifactProcessorRegistry artifactProcessorRegistry = registry.getExtensionPoint(StAXArtifactProcessorRegistry.class);
- artifactProcessorRegistry.removeArtifactProcessor(echoBindingProcessor);
+ StAXArtifactProcessorExtensionPoint artifactProcessorRegistry = registry.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
+ artifactProcessorRegistry.removeExtension(echoBindingProcessor);
EchoServer.stop();
}
Modified: incubator/tuscany/java/sca/samples/implementation-crud/src/main/java/org/apache/tuscany/container/crud/CRUDModuleActivator.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/implementation-crud/src/main/java/org/apache/tuscany/container/crud/CRUDModuleActivator.java?view=diff&rev=528877&r1=528876&r2=528877
==============================================================================
--- incubator/tuscany/java/sca/samples/implementation-crud/src/main/java/org/apache/tuscany/container/crud/CRUDModuleActivator.java (original)
+++ incubator/tuscany/java/sca/samples/implementation-crud/src/main/java/org/apache/tuscany/container/crud/CRUDModuleActivator.java Sat Apr 14 14:20:13 2007
@@ -21,7 +21,7 @@
import java.util.Map;
-import org.apache.tuscany.contribution.processor.StAXArtifactProcessorRegistry;
+import org.apache.tuscany.contribution.processor.StAXArtifactProcessorExtensionPoint;
import org.apache.tuscany.spi.bootstrap.ModuleActivator;
import org.apache.tuscany.spi.bootstrap.ExtensionPointRegistry;
import org.apache.tuscany.spi.builder.BuilderRegistry;
@@ -35,11 +35,11 @@
private CRUDComponentBuilder builder;
public void start(ExtensionPointRegistry registry) {
- StAXArtifactProcessorRegistry processors = registry.getExtensionPoint(StAXArtifactProcessorRegistry.class);
+ StAXArtifactProcessorExtensionPoint processors = registry.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
BuilderRegistry builderRegistry = registry.getExtensionPoint(BuilderRegistry.class);
implementationLoader = new CRUDImplementationLoader();
- processors.addArtifactProcessor(implementationLoader);
+ processors.addExtension(implementationLoader);
builder = new CRUDComponentBuilder();
builder.setBuilderRegistry(builderRegistry);
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org