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/05 02:01:00 UTC
svn commit: r525646 - in /incubator/tuscany/java/sca/modules/assembly-xml:
./ src/main/java/org/apache/tuscany/assembly/xml/
src/main/java/org/apache/tuscany/assembly/xml/impl/
src/test/java/org/apache/tuscany/assembly/xml/
Author: jsdelfino
Date: Wed Apr 4 17:00:59 2007
New Revision: 525646
URL: http://svn.apache.org/viewvc?view=rev&rev=525646
Log:
First cut of port of the loaders to the contribution ArtifactProcessor interface.
Modified:
incubator/tuscany/java/sca/modules/assembly-xml/pom.xml
incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/Constants.java
incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/impl/DOMUtil.java
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/ReadTestCase.java
incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/StAXPerfTest.java
Modified: incubator/tuscany/java/sca/modules/assembly-xml/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xml/pom.xml?view=diff&rev=525646&r1=525645&r2=525646
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly-xml/pom.xml (original)
+++ incubator/tuscany/java/sca/modules/assembly-xml/pom.xml Wed Apr 4 17:00:59 2007
@@ -30,8 +30,14 @@
<dependencies>
<dependency>
- <groupId>org.apache.tuscany.sca</groupId>
+ <groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-assembly</artifactId>
+ <version>1.0-incubating-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-contribution</artifactId>
<version>1.0-incubating-SNAPSHOT</version>
</dependency>
Modified: incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/Constants.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/Constants.java?view=diff&rev=525646&r1=525645&r2=525646
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/Constants.java (original)
+++ incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/Constants.java Wed Apr 4 17:00:59 2007
@@ -21,6 +21,9 @@
import javax.xml.namespace.QName;
+/**
+ * Constants used in SCA assembly XML files.
+ */
public interface Constants {
String SCA10_NS = "http://www.osoa.org/xmlns/sca/1.0";
String COMPONENT_TYPE = "componentType";
Modified: incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/impl/DOMUtil.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/impl/DOMUtil.java?view=diff&rev=525646&r1=525645&r2=525646
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/impl/DOMUtil.java (original)
+++ incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/impl/DOMUtil.java Wed Apr 4 17:00:59 2007
@@ -29,7 +29,7 @@
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
-import org.apache.tuscany.assembly.xml.LoaderException;
+import org.apache.tuscany.services.spi.contribution.ContributionReadException;
import org.w3c.dom.Attr;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -48,11 +48,11 @@
private DOMUtil() {
}
- public static Document newDocument() {
+ public static Document newDocument() throws ContributionReadException {
try {
return newDocumentBuilder().newDocument();
} catch (ParserConfigurationException e) {
- throw new LoaderException(e);
+ throw new ContributionReadException(e);
}
}
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=525646&r1=525645&r2=525646
==============================================================================
--- 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 Wed Apr 4 17:00:59 2007
@@ -36,8 +36,7 @@
import org.apache.tuscany.assembly.Property;
import org.apache.tuscany.assembly.util.CompositeUtil;
import org.apache.tuscany.assembly.util.PrintUtil;
-import org.apache.tuscany.assembly.xml.Constants;
-import org.apache.tuscany.assembly.xml.impl.LoaderRegistryImpl;
+import org.apache.tuscany.services.spi.contribution.StAXArtifactProcessorRegistry;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -47,7 +46,7 @@
* @version $Rev$ $Date$
*/
public class ReadAllTestCase extends TestCase {
- private LoaderRegistryImpl loaderRegistry;
+ private StAXArtifactProcessorRegistry loaderRegistry;
public void setUp() throws Exception {
loaderRegistry = new LoaderRegistryImpl();
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=525646&r1=525645&r2=525646
==============================================================================
--- 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 Wed Apr 4 17:00:59 2007
@@ -29,9 +29,9 @@
import org.apache.tuscany.assembly.AssemblyFactory;
import org.apache.tuscany.assembly.impl.DefaultAssemblyFactory;
import org.apache.tuscany.assembly.xml.LoaderRegistry;
-import org.apache.tuscany.assembly.xml.impl.ComponentTypeLoader;
-import org.apache.tuscany.assembly.xml.impl.CompositeLoader;
-import org.apache.tuscany.assembly.xml.impl.ConstrainingTypeLoader;
+import org.apache.tuscany.assembly.xml.impl.ComponentTypeProcessor;
+import org.apache.tuscany.assembly.xml.impl.CompositeProcessor;
+import org.apache.tuscany.assembly.xml.impl.ConstrainingTypeProcessor;
import org.apache.tuscany.assembly.xml.impl.LoaderRegistryImpl;
import org.apache.tuscany.policy.PolicyFactory;
import org.apache.tuscany.policy.impl.DefaultPolicyFactory;
@@ -63,7 +63,7 @@
}
public void testReadComponentType() throws Exception {
- ComponentTypeLoader componentTypeReader = new ComponentTypeLoader(assemblyFactory, policyFactory, loaderRegistry);
+ ComponentTypeProcessor componentTypeReader = new ComponentTypeProcessor(assemblyFactory, policyFactory, loaderRegistry);
InputStream is = getClass().getClassLoader().getResourceAsStream("CalculatorImpl.componentType");
XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
assertNotNull(componentTypeReader.load(reader));
@@ -72,7 +72,7 @@
public void testReadConstrainingType() throws Exception {
InputStream is = getClass().getClassLoader().getResourceAsStream("CalculatorComponent.constrainingType");
- ConstrainingTypeLoader constrainingTypeReader = new ConstrainingTypeLoader(assemblyFactory, policyFactory, loaderRegistry);
+ ConstrainingTypeProcessor constrainingTypeReader = new ConstrainingTypeProcessor(assemblyFactory, policyFactory, loaderRegistry);
XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
assertNotNull(constrainingTypeReader.load(reader));
is.close();
@@ -81,7 +81,7 @@
public void testReadComposite() throws Exception {
InputStream is = getClass().getClassLoader().getResourceAsStream("Calculator.composite");
- CompositeLoader compositeReader = new CompositeLoader(assemblyFactory, policyFactory, loaderRegistry);
+ CompositeProcessor compositeReader = new CompositeProcessor(assemblyFactory, policyFactory, loaderRegistry);
XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
assertNotNull(compositeReader.load(reader));
is.close();
@@ -90,7 +90,7 @@
public void testReadCompositeAndWireIt() throws Exception {
InputStream is = getClass().getClassLoader().getResourceAsStream("Calculator.composite");
- CompositeLoader compositeReader = new CompositeLoader(assemblyFactory, policyFactory, loaderRegistry);
+ CompositeProcessor compositeReader = new CompositeProcessor(assemblyFactory, policyFactory, loaderRegistry);
XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
assertNotNull(compositeReader.load(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=525646&r1=525645&r2=525646
==============================================================================
--- 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 Wed Apr 4 17:00:59 2007
@@ -28,7 +28,7 @@
import org.apache.tuscany.assembly.Composite;
import org.apache.tuscany.assembly.impl.DefaultAssemblyFactory;
import org.apache.tuscany.assembly.xml.LoaderRegistry;
-import org.apache.tuscany.assembly.xml.impl.CompositeLoader;
+import org.apache.tuscany.assembly.xml.impl.CompositeProcessor;
import org.apache.tuscany.assembly.xml.impl.LoaderRegistryImpl;
import org.apache.tuscany.policy.PolicyFactory;
import org.apache.tuscany.policy.impl.DefaultPolicyFactory;
@@ -84,7 +84,7 @@
public void testReadComposite() throws Exception {
InputStream is = getClass().getClassLoader().getResourceAsStream("TestAllCalculator.composite");
- CompositeLoader loader = new CompositeLoader(assemblyFactory, policyFactory, loaderRegistry);
+ CompositeProcessor loader = new CompositeProcessor(assemblyFactory, policyFactory, loaderRegistry);
XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
Composite composite = loader.load(reader);
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org