diff options
Diffstat (limited to 'java/sca/modules')
4 files changed, 11 insertions, 8 deletions
diff --git a/java/sca/modules/binding-sca-xml/src/main/java/org/apache/tuscany/sca/binding/sca/xml/SCABindingProcessor.java b/java/sca/modules/binding-sca-xml/src/main/java/org/apache/tuscany/sca/binding/sca/xml/SCABindingProcessor.java index 474fb0ce38..92581b6e0f 100644 --- a/java/sca/modules/binding-sca-xml/src/main/java/org/apache/tuscany/sca/binding/sca/xml/SCABindingProcessor.java +++ b/java/sca/modules/binding-sca-xml/src/main/java/org/apache/tuscany/sca/binding/sca/xml/SCABindingProcessor.java @@ -28,7 +28,6 @@ import javax.xml.stream.XMLStreamWriter; import org.apache.tuscany.sca.assembly.SCABinding; import org.apache.tuscany.sca.assembly.SCABindingFactory; -import org.apache.tuscany.sca.assembly.xml.Constants; import org.apache.tuscany.sca.assembly.xml.PolicySubjectProcessor; import org.apache.tuscany.sca.contribution.processor.ContributionReadException; import org.apache.tuscany.sca.contribution.processor.ContributionResolveException; @@ -46,15 +45,19 @@ import org.apache.tuscany.sca.policy.PolicySubject; * @version $Rev$ $Date$ */ -public class SCABindingProcessor implements StAXArtifactProcessor<SCABinding>, Constants{ +public class SCABindingProcessor implements StAXArtifactProcessor<SCABinding> { + private static final String NAME = "name"; + private static final String URI = "uri"; + + private static final String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200712"; + private static final String BINDING_SCA = "binding.sca"; + private static final QName BINDING_SCA_QNAME = new QName(SCA11_NS, BINDING_SCA); private PolicyFactory policyFactory; private SCABindingFactory scaBindingFactory; private PolicySubjectProcessor policyProcessor; private PolicyFactory intentAttachPointTypeFactory; - protected static final String BINDING_SCA = "binding.sca"; - protected static final QName BINDING_SCA_QNAME = new QName(Constants.SCA10_NS, BINDING_SCA); public SCABindingProcessor(FactoryExtensionPoint modelFactories) { this.policyFactory = modelFactories.getFactory(PolicyFactory.class); @@ -110,7 +113,7 @@ public class SCABindingProcessor implements StAXArtifactProcessor<SCABinding>, C // Write <binding.sca> policyProcessor.writePolicyPrefixes(scaBinding, writer); - writer.writeStartElement(Constants.SCA10_NS, BINDING_SCA); + writer.writeStartElement(SCA11_NS, BINDING_SCA); policyProcessor.writePolicyAttributes(scaBinding, writer); // Write binding name diff --git a/java/sca/modules/binding-sca-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/java/sca/modules/binding-sca-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor index 3b002cf6b6..ea688c96b8 100644 --- a/java/sca/modules/binding-sca-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor +++ b/java/sca/modules/binding-sca-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor @@ -16,4 +16,4 @@ # under the License. # Implementation class for the artifact processor extension -org.apache.tuscany.sca.binding.sca.xml.SCABindingProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#binding.sca,model=org.apache.tuscany.sca.assembly.SCABinding +org.apache.tuscany.sca.binding.sca.xml.SCABindingProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200712#binding.sca,model=org.apache.tuscany.sca.assembly.SCABinding diff --git a/java/sca/modules/binding-sca-xml/src/test/resources/Calculator.composite b/java/sca/modules/binding-sca-xml/src/test/resources/Calculator.composite index 0be16ec536..09a90ac54c 100644 --- a/java/sca/modules/binding-sca-xml/src/test/resources/Calculator.composite +++ b/java/sca/modules/binding-sca-xml/src/test/resources/Calculator.composite @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. --> -<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" +<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712" xmlns:calc="http://calc" targetNamespace="http://calc" name="Calculator"> diff --git a/java/sca/modules/binding-sca-xml/src/test/resources/CalculatorServiceImpl.componentType b/java/sca/modules/binding-sca-xml/src/test/resources/CalculatorServiceImpl.componentType index 55e8926504..f43bcec7b8 100644 --- a/java/sca/modules/binding-sca-xml/src/test/resources/CalculatorServiceImpl.componentType +++ b/java/sca/modules/binding-sca-xml/src/test/resources/CalculatorServiceImpl.componentType @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. --> -<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0"> +<componentType xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712"> <service name="CalculatorService"> <interface.java interface="calculator.CalculatorService" /> |