Author: rfeng
Date: Mon Oct 23 13:41:07 2006
New Revision: 467119
URL: http://svn.apache.org/viewvc?view=rev&rev=467119
Log:
Clean up/Format the sample code
Add tests that can be run from inside an IDE
Added:
incubator/tuscany/branches/sca-java-M2/samples/standalone/calculator-combo/src/test/
incubator/tuscany/branches/sca-java-M2/samples/standalone/calculator-combo/src/test/java/
incubator/tuscany/branches/sca-java-M2/samples/standalone/calculator-combo/src/test/java/calculator/
incubator/tuscany/branches/sca-java-M2/samples/standalone/calculator-combo/src/test/java/calculator/CalculatorTestClient.java
(with props)
incubator/tuscany/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/test/
incubator/tuscany/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/test/java/
incubator/tuscany/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/test/java/calculator/
incubator/tuscany/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/test/java/calculator/server/
incubator/tuscany/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/test/java/calculator/server/CalculatorRMITestServer.java
(with props)
Removed:
incubator/tuscany/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/resources/META-INF/tuscany/
Modified:
incubator/tuscany/branches/sca-java-M2/samples/standalone/calculator-combo/
(props changed)
incubator/tuscany/branches/sca-java-M2/samples/standalone/calculator-combo/pom.xml
incubator/tuscany/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/CalculatorServiceImpl.java
incubator/tuscany/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/DivideServiceImpl.java
incubator/tuscany/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/client/CalculatorClient.java
incubator/tuscany/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/sci/SciCalculatorService.java
incubator/tuscany/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/sci/SciCalculatorServiceImpl.java
incubator/tuscany/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/sci/SqrtService.java
incubator/tuscany/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/resources/META-INF/sca/default.scdl
incubator/tuscany/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/resources/META-INF/sca/sci_calc.scdl
incubator/tuscany/branches/sca-java-M2/samples/standalone/calculatorRMIService/
(props changed)
incubator/tuscany/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/resources/META-INF/sca/default.scdl
incubator/tuscany/branches/sca-java-M2/samples/webapp/calculatorws/
(props changed)
Propchange:
incubator/tuscany/branches/sca-java-M2/samples/standalone/calculator-combo/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Oct 23 13:41:07 2006
@@ -0,0 +1,12 @@
+target
+*.iws
+*.ipr
+*.iml
+.project
+.classpath
+maven.log
+velocity.log*
+junit*.properties
+.settings
+.deployables
+.wtpmodules
Modified:
incubator/tuscany/branches/sca-java-M2/samples/standalone/calculator-combo/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-M2/samples/standalone/calculator-combo/pom.xml?view=diff&rev=467119&r1=467118&r2=467119
==============================================================================
---
incubator/tuscany/branches/sca-java-M2/samples/standalone/calculator-combo/pom.xml
(original)
+++
incubator/tuscany/branches/sca-java-M2/samples/standalone/calculator-combo/pom.xml
Mon Oct 23 13:41:07 2006
@@ -49,6 +49,12 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.apache.tuscany.sca.services.databinding</groupId>
+ <artifactId>databinding-sdo</artifactId>
+ <version>${scaVersion}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.tuscany.sca.services.containers</groupId>
<artifactId>javascript</artifactId>
<version>${scaVersion}</version>
Modified:
incubator/tuscany/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/CalculatorServiceImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/CalculatorServiceImpl.java?view=diff&rev=467119&r1=467118&r2=467119
==============================================================================
---
incubator/tuscany/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/CalculatorServiceImpl.java
(original)
+++
incubator/tuscany/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/CalculatorServiceImpl.java
Mon Oct 23 13:41:07 2006
@@ -21,27 +21,26 @@
import org.osoa.sca.annotations.Reference;
import org.osoa.sca.annotations.Scope;
-
/**
* An implementation of the Calculator service.
*/
@Scope("MODULE")
public class CalculatorServiceImpl implements CalculatorService {
- @Reference
+ @Reference
protected AddService addService;
-
- @Reference
+
+ @Reference
protected SubtractService subtractService;
-
- @Reference
+
+ @Reference
protected MultiplyService multiplyService;
-
- @Reference
+
+ @Reference
protected DivideService divideService;
-
- @Reference
- protected CalculatorService rmiCalculatorService;
+
+ @Reference
+ protected CalculatorService rmiCalculatorService;
public double add(double n1, double n2) {
return addService.add(n1, n2);
@@ -58,6 +57,5 @@
public double divide(double n1, double n2) {
return divideService.divide(n1, n2);
}
-
}
Modified:
incubator/tuscany/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/DivideServiceImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/DivideServiceImpl.java?view=diff&rev=467119&r1=467118&r2=467119
==============================================================================
---
incubator/tuscany/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/DivideServiceImpl.java
(original)
+++
incubator/tuscany/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/DivideServiceImpl.java
Mon Oct 23 13:41:07 2006
@@ -30,7 +30,6 @@
@Reference
protected CalculatorService calculatorWebService;
-
public double divide(double n1, double n2) {
return calculatorWebService.divide(n1, n2);
}
Modified:
incubator/tuscany/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/client/CalculatorClient.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/client/CalculatorClient.java?view=diff&rev=467119&r1=467118&r2=467119
==============================================================================
---
incubator/tuscany/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/client/CalculatorClient.java
(original)
+++
incubator/tuscany/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/client/CalculatorClient.java
Mon Oct 23 13:41:07 2006
@@ -25,58 +25,59 @@
import calculator.sci.SciCalculatorService;
/**
- * @author administrator
- *
+ * Calculator client
*/
public class CalculatorClient {
- public CalculatorClient()
- {
+ public CalculatorClient() {
}
- public static void main(String args[])
- throws Exception
- {
- try
- {
+ public static void main(String args[]) throws Exception {
+ try {
CalculatorClient calcClient = new CalculatorClient();
calcClient.testCalcCombo(args);
System.exit(0);
- }
- catch(Throwable e)
- {
+ } catch (Throwable e) {
e.printStackTrace();
}
}
- private void testCalcCombo(String args[])
- {
+ private void testCalcCombo(String args[]) {
System.out.println("\n\n***************************************");
System.out.println("Starting the Calculator Combo sample!!!");
System.out.println("***************************************");
CompositeContext context = CurrentCompositeContext.getContext();
- CalculatorService calculatorService =
(CalculatorService)context.locateService(CalculatorService.class,
"CalculatorServiceComponent");
+ CalculatorService calculatorService =
+ (CalculatorService)context.locateService(CalculatorService.class,
"CalculatorServiceComponent");
System.out.println("\nInvoking Java Implementation ... ");
- System.out.println((new StringBuilder()).append("3 + 2 =
").append(calculatorService.add(3D, 2D)).toString());
+ System.out.println((new StringBuilder()).append("3 + 2 =
").append(calculatorService.add(3D, 2D))
+ .toString());
System.out.println("\nInvoking Ruby Implementation ... ");
- System.out.println((new StringBuilder()).append("3 - 2 =
").append(calculatorService.subtract(3D, 2D)).toString());
+ System.out.println((new StringBuilder()).append("3 - 2 = ")
+ .append(calculatorService.subtract(3D, 2D)).toString());
System.out.println("\nInvoking over RMI Reference... ");
- System.out.println((new StringBuilder()).append("3 * 2 =
").append(calculatorService.multiply(3D, 2D)).toString());
+ System.out.println((new StringBuilder()).append("3 * 2 = ")
+ .append(calculatorService.multiply(3D, 2D)).toString());
System.out.println("\nInvoking WebService Implementation ... ");
- System.out.println((new StringBuilder()).append("3 / 2 =
").append(calculatorService.divide(3D, 2D)).toString());
+ System.out.println((new StringBuilder()).append("3 / 2 =
").append(calculatorService.divide(3D, 2D))
+ .toString());
System.out.println("\nInvoking Scientific Calculator Composite
Implementation ... ");
- SciCalculatorService sciCalculator =
(SciCalculatorService)context.locateService(SciCalculatorService.class,
"sciCalculatorService");
- double values[] = {
- 1.0D, 2D, 3D, 4D, 5D, 6D, 7D, 8D, 9D
- };
+ SciCalculatorService sciCalculator =
+
(SciCalculatorService)context.locateService(SciCalculatorService.class,
"sciCalculatorService");
+ double values[] = {1.0D, 2D, 3D, 4D, 5D, 6D, 7D, 8D, 9D};
System.out.println("\tInvoking Java Implementation ... ");
- System.out.println((new StringBuilder()).append("\tAverage of
1,2,3,4,5,6,7,8,9 = ").append(sciCalculator.average(values)).toString());
+ System.out.println((new StringBuilder()).append("\tAverage of
1,2,3,4,5,6,7,8,9 = ")
+ .append(sciCalculator.average(values)).toString());
System.out.println("\n\tInvoking JavaScript Implementation ... ");
- System.out.println((new StringBuilder()).append("\tSquare Root of 81 =
").append(sciCalculator.sqrt(81D)).toString());
+ System.out.println((new StringBuilder()).append("\tSquare Root of 81 =
").append(sciCalculator
+ .sqrt(81D)).toString());
System.out.println("\tInvoking Java Implementation configured for
Property ... ");
- System.out.println((new StringBuilder()).append("\tSine 90 Degrees =
").append(sciCalculator.sin(90D)).toString());
- System.out.println((new StringBuilder()).append("\tCos 90 Degrees =
").append(sciCalculator.cos(90D)).toString());
- System.out.println((new StringBuilder()).append("\tTan 90 Degrees =
").append(sciCalculator.tan(90D)).toString());
+ System.out.println((new StringBuilder()).append("\tSine 90 Degrees = ")
+ .append(sciCalculator.sin(90D)).toString());
+ System.out.println((new StringBuilder()).append("\tCos 90 Degrees =
").append(sciCalculator.cos(90D))
+ .toString());
+ System.out.println((new StringBuilder()).append("\tTan 90 Degrees =
").append(sciCalculator.tan(90D))
+ .toString());
System.out.println("\nExiting...");
}
Modified:
incubator/tuscany/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/sci/SciCalculatorService.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/sci/SciCalculatorService.java?view=diff&rev=467119&r1=467118&r2=467119
==============================================================================
---
incubator/tuscany/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/sci/SciCalculatorService.java
(original)
+++
incubator/tuscany/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/sci/SciCalculatorService.java
Mon Oct 23 13:41:07 2006
@@ -19,8 +19,7 @@
package calculator.sci;
/**
- * @author administrator
- *
+ * Scientific calculator
*/
public interface SciCalculatorService {
public abstract double average(double ad[]);
Modified:
incubator/tuscany/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/sci/SciCalculatorServiceImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/sci/SciCalculatorServiceImpl.java?view=diff&rev=467119&r1=467118&r2=467119
==============================================================================
---
incubator/tuscany/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/sci/SciCalculatorServiceImpl.java
(original)
+++
incubator/tuscany/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/sci/SciCalculatorServiceImpl.java
Mon Oct 23 13:41:07 2006
@@ -21,34 +21,25 @@
import org.osoa.sca.annotations.Property;
import org.osoa.sca.annotations.Reference;
-/**
- * @author administrator
- *
- */
public class SciCalculatorServiceImpl implements SciCalculatorService {
public static final String RADIANS = "RADIANS";
public static final String DEGREES = "DEGREES";
-
+
@Reference
protected SqrtService sqrtService;
-
-
+
private String trig_metric;
-
- public SciCalculatorServiceImpl()
- {
+ public SciCalculatorServiceImpl() {
}
- public double average(double values[])
- {
+ public double average(double values[]) {
double sum = 0.0D;
int count = 0;
double arr$[] = values;
int len$ = arr$.length;
- for(int i$ = 0; i$ < len$; i$++)
- {
+ for (int i$ = 0; i$ < len$; i$++) {
double aValue = arr$[i$];
sum += aValue;
count++;
@@ -57,40 +48,34 @@
return sum / (double)count;
}
- public double sqrt(double n)
- {
+ public double sqrt(double n) {
return sqrtService.sqrt(n);
}
- public double sin(double angle)
- {
- if(trig_metric.equalsIgnoreCase("DEGREES"))
+ public double sin(double angle) {
+ if (trig_metric.equalsIgnoreCase("DEGREES"))
angle = Math.toRadians(angle);
return Math.sin(angle);
}
- public double cos(double angle)
- {
- if(trig_metric.equalsIgnoreCase("DEGREES"))
+ public double cos(double angle) {
+ if (trig_metric.equalsIgnoreCase("DEGREES"))
angle = Math.toRadians(angle);
return Math.cos(angle);
}
- public double tan(double angle)
- {
- if(trig_metric.equalsIgnoreCase("DEGREES"))
+ public double tan(double angle) {
+ if (trig_metric.equalsIgnoreCase("DEGREES"))
angle = Math.toRadians(angle);
return Math.tan(angle);
}
- public String getTrig_metric()
- {
+ public String getTrig_metric() {
return trig_metric;
}
@Property
- public void setTrig_metric(String trig_metric)
- {
+ public void setTrig_metric(String trig_metric) {
this.trig_metric = trig_metric;
}
Modified:
incubator/tuscany/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/sci/SqrtService.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/sci/SqrtService.java?view=diff&rev=467119&r1=467118&r2=467119
==============================================================================
---
incubator/tuscany/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/sci/SqrtService.java
(original)
+++
incubator/tuscany/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/sci/SqrtService.java
Mon Oct 23 13:41:07 2006
@@ -19,8 +19,7 @@
package calculator.sci;
/**
- * @author administrator
- *
+ * Interface to calculate the square root
*/
public interface SqrtService {
public abstract double sqrt(double d);
Modified:
incubator/tuscany/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/resources/META-INF/sca/default.scdl
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/resources/META-INF/sca/default.scdl?view=diff&rev=467119&r1=467118&r2=467119
==============================================================================
---
incubator/tuscany/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/resources/META-INF/sca/default.scdl
(original)
+++
incubator/tuscany/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/resources/META-INF/sca/default.scdl
Mon Oct 23 13:41:07 2006
@@ -50,7 +50,7 @@
<reference name="CalculatorRmiService">
<interface.java interface="calculator.CalculatorService"/>
- <rmi:binding.rmi host="localhost" port="1099"
serviceName="rmiCalculator"/>
+ <rmi:binding.rmi host="localhost" port="9999"
serviceName="rmiCalculator"/>
</reference>
<!--component name="MultiplyServiceComponent">
Modified:
incubator/tuscany/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/resources/META-INF/sca/sci_calc.scdl
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/resources/META-INF/sca/sci_calc.scdl?view=diff&rev=467119&r1=467118&r2=467119
==============================================================================
---
incubator/tuscany/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/resources/META-INF/sca/sci_calc.scdl
(original)
+++
incubator/tuscany/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/resources/META-INF/sca/sci_calc.scdl
Mon Oct 23 13:41:07 2006
@@ -1,41 +1,42 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- * 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.
+ * 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.
-->
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0";
-
xmlns:js="http://incubator.apache.org/tuscany/xmlns/container/js/1.0-incubator-M2";
- name="SciCalculatorComposite">
-
- <service name="sciCalculatorService">
- <interface.java interface="calculator.sci.SciCalculatorService"/>
- <reference>SciCalculatorServiceComponent</reference>
- </service>
+
xmlns:js="http://incubator.apache.org/tuscany/xmlns/container/js/1.0-incubator-M2";
name="SciCalculatorComposite">
- <property name="trig_metric" type="xsd:string">DEGREES</property>
+ <service name="sciCalculatorService">
+ <interface.java interface="calculator.sci.SciCalculatorService" />
+ <reference>SciCalculatorServiceComponent</reference>
+ </service>
- <component name="SciCalculatorServiceComponent">
- <implementation.java
class="calculator.sci.SciCalculatorServiceImpl"/>
- <property name="trig_metric" source="$trig_metric"/>
- <!--property name="trig_metric">DEGREES</property-->
- <reference name="sqrtService">SqrtServiceComponent</reference>
- </component>
-
- <component name="SqrtServiceComponent">
- <js:implementation.js script="Sqrt.js"/>
- </component>
+ <!--
+ <property name="trig_metric" type="xsd:string">DEGREES</property>
+ -->
+
+ <component name="SciCalculatorServiceComponent">
+ <implementation.java class="calculator.sci.SciCalculatorServiceImpl" />
+ <!-- property name="trig_metric" source="$trig_metric"/ -->
+ <property name="trig_metric">DEGREES</property>
+ <reference name="sqrtService">SqrtServiceComponent</reference>
+ </component>
+
+ <component name="SqrtServiceComponent">
+ <js:implementation.js script="Sqrt.js" />
+ </component>
</composite>
Added:
incubator/tuscany/branches/sca-java-M2/samples/standalone/calculator-combo/src/test/java/calculator/CalculatorTestClient.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-M2/samples/standalone/calculator-combo/src/test/java/calculator/CalculatorTestClient.java?view=auto&rev=467119
==============================================================================
---
incubator/tuscany/branches/sca-java-M2/samples/standalone/calculator-combo/src/test/java/calculator/CalculatorTestClient.java
(added)
+++
incubator/tuscany/branches/sca-java-M2/samples/standalone/calculator-combo/src/test/java/calculator/CalculatorTestClient.java
Mon Oct 23 13:41:07 2006
@@ -0,0 +1,56 @@
+/*
+ * 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.test.SCATestCase;
+
+import calculator.client.CalculatorClient;
+
+/**
+ * This shows how to test the Calculator service component.
+ */
+public class CalculatorTestClient extends SCATestCase {
+
+ protected void setUp() throws Exception {
+
+ addExtension("ruby.extension", getClass().getClassLoader()
+ .getResource("META-INF/sca/ruby.system.scdl"));
+ addExtension("rmi.extension", getClass().getClassLoader()
+ .getResource("META-INF/sca/rmi_extension.scdl"));
+ addExtension("js.extension", getClass().getClassLoader()
+ .getResource("META-INF/sca/js.system.scdl"));
+ addExtension("axis2.extension", getClass().getClassLoader()
+ .getResource("META-INF/sca/binding.axis2.scdl"));
+ addExtension("databinding.sdo.extension", getClass().getClassLoader()
+ .getResource("META-INF/sca/databinding.sdo.scdl"));
+
+
setApplicationSCDL(getClass().getClassLoader().getResource("META-INF/sca/default.scdl"));
+ super.setUp();
+
+ }
+
+ public void testCalculatorClient() throws Exception {
+ CalculatorClient.main(new String[0]);
+ }
+
+ protected void tearDown() throws Exception {
+ // super.tearDown();
+ }
+
+}
Propchange:
incubator/tuscany/branches/sca-java-M2/samples/standalone/calculator-combo/src/test/java/calculator/CalculatorTestClient.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/tuscany/branches/sca-java-M2/samples/standalone/calculator-combo/src/test/java/calculator/CalculatorTestClient.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange:
incubator/tuscany/branches/sca-java-M2/samples/standalone/calculatorRMIService/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Oct 23 13:41:07 2006
@@ -0,0 +1,12 @@
+target
+*.iws
+*.ipr
+*.iml
+.project
+.classpath
+maven.log
+velocity.log*
+junit*.properties
+.settings
+.deployables
+.wtpmodules
Modified:
incubator/tuscany/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/resources/META-INF/sca/default.scdl
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/resources/META-INF/sca/default.scdl?view=diff&rev=467119&r1=467118&r2=467119
==============================================================================
---
incubator/tuscany/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/resources/META-INF/sca/default.scdl
(original)
+++
incubator/tuscany/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/resources/META-INF/sca/default.scdl
Mon Oct 23 13:41:07 2006
@@ -24,7 +24,7 @@
<service name="calculatorRMIService">
<interface.java interface="calculator.CalculatorService"/>
- <rmi:binding.rmi host="localhost" port="1099"
serviceName="rmiCalculator"/>
+ <rmi:binding.rmi host="localhost" port="9999"
serviceName="rmiCalculator"/>
<reference>CalculatorServiceComponent</reference>
</service>
Added:
incubator/tuscany/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/test/java/calculator/server/CalculatorRMITestServer.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/test/java/calculator/server/CalculatorRMITestServer.java?view=auto&rev=467119
==============================================================================
---
incubator/tuscany/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/test/java/calculator/server/CalculatorRMITestServer.java
(added)
+++
incubator/tuscany/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/test/java/calculator/server/CalculatorRMITestServer.java
Mon Oct 23 13:41:07 2006
@@ -0,0 +1,47 @@
+/*
+ * 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.server;
+
+import org.apache.tuscany.test.SCATestCase;
+
+import calculator.server.CalculatorRMIServer;
+
+/**
+ * This shows how to test the Calculator service component.
+ */
+public class CalculatorRMITestServer extends SCATestCase {
+
+ protected void setUp() throws Exception {
+
+ addExtension("rmi.extension", getClass().getClassLoader()
+ .getResource("META-INF/sca/rmi_extension.scdl"));
+
setApplicationSCDL(getClass().getClassLoader().getResource("META-INF/sca/default.scdl"));
+ super.setUp();
+
+ }
+
+ public void testCalculatorClient() throws Exception {
+ CalculatorRMIServer.main(new String[0]);
+ }
+
+ protected void tearDown() throws Exception {
+ // super.tearDown();
+ }
+
+}
Propchange:
incubator/tuscany/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/test/java/calculator/server/CalculatorRMITestServer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/tuscany/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/test/java/calculator/server/CalculatorRMITestServer.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: incubator/tuscany/branches/sca-java-M2/samples/webapp/calculatorws/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Oct 23 13:41:07 2006
@@ -0,0 +1,12 @@
+target
+*.iws
+*.ipr
+*.iml
+.project
+.classpath
+maven.log
+velocity.log*
+junit*.properties
+.settings
+.deployables
+.wtpmodules
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
