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/12 00:10:56 UTC
svn commit: r517041 - in /incubator/tuscany/java/sca/kernel:
core/src/main/java/org/apache/tuscany/core/marshaller/
core/src/main/java/org/apache/tuscany/core/marshaller/extensions/
core/src/main/java/org/apache/tuscany/core/marshaller/extensions/java/...
Author: meerajk
Date: Sun Mar 11 16:10:54 2007
New Revision: 517041
URL: http://svn.apache.org/viewvc?view=rev&rev=517041
Log:
Added wire source and target definitions and corresponding marshallers
Added:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/extensions/AbstractPhysicalWireSourceDefinitionMarshaller.java (with props)
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/extensions/AbstractPhysicalWireTargetDefinitionMarshaller.java (with props)
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/extensions/java/JavaPhysicalWireSourceDefinitionMarshaller.java (with props)
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/extensions/java/JavaPhysicalWireTargetDefinitionMarshaller.java (with props)
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/model/physical/java/JavaPhysicalWireSourceDefinition.java (with props)
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/model/physical/java/JavaPhysicalWireTargetDefinition.java (with props)
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/physical/PhysicalWireSourceDefinition.java (with props)
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/physical/PhysicalWireTargetDefinition.java (with props)
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/PhysicalChangeSetMarshaller.java
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/PhysicalWireDefinitionMarshaller.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/builder/ConnectorImplWireTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/marshaller/JavaPhysicalChangeSetMarshallerTest.java
incubator/tuscany/java/sca/kernel/core/src/test/resources/marshall/javaChangeSet.xml
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/physical/PhysicalWireDefinition.java
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/PhysicalChangeSetMarshaller.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/PhysicalChangeSetMarshaller.java?view=diff&rev=517041&r1=517040&r2=517041
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/PhysicalChangeSetMarshaller.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/PhysicalChangeSetMarshaller.java Sun Mar 11 16:10:54 2007
@@ -35,39 +35,39 @@
/**
* Marshaller for physical changeset.
*
- * @version $Revision$ $Date$
- *
+ * @version $Revision$ $Date: 2007-03-10 13:21:21 +0000 (Sat, 10 Mar
+ * 2007) $
*/
public class PhysicalChangeSetMarshaller extends AbstractMarshallerExtension<PhysicalChangeSet> {
// Core marshaller namespace
public static final String CORE_NS = "http://tuscany.apache.org/xmlns/marshaller/1.0-SNAPSHOT";
-
+
// Core marshaller prefix
public static final String CORE_PREFIX = "core";
-
+
// QName for the root element
public static final QName QNAME = new QName(CORE_NS, "changeSet", CORE_PREFIX);
// Local part for wire
- private static final String WIRE = "wire";
+ public static final String WIRE = "wire";
// Local part for component
- private static final String COMPONENT = "component";
+ public static final String COMPONENT = "component";
/**
* Marshalls a physical change set to the xml writer.
*/
public void marshal(PhysicalChangeSet modelObject, XMLStreamWriter writer) throws MarshalException {
-
+
try {
writer.writeStartDocument();
writer.writeStartElement(QNAME.getPrefix(), QNAME.getLocalPart(), QNAME.getNamespaceURI());
writer.writeNamespace(CORE_PREFIX, CORE_NS);
- for(PhysicalComponentDefinition pcd : modelObject.getComponentDefinitions()) {
+ for (PhysicalComponentDefinition pcd : modelObject.getComponentDefinitions()) {
registry.marshall(pcd, writer);
}
- for(PhysicalWireDefinition pcd : modelObject.getWireDefinitions()) {
+ for (PhysicalWireDefinition pcd : modelObject.getWireDefinitions()) {
registry.marshall(pcd, writer);
}
writer.writeEndElement();
@@ -75,7 +75,7 @@
} catch (XMLStreamException ex) {
throw new MarshalException(ex);
}
-
+
}
/**
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=517041&r1=517040&r2=517041
==============================================================================
--- 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 Sun Mar 11 16:10:54 2007
@@ -41,26 +41,25 @@
public class PhysicalOperationDefinitionMarshaller extends AbstractMarshallerExtension<PhysicalOperationDefinition> {
// Operation name attribute
- private static final String NAME = "name";
+ public static final String NAME = "name";
// Callback attribute
- private static final String CALLBACK = "callback";
-
+ public static final String CALLBACK = "callback";
+
// Return
- private static final String RETURN_TYPE = "returnType";
+ public static final String RETURN_TYPE = "returnType";
// argument
- private static final String PARAMETER = "parameter";
-
+ public static final String PARAMETER = "parameter";
// QName for the root element
- private static final QName QNAME = new QName(CORE_NS, "operation", CORE_PREFIX);
+ public static final QName QNAME = new QName(CORE_NS, "operation", CORE_PREFIX);
/**
* Marshalls a physical operation to the xml writer.
*/
public void marshal(PhysicalOperationDefinition modelObject, XMLStreamWriter writer) throws MarshalException {
-
+
try {
writer.writeStartElement(QNAME.getPrefix(), QNAME.getLocalPart(), QNAME.getNamespaceURI());
writer.writeAttribute(NAME, modelObject.getName());
@@ -68,7 +67,7 @@
writer.writeStartElement(QNAME.getPrefix(), RETURN_TYPE, QNAME.getNamespaceURI());
writer.writeCharacters(modelObject.getReturnType());
writer.writeEndElement();
- for(String parameter : modelObject.getParameters()) {
+ for (String parameter : modelObject.getParameters()) {
writer.writeStartElement(QNAME.getPrefix(), PARAMETER, QNAME.getNamespaceURI());
writer.writeCharacters(parameter);
writer.writeEndElement();
@@ -77,7 +76,7 @@
} catch (XMLStreamException ex) {
throw new MarshalException(ex);
}
-
+
}
/**
@@ -101,7 +100,7 @@
}
break;
case END_ELEMENT:
- if (getModelObjectQName().equals(reader.getName())) {
+ if (QNAME.equals(reader.getName())) {
return operation;
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/PhysicalWireDefinitionMarshaller.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/PhysicalWireDefinitionMarshaller.java?view=diff&rev=517041&r1=517040&r2=517041
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/PhysicalWireDefinitionMarshaller.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/PhysicalWireDefinitionMarshaller.java Sun Mar 11 16:10:54 2007
@@ -18,11 +18,10 @@
*/
package org.apache.tuscany.core.marshaller;
-import static javax.xml.stream.XMLStreamConstants.START_ELEMENT;
import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;
-
-import java.net.URI;
-import java.net.URISyntaxException;
+import static javax.xml.stream.XMLStreamConstants.START_ELEMENT;
+import static org.apache.tuscany.core.marshaller.PhysicalChangeSetMarshaller.CORE_NS;
+import static org.apache.tuscany.core.marshaller.PhysicalChangeSetMarshaller.CORE_PREFIX;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamException;
@@ -33,9 +32,8 @@
import org.apache.tuscany.spi.model.ModelObject;
import org.apache.tuscany.spi.model.physical.PhysicalOperationDefinition;
import org.apache.tuscany.spi.model.physical.PhysicalWireDefinition;
-
-import static org.apache.tuscany.core.marshaller.PhysicalChangeSetMarshaller.CORE_NS;
-import static org.apache.tuscany.core.marshaller.PhysicalChangeSetMarshaller.CORE_PREFIX;
+import org.apache.tuscany.spi.model.physical.PhysicalWireSourceDefinition;
+import org.apache.tuscany.spi.model.physical.PhysicalWireTargetDefinition;
/**
* Marshaller for physical wire definition.
@@ -45,32 +43,35 @@
*/
public class PhysicalWireDefinitionMarshaller extends AbstractMarshallerExtension<PhysicalWireDefinition> {
- // Source URI attribute
- private static final String SOURCE_URI = "sourceUri";
+ // Source
+ public static final String SOURCE = "wireSource";
+
+ // Target
+ public static final String TARGET = "wireTarget";
- // Source URI attribute
- private static final String TARGET_URI = "targetUri";
+ // Operation
+ public static final String OPERATION = "operation";
// QName for the root element
- private static final QName QNAME = new QName(CORE_NS, "wire", CORE_PREFIX);
+ public static final QName QNAME = new QName(CORE_NS, "wire", CORE_PREFIX);
/**
* Marshalls a physical wire to the xml writer.
*/
public void marshal(PhysicalWireDefinition modelObject, XMLStreamWriter writer) throws MarshalException {
-
+
try {
writer.writeStartElement(QNAME.getPrefix(), QNAME.getLocalPart(), QNAME.getNamespaceURI());
- writer.writeAttribute(SOURCE_URI, modelObject.getSourceUri().toASCIIString());
- writer.writeAttribute(TARGET_URI, modelObject.getTargetUri().toASCIIString());
- for(PhysicalOperationDefinition pod : modelObject.getOperations()) {
+ for (PhysicalOperationDefinition pod : modelObject.getOperations()) {
registry.marshall(pod, writer);
}
+ registry.marshall(modelObject.getSource(), writer);
+ registry.marshall(modelObject.getTarget(), writer);
writer.writeEndElement();
} catch (XMLStreamException ex) {
throw new MarshalException(ex);
}
-
+
}
/**
@@ -80,22 +81,26 @@
try {
PhysicalWireDefinition wireDefinition = new PhysicalWireDefinition();
- wireDefinition.setSourceUri(new URI(reader.getAttributeValue(null, SOURCE_URI)));
- wireDefinition.setTargetUri(new URI(reader.getAttributeValue(null, TARGET_URI)));
while (true) {
switch (reader.next()) {
case START_ELEMENT:
+ String name = reader.getName().getLocalPart();
ModelObject modelObject = registry.unmarshall(reader);
- wireDefinition.addOperation((PhysicalOperationDefinition)modelObject);
+ if (OPERATION.equals(name)) {
+ wireDefinition.addOperation((PhysicalOperationDefinition)modelObject);
+ } else if (SOURCE.equals(name)) {
+ wireDefinition.setSource((PhysicalWireSourceDefinition)modelObject);
+ } else if (TARGET.equals(name)) {
+ wireDefinition.setTarget((PhysicalWireTargetDefinition)modelObject);
+ }
break;
case END_ELEMENT:
- return wireDefinition;
-
+ if (QNAME.equals(reader.getName())) {
+ return wireDefinition;
+ }
}
}
} catch (XMLStreamException ex) {
- throw new MarshalException(ex);
- } catch (URISyntaxException ex) {
throw new MarshalException(ex);
}
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=517041&r1=517040&r2=517041
==============================================================================
--- 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 Sun Mar 11 16:10:54 2007
@@ -44,13 +44,13 @@
extends AbstractExtensibleMarshallerExtension<PCD> {
// Component id attribute
- private static final String COMPONENT_ID = "componentId";
+ public static final String COMPONENT_ID = "componentId";
// Reference
- private static final String REFERENCE = "reference";
+ public static final String REFERENCE = "reference";
// Service
- private static final String SERVICE = "service";
+ public static final String SERVICE = "service";
/**
* Marshalls a physical change set to the xml writer.
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=517041&r1=517040&r2=517041
==============================================================================
--- 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 Sun Mar 11 16:10:54 2007
@@ -40,10 +40,10 @@
AbstractExtensibleMarshallerExtension<PRD> {
// Local part for operation
- private static final String OPERATION = "operation";
+ public static final String OPERATION = "operation";
// Source name attribute
- private static final String NAME = "name";
+ public static final String NAME = "name";
/**
* Marshalls a physical java reference definition to the xml writer.
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=517041&r1=517040&r2=517041
==============================================================================
--- 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 Sun Mar 11 16:10:54 2007
@@ -40,10 +40,10 @@
AbstractExtensibleMarshallerExtension<PSD> {
// Local part for operation
- private static final String OPERATION = "operation";
+ public static final String OPERATION = "operation";
// Source name attribute
- private static final String NAME = "name";
+ public static final String NAME = "name";
/**
* Marshalls a physical java reference definition to the xml writer.
Added: 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=auto&rev=517041
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/extensions/AbstractPhysicalWireSourceDefinitionMarshaller.java (added)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/extensions/AbstractPhysicalWireSourceDefinitionMarshaller.java Sun Mar 11 16:10:54 2007
@@ -0,0 +1,81 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tuscany.core.marshaller.extensions;
+
+import java.net.URI;
+import java.net.URISyntaxException;
+
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+import javax.xml.stream.XMLStreamWriter;
+
+import org.apache.tuscany.spi.marshaller.MarshalException;
+import org.apache.tuscany.spi.model.physical.PhysicalWireSourceDefinition;
+
+/**
+ * Abstract marshaller for physical wire source definition.
+ *
+ * @version $Revision$ $Date$
+ */
+public abstract class AbstractPhysicalWireSourceDefinitionMarshaller<PWSD extends PhysicalWireSourceDefinition> extends
+ AbstractExtensibleMarshallerExtension<PWSD> {
+
+ // Source name attribute
+ public static final String URI_ATTRIBUTE = "uri";
+
+ /**
+ * Marshalls a physical java reference definition to the xml writer.
+ */
+ public void marshal(PWSD modelObject, XMLStreamWriter writer) throws MarshalException {
+
+ try {
+
+ QName qname = getModelObjectQName();
+ writer.writeStartElement(qname.getPrefix(), qname.getLocalPart(), qname.getNamespaceURI());
+ writer.writeAttribute(URI_ATTRIBUTE, modelObject.getUri().toASCIIString());
+ writer.writeNamespace(qname.getPrefix(), qname.getNamespaceURI());
+
+ handleExtension(modelObject, writer);
+
+ writer.writeEndElement();
+
+ } catch (XMLStreamException ex) {
+ throw new MarshalException(ex);
+ }
+
+ }
+
+ /**
+ * Unmarshalls a java physical reference definition from the xml reader.
+ */
+ public PWSD unmarshal(XMLStreamReader reader) throws MarshalException {
+
+ try {
+ PWSD sourceDefinition = getConcreteModelObject();
+ sourceDefinition.setUri(new URI(reader.getAttributeValue(null, URI_ATTRIBUTE)));
+ handleExtension(sourceDefinition, reader);
+ return sourceDefinition;
+ } catch (URISyntaxException ex) {
+ throw new MarshalException(ex);
+ }
+
+ }
+
+}
Propchange: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/extensions/AbstractPhysicalWireSourceDefinitionMarshaller.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/extensions/AbstractPhysicalWireSourceDefinitionMarshaller.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/extensions/AbstractPhysicalWireTargetDefinitionMarshaller.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/extensions/AbstractPhysicalWireTargetDefinitionMarshaller.java?view=auto&rev=517041
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/extensions/AbstractPhysicalWireTargetDefinitionMarshaller.java (added)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/extensions/AbstractPhysicalWireTargetDefinitionMarshaller.java Sun Mar 11 16:10:54 2007
@@ -0,0 +1,81 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tuscany.core.marshaller.extensions;
+
+import java.net.URI;
+import java.net.URISyntaxException;
+
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+import javax.xml.stream.XMLStreamWriter;
+
+import org.apache.tuscany.spi.marshaller.MarshalException;
+import org.apache.tuscany.spi.model.physical.PhysicalWireTargetDefinition;
+
+/**
+ * Abstract marshaller for physical wire target definition.
+ *
+ * @version $Revision$ $Date$
+ */
+public abstract class AbstractPhysicalWireTargetDefinitionMarshaller<PWTD extends PhysicalWireTargetDefinition> extends
+ AbstractExtensibleMarshallerExtension<PWTD> {
+
+ // Source name attribute
+ public static final String URI_ATTRIBUTE = "uri";
+
+ /**
+ * Marshalls a physical java reference definition to the xml writer.
+ */
+ public void marshal(PWTD modelObject, XMLStreamWriter writer) throws MarshalException {
+
+ try {
+
+ QName qname = getModelObjectQName();
+ writer.writeStartElement(qname.getPrefix(), qname.getLocalPart(), qname.getNamespaceURI());
+ writer.writeAttribute(URI_ATTRIBUTE, modelObject.getUri().toASCIIString());
+ writer.writeNamespace(qname.getPrefix(), qname.getNamespaceURI());
+
+ handleExtension(modelObject, writer);
+
+ writer.writeEndElement();
+
+ } catch (XMLStreamException ex) {
+ throw new MarshalException(ex);
+ }
+
+ }
+
+ /**
+ * Unmarshalls a java physical reference definition from the xml reader.
+ */
+ public PWTD unmarshal(XMLStreamReader reader) throws MarshalException {
+
+ try {
+ PWTD targetDefinition = getConcreteModelObject();
+ targetDefinition.setUri(new URI(reader.getAttributeValue(null, URI_ATTRIBUTE)));
+ handleExtension(targetDefinition, reader);
+ return targetDefinition;
+ } catch (URISyntaxException ex) {
+ throw new MarshalException(ex);
+ }
+
+ }
+
+}
Propchange: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/extensions/AbstractPhysicalWireTargetDefinitionMarshaller.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/extensions/AbstractPhysicalWireTargetDefinitionMarshaller.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
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=517041&r1=517040&r2=517041
==============================================================================
--- 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 Sun Mar 11 16:10:54 2007
@@ -27,6 +27,7 @@
import javax.xml.stream.XMLStreamWriter;
import org.apache.commons.codec.binary.Base64;
+import org.apache.tuscany.core.marshaller.PhysicalChangeSetMarshaller;
import org.apache.tuscany.core.marshaller.extensions.AbstractPhysicalComponentDefinitionMarshaller;
import org.apache.tuscany.core.model.physical.java.JavaPhysicalComponentDefinition;
import org.apache.tuscany.spi.marshaller.MarshalException;
@@ -58,7 +59,7 @@
// QName for the root element
private static final QName QNAME =
- new QName(JAVA_NS, "component", JAVA_PREFIX);
+ new QName(JAVA_NS, PhysicalChangeSetMarshaller.COMPONENT, JAVA_PREFIX);
/**
* Gets the qualified name of the XML fragment for the marshalled model
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=517041&r1=517040&r2=517041
==============================================================================
--- 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 Sun Mar 11 16:10:54 2007
@@ -25,6 +25,7 @@
import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLStreamWriter;
+import org.apache.tuscany.core.marshaller.extensions.AbstractPhysicalComponentDefinitionMarshaller;
import org.apache.tuscany.core.marshaller.extensions.AbstractPhysicalReferenceDefinitionMarshaller;
import org.apache.tuscany.core.model.physical.java.JavaPhysicalReferenceDefinition;
@@ -38,7 +39,7 @@
AbstractPhysicalReferenceDefinitionMarshaller<JavaPhysicalReferenceDefinition> {
// QName for the root element
- private static final QName QNAME = new QName(JAVA_NS, "reference", JAVA_PREFIX);
+ private static final QName QNAME = new QName(JAVA_NS, AbstractPhysicalComponentDefinitionMarshaller.REFERENCE, JAVA_PREFIX);
/**
* Gets the qualified name of the XML fragment for the marshalled model
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=517041&r1=517040&r2=517041
==============================================================================
--- 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 Sun Mar 11 16:10:54 2007
@@ -25,6 +25,7 @@
import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLStreamWriter;
+import org.apache.tuscany.core.marshaller.extensions.AbstractPhysicalComponentDefinitionMarshaller;
import org.apache.tuscany.core.marshaller.extensions.AbstractPhysicalServiceDefinitionMarshaller;
import org.apache.tuscany.core.model.physical.java.JavaPhysicalServiceDefinition;
@@ -38,7 +39,7 @@
AbstractPhysicalServiceDefinitionMarshaller<JavaPhysicalServiceDefinition> {
// QName for the root element
- private static final QName QNAME = new QName(JAVA_NS, "service", JAVA_PREFIX);
+ private static final QName QNAME = new QName(JAVA_NS, AbstractPhysicalComponentDefinitionMarshaller.SERVICE, JAVA_PREFIX);
/**
* Gets the qualified name of the XML fragment for the marshalled model
Added: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/extensions/java/JavaPhysicalWireSourceDefinitionMarshaller.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/extensions/java/JavaPhysicalWireSourceDefinitionMarshaller.java?view=auto&rev=517041
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/extensions/java/JavaPhysicalWireSourceDefinitionMarshaller.java (added)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/extensions/java/JavaPhysicalWireSourceDefinitionMarshaller.java Sun Mar 11 16:10:54 2007
@@ -0,0 +1,96 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tuscany.core.marshaller.extensions.java;
+
+import static org.apache.tuscany.core.marshaller.extensions.java.JavaPhysicalComponentDefinitionMarshaller.JAVA_NS;
+import static org.apache.tuscany.core.marshaller.extensions.java.JavaPhysicalComponentDefinitionMarshaller.JAVA_PREFIX;
+
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLStreamReader;
+import javax.xml.stream.XMLStreamWriter;
+
+import org.apache.tuscany.core.marshaller.PhysicalWireDefinitionMarshaller;
+import org.apache.tuscany.core.marshaller.extensions.AbstractPhysicalWireSourceDefinitionMarshaller;
+import org.apache.tuscany.core.model.physical.java.JavaPhysicalWireSourceDefinition;
+
+/**
+ * Marshaller for java physical wire source definition.
+ *
+ * @version $Revision$ $Date: 2007-03-03 16:41:22 +0000 (Sat, 03 Mar
+ * 2007) $
+ */
+public class JavaPhysicalWireSourceDefinitionMarshaller extends
+ AbstractPhysicalWireSourceDefinitionMarshaller<JavaPhysicalWireSourceDefinition> {
+
+ // QName for the root element
+ private static final QName QNAME = new QName(JAVA_NS, PhysicalWireDefinitionMarshaller.SOURCE, JAVA_PREFIX);
+
+ /**
+ * Gets the qualified name of the XML fragment for the marshalled model
+ * object.
+ *
+ * @return {"http://tuscany.apache.org/xmlns/marshaller/reference/java/1.0-SNAPSHOT",
+ * "service"}.
+ */
+ @Override
+ protected QName getModelObjectQName() {
+ return QNAME;
+ }
+
+ /**
+ * Returns the type of the model object.
+ *
+ * @return <code>JavaPhysicalWireSourceDefinition.class</code>.
+ */
+ @Override
+ protected Class<JavaPhysicalWireSourceDefinition> getModelObjectType() {
+ return JavaPhysicalWireSourceDefinition.class;
+ }
+
+ /**
+ * Create the concrete model object.
+ *
+ * @return An instance of <code>JavaPhysicalWireSourceDefinition</code>.
+ */
+ @Override
+ protected JavaPhysicalWireSourceDefinition getConcreteModelObject() {
+ return new JavaPhysicalWireSourceDefinition();
+ }
+
+ /**
+ * Handles extensions for unmarshalling Java wire source definitions.
+ *
+ * @param modelObject Concrete model object.
+ * @param reader Reader from which marshalled data is read.
+ */
+ @Override
+ protected void handleExtension(JavaPhysicalWireSourceDefinition modelObject, XMLStreamReader reader) {
+ }
+
+ /**
+ * Handles extensions for marshalling Java wire source definitions.
+ *
+ * @param modelObject Concrete model object.
+ * @param reader Writer to which marshalled data is written.
+ */
+ @Override
+ protected void handleExtension(JavaPhysicalWireSourceDefinition modelObject, XMLStreamWriter writer) {
+ }
+
+}
Propchange: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/extensions/java/JavaPhysicalWireSourceDefinitionMarshaller.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/extensions/java/JavaPhysicalWireSourceDefinitionMarshaller.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/extensions/java/JavaPhysicalWireTargetDefinitionMarshaller.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/extensions/java/JavaPhysicalWireTargetDefinitionMarshaller.java?view=auto&rev=517041
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/extensions/java/JavaPhysicalWireTargetDefinitionMarshaller.java (added)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/extensions/java/JavaPhysicalWireTargetDefinitionMarshaller.java Sun Mar 11 16:10:54 2007
@@ -0,0 +1,96 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tuscany.core.marshaller.extensions.java;
+
+import static org.apache.tuscany.core.marshaller.extensions.java.JavaPhysicalComponentDefinitionMarshaller.JAVA_NS;
+import static org.apache.tuscany.core.marshaller.extensions.java.JavaPhysicalComponentDefinitionMarshaller.JAVA_PREFIX;
+
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLStreamReader;
+import javax.xml.stream.XMLStreamWriter;
+
+import org.apache.tuscany.core.marshaller.PhysicalWireDefinitionMarshaller;
+import org.apache.tuscany.core.marshaller.extensions.AbstractPhysicalWireTargetDefinitionMarshaller;
+import org.apache.tuscany.core.model.physical.java.JavaPhysicalWireTargetDefinition;
+
+/**
+ * Marshaller for java physical service definition.
+ *
+ * @version $Revision$ $Date: 2007-03-03 16:41:22 +0000 (Sat, 03 Mar
+ * 2007) $
+ */
+public class JavaPhysicalWireTargetDefinitionMarshaller extends
+ AbstractPhysicalWireTargetDefinitionMarshaller<JavaPhysicalWireTargetDefinition> {
+
+ // QName for the root element
+ private static final QName QNAME = new QName(JAVA_NS, PhysicalWireDefinitionMarshaller.TARGET, JAVA_PREFIX);
+
+ /**
+ * Gets the qualified name of the XML fragment for the marshalled model
+ * object.
+ *
+ * @return {"http://tuscany.apache.org/xmlns/marshaller/reference/java/1.0-SNAPSHOT",
+ * "service"}.
+ */
+ @Override
+ protected QName getModelObjectQName() {
+ return QNAME;
+ }
+
+ /**
+ * Returns the type of the model object.
+ *
+ * @return <code>JavaPhysicalWireTargetDefinition.class</code>.
+ */
+ @Override
+ protected Class<JavaPhysicalWireTargetDefinition> getModelObjectType() {
+ return JavaPhysicalWireTargetDefinition.class;
+ }
+
+ /**
+ * Create the concrete model object.
+ *
+ * @return An instance of <code>JavaPhysicalWireTargetDefinition</code>.
+ */
+ @Override
+ protected JavaPhysicalWireTargetDefinition getConcreteModelObject() {
+ return new JavaPhysicalWireTargetDefinition();
+ }
+
+ /**
+ * Handles extensions for unmarshalling Java wire target definitions.
+ *
+ * @param modelObject Concrete model object.
+ * @param reader Reader from which marshalled data is read.
+ */
+ @Override
+ protected void handleExtension(JavaPhysicalWireTargetDefinition modelObject, XMLStreamReader reader) {
+ }
+
+ /**
+ * Handles extensions for marshalling Java wire target definitions.
+ *
+ * @param modelObject Concrete model object.
+ * @param reader Writer to which marshalled data is written.
+ */
+ @Override
+ protected void handleExtension(JavaPhysicalWireTargetDefinition modelObject, XMLStreamWriter writer) {
+ }
+
+}
Propchange: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/extensions/java/JavaPhysicalWireTargetDefinitionMarshaller.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/extensions/java/JavaPhysicalWireTargetDefinitionMarshaller.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/model/physical/java/JavaPhysicalWireSourceDefinition.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/model/physical/java/JavaPhysicalWireSourceDefinition.java?view=auto&rev=517041
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/model/physical/java/JavaPhysicalWireSourceDefinition.java (added)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/model/physical/java/JavaPhysicalWireSourceDefinition.java Sun Mar 11 16:10:54 2007
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tuscany.core.model.physical.java;
+
+import org.apache.tuscany.spi.model.physical.PhysicalWireSourceDefinition;
+
+/**
+ * Models a Java physical wire source definition.
+ *
+ * @version $Revision$ $Date: 2007-02-28 06:29:37 +0000 (Wed, 28 Feb
+ * 2007) $
+ */
+public class JavaPhysicalWireSourceDefinition extends PhysicalWireSourceDefinition {
+
+}
Propchange: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/model/physical/java/JavaPhysicalWireSourceDefinition.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/model/physical/java/JavaPhysicalWireSourceDefinition.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/model/physical/java/JavaPhysicalWireTargetDefinition.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/model/physical/java/JavaPhysicalWireTargetDefinition.java?view=auto&rev=517041
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/model/physical/java/JavaPhysicalWireTargetDefinition.java (added)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/model/physical/java/JavaPhysicalWireTargetDefinition.java Sun Mar 11 16:10:54 2007
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tuscany.core.model.physical.java;
+
+import org.apache.tuscany.spi.model.physical.PhysicalWireTargetDefinition;
+
+/**
+ * Models a Java physical wire target definition.
+ *
+ * @version $Revision$ $Date: 2007-02-28 06:29:37 +0000 (Wed, 28 Feb
+ * 2007) $
+ */
+public class JavaPhysicalWireTargetDefinition extends PhysicalWireTargetDefinition {
+
+}
Propchange: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/model/physical/java/JavaPhysicalWireTargetDefinition.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/model/physical/java/JavaPhysicalWireTargetDefinition.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/ConnectorImplWireTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/ConnectorImplWireTestCase.java?view=diff&rev=517041&r1=517040&r2=517041
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/ConnectorImplWireTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/ConnectorImplWireTestCase.java Sun Mar 11 16:10:54 2007
@@ -25,6 +25,8 @@
import org.apache.tuscany.spi.model.ServiceContract;
import org.apache.tuscany.spi.model.physical.PhysicalWireDefinition;
import org.apache.tuscany.spi.model.physical.PhysicalOperationDefinition;
+import org.apache.tuscany.spi.model.physical.PhysicalWireSourceDefinition;
+import org.apache.tuscany.spi.model.physical.PhysicalWireTargetDefinition;
import org.apache.tuscany.spi.component.AtomicComponent;
import org.apache.tuscany.spi.wire.Wire;
@@ -62,8 +64,12 @@
manager.register(target);
PhysicalWireDefinition definition = new PhysicalWireDefinition();
- definition.setSourceUri(SOURCE_URI);
- definition.setTargetUri(TARGET_URI);
+ PhysicalWireSourceDefinition pwsd = new PhysicalWireSourceDefinition();
+ pwsd.setUri(SOURCE_URI);
+ definition.setSource(pwsd);
+ PhysicalWireTargetDefinition pwtd = new PhysicalWireTargetDefinition();
+ pwtd.setUri(TARGET_URI);
+ definition.setTarget(pwtd);
PhysicalOperationDefinition op = new PhysicalOperationDefinition();
definition.addOperation(op);
connector.connect(definition);
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=517041&r1=517040&r2=517041
==============================================================================
--- 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 Sun Mar 11 16:10:54 2007
@@ -35,6 +35,8 @@
import org.apache.tuscany.core.marshaller.extensions.java.JavaPhysicalComponentDefinitionMarshaller;
import org.apache.tuscany.core.marshaller.extensions.java.JavaPhysicalReferenceDefinitionMarshaller;
import org.apache.tuscany.core.marshaller.extensions.java.JavaPhysicalServiceDefinitionMarshaller;
+import org.apache.tuscany.core.marshaller.extensions.java.JavaPhysicalWireSourceDefinitionMarshaller;
+import org.apache.tuscany.core.marshaller.extensions.java.JavaPhysicalWireTargetDefinitionMarshaller;
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;
@@ -64,7 +66,7 @@
registry = new DefaultModelMarshallerRegistry();
- AbstractMarshallerExtension<?>[] marshallers = new AbstractMarshallerExtension<?>[6];
+ AbstractMarshallerExtension<?>[] marshallers = new AbstractMarshallerExtension<?>[8];
marshallers[0] = new JavaPhysicalComponentDefinitionMarshaller();
marshallers[1] = new JavaPhysicalServiceDefinitionMarshaller();
@@ -72,8 +74,10 @@
marshallers[3] = new PhysicalOperationDefinitionMarshaller();
marshallers[4] = new PhysicalWireDefinitionMarshaller();
marshallers[5] = new PhysicalChangeSetMarshaller();
+ marshallers[6] = new JavaPhysicalWireSourceDefinitionMarshaller();
+ marshallers[7] = new JavaPhysicalWireTargetDefinitionMarshaller();
- for (int i = 0; i < 6; i++) {
+ for (int i = 0; i < 8; i++) {
marshallers[i].setMarshallerRegistry(registry);
}
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=517041&r1=517040&r2=517041
==============================================================================
--- 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 Sun Mar 11 16:10:54 2007
@@ -62,7 +62,9 @@
</java:component>
<!-- Wire 1 -->
- <core:wire sourceUri="cmp1#rf1" targetUri="cmp2#sv2">
+ <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" />
<core:operation name="op2">
<core:parameter>java.lang.String</core:parameter>
<core:parameter>java.lang.Long</core:parameter>
@@ -71,7 +73,9 @@
</core:wire>
<!-- Wire 2 -->
- <core:wire sourceUri="cmp2#rf2" targetUri="cmp1#sv1">
+ <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" />
<core:operation name="op1">
<core:parameter>java.lang.String</core:parameter>
<core:parameter>java.lang.Long</core:parameter>
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/physical/PhysicalWireDefinition.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/physical/PhysicalWireDefinition.java?view=diff&rev=517041&r1=517040&r2=517041
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/physical/PhysicalWireDefinition.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/physical/PhysicalWireDefinition.java Sun Mar 11 16:10:54 2007
@@ -20,8 +20,6 @@
import java.net.URI;
-import javax.xml.namespace.QName;
-
/**
* Model class representing the portable definition of a wire. This class is used to describe the inbound and outbound
* wires on a physical component definition.
@@ -30,55 +28,58 @@
*/
public class PhysicalWireDefinition extends Operations {
- // TODO this should be removed
- @Deprecated
- private QName bindingType;
-
- // The resolved source URI of the wire
- private URI sourceUri;
+ // Target definition
+ private PhysicalWireTargetDefinition target;
- // The resolved source URI of the wire
- private URI targetUri;
+ // Source definition
+ private PhysicalWireSourceDefinition source;
/**
- * Returns the wire binding type.
- * @return the binding type of the wire.
+ * Gets the Wire source URI.
+ * @return Wire source URI.
*/
- @Deprecated
- public QName getBindingType() {
- return bindingType;
+ public URI getSourceUri() {
+ return source.getUri();
}
/**
- * Sets the Wire source URI.
- * @param sourceUri Wire source URI.
+ * Gets the Wire target URI.
+ * @return Wire target URI.
*/
- public void setSourceUri(URI sourceUri) {
- this.sourceUri = sourceUri;
+ public URI getTargetUri() {
+ return target.getUri();
}
/**
- * Gets the Wire source URI.
- * @return Wire source URI.
+ * Gets the wire source.
+ * @return Wire source.
*/
- public URI getSourceUri() {
- return sourceUri;
+ public PhysicalWireSourceDefinition getSource() {
+ return source;
}
/**
- * Sets the Wire target URI.
- * @param targetUri Wire source URI.
+ * Sets the wire source.
+ * @param source Wire source.
*/
- public void setTargetUri(URI targetUri) {
- this.targetUri = targetUri;
+ public void setSource(PhysicalWireSourceDefinition source) {
+ this.source = source;
}
/**
- * Gets the Wire target URI.
- * @return Wire target URI.
+ * Gets the wire target.
+ * @return Wire target.
*/
- public URI getTargetUri() {
- return targetUri;
+ public PhysicalWireTargetDefinition getTarget() {
+ return target;
+ }
+
+ /**
+ * Sets the wire target.
+ * @param target Wire target.
+ */
+ public void setTarget(PhysicalWireTargetDefinition target) {
+ this.target = target;
}
}
Added: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/physical/PhysicalWireSourceDefinition.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/physical/PhysicalWireSourceDefinition.java?view=auto&rev=517041
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/physical/PhysicalWireSourceDefinition.java (added)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/physical/PhysicalWireSourceDefinition.java Sun Mar 11 16:10:54 2007
@@ -0,0 +1,52 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.tuscany.spi.model.physical;
+
+import java.net.URI;
+
+import org.apache.tuscany.spi.model.ModelObject;
+
+/**
+ * Represents a physical wire source definition.
+ *
+ * @version $Revision$ $Date$
+ */
+public class PhysicalWireSourceDefinition extends ModelObject {
+
+ // URI
+ private URI uri;
+
+ /**
+ * Gets the URI.
+ * @return Gets the URI.
+ */
+ public URI getUri() {
+ return uri;
+ }
+
+ /**
+ * Sets the URI.
+ * @param uri Sets the URI.
+ */
+ public void setUri(URI uri) {
+ this.uri = uri;
+ }
+
+}
Propchange: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/physical/PhysicalWireSourceDefinition.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/physical/PhysicalWireSourceDefinition.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/physical/PhysicalWireTargetDefinition.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/physical/PhysicalWireTargetDefinition.java?view=auto&rev=517041
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/physical/PhysicalWireTargetDefinition.java (added)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/physical/PhysicalWireTargetDefinition.java Sun Mar 11 16:10:54 2007
@@ -0,0 +1,52 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.tuscany.spi.model.physical;
+
+import java.net.URI;
+
+import org.apache.tuscany.spi.model.ModelObject;
+
+/**
+ * Represents a physical wire target definition.
+ *
+ * @version $Revision$ $Date$
+ */
+public class PhysicalWireTargetDefinition extends ModelObject {
+
+ // URI
+ private URI uri;
+
+ /**
+ * Gets the URI.
+ * @return Gets the URI.
+ */
+ public URI getUri() {
+ return uri;
+ }
+
+ /**
+ * Sets the URI.
+ * @param uri Sets the URI.
+ */
+ public void setUri(URI uri) {
+ this.uri = uri;
+ }
+
+}
Propchange: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/physical/PhysicalWireTargetDefinition.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/physical/PhysicalWireTargetDefinition.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org