tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jsdelf...@apache.org
Subject svn commit: r526473 - in /incubator/tuscany/java/sca/modules/assembly-xml/src/test: java/org/apache/tuscany/assembly/xml/ resources/ resources/org/ resources/org/apache/ resources/org/apache/tuscany/ resources/org/apache/tuscany/assembly/ resources/org...
Date Sat, 07 Apr 2007 19:13:16 GMT
Author: jsdelfino
Date: Sat Apr  7 12:13:15 2007
New Revision: 526473

URL: http://svn.apache.org/viewvc?view=rev&rev=526473
Log:
Cleaned up test cases, moved SCA assembly XML files to the same package as the test case.

Added:
    incubator/tuscany/java/sca/modules/assembly-xml/src/test/resources/org/
    incubator/tuscany/java/sca/modules/assembly-xml/src/test/resources/org/apache/
    incubator/tuscany/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/
    incubator/tuscany/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/assembly/
    incubator/tuscany/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/assembly/xml/
    incubator/tuscany/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/assembly/xml/Calculator.composite
  (with props)
    incubator/tuscany/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/assembly/xml/CalculatorComponent.constrainingType
    incubator/tuscany/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/assembly/xml/CalculatorImpl.componentType
  (with props)
    incubator/tuscany/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/assembly/xml/TestAllCalculator.composite
  (with props)
    incubator/tuscany/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/assembly/xml/TestAllDivide.composite
  (with props)
Removed:
    incubator/tuscany/java/sca/modules/assembly-xml/src/test/resources/Calculator.composite
    incubator/tuscany/java/sca/modules/assembly-xml/src/test/resources/CalculatorComponent.constrainingType
    incubator/tuscany/java/sca/modules/assembly-xml/src/test/resources/CalculatorImpl.componentType
    incubator/tuscany/java/sca/modules/assembly-xml/src/test/resources/TestAllCalculator.composite
    incubator/tuscany/java/sca/modules/assembly-xml/src/test/resources/TestAllDivide.composite
Modified:
    incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/OptimizeTestCase.java
    incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/ReadAllTestCase.java
    incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/ReadDocumentTestCase.java
    incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/ReadTestCase.java
    incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/ResolveTestCase.java
    incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/StAXPerfTest.java
    incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/WriteAllTestCase.java

Modified: incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/OptimizeTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/OptimizeTestCase.java?view=diff&rev=526473&r1=526472&r2=526473
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/OptimizeTestCase.java
(original)
+++ incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/OptimizeTestCase.java
Sat Apr  7 12:13:15 2007
@@ -56,7 +56,7 @@
     public void testResolveConstrainingType() throws Exception {
         DefaultArtifactResolver resolver = new DefaultArtifactResolver();
         
-        InputStream is = getClass().getClassLoader().getResourceAsStream("CalculatorComponent.constrainingType");
+        InputStream is = getClass().getResourceAsStream("CalculatorComponent.constrainingType");
         ConstrainingTypeProcessor constrainingTypeReader = new ConstrainingTypeProcessor(registry);
         XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
         ConstrainingType constrainingType = constrainingTypeReader.read(reader);
@@ -64,7 +64,7 @@
         assertNotNull(constrainingType);
         resolver.put(constrainingType, constrainingType);
 
-        is = getClass().getClassLoader().getResourceAsStream("TestAllCalculator.composite");
+        is = getClass().getResourceAsStream("TestAllCalculator.composite");
         CompositeProcessor compositeReader = new CompositeProcessor(registry);
         reader = inputFactory.createXMLStreamReader(is);
         Composite composite = compositeReader.read(reader);
@@ -81,7 +81,7 @@
     public void testResolveComposite() throws Exception {
         DefaultArtifactResolver resolver = new DefaultArtifactResolver();
         
-        InputStream is = getClass().getClassLoader().getResourceAsStream("Calculator.composite");
+        InputStream is = getClass().getResourceAsStream("Calculator.composite");
         CompositeProcessor compositeReader = new CompositeProcessor(registry);
         XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
         Composite nestedComposite = compositeReader.read(reader);
@@ -89,7 +89,7 @@
         assertNotNull(nestedComposite);
         resolver.put(nestedComposite, nestedComposite);
 
-        is = getClass().getClassLoader().getResourceAsStream("TestAllCalculator.composite");
+        is = getClass().getResourceAsStream("TestAllCalculator.composite");
         compositeReader = new CompositeProcessor(registry);
         reader = inputFactory.createXMLStreamReader(is);
         Composite composite = compositeReader.read(reader);

Modified: incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/ReadAllTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/ReadAllTestCase.java?view=diff&rev=526473&r1=526472&r2=526473
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/ReadAllTestCase.java
(original)
+++ incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/ReadAllTestCase.java
Sat Apr  7 12:13:15 2007
@@ -63,7 +63,7 @@
     }
 
     public void testReadComposite() throws Exception {
-        InputStream is = getClass().getClassLoader().getResourceAsStream("TestAllCalculator.composite");
+        InputStream is = getClass().getResourceAsStream("TestAllCalculator.composite");
         Composite composite = registry.read(is, Composite.class);
         assertNotNull(composite);
         assertEquals(composite.getName(), new QName("http://calc", "TestAllCalculator"));
@@ -150,12 +150,12 @@
     public void testReadCompositeAndWireIt() throws Exception {
         DefaultArtifactResolver resolver = new DefaultArtifactResolver();
 
-        InputStream is = getClass().getClassLoader().getResourceAsStream("TestAllDivide.composite");
+        InputStream is = getClass().getResourceAsStream("TestAllDivide.composite");
         Composite included = registry.read(is, Composite.class);
         assertNotNull(included);
         resolver.put(included, included);
         
-        is = getClass().getClassLoader().getResourceAsStream("TestAllCalculator.composite");
+        is = getClass().getResourceAsStream("TestAllCalculator.composite");
         Composite composite = registry.read(is, Composite.class);
         assertNotNull(composite);
         registry.resolve(composite, resolver);

Modified: incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/ReadDocumentTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/ReadDocumentTestCase.java?view=diff&rev=526473&r1=526472&r2=526473
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/ReadDocumentTestCase.java
(original)
+++ incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/ReadDocumentTestCase.java
Sat Apr  7 12:13:15 2007
@@ -66,12 +66,12 @@
     public void testResolveConstrainingType() throws Exception {
         DefaultArtifactResolver resolver = new DefaultArtifactResolver();
         
-        URL url = getClass().getClassLoader().getResource("CalculatorComponent.constrainingType");
+        URL url = getClass().getResource("CalculatorComponent.constrainingType");
         ConstrainingType constrainingType = (ConstrainingType)registry.read(url);
         assertNotNull(constrainingType);
         resolver.put(constrainingType, constrainingType);
 
-        url = getClass().getClassLoader().getResource("TestAllCalculator.composite");
+        url = getClass().getResource("TestAllCalculator.composite");
         Composite composite = (Composite)registry.read(url);
         assertNotNull(composite);
         
@@ -84,12 +84,12 @@
     public void testResolveComposite() throws Exception {
         DefaultArtifactResolver resolver = new DefaultArtifactResolver();
         
-        URL url = getClass().getClassLoader().getResource("Calculator.composite");
+        URL url = getClass().getResource("Calculator.composite");
         Composite nestedComposite = (Composite)registry.read(url);
         assertNotNull(nestedComposite);
         resolver.put(nestedComposite, nestedComposite);
 
-        url = getClass().getClassLoader().getResource("TestAllCalculator.composite");
+        url = getClass().getResource("TestAllCalculator.composite");
         Composite composite = (Composite)registry.read(url);
         
         registry.resolve(composite, resolver);

Modified: incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/ReadTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/ReadTestCase.java?view=diff&rev=526473&r1=526472&r2=526473
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/ReadTestCase.java
(original)
+++ incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/ReadTestCase.java
Sat Apr  7 12:13:15 2007
@@ -53,14 +53,14 @@
 
     public void testReadComponentType() throws Exception {
         ComponentTypeProcessor componentTypeReader = new ComponentTypeProcessor(registry);
-        InputStream is = getClass().getClassLoader().getResourceAsStream("CalculatorImpl.componentType");
+        InputStream is = getClass().getResourceAsStream("CalculatorImpl.componentType");
         XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
         assertNotNull(componentTypeReader.read(reader));
         is.close();
     }
 
     public void testReadConstrainingType() throws Exception {
-        InputStream is = getClass().getClassLoader().getResourceAsStream("CalculatorComponent.constrainingType");
+        InputStream is = getClass().getResourceAsStream("CalculatorComponent.constrainingType");
         ConstrainingTypeProcessor constrainingTypeReader = new ConstrainingTypeProcessor(registry);
         XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
         assertNotNull(constrainingTypeReader.read(reader));
@@ -69,7 +69,7 @@
     }
 
     public void testReadComposite() throws Exception {
-        InputStream is = getClass().getClassLoader().getResourceAsStream("Calculator.composite");
+        InputStream is = getClass().getResourceAsStream("Calculator.composite");
         CompositeProcessor compositeReader = new CompositeProcessor(registry);
         XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
         assertNotNull(compositeReader.read(reader));
@@ -78,7 +78,7 @@
     }
 
     public void testReadCompositeAndWireIt() throws Exception {
-        InputStream is = getClass().getClassLoader().getResourceAsStream("Calculator.composite");
+        InputStream is = getClass().getResourceAsStream("Calculator.composite");
         CompositeProcessor compositeReader = new CompositeProcessor(registry);
         XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
         assertNotNull(compositeReader.read(reader));

Modified: incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/ResolveTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/ResolveTestCase.java?view=diff&rev=526473&r1=526472&r2=526473
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/ResolveTestCase.java
(original)
+++ incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/ResolveTestCase.java
Sat Apr  7 12:13:15 2007
@@ -56,7 +56,7 @@
     public void testResolveConstrainingType() throws Exception {
         DefaultArtifactResolver resolver = new DefaultArtifactResolver();
         
-        InputStream is = getClass().getClassLoader().getResourceAsStream("CalculatorComponent.constrainingType");
+        InputStream is = getClass().getResourceAsStream("CalculatorComponent.constrainingType");
         ConstrainingTypeProcessor constrainingTypeReader = new ConstrainingTypeProcessor(registry);
         XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
         ConstrainingType constrainingType = constrainingTypeReader.read(reader);
@@ -64,7 +64,7 @@
         assertNotNull(constrainingType);
         resolver.put(constrainingType, constrainingType);
 
-        is = getClass().getClassLoader().getResourceAsStream("TestAllCalculator.composite");
+        is = getClass().getResourceAsStream("TestAllCalculator.composite");
         CompositeProcessor compositeReader = new CompositeProcessor(registry);
         reader = inputFactory.createXMLStreamReader(is);
         Composite composite = compositeReader.read(reader);
@@ -80,7 +80,7 @@
     public void testResolveComposite() throws Exception {
         DefaultArtifactResolver resolver = new DefaultArtifactResolver();
         
-        InputStream is = getClass().getClassLoader().getResourceAsStream("Calculator.composite");
+        InputStream is = getClass().getResourceAsStream("Calculator.composite");
         CompositeProcessor compositeReader = new CompositeProcessor(registry);
         XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
         Composite nestedComposite = compositeReader.read(reader);
@@ -88,7 +88,7 @@
         assertNotNull(nestedComposite);
         resolver.put(nestedComposite, nestedComposite);
 
-        is = getClass().getClassLoader().getResourceAsStream("TestAllCalculator.composite");
+        is = getClass().getResourceAsStream("TestAllCalculator.composite");
         compositeReader = new CompositeProcessor(registry);
         reader = inputFactory.createXMLStreamReader(is);
         Composite composite = compositeReader.read(reader);

Modified: incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/StAXPerfTest.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/StAXPerfTest.java?view=diff&rev=526473&r1=526472&r2=526473
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/StAXPerfTest.java
(original)
+++ incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/StAXPerfTest.java
Sat Apr  7 12:13:15 2007
@@ -82,7 +82,7 @@
     }
 
     public void testReadComposite() throws Exception {
-        InputStream is = getClass().getClassLoader().getResourceAsStream("TestAllCalculator.composite");
+        InputStream is = getClass().getResourceAsStream("TestAllCalculator.composite");
         CompositeProcessor loader = new CompositeProcessor(assemblyFactory, policyFactory,
registry);
         XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
 

Modified: incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/WriteAllTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/WriteAllTestCase.java?view=diff&rev=526473&r1=526472&r2=526473
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/WriteAllTestCase.java
(original)
+++ incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/WriteAllTestCase.java
Sat Apr  7 12:13:15 2007
@@ -52,13 +52,13 @@
     }
 
     public void testReadWriteComposite() throws Exception {
-        InputStream is = getClass().getClassLoader().getResourceAsStream("TestAllCalculator.composite");
+        InputStream is = getClass().getResourceAsStream("TestAllCalculator.composite");
         Composite composite = registry.read(is, Composite.class);
         registry.write(composite, System.out);
     }
 
     public void testReadWireWriteComposite() throws Exception {
-        InputStream is = getClass().getClassLoader().getResourceAsStream("TestAllCalculator.composite");
+        InputStream is = getClass().getResourceAsStream("TestAllCalculator.composite");
         Composite composite = registry.read(is, Composite.class);
         registry.resolve(composite, new DefaultArtifactResolver());
         registry.wire(composite);
@@ -66,7 +66,7 @@
     }
     
     public void testReadWriteComponentType() throws Exception {
-        InputStream is = getClass().getClassLoader().getResourceAsStream("CalculatorImpl.componentType");
+        InputStream is = getClass().getResourceAsStream("CalculatorImpl.componentType");
         ComponentType componentType = registry.read(is, ComponentType.class);
         registry.resolve(componentType, new DefaultArtifactResolver());
         registry.wire(componentType);
@@ -74,7 +74,7 @@
     }
 
     public void testReadWriteConstrainingType() throws Exception {
-        InputStream is = getClass().getClassLoader().getResourceAsStream("CalculatorComponent.constrainingType");
+        InputStream is = getClass().getResourceAsStream("CalculatorComponent.constrainingType");
         ConstrainingType constrainingType = registry.read(is, ConstrainingType.class);
         registry.resolve(constrainingType, new DefaultArtifactResolver());
         registry.wire(constrainingType);

Added: incubator/tuscany/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/assembly/xml/Calculator.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/assembly/xml/Calculator.composite?view=auto&rev=526473
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/assembly/xml/Calculator.composite
(added)
+++ incubator/tuscany/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/assembly/xml/Calculator.composite
Sat Apr  7 12:13:15 2007
@@ -0,0 +1,53 @@
+<?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.    
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+	xmlns:calc="http://calc"
+	targetNamespace="http://calc"
+	name="Calculator">
+
+    <service name="CalculatorService" promote="CalculatorServiceComponent">
+        <interface.java interface="calculator.CalculatorService"/>
+    </service>
+
+    <component name="CalculatorServiceComponent">
+		<implementation.java class="calculator.CalculatorServiceImpl"/>
+        <reference name="addService" target="AddServiceComponent"/>
+        <reference name="subtractService" target="SubtractServiceComponent"/>
+        <reference name="multiplyService" target="MultiplyServiceComponent"/>
+        <reference name="divideService" target="DivideServiceComponent"/>
+    </component>
+
+    <component name="AddServiceComponent">
+        <implementation.java class="calculator.AddServiceImpl"/>
+    </component>
+
+    <component name="SubtractServiceComponent">
+        <implementation.java class="calculator.SubtractServiceImpl"/>
+    </component>
+
+    <component name="MultiplyServiceComponent">
+        <implementation.java class="calculator.MultiplyServiceImpl"/>
+    </component>
+
+    <component name="DivideServiceComponent">
+        <implementation.java class="calculator.DivideServiceImpl"/>
+    </component>
+
+</composite>

Propchange: incubator/tuscany/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/assembly/xml/Calculator.composite
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: incubator/tuscany/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/assembly/xml/CalculatorComponent.constrainingType
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/assembly/xml/CalculatorComponent.constrainingType?view=auto&rev=526473
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/assembly/xml/CalculatorComponent.constrainingType
(added)
+++ incubator/tuscany/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/assembly/xml/CalculatorComponent.constrainingType
Sat Apr  7 12:13:15 2007
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="ASCII"?>
+<!--
+ * 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.
+-->
+<constrainingType xmlns="http://www.osoa.org/xmlns/sca/1.0"
+	xmlns:calc="http://calc"
+	targetNamespace="http://calc"
+	name="CalculatorComponent">
+
+  <service name="CalculatorService">
+        <interface.java class="calculator.CalculatorService" />
+  </service>
+
+  <reference name="divideService">
+        <interface.java class="calculator.DivideService" />
+  </reference>  
+
+</constrainingType>              
+       
\ No newline at end of file

Added: incubator/tuscany/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/assembly/xml/CalculatorImpl.componentType
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/assembly/xml/CalculatorImpl.componentType?view=auto&rev=526473
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/assembly/xml/CalculatorImpl.componentType
(added)
+++ incubator/tuscany/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/assembly/xml/CalculatorImpl.componentType
Sat Apr  7 12:13:15 2007
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="ASCII"?>
+<!--
+ * 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.
+-->
+<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">
+
+  <service name="CalculatorService">
+        <interface.java class="calculator.CalculatorService" />
+  </service>
+
+  <reference name="divideService">
+        <interface.java class="calculator.DivideService" />
+  </reference>  
+
+</componentType>              
+       
\ No newline at end of file

Propchange: incubator/tuscany/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/assembly/xml/CalculatorImpl.componentType
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/assembly/xml/CalculatorImpl.componentType
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: incubator/tuscany/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/assembly/xml/TestAllCalculator.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/assembly/xml/TestAllCalculator.composite?view=auto&rev=526473
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/assembly/xml/TestAllCalculator.composite
(added)
+++ incubator/tuscany/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/assembly/xml/TestAllCalculator.composite
Sat Apr  7 12:13:15 2007
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<composite autowire="false" constrainingType="tns:CalculatorComponent" local="true" name="TestAllCalculator"
policySets="sns:secure"
+    requires="cns:confidentiality" targetNamespace="http://calc" xmlns:tns="http://calc"
+    xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.osoa.org/xmlns/sca/1.0 http://www.osoa.org/xmlns/sca/1.0
"
+    xmlns:cns="http://test/confidentiality" xmlns:sns="http://test/secure">
+
+    <include>tns:TestAllDivide</include>
+
+    <service name="CalculatorService" promote="CalculatorServiceComponent/CalculatorService"
requires="cns:confidentiality"
+        policySets="sns:secure">
+        <interface.java interface="calculator.CalculatorService" callbackInterface="calculator.CalculatorCallback"
/>
+        <operation name="add" policySets="sns:secure" requires="cns:confidentiality" />
+
+        <binding.ws name="CalculatorWS" policySets="sns:secure" port="" requires="cns:confidentiality"
uri="http://calc/ws">
+            <operation name="add" policySets="sns:secure" requires="cns:confidentiality"
/>
+        </binding.ws>
+
+        <callback policySets="sns:secure" requires="cns:confidentiality">
+            <binding.ws name="CalculatorCallbackWS" policySets="" port="" requires=""
uri="http://calc/callback/ws">
+                <operation name="addCallback" policySets="sns:secure" requires="cns:confidentiality"
/>
+            </binding.ws>
+        </callback>
+    </service>
+
+    <component name="CalculatorServiceComponent" autowire="false" constrainingType="tns:CalculatorComponent"
+        policySets="sns:secure" requires="cns:confidentiality">
+        <service name="CalculatorService" policySets="sns:secure" requires="cns:confidentiality">
+            <interface.java interface="calculator.CalculatorService" callbackInterface="calculator.CalculatorCallback"
/>
+        </service>
+
+        <reference name="addService" target="AddServiceComponent/AddService" autowire="false"
multiplicity="1..1"
+            policySets="sns:secure" requires="cns:confidentiality" wiredByImpl="false">
+            <interface.java interface="calculator.AddService" callbackInterface="calculator.AddCallback"
/>
+        </reference>
+        <reference name="subtractService" target="SubtractServiceComponent" />
+        <reference name="multiplyService" />
+        <reference name="divideService" target="DivideServiceComponent" />
+
+        <property name="round" type="xsd:boolean" many="false">true</property>
+
+        <implementation.java class="calculator.CalculatorServiceImpl" policySets="" requires=""
/>
+    </component>
+
+    <component name="AddServiceComponent">
+        <service name="AddService">
+            <interface.java interface="calculator.AddService" />
+        </service>
+        <implementation.java class="calculator.AddServiceImpl" />
+    </component>
+
+    <component name="NestedCompositeComponent">
+        <service name="CalculatorService">
+            <interface.java interface="calculator.CalculatorService" />
+        </service>
+        <implementation.composite name="tns:Calculator" />
+    </component>
+
+    <component name="SubtractServiceComponent">
+        <implementation.java class="calculator.SubtractServiceImpl" />
+    </component>
+
+    <component name="MultiplyServiceComponent">
+        <implementation.java class="calculator.MultiplyServiceImpl" />
+    </component>
+
+    <component name="DivideServiceComponent">
+        <implementation.java class="calculator.DivideServiceImpl" />
+    </component>
+
+    <reference name="MultiplyService" promote="CalculatorServiceComponent/multiplyService"
policySets="sns:secure"
+        requires="cns:confidentiality">
+        <interface.java interface="calculator.MultiplyService" callbackInterface="calculator.MultiplyCallback"
/>
+        <operation name="multiply" policySets="sns:secure" requires="cns:confidentiality"
/>
+
+        <binding.ws name="MultiplyWS" port="" policySets="sns:secure" requires="cns:confidentiality"
uri="http://calc/ws">
+            <operation name="multiply" policySets="sns:secure" requires="cns:confidentiality"
/>
+        </binding.ws>
+
+        <callback policySets="sns:secure" requires="cns:confidentiality">
+            <binding.ws name="MultiplyCallbackWS" port="" uri="http://calc/callback/ws"
policySets="sns:secure"
+                requires="cns:confidentiality">
+                <operation name="multiplyCallback" policySets="sns:secure" requires="cns:confidentiality"
/>
+            </binding.ws>
+        </callback>
+    </reference>
+
+    <property name="prop1" xmlns:foo="http://foo">
+        <MyComplexPropertyValue1 xsi:type="foo:MyComplexType" attr="bar">
+            <foo:a>AValue</foo:a>
+            <bar:b xmlns:bar="http://bar">InterestingURI</bar:b>
+        </MyComplexPropertyValue1>
+        <MyComplexPropertyValue2 xsi:type="foo:MyComplexType" attr="zing">
+            <foo:a>BValue</foo:a>
+            <bar:b xmlns:bar="http://bar">BoringURI</bar:b>
+        </MyComplexPropertyValue2>
+    </property>
+
+</composite>

Propchange: incubator/tuscany/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/assembly/xml/TestAllCalculator.composite
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: incubator/tuscany/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/assembly/xml/TestAllDivide.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/assembly/xml/TestAllDivide.composite?view=auto&rev=526473
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/assembly/xml/TestAllDivide.composite
(added)
+++ incubator/tuscany/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/assembly/xml/TestAllDivide.composite
Sat Apr  7 12:13:15 2007
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<composite autowire="false"
+	constrainingType="tns:Calculator"
+	local="true"
+	name="TestAllDivide"
+	policySets="" requires=""
+	targetNamespace="http://calc"
+	xmlns:tns="http://calc"
+	xmlns="http://www.osoa.org/xmlns/sca/1.0"
+	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://www.osoa.org/xmlns/sca/1.0 http://www.osoa.org/xmlns/sca/1.0
">
+	
+  <include>tns:CompleteDivide</include>
+  
+  <service name="DivideService" policySets="" promote="CalculatorDivideComponent/DivideService"
requires="">
+    <interface.java interface="calculator.DivideService" callbackInterface="calculator.DivideCallback"/>
+    <operation name="divide" policySets="" requires=""/>
+
+    <binding.ws name="CalculatorWS" policySets="" port="" requires="" uri="http://calc/ws">
+      <operation name="divide" policySets="" requires=""/>
+    </binding.ws>
+
+    <callback policySets="" requires="">
+      <binding.ws name="CalculatorCallbackWS" policySets="" port="" requires="" uri="http://calc/callback/ws">
+        <operation name="divideCallback" policySets="" requires=""/>
+      </binding.ws>
+    </callback>
+  </service>
+  
+   <component name="CalculatorDivideComponent" autowire="false" constrainingType="tns:CalculatorServiceComponent"
policySets="" requires="">
+   		<service name="DivideService" policySets="" requires="">
+   			<interface.java interface="calculator.DivideService" callbackInterface="calculator.DivideCallback"/>
+   		</service>
+		<implementation.java class="calculator.DivideImpl" policySets="" requires=""/>
+   </component>
+
+</composite>

Propchange: incubator/tuscany/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/assembly/xml/TestAllDivide.composite
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/assembly/xml/TestAllDivide.composite
------------------------------------------------------------------------------
    svn:keywords = Rev Date



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org


Mime
View raw message