You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2007/04/12 08:05:10 UTC
svn commit: r527782 - in /incubator/tuscany/java/sca/itest: ./ contribution/
exceptions/ exceptions/src/main/resources/ properties/ spec-api/
spec-api/src/main/resources/
Author: jsdelfino
Date: Wed Apr 11 23:05:08 2007
New Revision: 527782
URL: http://svn.apache.org/viewvc?view=rev&rev=527782
Log:
Starting to bring-up integration tests. Added the first ones to the build. Fixed .composite files and ported them to the latest SCA assembly XML syntax.
Added:
incubator/tuscany/java/sca/itest/pom.xml (with props)
Modified:
incubator/tuscany/java/sca/itest/contribution/ (props changed)
incubator/tuscany/java/sca/itest/contribution/pom.xml
incubator/tuscany/java/sca/itest/exceptions/pom.xml
incubator/tuscany/java/sca/itest/exceptions/src/main/resources/ExceptionTest.composite
incubator/tuscany/java/sca/itest/exceptions/src/main/resources/intracomposite.composite
incubator/tuscany/java/sca/itest/properties/pom.xml
incubator/tuscany/java/sca/itest/spec-api/pom.xml
incubator/tuscany/java/sca/itest/spec-api/src/main/resources/CompositeTest.composite
incubator/tuscany/java/sca/itest/spec-api/src/main/resources/myListService.composite
incubator/tuscany/java/sca/itest/spec-api/src/main/resources/myServiceInComposite.composite
incubator/tuscany/java/sca/itest/spec-api/src/main/resources/myServiceInRecursive.composite
incubator/tuscany/java/sca/itest/spec-api/src/main/resources/mySimpleService.composite
incubator/tuscany/java/sca/itest/spec-api/src/main/resources/mySimpleServiceInRecursive.composite
incubator/tuscany/java/sca/itest/spec-api/src/main/resources/mySimpleServiceInRecursive2.composite
incubator/tuscany/java/sca/itest/spec-api/src/main/resources/myTotalService.composite
incubator/tuscany/java/sca/itest/spec-api/src/main/resources/myTotalServiceInComposite.composite
incubator/tuscany/java/sca/itest/spec-api/src/main/resources/myTotalServiceInCompositeForReferenceOverride.composite
incubator/tuscany/java/sca/itest/spec-api/src/main/resources/myTotalServiceInRecursive.composite
incubator/tuscany/java/sca/itest/spec-api/src/main/resources/myTotalServiceInRecursiveForReferenceOverride.composite
incubator/tuscany/java/sca/itest/spec-api/src/main/resources/myservice.composite
Propchange: incubator/tuscany/java/sca/itest/contribution/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Apr 11 23:05:08 2007
@@ -0,0 +1,14 @@
+target
+*.iws
+*.ipr
+*.iml
+.project
+.classpath
+maven.log
+velocity.log*
+junit*.properties
+surefire*.properties
+.settings
+.deployables
+.wtpmodules
+
Modified: incubator/tuscany/java/sca/itest/contribution/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/contribution/pom.xml?view=diff&rev=527782&r1=527781&r2=527782
==============================================================================
--- incubator/tuscany/java/sca/itest/contribution/pom.xml (original)
+++ incubator/tuscany/java/sca/itest/contribution/pom.xml Wed Apr 11 23:05:08 2007
@@ -18,16 +18,21 @@
* under the License.
-->
<project>
+ <modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.tuscany.testing</groupId>
- <artifactId>sca-itest</artifactId>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-itest</artifactId>
<version>1.0-incubating-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>iTest-Contribution</artifactId>
- <version>SNAPSHOT</version>
- <packaging>jar</packaging>
- <name>Test Suite for SCA Contribution</name>
+ <artifactId>tuscany-itest-contribution</artifactId>
+ <name>Apache Tuscany Contribution Integration Tests</name>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-contribution-impl</artifactId>
+ <version>1.0-incubating-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
</project>
Modified: incubator/tuscany/java/sca/itest/exceptions/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/exceptions/pom.xml?view=diff&rev=527782&r1=527781&r2=527782
==============================================================================
--- incubator/tuscany/java/sca/itest/exceptions/pom.xml (original)
+++ incubator/tuscany/java/sca/itest/exceptions/pom.xml Wed Apr 11 23:05:08 2007
@@ -18,15 +18,28 @@
* under the License.
-->
<project>
+ <modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.tuscany.testing</groupId>
- <artifactId>sca-itest</artifactId>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-itest</artifactId>
<version>1.0-incubating-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>iTest-exceptions</artifactId>
- <packaging>jar</packaging>
- <name>Test Suite Exception Handling</name>
+ <artifactId>tuscany-itest-exceptions</artifactId>
+ <name>Apache Tuscany Exceptions Integration Tests</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-host-embedded</artifactId>
+ <version>1.0-incubating-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-implementation-java-runtime</artifactId>
+ <version>1.0-incubating-SNAPSHOT</version>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
</project>
Modified: incubator/tuscany/java/sca/itest/exceptions/src/main/resources/ExceptionTest.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/exceptions/src/main/resources/ExceptionTest.composite?view=diff&rev=527782&r1=527781&r2=527782
==============================================================================
--- incubator/tuscany/java/sca/itest/exceptions/src/main/resources/ExceptionTest.composite (original)
+++ incubator/tuscany/java/sca/itest/exceptions/src/main/resources/ExceptionTest.composite Wed Apr 11 23:05:08 2007
@@ -19,8 +19,9 @@
-->
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
xmlns:foo="http://foo"
+ targetNamespace = "http://foo"
name="ExceptionTest">
- <include name="intracomposite" scdlLocation="intracomposite.composite"/>
+ <include>foo:intracomposite</include>
</composite>
Modified: incubator/tuscany/java/sca/itest/exceptions/src/main/resources/intracomposite.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/exceptions/src/main/resources/intracomposite.composite?view=diff&rev=527782&r1=527781&r2=527782
==============================================================================
--- incubator/tuscany/java/sca/itest/exceptions/src/main/resources/intracomposite.composite (original)
+++ incubator/tuscany/java/sca/itest/exceptions/src/main/resources/intracomposite.composite Wed Apr 11 23:05:08 2007
@@ -19,11 +19,12 @@
-->
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
xmlns:foo="http://foo"
+ targetNamespace="http://foo"
name="intracomposite">
<component name="main">
<implementation.java class="org.apache.tuscany.sca.test.exceptions.impl.ExceptionHandlerImpl"/>
- <reference name="exceptionThrower">exceptionThrower</reference>
+ <reference name="exceptionThrower" target="exceptionThrower"/>
</component>
<component name="exceptionThrower">
Added: incubator/tuscany/java/sca/itest/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/pom.xml?view=auto&rev=527782
==============================================================================
--- incubator/tuscany/java/sca/itest/pom.xml (added)
+++ incubator/tuscany/java/sca/itest/pom.xml Wed Apr 11 23:05:08 2007
@@ -0,0 +1,68 @@
+<?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.
+-->
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-sca</artifactId>
+ <version>1.0-incubating-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <artifactId>tuscany-itest</artifactId>
+ <packaging>pom</packaging>
+ <name>Apache Tuscany SCA Integration Tests</name>
+
+ <profiles>
+ <profile>
+ <id>default</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <modules>
+ <!--
+ <module>contribution</module>
+ -->
+ <module>exceptions</module>
+ <!--
+ <module>properties</module>
+ <module>spec-api</module>
+ -->
+ </modules>
+ </profile>
+
+ </profiles>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.2</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ <version>2.2</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+</project>
Propchange: incubator/tuscany/java/sca/itest/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/itest/pom.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/java/sca/itest/properties/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/properties/pom.xml?view=diff&rev=527782&r1=527781&r2=527782
==============================================================================
--- incubator/tuscany/java/sca/itest/properties/pom.xml (original)
+++ incubator/tuscany/java/sca/itest/properties/pom.xml Wed Apr 11 23:05:08 2007
@@ -18,17 +18,28 @@
* under the License.
-->
<project>
+ <modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.tuscany.testing</groupId>
- <artifactId>sca-itest</artifactId>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-itest</artifactId>
<version>1.0-incubating-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
+ <artifactId>tuscany-itest-properties</artifactId>
+ <name>Apache Tuscany Properties Integration Tests</name>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>iTest-propertyTest</artifactId>
- <version>${testing.version}</version>
- <packaging>jar</packaging>
- <name>Test Suite for SCA properties</name>
-
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-host-embedded</artifactId>
+ <version>1.0-incubating-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-implementation-java-runtime</artifactId>
+ <version>1.0-incubating-SNAPSHOT</version>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
</project>
Modified: incubator/tuscany/java/sca/itest/spec-api/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/spec-api/pom.xml?view=diff&rev=527782&r1=527781&r2=527782
==============================================================================
--- incubator/tuscany/java/sca/itest/spec-api/pom.xml (original)
+++ incubator/tuscany/java/sca/itest/spec-api/pom.xml Wed Apr 11 23:05:08 2007
@@ -18,17 +18,28 @@
* under the License.
-->
<project>
+ <modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.tuscany.testing</groupId>
- <artifactId>sca-itest</artifactId>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-itest</artifactId>
<version>1.0-incubating-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
+ <artifactId>tuscany-itest-spec-api</artifactId>
+ <name>Apache Tuscany SCA Spec API Integration Tests</name>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>iTest-spec</artifactId>
- <version>${testing.version}</version>
- <packaging>jar</packaging>
- <name>Test Suite for SCA Spec APIs</name>
-
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-host-embedded</artifactId>
+ <version>1.0-incubating-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-implementation-java-runtime</artifactId>
+ <version>1.0-incubating-SNAPSHOT</version>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
</project>
Modified: incubator/tuscany/java/sca/itest/spec-api/src/main/resources/CompositeTest.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/spec-api/src/main/resources/CompositeTest.composite?view=diff&rev=527782&r1=527781&r2=527782
==============================================================================
--- incubator/tuscany/java/sca/itest/spec-api/src/main/resources/CompositeTest.composite (original)
+++ incubator/tuscany/java/sca/itest/spec-api/src/main/resources/CompositeTest.composite Wed Apr 11 23:05:08 2007
@@ -18,16 +18,16 @@
* under the License.
-->
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- xmlns:foo="http://foo"
- name="CompositeTest">
+ targetNamespace = "http://foo"
+ xmlns:foo="http://foo"
+ name="CompositeTest">
- <include name="myTotalService" scdlLocation="myTotalService.composite"/>
- <include name="myListService" scdlLocation="myListService.composite"/>
- <include name="mySimpleServiceInRecursive" scdlLocation="mySimpleServiceInRecursive.composite"/>
- <include name="myServiceInRecursive" scdlLocation="myServiceInRecursive.composite"/>
- <include name="mySimpleServiceInRecursive2" scdlLocation="mySimpleServiceInRecursive2.composite"/>
- <include name="MyTotalServiceInRecursive" scdlLocation="myTotalServiceInRecursive.composite"/>
- <include name="MyTotalServiceInRecursiveForReferenceOverride" scdlLocation="myTotalServiceInRecursiveForReferenceOverride.composite"/>
-
+ <include>foo:myTotalService"</include>
+ <include>foo:myListService"</include>
+ <include>"foo:mySimpleServiceInRecursive"</include>
+ <include>foo:myServiceInRecursive</include>
+ <include>foo:mySimpleServiceInRecursive2</include>
+ <include>foo:myTotalServiceInRecursive</include>
+ <include>foo:myTotalServiceInRecursiveForReferenceOverride</include>
</composite>
Modified: incubator/tuscany/java/sca/itest/spec-api/src/main/resources/myListService.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/spec-api/src/main/resources/myListService.composite?view=diff&rev=527782&r1=527781&r2=527782
==============================================================================
--- incubator/tuscany/java/sca/itest/spec-api/src/main/resources/myListService.composite (original)
+++ incubator/tuscany/java/sca/itest/spec-api/src/main/resources/myListService.composite Wed Apr 11 23:05:08 2007
@@ -19,7 +19,8 @@
-->
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
xmlns:foo="http://foo"
- name="MyListServiceTest">
+ targetNamespace="http://foo"
+ name="myListServiceTest">
<component name="MyNewListService">
<implementation.java class="org.apache.tuscany.sca.test.spec.impl.MyListServiceImpl"/>
Modified: incubator/tuscany/java/sca/itest/spec-api/src/main/resources/myServiceInComposite.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/spec-api/src/main/resources/myServiceInComposite.composite?view=diff&rev=527782&r1=527781&r2=527782
==============================================================================
--- incubator/tuscany/java/sca/itest/spec-api/src/main/resources/myServiceInComposite.composite (original)
+++ incubator/tuscany/java/sca/itest/spec-api/src/main/resources/myServiceInComposite.composite Wed Apr 11 23:05:08 2007
@@ -19,29 +19,26 @@
-->
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
xmlns:foo="http://foo"
- name="MyServiceInCompositeTest">
+ targetNamespace="http://foo"
+ name="myServiceInComposite">
- <service name="MyService">
+ <service name="MyService" promote="MyServiceComponent/MyService">
<interface.java interface="org.apache.tuscany.sca.test.spec.MyService"/>
- <reference>MyServiceComponent/MyService</reference>
</service>
- <service name="MyListService">
+ <service name="MyListService" promote="MyServiceComponent/MyListService">
<interface.java interface="org.apache.tuscany.sca.test.spec.MyListService"/>
- <reference>MyServiceComponent/MyListService</reference>
</service>
- <service name="MyListServiceByYear">
+ <service name="MyListServiceByYear" promote="MyServiceComponent/MyListServiceByYear">
<interface.java interface="org.apache.tuscany.sca.test.spec.MyListServiceByYear"/>
- <reference>MyServiceComponent/MyListServiceByYear</reference>
</service>
- <service name="MyServiceByDate">
+ <service name="MyServiceByDate" promote="MyServiceComponent/MyServiceByDate">
<interface.java interface="org.apache.tuscany.sca.test.spec.MyServiceByDate"/>
- <reference>MyServiceComponent/MyServiceByDate</reference>
</service>
<component name="MyServiceComponent">
Modified: incubator/tuscany/java/sca/itest/spec-api/src/main/resources/myServiceInRecursive.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/spec-api/src/main/resources/myServiceInRecursive.composite?view=diff&rev=527782&r1=527781&r2=527782
==============================================================================
--- incubator/tuscany/java/sca/itest/spec-api/src/main/resources/myServiceInRecursive.composite (original)
+++ incubator/tuscany/java/sca/itest/spec-api/src/main/resources/myServiceInRecursive.composite Wed Apr 11 23:05:08 2007
@@ -19,34 +19,31 @@
-->
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
xmlns:foo="http://foo"
- name="MyServiceInRecursiveTest">
+ targetNamespace="http://foo"
+ name="myServiceInRecursive">
- <service name="MyServiceInRecursiveMyService">
+ <service name="MyServiceInRecursiveMyService" promote="MyServiceInRecursive/MyService">
<interface.java interface="org.apache.tuscany.sca.test.spec.MyService"/>
- <reference>MyServiceInRecursive/MyService</reference>
</service>
- <service name="MyServiceInRecursiveMyListService">
+ <service name="MyServiceInRecursiveMyListService" promote="MyServiceInRecursive/MyListService">
<interface.java interface="org.apache.tuscany.sca.test.spec.MyListService"/>
- <reference>MyServiceInRecursive/MyListService</reference>
</service>
- <service name="MyServiceInRecursiveMyListServiceByYear">
+ <service name="MyServiceInRecursiveMyListServiceByYear" promote="MyServiceInRecursive/MyListServiceByYear">
<interface.java interface="org.apache.tuscany.sca.test.spec.MyListServiceByYear"/>
- <reference>MyServiceInRecursive/MyListServiceByYear</reference>
</service>
- <service name="MyServiceInRecursiveMyServiceByDate">
+ <service name="MyServiceInRecursiveMyServiceByDate" promote="MyServiceInRecursive/MyServiceByDate">
<interface.java interface="org.apache.tuscany.sca.test.spec.MyServiceByDate"/>
- <reference>MyServiceInRecursive/MyServiceByDate</reference>
</service>
<component name="MyServiceInRecursive">
- <implementation.composite scdlLocation="myServiceInComposite.composite"/>
+ <implementation.composite name="foo:myServiceInComposite"/>
</component>
Modified: incubator/tuscany/java/sca/itest/spec-api/src/main/resources/mySimpleService.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/spec-api/src/main/resources/mySimpleService.composite?view=diff&rev=527782&r1=527781&r2=527782
==============================================================================
--- incubator/tuscany/java/sca/itest/spec-api/src/main/resources/mySimpleService.composite (original)
+++ incubator/tuscany/java/sca/itest/spec-api/src/main/resources/mySimpleService.composite Wed Apr 11 23:05:08 2007
@@ -19,11 +19,11 @@
-->
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
xmlns:foo="http://foo"
- name="MySimpleServiceTest">
+ targetNamespace="http://foo"
+ name="mySimpleService">
- <service name="MyService">
+ <service name="MyService" promote="MyServiceComponent/MyService">
<interface.java interface="org.apache.tuscany.sca.test.spec.MyService"/>
- <reference>MyServiceComponent/MyService</reference>
</service>
<component name="MyServiceComponent">
Modified: incubator/tuscany/java/sca/itest/spec-api/src/main/resources/mySimpleServiceInRecursive.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/spec-api/src/main/resources/mySimpleServiceInRecursive.composite?view=diff&rev=527782&r1=527781&r2=527782
==============================================================================
--- incubator/tuscany/java/sca/itest/spec-api/src/main/resources/mySimpleServiceInRecursive.composite (original)
+++ incubator/tuscany/java/sca/itest/spec-api/src/main/resources/mySimpleServiceInRecursive.composite Wed Apr 11 23:05:08 2007
@@ -19,30 +19,27 @@
-->
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
xmlns:foo="http://foo"
- name="MySimpleServiceInRecursiveTest">
+ targetNamespace="http://foo"
+ name="mySimpleServiceInRecursive">
- <service name="MySimpleService">
+ <service name="MySimpleService" promote="MySimpleServiceInRecursive/MyService">
<interface.java interface="org.apache.tuscany.sca.test.spec.MyService"/>
- <reference>MySimpleServiceInRecursive/MyService</reference>
</service>
- <service name="MySimpleServiceNo" override="no">
+ <service name="MySimpleServiceNo" promote="MySimpleServiceInRecursive/MyService">
<interface.java interface="org.apache.tuscany.sca.test.spec.MyService"/>
- <reference>MySimpleServiceInRecursive/MyService</reference>
</service>
- <service name="MySimpleServiceMay" override="may">
+ <service name="MySimpleServiceMay" promote="MySimpleServiceInRecursive/MyService">
<interface.java interface="org.apache.tuscany.sca.test.spec.MyService"/>
- <reference>MySimpleServiceInRecursive/MyService</reference>
</service>
- <service name="MySimpleServiceMust" override="must">
+ <service name="MySimpleServiceMust" promote="MySimpleServiceInRecursive/MyService">
<interface.java interface="org.apache.tuscany.sca.test.spec.MyService"/>
- <reference>MySimpleServiceInRecursive/MyService</reference>
</service>
<component name="MySimpleServiceInRecursive">
- <implementation.composite scdlLocation="mySimpleService.composite"/>
+ <implementation.composite name="foo:mySimpleService"/>
</component>
</composite>
Modified: incubator/tuscany/java/sca/itest/spec-api/src/main/resources/mySimpleServiceInRecursive2.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/spec-api/src/main/resources/mySimpleServiceInRecursive2.composite?view=diff&rev=527782&r1=527781&r2=527782
==============================================================================
--- incubator/tuscany/java/sca/itest/spec-api/src/main/resources/mySimpleServiceInRecursive2.composite (original)
+++ incubator/tuscany/java/sca/itest/spec-api/src/main/resources/mySimpleServiceInRecursive2.composite Wed Apr 11 23:05:08 2007
@@ -19,29 +19,26 @@
-->
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
xmlns:foo="http://foo"
- name="MySimpleServiceInRecursiveTest">
+ targetNamespace="http://foo"
+ name="MySimpleServiceInRecursive2">
<service name="MySimpleServiceDefault">
- <interface.java interface="org.apache.tuscany.sca.test.spec.MyService"/>
- <reference>MySimpleServiceInRecursiveComponent/MySimpleService</reference>
+ <interface.java interface="org.apache.tuscany.sca.test.spec.MyService" promote="MySimpleServiceInRecursiveComponent/MySimpleService"/>
</service>
- <service name="MySimpleServiceNo" override="no">
+ <service name="MySimpleServiceNo" promote="MySimpleServiceInRecursiveComponent/MySimpleServiceNo">
<interface.java interface="org.apache.tuscany.sca.test.spec.MyService"/>
- <reference>MySimpleServiceInRecursiveComponent/MySimpleServiceNo</reference>
</service>
- <service name="MySimpleServiceMay" override="may">
+ <service name="MySimpleServiceMay" promote="MySimpleServiceInRecursiveComponent/MySimpleServiceMay">
<interface.java interface="org.apache.tuscany.sca.test.spec.MyService"/>
- <reference>MySimpleServiceInRecursiveComponent/MySimpleServiceMay</reference>
</service>
- <service name="MySimpleServiceMust" override="must">
+ <service name="MySimpleServiceMust" promote="MySimpleServiceInRecursiveComponent/MySimpleServiceMust">
<interface.java interface="org.apache.tuscany.sca.test.spec.MyService"/>
- <reference>MySimpleServiceInRecursiveComponent/MySimpleServiceMust</reference>
</service>
<component name="MySimpleServiceInRecursiveComponent">
- <implementation.composite scdlLocation="mySimpleServiceInRecursive.composite"/>
+ <implementation.composite name="foo:mySimpleServiceInRecursive"/>
</component>
</composite>
Modified: incubator/tuscany/java/sca/itest/spec-api/src/main/resources/myTotalService.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/spec-api/src/main/resources/myTotalService.composite?view=diff&rev=527782&r1=527781&r2=527782
==============================================================================
--- incubator/tuscany/java/sca/itest/spec-api/src/main/resources/myTotalService.composite (original)
+++ incubator/tuscany/java/sca/itest/spec-api/src/main/resources/myTotalService.composite Wed Apr 11 23:05:08 2007
@@ -18,10 +18,11 @@
* under the License.
-->
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- xmlns:foo="http://foo"
- name="MyTotalServiceTest">
+ xmlns:foo="http://foo"
+ targetNamespace="http://foo"
+ name="MyTotalServiceTest">
- <include name="myservice" scdlLocation="myservice.composite"/>
+ <include name="myservice"/>
<component name="MyTotalService">
<implementation.java class="org.apache.tuscany.sca.test.spec.impl.MyTotalServiceImpl"/>
Modified: incubator/tuscany/java/sca/itest/spec-api/src/main/resources/myTotalServiceInComposite.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/spec-api/src/main/resources/myTotalServiceInComposite.composite?view=diff&rev=527782&r1=527781&r2=527782
==============================================================================
--- incubator/tuscany/java/sca/itest/spec-api/src/main/resources/myTotalServiceInComposite.composite (original)
+++ incubator/tuscany/java/sca/itest/spec-api/src/main/resources/myTotalServiceInComposite.composite Wed Apr 11 23:05:08 2007
@@ -19,24 +19,22 @@
-->
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
xmlns:foo="http://foo"
- name="MyTotalServiceReferenceOverrideTest">
+ targetNamespace="http://foo"
+ name="myTotalServiceInComposite">
- <service name="MyTotalService">
+ <service name="MyTotalService" promote="MyTotalServiceComponent">
<interface.java interface="org.apache.tuscany.sca.test.spec.MyTotalService"/>
- <reference>MyTotalServiceComponent</reference>
</service>
<component name="MyTotalServiceComponent">
<implementation.java class="org.apache.tuscany.sca.test.spec.impl.MyTotalServiceImpl"/>
- <reference name="myService">MyServiceRef</reference>
- <reference name="myListService">MyListServiceRef</reference>
</component>
- <reference name="MyServiceRef">
+ <reference name="MyServiceRef" promote="MyTotalServiceComponent/myService">
<interface.java interface="org.apache.tuscany.sca.test.spec.MyService"/>
</reference>
- <reference name="MyListServiceRef">
+ <reference name="MyListServiceRef" promote="MyTotalServiceComponent/myListService">
<interface.java interface="org.apache.tuscany.sca.test.spec.MyListService"/>
</reference>
Modified: incubator/tuscany/java/sca/itest/spec-api/src/main/resources/myTotalServiceInCompositeForReferenceOverride.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/spec-api/src/main/resources/myTotalServiceInCompositeForReferenceOverride.composite?view=diff&rev=527782&r1=527781&r2=527782
==============================================================================
--- incubator/tuscany/java/sca/itest/spec-api/src/main/resources/myTotalServiceInCompositeForReferenceOverride.composite (original)
+++ incubator/tuscany/java/sca/itest/spec-api/src/main/resources/myTotalServiceInCompositeForReferenceOverride.composite Wed Apr 11 23:05:08 2007
@@ -19,11 +19,11 @@
-->
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
xmlns:foo="http://foo"
- name="MyTotalServiceTest">
+ targetNamespace="http://foo"
+ name="myTotalServiceInCompositeForReferenceOverride">
- <service name="MyTotalServiceNo">
+ <service name="MyTotalServiceNo" promote="MyTotalServiceComponentNo">
<interface.java interface="org.apache.tuscany.sca.test.spec.MyTotalService"/>
- <reference>MyTotalServiceComponentNo</reference>
</service>
<component name="MyTotalServiceComponentNo">
@@ -32,49 +32,43 @@
<reference name="myListService">MyListServiceRefNo</reference>
</component>
- <reference name="MyServiceRefNo" override="no">
+ <reference name="MyServiceRefNo" promote="MyTotalServiceComponentNo/myService">
<interface.java interface="org.apache.tuscany.sca.test.spec.MyService"/>
</reference>
- <reference name="MyListServiceRefNo" override="no">
+ <reference name="MyListServiceRefNo" promote="MyTotalServiceComponentNo/myListService">
<interface.java interface="org.apache.tuscany.sca.test.spec.MyListService"/>
</reference>
- <service name="MyTotalServiceMay">
+ <service name="MyTotalServiceMay" promote="MyTotalServiceComponentMay">
<interface.java interface="org.apache.tuscany.sca.test.spec.MyTotalService"/>
- <reference>MyTotalServiceComponentMay</reference>
</service>
<component name="MyTotalServiceComponentMay">
<implementation.java class="org.apache.tuscany.sca.test.spec.impl.MyTotalServiceImpl"/>
- <reference name="myService">MyServiceRefMay</reference>
- <reference name="myListService">MyListServiceRefMay</reference>
</component>
- <reference name="MyServiceRefMay" override="may">
+ <reference name="MyServiceRefMay" promote="MyTotalServiceComponentMay/myService">
<interface.java interface="org.apache.tuscany.sca.test.spec.MyService"/>
</reference>
- <reference name="MyListServiceRefMay" override="may">
+ <reference name="MyListServiceRefMay" promote="MyTotalServiceComponentMay/myListService">
<interface.java interface="org.apache.tuscany.sca.test.spec.MyListService"/>
</reference>
- <service name="MyTotalServiceMust">
+ <service name="MyTotalServiceMust" promote="MyTotalServiceComponentMust">
<interface.java interface="org.apache.tuscany.sca.test.spec.MyTotalService"/>
- <reference>MyTotalServiceComponentMust</reference>
</service>
<component name="MyTotalServiceComponentMust">
<implementation.java class="org.apache.tuscany.sca.test.spec.impl.MyTotalServiceImpl"/>
- <reference name="myService">MyServiceRefMust</reference>
- <reference name="myListService">MyListServiceRefMust</reference>
</component>
- <reference name="MyServiceRefMust" override="must">
+ <reference name="MyServiceRefMust" promote="MyTotalServiceComponentMust/myService">
<interface.java interface="org.apache.tuscany.sca.test.spec.MyService"/>
</reference>
- <reference name="MyListServiceRefMust" override="must">
+ <reference name="MyListServiceRefMust" promote="MyTotalServiceComponentMust/myListService">
<interface.java interface="org.apache.tuscany.sca.test.spec.MyListService"/>
</reference>
Modified: incubator/tuscany/java/sca/itest/spec-api/src/main/resources/myTotalServiceInRecursive.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/spec-api/src/main/resources/myTotalServiceInRecursive.composite?view=diff&rev=527782&r1=527781&r2=527782
==============================================================================
--- incubator/tuscany/java/sca/itest/spec-api/src/main/resources/myTotalServiceInRecursive.composite (original)
+++ incubator/tuscany/java/sca/itest/spec-api/src/main/resources/myTotalServiceInRecursive.composite Wed Apr 11 23:05:08 2007
@@ -19,10 +19,11 @@
-->
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
xmlns:foo="http://foo"
+ targetNamespace="http://foo"
name="MyTotalServiceInRecursiveTest">
<component name="MyServiceInComposite">
- <implementation.composite scdlLocation="myServiceInComposite.composite"/>
+ <implementation.composite name="foo:myServiceInComposite"/>
</component>
<component name="MyTotalServiceFromRecursive">
@@ -31,24 +32,22 @@
<reference name="myListService">MyServiceInComposite/MyListService</reference>
</component>
- <service name="MyTotalServiceInCompositeWithRecursiveUseService">
+ <service name="MyTotalServiceInCompositeWithRecursiveUseService" promote="MyTotalServiceInCompositeWithRecursive">
<interface.java interface="org.apache.tuscany.sca.test.spec.MyTotalService"/>
- <reference>MyTotalServiceInCompositeWithRecursive</reference>
</service>
- <service name="MyTotalServiceInCompositeWithComponentServiceUseService">
+ <service name="MyTotalServiceInCompositeWithComponentServiceUseService" promote="MyTotalServiceInCompositeWithComponentService">
<interface.java interface="org.apache.tuscany.sca.test.spec.MyTotalService"/>
- <reference>MyTotalServiceInCompositeWithComponentService</reference>
</service>
<component name="MyTotalServiceInCompositeWithRecursive">
- <implementation.composite scdlLocation="myTotalServiceInComposite.composite"/>
+ <implementation.composite name="foo:myTotalServiceInComposite"/>
<reference name="MyServiceRef">MyServiceInComposite/MyService</reference>
<reference name="MyListServiceRef">MyServiceInComposite/MyListService</reference>
</component>
<component name="MyTotalServiceInCompositeWithComponentService">
- <implementation.composite scdlLocation="myTotalServiceInComposite.composite"/>
+ <implementation.composite name="foo:myTotalServiceInComposite"/>
<reference name="MyServiceRef">MyServiceInComponent/MyService</reference>
<reference name="MyListServiceRef">MyServiceInComponent/MyListService</reference>
</component>
Modified: incubator/tuscany/java/sca/itest/spec-api/src/main/resources/myTotalServiceInRecursiveForReferenceOverride.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/spec-api/src/main/resources/myTotalServiceInRecursiveForReferenceOverride.composite?view=diff&rev=527782&r1=527781&r2=527782
==============================================================================
--- incubator/tuscany/java/sca/itest/spec-api/src/main/resources/myTotalServiceInRecursiveForReferenceOverride.composite (original)
+++ incubator/tuscany/java/sca/itest/spec-api/src/main/resources/myTotalServiceInRecursiveForReferenceOverride.composite Wed Apr 11 23:05:08 2007
@@ -19,25 +19,23 @@
-->
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
xmlns:foo="http://foo"
+ targetNamespace="http://foo"
name="MyTotalServiceInRecursiveTest">
- <service name="MyTotalServiceNo">
+ <service name="MyTotalServiceNo" promote="MyTotalServiceForReferenceComponent/MyTotalServiceNo">
<interface.java interface="org.apache.tuscany.sca.test.spec.MyTotalService"/>
- <reference>MyTotalServiceForReferenceComponent/MyTotalServiceNo</reference>
</service>
- <service name="MyTotalServiceMay">
+ <service name="MyTotalServiceMay" promote="MyTotalServiceForReferenceComponent/MyTotalServiceMay">
<interface.java interface="org.apache.tuscany.sca.test.spec.MyTotalService"/>
- <reference>MyTotalServiceForReferenceComponent/MyTotalServiceMay</reference>
</service>
- <service name="MyTotalServiceMust">
+ <service name="MyTotalServiceMust" promote="MyTotalServiceForReferenceComponent/MyTotalServiceMust">
<interface.java interface="org.apache.tuscany.sca.test.spec.MyTotalService"/>
- <reference>MyTotalServiceForReferenceComponent/MyTotalServiceMust</reference>
</service>
<component name="MyTotalServiceForReferenceComponent">
- <implementation.composite scdlLocation="myTotalServiceInCompositeForReferenceOverride.composite"/>
+ <implementation.composite name="foo:myTotalServiceInCompositeForReferenceOverride"/>
<reference name="MyServiceRefNo">MyServiceInComposite/MyService</reference>
<reference name="MyListServiceRefNo">MyServiceInComposite/MyListService</reference>
<reference name="MyServiceRefMay">MyServiceInComposite/MyService</reference>
Modified: incubator/tuscany/java/sca/itest/spec-api/src/main/resources/myservice.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/spec-api/src/main/resources/myservice.composite?view=diff&rev=527782&r1=527781&r2=527782
==============================================================================
--- incubator/tuscany/java/sca/itest/spec-api/src/main/resources/myservice.composite (original)
+++ incubator/tuscany/java/sca/itest/spec-api/src/main/resources/myservice.composite Wed Apr 11 23:05:08 2007
@@ -19,7 +19,8 @@
-->
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
xmlns:foo="http://foo"
- name="MyServiceComposite">
+ targetNamespace="http://foo"
+ name="myservice">
<component name="MyService">
<implementation.java class="org.apache.tuscany.sca.test.spec.impl.MyServiceImpl"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org