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/10 02:57:12 UTC
svn commit: r526977 - in /incubator/tuscany/java/sca/modules:
assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/
binding-ws-xml/src/test/java/org/apache/tuscany/binding/ws/xml/
contribution-impl/src/main/java/org/apache/tuscany/services/contri...
Author: jsdelfino
Date: Mon Apr 9 17:57:11 2007
New Revision: 526977
URL: http://svn.apache.org/viewvc?view=rev&rev=526977
Log:
Cleaned up usage of ArtifactResolver. DefaultArtifactResolver does not extend HashMap anymore. Cleaned up test cases so that they don't dump models to system.out.
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/ResolveTestCase.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-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/contribution-impl/src/main/java/org/apache/tuscany/services/contribution/ContributionServiceImpl.java
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/spi/contribution/DefaultArtifactResolver.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/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/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/main/java/org/apache/tuscany/interfacedef/wsdl/xml/WSDLInterfaceProcessor.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/WriteTestCase.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=526977&r1=526976&r2=526977
==============================================================================
--- 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 Mon Apr 9 17:57:11 2007
@@ -144,7 +144,7 @@
assertNotNull(calcCallback);
// TODO test operations
- new PrintUtil(System.out).print(composite);
+ //new PrintUtil(System.out).print(composite);
}
public void testReadCompositeAndWireIt() throws Exception {
@@ -153,7 +153,7 @@
InputStream is = getClass().getResourceAsStream("TestAllDivide.composite");
Composite included = registry.read(is, Composite.class);
assertNotNull(included);
- resolver.put(included, included);
+ resolver.add(included);
is = getClass().getResourceAsStream("TestAllCalculator.composite");
Composite composite = registry.read(is, Composite.class);
@@ -173,7 +173,7 @@
ComponentReference addReference = calcComponent.getReferences().get(0);
assertEquals(addReference.getTargets().get(0), addComponent.getServices().get(0));
- new PrintUtil(System.out).print(composite);
+ //new PrintUtil(System.out).print(composite);
}
}
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=526977&r1=526976&r2=526977
==============================================================================
--- 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 Mon Apr 9 17:57:11 2007
@@ -69,7 +69,7 @@
URL url = getClass().getResource("CalculatorComponent.constrainingType");
ConstrainingType constrainingType = (ConstrainingType)registry.read(url);
assertNotNull(constrainingType);
- resolver.put(constrainingType, constrainingType);
+ resolver.add(constrainingType);
url = getClass().getResource("TestAllCalculator.composite");
Composite composite = (Composite)registry.read(url);
@@ -87,7 +87,7 @@
URL url = getClass().getResource("Calculator.composite");
Composite nestedComposite = (Composite)registry.read(url);
assertNotNull(nestedComposite);
- resolver.put(nestedComposite, nestedComposite);
+ resolver.add(nestedComposite);
url = getClass().getResource("TestAllCalculator.composite");
Composite composite = (Composite)registry.read(url);
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=526977&r1=526976&r2=526977
==============================================================================
--- 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 Mon Apr 9 17:57:11 2007
@@ -62,7 +62,7 @@
ConstrainingType constrainingType = constrainingTypeReader.read(reader);
is.close();
assertNotNull(constrainingType);
- resolver.put(constrainingType, constrainingType);
+ resolver.add(constrainingType);
is = getClass().getResourceAsStream("TestAllCalculator.composite");
CompositeProcessor compositeReader = new CompositeProcessor(registry);
@@ -86,7 +86,7 @@
Composite nestedComposite = compositeReader.read(reader);
is.close();
assertNotNull(nestedComposite);
- resolver.put(nestedComposite, nestedComposite);
+ resolver.add(nestedComposite);
is = getClass().getResourceAsStream("TestAllCalculator.composite");
compositeReader = new CompositeProcessor(registry);
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=526977&r1=526976&r2=526977
==============================================================================
--- 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 Mon Apr 9 17:57:11 2007
@@ -62,7 +62,7 @@
ConstrainingType constrainingType = constrainingTypeReader.read(reader);
is.close();
assertNotNull(constrainingType);
- resolver.put(constrainingType, constrainingType);
+ resolver.add(constrainingType);
is = getClass().getResourceAsStream("TestAllCalculator.composite");
CompositeProcessor compositeReader = new CompositeProcessor(registry);
@@ -87,7 +87,7 @@
Composite nestedComposite = compositeReader.read(reader);
is.close();
assertNotNull(nestedComposite);
- resolver.put(nestedComposite, nestedComposite);
+ resolver.add(nestedComposite);
is = getClass().getResourceAsStream("TestAllCalculator.composite");
compositeReader = new CompositeProcessor(registry);
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=526977&r1=526976&r2=526977
==============================================================================
--- 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 Mon Apr 9 17:57:11 2007
@@ -19,6 +19,7 @@
package org.apache.tuscany.assembly.xml;
+import java.io.ByteArrayOutputStream;
import java.io.InputStream;
import junit.framework.TestCase;
@@ -54,7 +55,8 @@
public void testReadWriteComposite() throws Exception {
InputStream is = getClass().getResourceAsStream("TestAllCalculator.composite");
Composite composite = registry.read(is, Composite.class);
- registry.write(composite, System.out);
+ ByteArrayOutputStream bos = new ByteArrayOutputStream();
+ registry.write(composite, bos);
}
public void testReadWireWriteComposite() throws Exception {
@@ -62,7 +64,8 @@
Composite composite = registry.read(is, Composite.class);
registry.resolve(composite, new DefaultArtifactResolver());
registry.wire(composite);
- registry.write(composite, System.out);
+ ByteArrayOutputStream bos = new ByteArrayOutputStream();
+ registry.write(composite, bos);
}
public void testReadWriteComponentType() throws Exception {
@@ -70,7 +73,8 @@
ComponentType componentType = registry.read(is, ComponentType.class);
registry.resolve(componentType, new DefaultArtifactResolver());
registry.wire(componentType);
- registry.write(componentType, System.out);
+ ByteArrayOutputStream bos = new ByteArrayOutputStream();
+ registry.write(componentType, bos);
}
public void testReadWriteConstrainingType() throws Exception {
@@ -78,7 +82,8 @@
ConstrainingType constrainingType = registry.read(is, ConstrainingType.class);
registry.resolve(constrainingType, new DefaultArtifactResolver());
registry.wire(constrainingType);
- registry.write(constrainingType, System.out);
+ ByteArrayOutputStream bos = new ByteArrayOutputStream();
+ registry.write(constrainingType, bos);
}
}
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=526977&r1=526976&r2=526977
==============================================================================
--- 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 Mon Apr 9 17:57:11 2007
@@ -64,7 +64,7 @@
ComponentType componentType = componentTypeProcessor.read(reader);
assertNotNull(componentType);
- new PrintUtil(System.out).print(componentType);
+ //new PrintUtil(System.out).print(componentType);
}
public void testReadComposite() throws Exception {
@@ -76,7 +76,7 @@
new CompositeUtil(composite).configure(null);
- new PrintUtil(System.out).print(composite);
+ //new PrintUtil(System.out).print(composite);
}
}
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=526977&r1=526976&r2=526977
==============================================================================
--- 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 Mon Apr 9 17:57:11 2007
@@ -19,6 +19,7 @@
package org.apache.tuscany.binding.ws.xml;
+import java.io.ByteArrayOutputStream;
import java.io.InputStream;
import javax.xml.stream.XMLInputFactory;
@@ -63,14 +64,16 @@
InputStream is = getClass().getResourceAsStream("CalculatorImpl.componentType");
ComponentType componentType = registry.read(is, ComponentType.class);
assertNotNull(componentType);
- registry.write(componentType, System.out);
+ ByteArrayOutputStream bos = new ByteArrayOutputStream();
+ registry.write(componentType, bos);
}
public void testReadWriteComposite() throws Exception {
InputStream is = getClass().getResourceAsStream("Calculator.composite");
Composite composite = registry.read(is, Composite.class);
assertNotNull(composite);
- registry.write(composite, System.out);
+ ByteArrayOutputStream bos = new ByteArrayOutputStream();
+ registry.write(composite, bos);
}
}
Modified: incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/services/contribution/ContributionServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/services/contribution/ContributionServiceImpl.java?view=diff&rev=526977&r1=526976&r2=526977
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/services/contribution/ContributionServiceImpl.java (original)
+++ incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/services/contribution/ContributionServiceImpl.java Mon Apr 9 17:57:11 2007
@@ -269,7 +269,7 @@
Object model = this.artifactProcessor.read(artifactURL);
if (model != null) {
- ((DefaultArtifactResolver)artifactResolver).put(model,model);
+ artifactResolver.add(model);
URI artifactURI = contribution.getUri().resolve(a);
DeployedArtifact artifact = new DeployedArtifact(artifactURI);
Modified: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/spi/contribution/DefaultArtifactResolver.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/spi/contribution/DefaultArtifactResolver.java?view=diff&rev=526977&r1=526976&r2=526977
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/spi/contribution/DefaultArtifactResolver.java (original)
+++ incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/spi/contribution/DefaultArtifactResolver.java Mon Apr 9 17:57:11 2007
@@ -20,17 +20,20 @@
package org.apache.tuscany.services.spi.contribution;
import java.util.HashMap;
+import java.util.Map;
/**
* A default implementation of an artifact resolver, based on a map.
*
* @version $Rev$ $Date$
*/
-public class DefaultArtifactResolver extends HashMap<Object, Object> implements ArtifactResolver {
+public class DefaultArtifactResolver implements ArtifactResolver {
private static final long serialVersionUID = -7826976465762296634L;
+
+ private Map<Object, Object> map = new HashMap<Object, Object>();
public <T> T resolve(Class<T> modelClass, T unresolved) {
- Object resolved = get(unresolved);
+ Object resolved = map.get(unresolved);
if (resolved != null) {
// If the resolved object is an artifact resolver then delegate the
@@ -54,7 +57,11 @@
}
public void add(Object resolved) {
- super.put(resolved, resolved);
+ map.put(resolved, resolved);
+ }
+
+ public Object remove(Object resolved) {
+ return map.remove(resolved);
}
}
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=526977&r1=526976&r2=526977
==============================================================================
--- 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 Mon Apr 9 17:57:11 2007
@@ -59,7 +59,7 @@
// Parse the composite file
InputStream is = getClass().getClassLoader().getResourceAsStream(compositeFile);
Composite composite = registry.read(is, Composite.class);
- resolver.put(composite, composite);
+ resolver.add(composite);
// Resolve and configure the composite
compositeProcessor.resolve(composite, resolver);
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=526977&r1=526976&r2=526977
==============================================================================
--- 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 Mon Apr 9 17:57:11 2007
@@ -74,7 +74,7 @@
// Parse the composite file
InputStream is = getClass().getClassLoader().getResourceAsStream(compositeFile);
Composite composite = registry.read(is, Composite.class);
- resolver.put(composite, composite);
+ resolver.add(composite);
// Resolve and configure the composite
compositeProcessor.resolve(composite, resolver);
Modified: incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/implementation/java/xml/ReadTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/implementation/java/xml/ReadTestCase.java?view=diff&rev=526977&r1=526976&r2=526977
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/implementation/java/xml/ReadTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/implementation/java/xml/ReadTestCase.java Mon Apr 9 17:57:11 2007
@@ -64,7 +64,7 @@
new CompositeUtil(composite).configure(null);
- new PrintUtil(System.out).print(composite);
+ //new PrintUtil(System.out).print(composite);
}
}
Modified: incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/implementation/java/xml/WriteTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/implementation/java/xml/WriteTestCase.java?view=diff&rev=526977&r1=526976&r2=526977
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/implementation/java/xml/WriteTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/implementation/java/xml/WriteTestCase.java Mon Apr 9 17:57:11 2007
@@ -19,6 +19,7 @@
package org.apache.tuscany.implementation.java.xml;
+import java.io.ByteArrayOutputStream;
import java.io.InputStream;
import javax.xml.stream.XMLInputFactory;
@@ -62,7 +63,8 @@
InputStream is = getClass().getResourceAsStream("Calculator.composite");
Composite composite = registry.read(is, Composite.class);
assertNotNull(composite);
- registry.write(composite, System.out);
+ ByteArrayOutputStream bos = new ByteArrayOutputStream();
+ registry.write(composite, bos);
}
}
Modified: incubator/tuscany/java/sca/modules/interface-java-xml/src/test/java/org/apache/tuscany/interfacedef/java/xml/ReadTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/interface-java-xml/src/test/java/org/apache/tuscany/interfacedef/java/xml/ReadTestCase.java?view=diff&rev=526977&r1=526976&r2=526977
==============================================================================
--- incubator/tuscany/java/sca/modules/interface-java-xml/src/test/java/org/apache/tuscany/interfacedef/java/xml/ReadTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/interface-java-xml/src/test/java/org/apache/tuscany/interfacedef/java/xml/ReadTestCase.java Mon Apr 9 17:57:11 2007
@@ -67,7 +67,7 @@
ComponentType componentType = componentTypeReader.read(reader);
assertNotNull(componentType);
- new PrintUtil(System.out).print(componentType);
+ //new PrintUtil(System.out).print(componentType);
}
public void testReadConstrainingType() throws Exception {
@@ -77,7 +77,7 @@
ConstrainingType constrainingType = constrainingTypeProcessor.read(reader);
assertNotNull(constrainingType);
- new PrintUtil(System.out).print(constrainingType);
+ //new PrintUtil(System.out).print(constrainingType);
}
public void testReadComposite() throws Exception {
@@ -89,7 +89,7 @@
new CompositeUtil(composite).configure(null);
- new PrintUtil(System.out).print(composite);
+ //new PrintUtil(System.out).print(composite);
}
}
Modified: incubator/tuscany/java/sca/modules/interface-java-xml/src/test/java/org/apache/tuscany/interfacedef/java/xml/WriteTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/interface-java-xml/src/test/java/org/apache/tuscany/interfacedef/java/xml/WriteTestCase.java?view=diff&rev=526977&r1=526976&r2=526977
==============================================================================
--- incubator/tuscany/java/sca/modules/interface-java-xml/src/test/java/org/apache/tuscany/interfacedef/java/xml/WriteTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/interface-java-xml/src/test/java/org/apache/tuscany/interfacedef/java/xml/WriteTestCase.java Mon Apr 9 17:57:11 2007
@@ -19,6 +19,7 @@
package org.apache.tuscany.interfacedef.java.xml;
+import java.io.ByteArrayOutputStream;
import java.io.InputStream;
import javax.xml.stream.XMLInputFactory;
@@ -64,21 +65,24 @@
InputStream is = getClass().getResourceAsStream("CalculatorImpl.componentType");
ComponentType componentType = registry.read(is, ComponentType.class);
assertNotNull(componentType);
- registry.write(componentType, System.out);
+ ByteArrayOutputStream bos = new ByteArrayOutputStream();
+ registry.write(componentType, bos);
}
public void testReadWriteConstrainingType() throws Exception {
InputStream is = getClass().getResourceAsStream("CalculatorComponent.constrainingType");
ConstrainingType constrainingType = registry.read(is, ConstrainingType.class);
assertNotNull(constrainingType);
- registry.write(constrainingType, System.out);
+ ByteArrayOutputStream bos = new ByteArrayOutputStream();
+ registry.write(constrainingType, bos);
}
public void testReadWriteComposite() throws Exception {
InputStream is = getClass().getResourceAsStream("Calculator.composite");
Composite composite = registry.read(is, Composite.class);
assertNotNull(composite);
- registry.write(composite, System.out);
+ ByteArrayOutputStream bos = new ByteArrayOutputStream();
+ registry.write(composite, bos);
}
}
Modified: incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java?view=diff&rev=526977&r1=526976&r2=526977
==============================================================================
--- incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java Mon Apr 9 17:57:11 2007
@@ -110,8 +110,7 @@
}
}
- public void resolve(WSDLInterface model, ArtifactResolver resolver) throws ContributionResolveException {
- // TODO Auto-generated method stub
+ public void resolve(WSDLInterface wsdlInterface, ArtifactResolver resolver) throws ContributionResolveException {
}
public void wire(WSDLInterface model) throws ContributionWireException {
Modified: incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/interfacedef/wsdl/xml/ReadTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/interfacedef/wsdl/xml/ReadTestCase.java?view=diff&rev=526977&r1=526976&r2=526977
==============================================================================
--- incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/interfacedef/wsdl/xml/ReadTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/interfacedef/wsdl/xml/ReadTestCase.java Mon Apr 9 17:57:11 2007
@@ -67,7 +67,7 @@
ComponentType componentType = componentTypeProcessor.read(reader);
assertNotNull(componentType);
- new PrintUtil(System.out).print(componentType);
+ //new PrintUtil(System.out).print(componentType);
}
public void testReadConstrainingType() throws Exception {
@@ -77,7 +77,7 @@
ConstrainingType constrainingType = constrainingTypeProcessor.read(reader);
assertNotNull(constrainingType);
- new PrintUtil(System.out).print(constrainingType);
+ //new PrintUtil(System.out).print(constrainingType);
}
public void testReadComposite() throws Exception {
@@ -89,7 +89,7 @@
new CompositeUtil(composite).configure(null);
- new PrintUtil(System.out).print(composite);
+ //new PrintUtil(System.out).print(composite);
}
}
Modified: incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/interfacedef/wsdl/xml/WriteTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/interfacedef/wsdl/xml/WriteTestCase.java?view=diff&rev=526977&r1=526976&r2=526977
==============================================================================
--- incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/interfacedef/wsdl/xml/WriteTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/interfacedef/wsdl/xml/WriteTestCase.java Mon Apr 9 17:57:11 2007
@@ -19,6 +19,7 @@
package org.apache.tuscany.interfacedef.wsdl.xml;
+import java.io.ByteArrayOutputStream;
import java.io.InputStream;
import javax.xml.stream.XMLInputFactory;
@@ -64,21 +65,24 @@
InputStream is = getClass().getResourceAsStream("CalculatorImpl.componentType");
ComponentType componentType = registry.read(is, ComponentType.class);
assertNotNull(componentType);
- registry.write(componentType, System.out);
+ ByteArrayOutputStream bos = new ByteArrayOutputStream();
+ registry.write(componentType, bos);
}
public void testReadWriteConstrainingType() throws Exception {
InputStream is = getClass().getResourceAsStream("CalculatorComponent.constrainingType");
ConstrainingType constrainingType = registry.read(is, ConstrainingType.class);
assertNotNull(constrainingType);
- registry.write(constrainingType, System.out);
+ ByteArrayOutputStream bos = new ByteArrayOutputStream();
+ registry.write(constrainingType, bos);
}
public void testReadWriteComposite() throws Exception {
InputStream is = getClass().getResourceAsStream("Calculator.composite");
Composite composite = registry.read(is, Composite.class);
assertNotNull(composite);
- registry.write(composite, System.out);
+ ByteArrayOutputStream bos = new ByteArrayOutputStream();
+ registry.write(composite, bos);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org