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/08 00:01:11 UTC
svn commit: r515830 - in /incubator/tuscany/java/sca/kernel:
core/src/main/java/org/apache/tuscany/core/deployer/federation/
core/src/main/java/org/apache/tuscany/core/marshaller/
core/src/main/java/org/apache/tuscany/core/marshaller/extensions/ core/s...
Author: meerajk
Date: Wed Mar 7 15:01:09 2007
New Revision: 515830
URL: http://svn.apache.org/viewvc?view=rev&rev=515830
Log:
renamed marshall to marshal
Added:
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/marshaller/MarshalException.java
- copied, changed from r515766, incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/marshaller/MarshallException.java
Removed:
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/marshaller/MarshallException.java
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/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/test/java/org/apache/tuscany/core/marshaller/JavaPhysicalChangeSetMarshallerTest.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/marshaller/ModelMarshaller.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/marshaller/ModelMarshallerRegistry.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=515830&r1=515829&r2=515830
==============================================================================
--- 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 Wed Mar 7 15:01:09 2007
@@ -27,7 +27,7 @@
import org.apache.tuscany.spi.builder.physical.PhysicalComponentBuilderRegistry;
import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.component.RegistrationException;
-import org.apache.tuscany.spi.marshaller.MarshallException;
+import org.apache.tuscany.spi.marshaller.MarshalException;
import org.apache.tuscany.spi.marshaller.ModelMarshallerRegistry;
import org.apache.tuscany.spi.model.physical.PhysicalChangeSet;
import org.apache.tuscany.spi.model.physical.PhysicalComponentDefinition;
@@ -86,7 +86,7 @@
connector.connect(pwd);
}
- } catch (MarshallException ex) {
+ } catch (MarshalException ex) {
return null;
} catch (BuilderException ex) {
return null;
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=515830&r1=515829&r2=515830
==============================================================================
--- 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 Wed Mar 7 15:01:09 2007
@@ -25,7 +25,7 @@
import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLStreamWriter;
-import org.apache.tuscany.spi.marshaller.MarshallException;
+import org.apache.tuscany.spi.marshaller.MarshalException;
import org.apache.tuscany.spi.marshaller.ModelMarshaller;
import org.apache.tuscany.spi.marshaller.ModelMarshallerRegistry;
import org.apache.tuscany.spi.model.ModelObject;
@@ -66,13 +66,13 @@
* @param writer Writer to which marshalled information is written.
*/
@SuppressWarnings("unchecked")
- public void marshall(ModelObject modelObject, XMLStreamWriter writer) throws MarshallException {
+ public void marshall(ModelObject modelObject, XMLStreamWriter writer) throws MarshalException {
ModelMarshaller marshaller = marshallerRegistry.get(modelObject.getClass());
if (marshaller == null) {
- throw new MarshallException("No marshaller defined for " + modelObject.getClass());
+ throw new MarshalException("No marshaller defined for " + modelObject.getClass());
}
- marshaller.marshall(modelObject, writer);
+ marshaller.marshal(modelObject, writer);
}
@@ -82,15 +82,15 @@
* @param reader Reader from which marshalled information is read.
* @return Model object from the marshalled stream.
*/
- public ModelObject unmarshall(XMLStreamReader reader) throws MarshallException {
+ public ModelObject unmarshall(XMLStreamReader reader) throws MarshalException {
QName qname = reader.getName();
ModelMarshaller marshaller = unmarshallerRegistry.get(qname);
if (marshaller == null) {
- throw new MarshallException("No marshaller defined for " + qname);
+ throw new MarshalException("No marshaller defined for " + qname);
}
- return marshaller.unmarshall(reader);
+ return marshaller.unmarshal(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=515830&r1=515829&r2=515830
==============================================================================
--- 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 Wed Mar 7 15:01:09 2007
@@ -26,7 +26,7 @@
import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLStreamWriter;
-import org.apache.tuscany.spi.marshaller.MarshallException;
+import org.apache.tuscany.spi.marshaller.MarshalException;
import org.apache.tuscany.spi.model.ModelObject;
import org.apache.tuscany.spi.model.physical.PhysicalChangeSet;
import org.apache.tuscany.spi.model.physical.PhysicalComponentDefinition;
@@ -52,14 +52,14 @@
/**
* Marshalls a physical change set to the xml writer.
*/
- public void marshall(PhysicalChangeSet modelObject, XMLStreamWriter writer) throws MarshallException {
+ public void marshal(PhysicalChangeSet modelObject, XMLStreamWriter writer) throws MarshalException {
throw new UnsupportedOperationException();
}
/**
* Unmarshalls a physical change set from the xml reader.
*/
- public PhysicalChangeSet unmarshall(XMLStreamReader reader) throws MarshallException {
+ public PhysicalChangeSet unmarshal(XMLStreamReader reader) throws MarshalException {
try {
PhysicalChangeSet changeSet = new PhysicalChangeSet();
@@ -79,7 +79,7 @@
}
}
} catch (XMLStreamException ex) {
- throw new MarshallException(ex);
+ throw new MarshalException(ex);
}
}
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=515830&r1=515829&r2=515830
==============================================================================
--- 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 Wed Mar 7 15:01:09 2007
@@ -22,7 +22,7 @@
import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLStreamWriter;
-import org.apache.tuscany.spi.marshaller.MarshallException;
+import org.apache.tuscany.spi.marshaller.MarshalException;
import org.apache.tuscany.spi.model.physical.PhysicalOperationDefinition;
/**
@@ -43,14 +43,14 @@
/**
* Marshalls a physical operation to the xml writer.
*/
- public void marshall(PhysicalOperationDefinition modelObject, XMLStreamWriter writer) throws MarshallException {
+ public void marshal(PhysicalOperationDefinition modelObject, XMLStreamWriter writer) throws MarshalException {
throw new UnsupportedOperationException();
}
/**
* Unmarshalls a physical operation from the xml reader.
*/
- public PhysicalOperationDefinition unmarshall(XMLStreamReader reader) throws MarshallException {
+ public PhysicalOperationDefinition unmarshal(XMLStreamReader reader) throws MarshalException {
PhysicalOperationDefinition operation = new PhysicalOperationDefinition();
operation.setName(reader.getAttributeValue(null, NAME));
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=515830&r1=515829&r2=515830
==============================================================================
--- 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 Wed Mar 7 15:01:09 2007
@@ -29,7 +29,7 @@
import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLStreamWriter;
-import org.apache.tuscany.spi.marshaller.MarshallException;
+import org.apache.tuscany.spi.marshaller.MarshalException;
import org.apache.tuscany.spi.model.ModelObject;
import org.apache.tuscany.spi.model.physical.PhysicalOperationDefinition;
import org.apache.tuscany.spi.model.physical.PhysicalWireDefinition;
@@ -54,14 +54,14 @@
/**
* Marshalls a physical wire to the xml writer.
*/
- public void marshall(PhysicalWireDefinition modelObject, XMLStreamWriter writer) throws MarshallException {
+ public void marshal(PhysicalWireDefinition modelObject, XMLStreamWriter writer) throws MarshalException {
throw new UnsupportedOperationException();
}
/**
* Unmarshalls a physical wire from the xml reader.
*/
- public PhysicalWireDefinition unmarshall(XMLStreamReader reader) throws MarshallException {
+ public PhysicalWireDefinition unmarshal(XMLStreamReader reader) throws MarshalException {
try {
PhysicalWireDefinition wireDefinition = new PhysicalWireDefinition();
@@ -79,9 +79,9 @@
}
}
} catch (XMLStreamException ex) {
- throw new MarshallException(ex);
+ throw new MarshalException(ex);
} catch (URISyntaxException ex) {
- throw new MarshallException(ex);
+ throw new MarshalException(ex);
}
}
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=515830&r1=515829&r2=515830
==============================================================================
--- 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 Wed Mar 7 15:01:09 2007
@@ -22,7 +22,7 @@
import javax.xml.stream.XMLStreamWriter;
import org.apache.tuscany.core.marshaller.AbstractMarshallerExtension;
-import org.apache.tuscany.spi.marshaller.MarshallException;
+import org.apache.tuscany.spi.marshaller.MarshalException;
import org.apache.tuscany.spi.model.ModelObject;
/**
@@ -48,7 +48,7 @@
* @param modelObject Concrete model object.
* @param reader Reader from which marshalled data is read.
*/
- protected abstract void handleExtension(MD modelObject, XMLStreamReader reader) throws MarshallException;
+ protected abstract void handleExtension(MD modelObject, XMLStreamReader reader) throws MarshalException;
/**
* Handles extensions for marshalling.
@@ -56,6 +56,6 @@
* @param modelObject Concrete model object.
* @param reader Writer to which marshalled data is written.
*/
- protected abstract void handleExtension(MD modelObject, XMLStreamWriter writer) throws MarshallException;
+ protected abstract void handleExtension(MD modelObject, XMLStreamWriter writer) throws MarshalException;
}
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=515830&r1=515829&r2=515830
==============================================================================
--- 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 Wed Mar 7 15:01:09 2007
@@ -28,7 +28,7 @@
import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLStreamWriter;
-import org.apache.tuscany.spi.marshaller.MarshallException;
+import org.apache.tuscany.spi.marshaller.MarshalException;
import org.apache.tuscany.spi.model.physical.PhysicalComponentDefinition;
/**
@@ -52,14 +52,14 @@
/**
* Marshalls a physical change set to the xml writer.
*/
- public final void marshall(PCD modelObject, XMLStreamWriter writer) throws MarshallException {
+ public final void marshal(PCD modelObject, XMLStreamWriter writer) throws MarshalException {
throw new UnsupportedOperationException();
}
/**
* Unmarshalls a physical change set from the xml reader.
*/
- public final PCD unmarshall(XMLStreamReader reader) throws MarshallException {
+ public final PCD unmarshal(XMLStreamReader reader) throws MarshalException {
try {
PCD componentDefinition = getConcreteModelObject();
@@ -84,9 +84,9 @@
}
}
} catch (XMLStreamException ex) {
- throw new MarshallException(ex);
+ throw new MarshalException(ex);
} catch (URISyntaxException ex) {
- throw new MarshallException(ex);
+ throw new MarshalException(ex);
}
}
@@ -97,7 +97,7 @@
* @param componentDefinition Component definition.
* @param reader XML stream.
*/
- protected abstract void handleReference(PCD componentDefinition, XMLStreamReader reader) throws MarshallException;
+ protected abstract void handleReference(PCD componentDefinition, XMLStreamReader reader) throws MarshalException;
/**
* Handles a reference.
@@ -105,6 +105,6 @@
* @param componentDefinition Component definition.
* @param reader XML stream.
*/
- protected abstract void handleService(PCD componentDefinition, XMLStreamReader reader) throws MarshallException;
+ protected abstract void handleService(PCD componentDefinition, XMLStreamReader reader) throws MarshalException;
}
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=515830&r1=515829&r2=515830
==============================================================================
--- 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 Wed Mar 7 15:01:09 2007
@@ -25,7 +25,7 @@
import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLStreamWriter;
-import org.apache.tuscany.spi.marshaller.MarshallException;
+import org.apache.tuscany.spi.marshaller.MarshalException;
import org.apache.tuscany.spi.model.ModelObject;
import org.apache.tuscany.spi.model.physical.PhysicalOperationDefinition;
import org.apache.tuscany.spi.model.physical.PhysicalReferenceDefinition;
@@ -47,14 +47,14 @@
/**
* Marshalls a physical java reference definition to the xml writer.
*/
- public void marshall(PRD modelObject, XMLStreamWriter writer) throws MarshallException {
+ public void marshal(PRD modelObject, XMLStreamWriter writer) throws MarshalException {
throw new UnsupportedOperationException();
}
/**
* Unmarshalls a java physical reference definition from the xml reader.
*/
- public PRD unmarshall(XMLStreamReader reader) throws MarshallException {
+ public PRD unmarshal(XMLStreamReader reader) throws MarshalException {
try {
PRD referenceDefinition = getConcreteModelObject();
@@ -76,7 +76,7 @@
}
}
} catch (XMLStreamException ex) {
- throw new MarshallException(ex);
+ throw new MarshalException(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=515830&r1=515829&r2=515830
==============================================================================
--- 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 Wed Mar 7 15:01:09 2007
@@ -25,7 +25,7 @@
import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLStreamWriter;
-import org.apache.tuscany.spi.marshaller.MarshallException;
+import org.apache.tuscany.spi.marshaller.MarshalException;
import org.apache.tuscany.spi.model.ModelObject;
import org.apache.tuscany.spi.model.physical.PhysicalOperationDefinition;
import org.apache.tuscany.spi.model.physical.PhysicalServiceDefinition;
@@ -47,14 +47,14 @@
/**
* Marshalls a physical java reference definition to the xml writer.
*/
- public void marshall(PSD modelObject, XMLStreamWriter writer) throws MarshallException {
+ public void marshal(PSD modelObject, XMLStreamWriter writer) throws MarshalException {
throw new UnsupportedOperationException();
}
/**
* Unmarshalls a java physical reference definition from the xml reader.
*/
- public PSD unmarshall(XMLStreamReader reader) throws MarshallException {
+ public PSD unmarshal(XMLStreamReader reader) throws MarshalException {
try {
PSD serviceDefinition = getConcreteModelObject();
@@ -76,7 +76,7 @@
}
}
} catch (XMLStreamException ex) {
- throw new MarshallException(ex);
+ throw new MarshalException(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=515830&r1=515829&r2=515830
==============================================================================
--- 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 Wed Mar 7 15:01:09 2007
@@ -31,7 +31,7 @@
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.MarshallException;
+import org.apache.tuscany.spi.marshaller.MarshalException;
import org.apache.tuscany.spi.model.Scope;
/**
@@ -97,7 +97,7 @@
*/
@Override
protected void handleExtension(JavaPhysicalComponentDefinition componentDefinition, XMLStreamReader reader)
- throws MarshallException {
+ throws MarshalException {
try {
String name = reader.getName().getLocalPart();
@@ -112,9 +112,9 @@
componentDefinition.setClassLoaderId(new URI(reader.getText()));
}
} catch (XMLStreamException ex) {
- throw new MarshallException(ex);
+ throw new MarshalException(ex);
} catch (URISyntaxException ex) {
- throw new MarshallException(ex);
+ throw new MarshalException(ex);
}
}
@@ -126,7 +126,7 @@
* @param reader XML stream.
*/
protected void handleReference(JavaPhysicalComponentDefinition componentDefinition, XMLStreamReader reader)
- throws MarshallException {
+ throws MarshalException {
JavaPhysicalReferenceDefinition reference = (JavaPhysicalReferenceDefinition)registry.unmarshall(reader);
componentDefinition.addReference(reference);
}
@@ -138,7 +138,7 @@
* @param reader XML stream.
*/
protected void handleService(JavaPhysicalComponentDefinition componentDefinition, XMLStreamReader reader)
- throws MarshallException {
+ throws MarshalException {
JavaPhysicalServiceDefinition service = (JavaPhysicalServiceDefinition)registry.unmarshall(reader);
componentDefinition.addService(service);
}
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=515830&r1=515829&r2=515830
==============================================================================
--- 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 Wed Mar 7 15:01:09 2007
@@ -18,6 +18,7 @@
*/
package org.apache.tuscany.core.marshaller;
+import static javax.xml.stream.XMLStreamConstants.START_ELEMENT;
import java.io.InputStream;
import java.util.Set;
@@ -77,7 +78,8 @@
InputStream inputStream = cl.getResourceAsStream("marshall/javaChangeSet.xml");
XMLStreamReader reader = XMLInputFactory.newInstance().createXMLStreamReader(inputStream);
- reader.next();
+ while(reader.next() != START_ELEMENT) {
+ }
PhysicalChangeSet changeSet = (PhysicalChangeSet)registry.unmarshall(reader);
assertNotNull(changeSet);
Set<? extends PhysicalComponentDefinition> pcds = changeSet.getComponentDefinitions();
Copied: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/marshaller/MarshalException.java (from r515766, incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/marshaller/MarshallException.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/marshaller/MarshalException.java?view=diff&rev=515830&p1=incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/marshaller/MarshallException.java&r1=515766&p2=incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/marshaller/MarshalException.java&r2=515830
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/marshaller/MarshallException.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/marshaller/MarshalException.java Wed Mar 7 15:01:09 2007
@@ -26,14 +26,14 @@
* @version $Rev$ $Date$
*/
@SuppressWarnings("serial")
-public class MarshallException extends TuscanyException {
+public class MarshalException extends TuscanyException {
/**
* Initializes the exception message.
*
* @param message Message for the exception.
*/
- public MarshallException(String message) {
+ public MarshalException(String message) {
super(message);
}
@@ -42,7 +42,7 @@
*
* @param cause Root cause for the exception.
*/
- public MarshallException(Throwable cause) {
+ public MarshalException(Throwable cause) {
super(cause);
}
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/marshaller/ModelMarshaller.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/marshaller/ModelMarshaller.java?view=diff&rev=515830&r1=515829&r2=515830
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/marshaller/ModelMarshaller.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/marshaller/ModelMarshaller.java Wed Mar 7 15:01:09 2007
@@ -36,17 +36,17 @@
*
* @param modelObject Physical component definition to be serialized.
* @param writer Stream writer to which the infoset is serialized.
- * @throws MarshallException In case of any marshalling error.
+ * @throws MarshalException In case of any marshalling error.
*/
- void marshall(MD modelObject, XMLStreamWriter writer) throws MarshallException;
+ void marshal(MD modelObject, XMLStreamWriter writer) throws MarshalException;
/**
* Unmarshalls an XML stream to a model object.
*
* @param reader XML stream from where the marshalled XML is read.
* @return Physical component definition.
- * @throws MarshallException In case of any unmarshalling error.
+ * @throws MarshalException In case of any unmarshalling error.
*/
- MD unmarshall(XMLStreamReader reader) throws MarshallException;
+ MD unmarshal(XMLStreamReader reader) throws MarshalException;
}
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/marshaller/ModelMarshallerRegistry.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/marshaller/ModelMarshallerRegistry.java?view=diff&rev=515830&r1=515829&r2=515830
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/marshaller/ModelMarshallerRegistry.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/marshaller/ModelMarshallerRegistry.java Wed Mar 7 15:01:09 2007
@@ -47,7 +47,7 @@
* @param modelObject Model object to be marshalled.
* @param writer Writer to which marshalled information is written.
*/
- void marshall(ModelObject modelObject, XMLStreamWriter writer) throws MarshallException;
+ void marshall(ModelObject modelObject, XMLStreamWriter writer) throws MarshalException;
/**
* Unmarshalls an XML stream to a model object.
@@ -55,6 +55,6 @@
* @param reader Reader from which marshalled information is read.
* @return Model object from the marshalled stream.
*/
- ModelObject unmarshall(XMLStreamReader reader) throws MarshallException;
+ ModelObject unmarshall(XMLStreamReader reader) throws MarshalException;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org