You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2009/03/05 06:52:04 UTC
svn commit: r750323 [1/2] - in /tuscany/java/sca: itest/
itest/callback-api/src/main/resources/
itest/callback-api/src/main/resources/META-INF/
itest/callback-basic/src/main/resources/
itest/callback-basic/src/main/resources/META-INF/ itest/callback-co...
Author: rfeng
Date: Thu Mar 5 05:52:01 2009
New Revision: 750323
URL: http://svn.apache.org/viewvc?rev=750323&view=rev
Log:
More changes to switch SCA namespace from osoa version to oasis one
Modified:
tuscany/java/sca/itest/ (props changed)
tuscany/java/sca/itest/callback-api/src/main/resources/CallBackApiTest.composite
tuscany/java/sca/itest/callback-api/src/main/resources/META-INF/sca-contribution.xml
tuscany/java/sca/itest/callback-basic/src/main/resources/CallBackBasicTest.composite
tuscany/java/sca/itest/callback-basic/src/main/resources/META-INF/sca-contribution.xml
tuscany/java/sca/itest/callback-complex-type/src/main/resources/CallBackCTypeClient.composite
tuscany/java/sca/itest/callback-complex-type/src/main/resources/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.componentType
tuscany/java/sca/itest/callback-id/src/main/resources/CallBackIdClient.composite
tuscany/java/sca/itest/callback-multiple-wires/src/main/resources/CallbackMultiWireTest.composite
tuscany/java/sca/itest/callback-separatethread/src/main/resources/CallBackSeparateThreadTest.composite
tuscany/java/sca/itest/callback-set-callback/src/main/resources/CallBackSetCallbackTest.composite
tuscany/java/sca/itest/callback-set-conversation/src/main/resources/CallBackSetCallbackConvTest.composite
tuscany/java/sca/itest/component-type/src/main/resources/Calculator.composite
tuscany/java/sca/itest/component-type/src/main/resources/calculator/AddServiceImpl.componentType
tuscany/java/sca/itest/component-type/src/main/resources/calculator/CalculatorServiceImpl.componentType
tuscany/java/sca/itest/component-type/src/main/resources/calculator/DivideServiceImpl.componentType
tuscany/java/sca/itest/component-type/src/main/resources/calculator/MultiplyServiceImpl.componentType
tuscany/java/sca/itest/component-type/src/main/resources/calculator/SubtractServiceImpl.componentType
tuscany/java/sca/itest/conversations/src/main/resources/ConversationAge.composite
tuscany/java/sca/itest/conversations/src/main/resources/ConversationUniqueId.composite
tuscany/java/sca/itest/conversations/src/main/resources/conversationId.composite
tuscany/java/sca/itest/conversations/src/main/resources/conversationLifetime.composite
tuscany/java/sca/itest/conversations/src/main/resources/conversational.composite
tuscany/java/sca/itest/distribution/bin-distro-unzip/pom.xml
tuscany/java/sca/itest/exceptions/src/main/resources/ExceptionTest.composite
tuscany/java/sca/itest/interfaces/src/main/resources/InterfacesTest.composite
tuscany/java/sca/itest/properties/src/main/resources/ConstructorPropertyInjection.composite
tuscany/java/sca/itest/properties/src/main/resources/Outer.composite
tuscany/java/sca/itest/properties/src/main/resources/OuterPropertyTest.composite
tuscany/java/sca/itest/properties/src/main/resources/PropertyTest.composite
tuscany/java/sca/itest/properties/src/main/resources/mySimpleService.composite
tuscany/java/sca/itest/recursive-multi-level/src/main/resources/TotalService1Auto.composite
tuscany/java/sca/itest/recursive-multi-level/src/main/resources/TotalService2Auto.composite
tuscany/java/sca/itest/recursive-multi-level/src/main/resources/TotalService3Auto.composite
tuscany/java/sca/itest/references/src/main/resources/AutoWiredReferencesTest.composite
tuscany/java/sca/itest/references/src/main/resources/InnerReferencesTest.composite
tuscany/java/sca/itest/references/src/main/resources/ManualWiredReferencesTest.composite
tuscany/java/sca/itest/scopes/src/main/resources/scopes.composite
tuscany/java/sca/itest/services/src/main/resources/META-INF/sca-contribution.xml
tuscany/java/sca/itest/services/src/main/resources/ServicesTest.composite
tuscany/java/sca/itest/wires/src/main/resources/WireTest.composite
tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingImpl.java
tuscany/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllPolicyCalculator.composite
tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BaseBuilderImpl.java
tuscany/java/sca/modules/binding-dwr/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
tuscany/java/sca/modules/binding-jsonp/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
tuscany/java/sca/modules/binding-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
tuscany/java/sca/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/WriteTestCase.java
tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/XMLStreamReader2CallableReference.java
tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/ReferenceParameterProcessor.java
tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/CompositeContextImpl.java
tuscany/java/sca/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
tuscany/java/sca/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefinitionsDocumentProcessor.java
tuscany/java/sca/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/xml/NodeImplementationProcessor.java
tuscany/java/sca/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLConstants.java
tuscany/java/sca/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java
tuscany/java/sca/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLModelResolver.java
tuscany/java/sca/modules/interface-wsdl-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
tuscany/java/sca/modules/interface-wsdl-xml/src/test/resources/policy/stockquote_policy.wsdl
tuscany/java/sca/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceIntrospectorImpl.java
tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java
tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicy.java
tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicyProcessor.java
tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationReferencePolicyInterceptor.java
tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationServicePolicyInterceptor.java
tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicy.java
tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicy.java
tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicy.java
tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyHandler.java
tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProcessor.java
tuscany/java/sca/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
tuscany/java/sca/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/definitions.xml
tuscany/java/sca/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/tuscany_definitions.xml
tuscany/java/sca/modules/policy-security/src/test/java/org/apache/tuscany/sca/policy/security/PolicyProcessorTestCase.java
tuscany/java/sca/modules/policy-security/src/test/resources/org/apache/tuscany/sca/policy/security/mock_policy_definitions.xml
tuscany/java/sca/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/ws/WSPolicyProcessorTestCase.java
tuscany/java/sca/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyConstants.java
tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyComputationUtils.java
tuscany/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/Constants.java
tuscany/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Requires.java
tuscany/java/sca/modules/workspace-xml/src/main/java/org/apache/tuscany/sca/workspace/xml/WorkspaceProcessor.java
tuscany/java/sca/modules/workspace-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
tuscany/java/sca/modules/workspace-xml/src/test/java/org/apache/tuscany/sca/workspace/xml/ContributionWorkspaceProcessorTestCase.java
tuscany/java/sca/samples/binding-ws-calculator/src/main/resources/Calculator.composite
tuscany/java/sca/samples/binding-ws-calculator/src/main/resources/META-INF/sca-contribution.xml
tuscany/java/sca/samples/calculator-equinox/src/main/resources/Calculator.composite
tuscany/java/sca/samples/calculator-osgi/src/main/resources/Calculator.composite
tuscany/java/sca/samples/calculator-rmi-reference/build.xml
tuscany/java/sca/samples/calculator-rmi-reference/src/main/resources/CalculatorRMIReference.composite
tuscany/java/sca/samples/calculator-rmi-service/src/main/resources/CalculatorRMIServer.composite
tuscany/java/sca/samples/calculator-rmi-service/src/main/resources/META-INF/sca-contribution.xml
tuscany/java/sca/samples/calculator/src/main/resources/Calculator.composite
tuscany/java/sca/samples/calculator/src/main/resources/META-INF/sca-contribution.xml
tuscany/java/sca/samples/implementation-java-calculator/src/main/resources/Calculator.composite
Propchange: tuscany/java/sca/itest/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Mar 5 05:52:01 2009
@@ -0,0 +1,2 @@
+/tuscany/branches/sca-equinox/itest:694816-709480
+/tuscany/branches/sca-java-1.3/itest:671193,680620-680628
Modified: tuscany/java/sca/itest/callback-api/src/main/resources/CallBackApiTest.composite
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/callback-api/src/main/resources/CallBackApiTest.composite?rev=750323&r1=750322&r2=750323&view=diff
==============================================================================
--- tuscany/java/sca/itest/callback-api/src/main/resources/CallBackApiTest.composite (original)
+++ tuscany/java/sca/itest/callback-api/src/main/resources/CallBackApiTest.composite Thu Mar 5 05:52:01 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"
targetNamespace="http://callback"
name="CallBackApiTest">
Modified: tuscany/java/sca/itest/callback-api/src/main/resources/META-INF/sca-contribution.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/callback-api/src/main/resources/META-INF/sca-contribution.xml?rev=750323&r1=750322&r2=750323&view=diff
==============================================================================
--- tuscany/java/sca/itest/callback-api/src/main/resources/META-INF/sca-contribution.xml (original)
+++ tuscany/java/sca/itest/callback-api/src/main/resources/META-INF/sca-contribution.xml Thu Mar 5 05:52:01 2009
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0" targetNamespace="http://callback"
+<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712" targetNamespace="http://callback"
xmlns:t="http://callback">
<deployable composite="t:CallBackApiTest" />
</contribution>
\ No newline at end of file
Modified: tuscany/java/sca/itest/callback-basic/src/main/resources/CallBackBasicTest.composite
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/callback-basic/src/main/resources/CallBackBasicTest.composite?rev=750323&r1=750322&r2=750323&view=diff
==============================================================================
--- tuscany/java/sca/itest/callback-basic/src/main/resources/CallBackBasicTest.composite (original)
+++ tuscany/java/sca/itest/callback-basic/src/main/resources/CallBackBasicTest.composite Thu Mar 5 05:52:01 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"
targetNamespace="http://callback"
name="CallBackBasicTest">
Modified: tuscany/java/sca/itest/callback-basic/src/main/resources/META-INF/sca-contribution.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/callback-basic/src/main/resources/META-INF/sca-contribution.xml?rev=750323&r1=750322&r2=750323&view=diff
==============================================================================
--- tuscany/java/sca/itest/callback-basic/src/main/resources/META-INF/sca-contribution.xml (original)
+++ tuscany/java/sca/itest/callback-basic/src/main/resources/META-INF/sca-contribution.xml Thu Mar 5 05:52:01 2009
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0" targetNamespace="http://callback"
+<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712" targetNamespace="http://callback"
xmlns:t="http://callback">
<deployable composite="t:CallBackBasicTest" />
</contribution>
\ No newline at end of file
Modified: tuscany/java/sca/itest/callback-complex-type/src/main/resources/CallBackCTypeClient.composite
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/callback-complex-type/src/main/resources/CallBackCTypeClient.composite?rev=750323&r1=750322&r2=750323&view=diff
==============================================================================
--- tuscany/java/sca/itest/callback-complex-type/src/main/resources/CallBackCTypeClient.composite (original)
+++ tuscany/java/sca/itest/callback-complex-type/src/main/resources/CallBackCTypeClient.composite Thu Mar 5 05:52:01 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"
targetNamespace="http://callback"
name="CallBackCTypeTest">
Modified: tuscany/java/sca/itest/callback-complex-type/src/main/resources/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.componentType
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/callback-complex-type/src/main/resources/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.componentType?rev=750323&r1=750322&r2=750323&view=diff
==============================================================================
--- tuscany/java/sca/itest/callback-complex-type/src/main/resources/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.componentType (original)
+++ tuscany/java/sca/itest/callback-complex-type/src/main/resources/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.componentType Thu Mar 5 05:52:01 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="CallBackCTypeService">
<interface.java interface="org.apache.tuscany.sca.test.CallBackCTypeService"
Modified: tuscany/java/sca/itest/callback-id/src/main/resources/CallBackIdClient.composite
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/callback-id/src/main/resources/CallBackIdClient.composite?rev=750323&r1=750322&r2=750323&view=diff
==============================================================================
--- tuscany/java/sca/itest/callback-id/src/main/resources/CallBackIdClient.composite (original)
+++ tuscany/java/sca/itest/callback-id/src/main/resources/CallBackIdClient.composite Thu Mar 5 05:52:01 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"
targetNamespace="http://callback"
name="CallBackIdTest">
Modified: tuscany/java/sca/itest/callback-multiple-wires/src/main/resources/CallbackMultiWireTest.composite
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/callback-multiple-wires/src/main/resources/CallbackMultiWireTest.composite?rev=750323&r1=750322&r2=750323&view=diff
==============================================================================
--- tuscany/java/sca/itest/callback-multiple-wires/src/main/resources/CallbackMultiWireTest.composite (original)
+++ tuscany/java/sca/itest/callback-multiple-wires/src/main/resources/CallbackMultiWireTest.composite Thu Mar 5 05:52:01 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"
targetNamespace="http://callback"
name="CallbackMultiWireTest">
Modified: tuscany/java/sca/itest/callback-separatethread/src/main/resources/CallBackSeparateThreadTest.composite
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/callback-separatethread/src/main/resources/CallBackSeparateThreadTest.composite?rev=750323&r1=750322&r2=750323&view=diff
==============================================================================
--- tuscany/java/sca/itest/callback-separatethread/src/main/resources/CallBackSeparateThreadTest.composite (original)
+++ tuscany/java/sca/itest/callback-separatethread/src/main/resources/CallBackSeparateThreadTest.composite Thu Mar 5 05:52:01 2009
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" targetNamespace="http://callback" name="CallBackSeparateThreadTest">
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712" targetNamespace="http://callback" name="CallBackSeparateThreadTest">
<component name="CallBackSeparateThreadClient">
<implementation.java class="org.apache.tuscany.sca.itest.CallBackSeparateThreadClientImpl"/>
Modified: tuscany/java/sca/itest/callback-set-callback/src/main/resources/CallBackSetCallbackTest.composite
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/callback-set-callback/src/main/resources/CallBackSetCallbackTest.composite?rev=750323&r1=750322&r2=750323&view=diff
==============================================================================
--- tuscany/java/sca/itest/callback-set-callback/src/main/resources/CallBackSetCallbackTest.composite (original)
+++ tuscany/java/sca/itest/callback-set-callback/src/main/resources/CallBackSetCallbackTest.composite Thu Mar 5 05:52:01 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"
targetNamespace="http://callback"
name="CallBackSetCallbackTest">
Modified: tuscany/java/sca/itest/callback-set-conversation/src/main/resources/CallBackSetCallbackConvTest.composite
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/callback-set-conversation/src/main/resources/CallBackSetCallbackConvTest.composite?rev=750323&r1=750322&r2=750323&view=diff
==============================================================================
--- tuscany/java/sca/itest/callback-set-conversation/src/main/resources/CallBackSetCallbackConvTest.composite (original)
+++ tuscany/java/sca/itest/callback-set-conversation/src/main/resources/CallBackSetCallbackConvTest.composite Thu Mar 5 05:52:01 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"
targetNamespace="http://callback"
name="CallBackSetCallbackConvTest">
Modified: tuscany/java/sca/itest/component-type/src/main/resources/Calculator.composite
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/component-type/src/main/resources/Calculator.composite?rev=750323&r1=750322&r2=750323&view=diff
==============================================================================
--- tuscany/java/sca/itest/component-type/src/main/resources/Calculator.composite (original)
+++ tuscany/java/sca/itest/component-type/src/main/resources/Calculator.composite Thu Mar 5 05:52:01 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"
targetNamespace="http://sample"
xmlns:sample="http://sample"
name="Calculator">
Modified: tuscany/java/sca/itest/component-type/src/main/resources/calculator/AddServiceImpl.componentType
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/component-type/src/main/resources/calculator/AddServiceImpl.componentType?rev=750323&r1=750322&r2=750323&view=diff
==============================================================================
--- tuscany/java/sca/itest/component-type/src/main/resources/calculator/AddServiceImpl.componentType (original)
+++ tuscany/java/sca/itest/component-type/src/main/resources/calculator/AddServiceImpl.componentType Thu Mar 5 05:52:01 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="AddService">
<interface.java interface="calculator.AddService"/>
Modified: tuscany/java/sca/itest/component-type/src/main/resources/calculator/CalculatorServiceImpl.componentType
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/component-type/src/main/resources/calculator/CalculatorServiceImpl.componentType?rev=750323&r1=750322&r2=750323&view=diff
==============================================================================
--- tuscany/java/sca/itest/component-type/src/main/resources/calculator/CalculatorServiceImpl.componentType (original)
+++ tuscany/java/sca/itest/component-type/src/main/resources/calculator/CalculatorServiceImpl.componentType Thu Mar 5 05:52:01 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"/>
Modified: tuscany/java/sca/itest/component-type/src/main/resources/calculator/DivideServiceImpl.componentType
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/component-type/src/main/resources/calculator/DivideServiceImpl.componentType?rev=750323&r1=750322&r2=750323&view=diff
==============================================================================
--- tuscany/java/sca/itest/component-type/src/main/resources/calculator/DivideServiceImpl.componentType (original)
+++ tuscany/java/sca/itest/component-type/src/main/resources/calculator/DivideServiceImpl.componentType Thu Mar 5 05:52:01 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="DivideService">
<interface.java interface="calculator.DivideService"/>
Modified: tuscany/java/sca/itest/component-type/src/main/resources/calculator/MultiplyServiceImpl.componentType
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/component-type/src/main/resources/calculator/MultiplyServiceImpl.componentType?rev=750323&r1=750322&r2=750323&view=diff
==============================================================================
--- tuscany/java/sca/itest/component-type/src/main/resources/calculator/MultiplyServiceImpl.componentType (original)
+++ tuscany/java/sca/itest/component-type/src/main/resources/calculator/MultiplyServiceImpl.componentType Thu Mar 5 05:52:01 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="MultiplyService">
<interface.java interface="calculator.MultiplyService"/>
Modified: tuscany/java/sca/itest/component-type/src/main/resources/calculator/SubtractServiceImpl.componentType
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/component-type/src/main/resources/calculator/SubtractServiceImpl.componentType?rev=750323&r1=750322&r2=750323&view=diff
==============================================================================
--- tuscany/java/sca/itest/component-type/src/main/resources/calculator/SubtractServiceImpl.componentType (original)
+++ tuscany/java/sca/itest/component-type/src/main/resources/calculator/SubtractServiceImpl.componentType Thu Mar 5 05:52:01 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="SubtractService">
<interface.java interface="calculator.SubtractService"/>
Modified: tuscany/java/sca/itest/conversations/src/main/resources/ConversationAge.composite
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/conversations/src/main/resources/ConversationAge.composite?rev=750323&r1=750322&r2=750323&view=diff
==============================================================================
--- tuscany/java/sca/itest/conversations/src/main/resources/ConversationAge.composite (original)
+++ tuscany/java/sca/itest/conversations/src/main/resources/ConversationAge.composite Thu Mar 5 05:52:01 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"
name="ConversationalIdTest">
<component name="ConversationAgeComponent">
Modified: tuscany/java/sca/itest/conversations/src/main/resources/ConversationUniqueId.composite
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/conversations/src/main/resources/ConversationUniqueId.composite?rev=750323&r1=750322&r2=750323&view=diff
==============================================================================
--- tuscany/java/sca/itest/conversations/src/main/resources/ConversationUniqueId.composite (original)
+++ tuscany/java/sca/itest/conversations/src/main/resources/ConversationUniqueId.composite Thu Mar 5 05:52:01 2009
@@ -20,7 +20,7 @@
<!-- $Rev$ $Date$ -->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712"
targetNamespace="http://conversations"
name="ConversationUniqueIdTest">
Modified: tuscany/java/sca/itest/conversations/src/main/resources/conversationId.composite
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/conversations/src/main/resources/conversationId.composite?rev=750323&r1=750322&r2=750323&view=diff
==============================================================================
--- tuscany/java/sca/itest/conversations/src/main/resources/conversationId.composite (original)
+++ tuscany/java/sca/itest/conversations/src/main/resources/conversationId.composite Thu Mar 5 05:52:01 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"
name="ConversationalIdTest">
<component name="ConversationIdComponent">
Modified: tuscany/java/sca/itest/conversations/src/main/resources/conversationLifetime.composite
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/conversations/src/main/resources/conversationLifetime.composite?rev=750323&r1=750322&r2=750323&view=diff
==============================================================================
--- tuscany/java/sca/itest/conversations/src/main/resources/conversationLifetime.composite (original)
+++ tuscany/java/sca/itest/conversations/src/main/resources/conversationLifetime.composite Thu Mar 5 05:52:01 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"
targetNamespace="http://conversations"
name="conversationLifetimeTest">
Modified: tuscany/java/sca/itest/conversations/src/main/resources/conversational.composite
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/conversations/src/main/resources/conversational.composite?rev=750323&r1=750322&r2=750323&view=diff
==============================================================================
--- tuscany/java/sca/itest/conversations/src/main/resources/conversational.composite (original)
+++ tuscany/java/sca/itest/conversations/src/main/resources/conversational.composite Thu Mar 5 05:52:01 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"
targetNamespace="http://conversations"
name="ConversationalITest">
Modified: tuscany/java/sca/itest/distribution/bin-distro-unzip/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/distribution/bin-distro-unzip/pom.xml?rev=750323&r1=750322&r2=750323&view=diff
==============================================================================
--- tuscany/java/sca/itest/distribution/bin-distro-unzip/pom.xml (original)
+++ tuscany/java/sca/itest/distribution/bin-distro-unzip/pom.xml Thu Mar 5 05:52:01 2009
@@ -71,6 +71,7 @@
</goals>
<configuration>
<tasks>
+ <property name="java.home" value="${java.home}"/>
<ant antfile="./build.xml" />
</tasks>
</configuration>
@@ -120,6 +121,7 @@
</goals>
<configuration>
<tasks>
+ <property name="java.home" value="${java.home}"/>
<ant antfile="./build.xml" />
</tasks>
</configuration>
Modified: tuscany/java/sca/itest/exceptions/src/main/resources/ExceptionTest.composite
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/exceptions/src/main/resources/ExceptionTest.composite?rev=750323&r1=750322&r2=750323&view=diff
==============================================================================
--- tuscany/java/sca/itest/exceptions/src/main/resources/ExceptionTest.composite (original)
+++ tuscany/java/sca/itest/exceptions/src/main/resources/ExceptionTest.composite Thu Mar 5 05:52:01 2009
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:foo="http://foo" targetNamespace="http://foo"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712" xmlns:foo="http://foo" targetNamespace="http://foo"
name="ExceptionTest">
<component name="main">
<implementation.java class="org.apache.tuscany.sca.test.exceptions.impl.ExceptionHandlerImpl" />
Modified: tuscany/java/sca/itest/interfaces/src/main/resources/InterfacesTest.composite
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/interfaces/src/main/resources/InterfacesTest.composite?rev=750323&r1=750322&r2=750323&view=diff
==============================================================================
--- tuscany/java/sca/itest/interfaces/src/main/resources/InterfacesTest.composite (original)
+++ tuscany/java/sca/itest/interfaces/src/main/resources/InterfacesTest.composite Thu Mar 5 05:52:01 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:foo="http://foo" targetNamespace="http://foo"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712" xmlns:foo="http://foo" targetNamespace="http://foo"
name="InterfacesTest" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<component name="LocalClientComponent">
Modified: tuscany/java/sca/itest/properties/src/main/resources/ConstructorPropertyInjection.composite
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/properties/src/main/resources/ConstructorPropertyInjection.composite?rev=750323&r1=750322&r2=750323&view=diff
==============================================================================
--- tuscany/java/sca/itest/properties/src/main/resources/ConstructorPropertyInjection.composite (original)
+++ tuscany/java/sca/itest/properties/src/main/resources/ConstructorPropertyInjection.composite Thu Mar 5 05:52:01 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"
name="ConstructorPropertyInjection">
<component name="Foo1Component">
Modified: tuscany/java/sca/itest/properties/src/main/resources/Outer.composite
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/properties/src/main/resources/Outer.composite?rev=750323&r1=750322&r2=750323&view=diff
==============================================================================
--- tuscany/java/sca/itest/properties/src/main/resources/Outer.composite (original)
+++ tuscany/java/sca/itest/properties/src/main/resources/Outer.composite Thu Mar 5 05:52:01 2009
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<composite xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712"
xmlns:foo="http://foo" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xsi:schemaLocation="http://www.osoa.org/xmlns/sca/1.0 http://www.osoa.org/xmlns/sca/1.0" name="Iteration3Composite"
+ xsi:schemaLocation="http://docs.oasis-open.org/ns/opencsa/sca/200712 http://docs.oasis-open.org/ns/opencsa/sca/200712" name="Iteration3Composite"
targetNamespace="http://foo" local="true" autowire="false">
<property name="newLocation" type="xsd:anyURI">Raleigh</property>
Modified: tuscany/java/sca/itest/properties/src/main/resources/OuterPropertyTest.composite
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/properties/src/main/resources/OuterPropertyTest.composite?rev=750323&r1=750322&r2=750323&view=diff
==============================================================================
--- tuscany/java/sca/itest/properties/src/main/resources/OuterPropertyTest.composite (original)
+++ tuscany/java/sca/itest/properties/src/main/resources/OuterPropertyTest.composite Thu Mar 5 05:52:01 2009
@@ -16,7 +16,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:foo="http://foo"
targetNamespace="http://foo"
name="OuterPropertyTest"
Modified: tuscany/java/sca/itest/properties/src/main/resources/PropertyTest.composite
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/properties/src/main/resources/PropertyTest.composite?rev=750323&r1=750322&r2=750323&view=diff
==============================================================================
--- tuscany/java/sca/itest/properties/src/main/resources/PropertyTest.composite (original)
+++ tuscany/java/sca/itest/properties/src/main/resources/PropertyTest.composite Thu Mar 5 05:52:01 2009
@@ -16,7 +16,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:foo="http://foo"
xmlns:cust="http://www.example.com/Customer"
xmlns:dbsdo="http://tuscany.apache.org/xmlns/sca/databinding/sdo/1.0"
Modified: tuscany/java/sca/itest/properties/src/main/resources/mySimpleService.composite
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/properties/src/main/resources/mySimpleService.composite?rev=750323&r1=750322&r2=750323&view=diff
==============================================================================
--- tuscany/java/sca/itest/properties/src/main/resources/mySimpleService.composite (original)
+++ tuscany/java/sca/itest/properties/src/main/resources/mySimpleService.composite Thu Mar 5 05:52:01 2009
@@ -18,9 +18,9 @@
* under the License.
-->
<composite autowire="false" local="true" name="MySimpleService"
- targetNamespace="http://foo" xmlns:foo="http://foo" xmlns="http://www.osoa.org/xmlns/sca/1.0"
+ targetNamespace="http://foo" xmlns:foo="http://foo" xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712"
xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.osoa.org/xmlns/sca/1.0 http://www.osoa.org/xmlns/sca/1.0 ">
+ xsi:schemaLocation="http://docs.oasis-open.org/ns/opencsa/sca/200712 http://docs.oasis-open.org/ns/opencsa/sca/200712 ">
<service name="MyServiceNew1" promote="MyServiceComponentNew/MyService">
Modified: tuscany/java/sca/itest/recursive-multi-level/src/main/resources/TotalService1Auto.composite
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/recursive-multi-level/src/main/resources/TotalService1Auto.composite?rev=750323&r1=750322&r2=750323&view=diff
==============================================================================
--- tuscany/java/sca/itest/recursive-multi-level/src/main/resources/TotalService1Auto.composite (original)
+++ tuscany/java/sca/itest/recursive-multi-level/src/main/resources/TotalService1Auto.composite Thu Mar 5 05:52:01 2009
@@ -18,10 +18,10 @@
* under the License.
-->
<composite xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://www.osoa.org/xmlns/sca/1.0"
+ xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712"
xmlns:foo="http://foo"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xsi:schemaLocation="http://www.osoa.org/xmlns/sca/1.0 http://www.osoa.org/xmlns/sca/1.0"
+ xsi:schemaLocation="http://docs.oasis-open.org/ns/opencsa/sca/200712 http://docs.oasis-open.org/ns/opencsa/sca/200712"
name="TotalComposite1Auto"
targetNamespace="http://foo"
local="true"
Modified: tuscany/java/sca/itest/recursive-multi-level/src/main/resources/TotalService2Auto.composite
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/recursive-multi-level/src/main/resources/TotalService2Auto.composite?rev=750323&r1=750322&r2=750323&view=diff
==============================================================================
--- tuscany/java/sca/itest/recursive-multi-level/src/main/resources/TotalService2Auto.composite (original)
+++ tuscany/java/sca/itest/recursive-multi-level/src/main/resources/TotalService2Auto.composite Thu Mar 5 05:52:01 2009
@@ -18,10 +18,10 @@
* under the License.
-->
<composite xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://www.osoa.org/xmlns/sca/1.0"
+ xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712"
xmlns:foo="http://foo"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xsi:schemaLocation="http://www.osoa.org/xmlns/sca/1.0 http://www.osoa.org/xmlns/sca/1.0"
+ xsi:schemaLocation="http://docs.oasis-open.org/ns/opencsa/sca/200712 http://docs.oasis-open.org/ns/opencsa/sca/200712"
name="TotalComposite2Auto"
targetNamespace="http://foo"
local="true"
Modified: tuscany/java/sca/itest/recursive-multi-level/src/main/resources/TotalService3Auto.composite
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/recursive-multi-level/src/main/resources/TotalService3Auto.composite?rev=750323&r1=750322&r2=750323&view=diff
==============================================================================
--- tuscany/java/sca/itest/recursive-multi-level/src/main/resources/TotalService3Auto.composite (original)
+++ tuscany/java/sca/itest/recursive-multi-level/src/main/resources/TotalService3Auto.composite Thu Mar 5 05:52:01 2009
@@ -18,10 +18,10 @@
* under the License.
-->
<composite xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://www.osoa.org/xmlns/sca/1.0"
+ xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712"
xmlns:foo="http://foo"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xsi:schemaLocation="http://www.osoa.org/xmlns/sca/1.0 http://www.osoa.org/xmlns/sca/1.0"
+ xsi:schemaLocation="http://docs.oasis-open.org/ns/opencsa/sca/200712 http://docs.oasis-open.org/ns/opencsa/sca/200712"
name="TotalComposite3Auto"
targetNamespace="http://foo"
local="true"
Modified: tuscany/java/sca/itest/references/src/main/resources/AutoWiredReferencesTest.composite
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/references/src/main/resources/AutoWiredReferencesTest.composite?rev=750323&r1=750322&r2=750323&view=diff
==============================================================================
--- tuscany/java/sca/itest/references/src/main/resources/AutoWiredReferencesTest.composite (original)
+++ tuscany/java/sca/itest/references/src/main/resources/AutoWiredReferencesTest.composite Thu Mar 5 05:52:01 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:foo="http://foo" targetNamespace="http://foo"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712" xmlns:foo="http://foo" targetNamespace="http://foo"
name="AutowireReferencesTest" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" autowire="true">
<service name="AComponent" promote="AComponent">
Modified: tuscany/java/sca/itest/references/src/main/resources/InnerReferencesTest.composite
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/references/src/main/resources/InnerReferencesTest.composite?rev=750323&r1=750322&r2=750323&view=diff
==============================================================================
--- tuscany/java/sca/itest/references/src/main/resources/InnerReferencesTest.composite (original)
+++ tuscany/java/sca/itest/references/src/main/resources/InnerReferencesTest.composite Thu Mar 5 05:52:01 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:foo="http://foo" targetNamespace="http://foo"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712" xmlns:foo="http://foo" targetNamespace="http://foo"
name="InnerReferencesTest" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<service name="AComponent" promote="AComponent">
Modified: tuscany/java/sca/itest/references/src/main/resources/ManualWiredReferencesTest.composite
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/references/src/main/resources/ManualWiredReferencesTest.composite?rev=750323&r1=750322&r2=750323&view=diff
==============================================================================
--- tuscany/java/sca/itest/references/src/main/resources/ManualWiredReferencesTest.composite (original)
+++ tuscany/java/sca/itest/references/src/main/resources/ManualWiredReferencesTest.composite Thu Mar 5 05:52:01 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:foo="http://foo" targetNamespace="http://foo"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712" xmlns:foo="http://foo" targetNamespace="http://foo"
name="ManualWiredReferencesTest" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" autowire="true">
<service name="AComponent" promote="AComponent">
Modified: tuscany/java/sca/itest/scopes/src/main/resources/scopes.composite
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/scopes/src/main/resources/scopes.composite?rev=750323&r1=750322&r2=750323&view=diff
==============================================================================
--- tuscany/java/sca/itest/scopes/src/main/resources/scopes.composite (original)
+++ tuscany/java/sca/itest/scopes/src/main/resources/scopes.composite Thu Mar 5 05:52:01 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"
name="Scopes">
<!-- Components used to test scopes. -->
Modified: tuscany/java/sca/itest/services/src/main/resources/META-INF/sca-contribution.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/services/src/main/resources/META-INF/sca-contribution.xml?rev=750323&r1=750322&r2=750323&view=diff
==============================================================================
--- tuscany/java/sca/itest/services/src/main/resources/META-INF/sca-contribution.xml (original)
+++ tuscany/java/sca/itest/services/src/main/resources/META-INF/sca-contribution.xml Thu Mar 5 05:52:01 2009
@@ -17,6 +17,6 @@
* specific language governing permissions and limitations
* under the License.
-->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0" targetNamespace="http://foo" xmlns:foo="http://foo">
+<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712" targetNamespace="http://foo" xmlns:foo="http://foo">
<deployable composite="foo:InnerServicesTest" />
</contribution>
\ No newline at end of file
Modified: tuscany/java/sca/itest/services/src/main/resources/ServicesTest.composite
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/services/src/main/resources/ServicesTest.composite?rev=750323&r1=750322&r2=750323&view=diff
==============================================================================
--- tuscany/java/sca/itest/services/src/main/resources/ServicesTest.composite (original)
+++ tuscany/java/sca/itest/services/src/main/resources/ServicesTest.composite Thu Mar 5 05:52:01 2009
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:foo="http://foo" targetNamespace="http://foo"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712" xmlns:foo="http://foo" targetNamespace="http://foo"
name="InnerServicesTest" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<component name="AComponent1">
Modified: tuscany/java/sca/itest/wires/src/main/resources/WireTest.composite
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/wires/src/main/resources/WireTest.composite?rev=750323&r1=750322&r2=750323&view=diff
==============================================================================
--- tuscany/java/sca/itest/wires/src/main/resources/WireTest.composite (original)
+++ tuscany/java/sca/itest/wires/src/main/resources/WireTest.composite Thu Mar 5 05:52:01 2009
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" targetNamespace="http://wires" name="WireTest">
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712" targetNamespace="http://wires" name="WireTest">
<component name="WireClient">
<implementation.java class="org.apache.tuscany.sca.itest.WireClientImpl"/>
Modified: tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingImpl.java?rev=750323&r1=750322&r2=750323&view=diff
==============================================================================
--- tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingImpl.java (original)
+++ tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingImpl.java Thu Mar 5 05:52:01 2009
@@ -155,7 +155,7 @@
}
private class TestSCABindingType implements ExtensionType {
- private QName name = new QName("http://www.osoa.org/xmlns/sca/1.0","binding");
+ private QName name = new QName("http://docs.oasis-open.org/ns/opencsa/sca/200712","binding");
public QName getBaseType() {
return BINDING_BASE;
}
Modified: tuscany/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllPolicyCalculator.composite
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllPolicyCalculator.composite?rev=750323&r1=750322&r2=750323&view=diff
==============================================================================
--- tuscany/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllPolicyCalculator.composite (original)
+++ tuscany/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllPolicyCalculator.composite Thu Mar 5 05:52:01 2009
@@ -20,7 +20,7 @@
<composite autowire="false" constrainingType="tns:CalculatorComponent" local="true" name="TestAllCalculator"
requires="cns:tuscanyIntent_1" targetNamespace="http://calc" xmlns:tns="http://calc"
- xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://docs.oasis-open.org/ns/opencsa/sca/200712 http://docs.oasis-open.org/ns/opencsa/sca/200712 "
xmlns:ext="http://extension"
Modified: tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BaseBuilderImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BaseBuilderImpl.java?rev=750323&r1=750322&r2=750323&view=diff
==============================================================================
--- tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BaseBuilderImpl.java (original)
+++ tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BaseBuilderImpl.java Thu Mar 5 05:52:01 2009
@@ -54,9 +54,9 @@
* @version $Rev$ $Date$
*/
public abstract class BaseBuilderImpl implements CompositeBuilder {
- protected static final String SCA10_NS = "http://www.osoa.org/xmlns/sca/1.0";
+ protected static final String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200712";
protected static final String BINDING_SCA = "binding.sca";
- protected static final QName BINDING_SCA_QNAME = new QName(SCA10_NS, BINDING_SCA);
+ protected static final QName BINDING_SCA_QNAME = new QName(SCA11_NS, BINDING_SCA);
protected AssemblyFactory assemblyFactory;
protected SCABindingFactory scaBindingFactory;
Modified: tuscany/java/sca/modules/binding-dwr/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-dwr/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor?rev=750323&r1=750322&r2=750323&view=diff
==============================================================================
--- tuscany/java/sca/modules/binding-dwr/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor (original)
+++ tuscany/java/sca/modules/binding-dwr/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor Thu Mar 5 05:52:01 2009
@@ -16,4 +16,4 @@
# under the License.
# Implementation class for the artifact processor extension
-org.apache.tuscany.sca.assembly.xml.DefaultBeanModelProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.0#binding.dwr,model=org.apache.tuscany.sca.binding.dwr.DWRBinding,factory=org.apache.tuscany.sca.binding.dwr.DWRBindingFactory
+org.apache.tuscany.sca.assembly.xml.DefaultBeanModelProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.1#binding.dwr,model=org.apache.tuscany.sca.binding.dwr.DWRBinding,factory=org.apache.tuscany.sca.binding.dwr.DWRBindingFactory
Modified: tuscany/java/sca/modules/binding-jsonp/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-jsonp/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor?rev=750323&r1=750322&r2=750323&view=diff
==============================================================================
--- tuscany/java/sca/modules/binding-jsonp/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor (original)
+++ tuscany/java/sca/modules/binding-jsonp/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor Thu Mar 5 05:52:01 2009
@@ -16,4 +16,4 @@
# under the License.
# Implementation class for the artifact processor extension
-org.apache.tuscany.sca.assembly.xml.DefaultBeanModelProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.0#binding.jsonp,model=org.apache.tuscany.sca.binding.rmi.RMIBinding,factory=org.apache.tuscany.sca.binding.jsonp.JSONPBindingFactory
+org.apache.tuscany.sca.assembly.xml.DefaultBeanModelProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.1#binding.jsonp,model=org.apache.tuscany.sca.binding.rmi.RMIBinding,factory=org.apache.tuscany.sca.binding.jsonp.JSONPBindingFactory
Modified: tuscany/java/sca/modules/binding-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor?rev=750323&r1=750322&r2=750323&view=diff
==============================================================================
--- tuscany/java/sca/modules/binding-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor (original)
+++ tuscany/java/sca/modules/binding-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor Thu Mar 5 05:52:01 2009
@@ -16,4 +16,4 @@
# under the License.
# Implementation class for the artifact processor extension
-org.apache.tuscany.sca.assembly.xml.DefaultBeanModelProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.0#binding.jsonrpc,model=org.apache.tuscany.sca.binding.jsonrpc.JSONRPCBinding,factory=org.apache.tuscany.sca.binding.jsonrpc.JSONRPCBindingFactory
+org.apache.tuscany.sca.assembly.xml.DefaultBeanModelProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.1#binding.jsonrpc,model=org.apache.tuscany.sca.binding.jsonrpc.JSONRPCBinding,factory=org.apache.tuscany.sca.binding.jsonrpc.JSONRPCBindingFactory
Modified: tuscany/java/sca/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/WriteTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/WriteTestCase.java?rev=750323&r1=750322&r2=750323&view=diff
==============================================================================
--- tuscany/java/sca/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/WriteTestCase.java (original)
+++ tuscany/java/sca/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/WriteTestCase.java Thu Mar 5 05:52:01 2009
@@ -66,7 +66,7 @@
assertNotNull(componentType);
ByteArrayOutputStream bos = new ByteArrayOutputStream();
staxProcessor.write(componentType, outputFactory.createXMLStreamWriter(bos));
- assertEquals("<?xml version='1.0' encoding='UTF-8'?><componentType xmlns=\"http://www.osoa.org/xmlns/sca/1.0\" xmlns:ns1=\"http://www.osoa.org/xmlns/sca/1.0\"><service name=\"CalculatorService\"><binding.sca /><interface.java interface=\"calculator.CalculatorService\" /></service><reference name=\"addService\"><binding.sca /><interface.java interface=\"calculator.AddService\" /></reference></componentType>",
+ assertEquals("<?xml version='1.0' encoding='UTF-8'?><componentType xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200712\" xmlns:ns1=\"http://docs.oasis-open.org/ns/opencsa/sca/200712\"><service name=\"CalculatorService\"><binding.sca /><interface.java interface=\"calculator.CalculatorService\" /></service><reference name=\"addService\"><binding.sca /><interface.java interface=\"calculator.AddService\" /></reference></componentType>",
bos.toString());
}
@@ -78,7 +78,7 @@
assertNotNull(composite);
ByteArrayOutputStream bos = new ByteArrayOutputStream();
staxProcessor.write(composite, outputFactory.createXMLStreamWriter(bos));
- assertEquals("<?xml version='1.0' encoding='UTF-8'?><composite xmlns=\"http://www.osoa.org/xmlns/sca/1.0\" xmlns:ns1=\"http://www.osoa.org/xmlns/sca/1.0\" targetNamespace=\"http://calc\" name=\"Calculator\"><service name=\"CalculatorService\" promote=\"CalculatorServiceComponent\"><binding.sca /><interface.java interface=\"calculator.CalculatorService\" /></service><component name=\"CalculatorServiceComponent\"><implementation.java class=\"calculator.CalculatorServiceImpl\" /><reference name=\"addService\" target=\"AddServiceComponent\"><binding.sca /></reference><reference name=\"subtractService\" target=\"SubtractServiceComponent\" /><reference name=\"multiplyService\" target=\"MultiplyServiceComponent\" /><reference name=\"divideService\" target=\"DivideServiceComponent\" /></component><component name=\"AddServiceComponent\"><implementation.java class=\"calculator.AddServiceImpl\" /><service name=\"AddService\"><binding.sca /><interface.java interface=\"calculator
.AddService\" /></service></component><component name=\"SubtractServiceComponent\"><implementation.java class=\"calculator.SubtractServiceImpl\" /></component><component name=\"MultiplyServiceComponent\"><implementation.java class=\"calculator.MultiplyServiceImpl\" /></component><component name=\"DivideServiceComponent\"><implementation.java class=\"calculator.DivideServiceImpl\" /></component></composite>",
+ assertEquals("<?xml version='1.0' encoding='UTF-8'?><composite xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200712\" xmlns:ns1=\"http://docs.oasis-open.org/ns/opencsa/sca/200712\" targetNamespace=\"http://calc\" name=\"Calculator\"><service name=\"CalculatorService\" promote=\"CalculatorServiceComponent\"><binding.sca /><interface.java interface=\"calculator.CalculatorService\" /></service><component name=\"CalculatorServiceComponent\"><implementation.java class=\"calculator.CalculatorServiceImpl\" /><reference name=\"addService\" target=\"AddServiceComponent\"><binding.sca /></reference><reference name=\"subtractService\" target=\"SubtractServiceComponent\" /><reference name=\"multiplyService\" target=\"MultiplyServiceComponent\" /><reference name=\"divideService\" target=\"DivideServiceComponent\" /></component><component name=\"AddServiceComponent\"><implementation.java class=\"calculator.AddServiceImpl\" /><service name=\"AddService\"><binding.sca /><interfa
ce.java interface=\"calculator.AddService\" /></service></component><component name=\"SubtractServiceComponent\"><implementation.java class=\"calculator.SubtractServiceImpl\" /></component><component name=\"MultiplyServiceComponent\"><implementation.java class=\"calculator.MultiplyServiceImpl\" /></component><component name=\"DivideServiceComponent\"><implementation.java class=\"calculator.DivideServiceImpl\" /></component></composite>",
bos.toString());
}
Modified: tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/XMLStreamReader2CallableReference.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/XMLStreamReader2CallableReference.java?rev=750323&r1=750322&r2=750323&view=diff
==============================================================================
--- tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/XMLStreamReader2CallableReference.java (original)
+++ tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/XMLStreamReader2CallableReference.java Thu Mar 5 05:52:01 2009
@@ -38,9 +38,9 @@
public class XMLStreamReader2CallableReference extends BaseTransformer<XMLStreamReader, CallableReference>
implements PullTransformer<XMLStreamReader, CallableReference> {
- 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 static final String COMPOSITE = "composite";
- private static final QName COMPOSITE_QNAME = new QName(SCA10_NS, COMPOSITE);
+ private static final QName COMPOSITE_QNAME = new QName(SCA11_NS, COMPOSITE);
public CallableReference transform(XMLStreamReader source, TransformationContext context) {
try {
Modified: tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/ReferenceParameterProcessor.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/ReferenceParameterProcessor.java?rev=750323&r1=750322&r2=750323&view=diff
==============================================================================
--- tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/ReferenceParameterProcessor.java (original)
+++ tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/ReferenceParameterProcessor.java Thu Mar 5 05:52:01 2009
@@ -40,7 +40,7 @@
*/
public class ReferenceParameterProcessor implements StAXArtifactProcessor<ReferenceParameters> {
private static final QName REFERENCE_PARAMETERS =
- new QName("http://tuscany.apache.org/xmlns/sca/1.0", "referenceParameters", "tuscany");
+ new QName("http://tuscany.apache.org/xmlns/sca/1.1", "referenceParameters", "tuscany");
/**
* Constructs a new processor.
Modified: tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/CompositeContextImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/CompositeContextImpl.java?rev=750323&r1=750322&r2=750323&view=diff
==============================================================================
--- tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/CompositeContextImpl.java (original)
+++ tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/CompositeContextImpl.java Thu Mar 5 05:52:01 2009
@@ -212,7 +212,7 @@
try {
StAXArtifactProcessor<Composite> processor = staxProcessors.getProcessor(Composite.class);
Composite composite = assemblyFactory.createComposite();
- composite.setName(new QName("http://tuscany.apache.org/xmlns/sca/1.0", "default"));
+ composite.setName(new QName("http://tuscany.apache.org/xmlns/sca/1.1", "default"));
Component comp = assemblyFactory.createComponent();
comp.setName("default");
comp.setURI(component.getURI());
Modified: tuscany/java/sca/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor?rev=750323&r1=750322&r2=750323&view=diff
==============================================================================
--- tuscany/java/sca/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor (original)
+++ tuscany/java/sca/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor Thu Mar 5 05:52:01 2009
@@ -16,4 +16,4 @@
# under the License.
# Implementation class for the artifact processor extension
-org.apache.tuscany.sca.core.assembly.impl.ReferenceParameterProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.0#referenceParameters,model=org.apache.tuscany.sca.runtime.ReferenceParameters
+org.apache.tuscany.sca.core.assembly.impl.ReferenceParameterProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.1#referenceParameters,model=org.apache.tuscany.sca.runtime.ReferenceParameters
Modified: tuscany/java/sca/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefinitionsDocumentProcessor.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefinitionsDocumentProcessor.java?rev=750323&r1=750322&r2=750323&view=diff
==============================================================================
--- tuscany/java/sca/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefinitionsDocumentProcessor.java (original)
+++ tuscany/java/sca/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefinitionsDocumentProcessor.java Thu Mar 5 05:52:01 2009
@@ -62,7 +62,7 @@
private StAXArtifactProcessor<Object> extensionProcessor;
private XMLInputFactory inputFactory;
private DefinitionsFactory definitionsFactory;
- private static final String TUSCANY_NS = "http://tuscany.apache.org/xmlns/sca/1.0";
+ private static final String TUSCANY_NS = "http://tuscany.apache.org/xmlns/sca/1.1";
private static final String DEFINITIONS = "definitions";
private static final QName DEFINITIONS_QNAME = new QName(TUSCANY_NS, DEFINITIONS);
private Monitor monitor;
Modified: tuscany/java/sca/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/xml/NodeImplementationProcessor.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/xml/NodeImplementationProcessor.java?rev=750323&r1=750322&r2=750323&view=diff
==============================================================================
--- tuscany/java/sca/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/xml/NodeImplementationProcessor.java (original)
+++ tuscany/java/sca/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/xml/NodeImplementationProcessor.java Thu Mar 5 05:52:01 2009
@@ -45,7 +45,7 @@
* @version $Rev$ $Date$
*/
public class NodeImplementationProcessor extends BaseStAXArtifactProcessor implements StAXArtifactProcessor<NodeImplementation> {
- private static final String SCA10_TUSCANY_NS = "http://tuscany.apache.org/xmlns/sca/1.0";
+ private static final String SCA10_TUSCANY_NS = "http://tuscany.apache.org/xmlns/sca/1.1";
private static final QName IMPLEMENTATION_NODE = new QName(SCA10_TUSCANY_NS, "implementation.node");
private AssemblyFactory assemblyFactory;
Modified: tuscany/java/sca/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLConstants.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLConstants.java?rev=750323&r1=750322&r2=750323&view=diff
==============================================================================
--- tuscany/java/sca/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLConstants.java (original)
+++ tuscany/java/sca/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLConstants.java Thu Mar 5 05:52:01 2009
@@ -26,9 +26,9 @@
* @version $Rev$ $Date$
*/
public interface WSDLConstants {
- 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_WSDL = "interface.wsdl";
- QName INTERFACE_WSDL_QNAME = new QName(SCA10_NS, "interface.wsdl");
+ QName INTERFACE_WSDL_QNAME = new QName(SCA11_NS, "interface.wsdl");
String INTERFACE = "interface";
String CALLBACK_INTERFACE = "callbackInterface";
String WSDL_LOCATION = "wsdlLocation";
Modified: tuscany/java/sca/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java?rev=750323&r1=750322&r2=750323&view=diff
==============================================================================
--- tuscany/java/sca/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java (original)
+++ tuscany/java/sca/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java Thu Mar 5 05:52:01 2009
@@ -160,7 +160,7 @@
public void write(WSDLInterfaceContract wsdlInterfaceContract, XMLStreamWriter writer) throws ContributionWriteException, XMLStreamException {
// Write an <interface.wsdl>
- writer.writeStartElement(WSDLConstants.SCA10_NS, INTERFACE_WSDL);
+ writer.writeStartElement(WSDLConstants.SCA11_NS, INTERFACE_WSDL);
// Write interface name
WSDLInterface wsdlInterface = (WSDLInterface)wsdlInterfaceContract.getInterface();
Modified: tuscany/java/sca/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLModelResolver.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLModelResolver.java?rev=750323&r1=750322&r2=750323&view=diff
==============================================================================
--- tuscany/java/sca/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLModelResolver.java (original)
+++ tuscany/java/sca/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLModelResolver.java Thu Mar 5 05:52:01 2009
@@ -92,8 +92,8 @@
// ---- Policy WSDL Attachments
- public static final QName Q_POLICY_ATTRIBUTE_EXTENSION = new QName("http://www.osoa.org/xmlns/sca/1.0", "requires");
- public static final QName Q_POLICY_END_CONVERSATION_ATTRIBUTE_EXTENSION = new QName("http://www.osoa.org/xmlns/sca/1.0", "endsConversation");
+ public static final QName Q_POLICY_ATTRIBUTE_EXTENSION = new QName("http://docs.oasis-open.org/ns/opencsa/sca/200712", "requires");
+ public static final QName Q_POLICY_END_CONVERSATION_ATTRIBUTE_EXTENSION = new QName("http://docs.oasis-open.org/ns/opencsa/sca/200712", "endsConversation");
// ---- Stuff added for BPEL extension elements --- Mike Edwards 01/05/2008
public static final String ELEM_PLINKTYPE = "partnerLinkType";
Modified: tuscany/java/sca/modules/interface-wsdl-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-wsdl-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor?rev=750323&r1=750322&r2=750323&view=diff
==============================================================================
--- tuscany/java/sca/modules/interface-wsdl-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor (original)
+++ tuscany/java/sca/modules/interface-wsdl-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor Thu Mar 5 05:52:01 2009
@@ -16,4 +16,4 @@
# under the License.
# Implementation class for the artifact processor extension
-org.apache.tuscany.sca.interfacedef.wsdl.xml.WSDLInterfaceProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#interface.wsdl,model=org.apache.tuscany.sca.interfacedef.wsdl.WSDLInterfaceContract
+org.apache.tuscany.sca.interfacedef.wsdl.xml.WSDLInterfaceProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200712#interface.wsdl,model=org.apache.tuscany.sca.interfacedef.wsdl.WSDLInterfaceContract
Modified: tuscany/java/sca/modules/interface-wsdl-xml/src/test/resources/policy/stockquote_policy.wsdl
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/interface-wsdl-xml/src/test/resources/policy/stockquote_policy.wsdl?rev=750323&r1=750322&r2=750323&view=diff
==============================================================================
--- tuscany/java/sca/modules/interface-wsdl-xml/src/test/resources/policy/stockquote_policy.wsdl (original)
+++ tuscany/java/sca/modules/interface-wsdl-xml/src/test/resources/policy/stockquote_policy.wsdl Thu Mar 5 05:52:01 2009
@@ -21,7 +21,7 @@
targetNamespace="http://example.com/stockquote.wsdl"
xmlns:tns="http://example.com/stockquote.wsdl"
xmlns:xsd="http://example.com/stockquote.xsd"
- xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
+ xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200712"
xmlns="http://schemas.xmlsoap.org/wsdl/">
<types>
Modified: tuscany/java/sca/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceIntrospectorImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceIntrospectorImpl.java?rev=750323&r1=750322&r2=750323&view=diff
==============================================================================
--- tuscany/java/sca/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceIntrospectorImpl.java (original)
+++ tuscany/java/sca/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceIntrospectorImpl.java Thu Mar 5 05:52:01 2009
@@ -43,9 +43,9 @@
* @version $Rev$ $Date$
*/
public class WSDLInterfaceIntrospectorImpl {
- private static final QName POLICY_REQUIRES = new QName("http://www.osoa.org/xmlns/sca/1.0", "requires");
- private static final QName POLICY_CONVERSATIONAL = new QName("http://www.osoa.org/xmlns/sca/1.0", "conversational");
- public static final QName POLICY_END_CONVERSATION = new QName("http://www.osoa.org/xmlns/sca/1.0", "endsConversation");
+ private static final QName POLICY_REQUIRES = new QName("http://docs.oasis-open.org/ns/opencsa/sca/200712", "requires");
+ private static final QName POLICY_CONVERSATIONAL = new QName("http://docs.oasis-open.org/ns/opencsa/sca/200712", "conversational");
+ public static final QName POLICY_END_CONVERSATION = new QName("http://docs.oasis-open.org/ns/opencsa/sca/200712", "endsConversation");
private XSDFactory xsdFactory;
private PolicyFactory policyFactory;
Modified: tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java?rev=750323&r1=750322&r2=750323&view=diff
==============================================================================
--- tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java (original)
+++ tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java Thu Mar 5 05:52:01 2009
@@ -38,6 +38,9 @@
import javax.xml.namespace.QName;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamReader;
+import javax.xml.xpath.XPath;
+import javax.xml.xpath.XPathExpression;
+import javax.xml.xpath.XPathFactory;
import org.apache.tuscany.sca.assembly.AssemblyFactory;
import org.apache.tuscany.sca.assembly.Component;
@@ -81,6 +84,7 @@
import org.apache.tuscany.sca.node.Client;
import org.apache.tuscany.sca.node.ContributionLocationHelper;
import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.policy.PolicySet;
import org.apache.tuscany.sca.provider.DefinitionsProvider;
import org.apache.tuscany.sca.provider.DefinitionsProviderException;
import org.apache.tuscany.sca.provider.DefinitionsProviderExtensionPoint;
@@ -95,6 +99,7 @@
import org.oasisopen.sca.ServiceReference;
import org.oasisopen.sca.ServiceRuntimeException;
+
/**
* Represents an SCA runtime node.
*
@@ -102,7 +107,7 @@
*/
public class NodeImpl implements Node, Client {
- private static final String SCA10_TUSCANY_NS = "http://tuscany.apache.org/xmlns/sca/1.0";
+ private static final String SCA10_TUSCANY_NS = "http://tuscany.apache.org/xmlns/sca/1.1";
private static final Logger logger = Logger.getLogger(NodeImpl.class.getName());
@@ -561,6 +566,18 @@
// logic in callable reference resolution relies on this being
// available
compositeActivator.setDomainComposite(tempComposite);
+
+ XPathFactory xPathFactory = modelFactories.getFactory(XPathFactory.class);
+ for (PolicySet policySet : systemDefinitions.getPolicySets()) {
+ if (policySet.getAppliesTo() != null) {
+ XPath xpath = xPathFactory.newXPath();
+ // FIXME: We need to develop a xpath function resolver to
+ // deal with the SCA functions
+ // xpath.setXPathFunctionResolver(resolver);
+ XPathExpression exp = xpath.compile(policySet.getAppliesTo());
+ // exp.evaluate(item, XPathConstants.BOOLEAN);
+ }
+ }
}
public void start() {
Modified: tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicy.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicy.java?rev=750323&r1=750322&r2=750323&view=diff
==============================================================================
--- tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicy.java (original)
+++ tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicy.java Thu Mar 5 05:52:01 2009
@@ -27,7 +27,7 @@
* @version $Rev$ $Date$
*/
public class BasicAuthenticationPolicy {
- private static final String SCA10_TUSCANY_NS = "http://tuscany.apache.org/xmlns/sca/1.0";
+ private static final String SCA10_TUSCANY_NS = "http://tuscany.apache.org/xmlns/sca/1.1";
public static final QName BASIC_AUTHENTICATION_POLICY_QNAME = new QName(SCA10_TUSCANY_NS, "basicAuthentication");
public static final String BASIC_AUTHENTICATION_USERNAME = "userName";
Modified: tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicyProcessor.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicyProcessor.java?rev=750323&r1=750322&r2=750323&view=diff
==============================================================================
--- tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicyProcessor.java (original)
+++ tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicyProcessor.java Thu Mar 5 05:52:01 2009
@@ -39,7 +39,7 @@
* @version $Rev$ $Date$
*/
public class BasicAuthenticationPolicyProcessor implements StAXArtifactProcessor<BasicAuthenticationPolicy> {
- private static final String SCA10_TUSCANY_NS = "http://tuscany.apache.org/xmlns/sca/1.0";
+ private static final String SCA10_TUSCANY_NS = "http://tuscany.apache.org/xmlns/sca/1.1";
public QName getArtifactType() {
return BasicAuthenticationPolicy.BASIC_AUTHENTICATION_POLICY_QNAME;
Modified: tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationReferencePolicyInterceptor.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationReferencePolicyInterceptor.java?rev=750323&r1=750322&r2=750323&view=diff
==============================================================================
--- tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationReferencePolicyInterceptor.java (original)
+++ tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationReferencePolicyInterceptor.java Thu Mar 5 05:52:01 2009
@@ -33,7 +33,7 @@
* @version $Rev$ $Date$
*/
public class BasicAuthenticationReferencePolicyInterceptor implements Interceptor {
- private static final String SCA10_TUSCANY_NS = "http://tuscany.apache.org/xmlns/sca/1.0";
+ private static final String SCA10_TUSCANY_NS = "http://tuscany.apache.org/xmlns/sca/1.1";
public static final QName policySetQName = new QName(SCA10_TUSCANY_NS, "wsBasicAuthentication");
private Invoker next;
Modified: tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationServicePolicyInterceptor.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationServicePolicyInterceptor.java?rev=750323&r1=750322&r2=750323&view=diff
==============================================================================
--- tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationServicePolicyInterceptor.java (original)
+++ tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationServicePolicyInterceptor.java Thu Mar 5 05:52:01 2009
@@ -32,12 +32,12 @@
/**
* Policy handler to handle PolicySet related to Logging with the QName
- * {http://tuscany.apache.org/xmlns/sca/1.0/impl/java}LoggingPolicy
+ * {http://tuscany.apache.org/xmlns/sca/1.1/impl/java}LoggingPolicy
*
* @version $Rev$ $Date$
*/
public class BasicAuthenticationServicePolicyInterceptor implements Interceptor {
- private static final String SCA10_TUSCANY_NS = "http://tuscany.apache.org/xmlns/sca/1.0";
+ private static final String SCA10_TUSCANY_NS = "http://tuscany.apache.org/xmlns/sca/1.1";
public static final QName policySetQName = new QName(SCA10_TUSCANY_NS, "wsBasicAuthentication");
private Invoker next;
Modified: tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicy.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicy.java?rev=750323&r1=750322&r2=750323&view=diff
==============================================================================
--- tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicy.java (original)
+++ tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicy.java Thu Mar 5 05:52:01 2009
@@ -30,9 +30,9 @@
* @version $Rev$ $Date$
*/
public class AuthorizationPolicy {
- private final static String SCA10_NS = "http://www.osoa.org/xmlns/sca/1.0";
- // private final static String SCA10_TUSCANY_NS = "http://tuscany.apache.org/xmlns/sca/1.0";
- public static final QName NAME = new QName(SCA10_NS, "authorization");
+ private final static String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200712";
+ // private final static String SCA10_TUSCANY_NS = "http://tuscany.apache.org/xmlns/sca/1.1";
+ public static final QName NAME = new QName(SCA11_NS, "authorization");
public static enum AcessControl {
permitAll, denyAll, allow
Modified: tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicy.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicy.java?rev=750323&r1=750322&r2=750323&view=diff
==============================================================================
--- tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicy.java (original)
+++ tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicy.java Thu Mar 5 05:52:01 2009
@@ -27,8 +27,8 @@
* @version $Rev$ $Date$
*/
public class SecurityIdentityPolicy {
- private final static String SCA10_NS = "http://www.osoa.org/xmlns/sca/1.0";
- public static final QName NAME = new QName(SCA10_NS, "securityIdentity");
+ private final static String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200712";
+ public static final QName NAME = new QName(SCA11_NS, "securityIdentity");
private boolean useCallerIdentity;