tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From n...@apache.org
Subject svn commit: r674100 - in /tuscany/java/sca/itest/builder/src: main/resources/ main/resources/META-INF/ main/resources/scenario1/ main/resources/scenario1/META-INF/ main/resources/scenario2/ main/resources/scenario2/META-INF/ main/resources/scenario3/ m...
Date Fri, 04 Jul 2008 17:27:56 GMT
Author: nash
Date: Fri Jul  4 10:27:55 2008
New Revision: 674100

URL: http://svn.apache.org/viewvc?rev=674100&view=rev
Log:
Add 3 additional scenarios

Added:
    tuscany/java/sca/itest/builder/src/main/resources/scenario1/
    tuscany/java/sca/itest/builder/src/main/resources/scenario1/META-INF/
    tuscany/java/sca/itest/builder/src/main/resources/scenario1/META-INF/sca-contribution.xml
    tuscany/java/sca/itest/builder/src/main/resources/scenario1/scenario1.composite
    tuscany/java/sca/itest/builder/src/main/resources/scenario1/scenario1a.composite
    tuscany/java/sca/itest/builder/src/main/resources/scenario2/
    tuscany/java/sca/itest/builder/src/main/resources/scenario2/META-INF/
    tuscany/java/sca/itest/builder/src/main/resources/scenario2/META-INF/sca-contribution.xml
    tuscany/java/sca/itest/builder/src/main/resources/scenario2/scenario2.composite
    tuscany/java/sca/itest/builder/src/main/resources/scenario2/scenario2a.composite
    tuscany/java/sca/itest/builder/src/main/resources/scenario3/
    tuscany/java/sca/itest/builder/src/main/resources/scenario3/META-INF/
    tuscany/java/sca/itest/builder/src/main/resources/scenario3/META-INF/sca-contribution.xml
    tuscany/java/sca/itest/builder/src/main/resources/scenario3/scenario3.composite
    tuscany/java/sca/itest/builder/src/main/resources/scenario3/scenario3a.composite
    tuscany/java/sca/itest/builder/src/main/resources/scenario4/
    tuscany/java/sca/itest/builder/src/main/resources/scenario4/META-INF/
    tuscany/java/sca/itest/builder/src/main/resources/scenario4/META-INF/sca-contribution.xml
    tuscany/java/sca/itest/builder/src/main/resources/scenario4/scenario4.composite
    tuscany/java/sca/itest/builder/src/main/resources/scenario4/scenario4a.composite
Removed:
    tuscany/java/sca/itest/builder/src/main/resources/META-INF/
    tuscany/java/sca/itest/builder/src/main/resources/scenario1.composite
    tuscany/java/sca/itest/builder/src/main/resources/scenario1a.composite
Modified:
    tuscany/java/sca/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/BuilderTestCase.java

Added: tuscany/java/sca/itest/builder/src/main/resources/scenario1/META-INF/sca-contribution.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/builder/src/main/resources/scenario1/META-INF/sca-contribution.xml?rev=674100&view=auto
==============================================================================
--- tuscany/java/sca/itest/builder/src/main/resources/scenario1/META-INF/sca-contribution.xml
(added)
+++ tuscany/java/sca/itest/builder/src/main/resources/scenario1/META-INF/sca-contribution.xml
Fri Jul  4 10:27:55 2008
@@ -0,0 +1,24 @@
+<?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.    
+-->
+<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
+              targetNamespace="http://scenario1"
+              xmlns:ns1="http://scenario1">
+    <deployable composite="ns1:CompositeA" />
+</contribution>

Added: tuscany/java/sca/itest/builder/src/main/resources/scenario1/scenario1.composite
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/builder/src/main/resources/scenario1/scenario1.composite?rev=674100&view=auto
==============================================================================
--- tuscany/java/sca/itest/builder/src/main/resources/scenario1/scenario1.composite (added)
+++ tuscany/java/sca/itest/builder/src/main/resources/scenario1/scenario1.composite Fri Jul
 4 10:27:55 2008
@@ -0,0 +1,22 @@
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+        targetNamespace="http://scenario1"
+        xmlns:tns="http://scenario1"
+        name="CompositeA">
+
+    <service name="Service1" promote="ComponentB/Service2">
+        <!-- bindings and/or interfaces may or may not be specified explicitly here -->
+        <binding.ws />
+    </service>
+
+    <component name="ComponentB">
+        <implementation.composite name="tns:CompositeC" />
+        <service name="Service2">
+            <!-- bindings and/or interfaces may or may not be specified explicitly here
-->
+        </service>
+        <service name="Service2a">
+            <!-- bindings and/or interfaces may or may not be specified explicitly here
-->
+        </service>
+    </component>
+
+</composite>
+

Added: tuscany/java/sca/itest/builder/src/main/resources/scenario1/scenario1a.composite
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/builder/src/main/resources/scenario1/scenario1a.composite?rev=674100&view=auto
==============================================================================
--- tuscany/java/sca/itest/builder/src/main/resources/scenario1/scenario1a.composite (added)
+++ tuscany/java/sca/itest/builder/src/main/resources/scenario1/scenario1a.composite Fri Jul
 4 10:27:55 2008
@@ -0,0 +1,24 @@
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+        targetNamespace="http://scenario1"
+        xmlns:tns="http://scenario1"
+        name="CompositeC">
+
+    <service name="Service2" promote="ComponentD/Service3">
+        <!-- bindings and/or interfaces may or may not be specified explicitly here -->
+    </service>
+    <service name="Service2a" promote="ComponentD/Service3a">
+        <!-- bindings and/or interfaces may or may not be specified explicitly here -->
+    </service>
+
+    <component name="ComponentD">
+        <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentDImpl"/>
+        <service name="Service3">
+            <!-- bindings and/or interfaces may or may not be specified explicitly here
-->
+        </service>
+        <service name="Service3a">
+            <!-- bindings and/or interfaces may or may not be specified explicitly here
-->
+        </service>
+    </component>
+</composite>
+
+

Added: tuscany/java/sca/itest/builder/src/main/resources/scenario2/META-INF/sca-contribution.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/builder/src/main/resources/scenario2/META-INF/sca-contribution.xml?rev=674100&view=auto
==============================================================================
--- tuscany/java/sca/itest/builder/src/main/resources/scenario2/META-INF/sca-contribution.xml
(added)
+++ tuscany/java/sca/itest/builder/src/main/resources/scenario2/META-INF/sca-contribution.xml
Fri Jul  4 10:27:55 2008
@@ -0,0 +1,24 @@
+<?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.    
+-->
+<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
+              targetNamespace="http://scenario2"
+              xmlns:ns2="http://scenario2">
+    <deployable composite="ns2:CompositeA" />
+</contribution>

Added: tuscany/java/sca/itest/builder/src/main/resources/scenario2/scenario2.composite
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/builder/src/main/resources/scenario2/scenario2.composite?rev=674100&view=auto
==============================================================================
--- tuscany/java/sca/itest/builder/src/main/resources/scenario2/scenario2.composite (added)
+++ tuscany/java/sca/itest/builder/src/main/resources/scenario2/scenario2.composite Fri Jul
 4 10:27:55 2008
@@ -0,0 +1,21 @@
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+        targetNamespace="http://scenario2"
+        xmlns:tns="http://scenario2"
+        name="CompositeA">
+
+    <service name="Service1" promote="ComponentB/Service2">
+        <!-- bindings and/or interfaces may or may not be specified explicitly here -->
+    </service>
+
+    <component name="ComponentB">
+        <implementation.composite name="tns:CompositeC" />
+        <service name="Service2">
+            <!-- bindings and/or interfaces may or may not be specified explicitly here
-->
+        </service>
+        <service name="Service2a">
+            <!-- bindings and/or interfaces may or may not be specified explicitly here
-->
+        </service>
+    </component>
+
+</composite>
+

Added: tuscany/java/sca/itest/builder/src/main/resources/scenario2/scenario2a.composite
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/builder/src/main/resources/scenario2/scenario2a.composite?rev=674100&view=auto
==============================================================================
--- tuscany/java/sca/itest/builder/src/main/resources/scenario2/scenario2a.composite (added)
+++ tuscany/java/sca/itest/builder/src/main/resources/scenario2/scenario2a.composite Fri Jul
 4 10:27:55 2008
@@ -0,0 +1,25 @@
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+        targetNamespace="http://scenario2"
+        xmlns:tns="http://scenario2"
+        name="CompositeC">
+
+    <service name="Service2" promote="ComponentD/Service3">
+        <!-- bindings and/or interfaces may or may not be specified explicitly here -->
+        <binding.ws />
+    </service>
+    <service name="Service2a" promote="ComponentD/Service3a">
+        <!-- bindings and/or interfaces may or may not be specified explicitly here -->
+    </service>
+
+    <component name="ComponentD">
+        <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentDImpl"/>
+        <service name="Service3">
+            <!-- bindings and/or interfaces may or may not be specified explicitly here
-->
+        </service>
+        <service name="Service3a">
+            <!-- bindings and/or interfaces may or may not be specified explicitly here
-->
+        </service>
+    </component>
+</composite>
+
+

Added: tuscany/java/sca/itest/builder/src/main/resources/scenario3/META-INF/sca-contribution.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/builder/src/main/resources/scenario3/META-INF/sca-contribution.xml?rev=674100&view=auto
==============================================================================
--- tuscany/java/sca/itest/builder/src/main/resources/scenario3/META-INF/sca-contribution.xml
(added)
+++ tuscany/java/sca/itest/builder/src/main/resources/scenario3/META-INF/sca-contribution.xml
Fri Jul  4 10:27:55 2008
@@ -0,0 +1,24 @@
+<?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.    
+-->
+<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
+              targetNamespace="http://scenario3"
+              xmlns:ns3="http://scenario3">
+    <deployable composite="ns3:CompositeA" />
+</contribution>

Added: tuscany/java/sca/itest/builder/src/main/resources/scenario3/scenario3.composite
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/builder/src/main/resources/scenario3/scenario3.composite?rev=674100&view=auto
==============================================================================
--- tuscany/java/sca/itest/builder/src/main/resources/scenario3/scenario3.composite (added)
+++ tuscany/java/sca/itest/builder/src/main/resources/scenario3/scenario3.composite Fri Jul
 4 10:27:55 2008
@@ -0,0 +1,22 @@
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+        targetNamespace="http://scenario3"
+        xmlns:tns="http://scenario3"
+        name="CompositeA">
+
+    <service name="Service1" promote="ComponentB/Service2">
+        <!-- bindings and/or interfaces may or may not be specified explicitly here -->
+    </service>
+
+    <component name="ComponentB">
+        <implementation.composite name="tns:CompositeC" />
+        <service name="Service2">
+            <!-- bindings and/or interfaces may or may not be specified explicitly here
-->
+            <binding.ws />
+        </service>
+        <service name="Service2a">
+            <!-- bindings and/or interfaces may or may not be specified explicitly here
-->
+        </service>
+    </component>
+
+</composite>
+

Added: tuscany/java/sca/itest/builder/src/main/resources/scenario3/scenario3a.composite
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/builder/src/main/resources/scenario3/scenario3a.composite?rev=674100&view=auto
==============================================================================
--- tuscany/java/sca/itest/builder/src/main/resources/scenario3/scenario3a.composite (added)
+++ tuscany/java/sca/itest/builder/src/main/resources/scenario3/scenario3a.composite Fri Jul
 4 10:27:55 2008
@@ -0,0 +1,24 @@
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+        targetNamespace="http://scenario3"
+        xmlns:tns="http://scenario3"
+        name="CompositeC">
+
+    <service name="Service2" promote="ComponentD/Service3">
+        <!-- bindings and/or interfaces may or may not be specified explicitly here -->
+    </service>
+    <service name="Service2a" promote="ComponentD/Service3a">
+        <!-- bindings and/or interfaces may or may not be specified explicitly here -->
+    </service>
+
+    <component name="ComponentD">
+        <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentDImpl"/>
+        <service name="Service3">
+            <!-- bindings and/or interfaces may or may not be specified explicitly here
-->
+        </service>
+        <service name="Service3a">
+            <!-- bindings and/or interfaces may or may not be specified explicitly here
-->
+        </service>
+    </component>
+</composite>
+
+

Added: tuscany/java/sca/itest/builder/src/main/resources/scenario4/META-INF/sca-contribution.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/builder/src/main/resources/scenario4/META-INF/sca-contribution.xml?rev=674100&view=auto
==============================================================================
--- tuscany/java/sca/itest/builder/src/main/resources/scenario4/META-INF/sca-contribution.xml
(added)
+++ tuscany/java/sca/itest/builder/src/main/resources/scenario4/META-INF/sca-contribution.xml
Fri Jul  4 10:27:55 2008
@@ -0,0 +1,24 @@
+<?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.    
+-->
+<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
+              targetNamespace="http://scenario4"
+              xmlns:ns4="http://scenario4">
+   <deployable composite="ns4:CompositeA" />
+</contribution>

Added: tuscany/java/sca/itest/builder/src/main/resources/scenario4/scenario4.composite
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/builder/src/main/resources/scenario4/scenario4.composite?rev=674100&view=auto
==============================================================================
--- tuscany/java/sca/itest/builder/src/main/resources/scenario4/scenario4.composite (added)
+++ tuscany/java/sca/itest/builder/src/main/resources/scenario4/scenario4.composite Fri Jul
 4 10:27:55 2008
@@ -0,0 +1,21 @@
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+        targetNamespace="http://scenario4"
+        xmlns:tns="http://scenario4"
+        name="CompositeA">
+
+    <service name="Service1" promote="ComponentB/Service2">
+        <!-- bindings and/or interfaces may or may not be specified explicitly here -->
+    </service>
+
+    <component name="ComponentB">
+        <implementation.composite name="tns:CompositeC" />
+        <service name="Service2">
+            <!-- bindings and/or interfaces may or may not be specified explicitly here
-->
+        </service>
+        <service name="Service2a">
+            <!-- bindings and/or interfaces may or may not be specified explicitly here
-->
+        </service>
+    </component>
+
+</composite>
+

Added: tuscany/java/sca/itest/builder/src/main/resources/scenario4/scenario4a.composite
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/builder/src/main/resources/scenario4/scenario4a.composite?rev=674100&view=auto
==============================================================================
--- tuscany/java/sca/itest/builder/src/main/resources/scenario4/scenario4a.composite (added)
+++ tuscany/java/sca/itest/builder/src/main/resources/scenario4/scenario4a.composite Fri Jul
 4 10:27:55 2008
@@ -0,0 +1,25 @@
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+        targetNamespace="http://scenario4"
+        xmlns:tns="http://scenario4"
+        name="CompositeC">
+
+    <service name="Service2" promote="ComponentD/Service3">
+        <!-- bindings and/or interfaces may or may not be specified explicitly here -->
+    </service>
+    <service name="Service2a" promote="ComponentD/Service3a">
+        <!-- bindings and/or interfaces may or may not be specified explicitly here -->
+    </service>
+
+    <component name="ComponentD">
+        <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentDImpl"/>
+        <service name="Service3">
+            <!-- bindings and/or interfaces may or may not be specified explicitly here
-->
+            <binding.ws />
+        </service>
+        <service name="Service3a">
+            <!-- bindings and/or interfaces may or may not be specified explicitly here
-->
+        </service>
+    </component>
+</composite>
+
+

Modified: tuscany/java/sca/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/BuilderTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/BuilderTestCase.java?rev=674100&r1=674099&r2=674100&view=diff
==============================================================================
--- tuscany/java/sca/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/BuilderTestCase.java
(original)
+++ tuscany/java/sca/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/BuilderTestCase.java
Fri Jul  4 10:27:55 2008
@@ -58,9 +58,34 @@
     }
 
     public void testScenario1() throws Exception {
+        System.out.println("====>Running testScenario1");
         customBuilder = new CustomCompositeBuilder();
-        customBuilder.loadContribution("src/main/resources/scenario1.composite", 
-                                       "TestContribution", "src/main/resources/");
+        customBuilder.loadContribution("src/main/resources/scenario1/scenario1.composite",

+                                       "TestContribution", "src/main/resources/scenario1/");
+        printResults();
+    }
+
+    public void testScenario2() throws Exception {
+        System.out.println("====>Running testScenario2");
+        customBuilder = new CustomCompositeBuilder();
+        customBuilder.loadContribution("src/main/resources/scenario2/scenario2.composite",

+                                       "TestContribution", "src/main/resources/scenario2/");
+        printResults();
+    }
+
+    public void testScenario3() throws Exception {
+        System.out.println("====>Running testScenario3");
+        customBuilder = new CustomCompositeBuilder();
+        customBuilder.loadContribution("src/main/resources/scenario3/scenario3.composite",

+                                       "TestContribution", "src/main/resources/scenario3/");
+        printResults();
+    }
+
+    public void testScenario4() throws Exception {
+        System.out.println("====>Running testScenario4");
+        customBuilder = new CustomCompositeBuilder();
+        customBuilder.loadContribution("src/main/resources/scenario4/scenario4.composite",

+                                       "TestContribution", "src/main/resources/scenario4/");
         printResults();
     }
 



Mime
View raw message