Author: meerajk
Date: Tue Feb 27 22:10:06 2007
New Revision: 512615
URL: http://svn.apache.org/viewvc?view=rev&rev=512615
Log:
Added Java PCD marshaller
Added:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/PhysicalChangeSetMarshaller.java
- copied, changed from r512475,
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/ChangeSetMarshaller.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/PhysicalOperationDefinitionMarshaller.java
- copied, changed from r512475,
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/OperationDefinitionMarshaller.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/PhysicalWireDefinitionMarshaller.java
- copied, changed from r512475,
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/WireDefinitionMarshaller.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/java/
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/java/JavaPhysicalComponentDefinitionMarshaller.java
(with props)
Removed:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/ChangeSetMarshaller.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/OperationDefinitionMarshaller.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/WireDefinitionMarshaller.java
Modified:
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/physical/PhysicalComponentDefinition.java
Copied:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/PhysicalChangeSetMarshaller.java
(from r512475,
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/ChangeSetMarshaller.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=512615&p1=incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/ChangeSetMarshaller.java&r1=512475&p2=incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/PhysicalChangeSetMarshaller.java&r2=512615
==============================================================================
---
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/ChangeSetMarshaller.java
(original)
+++
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/PhysicalChangeSetMarshaller.java
Tue Feb 27 22:10:06 2007
@@ -36,10 +36,10 @@
* @version $Revision$ $Date$
*
*/
-public class ChangeSetMarshaller extends
AbstractMarshallerExtension<PhysicalChangeSet> {
+public class PhysicalChangeSetMarshaller extends
AbstractMarshallerExtension<PhysicalChangeSet> {
// QName for the root element
- private static final QName QNAME = new
QName("http://tuscany.apache.org/xmlns/1.0-SNAPSHOT";, "changeSet");
+ private static final QName QNAME = new
QName("http://tuscany.apache.org/xmlns/marshaller/1.0-SNAPSHOT";, "changeSet");
/**
* Marshalls a physical change set to the xml writer.
Copied:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/PhysicalOperationDefinitionMarshaller.java
(from r512475,
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/OperationDefinitionMarshaller.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=512615&p1=incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/OperationDefinitionMarshaller.java&r1=512475&p2=incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/PhysicalOperationDefinitionMarshaller.java&r2=512615
==============================================================================
---
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/OperationDefinitionMarshaller.java
(original)
+++
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/PhysicalOperationDefinitionMarshaller.java
Tue Feb 27 22:10:06 2007
@@ -26,27 +26,27 @@
import org.apache.tuscany.spi.model.physical.PhysicalOperationDefinition;
/**
- * Marshaller for physical wire definition.
+ * Marshaller for physical operation definition.
*
* @version $Revision$ $Date$
*/
-public class OperationDefinitionMarshaller extends
AbstractMarshallerExtension<PhysicalOperationDefinition> {
+public class PhysicalOperationDefinitionMarshaller extends
AbstractMarshallerExtension<PhysicalOperationDefinition> {
// Source URI attribute
private static final String NAME = "name";
// QName for the root element
- private static final QName QNAME = new
QName("http://tuscany.apache.org/xmlns/1.0-SNAPSHOT";, "operation");
+ private static final QName QNAME = new
QName("http://tuscany.apache.org/xmlns/marshaller/1.0-SNAPSHOT";, "operation");
/**
- * Marshalls a physical change set to the xml writer.
+ * Marshalls a physical operation to the xml writer.
*/
public void marshall(PhysicalOperationDefinition modelObject,
XMLStreamWriter writer) throws MarshallException {
throw new UnsupportedOperationException();
}
/**
- * Unmarshalls a physical change set from the xml reader.
+ * Unmarshalls a physical operation from the xml reader.
*/
public PhysicalOperationDefinition unmarshall(XMLStreamReader reader)
throws MarshallException {
Copied:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/PhysicalWireDefinitionMarshaller.java
(from r512475,
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/WireDefinitionMarshaller.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=512615&p1=incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/WireDefinitionMarshaller.java&r1=512475&p2=incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/PhysicalWireDefinitionMarshaller.java&r2=512615
==============================================================================
---
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/WireDefinitionMarshaller.java
(original)
+++
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/PhysicalWireDefinitionMarshaller.java
Tue Feb 27 22:10:06 2007
@@ -38,7 +38,7 @@
*
* @version $Revision$ $Date$
*/
-public class WireDefinitionMarshaller extends
AbstractMarshallerExtension<PhysicalWireDefinition> {
+public class PhysicalWireDefinitionMarshaller extends
AbstractMarshallerExtension<PhysicalWireDefinition> {
// Source URI attribute
private static final String SOURCE_URI = "sourceUri";
@@ -47,17 +47,17 @@
private static final String TARGET_URI = "targetUri";
// QName for the root element
- private static final QName QNAME = new
QName("http://tuscany.apache.org/xmlns/1.0-SNAPSHOT";, "wire");
+ private static final QName QNAME = new
QName("http://tuscany.apache.org/xmlns/marshaller/1.0-SNAPSHOT";, "wire");
/**
- * Marshalls a physical change set to the xml writer.
+ * Marshalls a physical wire to the xml writer.
*/
public void marshall(PhysicalWireDefinition modelObject, XMLStreamWriter
writer) throws MarshallException {
throw new UnsupportedOperationException();
}
/**
- * Unmarshalls a physical change set from the xml reader.
+ * Unmarshalls a physical wire from the xml reader.
*/
public PhysicalWireDefinition unmarshall(XMLStreamReader reader) throws
MarshallException {
Added:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/java/JavaPhysicalComponentDefinitionMarshaller.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/java/JavaPhysicalComponentDefinitionMarshaller.java?view=auto&rev=512615
==============================================================================
---
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/java/JavaPhysicalComponentDefinitionMarshaller.java
(added)
+++
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/java/JavaPhysicalComponentDefinitionMarshaller.java
Tue Feb 27 22:10:06 2007
@@ -0,0 +1,115 @@
+/*
+ * 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.java;
+
+import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;
+import static javax.xml.stream.XMLStreamConstants.START_ELEMENT;
+
+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.commons.codec.binary.Base64;
+import org.apache.tuscany.core.component.JavaPhysicalComponentDefinition;
+import org.apache.tuscany.core.marshaller.AbstractMarshallerExtension;
+import org.apache.tuscany.spi.marshaller.MarshallException;
+import org.apache.tuscany.spi.model.physical.PhysicalReferenceDefinition;
+import org.apache.tuscany.spi.model.physical.PhysicalServiceDefinition;
+
+/**
+ * Marshaller for physical wire definition.
+ *
+ * @version $Revision$ $Date$
+ */
+public class JavaPhysicalComponentDefinitionMarshaller extends
AbstractMarshallerExtension<JavaPhysicalComponentDefinition> {
+
+ // Component id attribute
+ private static final String COMPONENT_ID = "componentId";
+
+ // Reference
+ private static final String REFERENCE = "reference";
+
+ // Service
+ private static final String SERVICE = "service";
+
+ // Instance factory
+ private static final String INSTANCE_FACTORY = "instanceFactory";
+
+ // QName for the root element
+ private static final QName QNAME = new
QName("http://tuscany.apache.org/xmlns/marshaller/component/java/1.0-SNAPSHOT";,
"component");
+
+ /**
+ * Marshalls a physical change set to the xml writer.
+ */
+ public void marshall(JavaPhysicalComponentDefinition modelObject,
XMLStreamWriter writer) throws MarshallException {
+ throw new UnsupportedOperationException();
+ }
+
+ /**
+ * Unmarshalls a physical change set from the xml reader.
+ */
+ public JavaPhysicalComponentDefinition unmarshall(XMLStreamReader reader)
throws MarshallException {
+
+ try {
+ JavaPhysicalComponentDefinition javaPhysicalComponentDefinition =
new JavaPhysicalComponentDefinition();
+ javaPhysicalComponentDefinition.setComponentId(new
URI(reader.getAttributeValue(null, COMPONENT_ID)));
+ while (true) {
+ switch (reader.next()) {
+ case START_ELEMENT:
+ String name = reader.getName().getLocalPart();
+ if(REFERENCE.equals(name)) {
+ PhysicalReferenceDefinition reference =
(PhysicalReferenceDefinition) registry.unmarshall(reader);
+
javaPhysicalComponentDefinition.addReference(reference);
+ } else if(SERVICE.equals(name)) {
+ PhysicalServiceDefinition service =
(PhysicalServiceDefinition) registry.unmarshall(reader);
+
javaPhysicalComponentDefinition.addService(service);
+ } else if(INSTANCE_FACTORY.equals(name)) {
+ byte[] base64ByteCode =
reader.getText().getBytes();
+ byte[] byteCode =
Base64.decodeBase64(base64ByteCode);
+
javaPhysicalComponentDefinition.setInstanceFactoryByteCode(byteCode);
+ }
+ break;
+ case END_ELEMENT:
+ return javaPhysicalComponentDefinition;
+
+ }
+ }
+ } catch (XMLStreamException ex) {
+ throw new MarshallException(ex);
+ } catch (URISyntaxException ex) {
+ throw new MarshallException(ex);
+ }
+
+ }
+
+ @Override
+ protected QName getModelObjectQName() {
+ return QNAME;
+ }
+
+ @Override
+ protected Class<JavaPhysicalComponentDefinition> getModelObjectType() {
+ return JavaPhysicalComponentDefinition.class;
+ }
+
+}
Propchange:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/java/JavaPhysicalComponentDefinitionMarshaller.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/java/JavaPhysicalComponentDefinitionMarshaller.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified:
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/physical/PhysicalComponentDefinition.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/physical/PhysicalComponentDefinition.java?view=diff&rev=512615&r1=512614&r2=512615
==============================================================================
---
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/physical/PhysicalComponentDefinition.java
(original)
+++
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/physical/PhysicalComponentDefinition.java
Tue Feb 27 22:10:06 2007
@@ -85,7 +85,7 @@
* Adds a reference definition to the component.
* @param reference Reference definition to be added to the component.
*/
- public void addService(PhysicalReferenceDefinition reference) {
+ public void addReference(PhysicalReferenceDefinition reference) {
references.add(reference);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
