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 18:37:32 UTC
svn commit: r517301 - in /incubator/tuscany/java/sca/kernel:
core/src/main/java/org/apache/tuscany/core/marshaller/extensions/
core/src/main/java/org/apache/tuscany/core/marshaller/extensions/java/
core/src/main/java/org/apache/tuscany/core/model/physi...
Author: meerajk
Date: Mon Mar 12 10:37:30 2007
New Revision: 517301
URL: http://svn.apache.org/viewvc?view=rev&rev=517301
Log:
nuked PRD and PSD
Removed:
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/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/main/java/org/apache/tuscany/core/model/physical/java/JavaPhysicalReferenceDefinition.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/model/physical/java/JavaPhysicalServiceDefinition.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/physical/PhysicalReferenceDefinition.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/physical/PhysicalServiceDefinition.java
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/extensions/AbstractPhysicalComponentDefinitionMarshaller.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/PhysicalComponentDefinition.java
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=517301&r1=517300&r2=517301
==============================================================================
--- 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 Mon Mar 12 10:37:30 2007
@@ -31,8 +31,6 @@
import org.apache.tuscany.spi.marshaller.MarshalException;
import org.apache.tuscany.spi.model.physical.PhysicalComponentDefinition;
-import org.apache.tuscany.spi.model.physical.PhysicalReferenceDefinition;
-import org.apache.tuscany.spi.model.physical.PhysicalServiceDefinition;
/**
* Abstract super class for all PCD marshallers.
@@ -46,12 +44,6 @@
// Component id attribute
public static final String COMPONENT_ID = "componentId";
- // Reference
- public static final String REFERENCE = "reference";
-
- // Service
- public static final String SERVICE = "service";
-
/**
* Marshalls a physical change set to the xml writer.
*/
@@ -64,13 +56,6 @@
writer.writeAttribute(COMPONENT_ID, modelObject.getComponentId().toASCIIString());
writer.writeNamespace(qname.getPrefix(), qname.getNamespaceURI());
- for(PhysicalReferenceDefinition prd : modelObject.getReferences()) {
- registry.marshall(prd, writer);
- }
- for(PhysicalServiceDefinition psd : modelObject.getServices()) {
- registry.marshall(psd, writer);
- }
-
handleExtension(modelObject, writer);
writer.writeEndElement();
@@ -92,16 +77,7 @@
while (true) {
switch (reader.next()) {
case START_ELEMENT:
- String name = reader.getName().getLocalPart();
- if (REFERENCE.equals(name)) {
- PhysicalReferenceDefinition reference = (PhysicalReferenceDefinition)registry.unmarshall(reader);
- componentDefinition.addReference(reference);
- } else if (SERVICE.equals(name)) {
- PhysicalServiceDefinition service = (PhysicalServiceDefinition)registry.unmarshall(reader);
- componentDefinition.addService(service);
- } else {
- handleExtension(componentDefinition, reader);
- }
+ handleExtension(componentDefinition, reader);
break;
case END_ELEMENT:
if (getModelObjectQName().equals(reader.getName())) {
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=517301&r1=517300&r2=517301
==============================================================================
--- 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 Mon Mar 12 10:37:30 2007
@@ -33,19 +33,13 @@
import junit.framework.TestCase;
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;
import org.apache.tuscany.spi.marshaller.ModelMarshallerRegistry;
import org.apache.tuscany.spi.model.physical.PhysicalChangeSet;
import org.apache.tuscany.spi.model.physical.PhysicalComponentDefinition;
import org.apache.tuscany.spi.model.physical.PhysicalOperationDefinition;
-import org.apache.tuscany.spi.model.physical.PhysicalReferenceDefinition;
-import org.apache.tuscany.spi.model.physical.PhysicalServiceDefinition;
import org.apache.tuscany.spi.model.physical.PhysicalWireDefinition;
/**
@@ -66,18 +60,16 @@
registry = new DefaultModelMarshallerRegistry();
- AbstractMarshallerExtension<?>[] marshallers = new AbstractMarshallerExtension<?>[8];
+ AbstractMarshallerExtension<?>[] marshallers = new AbstractMarshallerExtension<?>[6];
marshallers[0] = new JavaPhysicalComponentDefinitionMarshaller();
- marshallers[1] = new JavaPhysicalServiceDefinitionMarshaller();
- marshallers[2] = new JavaPhysicalReferenceDefinitionMarshaller();
- marshallers[3] = new PhysicalOperationDefinitionMarshaller();
- marshallers[4] = new PhysicalWireDefinitionMarshaller();
- marshallers[5] = new PhysicalChangeSetMarshaller();
- marshallers[6] = new JavaPhysicalWireSourceDefinitionMarshaller();
- marshallers[7] = new JavaPhysicalWireTargetDefinitionMarshaller();
+ marshallers[1] = new PhysicalOperationDefinitionMarshaller();
+ marshallers[2] = new PhysicalWireDefinitionMarshaller();
+ marshallers[3] = new PhysicalChangeSetMarshaller();
+ marshallers[4] = new JavaPhysicalWireSourceDefinitionMarshaller();
+ marshallers[5] = new JavaPhysicalWireTargetDefinitionMarshaller();
- for (int i = 0; i < 8; i++) {
+ for (int i = 0; i < 6; i++) {
marshallers[i].setMarshallerRegistry(registry);
}
@@ -132,51 +124,7 @@
assertTrue(pcd instanceof JavaPhysicalComponentDefinition);
String componentId = pcd.getComponentId().toString();
assertTrue("cmp1".equals(componentId) || "cmp2".equals(componentId));
-
- JavaPhysicalComponentDefinition jpcd = (JavaPhysicalComponentDefinition)pcd;
-
- Set<PhysicalReferenceDefinition> refs = jpcd.getReferences();
- assertEquals(1, refs.size());
- JavaPhysicalReferenceDefinition ref = (JavaPhysicalReferenceDefinition) refs.iterator().next();
- assertEquals(1, ref.getOperations().size());
- assertEquals(1, ref.getNonCallbackOperations().size());
- assertEquals(0, ref.getCallbackOperations().size());
-
- if ("cmp1".equals(componentId)) {
- assertEquals("rf1", ref.getName());
- Set<PhysicalOperationDefinition> pods = ref.getOperations();
- assertEquals(1, pods.size());
- PhysicalOperationDefinition pod = pods.iterator().next();
- assertEquals("op2", pod.getName());
- assertEquals("java.lang.Object", pod.getReturnType());
- assertEquals(2, pod.getParameters().size());
- } else {
- assertEquals("rf2", ref.getName());
- Set<PhysicalOperationDefinition> pods = ref.getOperations();
- assertEquals(1, pods.size());
- PhysicalOperationDefinition pod = pods.iterator().next();
- assertEquals("op1", pod.getName());
- }
-
- Set<PhysicalServiceDefinition> svs = jpcd.getServices();
- assertEquals(1, svs.size());
- JavaPhysicalServiceDefinition sv = (JavaPhysicalServiceDefinition)svs.iterator().next();
- assertEquals(1, sv.getOperations().size());
- assertEquals(1, sv.getNonCallbackOperations().size());
- assertEquals(0, sv.getCallbackOperations().size());
- if ("cmp1".equals(componentId)) {
- assertEquals("sv1", sv.getName());
- Set<PhysicalOperationDefinition> pods = sv.getOperations();
- assertEquals(1, pods.size());
- PhysicalOperationDefinition pod = pods.iterator().next();
- assertEquals("op1", pod.getName());
- } else {
- assertEquals("sv2", sv.getName());
- Set<PhysicalOperationDefinition> pods = sv.getOperations();
- assertEquals(1, pods.size());
- PhysicalOperationDefinition pod = pods.iterator().next();
- assertEquals("op2", pod.getName());
- }
+ assertTrue(pcd instanceof JavaPhysicalComponentDefinition);
}
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=517301&r1=517300&r2=517301
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/resources/marshall/javaChangeSet.xml (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/resources/marshall/javaChangeSet.xml Mon Mar 12 10:37:30 2007
@@ -21,42 +21,12 @@
<!-- Component 1 -->
<java:component xmlns:java="http://tuscany.apache.org/xmlns/marshaller/java/1.0-SNAPSHOT" componentId="cmp1">
- <java:reference name="rf1">
- <core:operation name="op2">
- <core:parameter>java.lang.String</core:parameter>
- <core:parameter>java.lang.Long</core:parameter>
- <core:returnType>java.lang.Object</core:returnType>
- </core:operation>
- </java:reference>
- <java:service name="sv1">
- <core:operation name="op1">
- <core:parameter>java.lang.String</core:parameter>
- <core:parameter>java.lang.Long</core:parameter>
- <core:returnType>java.lang.Object</core:returnType>
- </core:operation>
- </java:service>
- <java:instanceFactory>1234ASF</java:instanceFactory>
<java:scope>STATELESS</java:scope>
<java:classLoaderId>#123</java:classLoaderId>
</java:component>
<!-- Component 2 -->
<java:component xmlns:java="http://tuscany.apache.org/xmlns/marshaller/java/1.0-SNAPSHOT" componentId="cmp2">
- <java:reference name="rf2">
- <core:operation name="op1">
- <core:parameter>java.lang.String</core:parameter>
- <core:parameter>java.lang.Long</core:parameter>
- <core:returnType>java.lang.Object</core:returnType>
- </core:operation>
- </java:reference>
- <java:service name="sv2">
- <core:operation name="op2">
- <core:parameter>java.lang.String</core:parameter>
- <core:parameter>java.lang.Long</core:parameter>
- <core:returnType>java.lang.Object</core:returnType>
- </core:operation>
- </java:service>
- <java:instanceFactory>1234ASF</java:instanceFactory>
<java:scope>STATELESS</java:scope>
<java:classLoaderId>#123</java:classLoaderId>
</java:component>
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=517301&r1=517300&r2=517301
==============================================================================
--- 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 Mon Mar 12 10:37:30 2007
@@ -19,9 +19,6 @@
package org.apache.tuscany.spi.model.physical;
import java.net.URI;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
import org.apache.tuscany.spi.model.ModelObject;
@@ -35,12 +32,6 @@
// Component Id.
private URI componentId;
- // Services exposed by this component
- private Set<PhysicalServiceDefinition> services = new HashSet<PhysicalServiceDefinition>();
-
- // References exposed by this component
- private Set<PhysicalReferenceDefinition> references = new HashSet<PhysicalReferenceDefinition>();
-
/**
* Gets the component id.
*
@@ -57,42 +48,6 @@
*/
public void setComponentId(URI componentId) {
this.componentId = componentId;
- }
-
- /**
- * Returns the service definitions available for this component.
- *
- * @return Service definitions for this operation.
- */
- public Set<PhysicalServiceDefinition> getServices() {
- return Collections.unmodifiableSet(services);
- }
-
- /**
- * Adds a service definition to the component.
- *
- * @param service Service definition to be added to the component.
- */
- public void addService(PhysicalServiceDefinition service) {
- services.add(service);
- }
-
- /**
- * Returns the reference definitions available for this component.
- *
- * @return Reference definitions for this operation.
- */
- public Set<PhysicalReferenceDefinition> getReferences() {
- return Collections.unmodifiableSet(references);
- }
-
- /**
- * Adds a reference definition to the component.
- *
- * @param reference Reference definition to be added to the component.
- */
- public void addReference(PhysicalReferenceDefinition reference) {
- references.add(reference);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org