summaryrefslogtreecommitdiffstats
path: root/java/sca/modules/assembly-xml/src
diff options
context:
space:
mode:
Diffstat (limited to 'java/sca/modules/assembly-xml/src')
-rw-r--r--java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/EndpointProcessor.java18
-rw-r--r--java/sca/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor2
-rw-r--r--java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/BuildPolicyTestCase.java8
3 files changed, 14 insertions, 14 deletions
diff --git a/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/EndpointProcessor.java b/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/EndpointProcessor.java
index be209cb681..8eebf1f5e5 100644
--- a/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/EndpointProcessor.java
+++ b/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/EndpointProcessor.java
@@ -28,7 +28,7 @@ import org.apache.tuscany.sca.assembly.Binding;
import org.apache.tuscany.sca.assembly.Component;
import org.apache.tuscany.sca.assembly.ComponentService;
import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.assembly.Endpoint2;
+import org.apache.tuscany.sca.assembly.Endpoint;
import org.apache.tuscany.sca.contribution.processor.ContributionReadException;
import org.apache.tuscany.sca.contribution.processor.ContributionResolveException;
import org.apache.tuscany.sca.contribution.processor.ContributionWriteException;
@@ -42,7 +42,7 @@ import org.apache.tuscany.sca.monitor.Monitor;
/**
*
*/
-public class EndpointProcessor extends BaseAssemblyProcessor implements StAXArtifactProcessor<Endpoint2> {
+public class EndpointProcessor extends BaseAssemblyProcessor implements StAXArtifactProcessor<Endpoint> {
private final static String ENDPOINT = "endpoint";
private final static QName ENDPOINT_QNAME = new QName(Constants.SCA11_TUSCANY_NS, ENDPOINT);
@@ -71,8 +71,8 @@ public class EndpointProcessor extends BaseAssemblyProcessor implements StAXArti
return ENDPOINT_QNAME;
}
- public Endpoint2 read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException {
- Endpoint2 endpoint = assemblyFactory.createEndpoint();
+ public Endpoint read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException {
+ Endpoint endpoint = assemblyFactory.createEndpoint();
reader.nextTag();
Object model = extensionProcessor.read(reader);
if (model instanceof Composite) {
@@ -87,13 +87,13 @@ public class EndpointProcessor extends BaseAssemblyProcessor implements StAXArti
return endpoint;
}
- public void write(Endpoint2 model, XMLStreamWriter writer) throws ContributionWriteException, XMLStreamException {
+ public void write(Endpoint model, XMLStreamWriter writer) throws ContributionWriteException, XMLStreamException {
// writeStart(writer, ENDPOINT_QNAME);
extensionProcessor.write(wrap(model), writer);
// writeEnd(writer);
}
- private Composite wrap(Endpoint2 endpoint) {
+ private Composite wrap(Endpoint endpoint) {
try {
Composite composite = assemblyFactory.createComposite();
composite.setName(ENDPOINT_QNAME);
@@ -113,10 +113,10 @@ public class EndpointProcessor extends BaseAssemblyProcessor implements StAXArti
}
}
- public Class<Endpoint2> getModelType() {
- return Endpoint2.class;
+ public Class<Endpoint> getModelType() {
+ return Endpoint.class;
}
- public void resolve(Endpoint2 model, ModelResolver resolver) throws ContributionResolveException {
+ public void resolve(Endpoint model, ModelResolver resolver) throws ContributionResolveException {
}
}
diff --git a/java/sca/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/java/sca/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 68859d3d98..565fe12329 100644
--- a/java/sca/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/java/sca/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
@@ -20,4 +20,4 @@ org.apache.tuscany.sca.assembly.xml.ComponentTypeProcessor;qname=http://docs.oas
org.apache.tuscany.sca.assembly.xml.ConstrainingTypeProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200903#constrainingType,model=org.apache.tuscany.sca.assembly.ConstrainingType
org.apache.tuscany.sca.assembly.xml.CompositeProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200903#composite,model=org.apache.tuscany.sca.assembly.Composite
org.apache.tuscany.sca.assembly.xml.SCABindingProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200903#binding.sca,model=org.apache.tuscany.sca.assembly.SCABinding
-org.apache.tuscany.sca.assembly.xml.EndpointProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.1#binding.rmi#endpoint,model=org.apache.tuscany.sca.assembly.Endpoint2 \ No newline at end of file
+org.apache.tuscany.sca.assembly.xml.EndpointProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.1#binding.rmi#endpoint,model=org.apache.tuscany.sca.assembly.Endpoint \ No newline at end of file
diff --git a/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/BuildPolicyTestCase.java b/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/BuildPolicyTestCase.java
index 7db6d964c4..fa0e9bdf5b 100644
--- a/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/BuildPolicyTestCase.java
+++ b/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/BuildPolicyTestCase.java
@@ -32,8 +32,8 @@ import javax.xml.namespace.QName;
import org.apache.tuscany.sca.assembly.Component;
import org.apache.tuscany.sca.assembly.Composite;
import org.apache.tuscany.sca.assembly.ConstrainingType;
-import org.apache.tuscany.sca.assembly.Endpoint2;
-import org.apache.tuscany.sca.assembly.EndpointReference2;
+import org.apache.tuscany.sca.assembly.Endpoint;
+import org.apache.tuscany.sca.assembly.EndpointReference;
import org.apache.tuscany.sca.assembly.SCABindingFactory;
import org.apache.tuscany.sca.assembly.builder.CompositeBuilder;
import org.apache.tuscany.sca.assembly.builder.CompositeBuilderExtensionPoint;
@@ -130,8 +130,8 @@ public class BuildPolicyTestCase {
new QName(namespaceUri, "tuscanyIntent_1"));
Component component = composite.getComponents().get(0);
- Endpoint2 ep = component.getServices().get(0).getEndpoints().get(0);
- EndpointReference2 epr = component.getReferences().get(0).getEndpointReferences().get(0);
+ Endpoint ep = component.getServices().get(0).getEndpoints().get(0);
+ EndpointReference epr = component.getReferences().get(0).getEndpointReferences().get(0);
System.out.println(ep.getRequiredIntents());
System.out.println(epr.getRequiredIntents());