Author: lresende
Date: Wed Mar 4 23:28:53 2009
New Revision: 750227
URL: http://svn.apache.org/viewvc?rev=750227&view=rev
Log:
Moving interface-java to use OASIS namespace/schema
Modified:
tuscany/java/sca/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaConstants.java
tuscany/java/sca/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaInterfaceProcessor.java
tuscany/java/sca/modules/interface-java-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
tuscany/java/sca/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/Calculator.composite
tuscany/java/sca/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/CalculatorComponent.constrainingType
tuscany/java/sca/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/CalculatorImpl.componentType
Modified:
tuscany/java/sca/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaConstants.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaConstants.java?rev=750227&r1=750226&r2=750227&view=diff
==============================================================================
---
tuscany/java/sca/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaConstants.java
(original)
+++
tuscany/java/sca/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaConstants.java
Wed Mar 4 23:28:53 2009
@@ -26,9 +26,9 @@
* @version $Rev$ $Date$
*/
public interface JavaConstants {
- String SCA10_NS = "http://www.osoa.org/xmlns/sca/1.0";;
+ String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200712";;
String INTERFACE_JAVA = "interface.java";
- QName INTERFACE_JAVA_QNAME = new QName(SCA10_NS, "interface.java");
+ QName INTERFACE_JAVA_QNAME = new QName(SCA11_NS, "interface.java");
String INTERFACE = "interface";
String CALLBACK_INTERFACE = "callbackInterface";
Modified:
tuscany/java/sca/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaInterfaceProcessor.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaInterfaceProcessor.java?rev=750227&r1=750226&r2=750227&view=diff
==============================================================================
---
tuscany/java/sca/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaInterfaceProcessor.java
(original)
+++
tuscany/java/sca/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaInterfaceProcessor.java
Wed Mar 4 23:28:53 2009
@@ -46,7 +46,7 @@
* @version $Rev$ $Date$
*/
public class JavaInterfaceProcessor implements
StAXArtifactProcessor<JavaInterfaceContract>, JavaConstants {
- private static final String SCA10_NS = "http://www.osoa.org/xmlns/sca/1.0";;
+ private static final String SCA11_NS =
"http://docs.oasis-open.org/ns/opencsa/sca/200712";;
private JavaInterfaceFactory javaFactory;
private Monitor monitor;
@@ -118,7 +118,7 @@
public void write(JavaInterfaceContract javaInterfaceContract,
XMLStreamWriter writer) throws ContributionWriteException, XMLStreamException {
// Write an <interface.java>
- writer.writeStartElement(SCA10_NS, INTERFACE_JAVA);
+ writer.writeStartElement(SCA11_NS, INTERFACE_JAVA);
JavaInterface javaInterface =
(JavaInterface)javaInterfaceContract.getInterface();
if (javaInterface != null && javaInterface.getName() != null) {
Modified:
tuscany/java/sca/modules/interface-java-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/interface-java-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor?rev=750227&r1=750226&r2=750227&view=diff
==============================================================================
---
tuscany/java/sca/modules/interface-java-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
(original)
+++
tuscany/java/sca/modules/interface-java-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
Wed Mar 4 23:28:53 2009
@@ -16,4 +16,4 @@
# under the License.
# Implementation class for the artifact processor extension
-org.apache.tuscany.sca.interfacedef.java.xml.JavaInterfaceProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#interface.java,model=org.apache.tuscany.sca.interfacedef.java.JavaInterfaceContract
+org.apache.tuscany.sca.interfacedef.java.xml.JavaInterfaceProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200712#interface.java,model=org.apache.tuscany.sca.interfacedef.java.JavaInterfaceContract
Modified:
tuscany/java/sca/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/Calculator.composite
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/Calculator.composite?rev=750227&r1=750226&r2=750227&view=diff
==============================================================================
---
tuscany/java/sca/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/Calculator.composite
(original)
+++
tuscany/java/sca/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/Calculator.composite
Wed Mar 4 23:28:53 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://sample.calculator";
targetNamespace="http://calc";
name="Calculator">
Modified:
tuscany/java/sca/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/CalculatorComponent.constrainingType
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/CalculatorComponent.constrainingType?rev=750227&r1=750226&r2=750227&view=diff
==============================================================================
---
tuscany/java/sca/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/CalculatorComponent.constrainingType
(original)
+++
tuscany/java/sca/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/CalculatorComponent.constrainingType
Wed Mar 4 23:28:53 2009
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<constrainingType xmlns="http://www.osoa.org/xmlns/sca/1.0";
+<constrainingType xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712";
xmlns:calc="http://calc";
targetNamespace="http://calc";
name="CalculatorComponent">
Modified:
tuscany/java/sca/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/CalculatorImpl.componentType
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/CalculatorImpl.componentType?rev=750227&r1=750226&r2=750227&view=diff
==============================================================================
---
tuscany/java/sca/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/CalculatorImpl.componentType
(original)
+++
tuscany/java/sca/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/CalculatorImpl.componentType
Wed Mar 4 23:28:53 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" />
