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/03 10:34:53 UTC
svn commit: r525085 [2/2] - in /incubator/tuscany/java/sca/scdl4j: ./
assembly-xml/ assembly-xml/src/main/java/org/apache/tuscany/assembly/
assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/
assembly-xml/src/main/java/org/apache/tuscany/assemb...
Added: incubator/tuscany/java/sca/scdl4j/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/ReadAllTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/ReadAllTestCase.java?view=auto&rev=525085
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/ReadAllTestCase.java (added)
+++ incubator/tuscany/java/sca/scdl4j/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/ReadAllTestCase.java Tue Apr 3 01:34:51 2007
@@ -0,0 +1,166 @@
+/*
+ * 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.assembly.xml;
+
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+
+import junit.framework.TestCase;
+
+import org.apache.tuscany.assembly.model.Callback;
+import org.apache.tuscany.assembly.model.Component;
+import org.apache.tuscany.assembly.model.ComponentReference;
+import org.apache.tuscany.assembly.model.ComponentService;
+import org.apache.tuscany.assembly.model.Composite;
+import org.apache.tuscany.assembly.model.CompositeReference;
+import org.apache.tuscany.assembly.model.CompositeService;
+import org.apache.tuscany.assembly.model.Multiplicity;
+import org.apache.tuscany.assembly.model.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.w3c.dom.Document;
+import org.w3c.dom.Element;
+
+/**
+ * Test the usability of the assembly model API when loading SCDL
+ *
+ * @version $Rev$ $Date$
+ */
+public class ReadAllTestCase extends TestCase {
+ private LoaderRegistryImpl loaderRegistry;
+
+ public void setUp() throws Exception {
+ loaderRegistry = new LoaderRegistryImpl();
+ }
+
+ public void tearDown() throws Exception {
+ loaderRegistry = null;
+ }
+
+ public void testReadComposite() throws Exception {
+ URL url = getClass().getClassLoader().getResource("TestAllCalculator.composite");
+ Composite composite = loaderRegistry.load(url, Composite.class);
+ assertNotNull(composite);
+ assertEquals(composite.getName(), new QName("http://calc", "TestAllCalculator"));
+ assertEquals(composite.getConstrainingType().getName(), new QName("http://calc", "Calculator"));
+ assertTrue(composite.isLocal());
+ assertFalse(composite.isAutowire());
+ assertEquals(composite.getRequiredIntents().get(0).getName(), new QName("http://test/confidentiality",
+ "confidentiality"));
+ assertEquals(composite.getPolicySets().get(0).getName(), new QName("http://test/secure", "secure"));
+
+ Composite include = composite.getIncludes().get(0);
+ assertEquals(include.getName(), new QName("http://calc", "TestAllDivide"));
+
+ CompositeService calcCompositeService = (CompositeService)composite.getServices().get(0);
+ assertEquals(calcCompositeService.getName(), "CalculatorService");
+ assertTrue(calcCompositeService.getPromotedService().isUnresolved());
+ assertEquals(calcCompositeService.getPromotedService().getName(),
+ "CalculatorServiceComponent/CalculatorService");
+ assertEquals(calcCompositeService.getRequiredIntents().get(0).getName(),
+ new QName("http://test/confidentiality", "confidentiality"));
+ assertEquals(calcCompositeService.getPolicySets().get(0).getName(), new QName("http://test/secure", "secure"));
+ // TODO test operations
+ Callback calcServiceCallback = calcCompositeService.getCallback();
+ assertNotNull(calcServiceCallback);
+ assertEquals(calcServiceCallback.getRequiredIntents().get(0).getName(),
+ new QName("http://test/confidentiality", "confidentiality"));
+ assertEquals(calcServiceCallback.getPolicySets().get(0).getName(), new QName("http://test/secure", "secure"));
+ // TODO test operations
+
+ Component calcComponent = composite.getComponents().get(0);
+ assertEquals(calcComponent.getName(), "CalculatorServiceComponent");
+ assertEquals(calcComponent.isAutowire(), false);
+ assertEquals(calcComponent.getConstrainingType().getName(), new QName("http://calc",
+ "CalculatorServiceComponent"));
+ assertEquals(calcComponent.getRequiredIntents().get(0).getName(), new QName("http://test/confidentiality",
+ "confidentiality"));
+ assertEquals(calcComponent.getPolicySets().get(0).getName(), new QName("http://test/secure", "secure"));
+
+ ComponentService calcComponentService = calcComponent.getServices().get(0);
+ assertEquals(calcComponentService.getName(), "CalculatorService");
+ assertEquals(calcComponentService.getRequiredIntents().get(0).getName(),
+ new QName("http://test/confidentiality", "confidentiality"));
+ assertEquals(calcComponentService.getPolicySets().get(0).getName(), new QName("http://test/secure", "secure"));
+ // TODO test operations
+
+ ComponentReference calcComponentReference = calcComponent.getReferences().get(0);
+ assertEquals(calcComponentReference.getName(), "addService");
+ assertEquals(calcComponentReference.isAutowire(), false);
+ assertEquals(calcComponentReference.isWiredByImpl(), false);
+ assertEquals(calcComponentReference.getMultiplicity(), Multiplicity.ONE_ONE);
+ assertEquals(calcComponentReference.getRequiredIntents().get(0).getName(),
+ new QName("http://test/confidentiality", "confidentiality"));
+ assertEquals(calcComponentReference.getPolicySets().get(0).getName(), new QName("http://test/secure", "secure"));
+ // TODO test operations
+
+ Property property = calcComponent.getProperties().get(0);
+ assertEquals(property.getName(), "round");
+ Document doc = (Document) property.getDefaultValue();
+ Element element = doc.getDocumentElement();
+ String value = element.getTextContent();
+ assertEquals(value, "true");
+ assertEquals(property.getXSDType(), new QName("http://www.w3.org/2001/XMLSchema", "boolean"));
+ assertEquals(property.isMany(), false);
+
+ CompositeReference calcCompositeReference = (CompositeReference)composite.getReferences().get(0);
+ assertEquals(calcCompositeReference.getName(), "MultiplyService");
+ assertTrue(calcCompositeReference.getPromotedReferences().get(0).isUnresolved());
+ assertEquals(calcCompositeReference.getPromotedReferences().get(0).getName(),
+ "CalculatorServiceComponent/multiplyService");
+ assertEquals(calcCompositeReference.getRequiredIntents().get(0).getName(),
+ new QName("http://test/confidentiality", "confidentiality"));
+ assertEquals(calcCompositeReference.getPolicySets().get(0).getName(), new QName("http://test/secure", "secure"));
+ // TODO test operations
+ Callback calcCallback = calcCompositeReference.getCallback();
+ assertEquals(calcCompositeReference.getRequiredIntents().get(0).getName(),
+ new QName("http://test/confidentiality", "confidentiality"));
+ assertEquals(calcCompositeReference.getPolicySets().get(0).getName(), new QName("http://test/secure", "secure"));
+ assertNotNull(calcCallback);
+ // TODO test operations
+
+ new PrintUtil(System.out).print(loaderRegistry.getLoader(Constants.COMPOSITE_QNAME));
+ }
+
+ public void testReadCompositeAndWireIt() throws Exception {
+ URL url = getClass().getClassLoader().getResource("TestAllCalculator.composite");
+ Composite composite = loaderRegistry.load(url, Composite.class);
+ assertNotNull(composite);
+ new CompositeUtil(loaderRegistry.getAssemblyFactory(), composite).configure(null);
+
+ Component calcComponent = composite.getComponents().get(0);
+ CompositeService calcCompositeService = (CompositeService)composite.getServices().get(0);
+ assertEquals(calcComponent.getServices().get(0), calcCompositeService.getPromotedService());
+
+ ComponentReference multiplyReference = calcComponent.getReferences().get(2);
+ CompositeReference calcCompositeReference = (CompositeReference)composite.getReferences().get(0);
+ assertEquals(multiplyReference, calcCompositeReference.getPromotedReferences().get(0));
+
+ Component addComponent = composite.getComponents().get(1);
+ ComponentReference addReference = calcComponent.getReferences().get(0);
+ assertEquals(addReference.getTargets().get(0), addComponent.getServices().get(0));
+
+ new PrintUtil(System.out).print(composite);
+ }
+
+}
Propchange: incubator/tuscany/java/sca/scdl4j/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/ReadAllTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/scdl4j/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/ReadAllTestCase.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: incubator/tuscany/java/sca/scdl4j/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/ReadTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/ReadTestCase.java?view=auto&rev=525085
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/ReadTestCase.java (added)
+++ incubator/tuscany/java/sca/scdl4j/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/ReadTestCase.java Tue Apr 3 01:34:51 2007
@@ -0,0 +1,99 @@
+/*
+ * 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.assembly.xml;
+
+import java.io.InputStream;
+
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamReader;
+
+import junit.framework.TestCase;
+
+import org.apache.tuscany.assembly.model.AssemblyFactory;
+import org.apache.tuscany.assembly.model.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.LoaderRegistryImpl;
+import org.apache.tuscany.policy.model.PolicyFactory;
+import org.apache.tuscany.policy.model.impl.DefaultPolicyFactory;
+
+/**
+ * Test the usability of the assembly model API when loading SCDL
+ *
+ * @version $Rev$ $Date$
+ */
+public class ReadTestCase extends TestCase {
+
+ private XMLInputFactory inputFactory;
+ private AssemblyFactory assemblyFactory;
+ private PolicyFactory policyFactory;
+ private LoaderRegistry loaderRegistry;
+
+ public void setUp() throws Exception {
+ inputFactory = XMLInputFactory.newInstance();
+ assemblyFactory = new DefaultAssemblyFactory();
+ policyFactory = new DefaultPolicyFactory();
+ loaderRegistry = new LoaderRegistryImpl();
+ }
+
+ public void tearDown() throws Exception {
+ assemblyFactory = null;
+ policyFactory = null;
+ inputFactory = null;
+ loaderRegistry = null;
+ }
+
+ public void testReadComponentType() throws Exception {
+ ComponentTypeLoader componentTypeReader = new ComponentTypeLoader(assemblyFactory, policyFactory, loaderRegistry);
+ InputStream is = getClass().getClassLoader().getResourceAsStream("CalculatorImpl.componentType");
+ XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
+ assertNotNull(componentTypeReader.load(reader));
+ is.close();
+ }
+
+ public void testReadConstrainingType() throws Exception {
+ InputStream is = getClass().getClassLoader().getResourceAsStream("CalculatorComponent.constrainingType");
+ ConstrainingTypeLoader constrainingTypeReader = new ConstrainingTypeLoader(assemblyFactory, policyFactory, loaderRegistry);
+ XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
+ assertNotNull(constrainingTypeReader.load(reader));
+ is.close();
+
+ }
+
+ public void testReadComposite() throws Exception {
+ InputStream is = getClass().getClassLoader().getResourceAsStream("Calculator.composite");
+ CompositeLoader compositeReader = new CompositeLoader(assemblyFactory, policyFactory, loaderRegistry);
+ XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
+ assertNotNull(compositeReader.load(reader));
+ is.close();
+
+ }
+
+ public void testReadCompositeAndWireIt() throws Exception {
+ InputStream is = getClass().getClassLoader().getResourceAsStream("Calculator.composite");
+ CompositeLoader compositeReader = new CompositeLoader(assemblyFactory, policyFactory, loaderRegistry);
+ XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
+ assertNotNull(compositeReader.load(reader));
+ is.close();
+ }
+
+}
Propchange: incubator/tuscany/java/sca/scdl4j/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/ReadTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/scdl4j/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/ReadTestCase.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: incubator/tuscany/java/sca/scdl4j/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/StAXPerfTest.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/StAXPerfTest.java?view=auto&rev=525085
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/StAXPerfTest.java (added)
+++ incubator/tuscany/java/sca/scdl4j/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/StAXPerfTest.java Tue Apr 3 01:34:51 2007
@@ -0,0 +1,98 @@
+/*
+ * 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.assembly.xml;
+
+import java.io.InputStream;
+
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamReader;
+
+import org.apache.tuscany.assembly.model.AssemblyFactory;
+import org.apache.tuscany.assembly.model.Composite;
+import org.apache.tuscany.assembly.model.impl.DefaultAssemblyFactory;
+import org.apache.tuscany.assembly.xml.LoaderRegistry;
+import org.apache.tuscany.assembly.xml.impl.CompositeLoader;
+import org.apache.tuscany.assembly.xml.impl.LoaderRegistryImpl;
+import org.apache.tuscany.policy.model.PolicyFactory;
+import org.apache.tuscany.policy.model.impl.DefaultPolicyFactory;
+
+/**
+ * Test the usability of the assembly model API when loading SCDL
+ *
+ * @version $Rev$ $Date$
+ */
+public class StAXPerfTest {
+
+ private XMLInputFactory inputFactory;
+ private AssemblyFactory assemblyFactory;
+ private PolicyFactory policyFactory;
+ private LoaderRegistry loaderRegistry;
+
+ public static void main(String[] args) throws Exception {
+
+ StAXPerfTest perfTest = new StAXPerfTest();
+ perfTest.setUp();
+
+ // Warm up
+ for (long i = 0; i < 500; i++) {
+ perfTest.testReadComposite();
+ }
+
+ long begin = System.currentTimeMillis();
+ long iter = 50000;
+ for (long i = 0; i < iter; i++) {
+ perfTest.testReadComposite();
+ }
+ long end = System.currentTimeMillis();
+ System.out.println("Iterations: " + iter);
+ double time = ((double)(end - begin)) / ((double)iter);
+ System.out.println("Time: " + time);
+ System.out.println("Memory: " + Runtime.getRuntime().totalMemory() / 1024);
+
+ }
+
+ public void setUp() throws Exception {
+ inputFactory = XMLInputFactory.newInstance();
+ assemblyFactory = new DefaultAssemblyFactory();
+ policyFactory = new DefaultPolicyFactory();
+ loaderRegistry = new LoaderRegistryImpl();
+ }
+
+ public void tearDown() throws Exception {
+ assemblyFactory = null;
+ policyFactory = null;
+ inputFactory = null;
+ loaderRegistry = null;
+ }
+
+ public void testReadComposite() throws Exception {
+ InputStream is = getClass().getClassLoader().getResourceAsStream("TestAllCalculator.composite");
+ CompositeLoader loader = new CompositeLoader(assemblyFactory, policyFactory, loaderRegistry);
+ XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
+
+ Composite composite = loader.load(reader);
+ is.close();
+
+ if (composite == null) {
+ throw new IllegalStateException("Null composite");
+ }
+ }
+
+}
Propchange: incubator/tuscany/java/sca/scdl4j/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/StAXPerfTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/scdl4j/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/StAXPerfTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/java/sca/scdl4j/idl-java-xml/src/main/java/org/apache/tuscany/idl/java/xml/JavaConstants.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/idl-java-xml/src/main/java/org/apache/tuscany/idl/java/xml/JavaConstants.java?view=diff&rev=525085&r1=525084&r2=525085
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/idl-java-xml/src/main/java/org/apache/tuscany/idl/java/xml/JavaConstants.java (original)
+++ incubator/tuscany/java/sca/scdl4j/idl-java-xml/src/main/java/org/apache/tuscany/idl/java/xml/JavaConstants.java Tue Apr 3 01:34:51 2007
@@ -20,7 +20,7 @@
import javax.xml.namespace.QName;
-import org.apache.tuscany.scdl.Constants;
+import org.apache.tuscany.assembly.xml.Constants;
public interface JavaConstants {
Modified: incubator/tuscany/java/sca/scdl4j/idl-java-xml/src/main/java/org/apache/tuscany/idl/java/xml/JavaInterfaceLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/idl-java-xml/src/main/java/org/apache/tuscany/idl/java/xml/JavaInterfaceLoader.java?view=diff&rev=525085&r1=525084&r2=525085
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/idl-java-xml/src/main/java/org/apache/tuscany/idl/java/xml/JavaInterfaceLoader.java (original)
+++ incubator/tuscany/java/sca/scdl4j/idl-java-xml/src/main/java/org/apache/tuscany/idl/java/xml/JavaInterfaceLoader.java Tue Apr 3 01:34:51 2007
@@ -24,9 +24,9 @@
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
+import org.apache.tuscany.assembly.xml.Loader;
import org.apache.tuscany.idl.java.JavaFactory;
import org.apache.tuscany.idl.java.JavaInterface;
-import org.apache.tuscany.scdl.stax.Loader;
public class JavaInterfaceLoader implements Loader<JavaInterface>, JavaConstants {
Modified: incubator/tuscany/java/sca/scdl4j/idl-java-xml/src/test/java/org/apache/tuscany/idl/java/xml/ReadTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/idl-java-xml/src/test/java/org/apache/tuscany/idl/java/xml/ReadTestCase.java?view=diff&rev=525085&r1=525084&r2=525085
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/idl-java-xml/src/test/java/org/apache/tuscany/idl/java/xml/ReadTestCase.java (original)
+++ incubator/tuscany/java/sca/scdl4j/idl-java-xml/src/test/java/org/apache/tuscany/idl/java/xml/ReadTestCase.java Tue Apr 3 01:34:51 2007
@@ -33,14 +33,14 @@
import org.apache.tuscany.assembly.model.impl.DefaultAssemblyFactory;
import org.apache.tuscany.assembly.util.CompositeUtil;
import org.apache.tuscany.assembly.util.PrintUtil;
+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.LoaderRegistryImpl;
import org.apache.tuscany.idl.java.impl.DefaultJavaFactory;
import org.apache.tuscany.policy.model.PolicyFactory;
import org.apache.tuscany.policy.model.impl.DefaultPolicyFactory;
-import org.apache.tuscany.scdl.stax.LoaderRegistry;
-import org.apache.tuscany.scdl.stax.impl.ComponentTypeLoader;
-import org.apache.tuscany.scdl.stax.impl.CompositeLoader;
-import org.apache.tuscany.scdl.stax.impl.ConstrainingTypeLoader;
-import org.apache.tuscany.scdl.stax.impl.LoaderRegistryImpl;
/**
* Test the usability of the assembly model API when loading SCDL
Modified: incubator/tuscany/java/sca/scdl4j/idl-wsdl-xml/src/main/java/org/apache/tuscany/idl/wsdl/xml/WSDLConstants.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/idl-wsdl-xml/src/main/java/org/apache/tuscany/idl/wsdl/xml/WSDLConstants.java?view=diff&rev=525085&r1=525084&r2=525085
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/idl-wsdl-xml/src/main/java/org/apache/tuscany/idl/wsdl/xml/WSDLConstants.java (original)
+++ incubator/tuscany/java/sca/scdl4j/idl-wsdl-xml/src/main/java/org/apache/tuscany/idl/wsdl/xml/WSDLConstants.java Tue Apr 3 01:34:51 2007
@@ -20,7 +20,7 @@
import javax.xml.namespace.QName;
-import org.apache.tuscany.scdl.Constants;
+import org.apache.tuscany.assembly.xml.Constants;
public interface WSDLConstants {
Modified: incubator/tuscany/java/sca/scdl4j/idl-wsdl-xml/src/main/java/org/apache/tuscany/idl/wsdl/xml/WSDLInterfaceLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/idl-wsdl-xml/src/main/java/org/apache/tuscany/idl/wsdl/xml/WSDLInterfaceLoader.java?view=diff&rev=525085&r1=525084&r2=525085
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/idl-wsdl-xml/src/main/java/org/apache/tuscany/idl/wsdl/xml/WSDLInterfaceLoader.java (original)
+++ incubator/tuscany/java/sca/scdl4j/idl-wsdl-xml/src/main/java/org/apache/tuscany/idl/wsdl/xml/WSDLInterfaceLoader.java Tue Apr 3 01:34:51 2007
@@ -25,9 +25,9 @@
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
+import org.apache.tuscany.assembly.xml.Loader;
import org.apache.tuscany.idl.WSDLFactory;
import org.apache.tuscany.idl.WSDLInterface;
-import org.apache.tuscany.scdl.stax.Loader;
public class WSDLInterfaceLoader implements Loader<WSDLInterface>, WSDLConstants {
Modified: incubator/tuscany/java/sca/scdl4j/idl-wsdl-xml/src/test/java/org/apache/tuscany/idl/wsdl/xml/ReadTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/idl-wsdl-xml/src/test/java/org/apache/tuscany/idl/wsdl/xml/ReadTestCase.java?view=diff&rev=525085&r1=525084&r2=525085
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/idl-wsdl-xml/src/test/java/org/apache/tuscany/idl/wsdl/xml/ReadTestCase.java (original)
+++ incubator/tuscany/java/sca/scdl4j/idl-wsdl-xml/src/test/java/org/apache/tuscany/idl/wsdl/xml/ReadTestCase.java Tue Apr 3 01:34:51 2007
@@ -33,14 +33,14 @@
import org.apache.tuscany.assembly.model.impl.DefaultAssemblyFactory;
import org.apache.tuscany.assembly.util.CompositeUtil;
import org.apache.tuscany.assembly.util.PrintUtil;
+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.LoaderRegistryImpl;
import org.apache.tuscany.idl.wsdl.impl.DefaultWSDLFactory;
import org.apache.tuscany.policy.model.PolicyFactory;
import org.apache.tuscany.policy.model.impl.DefaultPolicyFactory;
-import org.apache.tuscany.scdl.stax.LoaderRegistry;
-import org.apache.tuscany.scdl.stax.impl.ComponentTypeLoader;
-import org.apache.tuscany.scdl.stax.impl.CompositeLoader;
-import org.apache.tuscany.scdl.stax.impl.ConstrainingTypeLoader;
-import org.apache.tuscany.scdl.stax.impl.LoaderRegistryImpl;
/**
* Test the usability of the assembly model API when loading SCDL
Modified: incubator/tuscany/java/sca/scdl4j/impl-java-xml/src/main/java/org/apache/tuscany/implementation/java/xml/JavaImplementationConstants.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/impl-java-xml/src/main/java/org/apache/tuscany/implementation/java/xml/JavaImplementationConstants.java?view=diff&rev=525085&r1=525084&r2=525085
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/impl-java-xml/src/main/java/org/apache/tuscany/implementation/java/xml/JavaImplementationConstants.java (original)
+++ incubator/tuscany/java/sca/scdl4j/impl-java-xml/src/main/java/org/apache/tuscany/implementation/java/xml/JavaImplementationConstants.java Tue Apr 3 01:34:51 2007
@@ -20,7 +20,7 @@
import javax.xml.namespace.QName;
-import org.apache.tuscany.scdl.Constants;
+import org.apache.tuscany.assembly.xml.Constants;
public interface JavaImplementationConstants {
Modified: incubator/tuscany/java/sca/scdl4j/impl-java-xml/src/main/java/org/apache/tuscany/implementation/java/xml/JavaImplementationLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/impl-java-xml/src/main/java/org/apache/tuscany/implementation/java/xml/JavaImplementationLoader.java?view=diff&rev=525085&r1=525084&r2=525085
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/impl-java-xml/src/main/java/org/apache/tuscany/implementation/java/xml/JavaImplementationLoader.java (original)
+++ incubator/tuscany/java/sca/scdl4j/impl-java-xml/src/main/java/org/apache/tuscany/implementation/java/xml/JavaImplementationLoader.java Tue Apr 3 01:34:51 2007
@@ -24,9 +24,9 @@
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
+import org.apache.tuscany.assembly.xml.Loader;
import org.apache.tuscany.implementation.java.JavaImplementation;
import org.apache.tuscany.implementation.java.JavaImplementationFactory;
-import org.apache.tuscany.scdl.stax.Loader;
public class JavaImplementationLoader implements Loader<JavaImplementation>, JavaImplementationConstants {
Modified: incubator/tuscany/java/sca/scdl4j/impl-java-xml/src/test/java/org/apache/tuscany/implementation/java/xml/ReadTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/impl-java-xml/src/test/java/org/apache/tuscany/implementation/java/xml/ReadTestCase.java?view=diff&rev=525085&r1=525084&r2=525085
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/impl-java-xml/src/test/java/org/apache/tuscany/implementation/java/xml/ReadTestCase.java (original)
+++ incubator/tuscany/java/sca/scdl4j/impl-java-xml/src/test/java/org/apache/tuscany/implementation/java/xml/ReadTestCase.java Tue Apr 3 01:34:51 2007
@@ -33,14 +33,14 @@
import org.apache.tuscany.assembly.model.impl.DefaultAssemblyFactory;
import org.apache.tuscany.assembly.util.CompositeUtil;
import org.apache.tuscany.assembly.util.PrintUtil;
+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.LoaderRegistryImpl;
import org.apache.tuscany.implementation.java.impl.DefaultJavaImplementationFactory;
import org.apache.tuscany.policy.model.PolicyFactory;
import org.apache.tuscany.policy.model.impl.DefaultPolicyFactory;
-import org.apache.tuscany.scdl.stax.LoaderRegistry;
-import org.apache.tuscany.scdl.stax.impl.ComponentTypeLoader;
-import org.apache.tuscany.scdl.stax.impl.CompositeLoader;
-import org.apache.tuscany.scdl.stax.impl.ConstrainingTypeLoader;
-import org.apache.tuscany.scdl.stax.impl.LoaderRegistryImpl;
/**
* Test the usability of the assembly model API when loading SCDL
Modified: incubator/tuscany/java/sca/scdl4j/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/pom.xml?view=diff&rev=525085&r1=525084&r2=525085
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/pom.xml (original)
+++ incubator/tuscany/java/sca/scdl4j/pom.xml Tue Apr 3 01:34:51 2007
@@ -35,7 +35,6 @@
<module>idl</module>
<module>assembly</module>
<module>policy</module>
- <module>stax</module>
<module>assembly-xml</module>
<module>idl-java</module>
<module>idl-java-xml</module>
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org