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/03 17:41:25 UTC
svn commit: r514185 - in /incubator/tuscany/java/sca/kernel/core/src:
main/java/org/apache/tuscany/core/marshaller/extensions/
main/java/org/apache/tuscany/core/marshaller/extensions/java/
test/java/org/apache/tuscany/core/marshaller/
Author: meerajk
Date: Sat Mar 3 08:41:22 2007
New Revision: 514185
URL: http://svn.apache.org/viewvc?view=rev&rev=514185
Log:
fixed defect
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/extensions/AbstractExtensibleMarshallerExtension.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
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/extensions/AbstractExtensibleMarshallerExtension.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/extensions/AbstractExtensibleMarshallerExtension.java?view=diff&rev=514185&r1=514184&r2=514185
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/extensions/AbstractExtensibleMarshallerExtension.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/extensions/AbstractExtensibleMarshallerExtension.java Sat Mar 3 08:41:22 2007
@@ -44,13 +44,13 @@
* @param modelObject Concrete model object.
* @param reader Reader from which marshalled data is read.
*/
- protected abstract void handleExtensions(MD modelObject, XMLStreamReader reader);
+ protected abstract void handleExtension(MD modelObject, XMLStreamReader reader);
/**
* Handles extensions for marshalling.
* @param modelObject Concrete model object.
* @param reader Writer to which marshalled data is written.
*/
- protected abstract void handleExtensions(MD modelObject, XMLStreamWriter writer);
+ protected abstract void handleExtension(MD modelObject, XMLStreamWriter writer);
}
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=514185&r1=514184&r2=514185
==============================================================================
--- 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 3 08:41:22 2007
@@ -29,17 +29,15 @@
import javax.xml.stream.XMLStreamWriter;
import org.apache.tuscany.spi.marshaller.MarshallException;
-import org.apache.tuscany.spi.model.ModelObject;
import org.apache.tuscany.spi.model.physical.PhysicalComponentDefinition;
-import org.apache.tuscany.spi.model.physical.PhysicalReferenceDefinition;
-import org.apache.tuscany.spi.model.physical.PhysicalServiceDefinition;
/**
* Abstract super class for all PCD marshallers.
*
* @version $Revision$ $Date$
*/
-public abstract class AbstractPhysicalComponentDefinitionMarshaller<PCD extends PhysicalComponentDefinition> extends AbstractExtensibleMarshallerExtension<PCD> {
+public abstract class AbstractPhysicalComponentDefinitionMarshaller<PCD extends PhysicalComponentDefinition<?, ?>>
+ extends AbstractExtensibleMarshallerExtension<PCD> {
// Component id attribute
private static final String COMPONENT_ID = "componentId";
@@ -69,17 +67,18 @@
switch (reader.next()) {
case START_ELEMENT:
String name = reader.getName().getLocalPart();
- ModelObject modelObject = registry.unmarshall(reader);;
- if(REFERENCE.equals(name)) {
- componentDefinition.addReference((PhysicalReferenceDefinition) modelObject);
- } else if(SERVICE.equals(name)) {
- componentDefinition.addService((PhysicalServiceDefinition) modelObject);
+ if (REFERENCE.equals(name)) {
+ handleReference(componentDefinition, reader);
+ } else if (SERVICE.equals(name)) {
+ handleService(componentDefinition, reader);
} else {
- handleExtensions(componentDefinition, reader);
+ handleExtension(componentDefinition, reader);
}
break;
case END_ELEMENT:
- return componentDefinition;
+ if(getModelObjectQName().equals(reader.getName())) {
+ return componentDefinition;
+ }
}
}
@@ -90,5 +89,21 @@
}
}
+
+ /**
+ * Handles a reference.
+ *
+ * @param componentDefinition Component definition.
+ * @param reader XML stream.
+ */
+ protected abstract void handleReference(PCD componentDefinition, XMLStreamReader reader) throws MarshallException;
+
+ /**
+ * Handles a reference.
+ *
+ * @param componentDefinition Component definition.
+ * @param reader XML stream.
+ */
+ protected abstract void handleService(PCD componentDefinition, XMLStreamReader reader) throws MarshallException;
}
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=514185&r1=514184&r2=514185
==============================================================================
--- 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 3 08:41:22 2007
@@ -66,7 +66,7 @@
if(OPERATION.equals(name)) {
referenceDefinition.addOperation((PhysicalOperationDefinition)modelObject);
} else {
- handleExtensions(referenceDefinition, reader);
+ handleExtension(referenceDefinition, reader);
}
break;
case END_ELEMENT:
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=514185&r1=514184&r2=514185
==============================================================================
--- 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 3 08:41:22 2007
@@ -66,7 +66,7 @@
if(OPERATION.equals(name)) {
serviceDefinition.addOperation((PhysicalOperationDefinition)modelObject);
} else {
- handleExtensions(serviceDefinition, reader);
+ handleExtension(serviceDefinition, reader);
}
break;
case END_ELEMENT:
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=514185&r1=514184&r2=514185
==============================================================================
--- 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 3 08:41:22 2007
@@ -25,6 +25,9 @@
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.MarshallException;
/**
* Marshaller for Java physical component definitions.
@@ -74,7 +77,7 @@
* @param reader Reader from which marshalled data is read.
*/
@Override
- protected void handleExtensions(JavaPhysicalComponentDefinition componentDefinition, XMLStreamReader reader) {
+ protected void handleExtension(JavaPhysicalComponentDefinition componentDefinition, XMLStreamReader reader) {
String name = reader.getName().getLocalPart();
if(INSTANCE_FACTORY.equals(name)) {
byte[] base64ByteCode = reader.getText().getBytes();
@@ -82,6 +85,27 @@
componentDefinition.setInstanceFactoryByteCode(byteCode);
}
}
+ /**
+ * Handles a reference.
+ *
+ * @param componentDefinition Component definition.
+ * @param reader XML stream.
+ */
+ protected void handleReference(JavaPhysicalComponentDefinition componentDefinition, XMLStreamReader reader) throws MarshallException {
+ 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 MarshallException {
+ JavaPhysicalServiceDefinition service = (JavaPhysicalServiceDefinition) registry.unmarshall(reader);
+ componentDefinition.addService(service);
+ }
/**
* Handles extensions for marshalling Java physical component definitions
@@ -91,7 +115,7 @@
* @param reader Writer to which marshalled data is written.
*/
@Override
- protected void handleExtensions(JavaPhysicalComponentDefinition componentDefinition, XMLStreamWriter writer) {
+ protected void handleExtension(JavaPhysicalComponentDefinition componentDefinition, XMLStreamWriter writer) {
}
}
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=514185&r1=514184&r2=514185
==============================================================================
--- 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 3 08:41:22 2007
@@ -68,7 +68,7 @@
* @param reader Reader from which marshalled data is read.
*/
@Override
- protected void handleExtensions(JavaPhysicalReferenceDefinition modelObject, XMLStreamReader reader) {
+ protected void handleExtension(JavaPhysicalReferenceDefinition modelObject, XMLStreamReader reader) {
}
/**
@@ -77,7 +77,7 @@
* @param reader Writer to which marshalled data is written.
*/
@Override
- protected void handleExtensions(JavaPhysicalReferenceDefinition modelObject, XMLStreamWriter writer) {
+ protected void handleExtension(JavaPhysicalReferenceDefinition modelObject, XMLStreamWriter writer) {
}
}
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=514185&r1=514184&r2=514185
==============================================================================
--- 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 3 08:41:22 2007
@@ -68,7 +68,7 @@
* @param reader Reader from which marshalled data is read.
*/
@Override
- protected void handleExtensions(JavaPhysicalServiceDefinition modelObject, XMLStreamReader reader) {
+ protected void handleExtension(JavaPhysicalServiceDefinition modelObject, XMLStreamReader reader) {
}
/**
@@ -77,7 +77,7 @@
* @param reader Writer to which marshalled data is written.
*/
@Override
- protected void handleExtensions(JavaPhysicalServiceDefinition modelObject, XMLStreamWriter writer) {
+ protected void handleExtension(JavaPhysicalServiceDefinition modelObject, XMLStreamWriter writer) {
}
}
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=514185&r1=514184&r2=514185
==============================================================================
--- 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 3 08:41:22 2007
@@ -97,14 +97,14 @@
}
// TODO Fix defect
- /*Set<JavaPhysicalServiceDefinition> svs = jpcd.getServices();
+ Set<JavaPhysicalServiceDefinition> svs = jpcd.getServices();
assertEquals(1, svs.size());
JavaPhysicalServiceDefinition sv = svs.iterator().next();
if("cmp1".equals(componentId)) {
- assertEquals("sv1", ref.getName());
+ assertEquals("sv1", sv.getName());
} else {
- assertEquals("sv2", ref.getName());
- }*/
+ assertEquals("sv2", sv.getName());
+ }
}
assertEquals(2, changeSet.getWireDefinitions().size());
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org