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/10 01:04:26 UTC
svn commit: r516615 - in /incubator/tuscany/java/sca/kernel:
core/src/main/java/org/apache/tuscany/core/marshaller/extensions/
core/src/main/java/org/apache/tuscany/core/model/physical/java/
core/src/test/java/org/apache/tuscany/core/marshaller/ spi/sr...
Author: meerajk
Date: Fri Mar 9 16:04:25 2007
New Revision: 516615
URL: http://svn.apache.org/viewvc?view=rev&rev=516615
Log:
removed typing from PCD
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/main/java/org/apache/tuscany/core/model/physical/java/JavaPhysicalComponentDefinition.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/marshaller/JavaPhysicalChangeSetMarshallerTest.java
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=516615&r1=516614&r2=516615
==============================================================================
--- 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 Fri Mar 9 16:04:25 2007
@@ -30,6 +30,8 @@
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.
@@ -37,7 +39,7 @@
* @version $Revision$ $Date: 2007-03-03 16:41:22 +0000 (Sat, 03 Mar
* 2007) $
*/
-public abstract class AbstractPhysicalComponentDefinitionMarshaller<PCD extends PhysicalComponentDefinition<?, ?>>
+public abstract class AbstractPhysicalComponentDefinitionMarshaller<PCD extends PhysicalComponentDefinition>
extends AbstractExtensibleMarshallerExtension<PCD> {
// Component id attribute
@@ -69,9 +71,11 @@
case START_ELEMENT:
String name = reader.getName().getLocalPart();
if (REFERENCE.equals(name)) {
- handleReference(componentDefinition, reader);
+ PhysicalReferenceDefinition reference = (PhysicalReferenceDefinition)registry.unmarshall(reader);
+ componentDefinition.addReference(reference);
} else if (SERVICE.equals(name)) {
- handleService(componentDefinition, reader);
+ PhysicalServiceDefinition service = (PhysicalServiceDefinition)registry.unmarshall(reader);
+ componentDefinition.addService(service);
} else {
handleExtension(componentDefinition, reader);
}
@@ -90,21 +94,5 @@
}
}
-
- /**
- * Handles a reference.
- *
- * @param componentDefinition Component definition.
- * @param reader XML stream.
- */
- protected abstract void handleReference(PCD componentDefinition, XMLStreamReader reader) throws MarshalException;
-
- /**
- * Handles a reference.
- *
- * @param componentDefinition Component definition.
- * @param reader XML stream.
- */
- protected abstract void handleService(PCD componentDefinition, XMLStreamReader reader) throws MarshalException;
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/model/physical/java/JavaPhysicalComponentDefinition.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/model/physical/java/JavaPhysicalComponentDefinition.java?view=diff&rev=516615&r1=516614&r2=516615
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/model/physical/java/JavaPhysicalComponentDefinition.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/model/physical/java/JavaPhysicalComponentDefinition.java Fri Mar 9 16:04:25 2007
@@ -28,8 +28,7 @@
*
* @version $Rev$ $Date$
*/
-public class JavaPhysicalComponentDefinition extends
- PhysicalComponentDefinition<JavaPhysicalServiceDefinition, JavaPhysicalReferenceDefinition> {
+public class JavaPhysicalComponentDefinition extends PhysicalComponentDefinition {
// The byte code for the instance factory
private byte[] instanceFactoryByteCode;
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=516615&r1=516614&r2=516615
==============================================================================
--- 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 Fri Mar 9 16:04:25 2007
@@ -37,6 +37,8 @@
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;
/**
@@ -92,9 +94,9 @@
JavaPhysicalComponentDefinition jpcd = (JavaPhysicalComponentDefinition)pcd;
- Set<JavaPhysicalReferenceDefinition> refs = jpcd.getReferences();
+ Set<PhysicalReferenceDefinition> refs = jpcd.getReferences();
assertEquals(1, refs.size());
- JavaPhysicalReferenceDefinition ref = refs.iterator().next();
+ JavaPhysicalReferenceDefinition ref = (JavaPhysicalReferenceDefinition) refs.iterator().next();
if ("cmp1".equals(componentId)) {
assertEquals("rf1", ref.getName());
Set<PhysicalOperationDefinition> pods = ref.getOperations();
@@ -109,9 +111,9 @@
assertEquals("op1", pod.getName());
}
- Set<JavaPhysicalServiceDefinition> svs = jpcd.getServices();
+ Set<PhysicalServiceDefinition> svs = jpcd.getServices();
assertEquals(1, svs.size());
- JavaPhysicalServiceDefinition sv = svs.iterator().next();
+ JavaPhysicalServiceDefinition sv = (JavaPhysicalServiceDefinition)svs.iterator().next();
if ("cmp1".equals(componentId)) {
assertEquals("sv1", sv.getName());
Set<PhysicalOperationDefinition> pods = sv.getOperations();
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=516615&r1=516614&r2=516615
==============================================================================
--- 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 Fri Mar 9 16:04:25 2007
@@ -30,18 +30,16 @@
*
* @version $Rev$ $Date$
*/
-public abstract class PhysicalComponentDefinition<PSD extends PhysicalServiceDefinition,
- PRD extends PhysicalReferenceDefinition>
- extends ModelObject {
+public abstract class PhysicalComponentDefinition extends ModelObject {
// Component Id.
private URI componentId;
// Services exposed by this component
- private Set<PSD> services = new HashSet<PSD>();
+ private Set<PhysicalServiceDefinition> services = new HashSet<PhysicalServiceDefinition>();
// References exposed by this component
- private Set<PRD> references = new HashSet<PRD>();
+ private Set<PhysicalReferenceDefinition> references = new HashSet<PhysicalReferenceDefinition>();
/**
* Gets the component id.
@@ -66,7 +64,7 @@
*
* @return Service definitions for this operation.
*/
- public Set<PSD> getServices() {
+ public Set<PhysicalServiceDefinition> getServices() {
return Collections.unmodifiableSet(services);
}
@@ -75,7 +73,7 @@
*
* @param service Service definition to be added to the component.
*/
- public void addService(PSD service) {
+ public void addService(PhysicalServiceDefinition service) {
services.add(service);
}
@@ -84,7 +82,7 @@
*
* @return Reference definitions for this operation.
*/
- public Set<PRD> getReferences() {
+ public Set<PhysicalReferenceDefinition> getReferences() {
return Collections.unmodifiableSet(references);
}
@@ -93,7 +91,7 @@
*
* @param reference Reference definition to be added to the component.
*/
- public void addReference(PRD reference) {
+ 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