From 7f87032072bad92962601c8f9ece5f71b2d4a1ef Mon Sep 17 00:00:00 2001
From: rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68>
Date: Fri, 18 Jul 2008 18:29:28 +0000
Subject: Apply the patch from Wojtek for TUSCANY-2397
 (operations-mapping-jira-2357-15-july.patch)

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@677993 13f79535-47bb-0310-9956-ffa450edef68
---
 .../src/test/resources/ScenarioThree.composite     | 43 ++++++++++++++++++++++
 .../corba/src/test/resources/ScenarioTwo.composite | 43 ++++++++++++++++++++++
 .../corba/src/test/resources/itest_scenario.idl    | 10 +++++
 3 files changed, 96 insertions(+)
 create mode 100644 java/sca/itest/corba/src/test/resources/ScenarioThree.composite
 create mode 100644 java/sca/itest/corba/src/test/resources/ScenarioTwo.composite

(limited to 'java/sca/itest/corba/src/test/resources')

diff --git a/java/sca/itest/corba/src/test/resources/ScenarioThree.composite b/java/sca/itest/corba/src/test/resources/ScenarioThree.composite
new file mode 100644
index 0000000000..f43e4a3f7a
--- /dev/null
+++ b/java/sca/itest/corba/src/test/resources/ScenarioThree.composite
@@ -0,0 +1,43 @@
+<!--
+ * 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:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
+           targetNamespace="http://sample"
+           xmlns:sample="http://sample"
+           name="Corba">
+    
+    <!-- note that some binding configuration (like port or host name) is also used in JUnit test class -->
+    
+    <component name="ScenarioThreeService">
+    	<implementation.java class="org.apache.tuscany.sca.test.corba.types.TScenarioThreeServant" />
+    </component>
+    <service name="ScenarioThreeServiceTuscany" promote="ScenarioThreeService">
+    	<interface.java interface="org.apache.tuscany.sca.test.corba.types.TScenarioThree"/>
+        <tuscany:binding.corba uri="corbaname::localhost:5060#ScenarioThree"/>
+    </service>
+        
+    <component name="ScenarioThreeReference">
+        <implementation.java class="org.apache.tuscany.sca.test.corba.types.TScenarioThreeComponent" />
+        <reference name="scenarioThree">
+			<tuscany:binding.corba uri="corbaname::localhost:5060#ScenarioThree"/>        
+        </reference>
+    </component>
+    
+</composite>
diff --git a/java/sca/itest/corba/src/test/resources/ScenarioTwo.composite b/java/sca/itest/corba/src/test/resources/ScenarioTwo.composite
new file mode 100644
index 0000000000..dc5ddc50d3
--- /dev/null
+++ b/java/sca/itest/corba/src/test/resources/ScenarioTwo.composite
@@ -0,0 +1,43 @@
+<!--
+ * 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:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
+           targetNamespace="http://sample"
+           xmlns:sample="http://sample"
+           name="Corba">
+    
+    <!-- note that some binding configuration (like port or host name) is also used in JUnit test class -->
+    
+    <component name="ScenarioTwoService">
+        <implementation.java class="org.apache.tuscany.sca.test.corba.types.TScenarioTwoServant" />
+    </component>
+	<service name="ScenarioTwoServiceTuscany" promote="ScenarioTwoService">
+    	<interface.java interface="org.apache.tuscany.sca.test.corba.types.TScenarioTwo"/>
+        <tuscany:binding.corba uri="corbaname::localhost:5060#ScenarioTwo" id="IDL:org/apache/tuscany/sca/test/corba/generated/ScenarioTwo:1.0"/>
+    </service>
+    
+    <component name="ScenarioTwo">
+        <implementation.java class="org.apache.tuscany.sca.test.corba.types.TScenarioTwoComponent" />
+        <reference name="scenarioTwo">
+			<tuscany:binding.corba uri="corbaname::localhost:5060#ScenarioTwoGenerated"/>        
+        </reference>
+    </component>
+    
+</composite>
diff --git a/java/sca/itest/corba/src/test/resources/itest_scenario.idl b/java/sca/itest/corba/src/test/resources/itest_scenario.idl
index fc806efb54..f38f49ceab 100644
--- a/java/sca/itest/corba/src/test/resources/itest_scenario.idl
+++ b/java/sca/itest/corba/src/test/resources/itest_scenario.idl
@@ -30,6 +30,8 @@ module org {
 					module corba {
 						module generated { 
 						
+							// objects for ScenarioOne
+						
 							enum Color {red, yellow, green};
 							
 							typedef sequence<string> StringSequence;
@@ -62,6 +64,14 @@ module org {
 								RichStruct setRichStruct(in RichStruct richStruct) raises (WrongColor, UnexpectedException);
 							
 							};
+							
+							// objects for ScenarioTwo
+							
+							interface ScenarioTwo {
+								
+								attribute string stringField;
+								
+							};
 						};
 					};
 				};
-- 
cgit v1.2.3