You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2008/06/23 21:07:33 UTC
svn commit: r670714 [1/3] - in
/tuscany/java/sca/modules/binding-corba-runtime/src:
main/java/org/apache/tuscany/sca/binding/corba/impl/reference/
main/java/org/apache/tuscany/sca/binding/corba/impl/service/
main/java/org/apache/tuscany/sca/binding/cor...
Author: rfeng
Date: Mon Jun 23 12:07:31 2008
New Revision: 670714
URL: http://svn.apache.org/viewvc?rev=670714&view=rev
Log:
Apply the patch from Wojtek for TUSCANY-2357 (service-api-tests-jira-2357-23-june-2008-patch). Thanks.
Added:
tuscany/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/service/
tuscany/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/service/DynaCorbaServant.java (with props)
tuscany/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/Utils.java (with props)
tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/CorbaServantTestCase.java (with props)
tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/NonCorbaException.java (with props)
tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/InvalidTestObjectServant.java (with props)
tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/NonCorbaServant.java (with props)
tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/
tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/
tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestDataType.java (with props)
tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestInterface.java (with props)
tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestInterfaceContract.java (with props)
tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestOperation.java (with props)
tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestRuntimeComponentService.java (with props)
tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestRuntimeWire.java (with props)
Modified:
tuscany/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/reference/DynaCorbaRequest.java
tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/CorbaTypesTestCase.java
tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/TestConstants.java
tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetter.java
tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterHelper.java
tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterHolder.java
tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterOperations.java
tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetter.java
tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterHelper.java
tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterHolder.java
tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterOperations.java
tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObject.java
tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectHelper.java
tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectHolder.java
tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectOperations.java
tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStruct.java
tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStructHelper.java
tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStructHolder.java
tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SomeStruct.java
tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SomeStructHelper.java
tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SomeStructHolder.java
tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObject.java
tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectHelper.java
tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectHolder.java
tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectOperations.java
tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_ArraysSetterImplBase.java
tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_ArraysSetterStub.java
tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_PrimitivesSetterImplBase.java
tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_PrimitivesSetterStub.java
tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_RemoteObjectImplBase.java
tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_RemoteObjectStub.java
tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_TestObjectImplBase.java
tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_TestObjectStub.java
tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/boolean_listHelper.java
tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/boolean_listHolder.java
tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/char_listHelper.java
tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/char_listHolder.java
tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/double_listHelper.java
tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/double_listHolder.java
tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/float_listHelper.java
tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/float_listHolder.java
tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_listHelper.java
tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_listHolder.java
tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_long_listHelper.java
tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_long_listHolder.java
tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq1Helper.java
tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq1Holder.java
tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq2Helper.java
tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq2Holder.java
tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq3Helper.java
tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq3Holder.java
tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/octet_listHelper.java
tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/octet_listHolder.java
tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/remote_object_listHelper.java
tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/remote_object_listHolder.java
tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/short_listHelper.java
tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/short_listHolder.java
tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/string_listHelper.java
tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/string_listHolder.java
tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_listHelper.java
tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_listHolder.java
tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_long_listHelper.java
tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_long_listHolder.java
tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_short_listHelper.java
tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_short_listHolder.java
tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wchar_listHelper.java
tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wchar_listHolder.java
tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wstring_listHelper.java
tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wstring_listHolder.java
tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/TestObjectServant.java
tuscany/java/sca/modules/binding-corba-runtime/src/test/resources/general_tests.idl
Modified: tuscany/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/reference/DynaCorbaRequest.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/reference/DynaCorbaRequest.java?rev=670714&r1=670713&r2=670714&view=diff
==============================================================================
--- tuscany/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/reference/DynaCorbaRequest.java (original)
+++ tuscany/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/reference/DynaCorbaRequest.java Mon Jun 23 12:07:31 2008
@@ -27,6 +27,7 @@
import org.apache.tuscany.sca.binding.corba.impl.types.TypeTree;
import org.apache.tuscany.sca.binding.corba.impl.types.TypeTreeCreator;
import org.apache.tuscany.sca.binding.corba.impl.types.util.TypeHelpersProxy;
+import org.apache.tuscany.sca.binding.corba.impl.types.util.Utils;
import org.omg.CORBA.BAD_OPERATION;
import org.omg.CORBA.Object;
import org.omg.CORBA.SystemException;
@@ -82,17 +83,6 @@
returnTree = TypeTreeCreator.createTypeTree(forClass);
}
- private String getExceptionId(Class<?> forClass) {
- String result = forClass.getName().replace('.', '/');
- result = result.replaceAll("Package", "");
- if (result.endsWith("Exception")) {
- result = result
- .substring(0, result.length() - "Exception".length());
- }
- result = "IDL:" + result + ":1.0";
- return result;
- }
-
/**
* Configures possible exceptions
*
@@ -101,7 +91,7 @@
public void addExceptionType(Class<?> forClass)
throws RequestConfigurationException {
TypeTree tree = TypeTreeCreator.createTypeTree(forClass);
- String exceptionId = getExceptionId(forClass);
+ String exceptionId = Utils.getExceptionId(forClass);
exceptions.put(exceptionId, tree);
}
Added: tuscany/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/service/DynaCorbaServant.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/service/DynaCorbaServant.java?rev=670714&view=auto
==============================================================================
--- tuscany/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/service/DynaCorbaServant.java (added)
+++ tuscany/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/service/DynaCorbaServant.java Mon Jun 23 12:07:31 2008
@@ -0,0 +1,143 @@
+/*
+ * 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.impl.service;
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.tuscany.sca.assembly.Binding;
+import org.apache.tuscany.sca.binding.corba.impl.exceptions.RequestConfigurationException;
+import org.apache.tuscany.sca.binding.corba.impl.types.TypeTree;
+import org.apache.tuscany.sca.binding.corba.impl.types.TypeTreeCreator;
+import org.apache.tuscany.sca.binding.corba.impl.types.util.TypeHelpersProxy;
+import org.apache.tuscany.sca.binding.corba.impl.types.util.Utils;
+import org.apache.tuscany.sca.interfacedef.DataType;
+import org.apache.tuscany.sca.interfacedef.Operation;
+import org.apache.tuscany.sca.runtime.RuntimeComponentService;
+import org.omg.CORBA.portable.InputStream;
+import org.omg.CORBA.portable.InvokeHandler;
+import org.omg.CORBA.portable.ObjectImpl;
+import org.omg.CORBA.portable.OutputStream;
+import org.omg.CORBA.portable.ResponseHandler;
+
+/**
+ * General servant which provides target component implementation via CORBA
+ */
+public class DynaCorbaServant extends ObjectImpl implements InvokeHandler {
+
+ private static String[] DEFAULT_IDS = { "IDL:default:1.0" };
+ private RuntimeComponentService service;
+ private Binding binding;
+ private String[] ids = DEFAULT_IDS;
+
+ public DynaCorbaServant(RuntimeComponentService service, Binding binding) {
+ this.service = service;
+ this.binding = binding;
+ }
+
+ public void setIds(String[] ids) {
+ if (ids != null) {
+ this.ids = ids;
+ } else {
+ this.ids = DEFAULT_IDS;
+ }
+ }
+
+ public OutputStream _invoke(String method, InputStream in,
+ ResponseHandler rh) {
+
+ DataType outputType = null;
+ DataType<List<DataType>> inputType = null;
+ Operation operation = null;
+
+ List<Operation> operations = service.getInterfaceContract()
+ .getInterface().getOperations();
+ // searching for proper operation
+ for (Operation oper : operations) {
+ if (oper.getName().equals(method)) {
+ outputType = oper.getOutputType();
+ inputType = oper.getInputType();
+ operation = oper;
+ break;
+ }
+ }
+ if (operation == null) {
+ // operation wasn't found
+ throw new org.omg.CORBA.BAD_OPERATION(0,
+ org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE);
+ } else {
+ List<Object> inputInstances = new ArrayList<Object>();
+ try {
+ // retrieving in arguments
+ for (DataType type : inputType.getLogical()) {
+ Class<?> forClass = type.getPhysical();
+ TypeTree tree = TypeTreeCreator.createTypeTree(forClass);
+ Object o = TypeHelpersProxy.read(tree.getRootNode(), in);
+ inputInstances.add(o);
+
+ }
+ } catch (RequestConfigurationException e) {
+ // TODO: raise remote exception, BAD_PARAM exception maybe?
+ e.printStackTrace();
+ }
+ try {
+ // invocation and sending result
+ Object result = service.getRuntimeWire(binding).invoke(
+ operation, inputInstances.toArray());
+ if (outputType != null) {
+ OutputStream out = rh.createReply();
+ TypeTree tree = TypeTreeCreator.createTypeTree(outputType
+ .getPhysical());
+ TypeHelpersProxy.write(tree.getRootNode(), out, result);
+ return out;
+ }
+ } catch (InvocationTargetException ie) {
+ // handling user exception
+ try {
+ OutputStream out = rh.createExceptionReply();
+ Class<?> exceptionClass = ie.getTargetException()
+ .getClass();
+ TypeTree tree = TypeTreeCreator
+ .createTypeTree(exceptionClass);
+ String exceptionId = Utils.getExceptionId(exceptionClass);
+ out.write_string(exceptionId);
+ TypeHelpersProxy.write(tree.getRootNode(), out, ie
+ .getTargetException());
+ return out;
+ } catch (RequestConfigurationException e) {
+ // TODO: raise remote exception - exception while handling
+ // target exception
+ e.printStackTrace();
+ }
+ } catch (Exception e) {
+ // TODO: raise remote exception
+ e.printStackTrace();
+ }
+ }
+ return null;
+ }
+
+ @Override
+ public String[] _ids() {
+ return ids;
+ }
+
+}
Propchange: tuscany/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/service/DynaCorbaServant.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/service/DynaCorbaServant.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: tuscany/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/Utils.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/Utils.java?rev=670714&view=auto
==============================================================================
--- tuscany/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/Utils.java (added)
+++ tuscany/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/Utils.java Mon Jun 23 12:07:31 2008
@@ -0,0 +1,40 @@
+/*
+ * 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.impl.types.util;
+
+public class Utils {
+
+ /**
+ * Creates CORBA id for Java class
+ * @param forClass
+ * @return
+ */
+ public static String getExceptionId(Class<?> forClass) {
+ String result = forClass.getName().replace('.', '/');
+ result = result.replaceAll("Package", "");
+ if (result.endsWith("Exception")) {
+ result = result
+ .substring(0, result.length() - "Exception".length());
+ }
+ result = "IDL:" + result + ":1.0";
+ return result;
+ }
+
+}
Propchange: tuscany/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/Utils.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/Utils.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/CorbaServantTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/CorbaServantTestCase.java?rev=670714&view=auto
==============================================================================
--- tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/CorbaServantTestCase.java (added)
+++ tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/CorbaServantTestCase.java Mon Jun 23 12:07:31 2008
@@ -0,0 +1,440 @@
+/*
+ * 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;
+
+import java.io.IOException;
+import java.lang.reflect.Array;
+
+import junit.framework.TestCase;
+
+import org.apache.tuscany.sca.binding.corba.impl.exceptions.CorbaException;
+import org.apache.tuscany.sca.binding.corba.impl.reference.DynaCorbaRequest;
+import org.apache.tuscany.sca.binding.corba.impl.reference.DynaCorbaResponse;
+import org.apache.tuscany.sca.binding.corba.impl.service.DynaCorbaServant;
+import org.apache.tuscany.sca.binding.corba.testing.enums.Color;
+import org.apache.tuscany.sca.binding.corba.testing.enums.EnumManager;
+import org.apache.tuscany.sca.binding.corba.testing.enums.EnumManagerHelper;
+import org.apache.tuscany.sca.binding.corba.testing.exceptions.Calc;
+import org.apache.tuscany.sca.binding.corba.testing.exceptions.CalcHelper;
+import org.apache.tuscany.sca.binding.corba.testing.exceptions.CalcPackage.DivByZero;
+import org.apache.tuscany.sca.binding.corba.testing.exceptions.CalcPackage.NotSupported;
+import org.apache.tuscany.sca.binding.corba.testing.generated.ArraysSetter;
+import org.apache.tuscany.sca.binding.corba.testing.generated.ArraysSetterHelper;
+import org.apache.tuscany.sca.binding.corba.testing.generated.PrimitivesSetter;
+import org.apache.tuscany.sca.binding.corba.testing.generated.PrimitivesSetterHelper;
+import org.apache.tuscany.sca.binding.corba.testing.generated.SimpleStruct;
+import org.apache.tuscany.sca.binding.corba.testing.generated.SomeStruct;
+import org.apache.tuscany.sca.binding.corba.testing.generated.TestObject;
+import org.apache.tuscany.sca.binding.corba.testing.generated.TestObjectHelper;
+import org.apache.tuscany.sca.binding.corba.testing.hierarchy.NonCorbaException;
+import org.apache.tuscany.sca.binding.corba.testing.servants.ArraysSetterServant;
+import org.apache.tuscany.sca.binding.corba.testing.servants.CalcServant;
+import org.apache.tuscany.sca.binding.corba.testing.servants.EnumManagerServant;
+import org.apache.tuscany.sca.binding.corba.testing.servants.InvalidTestObjectServant;
+import org.apache.tuscany.sca.binding.corba.testing.servants.NonCorbaServant;
+import org.apache.tuscany.sca.binding.corba.testing.servants.PrimitivesSetterServant;
+import org.apache.tuscany.sca.binding.corba.testing.servants.TestObjectServant;
+import org.apache.tuscany.sca.binding.corba.testing.service.mocks.TestRuntimeComponentService;
+import org.omg.CORBA.BAD_OPERATION;
+import org.omg.CORBA.ORB;
+import org.omg.CORBA.Object;
+import org.omg.CosNaming.NameComponent;
+import org.omg.CosNaming.NamingContext;
+import org.omg.CosNaming.NamingContextHelper;
+
+public class CorbaServantTestCase extends TestCase {
+
+ private Process process;
+ private ORB orb;
+
+ /**
+ * Spawns tnamserv an initiates ORB
+ */
+ public void setUp() throws IOException {
+ String[] args = { "-ORBInitialPort",
+ "" + TestConstants.ORB_INITIAL_PORT };
+ process = Runtime.getRuntime().exec(
+ "tnameserv " + args[0] + " " + args[1]);
+ try {
+ // let the tnameserv have time to start
+ Thread.sleep(TestConstants.TNAMESERV_SPAWN_WAIT);
+ orb = ORB.init(args, null);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+ /**
+ * Kills tnameserv
+ */
+ public void tearDown() {
+ try {
+ if (process != null) {
+ process.destroy();
+ }
+ // let the tnameserv have time to die
+ Thread.sleep(TestConstants.TNAMESERV_SPAWN_WAIT);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+ /**
+ * Binds servant implementation to name
+ */
+ private void bindServant(DynaCorbaServant servant, String name) {
+ try {
+ Object nameService = orb.resolve_initial_references("NameService");
+ NamingContext namingContext = NamingContextHelper
+ .narrow(nameService);
+
+ NameComponent nc = new NameComponent(name, "");
+ NameComponent[] path = new NameComponent[] { nc };
+ namingContext.rebind(path, servant);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+ /**
+ * Returns object reference which is binded to given name
+ *
+ * @param name
+ * @return
+ */
+ private org.omg.CORBA.Object bindReference(String name) {
+ try {
+ org.omg.CORBA.Object objRef = orb
+ .resolve_initial_references("NameService");
+ NamingContext ncRef = NamingContextHelper.narrow(objRef);
+ NameComponent nc = new NameComponent(name, "");
+ NameComponent path[] = { nc };
+ return ncRef.resolve(path);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return null;
+ }
+
+ /**
+ * Tests primitives (arguments, return types)
+ */
+ public void test_primitivesSetter() {
+ try {
+ PrimitivesSetter primitivesSetter = new PrimitivesSetterServant();
+ TestRuntimeComponentService service = new TestRuntimeComponentService(
+ primitivesSetter);
+ DynaCorbaServant servant = new DynaCorbaServant(service, null);
+ String[] ids = new String[] { "IDL:org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetter:1.0" };
+ servant.setIds(ids);
+ bindServant(servant, "PrimitivesSetter");
+ PrimitivesSetter psClient = PrimitivesSetterHelper
+ .narrow(bindReference("PrimitivesSetter"));
+ assertTrue(psClient.setBoolean(true) == true);
+ assertTrue(psClient.setChar('A') == 'A');
+ assertTrue(psClient.setString("SomeTest").equals("SomeTest"));
+ assertTrue(psClient.setDouble(2d) == 2d);
+ assertTrue(psClient.setFloat(3f) == 3f);
+ assertTrue(psClient.setLong(1) == 1);
+ assertTrue(psClient.setLongLong(0L) == 0L);
+ assertTrue(psClient.setOctet((byte) 8) == (byte) 8);
+ assertTrue(psClient.setShort((short) 6) == (short) 6);
+ assertTrue(psClient.setUnsignedLong(9) == 9);
+ assertTrue(psClient.setUnsignedLongLong(11L) == 11L);
+ assertTrue(psClient.setUnsignedShort((short) 15) == (short) 15);
+ } catch (Exception e) {
+ e.printStackTrace();
+ fail();
+ }
+ }
+
+ /**
+ * Tests if array values are equal
+ */
+ private boolean areArraysEqual(java.lang.Object arr1,
+ java.lang.Object arr2, int arrLen) {
+ try {
+ for (int i = 0; i < arrLen; i++) {
+ if (!Array.get(arr1, i).equals(Array.get(arr2, i))) {
+ return false;
+ }
+ }
+ return true;
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return false;
+ }
+
+ /**
+ * Tests arrays (arguments, return types)
+ */
+ public void test_arraysSetter() {
+ try {
+ ArraysSetter arraysSetter = new ArraysSetterServant();
+ TestRuntimeComponentService service = new TestRuntimeComponentService(
+ arraysSetter);
+ DynaCorbaServant servant = new DynaCorbaServant(service, null);
+ String[] ids = new String[] { "IDL:org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetter:1.0" };
+ servant.setIds(ids);
+ java.lang.Object result = null;
+ bindServant(servant, "ArraysSetter");
+ ArraysSetter asClient = ArraysSetterHelper
+ .narrow(bindReference("ArraysSetter"));
+
+ boolean[] bArr = new boolean[] { true, false };
+ result = (java.lang.Object) asClient.setBoolean(bArr);
+ assertTrue(areArraysEqual(bArr, result, bArr.length));
+
+ byte[] byArr = new byte[] { 1, 2 };
+ result = (java.lang.Object) asClient.setOctet(byArr);
+ assertTrue(areArraysEqual(byArr, result, byArr.length));
+
+ short[] shArr = new short[] { 1, 2 };
+ result = (java.lang.Object) asClient.setShort(shArr);
+ assertTrue(areArraysEqual(shArr, result, shArr.length));
+
+ int[] iArr = new int[] { 1, 2 };
+ result = (java.lang.Object) asClient.setLong(iArr);
+ assertTrue(areArraysEqual(iArr, result, iArr.length));
+
+ long[] lArr = new long[] { 1, 2 };
+ result = (java.lang.Object) asClient.setLongLong(lArr);
+ assertTrue(areArraysEqual(lArr, result, lArr.length));
+
+ String[] strArr = new String[] { "Some", "Test" };
+ result = (java.lang.Object) asClient.setString(strArr);
+ assertTrue(areArraysEqual(strArr, result, strArr.length));
+
+ char[] chArr = new char[] { 'A', 'B' };
+ result = (java.lang.Object) asClient.setChar(chArr);
+ assertTrue(areArraysEqual(chArr, result, chArr.length));
+
+ float[] flArr = new float[] { 1, 2 };
+ result = (java.lang.Object) asClient.setFloat(flArr);
+ assertTrue(areArraysEqual(flArr, result, flArr.length));
+
+ double[] dbArr = new double[] { 1, 2 };
+ result = (java.lang.Object) asClient.setDouble(dbArr);
+ assertTrue(areArraysEqual(dbArr, result, dbArr.length));
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ fail();
+ }
+ }
+
+ /**
+ * Tests structures (arguments, return types)
+ */
+ public void test_TestObject_setStruct() {
+ try {
+ TestObject to = new TestObjectServant();
+ TestRuntimeComponentService service = new TestRuntimeComponentService(
+ to);
+ DynaCorbaServant servant = new DynaCorbaServant(service, null);
+ String[] ids = new String[] { "IDL:org/apache/tuscany/sca/binding/corba/testing/generated/TestObject:1.0" };
+ servant.setIds(ids);
+ bindServant(servant, "TestObject");
+ TestObject testObject = TestObjectHelper
+ .narrow(bindReference("TestObject"));
+ SomeStruct ss = new SomeStruct();
+ SimpleStruct inner = new SimpleStruct();
+ inner.field1 = TestConstants.STR_1;
+ inner.field2 = TestConstants.INT_1;
+ ss.innerStruct = inner;
+ ss.str = TestConstants.STR_2;
+ ss.str_list = TestConstants.STR_ARR_1;
+ ss.threeDimSeq = TestConstants.INT_ARRAY_3_DIM;
+ ss.twoDimSeq = TestConstants.INT_ARRAY_2_DIM;
+ SomeStruct result = testObject.setStruct(ss);
+ assertTrue(TestConstants.are2DimArraysEqual(result.twoDimSeq,
+ TestConstants.INT_ARRAY_2_DIM));
+ assertTrue(TestConstants.are3DimArraysEqual(result.threeDimSeq,
+ TestConstants.INT_ARRAY_3_DIM));
+ assertTrue(result.str.equals(ss.str));
+ assertTrue(result.innerStruct.field1.equals(ss.innerStruct.field1));
+ assertTrue(result.innerStruct.field2 == ss.innerStruct.field2);
+ assertTrue(areArraysEqual(result.str_list, ss.str_list,
+ ss.str_list.length));
+ } catch (Exception e) {
+ e.printStackTrace();
+ fail();
+ }
+ }
+
+ /**
+ * Tests handling BAD_OPERATION system exception
+ */
+ public void test_noSuchOperation() {
+ try {
+ TestObjectServant tos = new TestObjectServant();
+ TestRuntimeComponentService service = new TestRuntimeComponentService(
+ tos);
+ DynaCorbaServant servant = new DynaCorbaServant(service, null);
+ String[] ids = new String[] { "IDL:org/apache/tuscany/sca/binding/corba/testing/generated/TestObject:1.0" };
+ servant.setIds(ids);
+ bindServant(servant, "TestObject");
+ DynaCorbaRequest request = new DynaCorbaRequest(
+ bindReference("TestObject"), "methodThatSurelyDoesNotExist");
+ request.invoke();
+ } catch (Exception e) {
+ if (e instanceof CorbaException) {
+ assertTrue(true);
+ } else {
+ e.printStackTrace();
+ }
+ }
+
+ try {
+ InvalidTestObjectServant tos = new InvalidTestObjectServant();
+ TestRuntimeComponentService service = new TestRuntimeComponentService(
+ tos);
+ DynaCorbaServant servant = new DynaCorbaServant(service, null);
+ String[] ids = new String[] { "IDL:org/apache/tuscany/sca/binding/corba/testing/generated/TestObject:1.0" };
+ servant.setIds(ids);
+ bindServant(servant, "InvalidTestObject");
+ TestObject to = TestObjectHelper
+ .narrow(bindReference("InvalidTestObject"));
+ SomeStruct str = new SomeStruct();
+ str.innerStruct = new SimpleStruct();
+ str.innerStruct.field1 = "Whatever";
+ str.str = "Whatever";
+ str.str_list = new String[] {};
+ str.threeDimSeq = new int[][][] {};
+ str.twoDimSeq = new int[][] {};
+ to.setStruct(str);
+ } catch (Exception e) {
+ if (e instanceof BAD_OPERATION) {
+ assertTrue(true);
+ } else {
+ e.printStackTrace();
+ }
+ }
+ }
+
+ /**
+ * Tests handling user exceptions
+ */
+ public void test_userExceptions() {
+ try {
+ CalcServant calc = new CalcServant();
+ TestRuntimeComponentService service = new TestRuntimeComponentService(
+ calc);
+ DynaCorbaServant servant = new DynaCorbaServant(service, null);
+ String[] ids = { "IDL:org/apache/tuscany/sca/binding/corba/testing/exceptions/Calc:1.0" };
+ servant.setIds(ids);
+ bindServant(servant, "Calc");
+ Calc calcClient = CalcHelper.narrow(bindReference("Calc"));
+ calcClient.div(1, 0);
+ fail();
+ } catch (Exception e) {
+ if (e instanceof DivByZero) {
+ assertTrue(true);
+ } else {
+ e.printStackTrace();
+ fail();
+ }
+ }
+
+ try {
+ CalcServant calc = new CalcServant();
+ TestRuntimeComponentService service = new TestRuntimeComponentService(
+ calc);
+ DynaCorbaServant servant = new DynaCorbaServant(service, null);
+ String[] ids = { "IDL:org/apache/tuscany/sca/binding/corba/testing/exceptions/Calc:1.0" };
+ servant.setIds(ids);
+ bindServant(servant, "Calc");
+ Calc calcClient = CalcHelper.narrow(bindReference("Calc"));
+ calcClient.divForSmallArgs(255, 255);
+ fail();
+ } catch (Exception e) {
+ if (e instanceof NotSupported) {
+ assertTrue(true);
+ } else {
+ e.printStackTrace();
+ fail();
+ }
+ }
+ }
+
+ /**
+ * Tests enums (arguments, return types)
+ */
+ public void test_enums() {
+ try {
+ EnumManagerServant ems = new EnumManagerServant();
+ TestRuntimeComponentService service = new TestRuntimeComponentService(
+ ems);
+ DynaCorbaServant servant = new DynaCorbaServant(service, null);
+ String[] ids = { "IDL:org/apache/tuscany/sca/binding/corba/testing/enums/EnumManager:1.0" };
+ servant.setIds(ids);
+ bindServant(servant, "Enum");
+ EnumManager em = EnumManagerHelper.narrow(bindReference("Enum"));
+ Color color = Color.red;
+ assertTrue(em.getColor(color).value() == color.value());
+ } catch (Exception e) {
+ e.printStackTrace();
+ fail();
+ }
+ }
+
+ public void test_nonCorbaServants() {
+ try {
+ NonCorbaServant ncs = new NonCorbaServant();
+ TestRuntimeComponentService service = new TestRuntimeComponentService(
+ ncs);
+ DynaCorbaServant servant = new DynaCorbaServant(service, null);
+ bindServant(servant, "NonCorbaServant");
+ // it's non corba servant so we don't have stubs to test them
+ DynaCorbaRequest request = new DynaCorbaRequest(
+ bindReference("NonCorbaServant"), "setString");
+ request.addArgument(TestConstants.STR_1);
+ request.setOutputType(String.class);
+ DynaCorbaResponse response = request.invoke();
+ assertTrue(response.getContent().equals(TestConstants.STR_1));
+ } catch (Exception e) {
+ e.printStackTrace();
+ fail();
+ }
+
+ try {
+ NonCorbaServant ncs = new NonCorbaServant();
+ TestRuntimeComponentService service = new TestRuntimeComponentService(
+ ncs);
+ DynaCorbaServant servant = new DynaCorbaServant(service, null);
+ bindServant(servant, "NonCorbaServant");
+ // it's non corba servant so we don't have stubs to test them
+ DynaCorbaRequest request = new DynaCorbaRequest(
+ bindReference("NonCorbaServant"), "throwException");
+ request.addExceptionType(NonCorbaException.class);
+ request.invoke();
+ fail();
+ } catch (Exception e) {
+ if (e instanceof NonCorbaException) {
+ assertTrue(true);
+ } else {
+ e.printStackTrace();
+ fail();
+ }
+ }
+ }
+
+}
Propchange: tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/CorbaServantTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/CorbaServantTestCase.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/CorbaTypesTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/CorbaTypesTestCase.java?rev=670714&r1=670713&r2=670714&view=diff
==============================================================================
--- tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/CorbaTypesTestCase.java (original)
+++ tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/CorbaTypesTestCase.java Mon Jun 23 12:07:31 2008
@@ -290,24 +290,8 @@
request.setOutputType(SomeStruct.class);
DynaCorbaResponse response = request.invoke();
SomeStruct result = (SomeStruct) response.getContent();
- int sum = 0;
- for (int i = 0; i < result.twoDimSeq.length; i++) {
- for (int j = 0; j < result.twoDimSeq[i].length; j++) {
- sum++;
- assertEquals(TestConstants.INT_ARRAY_2_DIM[i][j],
- result.twoDimSeq[i][j]);
- }
- }
- sum = 0;
- for (int i = 0; i < result.threeDimSeq.length; i++) {
- for (int j = 0; j < result.threeDimSeq[i].length; j++) {
- for (int k = 0; k < result.threeDimSeq[i][j].length; k++) {
- sum++;
- assertEquals(TestConstants.INT_ARRAY_3_DIM[i][j][k],
- result.threeDimSeq[i][j][k]);
- }
- }
- }
+ assertTrue(TestConstants.are2DimArraysEqual(result.twoDimSeq, TestConstants.INT_ARRAY_2_DIM));
+ assertTrue(TestConstants.are3DimArraysEqual(result.threeDimSeq, TestConstants.INT_ARRAY_3_DIM));
assertEquals(TestConstants.STR_1, result.str);
assertEquals(TestConstants.STR_ARR_2[0], result.str_list[0]);
assertEquals(TestConstants.STR_ARR_2[1], result.str_list[1]);
Modified: tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/TestConstants.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/TestConstants.java?rev=670714&r1=670713&r2=670714&view=diff
==============================================================================
--- tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/TestConstants.java (original)
+++ tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/TestConstants.java Mon Jun 23 12:07:31 2008
@@ -20,6 +20,7 @@
package org.apache.tuscany.sca.binding.corba.testing;
/**
+ * Some constants and utilities for module tests
* @version $Rev$ $Date$
*/
public class TestConstants {
@@ -31,10 +32,53 @@
public static final String[] STR_ARR_2 = { "Another", "string", "array" };
public static final int INT_1 = 0;
+ public static final int ORB_INITIAL_PORT = 11100;
+
public static final int[][] INT_ARRAY_2_DIM = { { 1, 2 }, { 3, 4 } };
public static final int[][][] INT_ARRAY_3_DIM = { { { 1, 2 }, { 3, 4 } },
{ { 5, 6 }, { 7, 8 } } };
-
public static final long TNAMESERV_SPAWN_WAIT = 300;
+
+ /**
+ * Tests if given 2D arrays values are equal
+ * @param arr1
+ * @param arr2
+ * @return
+ */
+ public static boolean are2DimArraysEqual(int[][] arr1, int[][] arr2) {
+ int sum = 0;
+ int expSum = 0;
+ for (int i = 0; i < arr1.length; i++) {
+ for (int j = 0; j < arr1[i].length; j++) {
+ expSum++;
+ if (arr1[i][j] == arr2[i][j]) {
+ sum++;
+ }
+ }
+ }
+ return sum == expSum;
+ }
+
+ /**
+ * Tests if given 3D arrays values are equal
+ * @param arr1
+ * @param arr2
+ * @return
+ */
+ public static boolean are3DimArraysEqual(int[][][] arr1, int[][][] arr2) {
+ int sum = 0;
+ int expSum = 0;
+ for (int i = 0; i < arr1.length; i++) {
+ for (int j = 0; j < arr1[i].length; j++) {
+ for (int k = 0; k < arr1[i][j].length; k++) {
+ expSum++;
+ if (arr1[i][j][k] == arr2[i][j][k]) {
+ sum++;
+ }
+ }
+ }
+ }
+ return sum == expSum;
+ }
}
Modified: tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetter.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetter.java?rev=670714&r1=670713&r2=670714&view=diff
==============================================================================
--- tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetter.java (original)
+++ tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetter.java Mon Jun 23 12:07:31 2008
@@ -21,10 +21,10 @@
/**
-* Tester/ArraysSetter.java .
+* org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetter.java .
* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from tester.idl
-* pi±tek, 30 maj 2008 17:04:42 CEST
+* from general_tests.idl
+* monday, 23 june 2008 14:12:28 CEST
*/
public interface ArraysSetter extends ArraysSetterOperations, org.omg.CORBA.Object, org.omg.CORBA.portable.IDLEntity
Modified: tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterHelper.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterHelper.java?rev=670714&r1=670713&r2=670714&view=diff
==============================================================================
--- tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterHelper.java (original)
+++ tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterHelper.java Mon Jun 23 12:07:31 2008
@@ -21,15 +21,15 @@
/**
-* Tester/ArraysSetterHelper.java .
+* org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterHelper.java .
* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from tester.idl
-* pi±tek, 30 maj 2008 17:04:42 CEST
+* from general_tests.idl
+* monday, 23 june 2008 14:12:28 CEST
*/
abstract public class ArraysSetterHelper
{
- private static String _id = "IDL:Tester/ArraysSetter:1.0";
+ private static String _id = "IDL:org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetter:1.0";
public static void insert (org.omg.CORBA.Any a, org.apache.tuscany.sca.binding.corba.testing.generated.ArraysSetter that)
{
Modified: tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterHolder.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterHolder.java?rev=670714&r1=670713&r2=670714&view=diff
==============================================================================
--- tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterHolder.java (original)
+++ tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterHolder.java Mon Jun 23 12:07:31 2008
@@ -20,10 +20,10 @@
package org.apache.tuscany.sca.binding.corba.testing.generated;
/**
-* Tester/ArraysSetterHolder.java .
+* org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterHolder.java .
* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from tester.idl
-* pi±tek, 30 maj 2008 17:04:42 CEST
+* from general_tests.idl
+* monday, 23 june 2008 14:12:28 CEST
*/
public final class ArraysSetterHolder implements org.omg.CORBA.portable.Streamable
Modified: tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterOperations.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterOperations.java?rev=670714&r1=670713&r2=670714&view=diff
==============================================================================
--- tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterOperations.java (original)
+++ tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterOperations.java Mon Jun 23 12:07:31 2008
@@ -21,10 +21,10 @@
/**
-* Tester/ArraysSetterOperations.java .
+* org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterOperations.java .
* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from tester.idl
-* pi±tek, 30 maj 2008 17:04:42 CEST
+* from general_tests.idl
+* monday, 23 june 2008 14:12:28 CEST
*/
public interface ArraysSetterOperations
Modified: tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetter.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetter.java?rev=670714&r1=670713&r2=670714&view=diff
==============================================================================
--- tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetter.java (original)
+++ tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetter.java Mon Jun 23 12:07:31 2008
@@ -21,10 +21,10 @@
/**
-* Tester/PrimitivesSetter.java .
+* org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetter.java .
* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from tester.idl
-* pi±tek, 30 maj 2008 17:04:42 CEST
+* from general_tests.idl
+* monday, 23 june 2008 2008 14:12:28 CEST
*/
public interface PrimitivesSetter extends PrimitivesSetterOperations, org.omg.CORBA.Object, org.omg.CORBA.portable.IDLEntity
Modified: tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterHelper.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterHelper.java?rev=670714&r1=670713&r2=670714&view=diff
==============================================================================
--- tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterHelper.java (original)
+++ tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterHelper.java Mon Jun 23 12:07:31 2008
@@ -21,15 +21,15 @@
/**
-* Tester/PrimitivesSetterHelper.java .
+* org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterHelper.java .
* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from tester.idl
-* pi±tek, 30 maj 2008 17:04:42 CEST
+* from general_tests.idl
+* monday, 23 june 2008 2008 14:12:28 CEST
*/
abstract public class PrimitivesSetterHelper
{
- private static String _id = "IDL:Tester/PrimitivesSetter:1.0";
+ private static String _id = "IDL:org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetter:1.0";
public static void insert (org.omg.CORBA.Any a, org.apache.tuscany.sca.binding.corba.testing.generated.PrimitivesSetter that)
{
Modified: tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterHolder.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterHolder.java?rev=670714&r1=670713&r2=670714&view=diff
==============================================================================
--- tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterHolder.java (original)
+++ tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterHolder.java Mon Jun 23 12:07:31 2008
@@ -20,10 +20,10 @@
package org.apache.tuscany.sca.binding.corba.testing.generated;
/**
-* Tester/PrimitivesSetterHolder.java .
+* org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterHolder.java .
* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from tester.idl
-* pi±tek, 30 maj 2008 17:04:42 CEST
+* from general_tests.idl
+* monday, 23 june 2008 2008 14:12:28 CEST
*/
public final class PrimitivesSetterHolder implements org.omg.CORBA.portable.Streamable
Modified: tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterOperations.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterOperations.java?rev=670714&r1=670713&r2=670714&view=diff
==============================================================================
--- tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterOperations.java (original)
+++ tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterOperations.java Mon Jun 23 12:07:31 2008
@@ -21,10 +21,10 @@
/**
-* Tester/PrimitivesSetterOperations.java .
+* org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterOperations.java .
* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from tester.idl
-* pi±tek, 30 maj 2008 17:04:42 CEST
+* from general_tests.idl
+* monday, 23 june 2008 2008 14:12:28 CEST
*/
public interface PrimitivesSetterOperations
Modified: tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObject.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObject.java?rev=670714&r1=670713&r2=670714&view=diff
==============================================================================
--- tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObject.java (original)
+++ tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObject.java Mon Jun 23 12:07:31 2008
@@ -21,10 +21,10 @@
/**
-* Tester/RemoteObject.java .
+* org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObject.java .
* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from tester.idl
-* pi±tek, 30 maj 2008 17:04:42 CEST
+* from general_tests.idl
+* monday, 23 june 2008 2008 14:12:28 CEST
*/
public interface RemoteObject extends RemoteObjectOperations, org.omg.CORBA.Object, org.omg.CORBA.portable.IDLEntity
Modified: tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectHelper.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectHelper.java?rev=670714&r1=670713&r2=670714&view=diff
==============================================================================
--- tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectHelper.java (original)
+++ tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectHelper.java Mon Jun 23 12:07:31 2008
@@ -21,15 +21,15 @@
/**
-* Tester/RemoteObjectHelper.java .
+* org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectHelper.java .
* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from tester.idl
-* pi±tek, 30 maj 2008 17:04:42 CEST
+* from general_tests.idl
+* monday, 23 june 2008 2008 14:12:28 CEST
*/
abstract public class RemoteObjectHelper
{
- private static String _id = "IDL:Tester/RemoteObject:1.0";
+ private static String _id = "IDL:org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObject:1.0";
public static void insert (org.omg.CORBA.Any a, org.apache.tuscany.sca.binding.corba.testing.generated.RemoteObject that)
{
Modified: tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectHolder.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectHolder.java?rev=670714&r1=670713&r2=670714&view=diff
==============================================================================
--- tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectHolder.java (original)
+++ tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectHolder.java Mon Jun 23 12:07:31 2008
@@ -20,10 +20,10 @@
package org.apache.tuscany.sca.binding.corba.testing.generated;
/**
-* Tester/RemoteObjectHolder.java .
+* org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectHolder.java .
* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from tester.idl
-* pi±tek, 30 maj 2008 17:04:42 CEST
+* from general_tests.idl
+* monday, 23 june 2008 2008 14:12:28 CEST
*/
public final class RemoteObjectHolder implements org.omg.CORBA.portable.Streamable
Modified: tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectOperations.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectOperations.java?rev=670714&r1=670713&r2=670714&view=diff
==============================================================================
--- tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectOperations.java (original)
+++ tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectOperations.java Mon Jun 23 12:07:31 2008
@@ -21,10 +21,10 @@
/**
-* Tester/RemoteObjectOperations.java .
+* org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectOperations.java .
* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from tester.idl
-* pi±tek, 30 maj 2008 17:04:42 CEST
+* from general_tests.idl
+* monday, 23 june 2008 2008 14:12:28 CEST
*/
public interface RemoteObjectOperations
Modified: tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStruct.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStruct.java?rev=670714&r1=670713&r2=670714&view=diff
==============================================================================
--- tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStruct.java (original)
+++ tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStruct.java Mon Jun 23 12:07:31 2008
@@ -21,10 +21,10 @@
/**
-* Tester/SimpleStruct.java .
+* org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStruct.java .
* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from tester.idl
-* pi±tek, 30 maj 2008 17:04:42 CEST
+* from general_tests.idl
+* monday, 23 june 2008 2008 14:12:28 CEST
*/
public final class SimpleStruct implements org.omg.CORBA.portable.IDLEntity
Modified: tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStructHelper.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStructHelper.java?rev=670714&r1=670713&r2=670714&view=diff
==============================================================================
--- tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStructHelper.java (original)
+++ tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStructHelper.java Mon Jun 23 12:07:31 2008
@@ -21,15 +21,15 @@
/**
-* Tester/SimpleStructHelper.java .
+* org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStructHelper.java .
* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from tester.idl
-* pi±tek, 30 maj 2008 17:04:42 CEST
+* from general_tests.idl
+* monday, 23 june 2008 2008 14:12:28 CEST
*/
abstract public class SimpleStructHelper
{
- private static String _id = "IDL:Tester/SimpleStruct/SimpleStruct:1.0";
+ private static String _id = "IDL:org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStruct/SimpleStruct:1.0";
public static void insert (org.omg.CORBA.Any a, org.apache.tuscany.sca.binding.corba.testing.generated.SimpleStruct that)
{
Modified: tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStructHolder.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStructHolder.java?rev=670714&r1=670713&r2=670714&view=diff
==============================================================================
--- tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStructHolder.java (original)
+++ tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStructHolder.java Mon Jun 23 12:07:31 2008
@@ -20,10 +20,10 @@
package org.apache.tuscany.sca.binding.corba.testing.generated;
/**
-* Tester/SimpleStructHolder.java .
+* org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStructHolder.java .
* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from tester.idl
-* pi±tek, 30 maj 2008 17:04:42 CEST
+* from general_tests.idl
+* monday, 23 june 2008 2008 14:12:28 CEST
*/
public final class SimpleStructHolder implements org.omg.CORBA.portable.Streamable
Modified: tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SomeStruct.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SomeStruct.java?rev=670714&r1=670713&r2=670714&view=diff
==============================================================================
--- tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SomeStruct.java (original)
+++ tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SomeStruct.java Mon Jun 23 12:07:31 2008
@@ -21,10 +21,10 @@
/**
-* Tester/SomeStruct.java .
+* org/apache/tuscany/sca/binding/corba/testing/generated/SomeStruct.java .
* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from tester.idl
-* pi±tek, 30 maj 2008 17:04:42 CEST
+* from general_tests.idl
+* monday, 23 june 2008 2008 14:12:28 CEST
*/
public final class SomeStruct implements org.omg.CORBA.portable.IDLEntity
Modified: tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SomeStructHelper.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SomeStructHelper.java?rev=670714&r1=670713&r2=670714&view=diff
==============================================================================
--- tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SomeStructHelper.java (original)
+++ tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SomeStructHelper.java Mon Jun 23 12:07:31 2008
@@ -21,15 +21,15 @@
/**
-* Tester/SomeStructHelper.java .
+* org/apache/tuscany/sca/binding/corba/testing/generated/SomeStructHelper.java .
* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from tester.idl
-* pi±tek, 30 maj 2008 17:04:42 CEST
+* from general_tests.idl
+* monday, 23 june 2008 2008 14:12:28 CEST
*/
abstract public class SomeStructHelper
{
- private static String _id = "IDL:Tester/SomeStruct/SomeStruct:1.0";
+ private static String _id = "IDL:org/apache/tuscany/sca/binding/corba/testing/generated/SomeStruct/SomeStruct:1.0";
public static void insert (org.omg.CORBA.Any a, org.apache.tuscany.sca.binding.corba.testing.generated.SomeStruct that)
{
Modified: tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SomeStructHolder.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SomeStructHolder.java?rev=670714&r1=670713&r2=670714&view=diff
==============================================================================
--- tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SomeStructHolder.java (original)
+++ tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SomeStructHolder.java Mon Jun 23 12:07:31 2008
@@ -20,10 +20,10 @@
package org.apache.tuscany.sca.binding.corba.testing.generated;
/**
-* Tester/SomeStructHolder.java .
+* org/apache/tuscany/sca/binding/corba/testing/generated/SomeStructHolder.java .
* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from tester.idl
-* pi±tek, 30 maj 2008 17:04:42 CEST
+* from general_tests.idl
+* monday, 23 june 2008 2008 14:12:28 CEST
*/
public final class SomeStructHolder implements org.omg.CORBA.portable.Streamable
Modified: tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObject.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObject.java?rev=670714&r1=670713&r2=670714&view=diff
==============================================================================
--- tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObject.java (original)
+++ tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObject.java Mon Jun 23 12:07:31 2008
@@ -21,10 +21,10 @@
/**
-* Tester/TestObject.java .
+* org/apache/tuscany/sca/binding/corba/testing/generated/TestObject.java .
* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from tester.idl
-* pi±tek, 30 maj 2008 17:04:42 CEST
+* from general_tests.idl
+* monday, 23 june 2008 2008 14:12:28 CEST
*/
public interface TestObject extends TestObjectOperations, org.omg.CORBA.Object, org.omg.CORBA.portable.IDLEntity
Modified: tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectHelper.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectHelper.java?rev=670714&r1=670713&r2=670714&view=diff
==============================================================================
--- tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectHelper.java (original)
+++ tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectHelper.java Mon Jun 23 12:07:31 2008
@@ -21,15 +21,15 @@
/**
-* Tester/TestObjectHelper.java .
+* org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectHelper.java .
* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from tester.idl
-* pi±tek, 30 maj 2008 17:04:42 CEST
+* from general_tests.idl
+* monday, 23 june 2008 2008 14:12:28 CEST
*/
abstract public class TestObjectHelper
{
- private static String _id = "IDL:Tester/TestObject:1.0";
+ private static String _id = "IDL:org/apache/tuscany/sca/binding/corba/testing/generated/TestObject:1.0";
public static void insert (org.omg.CORBA.Any a, org.apache.tuscany.sca.binding.corba.testing.generated.TestObject that)
{
Modified: tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectHolder.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectHolder.java?rev=670714&r1=670713&r2=670714&view=diff
==============================================================================
--- tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectHolder.java (original)
+++ tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectHolder.java Mon Jun 23 12:07:31 2008
@@ -20,10 +20,10 @@
package org.apache.tuscany.sca.binding.corba.testing.generated;
/**
-* Tester/TestObjectHolder.java .
+* org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectHolder.java .
* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from tester.idl
-* pi±tek, 30 maj 2008 17:04:42 CEST
+* from general_tests.idl
+* monday, 23 june 2008 2008 14:12:28 CEST
*/
public final class TestObjectHolder implements org.omg.CORBA.portable.Streamable
Modified: tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectOperations.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectOperations.java?rev=670714&r1=670713&r2=670714&view=diff
==============================================================================
--- tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectOperations.java (original)
+++ tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectOperations.java Mon Jun 23 12:07:31 2008
@@ -21,16 +21,16 @@
/**
-* Tester/TestObjectOperations.java .
+* org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectOperations.java .
* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from tester.idl
-* pi±tek, 30 maj 2008 17:04:42 CEST
+* from general_tests.idl
+* monday, 23 june 2008 2008 14:12:28 CEST
*/
public interface TestObjectOperations
{
- org.apache.tuscany.sca.binding.corba.testing.generated.SomeStruct pickStructFromArgs (org.apache.tuscany.sca.binding.corba.testing.generated.SomeStructHolder arg1, org.apache.tuscany.sca.binding.corba.testing.generated.SomeStructHolder arg2, org.apache.tuscany.sca.binding.corba.testing.generated.SomeStructHolder arg3, int structNumber);
- org.apache.tuscany.sca.binding.corba.testing.generated.SomeStruct setStruct (org.apache.tuscany.sca.binding.corba.testing.generated.SomeStructHolder arg);
+ org.apache.tuscany.sca.binding.corba.testing.generated.SomeStruct pickStructFromArgs (org.apache.tuscany.sca.binding.corba.testing.generated.SomeStruct arg1, org.apache.tuscany.sca.binding.corba.testing.generated.SomeStruct arg2, org.apache.tuscany.sca.binding.corba.testing.generated.SomeStruct arg3, int structNumber);
+ org.apache.tuscany.sca.binding.corba.testing.generated.SomeStruct setStruct (org.apache.tuscany.sca.binding.corba.testing.generated.SomeStruct arg);
org.apache.tuscany.sca.binding.corba.testing.generated.SimpleStruct setSimpleStruct (org.apache.tuscany.sca.binding.corba.testing.generated.SimpleStructHolder arg);
int[] setLongSeq1 (org.apache.tuscany.sca.binding.corba.testing.generated.long_seq1Holder arg);
int[][] setLongSeq2 (org.apache.tuscany.sca.binding.corba.testing.generated.long_seq2Holder arg);
Modified: tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_ArraysSetterImplBase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_ArraysSetterImplBase.java?rev=670714&r1=670713&r2=670714&view=diff
==============================================================================
--- tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_ArraysSetterImplBase.java (original)
+++ tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_ArraysSetterImplBase.java Mon Jun 23 12:07:31 2008
@@ -21,10 +21,10 @@
/**
-* Tester/_ArraysSetterImplBase.java .
+* org/apache/tuscany/sca/binding/corba/testing/generated/_ArraysSetterImplBase.java .
* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from tester.idl
-* pi±tek, 30 maj 2008 17:04:42 CEST
+* from general_tests.idl
+* monday, 23 june 2008 14:12:28 CEST
*/
public abstract class _ArraysSetterImplBase extends org.omg.CORBA.portable.ObjectImpl
@@ -67,7 +67,7 @@
switch (__method.intValue ())
{
- case 0: // Tester/ArraysSetter/setBoolean
+ case 0: // org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetter/setBoolean
{
boolean arg[] = org.apache.tuscany.sca.binding.corba.testing.generated.boolean_listHelper.read (in);
boolean $result[] = null;
@@ -77,7 +77,7 @@
break;
}
- case 1: // Tester/ArraysSetter/setChar
+ case 1: // org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetter/setChar
{
char arg[] = org.apache.tuscany.sca.binding.corba.testing.generated.char_listHelper.read (in);
char $result[] = null;
@@ -87,7 +87,7 @@
break;
}
- case 2: // Tester/ArraysSetter/setWchar
+ case 2: // org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetter/setWchar
{
char arg[] = org.apache.tuscany.sca.binding.corba.testing.generated.wchar_listHelper.read (in);
char $result[] = null;
@@ -97,7 +97,7 @@
break;
}
- case 3: // Tester/ArraysSetter/setOctet
+ case 3: // org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetter/setOctet
{
byte arg[] = org.apache.tuscany.sca.binding.corba.testing.generated.octet_listHelper.read (in);
byte $result[] = null;
@@ -107,7 +107,7 @@
break;
}
- case 4: // Tester/ArraysSetter/setShort
+ case 4: // org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetter/setShort
{
short arg[] = org.apache.tuscany.sca.binding.corba.testing.generated.short_listHelper.read (in);
short $result[] = null;
@@ -117,7 +117,7 @@
break;
}
- case 5: // Tester/ArraysSetter/setUnsignedShort
+ case 5: // org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetter/setUnsignedShort
{
short arg[] = org.apache.tuscany.sca.binding.corba.testing.generated.unsigned_short_listHelper.read (in);
short $result[] = null;
@@ -127,7 +127,7 @@
break;
}
- case 6: // Tester/ArraysSetter/setLong
+ case 6: // org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetter/setLong
{
int arg[] = org.apache.tuscany.sca.binding.corba.testing.generated.long_listHelper.read (in);
int $result[] = null;
@@ -137,7 +137,7 @@
break;
}
- case 7: // Tester/ArraysSetter/setUnsignedLong
+ case 7: // org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetter/setUnsignedLong
{
int arg[] = org.apache.tuscany.sca.binding.corba.testing.generated.unsigned_long_listHelper.read (in);
int $result[] = null;
@@ -147,7 +147,7 @@
break;
}
- case 8: // Tester/ArraysSetter/setLongLong
+ case 8: // org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetter/setLongLong
{
long arg[] = org.apache.tuscany.sca.binding.corba.testing.generated.long_long_listHelper.read (in);
long $result[] = null;
@@ -157,7 +157,7 @@
break;
}
- case 9: // Tester/ArraysSetter/setUnsignedLongLong
+ case 9: // org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetter/setUnsignedLongLong
{
long arg[] = org.apache.tuscany.sca.binding.corba.testing.generated.unsigned_long_long_listHelper.read (in);
long $result[] = null;
@@ -167,7 +167,7 @@
break;
}
- case 10: // Tester/ArraysSetter/setFloat
+ case 10: // org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetter/setFloat
{
float arg[] = org.apache.tuscany.sca.binding.corba.testing.generated.float_listHelper.read (in);
float $result[] = null;
@@ -177,7 +177,7 @@
break;
}
- case 11: // Tester/ArraysSetter/setDouble
+ case 11: // org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetter/setDouble
{
double arg[] = org.apache.tuscany.sca.binding.corba.testing.generated.double_listHelper.read (in);
double $result[] = null;
@@ -187,7 +187,7 @@
break;
}
- case 12: // Tester/ArraysSetter/setString
+ case 12: // org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetter/setString
{
String arg[] = org.apache.tuscany.sca.binding.corba.testing.generated.string_listHelper.read (in);
String $result[] = null;
@@ -197,7 +197,7 @@
break;
}
- case 13: // Tester/ArraysSetter/setWstring
+ case 13: // org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetter/setWstring
{
String arg[] = org.apache.tuscany.sca.binding.corba.testing.generated.wstring_listHelper.read (in);
String $result[] = null;
@@ -207,7 +207,7 @@
break;
}
- case 14: // Tester/ArraysSetter/setRemoteObject
+ case 14: // org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetter/setRemoteObject
{
org.apache.tuscany.sca.binding.corba.testing.generated.RemoteObject obj[] = org.apache.tuscany.sca.binding.corba.testing.generated.remote_object_listHelper.read (in);
org.apache.tuscany.sca.binding.corba.testing.generated.RemoteObject $result[] = null;
@@ -226,7 +226,7 @@
// Type-specific CORBA::Object operations
private static String[] __ids = {
- "IDL:Tester/ArraysSetter:1.0"};
+ "IDL:org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetter:1.0"};
public String[] _ids ()
{
Modified: tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_ArraysSetterStub.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_ArraysSetterStub.java?rev=670714&r1=670713&r2=670714&view=diff
==============================================================================
--- tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_ArraysSetterStub.java (original)
+++ tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_ArraysSetterStub.java Mon Jun 23 12:07:31 2008
@@ -21,10 +21,10 @@
/**
-* Tester/_ArraysSetterStub.java .
+* org/apache/tuscany/sca/binding/corba/testing/generated/_ArraysSetterStub.java .
* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from tester.idl
-* pi±tek, 30 maj 2008 17:04:42 CEST
+* from general_tests.idl
+* monday, 23 june 2008 14:12:28 CEST
*/
public class _ArraysSetterStub extends org.omg.CORBA.portable.ObjectImpl implements org.apache.tuscany.sca.binding.corba.testing.generated.ArraysSetter
@@ -332,7 +332,7 @@
// Type-specific CORBA::Object operations
private static String[] __ids = {
- "IDL:Tester/ArraysSetter:1.0"};
+ "IDL:org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetter:1.0"};
public String[] _ids ()
{
Modified: tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_PrimitivesSetterImplBase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_PrimitivesSetterImplBase.java?rev=670714&r1=670713&r2=670714&view=diff
==============================================================================
--- tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_PrimitivesSetterImplBase.java (original)
+++ tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_PrimitivesSetterImplBase.java Mon Jun 23 12:07:31 2008
@@ -21,10 +21,10 @@
/**
-* Tester/_PrimitivesSetterImplBase.java .
+* org/apache/tuscany/sca/binding/corba/testing/generated/_PrimitivesSetterImplBase.java .
* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from tester.idl
-* pi±tek, 30 maj 2008 17:04:42 CEST
+* from general_tests.idl
+* monday, 23 june 2008 14:12:28 CEST
*/
public abstract class _PrimitivesSetterImplBase extends org.omg.CORBA.portable.ObjectImpl
@@ -67,7 +67,7 @@
switch (__method.intValue ())
{
- case 0: // Tester/PrimitivesSetter/setBoolean
+ case 0: // org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetter/setBoolean
{
boolean arg = in.read_boolean ();
boolean $result = false;
@@ -77,7 +77,7 @@
break;
}
- case 1: // Tester/PrimitivesSetter/setChar
+ case 1: // org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetter/setChar
{
char arg = in.read_char ();
char $result = (char)0;
@@ -87,7 +87,7 @@
break;
}
- case 2: // Tester/PrimitivesSetter/setWchar
+ case 2: // org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetter/setWchar
{
char arg = in.read_wchar ();
char $result = (char)0;
@@ -97,7 +97,7 @@
break;
}
- case 3: // Tester/PrimitivesSetter/setOctet
+ case 3: // org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetter/setOctet
{
byte arg = in.read_octet ();
byte $result = (byte)0;
@@ -107,7 +107,7 @@
break;
}
- case 4: // Tester/PrimitivesSetter/setShort
+ case 4: // org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetter/setShort
{
short arg = in.read_short ();
short $result = (short)0;
@@ -117,7 +117,7 @@
break;
}
- case 5: // Tester/PrimitivesSetter/setUnsignedShort
+ case 5: // org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetter/setUnsignedShort
{
short arg = in.read_ushort ();
short $result = (short)0;
@@ -127,7 +127,7 @@
break;
}
- case 6: // Tester/PrimitivesSetter/setLong
+ case 6: // org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetter/setLong
{
int arg = in.read_long ();
int $result = (int)0;
@@ -137,7 +137,7 @@
break;
}
- case 7: // Tester/PrimitivesSetter/setUnsignedLong
+ case 7: // org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetter/setUnsignedLong
{
int arg = in.read_ulong ();
int $result = (int)0;
@@ -147,7 +147,7 @@
break;
}
- case 8: // Tester/PrimitivesSetter/setLongLong
+ case 8: // org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetter/setLongLong
{
long arg = in.read_longlong ();
long $result = (long)0;
@@ -157,7 +157,7 @@
break;
}
- case 9: // Tester/PrimitivesSetter/setUnsignedLongLong
+ case 9: // org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetter/setUnsignedLongLong
{
long arg = in.read_ulonglong ();
long $result = (long)0;
@@ -167,7 +167,7 @@
break;
}
- case 10: // Tester/PrimitivesSetter/setFloat
+ case 10: // org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetter/setFloat
{
float arg = in.read_float ();
float $result = (float)0;
@@ -177,7 +177,7 @@
break;
}
- case 11: // Tester/PrimitivesSetter/setDouble
+ case 11: // org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetter/setDouble
{
double arg = in.read_double ();
double $result = (double)0;
@@ -187,7 +187,7 @@
break;
}
- case 12: // Tester/PrimitivesSetter/setString
+ case 12: // org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetter/setString
{
String arg = in.read_string ();
String $result = null;
@@ -197,7 +197,7 @@
break;
}
- case 13: // Tester/PrimitivesSetter/setWstring
+ case 13: // org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetter/setWstring
{
String arg = in.read_wstring ();
String $result = null;
@@ -207,7 +207,7 @@
break;
}
- case 14: // Tester/PrimitivesSetter/setRemoteObject
+ case 14: // org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetter/setRemoteObject
{
org.apache.tuscany.sca.binding.corba.testing.generated.RemoteObject obj = org.apache.tuscany.sca.binding.corba.testing.generated.RemoteObjectHelper.read (in);
org.apache.tuscany.sca.binding.corba.testing.generated.RemoteObject $result = null;
@@ -226,7 +226,7 @@
// Type-specific CORBA::Object operations
private static String[] __ids = {
- "IDL:Tester/PrimitivesSetter:1.0"};
+ "IDL:org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetter:1.0"};
public String[] _ids ()
{