Author: lresende
Date: Wed Mar 4 23:30:08 2009
New Revision: 750228
URL: http://svn.apache.org/viewvc?rev=750228&view=rev
Log:
Updating binding-sca-xml to use new OASIS namespace
Modified:
tuscany/java/sca/modules/binding-sca-xml/src/main/java/org/apache/tuscany/sca/binding/sca/xml/SCABindingProcessor.java
tuscany/java/sca/modules/binding-sca-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
tuscany/java/sca/modules/binding-sca-xml/src/test/resources/Calculator.composite
tuscany/java/sca/modules/binding-sca-xml/src/test/resources/CalculatorServiceImpl.componentType
Modified:
tuscany/java/sca/modules/binding-sca-xml/src/main/java/org/apache/tuscany/sca/binding/sca/xml/SCABindingProcessor.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-sca-xml/src/main/java/org/apache/tuscany/sca/binding/sca/xml/SCABindingProcessor.java?rev=750228&r1=750227&r2=750228&view=diff
==============================================================================
---
tuscany/java/sca/modules/binding-sca-xml/src/main/java/org/apache/tuscany/sca/binding/sca/xml/SCABindingProcessor.java
(original)
+++
tuscany/java/sca/modules/binding-sca-xml/src/main/java/org/apache/tuscany/sca/binding/sca/xml/SCABindingProcessor.java
Wed Mar 4 23:30:08 2009
@@ -28,7 +28,6 @@
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 @@
* @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 @@
// 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
Modified:
tuscany/java/sca/modules/binding-sca-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-sca-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor?rev=750228&r1=750227&r2=750228&view=diff
==============================================================================
---
tuscany/java/sca/modules/binding-sca-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
(original)
+++
tuscany/java/sca/modules/binding-sca-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
Wed Mar 4 23:30:08 2009
@@ -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
Modified:
tuscany/java/sca/modules/binding-sca-xml/src/test/resources/Calculator.composite
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-sca-xml/src/test/resources/Calculator.composite?rev=750228&r1=750227&r2=750228&view=diff
==============================================================================
---
tuscany/java/sca/modules/binding-sca-xml/src/test/resources/Calculator.composite
(original)
+++
tuscany/java/sca/modules/binding-sca-xml/src/test/resources/Calculator.composite
Wed Mar 4 23:30:08 2009
@@ -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">
Modified:
tuscany/java/sca/modules/binding-sca-xml/src/test/resources/CalculatorServiceImpl.componentType
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-sca-xml/src/test/resources/CalculatorServiceImpl.componentType?rev=750228&r1=750227&r2=750228&view=diff
==============================================================================
---
tuscany/java/sca/modules/binding-sca-xml/src/test/resources/CalculatorServiceImpl.componentType
(original)
+++
tuscany/java/sca/modules/binding-sca-xml/src/test/resources/CalculatorServiceImpl.componentType
Wed Mar 4 23:30:08 2009
@@ -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" />
