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/05 17:49:37 UTC
svn commit: r514728 - in /incubator/tuscany/java/sca/kernel/core/src:
main/java/org/apache/tuscany/core/deployer/federation/
main/java/org/apache/tuscany/core/implementation/java/
main/java/org/apache/tuscany/core/marshaller/ main/java/org/apache/tusca...
Author: meerajk
Date: Mon Mar 5 08:49:35 2007
New Revision: 514728
URL: http://svn.apache.org/viewvc?view=rev&rev=514728
Log:
Sourcecheck cleanup.
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/deployer/federation/FederatedDeployer.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaComponent.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaPhysicalComponentBuilder.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/AbstractMarshallerExtension.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/DefaultModelMarshallerRegistry.java
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/AbstractExtensibleMarshallerExtension.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/main/java/org/apache/tuscany/core/model/physical/java/JavaPhysicalComponentDefinition.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/core/src/test/java/org/apache/tuscany/core/marshaller/JavaPhysicalChangeSetMarshallerTest.java
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/deployer/federation/FederatedDeployer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/deployer/federation/FederatedDeployer.java?view=diff&rev=514728&r1=514727&r2=514728
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/deployer/federation/FederatedDeployer.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/deployer/federation/FederatedDeployer.java Mon Mar 5 08:49:35 2007
@@ -77,12 +77,12 @@
final PhysicalChangeSet changeSet = (PhysicalChangeSet) marshallerRegistry.unmarshall(content);
- for(PhysicalComponentDefinition pcd : changeSet.getComponentDefinitions()) {
+ for (PhysicalComponentDefinition pcd : changeSet.getComponentDefinitions()) {
final Component component = builderRegistry.build(pcd);
componentManager.register(component);
component.start();
}
- for(PhysicalWireDefinition pwd : changeSet.getWireDefinitions()) {
+ for (PhysicalWireDefinition pwd : changeSet.getWireDefinitions()) {
connector.connect(pwd);
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaComponent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaComponent.java?view=diff&rev=514728&r1=514727&r2=514728
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaComponent.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaComponent.java Mon Mar 5 08:49:35 2007
@@ -48,10 +48,10 @@
public class JavaComponent implements Component {
// Instance factory class
- private Class<InstanceFactory<?>> instanceFactoryClass;
+ private Class<InstanceFactory<?>> instanceFactoryClass; //NOPMD
// Scope container
- private ScopeContainer scopeContainer;
+ private ScopeContainer scopeContainer; //NOPMD
/**
* Injects the instance factory class.
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaPhysicalComponentBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaPhysicalComponentBuilder.java?view=diff&rev=514728&r1=514727&r2=514728
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaPhysicalComponentBuilder.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaPhysicalComponentBuilder.java Mon Mar 5 08:49:35 2007
@@ -88,10 +88,10 @@
private void setInstanceFactoryClass(JavaPhysicalComponentDefinition componentDefinition, JavaComponent component) {
// TODO use MPCL to load IF class
URI classLoaderId = componentDefinition.getClassLoaderId();
- byte[] instanceFactoryByteCode = componentDefinition.getInstanceFactoryByteCode();
- ClassLoader appCl = classLoaderRegistry.getClassLoader(classLoaderId);
- ClassLoader systemCl = getClass().getClassLoader();
- ClassLoader mpcl = null;
+ byte[] instanceFactoryByteCode = componentDefinition.getInstanceFactoryByteCode(); //NOPMD
+ ClassLoader appCl = classLoaderRegistry.getClassLoader(classLoaderId); //NOPMD
+ ClassLoader systemCl = getClass().getClassLoader(); //NOPMD
+ ClassLoader mpcl = null; //NOPMD
Class<InstanceFactory<?>> instanceFactoryClass = null;
component.setInstanceFactoryClass(instanceFactoryClass);
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/AbstractMarshallerExtension.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/AbstractMarshallerExtension.java?view=diff&rev=514728&r1=514727&r2=514728
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/AbstractMarshallerExtension.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/AbstractMarshallerExtension.java Mon Mar 5 08:49:35 2007
@@ -28,8 +28,8 @@
/**
* Abstract marshaller that supports marshaller registry.
*
- * @version $Revision$ $Date$
- *
+ * @version $Revision$ $Date: 2007-03-03 12:17:30 +0000 (Sat, 03 Mar
+ * 2007) $
* @param <MD>
*/
public abstract class AbstractMarshallerExtension<MD extends ModelObject> implements ModelMarshaller<MD> {
@@ -39,6 +39,7 @@
/**
* Injects the model marshaller registry.
+ *
* @param registry Model marshaller registry.
*/
@Reference
@@ -54,13 +55,16 @@
}
/**
- * Gets the qualified name of the XML fragment for the marshalled model object.
+ * Gets the qualified name of the XML fragment for the marshalled model
+ * object.
+ *
* @return Qualified name of the XML fragment.
*/
protected abstract QName getModelObjectQName();
/**
* Retursn the type of the model object.
+ *
* @return Model object type.
*/
protected abstract Class<MD> getModelObjectType();
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/DefaultModelMarshallerRegistry.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/DefaultModelMarshallerRegistry.java?view=diff&rev=514728&r1=514727&r2=514728
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/DefaultModelMarshallerRegistry.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/DefaultModelMarshallerRegistry.java Mon Mar 5 08:49:35 2007
@@ -36,10 +36,11 @@
* @version $Rev$ $Date$
*/
public class DefaultModelMarshallerRegistry implements ModelMarshallerRegistry {
-
+
// Marshaller registry
- private final Map<Class<? extends ModelObject>, ModelMarshaller> marshallerRegistry = new ConcurrentHashMap<Class<? extends ModelObject>, ModelMarshaller>();
-
+ private final Map<Class<? extends ModelObject>, ModelMarshaller> marshallerRegistry =
+ new ConcurrentHashMap<Class<? extends ModelObject>, ModelMarshaller>();
+
// Unmarshaller registry
private final Map<QName, ModelMarshaller> unmarshallerRegistry = new ConcurrentHashMap<QName, ModelMarshaller>();
@@ -66,13 +67,13 @@
*/
@SuppressWarnings("unchecked")
public void marshall(ModelObject modelObject, XMLStreamWriter writer) throws MarshallException {
-
+
ModelMarshaller marshaller = marshallerRegistry.get(modelObject.getClass());
- if(marshaller == null) {
+ if (marshaller == null) {
throw new MarshallException("No marshaller defined for " + modelObject.getClass());
}
marshaller.marshall(modelObject, writer);
-
+
}
/**
@@ -82,15 +83,15 @@
* @return Model object from the marshalled stream.
*/
public ModelObject unmarshall(XMLStreamReader reader) throws MarshallException {
-
+
QName qname = reader.getName();
-
+
ModelMarshaller marshaller = unmarshallerRegistry.get(qname);
- if(marshaller == null) {
+ if (marshaller == null) {
throw new MarshallException("No marshaller defined for " + qname);
}
return marshaller.unmarshall(reader);
-
+
}
}
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=514728&r1=514727&r2=514728
==============================================================================
--- 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 Mon Mar 5 08:49:35 2007
@@ -42,14 +42,13 @@
// QName for the root element
public static final QName QNAME = new QName("http://tuscany.apache.org/xmlns/marshaller/1.0-SNAPSHOT", "changeSet");
-
+
// Local part for wire
private static final String WIRE = "wire";
// Local part for component
private static final String COMPONENT = "component";
-
-
+
/**
* Marshalls a physical change set to the xml writer.
*/
@@ -61,7 +60,7 @@
* Unmarshalls a physical change set from the xml reader.
*/
public PhysicalChangeSet unmarshall(XMLStreamReader reader) throws MarshallException {
-
+
try {
PhysicalChangeSet changeSet = new PhysicalChangeSet();
while (true) {
@@ -69,20 +68,20 @@
case START_ELEMENT:
String name = reader.getName().getLocalPart();
ModelObject modelObject = registry.unmarshall(reader);
- if(COMPONENT.equals(name)) {
- changeSet.addComponentDefinition((PhysicalComponentDefinition) modelObject);
- } else if(WIRE.equals(name)) {
- changeSet.addWireDefinition((PhysicalWireDefinition) modelObject);
+ if (COMPONENT.equals(name)) {
+ changeSet.addComponentDefinition((PhysicalComponentDefinition)modelObject);
+ } else if (WIRE.equals(name)) {
+ changeSet.addWireDefinition((PhysicalWireDefinition)modelObject);
}
break;
case END_DOCUMENT:
return changeSet;
}
}
- } catch(XMLStreamException ex) {
+ } catch (XMLStreamException ex) {
throw new MarshallException(ex);
}
-
+
}
@Override
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=514728&r1=514727&r2=514728
==============================================================================
--- 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 Mon Mar 5 08:49:35 2007
@@ -28,7 +28,8 @@
/**
* Marshaller for physical operation definition.
*
- * @version $Revision$ $Date$
+ * @version $Revision$ $Date: 2007-03-03 11:36:03 +0000 (Sat, 03 Mar
+ * 2007) $
*/
public class PhysicalOperationDefinitionMarshaller extends AbstractMarshallerExtension<PhysicalOperationDefinition> {
@@ -36,7 +37,8 @@
private static final String NAME = "name";
// QName for the root element
- private static final QName QNAME = new QName("http://tuscany.apache.org/xmlns/marshaller/1.0-SNAPSHOT", "operation");
+ private static final QName QNAME =
+ new QName("http://tuscany.apache.org/xmlns/marshaller/1.0-SNAPSHOT", "operation");
/**
* Marshalls a physical operation to the xml writer.
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=514728&r1=514727&r2=514728
==============================================================================
--- 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 Mon Mar 5 08:49:35 2007
@@ -37,7 +37,8 @@
/**
* Marshaller for physical wire definition.
*
- * @version $Revision$ $Date$
+ * @version $Revision$ $Date: 2007-03-03 11:36:03 +0000 (Sat, 03 Mar
+ * 2007) $
*/
public class PhysicalWireDefinitionMarshaller extends AbstractMarshallerExtension<PhysicalWireDefinition> {
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/extensions/AbstractExtensibleMarshallerExtension.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/extensions/AbstractExtensibleMarshallerExtension.java?view=diff&rev=514728&r1=514727&r2=514728
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/extensions/AbstractExtensibleMarshallerExtension.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/extensions/AbstractExtensibleMarshallerExtension.java Mon Mar 5 08:49:35 2007
@@ -28,8 +28,8 @@
/**
* Abstract marshaller that supports extensible model objects.
*
- * @version $Revision$ $Date$
- *
+ * @version $Revision$ $Date: 2007-03-04 18:23:24 +0000 (Sun, 04 Mar
+ * 2007) $
* @param <MD>
*/
public abstract class AbstractExtensibleMarshallerExtension<MD extends ModelObject> extends
@@ -37,12 +37,14 @@
/**
* Create the concrete model object.
+ *
* @return Concrete model object.
*/
protected abstract MD getConcreteModelObject();
/**
* Handles extensions for unmarshalling.
+ *
* @param modelObject Concrete model object.
* @param reader Reader from which marshalled data is read.
*/
@@ -50,6 +52,7 @@
/**
* Handles extensions for marshalling.
+ *
* @param modelObject Concrete model object.
* @param reader Writer to which marshalled data is written.
*/
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=514728&r1=514727&r2=514728
==============================================================================
--- 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 5 08:49:35 2007
@@ -34,7 +34,8 @@
/**
* Abstract super class for all PCD marshallers.
*
- * @version $Revision$ $Date$
+ * @version $Revision$ $Date: 2007-03-03 16:41:22 +0000 (Sat, 03 Mar
+ * 2007) $
*/
public abstract class AbstractPhysicalComponentDefinitionMarshaller<PCD extends PhysicalComponentDefinition<?, ?>>
extends AbstractExtensibleMarshallerExtension<PCD> {
@@ -76,7 +77,7 @@
}
break;
case END_ELEMENT:
- if(getModelObjectQName().equals(reader.getName())) {
+ if (getModelObjectQName().equals(reader.getName())) {
return componentDefinition;
}
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=514728&r1=514727&r2=514728
==============================================================================
--- 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 Mon Mar 5 08:49:35 2007
@@ -35,11 +35,12 @@
*
* @version $Revision$ $Date$
*/
-public abstract class AbstractPhysicalReferenceDefinitionMarshaller<PRD extends PhysicalReferenceDefinition> extends AbstractExtensibleMarshallerExtension<PRD> {
+public abstract class AbstractPhysicalReferenceDefinitionMarshaller<PRD extends PhysicalReferenceDefinition> extends
+ AbstractExtensibleMarshallerExtension<PRD> {
// Local part for operation
private static final String OPERATION = "operation";
-
+
// Source name attribute
private static final String NAME = "name";
@@ -54,7 +55,7 @@
* Unmarshalls a java physical reference definition from the xml reader.
*/
public PRD unmarshall(XMLStreamReader reader) throws MarshallException {
-
+
try {
PRD referenceDefinition = getConcreteModelObject();
referenceDefinition.setName(reader.getAttributeValue(null, NAME));
@@ -63,7 +64,7 @@
case START_ELEMENT:
ModelObject modelObject = registry.unmarshall(reader);
String name = reader.getName().getLocalPart();
- if(OPERATION.equals(name)) {
+ if (OPERATION.equals(name)) {
referenceDefinition.addOperation((PhysicalOperationDefinition)modelObject);
} else {
handleExtension(referenceDefinition, reader);
@@ -77,7 +78,7 @@
} catch (XMLStreamException ex) {
throw new MarshallException(ex);
}
-
+
}
}
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=514728&r1=514727&r2=514728
==============================================================================
--- 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 Mon Mar 5 08:49:35 2007
@@ -35,11 +35,12 @@
*
* @version $Revision$ $Date$
*/
-public abstract class AbstractPhysicalServiceDefinitionMarshaller<PSD extends PhysicalServiceDefinition> extends AbstractExtensibleMarshallerExtension<PSD> {
+public abstract class AbstractPhysicalServiceDefinitionMarshaller<PSD extends PhysicalServiceDefinition> extends
+ AbstractExtensibleMarshallerExtension<PSD> {
-// Local part for operation
+ // Local part for operation
private static final String OPERATION = "operation";
-
+
// Source name attribute
private static final String NAME = "name";
@@ -54,7 +55,7 @@
* Unmarshalls a java physical reference definition from the xml reader.
*/
public PSD unmarshall(XMLStreamReader reader) throws MarshallException {
-
+
try {
PSD serviceDefinition = getConcreteModelObject();
serviceDefinition.setName(reader.getAttributeValue(null, NAME));
@@ -63,7 +64,7 @@
case START_ELEMENT:
ModelObject modelObject = registry.unmarshall(reader);
String name = reader.getName().getLocalPart();
- if(OPERATION.equals(name)) {
+ if (OPERATION.equals(name)) {
serviceDefinition.addOperation((PhysicalOperationDefinition)modelObject);
} else {
handleExtension(serviceDefinition, reader);
@@ -77,7 +78,7 @@
} catch (XMLStreamException ex) {
throw new MarshallException(ex);
}
-
+
}
}
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=514728&r1=514727&r2=514728
==============================================================================
--- 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 Mon Mar 5 08:49:35 2007
@@ -51,7 +51,7 @@
// Classloader id
private static final String CLASSLOADER_ID = "classLoaderId";
-
+
// QName for the root element
private static final QName QNAME =
new QName("http://tuscany.apache.org/xmlns/marshaller/java/1.0-SNAPSHOT", "component");
@@ -106,9 +106,9 @@
byte[] base64ByteCode = reader.getText().getBytes();
byte[] byteCode = Base64.decodeBase64(base64ByteCode);
componentDefinition.setInstanceFactoryByteCode(byteCode);
- } else if(SCOPE.equals(name)) {
+ } else if (SCOPE.equals(name)) {
componentDefinition.setScope(new Scope(reader.getText()));
- } else if(CLASSLOADER_ID.equals(name)) {
+ } else if (CLASSLOADER_ID.equals(name)) {
componentDefinition.setClassLoaderId(new URI(reader.getText()));
}
} catch (XMLStreamException ex) {
@@ -116,7 +116,7 @@
} catch (URISyntaxException ex) {
throw new MarshallException(ex);
}
-
+
}
/**
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=514728&r1=514727&r2=514728
==============================================================================
--- 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 Mon Mar 5 08:49:35 2007
@@ -28,16 +28,22 @@
/**
* Marshaller for java physical reference definition.
*
- * @version $Revision$ $Date$
+ * @version $Revision$ $Date: 2007-03-03 16:41:22 +0000 (Sat, 03 Mar
+ * 2007) $
*/
-public class JavaPhysicalReferenceDefinitionMarshaller extends AbstractPhysicalReferenceDefinitionMarshaller<JavaPhysicalReferenceDefinition> {
-
+public class JavaPhysicalReferenceDefinitionMarshaller extends
+ AbstractPhysicalReferenceDefinitionMarshaller<JavaPhysicalReferenceDefinition> {
+
// QName for the root element
- private static final QName QNAME = new QName("http://tuscany.apache.org/xmlns/marshaller/java/1.0-SNAPSHOT", "reference");
+ private static final QName QNAME =
+ new QName("http://tuscany.apache.org/xmlns/marshaller/java/1.0-SNAPSHOT", "reference");
/**
- * 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"}.
+ * 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() {
@@ -46,6 +52,7 @@
/**
* Retursn the type of the model object.
+ *
* @return <code>JavaPhysicalReferenceDefinition.class</code>.
*/
@Override
@@ -55,6 +62,7 @@
/**
* Create the concrete model object.
+ *
* @return An instance of <code>JavaPhysicalReferenceDefinition</code>.
*/
@Override
@@ -64,6 +72,7 @@
/**
* Handles extensions for unmarshalling Java physical references.
+ *
* @param modelObject Concrete model object.
* @param reader Reader from which marshalled data is read.
*/
@@ -73,6 +82,7 @@
/**
* Handles extensions for marshalling Java physical references.
+ *
* @param modelObject Concrete model object.
* @param reader Writer to which marshalled data is written.
*/
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=514728&r1=514727&r2=514728
==============================================================================
--- 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 Mon Mar 5 08:49:35 2007
@@ -28,16 +28,22 @@
/**
* Marshaller for java physical service definition.
*
- * @version $Revision$ $Date$
+ * @version $Revision$ $Date: 2007-03-03 16:41:22 +0000 (Sat, 03 Mar
+ * 2007) $
*/
-public class JavaPhysicalServiceDefinitionMarshaller extends AbstractPhysicalServiceDefinitionMarshaller<JavaPhysicalServiceDefinition> {
-
+public class JavaPhysicalServiceDefinitionMarshaller extends
+ AbstractPhysicalServiceDefinitionMarshaller<JavaPhysicalServiceDefinition> {
+
// QName for the root element
- private static final QName QNAME = new QName("http://tuscany.apache.org/xmlns/marshaller/java/1.0-SNAPSHOT", "service");
+ private static final QName QNAME =
+ new QName("http://tuscany.apache.org/xmlns/marshaller/java/1.0-SNAPSHOT", "service");
/**
- * 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"}.
+ * 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() {
@@ -46,6 +52,7 @@
/**
* Returns the type of the model object.
+ *
* @return <code>JavaPhysicalServiceDefinition.class</code>.
*/
@Override
@@ -55,6 +62,7 @@
/**
* Create the concrete model object.
+ *
* @return An instance of <code>JavaPhysicalServiceDefinition</code>.
*/
@Override
@@ -64,6 +72,7 @@
/**
* Handles extensions for unmarshalling Java service definitions.
+ *
* @param modelObject Concrete model object.
* @param reader Reader from which marshalled data is read.
*/
@@ -73,6 +82,7 @@
/**
* Handles extensions for marshalling Java service definitions.
+ *
* @param modelObject Concrete model object.
* @param reader Writer to which marshalled data is written.
*/
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=514728&r1=514727&r2=514728
==============================================================================
--- 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 Mon Mar 5 08:49:35 2007
@@ -28,14 +28,15 @@
*
* @version $Rev$ $Date$
*/
-public class JavaPhysicalComponentDefinition extends PhysicalComponentDefinition<JavaPhysicalServiceDefinition, JavaPhysicalReferenceDefinition> {
+public class JavaPhysicalComponentDefinition extends
+ PhysicalComponentDefinition<JavaPhysicalServiceDefinition, JavaPhysicalReferenceDefinition> {
// The byte code for the instance factory
private byte[] instanceFactoryByteCode;
-
+
// Scope
private Scope scope;
-
+
// Class loader id
private URI classLoaderId;
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/model/physical/java/JavaPhysicalReferenceDefinition.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/model/physical/java/JavaPhysicalReferenceDefinition.java?view=diff&rev=514728&r1=514727&r2=514728
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/model/physical/java/JavaPhysicalReferenceDefinition.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/model/physical/java/JavaPhysicalReferenceDefinition.java Mon Mar 5 08:49:35 2007
@@ -23,8 +23,8 @@
/**
* Models a Java physical reference definition.
*
- * @version $Revision$ $Date$
- *
+ * @version $Revision$ $Date: 2007-02-28 06:29:37 +0000 (Wed, 28 Feb
+ * 2007) $
*/
public class JavaPhysicalReferenceDefinition extends PhysicalReferenceDefinition {
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/model/physical/java/JavaPhysicalServiceDefinition.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/model/physical/java/JavaPhysicalServiceDefinition.java?view=diff&rev=514728&r1=514727&r2=514728
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/model/physical/java/JavaPhysicalServiceDefinition.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/model/physical/java/JavaPhysicalServiceDefinition.java Mon Mar 5 08:49:35 2007
@@ -23,8 +23,8 @@
/**
* Models a Java physical service definition.
*
- * @version $Revision$ $Date$
- *
+ * @version $Revision$ $Date: 2007-02-28 06:29:37 +0000 (Wed, 28 Feb
+ * 2007) $
*/
public class JavaPhysicalServiceDefinition extends PhysicalServiceDefinition {
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=514728&r1=514727&r2=514728
==============================================================================
--- 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 5 08:49:35 2007
@@ -47,53 +47,53 @@
public class JavaPhysicalChangeSetMarshallerTest extends TestCase {
private ModelMarshallerRegistry registry;
-
+
public JavaPhysicalChangeSetMarshallerTest(String arg0) {
super(arg0);
}
-
+
public void setUp() {
-
+
registry = new DefaultModelMarshallerRegistry();
-
+
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();
-
- for(int i = 0;i < 6; i++) {
+
+ for (int i = 0; i < 6; i++) {
marshallers[i].setRegistry(registry);
}
-
+
}
public void testUnmarshall() throws Exception {
-
+
ClassLoader cl = getClass().getClassLoader();
InputStream inputStream = cl.getResourceAsStream("marshall/javaChangeSet.xml");
XMLStreamReader reader = XMLInputFactory.newInstance().createXMLStreamReader(inputStream);
-
+
reader.next();
- PhysicalChangeSet changeSet = (PhysicalChangeSet) registry.unmarshall(reader);
+ PhysicalChangeSet changeSet = (PhysicalChangeSet)registry.unmarshall(reader);
assertNotNull(changeSet);
Set<? extends PhysicalComponentDefinition> pcds = changeSet.getComponentDefinitions();
assertEquals(2, pcds.size());
- for(PhysicalComponentDefinition pcd : pcds) {
-
+ for (PhysicalComponentDefinition pcd : pcds) {
+
assertTrue(pcd instanceof JavaPhysicalComponentDefinition);
String componentId = pcd.getComponentId().toString();
assertTrue("cmp1".equals(componentId) || "cmp2".equals(componentId));
-
- JavaPhysicalComponentDefinition jpcd = (JavaPhysicalComponentDefinition) pcd;
-
+
+ JavaPhysicalComponentDefinition jpcd = (JavaPhysicalComponentDefinition)pcd;
+
Set<JavaPhysicalReferenceDefinition> refs = jpcd.getReferences();
assertEquals(1, refs.size());
JavaPhysicalReferenceDefinition ref = refs.iterator().next();
- if("cmp1".equals(componentId)) {
+ if ("cmp1".equals(componentId)) {
assertEquals("rf1", ref.getName());
Set<PhysicalOperationDefinition> pods = ref.getOperations();
assertEquals(1, pods.size());
@@ -106,11 +106,11 @@
PhysicalOperationDefinition pod = pods.iterator().next();
assertEquals("op1", pod.getName());
}
-
+
Set<JavaPhysicalServiceDefinition> svs = jpcd.getServices();
assertEquals(1, svs.size());
JavaPhysicalServiceDefinition sv = svs.iterator().next();
- if("cmp1".equals(componentId)) {
+ if ("cmp1".equals(componentId)) {
assertEquals("sv1", sv.getName());
Set<PhysicalOperationDefinition> pods = sv.getOperations();
assertEquals(1, pods.size());
@@ -123,34 +123,32 @@
PhysicalOperationDefinition pod = pods.iterator().next();
assertEquals("op2", pod.getName());
}
-
+
}
-
+
Set<PhysicalWireDefinition> pwds = changeSet.getWireDefinitions();
-
+
assertEquals(2, changeSet.getWireDefinitions().size());
- for(PhysicalWireDefinition pwd : pwds) {
-
+ for (PhysicalWireDefinition pwd : pwds) {
+
String sourceUri = pwd.getSourceUri().toString();
String targetUri = pwd.getTargetUri().toString();
-
- assertTrue(("cmp1#rf1".equals(sourceUri) &&
- "cmp2#sv2".equals(targetUri)) ||
- ("cmp2#rf2".equals(sourceUri) &&
- "cmp1#sv1".equals(targetUri)));
-
+
+ assertTrue(("cmp1#rf1".equals(sourceUri) && "cmp2#sv2".equals(targetUri))
+ || ("cmp2#rf2".equals(sourceUri) && "cmp1#sv1"
+ .equals(targetUri)));
+
Set<PhysicalOperationDefinition> pods = pwd.getOperations();
assertEquals(1, pods.size());
PhysicalOperationDefinition pod = pods.iterator().next();
-
- if(sourceUri.equals("cmp1#rf1")) {
+
+ if (sourceUri.equals("cmp1#rf1")) {
assertEquals("op2", pod.getName());
} else {
assertEquals("op1", pod.getName());
}
}
-
-
+
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org