From 093fcdb0a7125ec9767592c16882e1fe3a993b3c Mon Sep 17 00:00:00 2001 From: rfeng Date: Fri, 6 Mar 2009 21:35:43 +0000 Subject: Support the SCA property value based on the OASIS syntax git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@751079 13f79535-47bb-0310-9956-ffa450edef68 --- .../ConstructorPropertyInjection.composite | 32 ++-- .../properties/src/main/resources/Outer.composite | 4 +- .../src/main/resources/OuterPropertyTest.composite | 2 +- .../src/main/resources/PropertyTest.composite | 46 +++--- .../src/main/resources/mySimpleService.composite | 4 +- .../sca/assembly/xml/BaseAssemblyProcessor.java | 102 ++++++++++-- .../tuscany/sca/assembly/xml/WriteAllTestCase.java | 2 +- .../sca/assembly/xml/TestAllCalculator.composite | 16 +- .../assembly/xml/TestAllPolicyCalculator.composite | 9 +- .../tuscany/sca/databinding/jaxb/POJOTestCase.java | 5 +- .../databinding-jaxb/src/test/resources/ipo.xsd | 8 + .../injection/JavaPropertyValueObjectFactory.java | 172 +++++++++------------ .../org/apache/tuscany/sca/node/impl/NodeImpl.java | 2 +- 13 files changed, 236 insertions(+), 168 deletions(-) (limited to 'java') diff --git a/java/sca/itest/properties/src/main/resources/ConstructorPropertyInjection.composite b/java/sca/itest/properties/src/main/resources/ConstructorPropertyInjection.composite index c0e2fa32d5..24a2cca822 100644 --- a/java/sca/itest/properties/src/main/resources/ConstructorPropertyInjection.composite +++ b/java/sca/itest/properties/src/main/resources/ConstructorPropertyInjection.composite @@ -17,25 +17,23 @@ * specific language governing permissions and limitations * under the License. --> - + - - - fubar - + + + + - - - fubar - + + + fubar + - - - fubar - + + + + fubar + + \ No newline at end of file diff --git a/java/sca/itest/properties/src/main/resources/Outer.composite b/java/sca/itest/properties/src/main/resources/Outer.composite index 587557461e..0ada194cb3 100644 --- a/java/sca/itest/properties/src/main/resources/Outer.composite +++ b/java/sca/itest/properties/src/main/resources/Outer.composite @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. --> - Raleigh diff --git a/java/sca/itest/properties/src/main/resources/OuterPropertyTest.composite b/java/sca/itest/properties/src/main/resources/OuterPropertyTest.composite index 87840ba16b..75fa0aaa81 100644 --- a/java/sca/itest/properties/src/main/resources/OuterPropertyTest.composite +++ b/java/sca/itest/properties/src/main/resources/OuterPropertyTest.composite @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. --> - -1 - + a b c @@ -44,11 +44,11 @@ y z - + - + 1 11 @@ -73,16 +73,16 @@ 158.68 369.04 - + - + TestString_3 TestString_4 100 200 - + @@ -118,7 +118,7 @@ - + TestString_1 TestString_2 10 @@ -143,10 +143,10 @@ 158.68 369.04 - + - + TestElementString_1 TestElementString_2 10 @@ -174,7 +174,7 @@ - + 1 11.11 111.111 @@ -184,7 +184,7 @@ 11111.11111 - + 2 22.22 222.222 @@ -194,7 +194,7 @@ 22222.22222 - + 3 33.33 333.333 @@ -207,18 +207,18 @@ - + Firstly Name Middler Name Lasting Name - + - + Sdo Firstly Name Sdo Middler Name Sdo Lasting Name - + RTP 2006 @@ -226,21 +226,21 @@ 1 2 3 4 5 6 7 8 9 10 10 9 8 7 6 5 4 3 2 1 0 - + Firstly Name 1 Middler Name 1 Lasting Name 1 - - + + Firstly Name 2 Middler Name 2 Lasting Name 2 - - + + Firstly Name 3 Middler Name 3 Lasting Name 3 - + diff --git a/java/sca/itest/properties/src/main/resources/mySimpleService.composite b/java/sca/itest/properties/src/main/resources/mySimpleService.composite index 1d2bdbf4f8..b22b32bc30 100644 --- a/java/sca/itest/properties/src/main/resources/mySimpleService.composite +++ b/java/sca/itest/properties/src/main/resources/mySimpleService.composite @@ -18,9 +18,9 @@ * under the License. --> + xsi:schemaLocation="http://docs.oasis-open.org/ns/opencsa/sca/200903 http://docs.oasis-open.org/ns/opencsa/sca/200903 "> diff --git a/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java b/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java index c3c1ba7f42..03a087a5ec 100644 --- a/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java +++ b/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java @@ -21,6 +21,9 @@ package org.apache.tuscany.sca.assembly.xml; import static javax.xml.XMLConstants.W3C_XML_SCHEMA_INSTANCE_NS_URI; import static javax.xml.XMLConstants.XMLNS_ATTRIBUTE_NS_URI; +import static javax.xml.stream.XMLStreamConstants.CDATA; +import static javax.xml.stream.XMLStreamConstants.CHARACTERS; +import static javax.xml.stream.XMLStreamConstants.COMMENT; import static javax.xml.stream.XMLStreamConstants.END_ELEMENT; import static javax.xml.stream.XMLStreamConstants.START_ELEMENT; import static org.apache.tuscany.sca.assembly.xml.Constants.ELEMENT; @@ -30,6 +33,7 @@ import static org.apache.tuscany.sca.assembly.xml.Constants.MUST_SUPPLY; import static org.apache.tuscany.sca.assembly.xml.Constants.NAME; import static org.apache.tuscany.sca.assembly.xml.Constants.ONE_N; import static org.apache.tuscany.sca.assembly.xml.Constants.ONE_ONE; +import static org.apache.tuscany.sca.assembly.xml.Constants.PROPERTY; import static org.apache.tuscany.sca.assembly.xml.Constants.PROPERTY_QNAME; import static org.apache.tuscany.sca.assembly.xml.Constants.SCA11_NS; import static org.apache.tuscany.sca.assembly.xml.Constants.TARGET; @@ -430,6 +434,7 @@ abstract class BaseAssemblyProcessor extends BaseStAXArtifactProcessor { return null; } + /* protected List readPropertyValue(XMLStreamReader reader) throws XMLStreamException, ContributionReadException { List values = new ArrayList(); @@ -455,7 +460,7 @@ abstract class BaseAssemblyProcessor extends BaseStAXArtifactProcessor { name = reader.getName(); if (PROPERTY_QNAME.equals(name)) { isTextForProperty = true; - continue; + break; } isTextForProperty = false; // Read @@ -489,8 +494,14 @@ abstract class BaseAssemblyProcessor extends BaseStAXArtifactProcessor { } break; } + if (reader.hasNext()) { + event = reader.next(); + } else { + return values; + } } } + */ /** * Read a property value into a DOM document. @@ -517,8 +528,13 @@ abstract class BaseAssemblyProcessor extends BaseStAXArtifactProcessor { throw ce; } - // root element has no namespace and local name "value" - Element root = document.createElementNS(null, "value"); + // Collect the property values as elements under the + Element root = document.createElementNS(SCA11_NS, "sca:" + PROPERTY); + String nameAttr = getString(reader, NAME); + if (nameAttr != null) { + root.setAttributeNS(SCA11_NS, "sca:" + NAME, nameAttr); + } + declareNamespace(root, "sca", SCA11_NS); if (type != null) { org.w3c.dom.Attr xsi = document.createAttributeNS(XMLNS_ATTRIBUTE_NS_URI, "xmlns:xsi"); xsi.setValue(W3C_XML_SCHEMA_INSTANCE_NS_URI); @@ -537,7 +553,63 @@ abstract class BaseAssemblyProcessor extends BaseStAXArtifactProcessor { } document.appendChild(root); - loadElement(reader, root); + // Start to parse the property + QName name = reader.getName(); // Should be sca:property + + // SCA 1.1 supports the @value for simple types + String valueAttr = getString(reader, VALUE); + if (valueAttr != null) { + Element valueElement = document.createElementNS(SCA11_NS, VALUE); + root.appendChild(valueElement); + valueElement.setTextContent(valueAttr); + } + + boolean isTextForProperty = true; + StringBuffer text = new StringBuffer(); + + int event = reader.getEventType(); + while (true) { + switch (event) { + case START_ELEMENT: + name = reader.getName(); + if (PROPERTY_QNAME.equals(name)) { + isTextForProperty = true; + break; + } + isTextForProperty = false; + // Read + if (VALUE_QNAME.equals(name)) { + loadElement(reader, root); + } else { + // Global elements + loadElement(reader, root); + } + break; + case XMLStreamConstants.CHARACTERS: + case XMLStreamConstants.CDATA: + if (isTextForProperty) { + text.append(reader.getText()); + } + break; + case END_ELEMENT: + name = reader.getName(); + if (PROPERTY_QNAME.equals(name)) { + if (root.getChildNodes().getLength() == 0) { + // Add the text as an + Element valueElement = document.createElementNS(SCA11_NS, VALUE); + root.appendChild(valueElement); + valueElement.setTextContent(text.toString()); + } + return document; + } + break; + } + if (reader.hasNext()) { + event = reader.next(); + } else { + break; + } + } return document; } @@ -607,8 +679,8 @@ abstract class BaseAssemblyProcessor extends BaseStAXArtifactProcessor { Document document = root.getOwnerDocument(); Node current = root; while (true) { - switch (reader.next()) { - case XMLStreamConstants.START_ELEMENT: + switch (reader.getEventType()) { + case START_ELEMENT: QName name = reader.getName(); Element child = createElement(document, name); @@ -644,20 +716,28 @@ abstract class BaseAssemblyProcessor extends BaseStAXArtifactProcessor { } break; - case XMLStreamConstants.CDATA: + case CDATA: current.appendChild(document.createCDATASection(reader.getText())); break; - case XMLStreamConstants.CHARACTERS: + case CHARACTERS: current.appendChild(document.createTextNode(reader.getText())); break; - case XMLStreamConstants.END_ELEMENT: + case COMMENT: + current.appendChild(document.createComment(reader.getText())); + break; + case END_ELEMENT: + // pop the element off the stack + current = current.getParentNode(); // if we are back at the root then we are done if (current == root) { return; } - // pop the element off the stack - current = current.getParentNode(); + } + if (reader.hasNext()) { + reader.next(); + } else { + return; } } } diff --git a/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java b/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java index 1877470cd3..cf86aec6f4 100644 --- a/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java +++ b/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java @@ -152,7 +152,7 @@ public class WriteAllTestCase { assertEquals(composite.getProperties().get(1).getName(),"prop2"); assertEquals(composite.getProperties().get(1).isMustSupply(), true); assertEquals(composite.getProperties().get(0).getXSDType(), new QName("http://foo", "MyComplexType")); - assertEquals(composite.getProperties().get(1).getXSDElement(), new QName("http://docs.oasis-open.org/ns/opencsa/sca/200903", "MyComplexPropertyValue1")); + assertEquals(composite.getProperties().get(1).getXSDElement(), new QName("http://foo", "MyComplexPropertyValue1")); } } diff --git a/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllCalculator.composite b/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllCalculator.composite index 2f1c2e333a..65e709f9b1 100644 --- a/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllCalculator.composite +++ b/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllCalculator.composite @@ -107,17 +107,21 @@ - - + AValue InterestingURI - - + + BValue BoringURI - + - + + 123 + + + 123 + 123 diff --git a/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllPolicyCalculator.composite b/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllPolicyCalculator.composite index 9d5dcead7c..661270d341 100644 --- a/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllPolicyCalculator.composite +++ b/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllPolicyCalculator.composite @@ -112,15 +112,14 @@ - - + AValue InterestingURI - - + + BValue BoringURI - + diff --git a/java/sca/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/POJOTestCase.java b/java/sca/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/POJOTestCase.java index b9370c9387..98aefed546 100644 --- a/java/sca/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/POJOTestCase.java +++ b/java/sca/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/POJOTestCase.java @@ -209,11 +209,12 @@ public class POJOTestCase { public void testPrimitive() throws Exception { JAXBContext context = JAXBContext.newInstance(int.class); StringWriter writer = new StringWriter(); - JAXBElement element = new JAXBElement(new QName("http://ns1", "bean"), Object.class, 1); + JAXBElement element = new JAXBElement(new QName("http://ns1", "bean"), Integer.class, 1); context.createMarshaller().marshal(element, writer); // System.out.println(writer.toString()); - Object result = context.createUnmarshaller().unmarshal(new StringReader(writer.toString())); + StreamSource source = new StreamSource(new StringReader(writer.toString())); + Object result = context.createUnmarshaller().unmarshal(source, int.class); assertTrue(result instanceof JAXBElement); JAXBElement e2 = (JAXBElement)result; assertEquals(1, e2.getValue()); diff --git a/java/sca/modules/databinding-jaxb/src/test/resources/ipo.xsd b/java/sca/modules/databinding-jaxb/src/test/resources/ipo.xsd index 241ec15d36..04e8cb44f3 100755 --- a/java/sca/modules/databinding-jaxb/src/test/resources/ipo.xsd +++ b/java/sca/modules/databinding-jaxb/src/test/resources/ipo.xsd @@ -129,6 +129,14 @@ + + + + + + + + diff --git a/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/JavaPropertyValueObjectFactory.java b/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/JavaPropertyValueObjectFactory.java index 3618fa3477..885004b09b 100644 --- a/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/JavaPropertyValueObjectFactory.java +++ b/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/JavaPropertyValueObjectFactory.java @@ -57,95 +57,62 @@ public class JavaPropertyValueObjectFactory implements PropertyValueFactory { public JavaPropertyValueObjectFactory(ExtensionPointRegistry registry) { this.mediator = registry.getExtensionPoint(UtilityExtensionPoint.class).getUtility(Mediator.class); } + public JavaPropertyValueObjectFactory(Mediator mediator) { this.mediator = mediator; } - + + /** + * Introspect the property + * @param javaElement + * @return + */ + private DataType introspect(JavaElementImpl javaElement) { + DataType dt = + new DataTypeImpl(null, javaElement.getType(), javaElement.getGenericType(), XMLType.UNKNOWN); + mediator.getDataBindings().introspectType(dt, null); + return dt; + } + public ObjectFactory createValueFactory(Property property, Object propertyValue, JavaElementImpl javaElement) { - isSimpleType = isSimpleType(property); Document doc = (Document)propertyValue; + List nodes = getValues(doc); Class javaType = JavaIntrospectionHelper.getBaseType(javaElement.getType(), javaElement.getGenericType()); - Element rootElement = doc.getDocumentElement(); if (property.isMany()) { - if (isSimpleType) { - String value = ""; - if (rootElement.getChildNodes().getLength() > 0) { - value = rootElement.getChildNodes().item(0).getTextContent(); - } - List values = getSimplePropertyValues(value, javaType); - if ( javaElement.getType().isArray() ) { - return new ArrayObjectFactoryImpl(property, values, isSimpleType, javaType); - } else { - return new ListObjectFactoryImpl(property, values, isSimpleType, javaType); - } + if (javaElement.getType().isArray()) { + return new ArrayObjectFactoryImpl(property, nodes, javaType); } else { - if ( javaElement.getType().isArray() ) { - return new ArrayObjectFactoryImpl(property, getComplexPropertyValues(doc), isSimpleType, javaType); - } else { - return new ListObjectFactoryImpl(property, getComplexPropertyValues(doc), isSimpleType, javaType); - } + return new ListObjectFactoryImpl(property, nodes, javaType); } } else { - if (isSimpleType) { - String value = ""; - if (rootElement.getChildNodes().getLength() > 0) { - value = rootElement.getChildNodes().item(0).getTextContent(); - } - return new ObjectFactoryImpl(property, value, isSimpleType, javaType); - } else { - List nodes = getComplexPropertyValues(doc); - Object value = null; - if (!nodes.isEmpty()) { - value = nodes.get(0); - } - return new ObjectFactoryImpl(property, value, isSimpleType, javaType); + Object value = null; + if (!nodes.isEmpty()) { + value = nodes.get(0); } + return new ObjectFactoryImpl(property, value, javaType); } } - + public ObjectFactory createValueFactory(Property property, Object propertyValue, Class javaType) { - isSimpleType = isSimpleType(property); Document doc = (Document)propertyValue; - Element rootElement = doc.getDocumentElement(); + List nodes = getValues(doc); if (property.isMany()) { - if (isSimpleType) { - String value = ""; - if (rootElement.getChildNodes().getLength() > 0) { - value = rootElement.getChildNodes().item(0).getTextContent(); - } - List values = getSimplePropertyValues(value, javaType); - return new ListObjectFactoryImpl(property, values, isSimpleType, javaType); - } else { - return new ListObjectFactoryImpl(property, getComplexPropertyValues(doc), isSimpleType, javaType); - } + return new ListObjectFactoryImpl(property, nodes, javaType); } else { - if (isSimpleType) { - String value = ""; - if (rootElement.getChildNodes().getLength() > 0) { - value = rootElement.getChildNodes().item(0).getTextContent(); - } - return new ObjectFactoryImpl(property, value, isSimpleType, javaType); - } else { - List nodes = getComplexPropertyValues(doc); - Object value = null; - if (!nodes.isEmpty()) { - value = nodes.get(0); - } - return new ObjectFactoryImpl(property, value, isSimpleType, javaType); + Object value = null; + if (!nodes.isEmpty()) { + value = nodes.get(0); } - + return new ObjectFactoryImpl(property, value, javaType); } - } - + } - public B createPropertyValue(ComponentProperty property, Class type) - { + public B createPropertyValue(ComponentProperty property, Class type) { ObjectFactory factory = this.createValueFactory(property, property.getValue(), type); return factory.getInstance(); } - abstract class ObjectFactoryImplBase implements ObjectFactory { protected SimpleTypeMapper simpleTypeMapper = new SimpleTypeMapperImpl(); protected Property property; @@ -153,15 +120,14 @@ public class JavaPropertyValueObjectFactory implements PropertyValueFactory { protected Class javaType; protected DataType sourceDataType; protected DataType targetDataType; - boolean isSimpleType; - public ObjectFactoryImplBase(Property property, Object propertyValue, boolean isSimpleType, Class javaType) { - this.isSimpleType = isSimpleType; + public ObjectFactoryImplBase(Property property, Object propertyValue, Class javaType) { this.property = property; this.propertyValue = propertyValue; this.javaType = javaType; - sourceDataType = new DataTypeImpl(DOMDataBinding.NAME, Node.class, new XMLType(null, this.property - .getXSDType())); + sourceDataType = + new DataTypeImpl(DOMDataBinding.NAME, Node.class, + new XMLType(null, this.property.getXSDType())); TypeInfo typeInfo = null; if (this.property.getXSDType() != null) { if (SimpleTypeMapperImpl.isSimpleXSDType(this.property.getXSDType())) { @@ -185,8 +151,8 @@ public class JavaPropertyValueObjectFactory implements PropertyValueFactory { } class ObjectFactoryImpl extends ObjectFactoryImplBase { - public ObjectFactoryImpl(Property property, Object propertyValue, boolean isSimpleType, Class javaType) { - super(property, propertyValue, isSimpleType, javaType); + public ObjectFactoryImpl(Property property, Object propertyValue, Class javaType) { + super(property, propertyValue, javaType); } public Object getInstance() throws ObjectCreationException { @@ -194,11 +160,13 @@ public class JavaPropertyValueObjectFactory implements PropertyValueFactory { try { return simpleTypeMapper.toJavaObject(property.getXSDType(), (String)propertyValue, null); } catch (NumberFormatException ex) { - throw new ObjectCreationException("Failed to create instance for property " - + property.getName() + " with value " + propertyValue, ex); + throw new ObjectCreationException("Failed to create instance for property " + property.getName() + + " with value " + + propertyValue, ex); } catch (IllegalArgumentException ex) { - throw new ObjectCreationException("Failed to create instance for property " - + property.getName() + " with value " + propertyValue, ex); + throw new ObjectCreationException("Failed to create instance for property " + property.getName() + + " with value " + + propertyValue, ex); } } else { return mediator.mediate(propertyValue, sourceDataType, targetDataType, null); @@ -208,8 +176,8 @@ public class JavaPropertyValueObjectFactory implements PropertyValueFactory { } class ListObjectFactoryImpl extends ObjectFactoryImplBase { - public ListObjectFactoryImpl(Property property, List propertyValues, boolean isSimpleType, Class javaType) { - super(property, propertyValues, isSimpleType, javaType); + public ListObjectFactoryImpl(Property property, List propertyValues, Class javaType) { + super(property, propertyValues, javaType); } @SuppressWarnings("unchecked") @@ -220,13 +188,19 @@ public class JavaPropertyValueObjectFactory implements PropertyValueFactory { try { values.add(simpleTypeMapper.toJavaObject(property.getXSDType(), aValue, null)); } catch (NumberFormatException ex) { - throw new ObjectCreationException("Failed to create instance for property " - + property.getName() + " with value " + aValue - + " from value list of " + propertyValue, ex); + throw new ObjectCreationException("Failed to create instance for property " + property + .getName() + + " with value " + + aValue + + " from value list of " + + propertyValue, ex); } catch (IllegalArgumentException ex) { - throw new ObjectCreationException("Failed to create instance for property " - + property.getName() + " with value " + aValue - + " from value list of " + propertyValue, ex); + throw new ObjectCreationException("Failed to create instance for property " + property + .getName() + + " with value " + + aValue + + " from value list of " + + propertyValue, ex); } } return values; @@ -239,10 +213,10 @@ public class JavaPropertyValueObjectFactory implements PropertyValueFactory { } } } - + class ArrayObjectFactoryImpl extends ObjectFactoryImplBase { - public ArrayObjectFactoryImpl(Property property, List propertyValues, boolean isSimpleType, Class javaType) { - super(property, propertyValues, isSimpleType, javaType); + public ArrayObjectFactoryImpl(Property property, List propertyValues, Class javaType) { + super(property, propertyValues, javaType); } @SuppressWarnings("unchecked") @@ -254,13 +228,19 @@ public class JavaPropertyValueObjectFactory implements PropertyValueFactory { try { Array.set(values, count++, simpleTypeMapper.toJavaObject(property.getXSDType(), aValue, null)); } catch (NumberFormatException ex) { - throw new ObjectCreationException("Failed to create instance for property " - + property.getName() + " with value " + aValue - + " from value list of " + propertyValue, ex); + throw new ObjectCreationException("Failed to create instance for property " + property + .getName() + + " with value " + + aValue + + " from value list of " + + propertyValue, ex); } catch (IllegalArgumentException ex) { - throw new ObjectCreationException("Failed to create instance for property " - + property.getName() + " with value " + aValue - + " from value list of " + propertyValue, ex); + throw new ObjectCreationException("Failed to create instance for property " + property + .getName() + + " with value " + + aValue + + " from value list of " + + propertyValue, ex); } } return values; @@ -275,12 +255,10 @@ public class JavaPropertyValueObjectFactory implements PropertyValueFactory { } } - - /** * Utility methods */ - + /** * * @param property @@ -301,7 +279,6 @@ public class JavaPropertyValueObjectFactory implements PropertyValueFactory { return false; } - /** * Retrieve list of simple property values * @param concatenatedValue @@ -331,7 +308,8 @@ public class JavaPropertyValueObjectFactory implements PropertyValueFactory { * @param document * @return */ - private static List getComplexPropertyValues(Document document) { + private static List getValues(Document document) { + // The root is the property element Element rootElement = document.getDocumentElement(); List propValues = new ArrayList(); NodeList nodes = rootElement.getChildNodes(); diff --git a/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java b/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java index 8fa3b77ef4..08e38a63cc 100644 --- a/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java +++ b/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java @@ -387,7 +387,7 @@ public class NodeImpl implements Node, Client { // will be extended later with definitions from application contributions systemContribution = contributionFactory.createContribution(); systemContribution.setURI("http://tuscany.apache.org/SystemContribution"); - systemContribution.setLocation("Derived"); + systemContribution.setLocation("http://tuscany.apache.org/SystemContribution"); ModelResolver modelResolver = new ExtensibleModelResolver(systemContribution, modelResolvers, modelFactories); systemContribution.setModelResolver(modelResolver); systemContribution.setUnresolved(true); -- cgit v1.2.3