From 539451c7e13d98504e6f3368d892406494ca711d Mon Sep 17 00:00:00 2001 From: lresende Date: Fri, 13 Nov 2009 01:23:07 +0000 Subject: Removing obsolete release candidate tags git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@835693 13f79535-47bb-0310-9956-ffa450edef68 --- .../samples/calculator-corba-reference/README | 83 -------------- .../samples/calculator-corba-reference/pom.xml | 74 ------------- .../src/main/java/calculator/AddService.java | 28 ----- .../src/main/java/calculator/CalculatorClient.java | 44 -------- .../main/java/calculator/CalculatorService.java | 39 ------- .../java/calculator/CalculatorServiceImpl.java | 68 ------------ .../src/main/java/calculator/DivideService.java | 28 ----- .../src/main/java/calculator/MultiplyService.java | 28 ----- .../src/main/java/calculator/SubtractService.java | 28 ----- .../resources/CalculatorCORBAReference.composite | 42 -------- .../CalculatorCORBAReferenceTestCase.java | 82 -------------- .../java/calculator/CalculatorCORBAServant.java | 44 -------- .../calculator/idl/CalculatorCORBAService.java | 32 ------ .../idl/CalculatorCORBAServiceOperations.java | 36 ------- .../idl/_CalculatorCORBAServiceImplBase.java | 120 --------------------- .../src/test/resources/CalculatorCORBA.idl | 33 ------ 16 files changed, 809 deletions(-) delete mode 100644 sca-java-1.x/tags/1.5.1-RC4/samples/calculator-corba-reference/README delete mode 100644 sca-java-1.x/tags/1.5.1-RC4/samples/calculator-corba-reference/pom.xml delete mode 100644 sca-java-1.x/tags/1.5.1-RC4/samples/calculator-corba-reference/src/main/java/calculator/AddService.java delete mode 100644 sca-java-1.x/tags/1.5.1-RC4/samples/calculator-corba-reference/src/main/java/calculator/CalculatorClient.java delete mode 100644 sca-java-1.x/tags/1.5.1-RC4/samples/calculator-corba-reference/src/main/java/calculator/CalculatorService.java delete mode 100644 sca-java-1.x/tags/1.5.1-RC4/samples/calculator-corba-reference/src/main/java/calculator/CalculatorServiceImpl.java delete mode 100644 sca-java-1.x/tags/1.5.1-RC4/samples/calculator-corba-reference/src/main/java/calculator/DivideService.java delete mode 100644 sca-java-1.x/tags/1.5.1-RC4/samples/calculator-corba-reference/src/main/java/calculator/MultiplyService.java delete mode 100644 sca-java-1.x/tags/1.5.1-RC4/samples/calculator-corba-reference/src/main/java/calculator/SubtractService.java delete mode 100644 sca-java-1.x/tags/1.5.1-RC4/samples/calculator-corba-reference/src/main/resources/CalculatorCORBAReference.composite delete mode 100644 sca-java-1.x/tags/1.5.1-RC4/samples/calculator-corba-reference/src/test/java/calculator/CalculatorCORBAReferenceTestCase.java delete mode 100644 sca-java-1.x/tags/1.5.1-RC4/samples/calculator-corba-reference/src/test/java/calculator/CalculatorCORBAServant.java delete mode 100644 sca-java-1.x/tags/1.5.1-RC4/samples/calculator-corba-reference/src/test/java/calculator/idl/CalculatorCORBAService.java delete mode 100644 sca-java-1.x/tags/1.5.1-RC4/samples/calculator-corba-reference/src/test/java/calculator/idl/CalculatorCORBAServiceOperations.java delete mode 100644 sca-java-1.x/tags/1.5.1-RC4/samples/calculator-corba-reference/src/test/java/calculator/idl/_CalculatorCORBAServiceImplBase.java delete mode 100644 sca-java-1.x/tags/1.5.1-RC4/samples/calculator-corba-reference/src/test/resources/CalculatorCORBA.idl (limited to 'sca-java-1.x/tags/1.5.1-RC4/samples/calculator-corba-reference') diff --git a/sca-java-1.x/tags/1.5.1-RC4/samples/calculator-corba-reference/README b/sca-java-1.x/tags/1.5.1-RC4/samples/calculator-corba-reference/README deleted file mode 100644 index 66c4cddb94..0000000000 --- a/sca-java-1.x/tags/1.5.1-RC4/samples/calculator-corba-reference/README +++ /dev/null @@ -1,83 +0,0 @@ -Calculator CORBA Reference Sample -=============================== - -This sample illustrates the use of Tuscany CORBA Binding to call reference -services that are hosted as CORBA services. - -The README in the samples directory (the directory above this) provides -general instructions about building and running samples. Take a look there -first. - - -Sample Overview ---------------- -This sample extends the calculator sample by replacing the local wired -connections with CORBA bindings. Instead of local add, subtract, multiply and -divide components, an CORBA service implementation now provides the -add, subtract, multiply and divide interfaces and is hosted as an CORBA object. -References specified in the .composite file include a CORBA binding which targets -this CORBA object. Name service which is used in CORBA communication is provided -in test case class - CalculatorCORBAReferenceTestCase.java. - -This sample adds a number of classes to the basic calculator sample: - -calculator-corba-reference/ - src/ - main/ - java/ - calculator/ - CalculatorService.java - as calculator sample - AddService.java - as calculator sample - SubtractService.java - as calculator sample - MultipleService.java - as calculator sample - DivideService.java - as calculator sample - CalculatorClient.java - as calculator sample - CalculatorServiceImpl.java - calls the CORBA service - that provides the target for the - CORBA bindings in the composite - resources/ - CalculatorCORBAReference.composite - the SCA assembly for this sample - test/ - java/ - calculator/ - CalculatorCORBAReferenceTestCase.java - JUnit test case - CalculatorCORBAServant.java - CORBA service implementation - idl/ - contains files generated - from IDL file. Files are - used to create CORBA object which - will be consumed by SCA reference. - _CalculatorCORBAServiceImplBase.java - CalculatorCORBAService.java - CalculatorCORBAServiceOperations.java - resources/ - CalculatorCORBA.idl - IDL description for CORBA object - pom.xml - the Maven build file - -Note. As this test creates and uses local network connections you may need to -configure your firewall, if you are running one, to allow the test to run -successfully. - -Building And Running The Sample Using Maven -------------------------------------------- -With either the binary or source distributions the sample can be built and run -using Maven as follows. - -cd calculator-corba-reference -mvn - -You should see the following output from the test phase. - -------------------------------------------------------- - T E S T S -------------------------------------------------------- -Running calculator.CalculatorCORBAReferenceTestCase -Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 5.308 sec - -Results : - -Tests run: 1, Failures: 0, Errors: 0, Skipped: 0 - -This shows that the Junit test cases have run successfully. - - - diff --git a/sca-java-1.x/tags/1.5.1-RC4/samples/calculator-corba-reference/pom.xml b/sca-java-1.x/tags/1.5.1-RC4/samples/calculator-corba-reference/pom.xml deleted file mode 100644 index b469d2e9e2..0000000000 --- a/sca-java-1.x/tags/1.5.1-RC4/samples/calculator-corba-reference/pom.xml +++ /dev/null @@ -1,74 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-sca - 1.5.1 - ../../pom.xml - - sample-calculator-corba-reference - Apache Tuscany SCA Sample Calculator CORBA Reference - - - - apache.incubator - http://people.apache.org/repo/m2-incubating-repository - - - - - - org.apache.tuscany.sca - tuscany-host-embedded - 1.5.1 - - - org.apache.tuscany.sca - tuscany-implementation-java-runtime - 1.5.1 - runtime - - - org.apache.tuscany.sca - tuscany-binding-corba-runtime - 1.5.1 - runtime - - - org.apache.tuscany.sca - tuscany-host-corba-jse - 1.5.1 - runtime - - - junit - junit - 4.5 - test - - - - - ${artifactId} - - - diff --git a/sca-java-1.x/tags/1.5.1-RC4/samples/calculator-corba-reference/src/main/java/calculator/AddService.java b/sca-java-1.x/tags/1.5.1-RC4/samples/calculator-corba-reference/src/main/java/calculator/AddService.java deleted file mode 100644 index ec57a6a533..0000000000 --- a/sca-java-1.x/tags/1.5.1-RC4/samples/calculator-corba-reference/src/main/java/calculator/AddService.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * 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 calculator; - -/** - * The interface for the add service - */ -public interface AddService { - - double add(double n1, double n2); - -} diff --git a/sca-java-1.x/tags/1.5.1-RC4/samples/calculator-corba-reference/src/main/java/calculator/CalculatorClient.java b/sca-java-1.x/tags/1.5.1-RC4/samples/calculator-corba-reference/src/main/java/calculator/CalculatorClient.java deleted file mode 100644 index 168240fa01..0000000000 --- a/sca-java-1.x/tags/1.5.1-RC4/samples/calculator-corba-reference/src/main/java/calculator/CalculatorClient.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * 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 calculator; - -import org.apache.tuscany.sca.host.embedded.SCADomain; - -/** - * This client program shows how to create an SCA runtime, start it, - * and locate and invoke a SCA component - */ -public class CalculatorClient { - public static void main(String[] args) throws Exception { - SCADomain scaDomain = SCADomain.newInstance("CalculatorCORBAReference.composite"); - CalculatorService calculatorService = - scaDomain.getService(CalculatorService.class, "CalculatorServiceComponent"); - - // Calculate - System.out.println("3 + 2=" + calculatorService.add(3, 2)); - System.out.println("3 - 2=" + calculatorService.subtract(3, 2)); - System.out.println("3 * 2=" + calculatorService.multiply(3, 2)); - System.out.println("3 / 2=" + calculatorService.divide(3, 2)); - - scaDomain.close(); - - } - -} diff --git a/sca-java-1.x/tags/1.5.1-RC4/samples/calculator-corba-reference/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/tags/1.5.1-RC4/samples/calculator-corba-reference/src/main/java/calculator/CalculatorService.java deleted file mode 100644 index d310dad4b1..0000000000 --- a/sca-java-1.x/tags/1.5.1-RC4/samples/calculator-corba-reference/src/main/java/calculator/CalculatorService.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * 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 calculator; - -import java.rmi.Remote; -import java.rmi.RemoteException; - -import org.osoa.sca.annotations.Remotable; - -/** - * The Calculator service interface. - */ -@Remotable -public interface CalculatorService extends Remote { - - double add(double n1, double n2) throws RemoteException; - - double subtract(double n1, double n2) throws RemoteException; - - double multiply(double n1, double n2) throws RemoteException; - - double divide(double n1, double n2) throws RemoteException; -} diff --git a/sca-java-1.x/tags/1.5.1-RC4/samples/calculator-corba-reference/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/tags/1.5.1-RC4/samples/calculator-corba-reference/src/main/java/calculator/CalculatorServiceImpl.java deleted file mode 100644 index f28f0ca179..0000000000 --- a/sca-java-1.x/tags/1.5.1-RC4/samples/calculator-corba-reference/src/main/java/calculator/CalculatorServiceImpl.java +++ /dev/null @@ -1,68 +0,0 @@ -/* - * 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 calculator; - -import org.osoa.sca.annotations.Reference; - -/** - * An implementation of the Calculator service. - */ -public class CalculatorServiceImpl implements CalculatorService { - - private AddService addService; - private SubtractService subtractService; - private MultiplyService multiplyService; - private DivideService divideService; - - @Reference - public void setAddService(AddService addService) { - this.addService = addService; - } - - @Reference - public void setSubtractService(SubtractService subtractService) { - this.subtractService = subtractService; - } - - @Reference - public void setDivideService(DivideService divideService) { - this.divideService = divideService; - } - - @Reference - public void setMultiplyService(MultiplyService multiplyService) { - this.multiplyService = multiplyService; - } - - public double add(double n1, double n2) { - return addService.add(n1, n2); - } - - public double subtract(double n1, double n2) { - return subtractService.subtract(n1, n2); - } - - public double multiply(double n1, double n2) { - return multiplyService.multiply(n1, n2); - } - - public double divide(double n1, double n2) { - return divideService.divide(n1, n2); - } -} diff --git a/sca-java-1.x/tags/1.5.1-RC4/samples/calculator-corba-reference/src/main/java/calculator/DivideService.java b/sca-java-1.x/tags/1.5.1-RC4/samples/calculator-corba-reference/src/main/java/calculator/DivideService.java deleted file mode 100644 index 835e4fda6d..0000000000 --- a/sca-java-1.x/tags/1.5.1-RC4/samples/calculator-corba-reference/src/main/java/calculator/DivideService.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * 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 calculator; - -/** - * The interface for the divide service - */ -public interface DivideService { - - double divide(double n1, double n2); - -} diff --git a/sca-java-1.x/tags/1.5.1-RC4/samples/calculator-corba-reference/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/tags/1.5.1-RC4/samples/calculator-corba-reference/src/main/java/calculator/MultiplyService.java deleted file mode 100644 index db568cc762..0000000000 --- a/sca-java-1.x/tags/1.5.1-RC4/samples/calculator-corba-reference/src/main/java/calculator/MultiplyService.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * 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 calculator; - -/** - * The interface for the multiply service - */ -public interface MultiplyService { - - double multiply(double n1, double n2); - -} diff --git a/sca-java-1.x/tags/1.5.1-RC4/samples/calculator-corba-reference/src/main/java/calculator/SubtractService.java b/sca-java-1.x/tags/1.5.1-RC4/samples/calculator-corba-reference/src/main/java/calculator/SubtractService.java deleted file mode 100644 index 30e4e6a56a..0000000000 --- a/sca-java-1.x/tags/1.5.1-RC4/samples/calculator-corba-reference/src/main/java/calculator/SubtractService.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * 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 calculator; - -/** - * The interface for the subtract service - */ -public interface SubtractService { - - double subtract(double n1, double n2); - -} diff --git a/sca-java-1.x/tags/1.5.1-RC4/samples/calculator-corba-reference/src/main/resources/CalculatorCORBAReference.composite b/sca-java-1.x/tags/1.5.1-RC4/samples/calculator-corba-reference/src/main/resources/CalculatorCORBAReference.composite deleted file mode 100644 index 717add91a8..0000000000 --- a/sca-java-1.x/tags/1.5.1-RC4/samples/calculator-corba-reference/src/main/resources/CalculatorCORBAReference.composite +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/sca-java-1.x/tags/1.5.1-RC4/samples/calculator-corba-reference/src/test/java/calculator/CalculatorCORBAReferenceTestCase.java b/sca-java-1.x/tags/1.5.1-RC4/samples/calculator-corba-reference/src/test/java/calculator/CalculatorCORBAReferenceTestCase.java deleted file mode 100644 index 041608273b..0000000000 --- a/sca-java-1.x/tags/1.5.1-RC4/samples/calculator-corba-reference/src/test/java/calculator/CalculatorCORBAReferenceTestCase.java +++ /dev/null @@ -1,82 +0,0 @@ -/* - * 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 calculator; - -import junit.framework.Assert; -import junit.framework.TestCase; - -import org.apache.tuscany.sca.host.corba.naming.TransientNameServer; -import org.apache.tuscany.sca.host.corba.naming.TransientNameService; -import org.apache.tuscany.sca.host.embedded.SCADomain; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; -import org.omg.CORBA.ORB; -import org.omg.CosNaming.NameComponent; -import org.omg.CosNaming.NamingContext; -import org.omg.CosNaming.NamingContextHelper; - -/** - * This shows how to test the Calculator service component. - */ -public class CalculatorCORBAReferenceTestCase extends TestCase { - - private SCADomain scaDomain; - private CalculatorService calculatorService; - private TransientNameServer server; - - private void bindObject(String name, org.omg.CORBA.Object object) throws Exception { - ORB orb = server.getORB(); - org.omg.CORBA.Object objRef = orb.resolve_initial_references("NameService"); - NamingContext ncRef = NamingContextHelper.narrow(objRef); - NameComponent nc = new NameComponent(name, ""); - NameComponent path[] = {nc}; - ncRef.rebind(path, object); - } - - @BeforeClass - protected void setUp() throws Exception { - // create name service - server = new TransientNameServer("localhost", 5080, TransientNameService.DEFAULT_SERVICE_NAME); - Thread t = server.start(); - if (t == null) { - Assert.fail("The naming server cannot be started"); - } else { - // create CORBA object which will be accessible by SCA CORBA binding - bindObject("CalculatorCORBAService", new CalculatorCORBAServant()); - scaDomain = SCADomain.newInstance("CalculatorCORBAReference.composite"); - calculatorService = scaDomain.getService(CalculatorService.class, "CalculatorServiceComponent"); - } - } - - @AfterClass - protected void tearDown() throws Exception { - scaDomain.close(); - server.stop(); - } - - @Test - public void testCalculator() throws Exception { - assertEquals(5.0, calculatorService.add(3, 2)); - assertEquals(1.0, calculatorService.subtract(3, 2)); - assertEquals(6.0, calculatorService.multiply(3, 2)); - assertEquals(1.5, calculatorService.divide(3, 2)); - } -} diff --git a/sca-java-1.x/tags/1.5.1-RC4/samples/calculator-corba-reference/src/test/java/calculator/CalculatorCORBAServant.java b/sca-java-1.x/tags/1.5.1-RC4/samples/calculator-corba-reference/src/test/java/calculator/CalculatorCORBAServant.java deleted file mode 100644 index 65e9b89ce2..0000000000 --- a/sca-java-1.x/tags/1.5.1-RC4/samples/calculator-corba-reference/src/test/java/calculator/CalculatorCORBAServant.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * 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 calculator; - -import calculator.idl._CalculatorCORBAServiceImplBase; - -public class CalculatorCORBAServant extends _CalculatorCORBAServiceImplBase { - - private static final long serialVersionUID = 1L; - - public double add(double arg1, double arg2) { - return arg1 + arg2; - } - - public double subtract(double arg1, double arg2) { - return arg1 - arg2; - } - - public double multiply(double arg1, double arg2) { - return arg1 * arg2; - } - - public double divide(double arg1, double arg2) { - return arg1 / arg2; - } - -} diff --git a/sca-java-1.x/tags/1.5.1-RC4/samples/calculator-corba-reference/src/test/java/calculator/idl/CalculatorCORBAService.java b/sca-java-1.x/tags/1.5.1-RC4/samples/calculator-corba-reference/src/test/java/calculator/idl/CalculatorCORBAService.java deleted file mode 100644 index 83a1a5e23c..0000000000 --- a/sca-java-1.x/tags/1.5.1-RC4/samples/calculator-corba-reference/src/test/java/calculator/idl/CalculatorCORBAService.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * 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 calculator.idl; - - -/** -* calculator/idl/CalculatorCORBAService.java . -* Generated by the IDL-to-Java compiler (portable), version "3.2" -* from CalculatorCORBA.idl -* roda, 15 padziernik 2008 16:02:31 CEST -*/ - -public interface CalculatorCORBAService extends CalculatorCORBAServiceOperations, org.omg.CORBA.Object, org.omg.CORBA.portable.IDLEntity -{ -} // interface CalculatorCORBAService diff --git a/sca-java-1.x/tags/1.5.1-RC4/samples/calculator-corba-reference/src/test/java/calculator/idl/CalculatorCORBAServiceOperations.java b/sca-java-1.x/tags/1.5.1-RC4/samples/calculator-corba-reference/src/test/java/calculator/idl/CalculatorCORBAServiceOperations.java deleted file mode 100644 index ea9386dfef..0000000000 --- a/sca-java-1.x/tags/1.5.1-RC4/samples/calculator-corba-reference/src/test/java/calculator/idl/CalculatorCORBAServiceOperations.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * 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 calculator.idl; - - -/** -* calculator/idl/CalculatorCORBAServiceOperations.java . -* Generated by the IDL-to-Java compiler (portable), version "3.2" -* from CalculatorCORBA.idl -* roda, 15 padziernik 2008 16:02:31 CEST -*/ - -public interface CalculatorCORBAServiceOperations -{ - double add (double arg1, double arg2); - double subtract (double arg1, double arg2); - double multiply (double arg1, double arg2); - double divide (double arg1, double arg2); -} // interface CalculatorCORBAServiceOperations diff --git a/sca-java-1.x/tags/1.5.1-RC4/samples/calculator-corba-reference/src/test/java/calculator/idl/_CalculatorCORBAServiceImplBase.java b/sca-java-1.x/tags/1.5.1-RC4/samples/calculator-corba-reference/src/test/java/calculator/idl/_CalculatorCORBAServiceImplBase.java deleted file mode 100644 index c327e447e0..0000000000 --- a/sca-java-1.x/tags/1.5.1-RC4/samples/calculator-corba-reference/src/test/java/calculator/idl/_CalculatorCORBAServiceImplBase.java +++ /dev/null @@ -1,120 +0,0 @@ -/* - * 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 calculator.idl; - - -/** -* calculator/idl/_CalculatorCORBAServiceImplBase.java . -* Generated by the IDL-to-Java compiler (portable), version "3.2" -* from CalculatorCORBA.idl -* roda, 15 padziernik 2008 16:02:31 CEST -*/ - -public abstract class _CalculatorCORBAServiceImplBase extends org.omg.CORBA.portable.ObjectImpl - implements calculator.idl.CalculatorCORBAService, org.omg.CORBA.portable.InvokeHandler -{ - - // Constructors - public _CalculatorCORBAServiceImplBase () - { - } - - private static java.util.Hashtable _methods = new java.util.Hashtable (); - static - { - _methods.put ("add", new java.lang.Integer (0)); - _methods.put ("subtract", new java.lang.Integer (1)); - _methods.put ("multiply", new java.lang.Integer (2)); - _methods.put ("divide", new java.lang.Integer (3)); - } - - public org.omg.CORBA.portable.OutputStream _invoke (String $method, - org.omg.CORBA.portable.InputStream in, - org.omg.CORBA.portable.ResponseHandler $rh) - { - org.omg.CORBA.portable.OutputStream out = null; - java.lang.Integer __method = (java.lang.Integer)_methods.get ($method); - if (__method == null) - throw new org.omg.CORBA.BAD_OPERATION (0, org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE); - - switch (__method.intValue ()) - { - case 0: // calculator/idl/CalculatorCORBAService/add - { - double arg1 = in.read_double (); - double arg2 = in.read_double (); - double $result = (double)0; - $result = this.add (arg1, arg2); - out = $rh.createReply(); - out.write_double ($result); - break; - } - - case 1: // calculator/idl/CalculatorCORBAService/subtract - { - double arg1 = in.read_double (); - double arg2 = in.read_double (); - double $result = (double)0; - $result = this.subtract (arg1, arg2); - out = $rh.createReply(); - out.write_double ($result); - break; - } - - case 2: // calculator/idl/CalculatorCORBAService/multiply - { - double arg1 = in.read_double (); - double arg2 = in.read_double (); - double $result = (double)0; - $result = this.multiply (arg1, arg2); - out = $rh.createReply(); - out.write_double ($result); - break; - } - - case 3: // calculator/idl/CalculatorCORBAService/divide - { - double arg1 = in.read_double (); - double arg2 = in.read_double (); - double $result = (double)0; - $result = this.divide (arg1, arg2); - out = $rh.createReply(); - out.write_double ($result); - break; - } - - default: - throw new org.omg.CORBA.BAD_OPERATION (0, org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE); - } - - return out; - } // _invoke - - // Type-specific CORBA::Object operations - private static String[] __ids = { - "IDL:calculator/idl/CalculatorCORBAService:1.0"}; - - public String[] _ids () - { - return (String[])__ids.clone (); - } - - -} // class _CalculatorCORBAServiceImplBase diff --git a/sca-java-1.x/tags/1.5.1-RC4/samples/calculator-corba-reference/src/test/resources/CalculatorCORBA.idl b/sca-java-1.x/tags/1.5.1-RC4/samples/calculator-corba-reference/src/test/resources/CalculatorCORBA.idl deleted file mode 100644 index 55ffeac8a3..0000000000 --- a/sca-java-1.x/tags/1.5.1-RC4/samples/calculator-corba-reference/src/test/resources/CalculatorCORBA.idl +++ /dev/null @@ -1,33 +0,0 @@ -/* - * 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 -fserver -oldImplBase CalculatorCORBA.idl - */ - -module calculator { - module idl { - interface CalculatorCORBAService { - double add(in double arg1, in double arg2); - double subtract(in double arg1, in double arg2); - double multiply(in double arg1, in double arg2); - double divide(in double arg1, in double arg2); - }; - }; -}; \ No newline at end of file -- cgit v1.2.3