From fdd5b43d3c139cf2cbd1655d2efbfaf9032a5b5e Mon Sep 17 00:00:00 2001 From: lresende Date: Wed, 11 Nov 2009 23:14:18 +0000 Subject: Moving 1.x branches git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@835145 13f79535-47bb-0310-9956-ffa450edef68 --- .../samples/calculator-corba-service/README | 82 ------------ .../samples/calculator-corba-service/pom.xml | 74 ----------- .../src/main/java/calculator/AddService.java | 28 ---- .../src/main/java/calculator/AddServiceImpl.java | 30 ----- .../main/java/calculator/CalculatorService.java | 36 ------ .../java/calculator/CalculatorServiceImpl.java | 68 ---------- .../src/main/java/calculator/DivideService.java | 28 ---- .../main/java/calculator/DivideServiceImpl.java | 30 ----- .../src/main/java/calculator/MultiplyService.java | 28 ---- .../main/java/calculator/MultiplyServiceImpl.java | 30 ----- .../src/main/java/calculator/SubtractService.java | 28 ---- .../main/java/calculator/SubtractServiceImpl.java | 30 ----- .../main/resources/CalculatorCORBAServer.composite | 53 -------- .../calculator/CalculatorCORBAServerTestCase.java | 64 --------- .../calculator/idl/CalculatorCORBAService.java | 32 ----- .../idl/CalculatorCORBAServiceHelper.java | 104 --------------- .../idl/CalculatorCORBAServiceHolder.java | 57 -------- .../idl/CalculatorCORBAServiceOperations.java | 36 ------ .../idl/_CalculatorCORBAServiceStub.java | 143 --------------------- .../src/test/resources/CalculatorCORBA.idl | 33 ----- 20 files changed, 1014 deletions(-) delete mode 100644 branches/sca-java-1.5.1/samples/calculator-corba-service/README delete mode 100644 branches/sca-java-1.5.1/samples/calculator-corba-service/pom.xml delete mode 100644 branches/sca-java-1.5.1/samples/calculator-corba-service/src/main/java/calculator/AddService.java delete mode 100644 branches/sca-java-1.5.1/samples/calculator-corba-service/src/main/java/calculator/AddServiceImpl.java delete mode 100644 branches/sca-java-1.5.1/samples/calculator-corba-service/src/main/java/calculator/CalculatorService.java delete mode 100644 branches/sca-java-1.5.1/samples/calculator-corba-service/src/main/java/calculator/CalculatorServiceImpl.java delete mode 100644 branches/sca-java-1.5.1/samples/calculator-corba-service/src/main/java/calculator/DivideService.java delete mode 100644 branches/sca-java-1.5.1/samples/calculator-corba-service/src/main/java/calculator/DivideServiceImpl.java delete mode 100644 branches/sca-java-1.5.1/samples/calculator-corba-service/src/main/java/calculator/MultiplyService.java delete mode 100644 branches/sca-java-1.5.1/samples/calculator-corba-service/src/main/java/calculator/MultiplyServiceImpl.java delete mode 100644 branches/sca-java-1.5.1/samples/calculator-corba-service/src/main/java/calculator/SubtractService.java delete mode 100644 branches/sca-java-1.5.1/samples/calculator-corba-service/src/main/java/calculator/SubtractServiceImpl.java delete mode 100644 branches/sca-java-1.5.1/samples/calculator-corba-service/src/main/resources/CalculatorCORBAServer.composite delete mode 100644 branches/sca-java-1.5.1/samples/calculator-corba-service/src/test/java/calculator/CalculatorCORBAServerTestCase.java delete mode 100644 branches/sca-java-1.5.1/samples/calculator-corba-service/src/test/java/calculator/idl/CalculatorCORBAService.java delete mode 100644 branches/sca-java-1.5.1/samples/calculator-corba-service/src/test/java/calculator/idl/CalculatorCORBAServiceHelper.java delete mode 100644 branches/sca-java-1.5.1/samples/calculator-corba-service/src/test/java/calculator/idl/CalculatorCORBAServiceHolder.java delete mode 100644 branches/sca-java-1.5.1/samples/calculator-corba-service/src/test/java/calculator/idl/CalculatorCORBAServiceOperations.java delete mode 100644 branches/sca-java-1.5.1/samples/calculator-corba-service/src/test/java/calculator/idl/_CalculatorCORBAServiceStub.java delete mode 100644 branches/sca-java-1.5.1/samples/calculator-corba-service/src/test/resources/CalculatorCORBA.idl (limited to 'branches/sca-java-1.5.1/samples/calculator-corba-service') diff --git a/branches/sca-java-1.5.1/samples/calculator-corba-service/README b/branches/sca-java-1.5.1/samples/calculator-corba-service/README deleted file mode 100644 index 87863752cd..0000000000 --- a/branches/sca-java-1.5.1/samples/calculator-corba-service/README +++ /dev/null @@ -1,82 +0,0 @@ -Calculator CORBA Service Sample -============================= - -This sample illustrates the use of Tuscany CORBA Binding to expose component -services as CORBA objects. It also demonstrates how a simple Java CORBA -Client application invokes the SCA Application's services exposed 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 service -binding with an CORBA binding. So a java client can call the service exposed -by the SCA application using an CORBA client. Name service which is used in -CORBA communication is provided by Tuscany CORBA hosting module -(maven dependency: tuscany-host-corba-jse-tns) - see CORBA binding reference -on Apache Tuscany website for details. - -This sample adds a number of classes to the basic calculator sample: - -calculator-corba-service/ - src/ - main/ - java/ - calculator/ - CalculatorService.java - as calculator sample - CalculatorServiceImpl.java - AddService.java - as calculator sample - AddServiceImpl.java - SubtractService.java - as calculator sample - SubtractServiceImpl.java - MultiplyService.java - as calculator sample - MultiplyServiceImpl.java - DivideService.java - as calculator sample - DivideServiceImpl.java - resources/ - CalculatorCORBAServer.composite - the SCA assembly for this sample - test/ - java/ - calculator/ - CalculatorCORBAServerTestCase.java - JUnit test case - idl/ - contains files generated - from IDL file. Files are - used to access SCA component. - CalculatorCORBAServiceHelper.java - CalculatorCORBAService.java - _CalculatorCORBAServiceStub.java - CalculatorCORBAServiceHolder.java - CalculatorCORBAServiceOperations.java - resources/ - CalculatorCORBA.idl - IDL description for SCA component - 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-service -mvn - -You should see the following output from the test phase. - -------------------------------------------------------- - T E S T S -------------------------------------------------------- -Running calculator.CalculatorCORBAServerTestCase -Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 5.819 sec - -Results : - -Tests run: 1, Failures: 0, Errors: 0, Skipped: 0 - -This shows that the Junit test cases have run successfully. diff --git a/branches/sca-java-1.5.1/samples/calculator-corba-service/pom.xml b/branches/sca-java-1.5.1/samples/calculator-corba-service/pom.xml deleted file mode 100644 index 36f202b820..0000000000 --- a/branches/sca-java-1.5.1/samples/calculator-corba-service/pom.xml +++ /dev/null @@ -1,74 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-sca - 1.5.1-SNAPSHOT - ../../pom.xml - - sample-calculator-corba-service - Apache Tuscany SCA Sample Calculator CORBA Service - - - - apache.incubator - http://people.apache.org/repo/m2-incubating-repository - - - - - - org.apache.tuscany.sca - tuscany-host-embedded - 1.5.1-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-implementation-java-runtime - 1.5.1-SNAPSHOT - runtime - - - org.apache.tuscany.sca - tuscany-binding-corba-runtime - 1.5.1-SNAPSHOT - runtime - - - org.apache.tuscany.sca - tuscany-host-corba-jse-tns - 1.5.1-SNAPSHOT - runtime - - - junit - junit - 4.5 - test - - - - - ${artifactId} - - - diff --git a/branches/sca-java-1.5.1/samples/calculator-corba-service/src/main/java/calculator/AddService.java b/branches/sca-java-1.5.1/samples/calculator-corba-service/src/main/java/calculator/AddService.java deleted file mode 100644 index ec57a6a533..0000000000 --- a/branches/sca-java-1.5.1/samples/calculator-corba-service/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/branches/sca-java-1.5.1/samples/calculator-corba-service/src/main/java/calculator/AddServiceImpl.java b/branches/sca-java-1.5.1/samples/calculator-corba-service/src/main/java/calculator/AddServiceImpl.java deleted file mode 100644 index e9c635e3c8..0000000000 --- a/branches/sca-java-1.5.1/samples/calculator-corba-service/src/main/java/calculator/AddServiceImpl.java +++ /dev/null @@ -1,30 +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; - -/** - * An implementation of the Add service - */ -public class AddServiceImpl implements AddService { - - public double add(double n1, double n2) { - return n1 + n2; - } - -} diff --git a/branches/sca-java-1.5.1/samples/calculator-corba-service/src/main/java/calculator/CalculatorService.java b/branches/sca-java-1.5.1/samples/calculator-corba-service/src/main/java/calculator/CalculatorService.java deleted file mode 100644 index 3ddcef61df..0000000000 --- a/branches/sca-java-1.5.1/samples/calculator-corba-service/src/main/java/calculator/CalculatorService.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; - -import org.osoa.sca.annotations.Remotable; - -/** - * The Calculator service interface. - */ -@Remotable -public interface CalculatorService { - - double add(double n1, double n2); - - double subtract(double n1, double n2); - - double multiply(double n1, double n2); - - double divide(double n1, double n2); -} diff --git a/branches/sca-java-1.5.1/samples/calculator-corba-service/src/main/java/calculator/CalculatorServiceImpl.java b/branches/sca-java-1.5.1/samples/calculator-corba-service/src/main/java/calculator/CalculatorServiceImpl.java deleted file mode 100644 index f28f0ca179..0000000000 --- a/branches/sca-java-1.5.1/samples/calculator-corba-service/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/branches/sca-java-1.5.1/samples/calculator-corba-service/src/main/java/calculator/DivideService.java b/branches/sca-java-1.5.1/samples/calculator-corba-service/src/main/java/calculator/DivideService.java deleted file mode 100644 index 835e4fda6d..0000000000 --- a/branches/sca-java-1.5.1/samples/calculator-corba-service/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/branches/sca-java-1.5.1/samples/calculator-corba-service/src/main/java/calculator/DivideServiceImpl.java b/branches/sca-java-1.5.1/samples/calculator-corba-service/src/main/java/calculator/DivideServiceImpl.java deleted file mode 100644 index 8c33862f6d..0000000000 --- a/branches/sca-java-1.5.1/samples/calculator-corba-service/src/main/java/calculator/DivideServiceImpl.java +++ /dev/null @@ -1,30 +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; - -/** - * An implementation of the Divide service. - */ -public class DivideServiceImpl implements DivideService { - - public double divide(double n1, double n2) { - return n1 / n2; - } - -} diff --git a/branches/sca-java-1.5.1/samples/calculator-corba-service/src/main/java/calculator/MultiplyService.java b/branches/sca-java-1.5.1/samples/calculator-corba-service/src/main/java/calculator/MultiplyService.java deleted file mode 100644 index db568cc762..0000000000 --- a/branches/sca-java-1.5.1/samples/calculator-corba-service/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/branches/sca-java-1.5.1/samples/calculator-corba-service/src/main/java/calculator/MultiplyServiceImpl.java b/branches/sca-java-1.5.1/samples/calculator-corba-service/src/main/java/calculator/MultiplyServiceImpl.java deleted file mode 100644 index c7fbc73c00..0000000000 --- a/branches/sca-java-1.5.1/samples/calculator-corba-service/src/main/java/calculator/MultiplyServiceImpl.java +++ /dev/null @@ -1,30 +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; - -/** - * An implementation of the Multiply service. - */ -public class MultiplyServiceImpl implements MultiplyService { - - public double multiply(double n1, double n2) { - return n1 * n2; - } - -} diff --git a/branches/sca-java-1.5.1/samples/calculator-corba-service/src/main/java/calculator/SubtractService.java b/branches/sca-java-1.5.1/samples/calculator-corba-service/src/main/java/calculator/SubtractService.java deleted file mode 100644 index 30e4e6a56a..0000000000 --- a/branches/sca-java-1.5.1/samples/calculator-corba-service/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/branches/sca-java-1.5.1/samples/calculator-corba-service/src/main/java/calculator/SubtractServiceImpl.java b/branches/sca-java-1.5.1/samples/calculator-corba-service/src/main/java/calculator/SubtractServiceImpl.java deleted file mode 100644 index 1a7f145ad8..0000000000 --- a/branches/sca-java-1.5.1/samples/calculator-corba-service/src/main/java/calculator/SubtractServiceImpl.java +++ /dev/null @@ -1,30 +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; - -/** - * An implementation of the subtract service. - */ -public class SubtractServiceImpl implements SubtractService { - - public double subtract(double n1, double n2) { - return n1 - n2; - } - -} diff --git a/branches/sca-java-1.5.1/samples/calculator-corba-service/src/main/resources/CalculatorCORBAServer.composite b/branches/sca-java-1.5.1/samples/calculator-corba-service/src/main/resources/CalculatorCORBAServer.composite deleted file mode 100644 index 1ab6cecef7..0000000000 --- a/branches/sca-java-1.5.1/samples/calculator-corba-service/src/main/resources/CalculatorCORBAServer.composite +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.5.1/samples/calculator-corba-service/src/test/java/calculator/CalculatorCORBAServerTestCase.java b/branches/sca-java-1.5.1/samples/calculator-corba-service/src/test/java/calculator/CalculatorCORBAServerTestCase.java deleted file mode 100644 index 4248ca8573..0000000000 --- a/branches/sca-java-1.5.1/samples/calculator-corba-service/src/test/java/calculator/CalculatorCORBAServerTestCase.java +++ /dev/null @@ -1,64 +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.TestCase; - -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 calculator.idl.CalculatorCORBAService; -import calculator.idl.CalculatorCORBAServiceHelper; - -/** - * This shows how to test the Calculator service component. - */ -public class CalculatorCORBAServerTestCase extends TestCase { - - private SCADomain scaDomain; - private CalculatorCORBAService calculatorService; - - @BeforeClass - protected void setUp() throws Exception { - scaDomain = SCADomain.newInstance("CalculatorCORBAServer.composite"); - String[] args = {"-ORBInitialPort", "5080"}; - // retrieve CORBA object which is SCA component - ORB orb = ORB.init(args, null); - calculatorService = - CalculatorCORBAServiceHelper.narrow(orb - .string_to_object("corbaname::localhost:5080#CalculatorCORBAService")); - } - - @AfterClass - protected void tearDown() throws Exception { - scaDomain.close(); - } - - @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/branches/sca-java-1.5.1/samples/calculator-corba-service/src/test/java/calculator/idl/CalculatorCORBAService.java b/branches/sca-java-1.5.1/samples/calculator-corba-service/src/test/java/calculator/idl/CalculatorCORBAService.java deleted file mode 100644 index 97deba8ad0..0000000000 --- a/branches/sca-java-1.5.1/samples/calculator-corba-service/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 15:59:26 CEST -*/ - -public interface CalculatorCORBAService extends CalculatorCORBAServiceOperations, org.omg.CORBA.Object, org.omg.CORBA.portable.IDLEntity -{ -} // interface CalculatorCORBAService diff --git a/branches/sca-java-1.5.1/samples/calculator-corba-service/src/test/java/calculator/idl/CalculatorCORBAServiceHelper.java b/branches/sca-java-1.5.1/samples/calculator-corba-service/src/test/java/calculator/idl/CalculatorCORBAServiceHelper.java deleted file mode 100644 index 3940e80c7b..0000000000 --- a/branches/sca-java-1.5.1/samples/calculator-corba-service/src/test/java/calculator/idl/CalculatorCORBAServiceHelper.java +++ /dev/null @@ -1,104 +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/CalculatorCORBAServiceHelper.java . -* Generated by the IDL-to-Java compiler (portable), version "3.2" -* from CalculatorCORBA.idl -* roda, 15 padziernik 2008 15:59:26 CEST -*/ - -abstract public class CalculatorCORBAServiceHelper -{ - private static String _id = "IDL:calculator/idl/CalculatorCORBAService:1.0"; - - public static void insert (org.omg.CORBA.Any a, calculator.idl.CalculatorCORBAService that) - { - org.omg.CORBA.portable.OutputStream out = a.create_output_stream (); - a.type (type ()); - write (out, that); - a.read_value (out.create_input_stream (), type ()); - } - - public static calculator.idl.CalculatorCORBAService extract (org.omg.CORBA.Any a) - { - return read (a.create_input_stream ()); - } - - private static org.omg.CORBA.TypeCode __typeCode = null; - synchronized public static org.omg.CORBA.TypeCode type () - { - if (__typeCode == null) - { - __typeCode = org.omg.CORBA.ORB.init ().create_interface_tc (calculator.idl.CalculatorCORBAServiceHelper.id (), "CalculatorCORBAService"); - } - return __typeCode; - } - - public static String id () - { - return _id; - } - - public static calculator.idl.CalculatorCORBAService read (org.omg.CORBA.portable.InputStream istream) - { - return narrow (istream.read_Object (_CalculatorCORBAServiceStub.class)); - } - - public static void write (org.omg.CORBA.portable.OutputStream ostream, calculator.idl.CalculatorCORBAService value) - { - ostream.write_Object ((org.omg.CORBA.Object) value); - } - - public static calculator.idl.CalculatorCORBAService narrow (org.omg.CORBA.Object obj) - { - if (obj == null) - return null; - else if (obj instanceof calculator.idl.CalculatorCORBAService) - return (calculator.idl.CalculatorCORBAService)obj; - else if (!obj._is_a (id ())) - throw new org.omg.CORBA.BAD_PARAM (); - else - { - org.omg.CORBA.portable.Delegate delegate = ((org.omg.CORBA.portable.ObjectImpl)obj)._get_delegate (); - calculator.idl._CalculatorCORBAServiceStub stub = new calculator.idl._CalculatorCORBAServiceStub (); - stub._set_delegate(delegate); - return stub; - } - } - - public static calculator.idl.CalculatorCORBAService unchecked_narrow (org.omg.CORBA.Object obj) - { - if (obj == null) - return null; - else if (obj instanceof calculator.idl.CalculatorCORBAService) - return (calculator.idl.CalculatorCORBAService)obj; - else - { - org.omg.CORBA.portable.Delegate delegate = ((org.omg.CORBA.portable.ObjectImpl)obj)._get_delegate (); - calculator.idl._CalculatorCORBAServiceStub stub = new calculator.idl._CalculatorCORBAServiceStub (); - stub._set_delegate(delegate); - return stub; - } - } - -} diff --git a/branches/sca-java-1.5.1/samples/calculator-corba-service/src/test/java/calculator/idl/CalculatorCORBAServiceHolder.java b/branches/sca-java-1.5.1/samples/calculator-corba-service/src/test/java/calculator/idl/CalculatorCORBAServiceHolder.java deleted file mode 100644 index ba67857ef2..0000000000 --- a/branches/sca-java-1.5.1/samples/calculator-corba-service/src/test/java/calculator/idl/CalculatorCORBAServiceHolder.java +++ /dev/null @@ -1,57 +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/CalculatorCORBAServiceHolder.java . -* Generated by the IDL-to-Java compiler (portable), version "3.2" -* from CalculatorCORBA.idl -* roda, 15 padziernik 2008 15:59:26 CEST -*/ - -public final class CalculatorCORBAServiceHolder implements org.omg.CORBA.portable.Streamable -{ - public calculator.idl.CalculatorCORBAService value = null; - - public CalculatorCORBAServiceHolder () - { - } - - public CalculatorCORBAServiceHolder (calculator.idl.CalculatorCORBAService initialValue) - { - value = initialValue; - } - - public void _read (org.omg.CORBA.portable.InputStream i) - { - value = calculator.idl.CalculatorCORBAServiceHelper.read (i); - } - - public void _write (org.omg.CORBA.portable.OutputStream o) - { - calculator.idl.CalculatorCORBAServiceHelper.write (o, value); - } - - public org.omg.CORBA.TypeCode _type () - { - return calculator.idl.CalculatorCORBAServiceHelper.type (); - } - -} diff --git a/branches/sca-java-1.5.1/samples/calculator-corba-service/src/test/java/calculator/idl/CalculatorCORBAServiceOperations.java b/branches/sca-java-1.5.1/samples/calculator-corba-service/src/test/java/calculator/idl/CalculatorCORBAServiceOperations.java deleted file mode 100644 index 25e1f2bc1a..0000000000 --- a/branches/sca-java-1.5.1/samples/calculator-corba-service/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 15:59:26 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/branches/sca-java-1.5.1/samples/calculator-corba-service/src/test/java/calculator/idl/_CalculatorCORBAServiceStub.java b/branches/sca-java-1.5.1/samples/calculator-corba-service/src/test/java/calculator/idl/_CalculatorCORBAServiceStub.java deleted file mode 100644 index c78a5ea161..0000000000 --- a/branches/sca-java-1.5.1/samples/calculator-corba-service/src/test/java/calculator/idl/_CalculatorCORBAServiceStub.java +++ /dev/null @@ -1,143 +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/_CalculatorCORBAServiceStub.java . -* Generated by the IDL-to-Java compiler (portable), version "3.2" -* from CalculatorCORBA.idl -* roda, 15 padziernik 2008 15:59:26 CEST -*/ - -public class _CalculatorCORBAServiceStub extends org.omg.CORBA.portable.ObjectImpl implements calculator.idl.CalculatorCORBAService -{ - - public double add (double arg1, double arg2) - { - org.omg.CORBA.portable.InputStream $in = null; - try { - org.omg.CORBA.portable.OutputStream $out = _request ("add", true); - $out.write_double (arg1); - $out.write_double (arg2); - $in = _invoke ($out); - double $result = $in.read_double (); - return $result; - } catch (org.omg.CORBA.portable.ApplicationException $ex) { - $in = $ex.getInputStream (); - String _id = $ex.getId (); - throw new org.omg.CORBA.MARSHAL (_id); - } catch (org.omg.CORBA.portable.RemarshalException $rm) { - return add (arg1, arg2 ); - } finally { - _releaseReply ($in); - } - } // add - - public double subtract (double arg1, double arg2) - { - org.omg.CORBA.portable.InputStream $in = null; - try { - org.omg.CORBA.portable.OutputStream $out = _request ("subtract", true); - $out.write_double (arg1); - $out.write_double (arg2); - $in = _invoke ($out); - double $result = $in.read_double (); - return $result; - } catch (org.omg.CORBA.portable.ApplicationException $ex) { - $in = $ex.getInputStream (); - String _id = $ex.getId (); - throw new org.omg.CORBA.MARSHAL (_id); - } catch (org.omg.CORBA.portable.RemarshalException $rm) { - return subtract (arg1, arg2 ); - } finally { - _releaseReply ($in); - } - } // subtract - - public double multiply (double arg1, double arg2) - { - org.omg.CORBA.portable.InputStream $in = null; - try { - org.omg.CORBA.portable.OutputStream $out = _request ("multiply", true); - $out.write_double (arg1); - $out.write_double (arg2); - $in = _invoke ($out); - double $result = $in.read_double (); - return $result; - } catch (org.omg.CORBA.portable.ApplicationException $ex) { - $in = $ex.getInputStream (); - String _id = $ex.getId (); - throw new org.omg.CORBA.MARSHAL (_id); - } catch (org.omg.CORBA.portable.RemarshalException $rm) { - return multiply (arg1, arg2 ); - } finally { - _releaseReply ($in); - } - } // multiply - - public double divide (double arg1, double arg2) - { - org.omg.CORBA.portable.InputStream $in = null; - try { - org.omg.CORBA.portable.OutputStream $out = _request ("divide", true); - $out.write_double (arg1); - $out.write_double (arg2); - $in = _invoke ($out); - double $result = $in.read_double (); - return $result; - } catch (org.omg.CORBA.portable.ApplicationException $ex) { - $in = $ex.getInputStream (); - String _id = $ex.getId (); - throw new org.omg.CORBA.MARSHAL (_id); - } catch (org.omg.CORBA.portable.RemarshalException $rm) { - return divide (arg1, arg2 ); - } finally { - _releaseReply ($in); - } - } // divide - - // Type-specific CORBA::Object operations - private static String[] __ids = { - "IDL:calculator/idl/CalculatorCORBAService:1.0"}; - - public String[] _ids () - { - return (String[])__ids.clone (); - } - - private void readObject (java.io.ObjectInputStream s) throws java.io.IOException - { - String str = s.readUTF (); - String[] args = null; - java.util.Properties props = null; - org.omg.CORBA.Object obj = org.omg.CORBA.ORB.init (args, props).string_to_object (str); - org.omg.CORBA.portable.Delegate delegate = ((org.omg.CORBA.portable.ObjectImpl) obj)._get_delegate (); - _set_delegate (delegate); - } - - private void writeObject (java.io.ObjectOutputStream s) throws java.io.IOException - { - String[] args = null; - java.util.Properties props = null; - String str = org.omg.CORBA.ORB.init (args, props).object_to_string (this); - s.writeUTF (str); - } -} // class _CalculatorCORBAServiceStub diff --git a/branches/sca-java-1.5.1/samples/calculator-corba-service/src/test/resources/CalculatorCORBA.idl b/branches/sca-java-1.5.1/samples/calculator-corba-service/src/test/resources/CalculatorCORBA.idl deleted file mode 100644 index 5848bbaa2c..0000000000 --- a/branches/sca-java-1.5.1/samples/calculator-corba-service/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 -fclient -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