Author: slaws
Date: Fri Nov 7 04:56:56 2008
New Revision: 712118
URL: http://svn.apache.org/viewvc?rev=712118&view=rev
Log:
Remove the OASIS assembly specific parts from the OSOA core.xsd. The wireformat
function is, for the time being, now driven by some tuscany specific elements
particular to the JMS binding defined in tuscany-sca-binding-jms.xsd
Added:
tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-jms.xsd
(with props)
Modified:
tuscany/java/sca/itest/jms-format/src/main/resources/jmstextxml/helloworld.composite
tuscany/java/sca/modules/assembly-xsd/src/main/resources/sca-binding-jms.xsd
tuscany/java/sca/modules/assembly-xsd/src/main/resources/sca-core.xsd
tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca.xsd
tuscany/java/sca/modules/binding-jms-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
Modified:
tuscany/java/sca/itest/jms-format/src/main/resources/jmstextxml/helloworld.composite
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms-format/src/main/resources/jmstextxml/helloworld.composite?rev=712118&r1=712117&r2=712118&view=diff
==============================================================================
---
tuscany/java/sca/itest/jms-format/src/main/resources/jmstextxml/helloworld.composite
(original)
+++
tuscany/java/sca/itest/jms-format/src/main/resources/jmstextxml/helloworld.composite
Fri Nov 7 04:56:56 2008
@@ -19,6 +19,7 @@
-->
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0";
targetNamespace="http://helloworld";
+ xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0";
xmlns:hw="http://helloworld";
name="helloworld">
@@ -26,8 +27,8 @@
<implementation.java
class="org.apache.tuscany.sca.binding.jms.format.jmstextxml.helloworld.HelloWorldReferenceImpl"
/>
<reference name="helloWorldService1" >
<binding.jms>
- <wireFormat.jmsDefault/>
<destination name="HelloWorldService1"/>
+ <tuscany:wireFormat.jmsDefault/>
</binding.jms>
</reference>
<reference name="helloWorldService2" >
@@ -46,8 +47,8 @@
<implementation.java
class="org.apache.tuscany.sca.binding.jms.format.jmstextxml.helloworld.HelloWorldServiceImpl"
/>
<service name="HelloWorldService">
<binding.jms>
- <wireFormat.jmsDefault/>
<destination name="HelloWorldService1"/>
+ <tuscany:wireFormat.jmsDefault/>
</binding.jms>
</service>
</component>
Modified:
tuscany/java/sca/modules/assembly-xsd/src/main/resources/sca-binding-jms.xsd
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly-xsd/src/main/resources/sca-binding-jms.xsd?rev=712118&r1=712117&r2=712118&view=diff
==============================================================================
---
tuscany/java/sca/modules/assembly-xsd/src/main/resources/sca-binding-jms.xsd
(original)
+++
tuscany/java/sca/modules/assembly-xsd/src/main/resources/sca-binding-jms.xsd
Fri Nov 7 04:56:56 2008
@@ -136,22 +136,5 @@
<element name="binding.jms" type="sca:JMSBinding"
substitutionGroup="sca:binding"/>
-
- <complexType name="WireFormatJMSDefaultType">
- <complexContent>
- <extension base="sca:WireFormatType"/>
- </complexContent>
- </complexType>
-
- <element name="wireFormat.jmsDefault" type="sca:WireFormatJMSDefaultType"
- substitutionGroup="sca:wireFormat"/>
-
- <complexType name="OperationSelectorJMSDefaultType">
- <complexContent>
- <extension base="sca:OperationSelectorType"/>
- </complexContent>
- </complexType>
-
- <element name="operationSelector.jmsDefault"
type="sca:OperationSelectorJMSDefaultType"
- substitutionGroup="sca:operationSelector"/>
+
</schema>
Modified: tuscany/java/sca/modules/assembly-xsd/src/main/resources/sca-core.xsd
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly-xsd/src/main/resources/sca-core.xsd?rev=712118&r1=712117&r2=712118&view=diff
==============================================================================
--- tuscany/java/sca/modules/assembly-xsd/src/main/resources/sca-core.xsd
(original)
+++ tuscany/java/sca/modules/assembly-xsd/src/main/resources/sca-core.xsd Fri
Nov 7 04:56:56 2008
@@ -149,9 +149,7 @@
<element name="binding" type="sca:Binding" abstract="true"/>
<complexType name="Binding" abstract="true">
- <sequence>
- <element ref="sca:wireFormat" minOccurs="0" maxOccurs="1" />
- <element ref="sca:operationSelector" minOccurs="0" maxOccurs="1"
/>
+ <sequence>
<element name="operation" type="sca:Operation" minOccurs="0"
maxOccurs="unbounded" />
</sequence>
@@ -159,23 +157,7 @@
<attribute name="name" type="QName" use="optional"/>
<attribute name="requires" type="sca:listOfQNames" use="optional"/>
<attribute name="policySets" type="sca:listOfQNames" use="optional"/>
- </complexType>
-
- <element name="wireFormat" type="sca:WireFormatType"/>
- <complexType name="WireFormatType" abstract="true">
- <sequence>
- <any namespace="##other" processContents="lax" minOccurs="0"
maxOccurs="unbounded" />
- </sequence>
- <anyAttribute namespace="##other" processContents="lax"/>
- </complexType>
-
- <element name="operationSelector" type="sca:OperationSelectorType"/>
- <complexType name="OperationSelectorType" abstract="true">
- <sequence>
- <any namespace="##other" processContents="lax" minOccurs="0"
maxOccurs="unbounded" />
- </sequence>
- <anyAttribute namespace="##other" processContents="lax"/>
- </complexType>
+ </complexType>
<element name="bindingType" type="sca:BindingType"/>
<complexType name="BindingType">
Added:
tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-jms.xsd
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-jms.xsd?rev=712118&view=auto
==============================================================================
---
tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-jms.xsd
(added)
+++
tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-jms.xsd
Fri Nov 7 04:56:56 2008
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+<schema xmlns="http://www.w3.org/2001/XMLSchema";
+ targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0";
+ xmlns:sca="http://www.osoa.org/xmlns/sca/1.0";
+ xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0";
+ elementFormDefault="qualified">
+
+ <import namespace="http://www.osoa.org/xmlns/sca/1.0";
schemaLocation="sca-binding-jms.xsd"/>
+
+ <complexType name="WireFormatJMSDefaultType"/>
+
+ <element name="wireFormat.jmsDefault" type="t:WireFormatJMSDefaultType"/>
+
+ <complexType name="OperationSelectorJMSDefaultType"/>
+
+ <element name="operationSelector.jmsDefault"
type="t:OperationSelectorJMSDefaultType"/>
+
+</schema>
Propchange:
tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-jms.xsd
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-jms.xsd
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange:
tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-jms.xsd
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified:
tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca.xsd
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca.xsd?rev=712118&r1=712117&r2=712118&view=diff
==============================================================================
--- tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca.xsd
(original)
+++ tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca.xsd
Fri Nov 7 04:56:56 2008
@@ -29,6 +29,7 @@
<include schemaLocation="tuscany-sca-binding-dwr.xsd"/>
<include schemaLocation="tuscany-sca-binding-http.xsd"/>
<include schemaLocation="tuscany-sca-binding-jsonrpc.xsd"/>
+ <include schemaLocation="tuscany-sca-binding-jms.xsd"/>
<include schemaLocation="tuscany-sca-binding-notification.xsd"/>
<include schemaLocation="tuscany-sca-binding-rmi.xsd"/>
<include schemaLocation="tuscany-sca-binding-rss.xsd"/>
Modified:
tuscany/java/sca/modules/binding-jms-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-jms-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor?rev=712118&r1=712117&r2=712118&view=diff
==============================================================================
---
tuscany/java/sca/modules/binding-jms-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
(original)
+++
tuscany/java/sca/modules/binding-jms-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
Fri Nov 7 04:56:56 2008
@@ -16,6 +16,6 @@
# under the License.
# Implementation class for the artifact processor extension
-org.apache.tuscany.sca.binding.jms.wireformat.jmsdefault.WireFormatJMSDefaultProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#wireFormat.jmsDefault,model=org.apache.tuscany.sca.binding.jms.wireformat.jmsdefault.WireFormatJMSDefault
+org.apache.tuscany.sca.binding.jms.wireformat.jmsdefault.WireFormatJMSDefaultProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.0#wireFormat.jmsDefault,model=org.apache.tuscany.sca.binding.jms.wireformat.jmsdefault.WireFormatJMSDefault
org.apache.tuscany.sca.binding.jms.wireformat.jmsbytes.WireFormatJMSBytesProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.0#wireFormat.jmsBytes,model=org.apache.tuscany.sca.binding.jms.wireformat.jmsbytes.WireFormatJMSBytes
-org.apache.tuscany.sca.binding.jms.operationselector.jmsdefault.OperationSelectorJMSDefaultProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#operationSelector.jmsDefault,model=org.apache.tuscany.sca.binding.jms.operationselector.jmsdefault.OperationSelectorJMSDefault
+org.apache.tuscany.sca.binding.jms.operationselector.jmsdefault.OperationSelectorJMSDefaultProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.0#operationSelector.jmsDefault,model=org.apache.tuscany.sca.binding.jms.operationselector.jmsdefault.OperationSelectorJMSDefault
