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/16 00:24:16 UTC
svn commit: r518806 - in /incubator/tuscany/java/sca/kernel/core/src:
main/java/org/apache/tuscany/core/marshaller/
main/java/org/apache/tuscany/core/marshaller/extensions/
test/resources/marshall/
Author: meerajk
Date: Thu Mar 15 16:24:15 2007
New Revision: 518806
URL: http://svn.apache.org/viewvc?view=rev&rev=518806
Log:
Added marshalling support for PWSD#conversational POD#conversationSequence.
Modified:
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/extensions/AbstractPhysicalWireSourceDefinitionMarshaller.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/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=518806&r1=518805&r2=518806
==============================================================================
--- 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 Thu Mar 15 16:24:15 2007
@@ -52,6 +52,9 @@
// argument
public static final String PARAMETER = "parameter";
+ // Conversation sequence
+ public static final String CONVERSATION_SEQUENCE = "conversationSequence";
+
// QName for the root element
public static final QName QNAME = new QName(CORE_NS, "operation", CORE_PREFIX);
@@ -64,6 +67,7 @@
writer.writeStartElement(QNAME.getPrefix(), QNAME.getLocalPart(), QNAME.getNamespaceURI());
writer.writeAttribute(NAME, modelObject.getName());
writer.writeAttribute(CALLBACK, String.valueOf(modelObject.isCallback()));
+ writer.writeAttribute(CONVERSATION_SEQUENCE, String.valueOf(modelObject.getConversationSequence()));
writer.writeStartElement(QNAME.getPrefix(), RETURN_TYPE, QNAME.getNamespaceURI());
writer.writeCharacters(modelObject.getReturnType());
writer.writeEndElement();
@@ -88,6 +92,7 @@
PhysicalOperationDefinition operation = new PhysicalOperationDefinition();
operation.setName(reader.getAttributeValue(null, NAME));
operation.setCallback(Boolean.valueOf(reader.getAttributeValue(null, CALLBACK)));
+ operation.setConversationSequence(Integer.parseInt(reader.getAttributeValue(null, CONVERSATION_SEQUENCE)));
while (true) {
switch (reader.next()) {
case START_ELEMENT:
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/extensions/AbstractPhysicalWireSourceDefinitionMarshaller.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/extensions/AbstractPhysicalWireSourceDefinitionMarshaller.java?view=diff&rev=518806&r1=518805&r2=518806
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/extensions/AbstractPhysicalWireSourceDefinitionMarshaller.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/extensions/AbstractPhysicalWireSourceDefinitionMarshaller.java Thu Mar 15 16:24:15 2007
@@ -46,6 +46,9 @@
// Optimizable attribute
public static final String OPTIMIZABLE = "optimizable";
+ // Conversational
+ public static final String CONVERSATIONAL = "conversational";
+
/**
* Marshalls a physical java reference definition to the xml writer.
@@ -59,6 +62,7 @@
writer.writeAttribute(URI_ATTRIBUTE, modelObject.getUri().toASCIIString());
writer.writeAttribute(CALLBACK_URI, modelObject.getCallbackUri().toASCIIString());
writer.writeAttribute(OPTIMIZABLE, String.valueOf(modelObject.isOptimizable()));
+ writer.writeAttribute(CONVERSATIONAL, String.valueOf(modelObject.isConversational()));
writer.writeNamespace(qname.getPrefix(), qname.getNamespaceURI());
handleExtension(modelObject, writer);
@@ -80,7 +84,8 @@
PWSD sourceDefinition = getConcreteModelObject();
sourceDefinition.setUri(new URI(reader.getAttributeValue(null, URI_ATTRIBUTE)));
sourceDefinition.setCallbackUri(new URI(reader.getAttributeValue(null, CALLBACK_URI)));
- sourceDefinition.setOptimizable(Boolean.valueOf(reader.getAttributeValue(null, CALLBACK_URI)));
+ sourceDefinition.setOptimizable(Boolean.valueOf(reader.getAttributeValue(null, OPTIMIZABLE)));
+ sourceDefinition.setConversational(Boolean.valueOf(reader.getAttributeValue(null, CONVERSATIONAL)));
handleExtension(sourceDefinition, reader);
return sourceDefinition;
} catch (URISyntaxException ex) {
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=518806&r1=518805&r2=518806
==============================================================================
--- 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 Thu Mar 15 16:24:15 2007
@@ -46,11 +46,11 @@
<!-- Wire 1 -->
<core:wire>
- <java:wireSource uri="cmp1#rf1" callbackUri="a#b" optimizable="true"
+ <java:wireSource uri="cmp1#rf1" callbackUri="a#b" optimizable="true" conversational="false"
xmlns:java="http://tuscany.apache.org/xmlns/marshaller/java/1.0-SNAPSHOT" />
<java:wireTarget uri="cmp2#sv2" callbackUri="a#b" optimizable="true"
xmlns:java="http://tuscany.apache.org/xmlns/marshaller/java/1.0-SNAPSHOT" />
- <core:operation name="op2">
+ <core:operation name="op2" conversationSequence="1">
<core:parameter>java.lang.String</core:parameter>
<core:parameter>java.lang.Long</core:parameter>
<core:returnType>java.lang.Object</core:returnType>
@@ -59,11 +59,11 @@
<!-- Wire 2 -->
<core:wire>
- <java:wireSource uri="cmp2#rf2" callbackUri="a#b" optimizable="true"
+ <java:wireSource uri="cmp2#rf2" callbackUri="a#b" optimizable="true" conversational="true"
xmlns:java="http://tuscany.apache.org/xmlns/marshaller/java/1.0-SNAPSHOT" />
<java:wireTarget uri="cmp1#sv1" callbackUri="a#b" optimizable="true"
xmlns:java="http://tuscany.apache.org/xmlns/marshaller/java/1.0-SNAPSHOT" />
- <core:operation name="op1">
+ <core:operation name="op1" conversationSequence="2">
<core:parameter>java.lang.String</core:parameter>
<core:parameter>java.lang.Long</core:parameter>
<core:returnType>java.lang.Object</core:returnType>
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org