You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by sv...@apache.org on 2007/07/03 18:14:29 UTC

svn commit: r552894 - in /incubator/tuscany/branches/sca-java-0.91/samples: calculator-rmi-reference/src/test/java/calculator/ calculator-rmi-service/src/main/java/calculator/ calculator-webapp/ databinding-echo/ helloworld-dojo/ helloworld-jsonrpc/

Author: svkrish
Date: Tue Jul  3 09:14:25 2007
New Revision: 552894

URL: http://svn.apache.org/viewvc?view=rev&rev=552894
Log:
fixes for RC1 review comments

Modified:
    incubator/tuscany/branches/sca-java-0.91/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java
    incubator/tuscany/branches/sca-java-0.91/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServer.java
    incubator/tuscany/branches/sca-java-0.91/samples/calculator-webapp/build.xml
    incubator/tuscany/branches/sca-java-0.91/samples/databinding-echo/build.xml
    incubator/tuscany/branches/sca-java-0.91/samples/databinding-echo/pom.xml
    incubator/tuscany/branches/sca-java-0.91/samples/helloworld-dojo/README
    incubator/tuscany/branches/sca-java-0.91/samples/helloworld-dojo/build.xml
    incubator/tuscany/branches/sca-java-0.91/samples/helloworld-jsonrpc/README
    incubator/tuscany/branches/sca-java-0.91/samples/helloworld-jsonrpc/build.xml

Modified: incubator/tuscany/branches/sca-java-0.91/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-0.91/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java?view=diff&rev=552894&r1=552893&r2=552894
==============================================================================
--- incubator/tuscany/branches/sca-java-0.91/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java (original)
+++ incubator/tuscany/branches/sca-java-0.91/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java Tue Jul  3 09:14:25 2007
@@ -50,7 +50,7 @@
 
     public void testCalculator() throws Exception {
         // Calculate
-        assertEquals(calculatorService.add(3, 2), 5.0);
+    	assertEquals(calculatorService.add(3, 2), 5.0);
         assertEquals(calculatorService.subtract(3, 2), 1.0);
         assertEquals(calculatorService.multiply(3, 2), 6.0);
         assertEquals(calculatorService.divide(3, 2), 1.5);

Modified: incubator/tuscany/branches/sca-java-0.91/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-0.91/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServer.java?view=diff&rev=552894&r1=552893&r2=552894
==============================================================================
--- incubator/tuscany/branches/sca-java-0.91/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServer.java (original)
+++ incubator/tuscany/branches/sca-java-0.91/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServer.java Tue Jul  3 09:14:25 2007
@@ -27,7 +27,7 @@
  */
 public class CalculatorServer {
     public static void main(String[] args) throws Exception {
-        System.out.println("Starting the SCA Calculator Application exposed as RMI Services...");
+        System.out.println("Starting of the SCA Calculator Application exposed as RMI Services...");
         SCADomain scaDomain = SCADomain.newInstance("CalculatorRMIServer.composite");
         System.out.println("... Press Enter to Exit...");
         System.in.read();

Modified: incubator/tuscany/branches/sca-java-0.91/samples/calculator-webapp/build.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-0.91/samples/calculator-webapp/build.xml?view=diff&rev=552894&r1=552893&r2=552894
==============================================================================
--- incubator/tuscany/branches/sca-java-0.91/samples/calculator-webapp/build.xml (original)
+++ incubator/tuscany/branches/sca-java-0.91/samples/calculator-webapp/build.xml Tue Jul  3 09:14:25 2007
@@ -38,7 +38,7 @@
     </target>	
 	
     <target name="package" depends="compile">
-        <war destfile="target/sample-calculator-web.war" 
+        <war destfile="target/sample-calculator-webapp.war" 
              webxml="src/main/webapp/WEB-INF/web.xml">
             <fileset dir="src/main/webapp"/>
             <zipfileset dir="../../modules" prefix="WEB-INF/lib">

Modified: incubator/tuscany/branches/sca-java-0.91/samples/databinding-echo/build.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-0.91/samples/databinding-echo/build.xml?view=diff&rev=552894&r1=552893&r2=552894
==============================================================================
--- incubator/tuscany/branches/sca-java-0.91/samples/databinding-echo/build.xml (original)
+++ incubator/tuscany/branches/sca-java-0.91/samples/databinding-echo/build.xml Tue Jul  3 09:14:25 2007
@@ -32,7 +32,7 @@
                target="1.5">
             <classpath>
             	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>
-                <pathelement location="../binding-echo/target/sample-binding-echo.jar"/>
+                <pathelement location="../binding-echo/target/sample-binding-echo-extension.jar"/>
             </classpath>
         </javac> 
         <copy todir="target/classes">
@@ -51,7 +51,7 @@
             <classpath>
                 <pathelement path="target/classes"/>
             	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>
-                <pathelement location="../binding-echo/target/sample-binding-echo.jar"/>
+                <pathelement location="../binding-echo/target/sample-binding-echo-extension.jar"/>
             </classpath>
         </java>
     </target>
@@ -62,7 +62,7 @@
             <classpath>
                 <pathelement path="target/${test.jar}"/>
             	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>
-                <pathelement location="../binding-echo/target/sample-binding-echo.jar"/>
+                <pathelement location="../binding-echo/target/sample-binding-echo-extension.jar"/>
             </classpath>
         </java>    	
     </target>	

Modified: incubator/tuscany/branches/sca-java-0.91/samples/databinding-echo/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-0.91/samples/databinding-echo/pom.xml?view=diff&rev=552894&r1=552893&r2=552894
==============================================================================
--- incubator/tuscany/branches/sca-java-0.91/samples/databinding-echo/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-0.91/samples/databinding-echo/pom.xml Tue Jul  3 09:14:25 2007
@@ -57,7 +57,7 @@
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>sample-binding-echo</artifactId>
+            <artifactId>sample-binding-echo-extension</artifactId>
             <version>0.91-incubating-SNAPSHOT</version>
         </dependency>        
 

Modified: incubator/tuscany/branches/sca-java-0.91/samples/helloworld-dojo/README
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-0.91/samples/helloworld-dojo/README?view=diff&rev=552894&r1=552893&r2=552894
==============================================================================
--- incubator/tuscany/branches/sca-java-0.91/samples/helloworld-dojo/README (original)
+++ incubator/tuscany/branches/sca-java-0.91/samples/helloworld-dojo/README Tue Jul  3 09:14:25 2007
@@ -9,7 +9,7 @@
 
 As this sample provides a web app there is a manual step where the WAR file
 that contains the sample is copied to your web app container. If you just want 
-to give this sample a go deploy the WAR file (target/sample-helloworldjsonrpc.war)
+to give this sample a go deploy the WAR file (target/sample-helloworld-jsonrpc.war)
 to you web application server. 
 
 Once the web app is deployed use your browser to visit the following URL;
@@ -59,7 +59,7 @@
 cd helloworld-jsonrpc
 ant package
 
-This should result in a war file (sample-helloworldjsonrpc.war) in the target 
+This should result in a war file (sample-helloworld-jsonrpc.war) in the target 
 directory. Copy this war file to your web app deployment directory in your
 web app container. 
 
@@ -69,7 +69,7 @@
 
 Once the web app is deployed use your browser to visit the following URL;
 
-http://localhost:8080/sample-helloworldjsonrpc
+http://localhost:8080/sample-helloworld-dojo
 
 The port and hostname will of course vary depending on your local installation. 
 
@@ -84,7 +84,7 @@
 cd helloworld-jsonrpc 
 mvn
 
-Again this should result in a war file (sample-calculator-web.war) in the target 
+Again this should result in a war file (sample-helloworld-dojo.war) in the target 
 directory. Follow the steps described in the previous section for running the web 
 app and for the expected results.
 

Modified: incubator/tuscany/branches/sca-java-0.91/samples/helloworld-dojo/build.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-0.91/samples/helloworld-dojo/build.xml?view=diff&rev=552894&r1=552893&r2=552894
==============================================================================
--- incubator/tuscany/branches/sca-java-0.91/samples/helloworld-dojo/build.xml (original)
+++ incubator/tuscany/branches/sca-java-0.91/samples/helloworld-dojo/build.xml Tue Jul  3 09:14:25 2007
@@ -18,7 +18,7 @@
 -->
 <project name="helloworld-jsonrpc" default="package">
     <property name="settings.localRepository" value="./target/repo" />
-    <property name="artifactId" value="sample-helloworld-jsonrpc" />
+    <property name="artifactId" value="sample-helloworld-dojo" />
 	
     <target name="init">
         <mkdir dir="target/classes"/>
@@ -49,7 +49,7 @@
           <property name="artifactId" value="${artifactId}"/>
         </ant>   
 
-        <war destfile="target/sample-helloworldjsonrpc.war" 
+        <war destfile="target/sample-helloworld-dojo.war" 
              webxml="src/main/webapp/WEB-INF/web.xml">
             <fileset dir="src/main/webapp"/>
             <zipfileset dir="../../modules" prefix="WEB-INF/lib">

Modified: incubator/tuscany/branches/sca-java-0.91/samples/helloworld-jsonrpc/README
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-0.91/samples/helloworld-jsonrpc/README?view=diff&rev=552894&r1=552893&r2=552894
==============================================================================
--- incubator/tuscany/branches/sca-java-0.91/samples/helloworld-jsonrpc/README (original)
+++ incubator/tuscany/branches/sca-java-0.91/samples/helloworld-jsonrpc/README Tue Jul  3 09:14:25 2007
@@ -9,7 +9,7 @@
 
 As this sample provides a web app there is a manual step where the WAR file
 that contains the sample is copied to your web app container. If you just want 
-to give this sample a go deploy the WAR file (target/sample-helloworldjsonrpc.war)
+to give this sample a go deploy the WAR file (target/sample-helloworld-jsonrpc.war)
 to you web application server. 
 
 Once the web app is deployed use your browser to visit the following URL;
@@ -59,7 +59,7 @@
 cd helloworld-jsonrpc
 ant package
 
-This should result in a war file (sample-helloworldjsonrpc.war) in the target 
+This should result in a war file (sample-helloworld-jsonrpc.war) in the target 
 directory. Copy this war file to your web app deployment directory in your
 web app container. 
 
@@ -69,7 +69,7 @@
 
 Once the web app is deployed use your browser to visit the following URL;
 
-http://localhost:8080/sample-helloworldjsonrpc
+http://localhost:8080/sample-helloworld-jsonrpc
 
 The port and hostname will of course vary depending on your local installation. 
 
@@ -84,7 +84,7 @@
 cd helloworld-jsonrpc 
 mvn
 
-Again this should result in a war file (sample-calculator-web.war) in the target 
+Again this should result in a war file (sample-helloworld-jsonrpc.war) in the target 
 directory. Follow the steps described in the previous section for running the web 
 app and for the expected results.
 

Modified: incubator/tuscany/branches/sca-java-0.91/samples/helloworld-jsonrpc/build.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-0.91/samples/helloworld-jsonrpc/build.xml?view=diff&rev=552894&r1=552893&r2=552894
==============================================================================
--- incubator/tuscany/branches/sca-java-0.91/samples/helloworld-jsonrpc/build.xml (original)
+++ incubator/tuscany/branches/sca-java-0.91/samples/helloworld-jsonrpc/build.xml Tue Jul  3 09:14:25 2007
@@ -41,7 +41,7 @@
 	
     <target name="package" depends="compile">
 
-        <war destfile="target/sample-helloworldjsonrpc.war" 
+        <war destfile="target/sample-helloworld-jsonrpc.war" 
              webxml="src/main/webapp/WEB-INF/web.xml">
             <fileset dir="src/main/webapp"/>
             <zipfileset dir="../../modules" prefix="WEB-INF/lib">



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org