Author: rfeng
Date: Tue Mar 16 21:31:55 2010
New Revision: 923996
URL: http://svn.apache.org/viewvc?rev=923996&view=rev
Log:
Port implementation-script-runtime into 2.x
Added:
tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-implementation-script.xsd
(with props)
tuscany/sca-java-2.x/trunk/modules/implementation-script-runtime/
- copied from r923820,
tuscany/sca-java-2.x/contrib/modules/implementation-script-runtime/
Modified:
tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1.xsd
tuscany/sca-java-2.x/trunk/modules/implementation-script-runtime/pom.xml
tuscany/sca-java-2.x/trunk/modules/implementation-script-runtime/src/main/java/org/apache/tuscany/sca/implementation/script/provider/ScriptImplementationProviderFactory.java
tuscany/sca-java-2.x/trunk/modules/implementation-script-runtime/src/main/java/org/apache/tuscany/sca/implementation/script/provider/ScriptPropertyFactory.java
tuscany/sca-java-2.x/trunk/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/AbstractSCATestCase.java
tuscany/sca-java-2.x/trunk/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/GroovyHelloWorld.composite
tuscany/sca-java-2.x/trunk/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JRubyHelloWorld.composite
tuscany/sca-java-2.x/trunk/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScriptHelloWorld.composite
tuscany/sca-java-2.x/trunk/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JythonHelloWorld.composite
tuscany/sca-java-2.x/trunk/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.componentType
tuscany/sca-java-2.x/trunk/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/GroovyHelloWorld.composite
tuscany/sca-java-2.x/trunk/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JRubyHelloWorld.composite
tuscany/sca-java-2.x/trunk/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JavaScriptHelloWorld.composite
tuscany/sca-java-2.x/trunk/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JythonHelloWorld.composite
tuscany/sca-java-2.x/trunk/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.componentType
tuscany/sca-java-2.x/trunk/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/GroovyReference.composite
tuscany/sca-java-2.x/trunk/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JRubyReference.composite
tuscany/sca-java-2.x/trunk/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JavaScriptReference.composite
tuscany/sca-java-2.x/trunk/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JythonReference.composite
tuscany/sca-java-2.x/trunk/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.componentType
Added:
tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-implementation-script.xsd
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-implementation-script.xsd?rev=923996&view=auto
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-implementation-script.xsd
(added)
+++
tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-implementation-script.xsd
Tue Mar 16 21:31:55 2010
@@ -0,0 +1,40 @@
+<?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.1";
+ xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912";
+ xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1";
+ elementFormDefault="qualified">
+
+ <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200912";
schemaLocation="sca-1.1-cd04.xsd"/>
+
+ <element name="implementation.script" type="t:ScriptImplementation"
substitutionGroup="sca:implementation"/>
+
+ <complexType name="ScriptImplementation">
+ <complexContent>
+ <extension base="sca:Implementation">
+ <attribute name="script" type="anyURI" use="optional"/>
+ <attribute name="uri" type="anyURI" use="optional"/>
+ <attribute name="location" type="anyURI" use="optional"/>
+ </extension>
+ </complexContent>
+ </complexType>
+
+</schema>
Propchange:
tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-implementation-script.xsd
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-implementation-script.xsd
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified:
tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1.xsd
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1.xsd?rev=923996&r1=923995&r2=923996&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1.xsd
(original)
+++
tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1.xsd
Tue Mar 16 21:31:55 2010
@@ -32,4 +32,5 @@
<include schemaLocation="tuscany-sca-1.1-implementation-osgi.xsd"/>
<include schemaLocation="tuscany-sca-1.1-implementation-widget.xsd"/>
+ <include schemaLocation="tuscany-sca-1.1-implementation-script.xsd"/>
</schema>
\ No newline at end of file
Modified:
tuscany/sca-java-2.x/trunk/modules/implementation-script-runtime/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/implementation-script-runtime/pom.xml?rev=923996&r1=923820&r2=923996&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/implementation-script-runtime/pom.xml
(original)
+++ tuscany/sca-java-2.x/trunk/modules/implementation-script-runtime/pom.xml
Tue Mar 16 21:31:55 2010
@@ -58,7 +58,7 @@
<dependency>
<groupId>org.apache.bsf</groupId>
<artifactId>bsf-all</artifactId>
- <version>3.0-beta2</version>
+ <version>3.0</version>
</dependency>
<dependency>
@@ -88,13 +88,13 @@
<artifactId>xml-apis</artifactId>
</exclusion>
</exclusions>
- <version>1.2.7</version>
+ <version>1.2.8</version>
</dependency>
<dependency>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom-impl</artifactId>
- <version>1.2.7</version>
+ <version>1.2.8</version>
<scope>runtime</scope>
</dependency>
Modified:
tuscany/sca-java-2.x/trunk/modules/implementation-script-runtime/src/main/java/org/apache/tuscany/sca/implementation/script/provider/ScriptImplementationProviderFactory.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/implementation-script-runtime/src/main/java/org/apache/tuscany/sca/implementation/script/provider/ScriptImplementationProviderFactory.java?rev=923996&r1=923820&r2=923996&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/implementation-script-runtime/src/main/java/org/apache/tuscany/sca/implementation/script/provider/ScriptImplementationProviderFactory.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/implementation-script-runtime/src/main/java/org/apache/tuscany/sca/implementation/script/provider/ScriptImplementationProviderFactory.java
Tue Mar 16 21:31:55 2010
@@ -20,10 +20,9 @@
package org.apache.tuscany.sca.implementation.script.provider;
import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.databinding.DataBindingExtensionPoint;
+import org.apache.tuscany.sca.core.UtilityExtensionPoint;
import org.apache.tuscany.sca.databinding.Mediator;
-import org.apache.tuscany.sca.databinding.TransformerExtensionPoint;
-import org.apache.tuscany.sca.databinding.impl.MediatorImpl;
+import org.apache.tuscany.sca.databinding.SimpleTypeMapper;
import org.apache.tuscany.sca.implementation.script.ScriptImplementation;
import org.apache.tuscany.sca.provider.ImplementationProvider;
import org.apache.tuscany.sca.provider.ImplementationProviderFactory;
@@ -39,9 +38,10 @@ public class ScriptImplementationProvide
private ScriptPropertyFactory propertyFactory;
public ScriptImplementationProviderFactory(ExtensionPointRegistry
extensionPoints) {
- Mediator mediator = new
MediatorImpl(extensionPoints.getExtensionPoint(DataBindingExtensionPoint.class),
-
extensionPoints.getExtensionPoint(TransformerExtensionPoint.class));
- propertyFactory = new ScriptPropertyFactory(mediator);
+ UtilityExtensionPoint utilities =
extensionPoints.getExtensionPoint(UtilityExtensionPoint.class);
+ Mediator mediator = utilities.getUtility(Mediator.class);
+ SimpleTypeMapper simpleTypeMapper =
utilities.getUtility(SimpleTypeMapper.class);
+ propertyFactory = new ScriptPropertyFactory(mediator,
simpleTypeMapper);
}
public ImplementationProvider
createImplementationProvider(RuntimeComponent component, ScriptImplementation
Implementation) {
Modified:
tuscany/sca-java-2.x/trunk/modules/implementation-script-runtime/src/main/java/org/apache/tuscany/sca/implementation/script/provider/ScriptPropertyFactory.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/implementation-script-runtime/src/main/java/org/apache/tuscany/sca/implementation/script/provider/ScriptPropertyFactory.java?rev=923996&r1=923820&r2=923996&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/implementation-script-runtime/src/main/java/org/apache/tuscany/sca/implementation/script/provider/ScriptPropertyFactory.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/implementation-script-runtime/src/main/java/org/apache/tuscany/sca/implementation/script/provider/ScriptPropertyFactory.java
Tue Mar 16 21:31:55 2010
@@ -28,7 +28,6 @@ import org.apache.tuscany.sca.core.facto
import org.apache.tuscany.sca.core.factory.ObjectFactory;
import org.apache.tuscany.sca.databinding.Mediator;
import org.apache.tuscany.sca.databinding.SimpleTypeMapper;
-import org.apache.tuscany.sca.databinding.impl.SimpleTypeMapperImpl;
import org.apache.tuscany.sca.interfacedef.DataType;
import org.apache.tuscany.sca.interfacedef.util.XMLType;
import org.w3c.dom.Document;
@@ -42,10 +41,12 @@ import org.w3c.dom.Node;
*/
public class ScriptPropertyFactory {
private Mediator mediator = null;
+ private SimpleTypeMapper simpleTypeMapper;
boolean isSimpleType;
- public ScriptPropertyFactory(Mediator mediator) {
+ public ScriptPropertyFactory(Mediator mediator, SimpleTypeMapper
simpleTypeMapper) {
this.mediator = mediator;
+ this.simpleTypeMapper = simpleTypeMapper;
}
public ObjectFactory createValueFactory(Property property) {
@@ -98,7 +99,7 @@ public class ScriptPropertyFactory {
private boolean isSimpleType(Property property) {
if (property.getXSDType() != null) {
- return SimpleTypeMapperImpl.isSimpleXSDType(property.getXSDType());
+ return simpleTypeMapper.isSimpleXSDType(property.getXSDType());
} else {
if (property instanceof Document) {
Document doc = (Document)property;
@@ -142,7 +143,6 @@ public class ScriptPropertyFactory {
}
public abstract class ObjectFactoryImplBase implements ObjectFactory {
- protected SimpleTypeMapper simpleTypeMapper = new
SimpleTypeMapperImpl();
protected Property property;
protected Object propertyValue;
protected Class<?> javaType;
Modified:
tuscany/sca-java-2.x/trunk/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/AbstractSCATestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/AbstractSCATestCase.java?rev=923996&r1=923820&r2=923996&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/AbstractSCATestCase.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/AbstractSCATestCase.java
Tue Mar 16 21:31:55 2010
@@ -39,17 +39,16 @@ public abstract class AbstractSCATestCas
@SuppressWarnings("unchecked")
protected void setUp() throws Exception {
String contribution =
ContributionLocationHelper.getContributionLocation(getClass());
- node = NodeFactory.newInstance().createNode(getCompositeName(), new
Contribution("test", contribution));
+ node = NodeFactory.getInstance().createNode(getCompositeName(), new
Contribution("test", contribution));
node.start();
service = (T) node.getService(getServiceClass(), "ClientComponent");
}
- protected abstract Class getServiceClass();
+ protected abstract Class<T> getServiceClass();
@Override
protected void tearDown() throws Exception {
node.stop();
- node.destroy();
}
protected String getCompositeName() {
Modified:
tuscany/sca-java-2.x/trunk/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/GroovyHelloWorld.composite
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/GroovyHelloWorld.composite?rev=923996&r1=923820&r2=923996&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/GroovyHelloWorld.composite
(original)
+++
tuscany/sca-java-2.x/trunk/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/GroovyHelloWorld.composite
Tue Mar 16 21:31:55 2010
@@ -17,8 +17,8 @@
* specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0";
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0";
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912";
+ xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1";
targetNamespace="http://sample";
name="GroovyHelloWorld">
<component name="ClientComponent">
Modified:
tuscany/sca-java-2.x/trunk/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JRubyHelloWorld.composite
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JRubyHelloWorld.composite?rev=923996&r1=923820&r2=923996&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JRubyHelloWorld.composite
(original)
+++
tuscany/sca-java-2.x/trunk/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JRubyHelloWorld.composite
Tue Mar 16 21:31:55 2010
@@ -17,8 +17,8 @@
* specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0";
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0";
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912";
+ xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1";
targetNamespace="http://sample";
name="JRubyHelloWorld">
<component name="ClientComponent">
Modified:
tuscany/sca-java-2.x/trunk/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScriptHelloWorld.composite
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScriptHelloWorld.composite?rev=923996&r1=923820&r2=923996&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScriptHelloWorld.composite
(original)
+++
tuscany/sca-java-2.x/trunk/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScriptHelloWorld.composite
Tue Mar 16 21:31:55 2010
@@ -17,8 +17,8 @@
* specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0";
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0";
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912";
+ xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1";
targetNamespace="http://sample";
name="JavaScriptHelloWorld">
<component name="ClientComponent">
Modified:
tuscany/sca-java-2.x/trunk/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JythonHelloWorld.composite
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JythonHelloWorld.composite?rev=923996&r1=923820&r2=923996&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JythonHelloWorld.composite
(original)
+++
tuscany/sca-java-2.x/trunk/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JythonHelloWorld.composite
Tue Mar 16 21:31:55 2010
@@ -17,8 +17,8 @@
* specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0";
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0";
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912";
+ xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1";
targetNamespace="http://sample";
name="JythonHelloWorld">
<component name="ClientComponent">
Modified:
tuscany/sca-java-2.x/trunk/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.componentType
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.componentType?rev=923996&r1=923820&r2=923996&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.componentType
(original)
+++
tuscany/sca-java-2.x/trunk/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.componentType
Tue Mar 16 21:31:55 2010
@@ -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/200912";
xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns:xsd="http://www.w3.org/2001/XMLSchema";>
Modified:
tuscany/sca-java-2.x/trunk/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/GroovyHelloWorld.composite
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/GroovyHelloWorld.composite?rev=923996&r1=923820&r2=923996&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/GroovyHelloWorld.composite
(original)
+++
tuscany/sca-java-2.x/trunk/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/GroovyHelloWorld.composite
Tue Mar 16 21:31:55 2010
@@ -17,8 +17,8 @@
* specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0";
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0";
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912";
+ xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1";
targetNamespace="http://sample";
name="GroovyProperties">
<component name="ClientComponent">
Modified:
tuscany/sca-java-2.x/trunk/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JRubyHelloWorld.composite
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JRubyHelloWorld.composite?rev=923996&r1=923820&r2=923996&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JRubyHelloWorld.composite
(original)
+++
tuscany/sca-java-2.x/trunk/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JRubyHelloWorld.composite
Tue Mar 16 21:31:55 2010
@@ -17,8 +17,8 @@
* specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0";
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0";
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912";
+ xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1";
targetNamespace="http://sample";
name="JRubyProperties">
<component name="ClientComponent">
Modified:
tuscany/sca-java-2.x/trunk/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JavaScriptHelloWorld.composite
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JavaScriptHelloWorld.composite?rev=923996&r1=923820&r2=923996&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JavaScriptHelloWorld.composite
(original)
+++
tuscany/sca-java-2.x/trunk/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JavaScriptHelloWorld.composite
Tue Mar 16 21:31:55 2010
@@ -17,8 +17,8 @@
* specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0";
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0";
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912";
+ xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1";
targetNamespace="http://sample";
name="JavaScriptProperties">
<component name="ClientComponent">
Modified:
tuscany/sca-java-2.x/trunk/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JythonHelloWorld.composite
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JythonHelloWorld.composite?rev=923996&r1=923820&r2=923996&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JythonHelloWorld.composite
(original)
+++
tuscany/sca-java-2.x/trunk/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JythonHelloWorld.composite
Tue Mar 16 21:31:55 2010
@@ -17,8 +17,8 @@
* specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0";
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0";
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912";
+ xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1";
targetNamespace="http://sample";
name="JythonProperties">
<component name="ClientComponent">
Modified:
tuscany/sca-java-2.x/trunk/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.componentType
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.componentType?rev=923996&r1=923820&r2=923996&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.componentType
(original)
+++
tuscany/sca-java-2.x/trunk/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.componentType
Tue Mar 16 21:31:55 2010
@@ -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/200912";
xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns:xsd="http://www.w3.org/2001/XMLSchema";>
Modified:
tuscany/sca-java-2.x/trunk/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/GroovyReference.composite
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/GroovyReference.composite?rev=923996&r1=923820&r2=923996&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/GroovyReference.composite
(original)
+++
tuscany/sca-java-2.x/trunk/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/GroovyReference.composite
Tue Mar 16 21:31:55 2010
@@ -17,8 +17,8 @@
* specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0";
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0";
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912";
+ xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1";
targetNamespace="http://sample";
name="GroovyReference">
<component name="ClientComponent">
Modified:
tuscany/sca-java-2.x/trunk/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JRubyReference.composite
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JRubyReference.composite?rev=923996&r1=923820&r2=923996&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JRubyReference.composite
(original)
+++
tuscany/sca-java-2.x/trunk/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JRubyReference.composite
Tue Mar 16 21:31:55 2010
@@ -17,8 +17,8 @@
* specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0";
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0";
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912";
+ xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1";
targetNamespace="http://sample";
name="JRubyReference">
<component name="ClientComponent">
Modified:
tuscany/sca-java-2.x/trunk/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JavaScriptReference.composite
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JavaScriptReference.composite?rev=923996&r1=923820&r2=923996&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JavaScriptReference.composite
(original)
+++
tuscany/sca-java-2.x/trunk/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JavaScriptReference.composite
Tue Mar 16 21:31:55 2010
@@ -17,8 +17,8 @@
* specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0";
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0";
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912";
+ xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1";
targetNamespace="http://sample";
name="JavaScriptReference">
<component name="ClientComponent">
Modified:
tuscany/sca-java-2.x/trunk/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JythonReference.composite
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JythonReference.composite?rev=923996&r1=923820&r2=923996&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JythonReference.composite
(original)
+++
tuscany/sca-java-2.x/trunk/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JythonReference.composite
Tue Mar 16 21:31:55 2010
@@ -17,9 +17,9 @@
* specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0";
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0";
- name="JavaScriptReference">
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912";
+ xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1";
targetNamespace="http://sample";
+ name="JythonReference">
<component name="ClientComponent">
<implementation.java
class="org.apache.tuscany.sca.implementation.script.itests.helloworld.HelloWorldProxy"/>
Modified:
tuscany/sca-java-2.x/trunk/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.componentType
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.componentType?rev=923996&r1=923820&r2=923996&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.componentType
(original)
+++
tuscany/sca-java-2.x/trunk/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.componentType
Tue Mar 16 21:31:55 2010
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0";
xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance";>
+<componentType xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912";
xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance";>
<service name="HelloWorldService">
<interface.java
interface="org.apache.tuscany.sca.implementation.script.itests.helloworld.HelloWorld"
/>
