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/01 10:27:07 UTC
svn commit: r524556 - in /incubator/tuscany/java/sca/scdl4j: ./
assembly-xml/ assembly-xml/src/test/java/org/apache/tuscany/scdl/ assembly/
policy/ stax/ stax/src/main/java/org/apache/tuscany/scdl/stax/impl/
stax/src/test/java/org/apache/tuscany/scdl/s...
Author: jsdelfino
Date: Sun Apr 1 01:27:06 2007
New Revision: 524556
URL: http://svn.apache.org/viewvc?view=rev&rev=524556
Log:
Shortened maven artifact ids. Renamed xml module to assembly-xml. Minor cleanup of the Stax module.
Modified:
incubator/tuscany/java/sca/scdl4j/assembly-xml/pom.xml
incubator/tuscany/java/sca/scdl4j/assembly-xml/src/test/java/org/apache/tuscany/scdl/WriteTestCase.java
incubator/tuscany/java/sca/scdl4j/assembly/pom.xml
incubator/tuscany/java/sca/scdl4j/policy/pom.xml
incubator/tuscany/java/sca/scdl4j/pom.xml
incubator/tuscany/java/sca/scdl4j/stax/pom.xml
incubator/tuscany/java/sca/scdl4j/stax/src/main/java/org/apache/tuscany/scdl/stax/impl/BaseLoader.java
incubator/tuscany/java/sca/scdl4j/stax/src/main/java/org/apache/tuscany/scdl/stax/impl/ComponentTypeLoader.java
incubator/tuscany/java/sca/scdl4j/stax/src/main/java/org/apache/tuscany/scdl/stax/impl/CompositeLoader.java
incubator/tuscany/java/sca/scdl4j/stax/src/main/java/org/apache/tuscany/scdl/stax/impl/ConstrainingTypeLoader.java
incubator/tuscany/java/sca/scdl4j/stax/src/main/java/org/apache/tuscany/scdl/stax/impl/LoaderRegistryImpl.java
incubator/tuscany/java/sca/scdl4j/stax/src/test/java/org/apache/tuscany/scdl/stax/impl/ReadTestCase.java
Modified: incubator/tuscany/java/sca/scdl4j/assembly-xml/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/assembly-xml/pom.xml?view=diff&rev=524556&r1=524555&r2=524556
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/assembly-xml/pom.xml (original)
+++ incubator/tuscany/java/sca/scdl4j/assembly-xml/pom.xml Sun Apr 1 01:27:06 2007
@@ -25,7 +25,7 @@
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>tuscany-scdl4j-xml</artifactId>
+ <artifactId>tuscany-assembly-xml</artifactId>
<version>0.1-incubating-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Apache Tuscany support for SCA XML assembly files.</name>
@@ -35,15 +35,14 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-scdl4j-assembly</artifactId>
+ <artifactId>tuscany-assembly</artifactId>
<version>0.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>wstx-asl</artifactId>
- <version>3.2.0</version>
- <scope>test</scope>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-assembly-stax</artifactId>
+ <version>0.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
Modified: incubator/tuscany/java/sca/scdl4j/assembly-xml/src/test/java/org/apache/tuscany/scdl/WriteTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/assembly-xml/src/test/java/org/apache/tuscany/scdl/WriteTestCase.java?view=diff&rev=524556&r1=524555&r2=524556
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/assembly-xml/src/test/java/org/apache/tuscany/scdl/WriteTestCase.java (original)
+++ incubator/tuscany/java/sca/scdl4j/assembly-xml/src/test/java/org/apache/tuscany/scdl/WriteTestCase.java Sun Apr 1 01:27:06 2007
@@ -59,8 +59,6 @@
policyFactory = new DefaultPolicyFactory();
reader = XMLReaderFactory.createXMLReader();
- reader.setFeature("http://xml.org/sax/features/namespaces", true);
- reader.setFeature("http://xml.org/sax/features/namespace-prefixes", false);
transformer = TransformerFactory.newInstance().newTransformer();
transformer.setOutputProperty("indent", "yes");
Modified: incubator/tuscany/java/sca/scdl4j/assembly/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/assembly/pom.xml?view=diff&rev=524556&r1=524555&r2=524556
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/assembly/pom.xml (original)
+++ incubator/tuscany/java/sca/scdl4j/assembly/pom.xml Sun Apr 1 01:27:06 2007
@@ -25,7 +25,7 @@
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>tuscany-scdl4j-assembly</artifactId>
+ <artifactId>tuscany-assembly</artifactId>
<version>0.1-incubating-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Apache Tuscany SCDL4J Assembly Model</name>
@@ -35,7 +35,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-scdl4j-policy</artifactId>
+ <artifactId>tuscany-policy</artifactId>
<version>0.1-incubating-SNAPSHOT</version>
</dependency>
Modified: incubator/tuscany/java/sca/scdl4j/policy/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/policy/pom.xml?view=diff&rev=524556&r1=524555&r2=524556
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/policy/pom.xml (original)
+++ incubator/tuscany/java/sca/scdl4j/policy/pom.xml Sun Apr 1 01:27:06 2007
@@ -24,7 +24,7 @@
<version>0.1-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>tuscany-scdl4j-policy</artifactId>
+ <artifactId>tuscany-policy</artifactId>
<version>0.1-incubating-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Apache Tuscany SCDL4J Policy Model</name>
Modified: incubator/tuscany/java/sca/scdl4j/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/pom.xml?view=diff&rev=524556&r1=524555&r2=524556
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/pom.xml (original)
+++ incubator/tuscany/java/sca/scdl4j/pom.xml Sun Apr 1 01:27:06 2007
@@ -37,8 +37,10 @@
<module>../idl-wsdl</module>
<module>assembly</module>
<module>policy</module>
- <module>assembly-xml</module>
<module>stax</module>
+ <module>assembly-xml</module>
+ <module>idl-java-xml</module>
+ <module>idl-wsdl-xml</module>
</modules>
</project>
Modified: incubator/tuscany/java/sca/scdl4j/stax/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/stax/pom.xml?view=diff&rev=524556&r1=524555&r2=524556
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/stax/pom.xml (original)
+++ incubator/tuscany/java/sca/scdl4j/stax/pom.xml Sun Apr 1 01:27:06 2007
@@ -25,7 +25,7 @@
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>tuscany-scdl4j-stax</artifactId>
+ <artifactId>tuscany-assembly-stax</artifactId>
<version>0.1-incubating-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Apache Tuscany StAX-based loaders for SCA XML assembly files</name>
@@ -34,23 +34,23 @@
<dependencies>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-scdl4j-assembly</artifactId>
+ <artifactId>tuscany-assembly</artifactId>
<version>0.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>wstx-asl</artifactId>
- <version>3.2.0</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
<groupId>stax</groupId>
<artifactId>stax-api</artifactId>
<version>1.0.1</version>
</dependency>
+ <dependency>
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>wstx-asl</artifactId>
+ <version>3.2.0</version>
+ <scope>runtime</scope>
+ </dependency>
+
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Modified: incubator/tuscany/java/sca/scdl4j/stax/src/main/java/org/apache/tuscany/scdl/stax/impl/BaseLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/stax/src/main/java/org/apache/tuscany/scdl/stax/impl/BaseLoader.java?view=diff&rev=524556&r1=524555&r2=524556
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/stax/src/main/java/org/apache/tuscany/scdl/stax/impl/BaseLoader.java (original)
+++ incubator/tuscany/java/sca/scdl4j/stax/src/main/java/org/apache/tuscany/scdl/stax/impl/BaseLoader.java Sun Apr 1 01:27:06 2007
@@ -40,7 +40,6 @@
import org.apache.tuscany.policy.model.PolicySetAttachPoint;
import org.apache.tuscany.sca.idl.Operation;
import org.apache.tuscany.scdl.stax.Constants;
-import org.apache.tuscany.scdl.stax.LoaderRegistry;
/**
* A test handler to test the usability of the assembly model API when loading
@@ -48,17 +47,17 @@
*
* @version $Rev$ $Date$
*/
-public abstract class BaseLoader implements Constants {
-
- protected AssemblyFactory factory;
- protected PolicyFactory policyFactory;
- protected LoaderRegistry registry;
-
- public BaseLoader(AssemblyFactory factory, PolicyFactory policyFactory, LoaderRegistry registry) {
+abstract class BaseLoader implements Constants {
+ private AssemblyFactory factory;
+ private PolicyFactory policyFactory;
+
+ BaseLoader() {
+ }
+
+ BaseLoader(AssemblyFactory factory, PolicyFactory policyFactory) {
this.factory = factory;
this.policyFactory = policyFactory;
- this.registry = registry;
}
protected String getString(XMLStreamReader reader, String name) {
Modified: incubator/tuscany/java/sca/scdl4j/stax/src/main/java/org/apache/tuscany/scdl/stax/impl/ComponentTypeLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/stax/src/main/java/org/apache/tuscany/scdl/stax/impl/ComponentTypeLoader.java?view=diff&rev=524556&r1=524555&r2=524556
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/stax/src/main/java/org/apache/tuscany/scdl/stax/impl/ComponentTypeLoader.java (original)
+++ incubator/tuscany/java/sca/scdl4j/stax/src/main/java/org/apache/tuscany/scdl/stax/impl/ComponentTypeLoader.java Sun Apr 1 01:27:06 2007
@@ -39,14 +39,22 @@
import org.apache.tuscany.scdl.stax.LoaderRegistry;
/**
- * A componentType content handler.
+ * A componentType loader.
*
* @version $Rev$ $Date$
*/
public class ComponentTypeLoader extends BaseLoader implements Loader<ComponentType> {
+ private AssemblyFactory factory;
+ /**
+ * Constructs a new componentType loader.
+ * @param factory
+ * @param policyFactory
+ * @param registry
+ */
public ComponentTypeLoader(AssemblyFactory factory, PolicyFactory policyFactory, LoaderRegistry registry) {
- super(factory, policyFactory, registry);
+ super(factory, policyFactory);
+ this.factory = factory;
}
public ComponentType load(XMLStreamReader reader) throws XMLStreamException {
@@ -56,11 +64,14 @@
Contract contract = null;
Property property = null;
Callback callback = null;
+ QName name = null;
+
+ // Read the componentType document
while (reader.hasNext()) {
int event = reader.getEventType();
switch (event) {
case START_ELEMENT:
- QName name = reader.getName();
+ name = reader.getName();
if (Constants.COMPONENT_TYPE_QNAME.equals(name)) {
componentType = factory.createComponentType();
Modified: incubator/tuscany/java/sca/scdl4j/stax/src/main/java/org/apache/tuscany/scdl/stax/impl/CompositeLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/stax/src/main/java/org/apache/tuscany/scdl/stax/impl/CompositeLoader.java?view=diff&rev=524556&r1=524555&r2=524556
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/stax/src/main/java/org/apache/tuscany/scdl/stax/impl/CompositeLoader.java (original)
+++ incubator/tuscany/java/sca/scdl4j/stax/src/main/java/org/apache/tuscany/scdl/stax/impl/CompositeLoader.java Sun Apr 1 01:27:06 2007
@@ -28,6 +28,7 @@
import javax.xml.stream.XMLStreamReader;
import org.apache.tuscany.assembly.model.AssemblyFactory;
+import org.apache.tuscany.assembly.model.Binding;
import org.apache.tuscany.assembly.model.Callback;
import org.apache.tuscany.assembly.model.Component;
import org.apache.tuscany.assembly.model.ComponentProperty;
@@ -37,9 +38,11 @@
import org.apache.tuscany.assembly.model.CompositeReference;
import org.apache.tuscany.assembly.model.CompositeService;
import org.apache.tuscany.assembly.model.Contract;
+import org.apache.tuscany.assembly.model.Implementation;
import org.apache.tuscany.assembly.model.Property;
import org.apache.tuscany.assembly.model.Wire;
import org.apache.tuscany.policy.model.PolicyFactory;
+import org.apache.tuscany.sca.idl.Interface;
import org.apache.tuscany.sca.idl.Operation;
import org.apache.tuscany.scdl.stax.Loader;
import org.apache.tuscany.scdl.stax.LoaderRegistry;
@@ -50,23 +53,21 @@
* @version $Rev$ $Date$
*/
public class CompositeLoader extends BaseLoader implements Loader<Composite> {
-
- /**
- * Construct a new composite loader
- * @param assemblyFactory
- * @param policyFactory
- * @param registry
- */
- public CompositeLoader(AssemblyFactory assemblyFactory, PolicyFactory policyFactory, LoaderRegistry registry) {
- super(assemblyFactory, policyFactory, registry);
- }
+ private AssemblyFactory factory;
+ private LoaderRegistry registry;
/**
- * Read an SCA composite
- * @param reader
- * @return a composite model
- * @throws XMLStreamException
+ * Construct a new composite loader
+ * @param assemblyFactory
+ * @param policyFactory
+ * @param registry
*/
+ public CompositeLoader(AssemblyFactory factory, PolicyFactory policyFactory, LoaderRegistry registry) {
+ super(factory, policyFactory);
+ this.factory = factory;
+ this.registry = registry;
+ }
+
public Composite load(XMLStreamReader reader) throws XMLStreamException {
Composite composite = null;
Composite include = null;
@@ -227,13 +228,23 @@
}
} else {
- // Read extension elements
- // <service><interface>
- // <service><binding>
- // <component><implementation>
- if (nextChildElement(reader)) {
- registry.load(reader);
- continue;
+ // Read an extension element
+ Object extension = registry.load(reader);
+ if (extension != null) {
+ if (extension instanceof Interface) {
+
+ // <service><interface> and <reference><interface>
+ contract.setInterface((Interface)extension);
+
+ } else if (extension instanceof Binding) {
+ // <service><binding> and <reference><binding>
+ contract.getBindings().add((Binding)extension);
+
+ } else if (extension instanceof Implementation) {
+
+ // <component><implementation>
+ component.setImplementation((Implementation)extension);
+ }
}
}
break;
Modified: incubator/tuscany/java/sca/scdl4j/stax/src/main/java/org/apache/tuscany/scdl/stax/impl/ConstrainingTypeLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/stax/src/main/java/org/apache/tuscany/scdl/stax/impl/ConstrainingTypeLoader.java?view=diff&rev=524556&r1=524555&r2=524556
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/stax/src/main/java/org/apache/tuscany/scdl/stax/impl/ConstrainingTypeLoader.java (original)
+++ incubator/tuscany/java/sca/scdl4j/stax/src/main/java/org/apache/tuscany/scdl/stax/impl/ConstrainingTypeLoader.java Sun Apr 1 01:27:06 2007
@@ -42,11 +42,21 @@
* @version $Rev$ $Date$
*/
public class ConstrainingTypeLoader extends BaseLoader implements Loader<ConstrainingType> {
+ private AssemblyFactory factory;
+ private LoaderRegistry registry;
+ /**
+ * Construct a new constrainingType loader.
+ * @param factory
+ * @param policyFactory
+ * @param registry
+ */
public ConstrainingTypeLoader(AssemblyFactory factory,
PolicyFactory policyFactory,
LoaderRegistry registry) {
- super(factory, policyFactory, registry);
+ super(factory, policyFactory);
+ this.factory = factory;
+ this.registry = registry;
}
public ConstrainingType load(XMLStreamReader reader) throws XMLStreamException {
Modified: incubator/tuscany/java/sca/scdl4j/stax/src/main/java/org/apache/tuscany/scdl/stax/impl/LoaderRegistryImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/stax/src/main/java/org/apache/tuscany/scdl/stax/impl/LoaderRegistryImpl.java?view=diff&rev=524556&r1=524555&r2=524556
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/stax/src/main/java/org/apache/tuscany/scdl/stax/impl/LoaderRegistryImpl.java (original)
+++ incubator/tuscany/java/sca/scdl4j/stax/src/main/java/org/apache/tuscany/scdl/stax/impl/LoaderRegistryImpl.java Sun Apr 1 01:27:06 2007
@@ -27,6 +27,7 @@
import javax.xml.namespace.QName;
import javax.xml.stream.Location;
import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
@@ -54,6 +55,7 @@
private XMLInputFactory factory;
/**
+ * Constructs a new loader registry.
* @param assemblyFactory
* @param policyFactory
* @param factory
Modified: incubator/tuscany/java/sca/scdl4j/stax/src/test/java/org/apache/tuscany/scdl/stax/impl/ReadTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/stax/src/test/java/org/apache/tuscany/scdl/stax/impl/ReadTestCase.java?view=diff&rev=524556&r1=524555&r2=524556
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/stax/src/test/java/org/apache/tuscany/scdl/stax/impl/ReadTestCase.java (original)
+++ incubator/tuscany/java/sca/scdl4j/stax/src/test/java/org/apache/tuscany/scdl/stax/impl/ReadTestCase.java Sun Apr 1 01:27:06 2007
@@ -63,42 +63,36 @@
}
public void testReadComponentType() throws Exception {
- ComponentTypeLoader loader = new ComponentTypeLoader(assemblyFactory, policyFactory, loaderRegistry);
+ ComponentTypeLoader componentTypeReader = new ComponentTypeLoader(assemblyFactory, policyFactory, loaderRegistry);
InputStream is = getClass().getClassLoader().getResourceAsStream("CalculatorImpl.componentType");
XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
- assertNotNull(loader.load(reader));
+ assertNotNull(componentTypeReader.load(reader));
is.close();
}
public void testReadConstrainingType() throws Exception {
InputStream is = getClass().getClassLoader().getResourceAsStream("CalculatorComponent.constrainingType");
- ConstrainingTypeLoader loader = new ConstrainingTypeLoader(assemblyFactory, policyFactory, loaderRegistry);
+ ConstrainingTypeLoader constrainingTypeReader = new ConstrainingTypeLoader(assemblyFactory, policyFactory, loaderRegistry);
XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
- assertNotNull(loader.load(reader));
+ assertNotNull(constrainingTypeReader.load(reader));
is.close();
}
- public static void main(String[] args) throws Exception {
- ReadTestCase tc = new ReadTestCase();
- tc.setUp();
- tc.testReadComposite();
- }
-
public void testReadComposite() throws Exception {
InputStream is = getClass().getClassLoader().getResourceAsStream("Calculator.composite");
- CompositeLoader loader = new CompositeLoader(assemblyFactory, policyFactory, loaderRegistry);
+ CompositeLoader compositeReader = new CompositeLoader(assemblyFactory, policyFactory, loaderRegistry);
XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
- assertNotNull(loader.load(reader));
+ assertNotNull(compositeReader.load(reader));
is.close();
}
public void testReadCompositeAndWireIt() throws Exception {
InputStream is = getClass().getClassLoader().getResourceAsStream("Calculator.composite");
- CompositeLoader loader = new CompositeLoader(assemblyFactory, policyFactory, loaderRegistry);
+ CompositeLoader compositeReader = new CompositeLoader(assemblyFactory, policyFactory, loaderRegistry);
XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
- assertNotNull(loader.load(reader));
+ assertNotNull(compositeReader.load(reader));
is.close();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org