You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by me...@apache.org on 2007/03/10 14:21:22 UTC
svn commit: r516705 - in /incubator/tuscany/java/sca/kernel/core/src:
main/java/org/apache/tuscany/core/marshaller/
main/java/org/apache/tuscany/core/marshaller/extensions/
main/java/org/apache/tuscany/core/marshaller/extensions/java/
test/java/org/apa...
Author: meerajk
Date: Sat Mar 10 05:21:21 2007
New Revision: 516705
URL: http://svn.apache.org/viewvc?view=rev&rev=516705
Log:
completed marshalling side of the marshalling framework
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/PhysicalChangeSetMarshaller.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/PhysicalOperationDefinitionMarshaller.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/PhysicalWireDefinitionMarshaller.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/extensions/AbstractPhysicalComponentDefinitionMarshaller.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/extensions/AbstractPhysicalReferenceDefinitionMarshaller.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/extensions/AbstractPhysicalServiceDefinitionMarshaller.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/extensions/java/JavaPhysicalComponentDefinitionMarshaller.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/extensions/java/JavaPhysicalReferenceDefinitionMarshaller.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/extensions/java/JavaPhysicalServiceDefinitionMarshaller.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/marshaller/JavaPhysicalChangeSetMarshallerTest.java
incubator/tuscany/java/sca/kernel/core/src/test/resources/marshall/javaChangeSet.xml
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/PhysicalChangeSetMarshaller.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/PhysicalChangeSetMarshaller.java?view=diff&rev=516705&r1=516704&r2=516705
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/PhysicalChangeSetMarshaller.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/PhysicalChangeSetMarshaller.java Sat Mar 10 05:21:21 2007
@@ -40,8 +40,14 @@
*/
public class PhysicalChangeSetMarshaller extends AbstractMarshallerExtension<PhysicalChangeSet> {
+ // Core marshaller namespace
+ public static final String CORE_NS = "http://tuscany.apache.org/xmlns/marshaller/1.0-SNAPSHOT";
+
+ // Core marshaller prefix
+ public static final String CORE_PREFIX = "core";
+
// QName for the root element
- public static final QName QNAME = new QName("http://tuscany.apache.org/xmlns/marshaller/1.0-SNAPSHOT", "changeSet");
+ public static final QName QNAME = new QName(CORE_NS, "changeSet", CORE_PREFIX);
// Local part for wire
private static final String WIRE = "wire";
@@ -53,7 +59,23 @@
* Marshalls a physical change set to the xml writer.
*/
public void marshal(PhysicalChangeSet modelObject, XMLStreamWriter writer) throws MarshalException {
- throw new UnsupportedOperationException();
+
+ try {
+ writer.writeStartDocument();
+ writer.writeStartElement(QNAME.getPrefix(), QNAME.getLocalPart(), QNAME.getNamespaceURI());
+ writer.writeNamespace(CORE_PREFIX, CORE_NS);
+ for(PhysicalComponentDefinition pcd : modelObject.getComponentDefinitions()) {
+ registry.marshall(pcd, writer);
+ }
+ for(PhysicalWireDefinition pcd : modelObject.getWireDefinitions()) {
+ registry.marshall(pcd, writer);
+ }
+ writer.writeEndElement();
+ writer.writeEndDocument();
+ } catch (XMLStreamException ex) {
+ throw new MarshalException(ex);
+ }
+
}
/**
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/PhysicalOperationDefinitionMarshaller.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/PhysicalOperationDefinitionMarshaller.java?view=diff&rev=516705&r1=516704&r2=516705
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/PhysicalOperationDefinitionMarshaller.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/PhysicalOperationDefinitionMarshaller.java Sat Mar 10 05:21:21 2007
@@ -29,6 +29,9 @@
import org.apache.tuscany.spi.marshaller.MarshalException;
import org.apache.tuscany.spi.model.physical.PhysicalOperationDefinition;
+import static org.apache.tuscany.core.marshaller.PhysicalChangeSetMarshaller.CORE_NS;
+import static org.apache.tuscany.core.marshaller.PhysicalChangeSetMarshaller.CORE_PREFIX;
+
/**
* Marshaller for physical operation definition.
*
@@ -40,6 +43,9 @@
// Operation name attribute
private static final String NAME = "name";
+ // Callback attribute
+ private static final String CALLBACK = "callback";
+
// Return
private static final String RETURN_TYPE = "returnType";
@@ -48,14 +54,30 @@
// QName for the root element
- private static final QName QNAME =
- new QName("http://tuscany.apache.org/xmlns/marshaller/1.0-SNAPSHOT", "operation");
+ private static final QName QNAME = new QName(CORE_NS, "operation", CORE_PREFIX);
/**
* Marshalls a physical operation to the xml writer.
*/
public void marshal(PhysicalOperationDefinition modelObject, XMLStreamWriter writer) throws MarshalException {
- throw new UnsupportedOperationException();
+
+ try {
+ writer.writeStartElement(QNAME.getPrefix(), QNAME.getLocalPart(), QNAME.getNamespaceURI());
+ writer.writeAttribute(NAME, modelObject.getName());
+ writer.writeAttribute(CALLBACK, String.valueOf(modelObject.isCallback()));
+ writer.writeStartElement(QNAME.getPrefix(), RETURN_TYPE, QNAME.getNamespaceURI());
+ writer.writeCharacters(modelObject.getReturnType());
+ writer.writeEndElement();
+ for(String parameter : modelObject.getParameters()) {
+ writer.writeStartElement(QNAME.getPrefix(), PARAMETER, QNAME.getNamespaceURI());
+ writer.writeCharacters(parameter);
+ writer.writeEndElement();
+ }
+ writer.writeEndElement();
+ } catch (XMLStreamException ex) {
+ throw new MarshalException(ex);
+ }
+
}
/**
@@ -66,7 +88,7 @@
try {
PhysicalOperationDefinition operation = new PhysicalOperationDefinition();
operation.setName(reader.getAttributeValue(null, NAME));
- operation.setCallback(Boolean.valueOf(reader.getAttributeValue(null, NAME)));
+ operation.setCallback(Boolean.valueOf(reader.getAttributeValue(null, CALLBACK)));
while (true) {
switch (reader.next()) {
case START_ELEMENT:
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/PhysicalWireDefinitionMarshaller.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/PhysicalWireDefinitionMarshaller.java?view=diff&rev=516705&r1=516704&r2=516705
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/PhysicalWireDefinitionMarshaller.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/PhysicalWireDefinitionMarshaller.java Sat Mar 10 05:21:21 2007
@@ -34,6 +34,9 @@
import org.apache.tuscany.spi.model.physical.PhysicalOperationDefinition;
import org.apache.tuscany.spi.model.physical.PhysicalWireDefinition;
+import static org.apache.tuscany.core.marshaller.PhysicalChangeSetMarshaller.CORE_NS;
+import static org.apache.tuscany.core.marshaller.PhysicalChangeSetMarshaller.CORE_PREFIX;
+
/**
* Marshaller for physical wire definition.
*
@@ -49,13 +52,25 @@
private static final String TARGET_URI = "targetUri";
// QName for the root element
- private static final QName QNAME = new QName("http://tuscany.apache.org/xmlns/marshaller/1.0-SNAPSHOT", "wire");
+ private static final QName QNAME = new QName(CORE_NS, "wire", CORE_PREFIX);
/**
* Marshalls a physical wire to the xml writer.
*/
public void marshal(PhysicalWireDefinition modelObject, XMLStreamWriter writer) throws MarshalException {
- throw new UnsupportedOperationException();
+
+ try {
+ writer.writeStartElement(QNAME.getPrefix(), QNAME.getLocalPart(), QNAME.getNamespaceURI());
+ writer.writeAttribute(SOURCE_URI, modelObject.getSourceUri().toASCIIString());
+ writer.writeAttribute(TARGET_URI, modelObject.getTargetUri().toASCIIString());
+ for(PhysicalOperationDefinition pod : modelObject.getOperations()) {
+ registry.marshall(pod, writer);
+ }
+ writer.writeEndElement();
+ } catch (XMLStreamException ex) {
+ throw new MarshalException(ex);
+ }
+
}
/**
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/extensions/AbstractPhysicalComponentDefinitionMarshaller.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/extensions/AbstractPhysicalComponentDefinitionMarshaller.java?view=diff&rev=516705&r1=516704&r2=516705
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/extensions/AbstractPhysicalComponentDefinitionMarshaller.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/extensions/AbstractPhysicalComponentDefinitionMarshaller.java Sat Mar 10 05:21:21 2007
@@ -24,6 +24,7 @@
import java.net.URI;
import java.net.URISyntaxException;
+import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLStreamWriter;
@@ -55,7 +56,29 @@
* Marshalls a physical change set to the xml writer.
*/
public final void marshal(PCD modelObject, XMLStreamWriter writer) throws MarshalException {
- throw new UnsupportedOperationException();
+
+ try {
+
+ QName qname = getModelObjectQName();
+ writer.writeStartElement(qname.getPrefix(), qname.getLocalPart(), qname.getNamespaceURI());
+ writer.writeAttribute(COMPONENT_ID, modelObject.getComponentId().toASCIIString());
+ writer.writeNamespace(qname.getPrefix(), qname.getNamespaceURI());
+
+ for(PhysicalReferenceDefinition prd : modelObject.getReferences()) {
+ registry.marshall(prd, writer);
+ }
+ for(PhysicalServiceDefinition psd : modelObject.getServices()) {
+ registry.marshall(psd, writer);
+ }
+
+ handleExtension(modelObject, writer);
+
+ writer.writeEndElement();
+
+ } catch (XMLStreamException ex) {
+ throw new MarshalException(ex);
+ }
+
}
/**
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/extensions/AbstractPhysicalReferenceDefinitionMarshaller.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/extensions/AbstractPhysicalReferenceDefinitionMarshaller.java?view=diff&rev=516705&r1=516704&r2=516705
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/extensions/AbstractPhysicalReferenceDefinitionMarshaller.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/extensions/AbstractPhysicalReferenceDefinitionMarshaller.java Sat Mar 10 05:21:21 2007
@@ -21,6 +21,7 @@
import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;
import static javax.xml.stream.XMLStreamConstants.START_ELEMENT;
+import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLStreamWriter;
@@ -48,7 +49,25 @@
* Marshalls a physical java reference definition to the xml writer.
*/
public void marshal(PRD modelObject, XMLStreamWriter writer) throws MarshalException {
- throw new UnsupportedOperationException();
+
+ try {
+
+ QName qname = getModelObjectQName();
+ writer.writeStartElement(qname.getPrefix(), qname.getLocalPart(), qname.getNamespaceURI());
+ writer.writeAttribute(NAME, modelObject.getName());
+
+ for(PhysicalOperationDefinition pod : modelObject.getOperations()) {
+ registry.marshall(pod, writer);
+ }
+
+ handleExtension(modelObject, writer);
+
+ writer.writeEndElement();
+
+ } catch (XMLStreamException ex) {
+ throw new MarshalException(ex);
+ }
+
}
/**
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/extensions/AbstractPhysicalServiceDefinitionMarshaller.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/extensions/AbstractPhysicalServiceDefinitionMarshaller.java?view=diff&rev=516705&r1=516704&r2=516705
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/extensions/AbstractPhysicalServiceDefinitionMarshaller.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/extensions/AbstractPhysicalServiceDefinitionMarshaller.java Sat Mar 10 05:21:21 2007
@@ -21,6 +21,7 @@
import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;
import static javax.xml.stream.XMLStreamConstants.START_ELEMENT;
+import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLStreamWriter;
@@ -48,7 +49,25 @@
* Marshalls a physical java reference definition to the xml writer.
*/
public void marshal(PSD modelObject, XMLStreamWriter writer) throws MarshalException {
- throw new UnsupportedOperationException();
+
+ try {
+
+ QName qname = getModelObjectQName();
+ writer.writeStartElement(qname.getPrefix(), qname.getLocalPart(), qname.getNamespaceURI());
+ writer.writeAttribute(NAME, modelObject.getName());
+
+ for(PhysicalOperationDefinition pod : modelObject.getOperations()) {
+ registry.marshall(pod, writer);
+ }
+
+ handleExtension(modelObject, writer);
+
+ writer.writeEndElement();
+
+ } catch (XMLStreamException ex) {
+ throw new MarshalException(ex);
+ }
+
}
/**
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/extensions/java/JavaPhysicalComponentDefinitionMarshaller.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/extensions/java/JavaPhysicalComponentDefinitionMarshaller.java?view=diff&rev=516705&r1=516704&r2=516705
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/extensions/java/JavaPhysicalComponentDefinitionMarshaller.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/extensions/java/JavaPhysicalComponentDefinitionMarshaller.java Sat Mar 10 05:21:21 2007
@@ -29,8 +29,6 @@
import org.apache.commons.codec.binary.Base64;
import org.apache.tuscany.core.marshaller.extensions.AbstractPhysicalComponentDefinitionMarshaller;
import org.apache.tuscany.core.model.physical.java.JavaPhysicalComponentDefinition;
-import org.apache.tuscany.core.model.physical.java.JavaPhysicalReferenceDefinition;
-import org.apache.tuscany.core.model.physical.java.JavaPhysicalServiceDefinition;
import org.apache.tuscany.spi.marshaller.MarshalException;
import org.apache.tuscany.spi.model.Scope;
@@ -43,6 +41,12 @@
public class JavaPhysicalComponentDefinitionMarshaller extends
AbstractPhysicalComponentDefinitionMarshaller<JavaPhysicalComponentDefinition> {
+ // Core marshaller namespace
+ public static final String JAVA_NS = "http://tuscany.apache.org/xmlns/marshaller/java/1.0-SNAPSHOT";
+
+ // Core marshaller prefix
+ public static final String JAVA_PREFIX = "java";
+
// Instance factory
private static final String INSTANCE_FACTORY = "instanceFactory";
@@ -54,7 +58,7 @@
// QName for the root element
private static final QName QNAME =
- new QName("http://tuscany.apache.org/xmlns/marshaller/java/1.0-SNAPSHOT", "component");
+ new QName(JAVA_NS, "component", JAVA_PREFIX);
/**
* Gets the qualified name of the XML fragment for the marshalled model
@@ -120,30 +124,6 @@
}
/**
- * Handles a reference.
- *
- * @param componentDefinition Component definition.
- * @param reader XML stream.
- */
- protected void handleReference(JavaPhysicalComponentDefinition componentDefinition, XMLStreamReader reader)
- throws MarshalException {
- JavaPhysicalReferenceDefinition reference = (JavaPhysicalReferenceDefinition)registry.unmarshall(reader);
- componentDefinition.addReference(reference);
- }
-
- /**
- * Handles a reference.
- *
- * @param componentDefinition Component definition.
- * @param reader XML stream.
- */
- protected void handleService(JavaPhysicalComponentDefinition componentDefinition, XMLStreamReader reader)
- throws MarshalException {
- JavaPhysicalServiceDefinition service = (JavaPhysicalServiceDefinition)registry.unmarshall(reader);
- componentDefinition.addService(service);
- }
-
- /**
* Handles extensions for marshalling Java physical component definitions
* including the marshalling of base64 encoded instance factory byte code.
*
@@ -151,7 +131,24 @@
* @param reader Writer to which marshalled data is written.
*/
@Override
- protected void handleExtension(JavaPhysicalComponentDefinition componentDefinition, XMLStreamWriter writer) {
+ protected void handleExtension(JavaPhysicalComponentDefinition componentDefinition, XMLStreamWriter writer)
+ throws MarshalException {
+ try {
+
+ writer.writeStartElement(QNAME.getPrefix(), INSTANCE_FACTORY, QNAME.getNamespaceURI());
+ writer.writeCharacters(new String(Base64.encodeBase64(componentDefinition.getInstanceFactoryByteCode())));
+ writer.writeEndElement();
+ writer.writeStartElement(QNAME.getPrefix(), SCOPE, QNAME.getNamespaceURI());
+ writer.writeCharacters(componentDefinition.getScope().toString());
+ writer.writeEndElement();
+ writer.writeStartElement(QNAME.getPrefix(), CLASSLOADER_ID, QNAME.getNamespaceURI());
+ writer.writeCharacters(componentDefinition.getClassLoaderId().toASCIIString());
+ writer.writeEndElement();
+
+ } catch (XMLStreamException ex) {
+ throw new MarshalException(ex);
+ }
+
}
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/extensions/java/JavaPhysicalReferenceDefinitionMarshaller.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/extensions/java/JavaPhysicalReferenceDefinitionMarshaller.java?view=diff&rev=516705&r1=516704&r2=516705
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/extensions/java/JavaPhysicalReferenceDefinitionMarshaller.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/extensions/java/JavaPhysicalReferenceDefinitionMarshaller.java Sat Mar 10 05:21:21 2007
@@ -18,6 +18,9 @@
*/
package org.apache.tuscany.core.marshaller.extensions.java;
+import static org.apache.tuscany.core.marshaller.extensions.java.JavaPhysicalComponentDefinitionMarshaller.JAVA_NS;
+import static org.apache.tuscany.core.marshaller.extensions.java.JavaPhysicalComponentDefinitionMarshaller.JAVA_PREFIX;
+
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLStreamWriter;
@@ -35,8 +38,7 @@
AbstractPhysicalReferenceDefinitionMarshaller<JavaPhysicalReferenceDefinition> {
// QName for the root element
- private static final QName QNAME =
- new QName("http://tuscany.apache.org/xmlns/marshaller/java/1.0-SNAPSHOT", "reference");
+ private static final QName QNAME = new QName(JAVA_NS, "reference", JAVA_PREFIX);
/**
* Gets the qualified name of the XML fragment for the marshalled model
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/extensions/java/JavaPhysicalServiceDefinitionMarshaller.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/extensions/java/JavaPhysicalServiceDefinitionMarshaller.java?view=diff&rev=516705&r1=516704&r2=516705
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/extensions/java/JavaPhysicalServiceDefinitionMarshaller.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/extensions/java/JavaPhysicalServiceDefinitionMarshaller.java Sat Mar 10 05:21:21 2007
@@ -18,6 +18,9 @@
*/
package org.apache.tuscany.core.marshaller.extensions.java;
+import static org.apache.tuscany.core.marshaller.extensions.java.JavaPhysicalComponentDefinitionMarshaller.JAVA_NS;
+import static org.apache.tuscany.core.marshaller.extensions.java.JavaPhysicalComponentDefinitionMarshaller.JAVA_PREFIX;
+
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLStreamWriter;
@@ -35,9 +38,8 @@
AbstractPhysicalServiceDefinitionMarshaller<JavaPhysicalServiceDefinition> {
// QName for the root element
- private static final QName QNAME =
- new QName("http://tuscany.apache.org/xmlns/marshaller/java/1.0-SNAPSHOT", "service");
-
+ private static final QName QNAME = new QName(JAVA_NS, "service", JAVA_PREFIX);
+
/**
* Gets the qualified name of the XML fragment for the marshalled model
* object.
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/marshaller/JavaPhysicalChangeSetMarshallerTest.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/marshaller/JavaPhysicalChangeSetMarshallerTest.java?view=diff&rev=516705&r1=516704&r2=516705
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/marshaller/JavaPhysicalChangeSetMarshallerTest.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/marshaller/JavaPhysicalChangeSetMarshallerTest.java Sat Mar 10 05:21:21 2007
@@ -19,11 +19,16 @@
package org.apache.tuscany.core.marshaller;
import static javax.xml.stream.XMLStreamConstants.START_ELEMENT;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
import java.io.InputStream;
import java.util.Set;
import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLOutputFactory;
import javax.xml.stream.XMLStreamReader;
+import javax.xml.stream.XMLStreamWriter;
import junit.framework.TestCase;
@@ -73,6 +78,31 @@
}
}
+
+ public void testMarshall() throws Exception {
+
+ ClassLoader cl = getClass().getClassLoader();
+ InputStream inputStream = cl.getResourceAsStream("marshall/javaChangeSet.xml");
+ XMLStreamReader reader = XMLInputFactory.newInstance().createXMLStreamReader(inputStream);
+
+ while(reader.next() != START_ELEMENT) {
+ }
+ PhysicalChangeSet changeSet = (PhysicalChangeSet)registry.unmarshall(reader);
+
+ ByteArrayOutputStream out = new ByteArrayOutputStream();
+ XMLStreamWriter writer = XMLOutputFactory.newInstance().createXMLStreamWriter(out);
+ registry.marshall(changeSet, writer);
+
+ byte[] xml = out.toByteArray();
+ inputStream = new ByteArrayInputStream(xml);
+ reader = XMLInputFactory.newInstance().createXMLStreamReader(inputStream);
+
+ while(reader.next() != START_ELEMENT) {
+ }
+ changeSet = (PhysicalChangeSet)registry.unmarshall(reader);
+ verifyChangeSet(changeSet);
+
+ }
public void testUnmarshall() throws Exception {
@@ -83,6 +113,13 @@
while(reader.next() != START_ELEMENT) {
}
PhysicalChangeSet changeSet = (PhysicalChangeSet)registry.unmarshall(reader);
+ verifyChangeSet(changeSet);
+
+
+ }
+
+ private void verifyChangeSet(PhysicalChangeSet changeSet) {
+
assertNotNull(changeSet);
Set<? extends PhysicalComponentDefinition> pcds = changeSet.getComponentDefinitions();
assertEquals(2, pcds.size());
@@ -161,7 +198,6 @@
assertEquals("op1", pod.getName());
}
}
-
}
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/resources/marshall/javaChangeSet.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/resources/marshall/javaChangeSet.xml?view=diff&rev=516705&r1=516704&r2=516705
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/resources/marshall/javaChangeSet.xml (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/resources/marshall/javaChangeSet.xml Sat Mar 10 05:21:21 2007
@@ -63,12 +63,20 @@
<!-- Wire 1 -->
<core:wire sourceUri="cmp1#rf1" targetUri="cmp2#sv2">
- <core:operation name="op2"/>
+ <core:operation name="op2">
+ <core:parameter>java.lang.String</core:parameter>
+ <core:parameter>java.lang.Long</core:parameter>
+ <core:returnType>java.lang.Object</core:returnType>
+ </core:operation>
</core:wire>
<!-- Wire 2 -->
<core:wire sourceUri="cmp2#rf2" targetUri="cmp1#sv1">
- <core:operation name="op1"/>
+ <core:operation name="op1">
+ <core:parameter>java.lang.String</core:parameter>
+ <core:parameter>java.lang.Long</core:parameter>
+ <core:returnType>java.lang.Object</core:returnType>
+ </core:operation>
</core:wire>
</core:changeSet>
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org