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/02/19 23:58:38 UTC
svn commit: r509369 - in /incubator/tuscany/java/sca/kernel:
core/src/main/java/org/apache/tuscany/core/component/
core/src/main/java/org/apache/tuscany/core/marshaller/
core/src/test/java/org/apache/tuscany/core/marshaller/
spi/src/main/java/org/apach...
Author: meerajk
Date: Mon Feb 19 14:58:37 2007
New Revision: 509369
URL: http://svn.apache.org/viewvc?view=rev&rev=509369
Log:
refactored physical definitions
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/JavaPhysicalComponentDefinition.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/JavaPhysicalComponentDefinitionMarshaller.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/marshaller/JavaPhysicalComponentDefinitionMarshallerTestCase.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/physical/InterceptorDefinition.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/physical/PhysicalComponentDefinition.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/physical/WireDefinition.java
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/JavaPhysicalComponentDefinition.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/JavaPhysicalComponentDefinition.java?view=diff&rev=509369&r1=509368&r2=509369
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/JavaPhysicalComponentDefinition.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/JavaPhysicalComponentDefinition.java Mon Feb 19 14:58:37 2007
@@ -33,15 +33,6 @@
private byte[] instanceFactoryByteCode;
/**
- * Initializes the component id.
- *
- * @param componentId The component id.
- */
- public JavaPhysicalComponentDefinition(final URI componentId) {
- super(componentId);
- }
-
- /**
* Gets the byte code for the instance factory.
*
* @return Byte code for the instance factory.
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/JavaPhysicalComponentDefinitionMarshaller.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/JavaPhysicalComponentDefinitionMarshaller.java?view=diff&rev=509369&r1=509368&r2=509369
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/JavaPhysicalComponentDefinitionMarshaller.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/JavaPhysicalComponentDefinitionMarshaller.java Mon Feb 19 14:58:37 2007
@@ -105,14 +105,14 @@
try {
- JavaPhysicalComponentDefinition definition = null;
+ JavaPhysicalComponentDefinition definition = new JavaPhysicalComponentDefinition();
for (int i = reader.next(); i != END_DOCUMENT; i = reader.next()) {
switch (i) {
case START_ELEMENT:
if (reader.getName().equals(MESSAGE_TYPE)) {
final URI componentId = getComponentId(reader);
- definition = new JavaPhysicalComponentDefinition(componentId);
+ definition.setComponentId(componentId);
} else if (reader.getName().equals(INSTANCE_FACTORY_BYTE_CODE)) {
setInstanceFactoryByteCode(reader, definition);
}
@@ -120,7 +120,7 @@
}
}
- if (definition == null || definition.getInstanceFactoryByteCode() == null) {
+ if (definition.getComponentId() == null || definition.getInstanceFactoryByteCode() == null) {
throw new MarshalException("Invalid component definition");
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/marshaller/JavaPhysicalComponentDefinitionMarshallerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/marshaller/JavaPhysicalComponentDefinitionMarshallerTestCase.java?view=diff&rev=509369&r1=509368&r2=509369
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/marshaller/JavaPhysicalComponentDefinitionMarshallerTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/marshaller/JavaPhysicalComponentDefinitionMarshallerTestCase.java Mon Feb 19 14:58:37 2007
@@ -68,7 +68,8 @@
ByteArrayOutputStream out = new ByteArrayOutputStream();
- JavaPhysicalComponentDefinition definition = new JavaPhysicalComponentDefinition(new URI("uri"));
+ JavaPhysicalComponentDefinition definition = new JavaPhysicalComponentDefinition();
+ definition.setComponentId(new URI("uri"));
definition.setInstanceFactoryByteCode("TEST".getBytes());
XMLStreamWriter writer = XMLOutputFactory.newInstance().createXMLStreamWriter(out, "UTF-8");
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/physical/InterceptorDefinition.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/physical/InterceptorDefinition.java?view=diff&rev=509369&r1=509368&r2=509369
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/physical/InterceptorDefinition.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/physical/InterceptorDefinition.java Mon Feb 19 14:58:37 2007
@@ -18,6 +18,10 @@
*/
package org.apache.tuscany.spi.model.physical;
+import javax.xml.namespace.QName;
+
+import org.apache.tuscany.spi.model.ModelObject;
+
/**
* Model class representing the portable definition of an interceptor. This class
* is used to describe the interceptors around inbound and outbound wires on a
@@ -26,6 +30,21 @@
* @version $Rev$ $Date$
*
*/
-public class InterceptorDefinition {
+public class InterceptorDefinition extends ModelObject {
+
+ // The qualified name of the interceptor builder
+ private QName builder;
+
+ /**
+ * Gets the qualified name of the builder.
+ * @return
+ */
+ public QName getBuilder() {
+ return builder;
+ }
+
+ public void setBuilder(QName builder) {
+ this.builder = builder;
+ }
}
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=509369&r1=509368&r2=509369
==============================================================================
--- 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 Feb 19 14:58:37 2007
@@ -30,29 +30,22 @@
public abstract class PhysicalComponentDefinition extends ModelObject {
// Component Id.
- private final URI componentId;
+ private URI componentId;
/**
- * Initializes the component id.
- *
- * @param componentId The component id.
+ * Gets the component id.
+ * @return Component id.
*/
- public PhysicalComponentDefinition(final URI componentId) {
-
- if (componentId == null) {
- throw new IllegalArgumentException("Component id is null");
- }
- this.componentId = componentId;
-
+ public URI getComponentId() {
+ return componentId;
}
/**
- * Returns the absolute id for the phyiscal component.
- *
- * @return the absolute id for the phyiscal component
+ * Sets the component id.
+ * @param componentId
*/
- public URI getComponentId() {
- return componentId;
+ public void setComponentId(URI componentId) {
+ this.componentId = componentId;
}
}
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/physical/WireDefinition.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/physical/WireDefinition.java?view=diff&rev=509369&r1=509368&r2=509369
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/physical/WireDefinition.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/physical/WireDefinition.java Mon Feb 19 14:58:37 2007
@@ -23,37 +23,24 @@
import java.util.HashSet;
import java.util.Set;
+import org.apache.tuscany.spi.model.ModelObject;
+
/**
* 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.
*
* @version $Rev$ $Date$
*/
-public class WireDefinition {
+public class WireDefinition extends ModelObject {
// The resolved URI of the wire
- private final URI wireUri;
+ private URI wireUri;
// Interceptors defined against the wire
private final Set<InterceptorDefinition> interceptors = new HashSet<InterceptorDefinition>();
/**
- * Initializes the wire URI.
- *
- * @param wireUri The resolved URI of the wire.
- */
- public WireDefinition(final URI wireUri) {
-
- if (wireUri == null) {
- throw new IllegalArgumentException("Wire uri is null");
- }
- this.wireUri = wireUri;
-
- }
-
- /**
* Returns a read-only view of the available interceptors.
- *
* @return List of interceptors available on the wire.
*/
public Set<InterceptorDefinition> getInterceptors() {
@@ -62,7 +49,6 @@
/**
* Adds an interceptor definition.
- *
* @param interceptorDefinition Interceptor definition to add to the wire.
*/
public void addInterceptor(InterceptorDefinition interceptorDefinition) {
@@ -75,9 +61,16 @@
}
/**
- * Returns the wire URI.
- *
- * @return The resolved URI of the wire.
+ * Sets the Wire URI.
+ * @param wireUri Wire URI.
+ */
+ public void setWireUri(URI wireUri) {
+ this.wireUri = wireUri;
+ }
+
+ /**
+ * Gets the Wire URI.
+ * @return Wire URI.
*/
public URI getWireUri() {
return wireUri;
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org