You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2007/05/16 01:32:27 UTC
svn commit: r538384 - in /incubator/tuscany/java/sca/samples:
calculator-rmi-reference/src/main/java/calculator/
calculator-rmi-reference/src/main/resources/
calculator-rmi-reference/src/test/java/calculator/
calculator-rmi-service/src/main/resources/ ...
Author: jsdelfino
Date: Tue May 15 16:32:26 2007
New Revision: 538384
URL: http://svn.apache.org/viewvc?view=rev&rev=538384
Log:
Changed composite services to component services in samples, and removed unnecessary composite services.
Added:
incubator/tuscany/java/sca/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIServiceImpl.java (with props)
Removed:
incubator/tuscany/java/sca/samples/calculator-rmi-reference/src/main/java/calculator/AddServiceImpl.java
incubator/tuscany/java/sca/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorServer.java
incubator/tuscany/java/sca/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorServiceRmiImpl.java
incubator/tuscany/java/sca/samples/calculator-rmi-reference/src/main/java/calculator/DivideServiceImpl.java
incubator/tuscany/java/sca/samples/calculator-rmi-reference/src/main/java/calculator/MultiplyServiceImpl.java
incubator/tuscany/java/sca/samples/calculator-rmi-reference/src/main/java/calculator/SubtractServiceImpl.java
Modified:
incubator/tuscany/java/sca/samples/calculator-rmi-reference/src/main/resources/CalculatorRMIReference.composite
incubator/tuscany/java/sca/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java
incubator/tuscany/java/sca/samples/calculator-rmi-service/src/main/resources/CalculatorRMIServer.composite
incubator/tuscany/java/sca/samples/calculator-script/src/main/resources/Calculator.composite
incubator/tuscany/java/sca/samples/calculator-web/src/main/resources/Calculator.composite
incubator/tuscany/java/sca/samples/calculator/src/main/resources/Calculator.composite
incubator/tuscany/java/sca/samples/helloworld-jsonrpc/src/main/resources/jsonrpc.composite
incubator/tuscany/java/sca/samples/helloworld-jsonrpc/src/main/webapp/HelloWorldJSONRPC.html
incubator/tuscany/java/sca/samples/helloworld-ws-reference/src/main/resources/wsdl/helloworld.wsdl
incubator/tuscany/java/sca/samples/helloworld-ws-service/src/main/resources/helloworldws.composite
incubator/tuscany/java/sca/samples/helloworld-ws-service/src/main/resources/wsdl/helloworld.wsdl
incubator/tuscany/java/sca/samples/simple-bigbank/src/main/resources/BigBank.composite
Modified: incubator/tuscany/java/sca/samples/calculator-rmi-reference/src/main/resources/CalculatorRMIReference.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/calculator-rmi-reference/src/main/resources/CalculatorRMIReference.composite?view=diff&rev=538384&r1=538383&r2=538384
==============================================================================
--- incubator/tuscany/java/sca/samples/calculator-rmi-reference/src/main/resources/CalculatorRMIReference.composite (original)
+++ incubator/tuscany/java/sca/samples/calculator-rmi-reference/src/main/resources/CalculatorRMIReference.composite Tue May 15 16:32:26 2007
@@ -22,25 +22,18 @@
<component name="CalculatorServiceComponent">
<implementation.java class="calculator.CalculatorServiceImpl"/>
- <reference name="addService" />
- <reference name="subtractService" />
- <reference name="multiplyService" />
- <reference name="divideService" />
+ <reference name="addService">
+ <binding.rmi host="localhost" port="8099" serviceName="CalculatorRMIService"/>
+ </reference>
+ <reference name="subtractService">
+ <binding.rmi host="localhost" port="8099" serviceName="CalculatorRMIService"/>
+ </reference>
+ <reference name="multiplyService">
+ <binding.rmi host="localhost" port="8099" serviceName="CalculatorRMIService"/>
+ </reference>
+ <reference name="divideService">
+ <binding.rmi host="localhost" port="8099" serviceName="CalculatorRMIService"/>
+ </reference>
</component>
- <reference name="AddReference" promote="CalculatorServiceComponent/addService">
- <binding.rmi host="localhost" port="8099" serviceName="CalculatorRMIService"/>
- </reference>
-
- <reference name="SubtractReference" promote="CalculatorServiceComponent/subtractService">
- <binding.rmi host="localhost" port="8099" serviceName="CalculatorRMIService"/>
- </reference>
-
- <reference name="MultiplyReference" promote="CalculatorServiceComponent/multiplyService">
- <binding.rmi host="localhost" port="8099" serviceName="CalculatorRMIService"/>
- </reference>
-
- <reference name="DivideReference" promote="CalculatorServiceComponent/divideService">
- <binding.rmi host="localhost" port="8099" serviceName="CalculatorRMIService"/>
- </reference>
</composite>
Modified: incubator/tuscany/java/sca/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java?view=diff&rev=538384&r1=538383&r2=538384
==============================================================================
--- incubator/tuscany/java/sca/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java (original)
+++ incubator/tuscany/java/sca/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java Tue May 15 16:32:26 2007
@@ -35,7 +35,7 @@
private CalculatorService calculatorService;
protected void setUp() throws Exception {
- CalculatorServiceRmiImpl rmiCalculatorImpl = new CalculatorServiceRmiImpl();
+ CalculatorRMIServiceImpl rmiCalculatorImpl = new CalculatorRMIServiceImpl();
Registry rmiRegistry = LocateRegistry.createRegistry(8099);
rmiRegistry.bind("CalculatorRMIService", rmiCalculatorImpl);
Added: incubator/tuscany/java/sca/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIServiceImpl.java?view=auto&rev=538384
==============================================================================
--- incubator/tuscany/java/sca/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIServiceImpl.java (added)
+++ incubator/tuscany/java/sca/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIServiceImpl.java Tue May 15 16:32:26 2007
@@ -0,0 +1,52 @@
+/*
+ * 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.RemoteException;
+import java.rmi.server.UnicastRemoteObject;
+
+
+
+/**
+ * An implementation of the Calculator service.
+ */
+public class CalculatorRMIServiceImpl extends UnicastRemoteObject implements CalculatorService {
+
+ private static final long serialVersionUID = -1543948944662001428L;
+
+ public CalculatorRMIServiceImpl() throws RemoteException {
+ super();
+ }
+
+ public double add(double n1, double n2) throws RemoteException {
+ return n1 + n2;
+ }
+
+ public double subtract(double n1, double n2) {
+ return n1 - n2;
+ }
+
+ public double multiply(double n1, double n2) {
+ return n1 * n2;
+ }
+
+ public double divide(double n1, double n2) {
+ return n1 / n2;
+ }
+}
Propchange: incubator/tuscany/java/sca/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIServiceImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIServiceImpl.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/java/sca/samples/calculator-rmi-service/src/main/resources/CalculatorRMIServer.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/calculator-rmi-service/src/main/resources/CalculatorRMIServer.composite?view=diff&rev=538384&r1=538383&r2=538384
==============================================================================
--- incubator/tuscany/java/sca/samples/calculator-rmi-service/src/main/resources/CalculatorRMIServer.composite (original)
+++ incubator/tuscany/java/sca/samples/calculator-rmi-service/src/main/resources/CalculatorRMIServer.composite Tue May 15 16:32:26 2007
@@ -20,12 +20,11 @@
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
name="Calculator">
- <service name="CalculatorService" promote="CalculatorServiceComponent">
- <interface.java interface="calculator.CalculatorService"/>
- <binding.rmi host="localhost" port="8099" serviceName="CalculatorRMIService"/>
- </service>
-
<component name="CalculatorServiceComponent">
+ <service name="CalculatorService">
+ <interface.java interface="calculator.CalculatorService"/>
+ <binding.rmi host="localhost" port="8099" serviceName="CalculatorRMIService"/>
+ </service>
<implementation.java class="calculator.CalculatorServiceImpl"/>
<reference name="addService" target="AddServiceComponent"></reference>
<reference name="subtractService" target="SubtractServiceComponent"></reference>
Modified: incubator/tuscany/java/sca/samples/calculator-script/src/main/resources/Calculator.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/calculator-script/src/main/resources/Calculator.composite?view=diff&rev=538384&r1=538383&r2=538384
==============================================================================
--- incubator/tuscany/java/sca/samples/calculator-script/src/main/resources/Calculator.composite (original)
+++ incubator/tuscany/java/sca/samples/calculator-script/src/main/resources/Calculator.composite Tue May 15 16:32:26 2007
@@ -20,10 +20,6 @@
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
name="Calculator">
- <service name="CalculatorService" promote="CalculatorServiceComponent">
- <interface.java interface="calculator.CalculatorService"/>
- </service>
-
<component name="CalculatorServiceComponent">
<implementation.java class="calculator.CalculatorServiceImpl"/>
<reference name="addService" target="AddServiceComponent" />
Modified: incubator/tuscany/java/sca/samples/calculator-web/src/main/resources/Calculator.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/calculator-web/src/main/resources/Calculator.composite?view=diff&rev=538384&r1=538383&r2=538384
==============================================================================
--- incubator/tuscany/java/sca/samples/calculator-web/src/main/resources/Calculator.composite (original)
+++ incubator/tuscany/java/sca/samples/calculator-web/src/main/resources/Calculator.composite Tue May 15 16:32:26 2007
@@ -20,10 +20,6 @@
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
name="Calculator">
- <service name="CalculatorService" promote="CalculatorServiceComponent">
- <interface.java interface="calculator.CalculatorService"/>
- </service>
-
<component name="CalculatorServiceComponent">
<implementation.java class="calculator.CalculatorServiceImpl"/>
<reference name="addService" target="AddServiceComponent"></reference>
Modified: incubator/tuscany/java/sca/samples/calculator/src/main/resources/Calculator.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/calculator/src/main/resources/Calculator.composite?view=diff&rev=538384&r1=538383&r2=538384
==============================================================================
--- incubator/tuscany/java/sca/samples/calculator/src/main/resources/Calculator.composite (original)
+++ incubator/tuscany/java/sca/samples/calculator/src/main/resources/Calculator.composite Tue May 15 16:32:26 2007
@@ -20,10 +20,6 @@
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
name="Calculator">
- <service name="CalculatorService" promote="CalculatorServiceComponent">
- <interface.java interface="calculator.CalculatorService"/>
- </service>
-
<component name="CalculatorServiceComponent">
<implementation.java class="calculator.CalculatorServiceImpl"/>
<reference name="addService" target="AddServiceComponent" />
Modified: incubator/tuscany/java/sca/samples/helloworld-jsonrpc/src/main/resources/jsonrpc.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/helloworld-jsonrpc/src/main/resources/jsonrpc.composite?view=diff&rev=538384&r1=538383&r2=538384
==============================================================================
--- incubator/tuscany/java/sca/samples/helloworld-jsonrpc/src/main/resources/jsonrpc.composite (original)
+++ incubator/tuscany/java/sca/samples/helloworld-jsonrpc/src/main/resources/jsonrpc.composite Tue May 15 16:32:26 2007
@@ -20,12 +20,11 @@
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
name="helloworldjsonrpc">
- <service name="HelloWorldJSONService" promote="HelloWorldJSONServiceComponent">
- <interface.java interface="helloworldjsonrpc.HelloWorldService"/>
- <binding.jsonrpc/>
- </service>
-
<component name="HelloWorldJSONServiceComponent">
+ <service name="HelloWorldService">
+ <interface.java interface="helloworldjsonrpc.HelloWorldService"/>
+ <binding.jsonrpc/>
+ </service>
<implementation.java class="helloworldjsonrpc.HelloWorldServiceImpl"/>
</component>
Modified: incubator/tuscany/java/sca/samples/helloworld-jsonrpc/src/main/webapp/HelloWorldJSONRPC.html
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/helloworld-jsonrpc/src/main/webapp/HelloWorldJSONRPC.html?view=diff&rev=538384&r1=538383&r2=538384
==============================================================================
--- incubator/tuscany/java/sca/samples/helloworld-jsonrpc/src/main/webapp/HelloWorldJSONRPC.html (original)
+++ incubator/tuscany/java/sca/samples/helloworld-jsonrpc/src/main/webapp/HelloWorldJSONRPC.html Tue May 15 16:32:26 2007
@@ -28,7 +28,7 @@
<script type="text/javascript" src="services/SCA/scripts"></script>
<script language="JavaScript">
- SCA = new JSONRpcClient("services/HelloWorldJSONService");
+ SCA = new JSONRpcClient("services/HelloWorldService");
function getGreeting() {
var name = document.getElementById("name").value;
Modified: incubator/tuscany/java/sca/samples/helloworld-ws-reference/src/main/resources/wsdl/helloworld.wsdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/helloworld-ws-reference/src/main/resources/wsdl/helloworld.wsdl?view=diff&rev=538384&r1=538383&r2=538384
==============================================================================
--- incubator/tuscany/java/sca/samples/helloworld-ws-reference/src/main/resources/wsdl/helloworld.wsdl (original)
+++ incubator/tuscany/java/sca/samples/helloworld-ws-reference/src/main/resources/wsdl/helloworld.wsdl Tue May 15 16:32:26 2007
@@ -72,7 +72,7 @@
<wsdl:service name="HelloWorldService">
<wsdl:port binding="tns:HelloWorldSoapBinding" name="HelloWorldSoapPort">
- <wsdlsoap:address location="http://localhost:8080/HelloWorldServiceComponent/HelloWorldWebService"/>
+ <wsdlsoap:address location="http://localhost:8080/HelloWorldServiceComponent"/>
</wsdl:port>
</wsdl:service>
Modified: incubator/tuscany/java/sca/samples/helloworld-ws-service/src/main/resources/helloworldws.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/helloworld-ws-service/src/main/resources/helloworldws.composite?view=diff&rev=538384&r1=538383&r2=538384
==============================================================================
--- incubator/tuscany/java/sca/samples/helloworld-ws-service/src/main/resources/helloworldws.composite (original)
+++ incubator/tuscany/java/sca/samples/helloworld-ws-service/src/main/resources/helloworldws.composite Tue May 15 16:32:26 2007
@@ -22,12 +22,11 @@
xmlns:hw="http://helloworld"
name="helloworldws">
- <service name="HelloWorldWebService" promote="HelloWorldServiceComponent">
- <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />
- <binding.ws />
- </service>
-
<component name="HelloWorldServiceComponent">
+ <service name="HelloWorldService">
+ <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />
+ <binding.ws />
+ </service>
<implementation.java class="helloworld.HelloWorldImpl" />
</component>
Modified: incubator/tuscany/java/sca/samples/helloworld-ws-service/src/main/resources/wsdl/helloworld.wsdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/helloworld-ws-service/src/main/resources/wsdl/helloworld.wsdl?view=diff&rev=538384&r1=538383&r2=538384
==============================================================================
--- incubator/tuscany/java/sca/samples/helloworld-ws-service/src/main/resources/wsdl/helloworld.wsdl (original)
+++ incubator/tuscany/java/sca/samples/helloworld-ws-service/src/main/resources/wsdl/helloworld.wsdl Tue May 15 16:32:26 2007
@@ -72,7 +72,7 @@
<wsdl:service name="HelloWorldService">
<wsdl:port binding="tns:HelloWorldSoapBinding" name="HelloWorldSoapPort">
- <wsdlsoap:address location="http://localhost:8080/services/HelloWorldWebService"/>
+ <wsdlsoap:address location="http://localhost:8080/HelloWorldServiceComponent"/>
</wsdl:port>
</wsdl:service>
Modified: incubator/tuscany/java/sca/samples/simple-bigbank/src/main/resources/BigBank.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/simple-bigbank/src/main/resources/BigBank.composite?view=diff&rev=538384&r1=538383&r2=538384
==============================================================================
--- incubator/tuscany/java/sca/samples/simple-bigbank/src/main/resources/BigBank.composite (original)
+++ incubator/tuscany/java/sca/samples/simple-bigbank/src/main/resources/BigBank.composite Tue May 15 16:32:26 2007
@@ -20,10 +20,6 @@
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
name="BigBank">
- <service name="AccountService" promote="AccountServiceComponent">
- <interface.java interface="bigbank.account.AccountService"/>
- </service>
-
<component name="AccountServiceComponent">
<implementation.java class="bigbank.account.AccountServiceImpl"/>
<reference name="accountDataService" target="AccountDataServiceComponent"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org