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/19 19:14:01 UTC

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

Author: meerajk
Date: Mon Mar 19 11:14:00 2007
New Revision: 520030

URL: http://svn.apache.org/viewvc?view=rev&rev=520030
Log:
Added property values.

Modified:
    incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/extensions/instancefactory/ReflectiveIFProviderDefinitionMarshaller.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/instancefactory/ReflectiveIFProviderDefinitionMarshaller.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/extensions/instancefactory/ReflectiveIFProviderDefinitionMarshaller.java?view=diff&rev=520030&r1=520029&r2=520030
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/extensions/instancefactory/ReflectiveIFProviderDefinitionMarshaller.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/extensions/instancefactory/ReflectiveIFProviderDefinitionMarshaller.java Mon Mar 19 11:14:00 2007
@@ -20,6 +20,7 @@
 package org.apache.tuscany.core.marshaller.extensions.instancefactory;
 
 import java.lang.annotation.ElementType;
+import java.util.Map;
 
 import javax.xml.namespace.QName;
 import javax.xml.stream.XMLStreamException;
@@ -67,6 +68,9 @@
     // Injection site
     public static final String INJECTION_SITE = "injectionSite";
     
+    // Property
+    public static final String PROPERTY = "property";
+    
     // Injection site type
     public static final String TYPE = "type";
     
@@ -76,6 +80,9 @@
     // Injection site URI
     public static final String NAME = "name";
     
+    // Property value
+    public static final String VALUE = "value";
+    
     // Injection site name
     public static final String PHYSICAL_NAME = "physicalName";
 
@@ -136,6 +143,13 @@
                 
                 modelObject.addInjectionSite(injectionSite);
                 
+            } else if(PROPERTY.equals(name)) {
+                
+                InjectionSource injectionSource = new InjectionSource();
+                injectionSource.setName(reader.getAttributeValue(null, NAME));
+                injectionSource.setValueType(ValueSourceType.PROPERTY);
+                modelObject.addPropertValue(injectionSource, reader.getAttributeValue(null, VALUE));
+                
             }
             
         } catch (XMLStreamException ex) {
@@ -191,6 +205,14 @@
                 writer.writeAttribute(ELEMENT_TYPE, memberSite.getElementType().name());
                 writer.writeAttribute(NAME, source.getName());
                 writer.writeAttribute(PHYSICAL_NAME, memberSite.getName());
+                writer.writeEndElement();
+            }
+            
+            Map<InjectionSource, String> propertyValues = modelObject.getPropertyValues();
+            for(InjectionSource propertySource : propertyValues.keySet()) {
+                writer.writeStartElement(QNAME.getPrefix(), PROPERTY, QNAME.getNamespaceURI());
+                writer.writeAttribute(NAME, propertySource.getName());
+                writer.writeAttribute(TYPE, propertyValues.get(propertySource));
                 writer.writeEndElement();
             }
             

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=520030&r1=520029&r2=520030
==============================================================================
--- 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 Mon Mar 19 11:14:00 2007
@@ -39,6 +39,7 @@
 			<reflect:cdiSource type="REFERENCE" name="abc"/>
 			<reflect:injectionSite elementType="FIELD" type="PROPERTY" name="xyz" physicalName="xyz"/>
 			<reflect:injectionSite elementType="METHOD" type="CALLBACK" name="abc" physicalName="abc"/>
+			<reflect:property name="abc" value="123"/>
 		</reflect:instanceFactoryProvider>
 	</java:component>
 	



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