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/15 00:50:42 UTC

svn commit: r518385 - in /incubator/tuscany/java/sca/kernel/core/src: main/java/org/apache/tuscany/core/marshaller/extensions/AbstractPhysicalWireSourceDefinitionMarshaller.java test/resources/marshall/javaChangeSet.xml

Author: meerajk
Date: Wed Mar 14 16:50:41 2007
New Revision: 518385

URL: http://svn.apache.org/viewvc?view=rev&rev=518385
Log:
Add optimizable and callback uri to abstract PWSD marshaller.

Modified:
    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/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=518385&r1=518384&r2=518385
==============================================================================
--- 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 Wed Mar 14 16:50:41 2007
@@ -37,9 +37,16 @@
 public abstract class AbstractPhysicalWireSourceDefinitionMarshaller<PWSD extends PhysicalWireSourceDefinition> extends
     AbstractExtensibleMarshallerExtension<PWSD> {
 
-    // Source name attribute
+    // URI attribute
     public static final String URI_ATTRIBUTE = "uri";
 
+    // URI attribute
+    public static final String CALLBACK_URI = "callbackUri";
+    
+    // Optimizable attribute
+    public static final String OPTIMIZABLE = "optimizable";
+    
+
     /**
      * Marshalls a physical java reference definition to the xml writer.
      */
@@ -50,6 +57,8 @@
             QName qname = getModelObjectQName();
             writer.writeStartElement(qname.getPrefix(), qname.getLocalPart(), qname.getNamespaceURI());
             writer.writeAttribute(URI_ATTRIBUTE, modelObject.getUri().toASCIIString());
+            writer.writeAttribute(CALLBACK_URI, modelObject.getCallbackUri().toASCIIString());
+            writer.writeAttribute(OPTIMIZABLE, String.valueOf(modelObject.isOptimizable()));
             writer.writeNamespace(qname.getPrefix(), qname.getNamespaceURI());
             
             handleExtension(modelObject, writer);
@@ -70,6 +79,8 @@
         try {
             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)));
             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=518385&r1=518384&r2=518385
==============================================================================
--- 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 Wed Mar 14 16:50:41 2007
@@ -46,8 +46,10 @@
 	
 	<!-- Wire 1 -->
 	<core:wire>
-		<java:wireSource uri="cmp1#rf1" xmlns:java="http://tuscany.apache.org/xmlns/marshaller/java/1.0-SNAPSHOT" />
-		<java:wireTarget uri="cmp2#sv2" xmlns:java="http://tuscany.apache.org/xmlns/marshaller/java/1.0-SNAPSHOT" />
+		<java:wireSource uri="cmp1#rf1" callbackUri="a#b" optimizable="true" 
+			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:parameter>java.lang.String</core:parameter>
 			<core:parameter>java.lang.Long</core:parameter>
@@ -57,8 +59,10 @@
 	
 	<!-- Wire 2 -->
 	<core:wire>
-		<java:wireSource uri="cmp2#rf2" xmlns:java="http://tuscany.apache.org/xmlns/marshaller/java/1.0-SNAPSHOT" />
-		<java:wireTarget uri="cmp1#sv1" xmlns:java="http://tuscany.apache.org/xmlns/marshaller/java/1.0-SNAPSHOT" />
+		<java:wireSource uri="cmp2#rf2" callbackUri="a#b" optimizable="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:parameter>java.lang.String</core:parameter>
 			<core:parameter>java.lang.Long</core:parameter>



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org