You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by wj...@apache.org on 2008/08/16 18:18:01 UTC

svn commit: r686519 [2/2] - in /tuscany/java/sca/modules: binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/ binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/reference/ binding-corba-runtime/src/...

Added: tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/ArraysUnionsServant.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/ArraysUnionsServant.java?rev=686519&view=auto
==============================================================================
--- tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/ArraysUnionsServant.java (added)
+++ tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/ArraysUnionsServant.java Sat Aug 16 09:18:00 2008
@@ -0,0 +1,37 @@
+/*
+ * 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.    
+ */
+
+package org.apache.tuscany.sca.binding.corba.testing.servants;
+
+import org.apache.tuscany.sca.binding.corba.testing.arrays_unions.TestStruct;
+import org.apache.tuscany.sca.binding.corba.testing.arrays_unions._ArraysUnionsTestsImplBase;
+
+public class ArraysUnionsServant extends _ArraysUnionsTestsImplBase {
+
+    private static final long serialVersionUID = 1L;
+
+    public TestStruct passTestStruct(TestStruct arg) {
+        return arg;
+    }
+
+    public String[][] passStringArray(String[][] arg) {
+        return arg;
+    }
+
+}

Added: tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/ArraysUnionsTuscanyServant.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/ArraysUnionsTuscanyServant.java?rev=686519&view=auto
==============================================================================
--- tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/ArraysUnionsTuscanyServant.java (added)
+++ tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/ArraysUnionsTuscanyServant.java Sat Aug 16 09:18:00 2008
@@ -0,0 +1,38 @@
+/*
+ * 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.    
+ */
+
+package org.apache.tuscany.sca.binding.corba.testing.servants;
+
+import org.apache.tuscany.sca.binding.corba.meta.CorbaArray;
+import org.apache.tuscany.sca.binding.corba.testing.hierarchy.ArraysTestStruct;
+
+public class ArraysUnionsTuscanyServant {
+
+    private static final long serialVersionUID = 1L;
+
+    public ArraysTestStruct passTestStruct(ArraysTestStruct arg) {
+        return arg;
+    }
+
+    @CorbaArray( {2, 2})
+    public String[][] passStringArray(@CorbaArray( {2, 2})String[][] arg) {
+        return arg;
+    }
+
+}

Added: tuscany/java/sca/modules/binding-corba-runtime/src/test/resources/arrays_unions.idl
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-corba-runtime/src/test/resources/arrays_unions.idl?rev=686519&view=auto
==============================================================================
--- tuscany/java/sca/modules/binding-corba-runtime/src/test/resources/arrays_unions.idl (added)
+++ tuscany/java/sca/modules/binding-corba-runtime/src/test/resources/arrays_unions.idl Sat Aug 16 09:18:00 2008
@@ -0,0 +1,55 @@
+/*
+ * 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.    
+ */
+
+/*
+ * compile by
+ * idlj -fall -oldImplBase arrays_unions.idl
+ */
+
+module org {
+	module apache {
+		module tuscany {
+			module sca {
+				module binding {
+					module corba {
+						module testing {
+							module arrays_unions {
+								
+								struct TestStruct {
+									string oneDimArray[2];
+									long twoDimArray[2][4];
+									float threeDimArray[2][4][2];
+								};
+								
+								typedef string StringArray[2][2];
+								
+								interface ArraysUnionsTests {
+									TestStruct passTestStruct(in TestStruct arg);
+									StringArray passStringArray(in StringArray arg);
+								};
+								
+							};
+						};
+					};
+				};
+			};
+		};
+	};
+};
+

Modified: tuscany/java/sca/modules/binding-corba-runtime/src/test/resources/enums.idl
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-corba-runtime/src/test/resources/enums.idl?rev=686519&r1=686518&r2=686519&view=diff
==============================================================================
--- tuscany/java/sca/modules/binding-corba-runtime/src/test/resources/enums.idl (original)
+++ tuscany/java/sca/modules/binding-corba-runtime/src/test/resources/enums.idl Sat Aug 16 09:18:00 2008
@@ -42,91 +42,3 @@
 		};
 	};
 };
-/*
- * 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.    
- */
-
-/*
- * compile by
- * idlj -fall -oldImplBase enums.idl
- */
-
-module org {
-	module apache {
-		module tuscany {
-			module sca {
-				module binding {
-					module corba {
-						module testing {
-							module enums {
-								enum Color {red, yellow, green};
-								interface EnumManager {
-									Color getColor(in Color color);		
-								};
-							};
-						};
-					};
-				};
-			};
-		};
-	};
-};
-/*
- * 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.    
- */
-
-/*
- * compile by
- * idlj -fall -oldImplBase enums.idl
- */
-
-module org {
-	module apache {
-		module tuscany {
-			module sca {
-				module binding {
-					module corba {
-						module testing {
-							module enums {
-								enum Color {red, yellow, green};
-								interface EnumManager {
-									Color getColor(in Color color);		
-								};
-							};
-						};
-					};
-				};
-			};
-		};
-	};
-};

Modified: tuscany/java/sca/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAInvocationProxy.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAInvocationProxy.java?rev=686519&r1=686518&r2=686519&view=diff
==============================================================================
--- tuscany/java/sca/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAInvocationProxy.java (original)
+++ tuscany/java/sca/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAInvocationProxy.java Sat Aug 16 09:18:00 2008
@@ -56,9 +56,9 @@
         this.messageFactory = messageFactory;
         try {
             List<TypeTree> inputType = new ArrayList<TypeTree>();
-            inputType.add(TypeTreeCreator.createTypeTree(String.class));
+            inputType.add(TypeTreeCreator.createTypeTree(String.class, null));
             types.setInputType(inputType);
-            types.setOutputType(TypeTreeCreator.createTypeTree(String.class));
+            types.setOutputType(TypeTreeCreator.createTypeTree(String.class, null));
         } catch (RequestConfigurationException e) {
             // ignore - string type should not cause this exception
         }