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 [1/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...
Author: jsdelfino
Date: Sat Apr 14 14:20:13 2007
New Revision: 528877
URL: http://svn.apache.org/viewvc?view=rev&rev=528877
Log:
Renamed the o.a.t.contribution.*Registry extension points to *ExtensionPoint to be consistent with the other extension points.
Added:
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/processor/ArtifactProcessorExtensionPoint.java (with props)
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/processor/ContributionPostProcessorExtensionPoint.java (with props)
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/processor/DefaultArtifactProcessorExtensionPoint.java (with props)
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/processor/DefaultStAXArtifactProcessorExtensionPoint.java (with props)
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/processor/DefaultURLArtifactProcessorExtensionPoint.java (with props)
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/processor/StAXArtifactProcessorExtensionPoint.java (with props)
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/processor/URLArtifactProcessorExtensionPoint.java (with props)
Removed:
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/processor/ArtifactProcessorRegistry.java
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/processor/ContributionPostProcessorRegistry.java
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/processor/DefaultArtifactProcessorRegistry.java
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/processor/DefaultStAXArtifactProcessorRegistry.java
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/processor/DefaultURLArtifactProcessorRegistry.java
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/processor/StAXArtifactProcessorRegistry.java
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/processor/URLArtifactProcessorRegistry.java
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/resolver/ArtifactResolverRegistry.java
Modified:
incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/ReadAllTestCase.java
incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/ReadDocumentTestCase.java
incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/ReadTestCase.java
incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/ResolveTestCase.java
incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/StAXPerfTest.java
incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/WireTestCase.java
incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/WriteAllTestCase.java
incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2ModuleActivator.java
incubator/tuscany/java/sca/modules/binding-ws-xml/src/test/java/org/apache/tuscany/binding/ws/xml/ReadTestCase.java
incubator/tuscany/java/sca/modules/binding-ws-xml/src/test/java/org/apache/tuscany/binding/ws/xml/WriteTestCase.java
incubator/tuscany/java/sca/modules/core-spring/src/test/java/test/application/context/TestRuntimeContext.java
incubator/tuscany/java/sca/modules/core-spring/src/test/java/test/model/variant/VariantRuntimeContext.java
incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/bootstrap/SDODataBindingModuleActivator.java
incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/host/embedded/SimpleRuntimeImpl.java
incubator/tuscany/java/sca/modules/host-embedded/src/test/java/org/apache/tuscany/container/crud/CRUDModuleActivator.java
incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/module/JavaRuntimeModuleActivator.java
incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/implementation/java/xml/ReadTestCase.java
incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/implementation/java/xml/WriteTestCase.java
incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/implementation/script/ScriptModuleActivator.java
incubator/tuscany/java/sca/modules/interface-java-xml/src/test/java/org/apache/tuscany/interfacedef/java/xml/ReadTestCase.java
incubator/tuscany/java/sca/modules/interface-java-xml/src/test/java/org/apache/tuscany/interfacedef/java/xml/WriteTestCase.java
incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/interfacedef/wsdl/xml/ReadTestCase.java
incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/interfacedef/wsdl/xml/WSDLTestCase.java
incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/interfacedef/wsdl/xml/WriteTestCase.java
incubator/tuscany/java/sca/modules/pom.xml
incubator/tuscany/java/sca/samples/echo-binding/src/main/java/echo/EchoModuleActivator.java
incubator/tuscany/java/sca/samples/echo-databinding/src/main/java/echo/EchoModuleActivator.java
incubator/tuscany/java/sca/samples/implementation-crud/src/main/java/org/apache/tuscany/container/crud/CRUDModuleActivator.java
Modified: incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/ReadAllTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/ReadAllTestCase.java?view=diff&rev=528877&r1=528876&r2=528877
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/ReadAllTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/ReadAllTestCase.java Sat Apr 14 14:20:13 2007
@@ -34,8 +34,7 @@
import org.apache.tuscany.assembly.CompositeService;
import org.apache.tuscany.assembly.Multiplicity;
import org.apache.tuscany.assembly.Property;
-import org.apache.tuscany.assembly.util.PrintUtil;
-import org.apache.tuscany.contribution.processor.DefaultStAXArtifactProcessorRegistry;
+import org.apache.tuscany.contribution.processor.DefaultStAXArtifactProcessorExtensionPoint;
import org.apache.tuscany.contribution.resolver.DefaultArtifactResolver;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -46,22 +45,22 @@
* @version $Rev$ $Date$
*/
public class ReadAllTestCase extends TestCase {
- private DefaultStAXArtifactProcessorRegistry registry;
+ private DefaultStAXArtifactProcessorExtensionPoint staxProcessors;
public void setUp() throws Exception {
- registry = new DefaultStAXArtifactProcessorRegistry();
- registry.addArtifactProcessor(new CompositeProcessor(registry));
- registry.addArtifactProcessor(new ComponentTypeProcessor(registry));
- registry.addArtifactProcessor(new ConstrainingTypeProcessor(registry));
+ staxProcessors = new DefaultStAXArtifactProcessorExtensionPoint();
+ staxProcessors.addExtension(new CompositeProcessor(staxProcessors));
+ staxProcessors.addExtension(new ComponentTypeProcessor(staxProcessors));
+ staxProcessors.addExtension(new ConstrainingTypeProcessor(staxProcessors));
}
public void tearDown() throws Exception {
- registry = null;
+ staxProcessors = null;
}
public void testReadComposite() throws Exception {
InputStream is = getClass().getResourceAsStream("TestAllCalculator.composite");
- Composite composite = registry.read(is, Composite.class);
+ Composite composite = staxProcessors.read(is, Composite.class);
assertNotNull(composite);
assertEquals(composite.getName(), new QName("http://calc", "TestAllCalculator"));
assertEquals(composite.getConstrainingType().getName(), new QName("http://calc", "CalculatorComponent"));
@@ -148,15 +147,15 @@
DefaultArtifactResolver resolver = new DefaultArtifactResolver();
InputStream is = getClass().getResourceAsStream("TestAllDivide.composite");
- Composite included = registry.read(is, Composite.class);
+ Composite included = staxProcessors.read(is, Composite.class);
assertNotNull(included);
resolver.add(included);
is = getClass().getResourceAsStream("TestAllCalculator.composite");
- Composite composite = registry.read(is, Composite.class);
+ Composite composite = staxProcessors.read(is, Composite.class);
assertNotNull(composite);
- registry.resolve(composite, resolver);
- registry.wire(composite);
+ staxProcessors.resolve(composite, resolver);
+ staxProcessors.wire(composite);
Component calcComponent = composite.getComponents().get(0);
CompositeService calcCompositeService = (CompositeService)composite.getServices().get(0);
Modified: incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/ReadDocumentTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/ReadDocumentTestCase.java?view=diff&rev=528877&r1=528876&r2=528877
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/ReadDocumentTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/ReadDocumentTestCase.java Sat Apr 14 14:20:13 2007
@@ -25,8 +25,8 @@
import org.apache.tuscany.assembly.Composite;
import org.apache.tuscany.assembly.ConstrainingType;
-import org.apache.tuscany.contribution.processor.DefaultStAXArtifactProcessorRegistry;
-import org.apache.tuscany.contribution.processor.DefaultURLArtifactProcessorRegistry;
+import org.apache.tuscany.contribution.processor.DefaultStAXArtifactProcessorExtensionPoint;
+import org.apache.tuscany.contribution.processor.DefaultURLArtifactProcessorExtensionPoint;
import org.apache.tuscany.contribution.resolver.DefaultArtifactResolver;
/**
@@ -36,40 +36,40 @@
*/
public class ReadDocumentTestCase extends TestCase {
- private DefaultURLArtifactProcessorRegistry registry;
+ private DefaultURLArtifactProcessorExtensionPoint documentProcessors;
public void setUp() throws Exception {
- registry = new DefaultURLArtifactProcessorRegistry();
+ documentProcessors = new DefaultURLArtifactProcessorExtensionPoint();
// Create Stax processors
- DefaultStAXArtifactProcessorRegistry staxRegistry = new DefaultStAXArtifactProcessorRegistry();
- staxRegistry.addArtifactProcessor(new CompositeProcessor(staxRegistry));
- staxRegistry.addArtifactProcessor(new ComponentTypeProcessor(staxRegistry));
- staxRegistry.addArtifactProcessor(new ConstrainingTypeProcessor(staxRegistry));
+ DefaultStAXArtifactProcessorExtensionPoint staxProcessors = new DefaultStAXArtifactProcessorExtensionPoint();
+ staxProcessors.addExtension(new CompositeProcessor(staxProcessors));
+ staxProcessors.addExtension(new ComponentTypeProcessor(staxProcessors));
+ staxProcessors.addExtension(new ConstrainingTypeProcessor(staxProcessors));
// Create document processors
- registry.addArtifactProcessor(new CompositeDocumentProcessor(staxRegistry));
- registry.addArtifactProcessor(new ComponentTypeDocumentProcessor(staxRegistry));
- registry.addArtifactProcessor(new ConstrainingTypeDocumentProcessor(staxRegistry));
+ documentProcessors.addExtension(new CompositeDocumentProcessor(staxProcessors));
+ documentProcessors.addExtension(new ComponentTypeDocumentProcessor(staxProcessors));
+ documentProcessors.addExtension(new ConstrainingTypeDocumentProcessor(staxProcessors));
}
public void tearDown() throws Exception {
- registry = null;
+ documentProcessors = null;
}
public void testResolveConstrainingType() throws Exception {
DefaultArtifactResolver resolver = new DefaultArtifactResolver();
URL url = getClass().getResource("CalculatorComponent.constrainingType");
- ConstrainingType constrainingType = (ConstrainingType)registry.read(url);
+ ConstrainingType constrainingType = (ConstrainingType)documentProcessors.read(url);
assertNotNull(constrainingType);
resolver.add(constrainingType);
url = getClass().getResource("TestAllCalculator.composite");
- Composite composite = (Composite)registry.read(url);
+ Composite composite = (Composite)documentProcessors.read(url);
assertNotNull(composite);
- registry.resolve(composite, resolver);
+ documentProcessors.resolve(composite, resolver);
assertEquals(composite.getConstrainingType(), constrainingType);
assertEquals(composite.getComponents().get(0).getConstrainingType(), constrainingType);
@@ -79,14 +79,14 @@
DefaultArtifactResolver resolver = new DefaultArtifactResolver();
URL url = getClass().getResource("Calculator.composite");
- Composite nestedComposite = (Composite)registry.read(url);
+ Composite nestedComposite = (Composite)documentProcessors.read(url);
assertNotNull(nestedComposite);
resolver.add(nestedComposite);
url = getClass().getResource("TestAllCalculator.composite");
- Composite composite = (Composite)registry.read(url);
+ Composite composite = (Composite)documentProcessors.read(url);
- registry.resolve(composite, resolver);
+ documentProcessors.resolve(composite, resolver);
assertEquals(composite.getComponents().get(2).getImplementation(), nestedComposite);
}
Modified: incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/ReadTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/ReadTestCase.java?view=diff&rev=528877&r1=528876&r2=528877
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/ReadTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/ReadTestCase.java Sat Apr 14 14:20:13 2007
@@ -26,7 +26,7 @@
import junit.framework.TestCase;
-import org.apache.tuscany.contribution.processor.DefaultStAXArtifactProcessorRegistry;
+import org.apache.tuscany.contribution.processor.DefaultStAXArtifactProcessorExtensionPoint;
/**
* Test reading SCA XML assemblies.
@@ -36,20 +36,20 @@
public class ReadTestCase extends TestCase {
private XMLInputFactory inputFactory;
- private DefaultStAXArtifactProcessorRegistry registry;
+ private DefaultStAXArtifactProcessorExtensionPoint staxProcessors;
public void setUp() throws Exception {
inputFactory = XMLInputFactory.newInstance();
- registry = new DefaultStAXArtifactProcessorRegistry();
+ staxProcessors = new DefaultStAXArtifactProcessorExtensionPoint();
}
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);
assertNotNull(componentTypeReader.read(reader));
@@ -58,7 +58,7 @@
public void testReadConstrainingType() throws Exception {
InputStream is = getClass().getResourceAsStream("CalculatorComponent.constrainingType");
- ConstrainingTypeProcessor constrainingTypeReader = new ConstrainingTypeProcessor(registry);
+ ConstrainingTypeProcessor constrainingTypeReader = new ConstrainingTypeProcessor(staxProcessors);
XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
assertNotNull(constrainingTypeReader.read(reader));
is.close();
@@ -67,7 +67,7 @@
public void testReadComposite() throws Exception {
InputStream is = getClass().getResourceAsStream("Calculator.composite");
- CompositeProcessor compositeReader = new CompositeProcessor(registry);
+ CompositeProcessor compositeReader = new CompositeProcessor(staxProcessors);
XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
assertNotNull(compositeReader.read(reader));
is.close();
@@ -76,7 +76,7 @@
public void testReadCompositeAndWireIt() throws Exception {
InputStream is = getClass().getResourceAsStream("Calculator.composite");
- CompositeProcessor compositeReader = new CompositeProcessor(registry);
+ CompositeProcessor compositeReader = new CompositeProcessor(staxProcessors);
XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
assertNotNull(compositeReader.read(reader));
is.close();
Modified: incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/ResolveTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/ResolveTestCase.java?view=diff&rev=528877&r1=528876&r2=528877
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/ResolveTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/ResolveTestCase.java Sat Apr 14 14:20:13 2007
@@ -28,7 +28,7 @@
import org.apache.tuscany.assembly.Composite;
import org.apache.tuscany.assembly.ConstrainingType;
-import org.apache.tuscany.contribution.processor.DefaultStAXArtifactProcessorRegistry;
+import org.apache.tuscany.contribution.processor.DefaultStAXArtifactProcessorExtensionPoint;
import org.apache.tuscany.contribution.resolver.DefaultArtifactResolver;
/**
@@ -39,23 +39,23 @@
public class ResolveTestCase extends TestCase {
private XMLInputFactory inputFactory;
- private DefaultStAXArtifactProcessorRegistry registry;
+ private DefaultStAXArtifactProcessorExtensionPoint staxProcessors;
public void setUp() throws Exception {
inputFactory = XMLInputFactory.newInstance();
- registry = new DefaultStAXArtifactProcessorRegistry();
+ staxProcessors = new DefaultStAXArtifactProcessorExtensionPoint();
}
public void tearDown() throws Exception {
inputFactory = null;
- registry = null;
+ staxProcessors = null;
}
public void testResolveConstrainingType() throws Exception {
DefaultArtifactResolver resolver = new DefaultArtifactResolver();
InputStream is = getClass().getResourceAsStream("CalculatorComponent.constrainingType");
- ConstrainingTypeProcessor constrainingTypeReader = new ConstrainingTypeProcessor(registry);
+ ConstrainingTypeProcessor constrainingTypeReader = new ConstrainingTypeProcessor(staxProcessors);
XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
ConstrainingType constrainingType = constrainingTypeReader.read(reader);
is.close();
@@ -63,7 +63,7 @@
resolver.add(constrainingType);
is = getClass().getResourceAsStream("TestAllCalculator.composite");
- CompositeProcessor compositeReader = new CompositeProcessor(registry);
+ CompositeProcessor compositeReader = new CompositeProcessor(staxProcessors);
reader = inputFactory.createXMLStreamReader(is);
Composite composite = compositeReader.read(reader);
is.close();
@@ -79,7 +79,7 @@
DefaultArtifactResolver resolver = new DefaultArtifactResolver();
InputStream is = getClass().getResourceAsStream("Calculator.composite");
- CompositeProcessor compositeReader = new CompositeProcessor(registry);
+ CompositeProcessor compositeReader = new CompositeProcessor(staxProcessors);
XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
Composite nestedComposite = compositeReader.read(reader);
is.close();
@@ -87,7 +87,7 @@
resolver.add(nestedComposite);
is = getClass().getResourceAsStream("TestAllCalculator.composite");
- compositeReader = new CompositeProcessor(registry);
+ compositeReader = new CompositeProcessor(staxProcessors);
reader = inputFactory.createXMLStreamReader(is);
Composite composite = compositeReader.read(reader);
is.close();
Modified: incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/StAXPerfTest.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/StAXPerfTest.java?view=diff&rev=528877&r1=528876&r2=528877
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/StAXPerfTest.java (original)
+++ incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/StAXPerfTest.java Sat Apr 14 14:20:13 2007
@@ -27,7 +27,7 @@
import org.apache.tuscany.assembly.AssemblyFactory;
import org.apache.tuscany.assembly.Composite;
import org.apache.tuscany.assembly.impl.DefaultAssemblyFactory;
-import org.apache.tuscany.contribution.processor.DefaultStAXArtifactProcessorRegistry;
+import org.apache.tuscany.contribution.processor.DefaultStAXArtifactProcessorExtensionPoint;
import org.apache.tuscany.policy.PolicyFactory;
import org.apache.tuscany.policy.impl.DefaultPolicyFactory;
@@ -41,7 +41,7 @@
private XMLInputFactory inputFactory;
private AssemblyFactory assemblyFactory;
private PolicyFactory policyFactory;
- private DefaultStAXArtifactProcessorRegistry registry;
+ private DefaultStAXArtifactProcessorExtensionPoint staxProcessors;
public static void main(String[] args) throws Exception {
@@ -70,19 +70,19 @@
inputFactory = XMLInputFactory.newInstance();
assemblyFactory = new DefaultAssemblyFactory();
policyFactory = new DefaultPolicyFactory();
- registry = new DefaultStAXArtifactProcessorRegistry();
+ staxProcessors = new DefaultStAXArtifactProcessorExtensionPoint();
}
public void tearDown() throws Exception {
assemblyFactory = null;
policyFactory = null;
inputFactory = null;
- registry = null;
+ staxProcessors = null;
}
public void testReadComposite() throws Exception {
InputStream is = getClass().getResourceAsStream("TestAllCalculator.composite");
- CompositeProcessor loader = new CompositeProcessor(assemblyFactory, policyFactory, registry);
+ CompositeProcessor loader = new CompositeProcessor(assemblyFactory, policyFactory, staxProcessors);
XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
Composite composite = loader.read(reader);
Modified: incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/WireTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/WireTestCase.java?view=diff&rev=528877&r1=528876&r2=528877
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/WireTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/WireTestCase.java Sat Apr 14 14:20:13 2007
@@ -28,7 +28,7 @@
import org.apache.tuscany.assembly.Composite;
import org.apache.tuscany.assembly.ConstrainingType;
-import org.apache.tuscany.contribution.processor.DefaultStAXArtifactProcessorRegistry;
+import org.apache.tuscany.contribution.processor.DefaultStAXArtifactProcessorExtensionPoint;
import org.apache.tuscany.contribution.resolver.DefaultArtifactResolver;
/**
@@ -39,23 +39,23 @@
public class WireTestCase extends TestCase {
private XMLInputFactory inputFactory;
- private DefaultStAXArtifactProcessorRegistry registry;
+ private DefaultStAXArtifactProcessorExtensionPoint staxProcessors;
public void setUp() throws Exception {
inputFactory = XMLInputFactory.newInstance();
- registry = new DefaultStAXArtifactProcessorRegistry();
+ staxProcessors = new DefaultStAXArtifactProcessorExtensionPoint();
}
public void tearDown() throws Exception {
inputFactory = null;
- registry = null;
+ staxProcessors = null;
}
public void testResolveConstrainingType() throws Exception {
DefaultArtifactResolver resolver = new DefaultArtifactResolver();
InputStream is = getClass().getResourceAsStream("CalculatorComponent.constrainingType");
- ConstrainingTypeProcessor constrainingTypeReader = new ConstrainingTypeProcessor(registry);
+ ConstrainingTypeProcessor constrainingTypeReader = new ConstrainingTypeProcessor(staxProcessors);
XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
ConstrainingType constrainingType = constrainingTypeReader.read(reader);
is.close();
@@ -63,7 +63,7 @@
resolver.add(constrainingType);
is = getClass().getResourceAsStream("TestAllCalculator.composite");
- CompositeProcessor compositeReader = new CompositeProcessor(registry);
+ CompositeProcessor compositeReader = new CompositeProcessor(staxProcessors);
reader = inputFactory.createXMLStreamReader(is);
Composite composite = compositeReader.read(reader);
is.close();
@@ -80,7 +80,7 @@
DefaultArtifactResolver resolver = new DefaultArtifactResolver();
InputStream is = getClass().getResourceAsStream("Calculator.composite");
- CompositeProcessor compositeReader = new CompositeProcessor(registry);
+ CompositeProcessor compositeReader = new CompositeProcessor(staxProcessors);
XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
Composite nestedComposite = compositeReader.read(reader);
is.close();
@@ -88,7 +88,7 @@
resolver.add(nestedComposite);
is = getClass().getResourceAsStream("TestAllCalculator.composite");
- compositeReader = new CompositeProcessor(registry);
+ compositeReader = new CompositeProcessor(staxProcessors);
reader = inputFactory.createXMLStreamReader(is);
Composite composite = compositeReader.read(reader);
is.close();
Modified: incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/WriteAllTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/WriteAllTestCase.java?view=diff&rev=528877&r1=528876&r2=528877
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/WriteAllTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/WriteAllTestCase.java Sat Apr 14 14:20:13 2007
@@ -27,7 +27,7 @@
import org.apache.tuscany.assembly.ComponentType;
import org.apache.tuscany.assembly.Composite;
import org.apache.tuscany.assembly.ConstrainingType;
-import org.apache.tuscany.contribution.processor.DefaultStAXArtifactProcessorRegistry;
+import org.apache.tuscany.contribution.processor.DefaultStAXArtifactProcessorExtensionPoint;
import org.apache.tuscany.contribution.resolver.DefaultArtifactResolver;
/**
@@ -36,51 +36,51 @@
* @version $Rev$ $Date$
*/
public class WriteAllTestCase extends TestCase {
- private DefaultStAXArtifactProcessorRegistry registry;
+ private DefaultStAXArtifactProcessorExtensionPoint staxProcessors;
public void setUp() throws Exception {
- registry = new DefaultStAXArtifactProcessorRegistry();
- registry.addArtifactProcessor(new CompositeProcessor(registry));
- registry.addArtifactProcessor(new ComponentTypeProcessor(registry));
- registry.addArtifactProcessor(new ConstrainingTypeProcessor(registry));
+ staxProcessors = new DefaultStAXArtifactProcessorExtensionPoint();
+ staxProcessors.addExtension(new CompositeProcessor(staxProcessors));
+ staxProcessors.addExtension(new ComponentTypeProcessor(staxProcessors));
+ staxProcessors.addExtension(new ConstrainingTypeProcessor(staxProcessors));
}
public void tearDown() throws Exception {
- registry = null;
+ staxProcessors = null;
}
public void testReadWriteComposite() throws Exception {
InputStream is = getClass().getResourceAsStream("TestAllCalculator.composite");
- Composite composite = registry.read(is, Composite.class);
+ Composite composite = staxProcessors.read(is, Composite.class);
ByteArrayOutputStream bos = new ByteArrayOutputStream();
- registry.write(composite, bos);
+ staxProcessors.write(composite, bos);
}
public void testReadWireWriteComposite() throws Exception {
InputStream is = getClass().getResourceAsStream("TestAllCalculator.composite");
- Composite composite = registry.read(is, Composite.class);
- registry.resolve(composite, new DefaultArtifactResolver());
- registry.wire(composite);
+ Composite composite = staxProcessors.read(is, Composite.class);
+ staxProcessors.resolve(composite, new DefaultArtifactResolver());
+ staxProcessors.wire(composite);
ByteArrayOutputStream bos = new ByteArrayOutputStream();
- registry.write(composite, bos);
+ staxProcessors.write(composite, bos);
}
public void testReadWriteComponentType() throws Exception {
InputStream is = getClass().getResourceAsStream("CalculatorImpl.componentType");
- ComponentType componentType = registry.read(is, ComponentType.class);
- registry.resolve(componentType, new DefaultArtifactResolver());
- registry.wire(componentType);
+ ComponentType componentType = staxProcessors.read(is, ComponentType.class);
+ staxProcessors.resolve(componentType, new DefaultArtifactResolver());
+ staxProcessors.wire(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);
- registry.resolve(constrainingType, new DefaultArtifactResolver());
- registry.wire(constrainingType);
+ ConstrainingType constrainingType = staxProcessors.read(is, ConstrainingType.class);
+ staxProcessors.resolve(constrainingType, new DefaultArtifactResolver());
+ staxProcessors.wire(constrainingType);
ByteArrayOutputStream bos = new ByteArrayOutputStream();
- registry.write(constrainingType, bos);
+ staxProcessors.write(constrainingType, bos);
}
}
Modified: incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2ModuleActivator.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2ModuleActivator.java?view=diff&rev=528877&r1=528876&r2=528877
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2ModuleActivator.java (original)
+++ incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2ModuleActivator.java Sat Apr 14 14:20:13 2007
@@ -22,7 +22,7 @@
import java.util.Map;
import org.apache.tuscany.binding.ws.xml.WebServiceBindingProcessor;
-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;
@@ -30,8 +30,8 @@
public class Axis2ModuleActivator implements ModuleActivator {
public void start(ExtensionPointRegistry registry) {
- StAXArtifactProcessorRegistry artifactProcessorRegistry = registry.getExtensionPoint(StAXArtifactProcessorRegistry.class);
- artifactProcessorRegistry.addArtifactProcessor(new WebServiceBindingProcessor());
+ StAXArtifactProcessorExtensionPoint artifactProcessorRegistry = registry.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
+ artifactProcessorRegistry.addExtension(new WebServiceBindingProcessor());
BuilderRegistry builderRegistry = registry.getExtensionPoint(BuilderRegistry.class);
Axis2BindingBuilder builder = new Axis2BindingBuilder();
Modified: incubator/tuscany/java/sca/modules/binding-ws-xml/src/test/java/org/apache/tuscany/binding/ws/xml/ReadTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-ws-xml/src/test/java/org/apache/tuscany/binding/ws/xml/ReadTestCase.java?view=diff&rev=528877&r1=528876&r2=528877
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-ws-xml/src/test/java/org/apache/tuscany/binding/ws/xml/ReadTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/binding-ws-xml/src/test/java/org/apache/tuscany/binding/ws/xml/ReadTestCase.java Sat Apr 14 14:20:13 2007
@@ -32,7 +32,7 @@
import org.apache.tuscany.assembly.util.PrintUtil;
import org.apache.tuscany.assembly.xml.ComponentTypeProcessor;
import org.apache.tuscany.assembly.xml.CompositeProcessor;
-import org.apache.tuscany.contribution.processor.DefaultStAXArtifactProcessorRegistry;
+import org.apache.tuscany.contribution.processor.DefaultStAXArtifactProcessorExtensionPoint;
/**
* Test reading WSDL interfaces.
@@ -42,23 +42,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();
WebServiceBindingProcessor wsdlProcessor = new WebServiceBindingProcessor();
- 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);
@@ -68,7 +68,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/binding-ws-xml/src/test/java/org/apache/tuscany/binding/ws/xml/WriteTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-ws-xml/src/test/java/org/apache/tuscany/binding/ws/xml/WriteTestCase.java?view=diff&rev=528877&r1=528876&r2=528877
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-ws-xml/src/test/java/org/apache/tuscany/binding/ws/xml/WriteTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/binding-ws-xml/src/test/java/org/apache/tuscany/binding/ws/xml/WriteTestCase.java Sat Apr 14 14:20:13 2007
@@ -31,7 +31,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.
@@ -41,39 +41,39 @@
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));
WebServiceBindingProcessor wsdlProcessor = new WebServiceBindingProcessor();
- 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 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);
}
}
Added: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/processor/ArtifactProcessorExtensionPoint.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/processor/ArtifactProcessorExtensionPoint.java?view=auto&rev=528877
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/processor/ArtifactProcessorExtensionPoint.java (added)
+++ incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/processor/ArtifactProcessorExtensionPoint.java Sat Apr 14 14:20:13 2007
@@ -0,0 +1,43 @@
+/*
+ * 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.
+ */
+package org.apache.tuscany.contribution.processor;
+
+
+
+/**
+ * An extension point for artifact processors.
+ *
+ * @version $Rev$ $Date$
+ */
+public interface ArtifactProcessorExtensionPoint<P> {
+
+ /**
+ * Add an artifact processor.
+ * @param artifactProcessor the artifact processor to add
+ */
+ void addExtension(P artifactProcessor);
+
+ /**
+ * Remove an artifact processor.
+ * @param artifactProcessor the artifact processor to remove
+ */
+
+ void removeExtension(P artifactProcessor);
+
+}
Propchange: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/processor/ArtifactProcessorExtensionPoint.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/processor/ArtifactProcessorExtensionPoint.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/processor/ContributionPostProcessorExtensionPoint.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/processor/ContributionPostProcessorExtensionPoint.java?view=auto&rev=528877
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/processor/ContributionPostProcessorExtensionPoint.java (added)
+++ incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/processor/ContributionPostProcessorExtensionPoint.java Sat Apr 14 14:20:13 2007
@@ -0,0 +1,38 @@
+/*
+ * 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.
+ */
+
+package org.apache.tuscany.contribution.processor;
+
+/**
+ * An extension point for contribution post processor extensions.
+ *
+ * @version $Rev$ $Date$
+ */
+public interface ContributionPostProcessorExtensionPoint {
+ /**
+ * Add a ContributionPostProcessor
+ * @param processor
+ */
+ void addExtension(ContributionPostProcessor processor);
+ /**
+ * Remove a ContributionPostProcessor
+ * @param processor
+ */
+ void removeExtension(ContributionPostProcessor processor);
+}
Propchange: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/processor/ContributionPostProcessorExtensionPoint.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/processor/ContributionPostProcessorExtensionPoint.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/processor/DefaultArtifactProcessorExtensionPoint.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/processor/DefaultArtifactProcessorExtensionPoint.java?view=auto&rev=528877
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/processor/DefaultArtifactProcessorExtensionPoint.java (added)
+++ incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/processor/DefaultArtifactProcessorExtensionPoint.java Sat Apr 14 14:20:13 2007
@@ -0,0 +1,64 @@
+/*
+ * 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.
+ */
+package org.apache.tuscany.contribution.processor;
+
+import java.util.HashMap;
+import java.util.Map;
+
+
+/**
+ * The default implementation of an artifact processor registry.
+ *
+ * @version $Rev$ $Date$
+ */
+abstract class DefaultArtifactProcessorExtensionPoint {
+ protected final Map<Object, ArtifactProcessor> processorsByArtifactType = new HashMap<Object, ArtifactProcessor>();
+ protected final Map<Class<?>, ArtifactProcessor> processorsByModelType = new HashMap<Class<?>, ArtifactProcessor>();
+
+ /**
+ * Constructs a new loader registry.
+ */
+ public DefaultArtifactProcessorExtensionPoint() {
+ }
+
+ /**
+ * Returns the processor associated with the given artifact type.
+ * @param artifactType an artifact type
+ * @return the processor associated with the given artifact type
+ */
+ protected ArtifactProcessor getProcessor(Object artifactType) {
+ return processorsByArtifactType.get(artifactType);
+ }
+
+ /**
+ * Returns the processor associated with the given model type.
+ * @param modelType a model type
+ * @return the processor associated with the given model type
+ */
+ protected ArtifactProcessor getProcessor(Class<?> modelType) {
+ Class<?>[] classes = modelType.getInterfaces();
+ for (Class<?> c: classes) {
+ ArtifactProcessor processor = processorsByModelType.get(c);
+ if (processor != null)
+ return processor;
+ }
+ return processorsByModelType.get(modelType);
+ }
+
+}
Propchange: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/processor/DefaultArtifactProcessorExtensionPoint.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/processor/DefaultArtifactProcessorExtensionPoint.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/processor/DefaultStAXArtifactProcessorExtensionPoint.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/processor/DefaultStAXArtifactProcessorExtensionPoint.java?view=auto&rev=528877
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/processor/DefaultStAXArtifactProcessorExtensionPoint.java (added)
+++ incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/processor/DefaultStAXArtifactProcessorExtensionPoint.java Sat Apr 14 14:20:13 2007
@@ -0,0 +1,194 @@
+/*
+ * 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.
+ */
+package org.apache.tuscany.contribution.processor;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+import javax.xml.namespace.QName;
+import javax.xml.stream.Location;
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLOutputFactory;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+import javax.xml.stream.XMLStreamWriter;
+
+import org.apache.tuscany.contribution.resolver.ArtifactResolver;
+import org.apache.tuscany.contribution.service.ContributionReadException;
+import org.apache.tuscany.contribution.service.ContributionResolveException;
+import org.apache.tuscany.contribution.service.ContributionWireException;
+import org.apache.tuscany.contribution.service.ContributionWriteException;
+import org.apache.tuscany.contribution.service.UnrecognizedElementException;
+
+/**
+ * The default implementation of a StAX artifact processor registry.
+ *
+ * @version $Rev$ $Date$
+ */
+public class DefaultStAXArtifactProcessorExtensionPoint
+ extends DefaultArtifactProcessorExtensionPoint
+ implements StAXArtifactProcessorExtensionPoint, StAXArtifactProcessor<Object> {
+
+ private XMLInputFactory inputFactory;
+ private XMLOutputFactory outputFactory;
+
+ /**
+ * Constructs a new loader registry.
+ * @param assemblyFactory
+ * @param policyFactory
+ * @param inputFactory
+ */
+ public DefaultStAXArtifactProcessorExtensionPoint(XMLInputFactory inputFactory, XMLOutputFactory outputFactory) {
+ super();
+ this.inputFactory = inputFactory;
+ this.outputFactory = outputFactory;
+ this.outputFactory.setProperty("javax.xml.stream.isRepairingNamespaces",Boolean.TRUE);
+ }
+
+ public DefaultStAXArtifactProcessorExtensionPoint() {
+ this(XMLInputFactory.newInstance(), XMLOutputFactory.newInstance());
+ }
+
+ public Object read(XMLStreamReader source) throws ContributionReadException {
+
+ // Delegate to the processor associated with the element qname
+ QName name = source.getName();
+ StAXArtifactProcessor<?> processor = (StAXArtifactProcessor<?>)this.getProcessor(name);
+ if (processor == null) {
+ return null;
+ }
+ return processor.read(source);
+ }
+
+ public void write(Object model, XMLStreamWriter outputSource) throws ContributionWriteException {
+
+ // Delegate to the processor associated with the model type
+ if (model != null) {
+ StAXArtifactProcessor<Object> processor = (StAXArtifactProcessor<Object>)this.getProcessor((Class<Object>)model.getClass());
+ if (processor != null) {
+ processor.write(model, outputSource);
+ }
+ }
+ }
+
+ public void resolve(Object model, ArtifactResolver resolver) throws ContributionResolveException {
+
+ // Delegate to the processor associated with the model type
+ if (model != null) {
+ StAXArtifactProcessor<Object> processor = (StAXArtifactProcessor<Object>)this.getProcessor((Class<Object>)model.getClass());
+ if (processor != null) {
+ processor.resolve(model, resolver);
+ }
+ }
+ }
+
+ public void wire(Object model) throws ContributionWireException {
+
+ // Delegate to the processor associated with the model type
+ if (model != null) {
+ StAXArtifactProcessor<Object> processor = (StAXArtifactProcessor<Object>)this.getProcessor((Class<Object>)model.getClass());
+ if (processor != null) {
+ processor.wire(model);
+ }
+ }
+ }
+
+ /**
+ * Read a model from an input stream.
+ * @param is
+ * @param type
+ * @return
+ * @throws ContributionReadException
+ */
+ public <MO> MO read(InputStream is, Class<MO> type) throws ContributionReadException {
+ try {
+ XMLStreamReader reader;
+ try {
+ reader = inputFactory.createXMLStreamReader(is);
+ try {
+ reader.nextTag();
+ QName name = reader.getName();
+ Object mo = read(reader);
+ if (type.isInstance(mo)) {
+ return type.cast(mo);
+ } else {
+ UnrecognizedElementException e = new UnrecognizedElementException(name);
+ throw e;
+ }
+ } catch (ContributionReadException e) {
+ Location location = reader.getLocation();
+ e.setLine(location.getLineNumber());
+ e.setColumn(location.getColumnNumber());
+ throw e;
+ } finally {
+ try {
+ reader.close();
+ } catch (XMLStreamException e) {
+ // ignore
+ }
+ }
+ } finally {
+ try {
+ is.close();
+ } catch (IOException e) {
+ // ignore
+ }
+ }
+ } catch (XMLStreamException e) {
+ ContributionReadException ce = new ContributionReadException(e);
+ throw ce;
+ }
+ }
+
+ /**
+ * Write a model to an ouput stream.
+ * @param model
+ * @param os
+ * @throws ContributionWriteException
+ */
+ public void write(Object model, OutputStream os) throws ContributionWriteException {
+ try {
+ XMLStreamWriter writer = outputFactory.createXMLStreamWriter(os);
+ write(model, writer);
+ writer.flush();
+ writer.close();
+ } catch (XMLStreamException e) {
+ throw new ContributionWriteException(e);
+ }
+ }
+
+ public void addExtension(StAXArtifactProcessor artifactProcessor) {
+ processorsByArtifactType.put((Object)artifactProcessor.getArtifactType(), artifactProcessor);
+ processorsByModelType.put(artifactProcessor.getModelType(), artifactProcessor);
+ }
+
+ public void removeExtension(StAXArtifactProcessor artifactProcessor) {
+ processorsByArtifactType.remove((Object)artifactProcessor.getArtifactType());
+ processorsByModelType.remove(artifactProcessor.getModelType());
+ }
+
+ public QName getArtifactType() {
+ return null;
+ }
+
+ public Class<Object> getModelType() {
+ return null;
+ }
+}
Propchange: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/processor/DefaultStAXArtifactProcessorExtensionPoint.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/processor/DefaultStAXArtifactProcessorExtensionPoint.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/processor/DefaultURLArtifactProcessorExtensionPoint.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/processor/DefaultURLArtifactProcessorExtensionPoint.java?view=auto&rev=528877
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/processor/DefaultURLArtifactProcessorExtensionPoint.java (added)
+++ incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/processor/DefaultURLArtifactProcessorExtensionPoint.java Sat Apr 14 14:20:13 2007
@@ -0,0 +1,129 @@
+/*
+ * 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.
+ */
+package org.apache.tuscany.contribution.processor;
+
+import java.net.URL;
+
+import org.apache.tuscany.contribution.resolver.ArtifactResolver;
+import org.apache.tuscany.contribution.service.ContributionReadException;
+import org.apache.tuscany.contribution.service.ContributionResolveException;
+import org.apache.tuscany.contribution.service.ContributionWireException;
+import org.apache.tuscany.contribution.service.ContributionWriteException;
+import org.apache.tuscany.contribution.service.UnrecognizedElementException;
+
+/**
+ * The default implementation of a StAX artifact processor registry.
+ *
+ * @version $Rev$ $Date$
+ */
+public class DefaultURLArtifactProcessorExtensionPoint
+ extends DefaultArtifactProcessorExtensionPoint
+ implements URLArtifactProcessorExtensionPoint, URLArtifactProcessor<Object> {
+
+ /**
+ * Constructs a new loader registry.
+ * @param assemblyFactory
+ * @param policyFactory
+ * @param factory
+ */
+ public DefaultURLArtifactProcessorExtensionPoint() {
+ }
+
+ public Object read(URL source) throws ContributionReadException {
+ URLArtifactProcessor<Object> processor = null;
+
+ // Delegate to the processor associated with file extension
+ String extension = source.getFile();
+ int extensionStart = extension.lastIndexOf('.');
+ //handle files without extension (e.g NOTICE)
+ if(extensionStart > 0){
+ extension = extension.substring(extensionStart);
+ processor = (URLArtifactProcessor<Object>)this.getProcessor(extension);
+ }
+ if (processor == null) {
+ return null;
+ }
+ return processor.read(source);
+ }
+
+ public void write(Object model, URL outputSource) throws ContributionWriteException {
+
+ // Delegate to the processor associated with the particular model type
+ if (model != null) {
+ URLArtifactProcessor<Object> processor = (URLArtifactProcessor<Object>)this.getProcessor((Class<Object>)model.getClass());
+ if (processor != null) {
+ processor.write(model, outputSource);
+ }
+ }
+ }
+
+
+
+ public void resolve(Object model, ArtifactResolver resolver) throws ContributionResolveException {
+
+ // Delegate to the processor associated with the model type
+ if (model != null) {
+ URLArtifactProcessor<Object> processor = (URLArtifactProcessor<Object>)this.getProcessor((Class<Object>)model.getClass());
+ if (processor != null) {
+ processor.resolve(model, resolver);
+ }
+ }
+ }
+
+ public void wire(Object model) throws ContributionWireException {
+
+ // Delegate to the processor associated with the model type
+ if (model != null) {
+ URLArtifactProcessor<Object> processor = (URLArtifactProcessor<Object>)this.getProcessor((Class<Object>)model.getClass());
+ if (processor != null) {
+ processor.wire(model);
+ }
+ }
+ }
+
+ public <MO> MO read(URL url, Class<MO> type) throws ContributionReadException {
+ Object mo = read(url);
+ if (type.isInstance(mo)) {
+ return type.cast(mo);
+ } else {
+ UnrecognizedElementException e = new UnrecognizedElementException(null);
+ e.setResourceURI(url.toString());
+ throw e;
+ }
+ }
+
+ public void addExtension(URLArtifactProcessor artifactProcessor) {
+ processorsByArtifactType.put((Object)artifactProcessor.getArtifactType(), artifactProcessor);
+ processorsByModelType.put(artifactProcessor.getModelType(), artifactProcessor);
+ }
+
+ public void removeExtension(URLArtifactProcessor artifactProcessor) {
+ processorsByArtifactType.remove((Object)artifactProcessor.getArtifactType());
+ processorsByModelType.remove(artifactProcessor.getModelType());
+ }
+
+ public String getArtifactType() {
+ return null;
+ }
+
+ public Class<Object> getModelType() {
+ return null;
+ }
+
+}
Propchange: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/processor/DefaultURLArtifactProcessorExtensionPoint.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/processor/DefaultURLArtifactProcessorExtensionPoint.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/processor/StAXArtifactProcessorExtensionPoint.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/processor/StAXArtifactProcessorExtensionPoint.java?view=auto&rev=528877
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/processor/StAXArtifactProcessorExtensionPoint.java (added)
+++ incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/processor/StAXArtifactProcessorExtensionPoint.java Sat Apr 14 14:20:13 2007
@@ -0,0 +1,30 @@
+/*
+ * 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.
+ */
+package org.apache.tuscany.contribution.processor;
+
+
+
+/**
+ * A registry for DOM artifact processors.
+ *
+ * @version $Rev$ $Date$
+ */
+public interface StAXArtifactProcessorExtensionPoint extends ArtifactProcessorExtensionPoint<StAXArtifactProcessor> {
+
+}
Propchange: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/processor/StAXArtifactProcessorExtensionPoint.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/processor/StAXArtifactProcessorExtensionPoint.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/processor/URLArtifactProcessorExtensionPoint.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/processor/URLArtifactProcessorExtensionPoint.java?view=auto&rev=528877
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/processor/URLArtifactProcessorExtensionPoint.java (added)
+++ incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/processor/URLArtifactProcessorExtensionPoint.java Sat Apr 14 14:20:13 2007
@@ -0,0 +1,31 @@
+/*
+ * 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.
+ */
+package org.apache.tuscany.contribution.processor;
+
+
+
+/**
+ * A registry for Stream artifact processors.
+ *
+ * @version $Rev$ $Date$
+ */
+public interface URLArtifactProcessorExtensionPoint extends
+ ArtifactProcessorExtensionPoint<URLArtifactProcessor<Object>> {
+
+}
Propchange: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/processor/URLArtifactProcessorExtensionPoint.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/processor/URLArtifactProcessorExtensionPoint.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/java/sca/modules/core-spring/src/test/java/test/application/context/TestRuntimeContext.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spring/src/test/java/test/application/context/TestRuntimeContext.java?view=diff&rev=528877&r1=528876&r2=528877
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spring/src/test/java/test/application/context/TestRuntimeContext.java (original)
+++ incubator/tuscany/java/sca/modules/core-spring/src/test/java/test/application/context/TestRuntimeContext.java Sat Apr 14 14:20:13 2007
@@ -24,7 +24,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;
import org.apache.tuscany.contribution.resolver.DefaultArtifactResolver;
import org.apache.tuscany.contribution.service.ContributionException;
import org.apache.tuscany.core.bean.context.CompositeApplicationContext;
@@ -44,13 +44,13 @@
public TestRuntimeContext(String compositeFile) {
// Populate ArtifactProcessor registry
- DefaultStAXArtifactProcessorRegistry registry = new DefaultStAXArtifactProcessorRegistry();
- CompositeProcessor compositeProcessor = new CompositeProcessor(registry);
- registry.addArtifactProcessor(compositeProcessor);
- registry.addArtifactProcessor(new ComponentTypeProcessor(registry));
- registry.addArtifactProcessor(new ConstrainingTypeProcessor(registry));
- registry.addArtifactProcessor(new JavaInterfaceProcessor());
- registry.addArtifactProcessor(new JavaImplementationProcessor());
+ DefaultStAXArtifactProcessorExtensionPoint staxProcessors = new DefaultStAXArtifactProcessorExtensionPoint();
+ CompositeProcessor compositeProcessor = new CompositeProcessor(staxProcessors);
+ staxProcessors.addExtension(compositeProcessor);
+ staxProcessors.addExtension(new ComponentTypeProcessor(staxProcessors));
+ staxProcessors.addExtension(new ConstrainingTypeProcessor(staxProcessors));
+ staxProcessors.addExtension(new JavaInterfaceProcessor());
+ staxProcessors.addExtension(new JavaImplementationProcessor());
// Create a resolver
DefaultArtifactResolver resolver = new DefaultArtifactResolver();
@@ -58,7 +58,7 @@
try {
// Parse the composite file
InputStream is = getClass().getClassLoader().getResourceAsStream(compositeFile);
- Composite composite = registry.read(is, Composite.class);
+ Composite composite = staxProcessors.read(is, Composite.class);
resolver.add(composite);
// Resolve and configure the composite
Modified: incubator/tuscany/java/sca/modules/core-spring/src/test/java/test/model/variant/VariantRuntimeContext.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spring/src/test/java/test/model/variant/VariantRuntimeContext.java?view=diff&rev=528877&r1=528876&r2=528877
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spring/src/test/java/test/model/variant/VariantRuntimeContext.java (original)
+++ incubator/tuscany/java/sca/modules/core-spring/src/test/java/test/model/variant/VariantRuntimeContext.java Sat Apr 14 14:20:13 2007
@@ -27,7 +27,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;
import org.apache.tuscany.contribution.resolver.DefaultArtifactResolver;
import org.apache.tuscany.contribution.service.ContributionException;
import org.apache.tuscany.implementation.java.JavaImplementationFactory;
@@ -60,13 +60,13 @@
JavaImplementationFactory javaImplementationFactory = new BeanJavaImplementationFactory(beanFactory);
// Populate ArtifactProcessor registry
- DefaultStAXArtifactProcessorRegistry registry = new DefaultStAXArtifactProcessorRegistry();
- CompositeProcessor compositeProcessor = new CompositeProcessor(assemblyFactory, policyFactory, registry);
- registry.addArtifactProcessor(compositeProcessor);
- registry.addArtifactProcessor(new ComponentTypeProcessor(assemblyFactory, policyFactory, registry));
- registry.addArtifactProcessor(new ConstrainingTypeProcessor(registry));
- registry.addArtifactProcessor(new JavaInterfaceProcessor());
- registry.addArtifactProcessor(new JavaImplementationProcessor(javaImplementationFactory, new DefaultJavaClassIntrospector()));
+ DefaultStAXArtifactProcessorExtensionPoint staxProcessors = new DefaultStAXArtifactProcessorExtensionPoint();
+ CompositeProcessor compositeProcessor = new CompositeProcessor(assemblyFactory, policyFactory, staxProcessors);
+ staxProcessors.addExtension(compositeProcessor);
+ staxProcessors.addExtension(new ComponentTypeProcessor(assemblyFactory, policyFactory, staxProcessors));
+ staxProcessors.addExtension(new ConstrainingTypeProcessor(staxProcessors));
+ staxProcessors.addExtension(new JavaInterfaceProcessor());
+ staxProcessors.addExtension(new JavaImplementationProcessor(javaImplementationFactory, new DefaultJavaClassIntrospector()));
// Create a resolver
DefaultArtifactResolver resolver = new DefaultArtifactResolver();
@@ -74,7 +74,7 @@
try {
// Parse the composite file
InputStream is = getClass().getClassLoader().getResourceAsStream(compositeFile);
- Composite composite = registry.read(is, Composite.class);
+ Composite composite = staxProcessors.read(is, Composite.class);
resolver.add(composite);
// Resolve and configure the composite
Modified: incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/bootstrap/SDODataBindingModuleActivator.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/bootstrap/SDODataBindingModuleActivator.java?view=diff&rev=528877&r1=528876&r2=528877
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/bootstrap/SDODataBindingModuleActivator.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/bootstrap/SDODataBindingModuleActivator.java Sat Apr 14 14:20:13 2007
@@ -22,7 +22,7 @@
import java.util.HashMap;
import java.util.Map;
-import org.apache.tuscany.contribution.processor.StAXArtifactProcessorRegistry;
+import org.apache.tuscany.contribution.processor.StAXArtifactProcessorExtensionPoint;
import org.apache.tuscany.databinding.sdo.DataObject2String;
import org.apache.tuscany.databinding.sdo.DataObject2XMLStreamReader;
import org.apache.tuscany.databinding.sdo.HelperContextProcessor;
@@ -56,10 +56,10 @@
DataBindingRegistry dataBindingRegistry = registry.getExtensionPoint(DataBindingRegistry.class);
dataBindingRegistry.register(new SDODataBinding());
- StAXArtifactProcessorRegistry processorRegistry = registry
- .getExtensionPoint(StAXArtifactProcessorRegistry.class);
+ StAXArtifactProcessorExtensionPoint processorRegistry = registry
+ .getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
HelperContextRegistry contextRegistry = registry.getExtensionPoint(HelperContextRegistry.class);
- processorRegistry.addArtifactProcessor(new ImportSDOProcessor(contextRegistry));
+ processorRegistry.addExtension(new ImportSDOProcessor(contextRegistry));
TransformerRegistry transformerRegistry = registry.getExtensionPoint(TransformerRegistry.class);
transformerRegistry.registerTransformer(new DataObject2String());
Modified: incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/host/embedded/SimpleRuntimeImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/host/embedded/SimpleRuntimeImpl.java?view=diff&rev=528877&r1=528876&r2=528877
==============================================================================
--- incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/host/embedded/SimpleRuntimeImpl.java (original)
+++ incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/host/embedded/SimpleRuntimeImpl.java Sat Apr 14 14:20:13 2007
@@ -35,10 +35,10 @@
import org.apache.tuscany.contribution.Contribution;
import org.apache.tuscany.contribution.DeployedArtifact;
import org.apache.tuscany.contribution.processor.ContributionPackageProcessorRegistry;
-import org.apache.tuscany.contribution.processor.DefaultStAXArtifactProcessorRegistry;
-import org.apache.tuscany.contribution.processor.DefaultURLArtifactProcessorRegistry;
-import org.apache.tuscany.contribution.processor.StAXArtifactProcessorRegistry;
-import org.apache.tuscany.contribution.processor.URLArtifactProcessorRegistry;
+import org.apache.tuscany.contribution.processor.DefaultStAXArtifactProcessorExtensionPoint;
+import org.apache.tuscany.contribution.processor.DefaultURLArtifactProcessorExtensionPoint;
+import org.apache.tuscany.contribution.processor.StAXArtifactProcessorExtensionPoint;
+import org.apache.tuscany.contribution.processor.URLArtifactProcessorExtensionPoint;
import org.apache.tuscany.contribution.processor.impl.ContributionPackageProcessorRegistryImpl;
import org.apache.tuscany.contribution.processor.impl.FolderContributionProcessor;
import org.apache.tuscany.contribution.processor.impl.JarContributionProcessor;
@@ -119,20 +119,20 @@
ExtensionPointRegistry extensionRegistry = new ExtensionPointRegistryImpl();
ContributionRepository repository = new ContributionRepositoryImpl("target");
- DefaultStAXArtifactProcessorRegistry staxExtensionPoint = new DefaultStAXArtifactProcessorRegistry();
- staxExtensionPoint.addArtifactProcessor(new CompositeProcessor(staxExtensionPoint));
- staxExtensionPoint.addArtifactProcessor(new ComponentTypeProcessor(staxExtensionPoint));
- staxExtensionPoint.addArtifactProcessor(new ConstrainingTypeProcessor(staxExtensionPoint));
- staxExtensionPoint.addArtifactProcessor(new JavaInterfaceProcessor());
- staxExtensionPoint.addArtifactProcessor(new WSDLInterfaceProcessor());
- extensionRegistry.addExtensionPoint(StAXArtifactProcessorRegistry.class, staxExtensionPoint);
-
- DefaultURLArtifactProcessorRegistry documentExtensionPoint = new DefaultURLArtifactProcessorRegistry();
- documentExtensionPoint.addArtifactProcessor(new CompositeDocumentProcessor(staxExtensionPoint));
- documentExtensionPoint.addArtifactProcessor(new ComponentTypeDocumentProcessor(staxExtensionPoint));
- documentExtensionPoint.addArtifactProcessor(new ConstrainingTypeDocumentProcessor(staxExtensionPoint));
- documentExtensionPoint.addArtifactProcessor(new WSDLDocumentProcessor());
- extensionRegistry.addExtensionPoint(URLArtifactProcessorRegistry.class, documentExtensionPoint);
+ DefaultStAXArtifactProcessorExtensionPoint staxProcessors = new DefaultStAXArtifactProcessorExtensionPoint();
+ staxProcessors.addExtension(new CompositeProcessor(staxProcessors));
+ staxProcessors.addExtension(new ComponentTypeProcessor(staxProcessors));
+ staxProcessors.addExtension(new ConstrainingTypeProcessor(staxProcessors));
+ staxProcessors.addExtension(new JavaInterfaceProcessor());
+ staxProcessors.addExtension(new WSDLInterfaceProcessor());
+ extensionRegistry.addExtensionPoint(StAXArtifactProcessorExtensionPoint.class, staxProcessors);
+
+ DefaultURLArtifactProcessorExtensionPoint documentProcessors = new DefaultURLArtifactProcessorExtensionPoint();
+ documentProcessors.addExtension(new CompositeDocumentProcessor(staxProcessors));
+ documentProcessors.addExtension(new ComponentTypeDocumentProcessor(staxProcessors));
+ documentProcessors.addExtension(new ConstrainingTypeDocumentProcessor(staxProcessors));
+ documentProcessors.addExtension(new WSDLDocumentProcessor());
+ extensionRegistry.addExtensionPoint(URLArtifactProcessorExtensionPoint.class, documentProcessors);
PackageTypeDescriberImpl describer = new PackageTypeDescriberImpl();
ContributionPackageProcessorRegistry pkgRegistry = new ContributionPackageProcessorRegistryImpl(describer);
@@ -146,7 +146,7 @@
DefaultArtifactResolver artifactResolver = new DefaultArtifactResolver();
ContributionService contributionService = new ContributionServiceImpl(repository, pkgRegistry,
- documentExtensionPoint, artifactResolver);
+ documentProcessors, artifactResolver);
extensionRegistry.addExtensionPoint(ContributionService.class, contributionService);
initialize(extensionRegistry, contributionService);
Modified: incubator/tuscany/java/sca/modules/host-embedded/src/test/java/org/apache/tuscany/container/crud/CRUDModuleActivator.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/host-embedded/src/test/java/org/apache/tuscany/container/crud/CRUDModuleActivator.java?view=diff&rev=528877&r1=528876&r2=528877
==============================================================================
--- incubator/tuscany/java/sca/modules/host-embedded/src/test/java/org/apache/tuscany/container/crud/CRUDModuleActivator.java (original)
+++ incubator/tuscany/java/sca/modules/host-embedded/src/test/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);
Modified: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/module/JavaRuntimeModuleActivator.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/module/JavaRuntimeModuleActivator.java?view=diff&rev=528877&r1=528876&r2=528877
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/module/JavaRuntimeModuleActivator.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/module/JavaRuntimeModuleActivator.java Sat Apr 14 14:20:13 2007
@@ -22,7 +22,7 @@
import java.util.HashMap;
import java.util.Map;
-import org.apache.tuscany.contribution.processor.StAXArtifactProcessorRegistry;
+import org.apache.tuscany.contribution.processor.StAXArtifactProcessorExtensionPoint;
import org.apache.tuscany.implementation.java.JavaImplementation;
import org.apache.tuscany.implementation.java.context.JavaComponentBuilder;
import org.apache.tuscany.implementation.java.introspect.BaseJavaClassIntrospectorExtension;
@@ -95,10 +95,10 @@
classIntrospector.addExtension(e);
}
- StAXArtifactProcessorRegistry artifactProcessorRegistry = extensionPointRegistry
- .getExtensionPoint(StAXArtifactProcessorRegistry.class);
+ StAXArtifactProcessorExtensionPoint artifactProcessorRegistry = extensionPointRegistry
+ .getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
JavaImplementationProcessor javaImplementationProcessor = new JavaImplementationProcessor(classIntrospector);
- artifactProcessorRegistry.addArtifactProcessor(javaImplementationProcessor);
+ artifactProcessorRegistry.addExtension(javaImplementationProcessor);
BuilderRegistry builderRegistry = extensionPointRegistry.getExtensionPoint(BuilderRegistry.class);
JavaComponentBuilder builder = new JavaComponentBuilder();
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org