Author: rfeng
Date: Tue Jan 13 16:32:52 2009
New Revision: 734283
URL: http://svn.apache.org/viewvc?rev=734283&view=rev
Log:
Update the calculator-osgi example
Added:
tuscany/java/sca/samples/calculator-osgi/META-INF/
- copied from r709261,
tuscany/branches/sca-equinox/samples/calculator-osgi/META-INF/
tuscany/java/sca/samples/calculator-osgi/META-INF/MANIFEST.MF
- copied unchanged from r709261,
tuscany/branches/sca-equinox/samples/calculator-osgi/META-INF/MANIFEST.MF
tuscany/java/sca/samples/calculator-osgi/pom.xml
- copied, changed from r709261,
tuscany/branches/sca-equinox/samples/calculator-osgi/pom.xml
tuscany/java/sca/samples/calculator-osgi/src/main/java/calculator/AddService.java
- copied unchanged from r709261,
tuscany/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/AddService.java
tuscany/java/sca/samples/calculator-osgi/src/main/java/calculator/AddServiceImpl.java
- copied unchanged from r709261,
tuscany/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/AddServiceImpl.java
tuscany/java/sca/samples/calculator-osgi/src/main/java/calculator/CalculatorActivator.java
- copied unchanged from r709261,
tuscany/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/CalculatorActivator.java
tuscany/java/sca/samples/calculator-osgi/src/main/java/calculator/CalculatorClient.java
- copied unchanged from r709261,
tuscany/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/CalculatorClient.java
tuscany/java/sca/samples/calculator-osgi/src/main/java/calculator/CalculatorService.java
- copied unchanged from r709261,
tuscany/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/CalculatorService.java
tuscany/java/sca/samples/calculator-osgi/src/main/java/calculator/CalculatorServiceImpl.java
- copied unchanged from r709261,
tuscany/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/CalculatorServiceImpl.java
tuscany/java/sca/samples/calculator-osgi/src/main/java/calculator/DivideService.java
- copied unchanged from r709261,
tuscany/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/DivideService.java
tuscany/java/sca/samples/calculator-osgi/src/main/java/calculator/DivideServiceImpl.java
- copied unchanged from r709261,
tuscany/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/DivideServiceImpl.java
tuscany/java/sca/samples/calculator-osgi/src/main/java/calculator/MultiplyService.java
- copied unchanged from r709261,
tuscany/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/MultiplyService.java
tuscany/java/sca/samples/calculator-osgi/src/main/java/calculator/MultiplyServiceImpl.java
- copied unchanged from r709261,
tuscany/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/MultiplyServiceImpl.java
tuscany/java/sca/samples/calculator-osgi/src/main/java/calculator/SubtractService.java
- copied unchanged from r709261,
tuscany/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/SubtractService.java
tuscany/java/sca/samples/calculator-osgi/src/main/java/calculator/SubtractServiceImpl.java
- copied unchanged from r709261,
tuscany/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/SubtractServiceImpl.java
tuscany/java/sca/samples/calculator-osgi/src/main/resources/Calculator.composite
- copied unchanged from r709261,
tuscany/branches/sca-equinox/samples/calculator-osgi/src/main/resources/Calculator.composite
Removed:
tuscany/java/sca/samples/calculator-osgi/README
tuscany/java/sca/samples/calculator-osgi/build.xml
tuscany/java/sca/samples/calculator-osgi/calculator.png
tuscany/java/sca/samples/calculator-osgi/calculator.svg
tuscany/java/sca/samples/calculator-osgi/src/test/java/calculator/CalculatorTestCase.java
Modified:
tuscany/java/sca/samples/calculator-osgi/ (props changed)
Propchange: tuscany/java/sca/samples/calculator-osgi/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Jan 13 16:32:52 2009
@@ -0,0 +1,2 @@
+/tuscany/branches/sca-equinox/samples/calculator-osgi:696924-709261
+/tuscany/branches/sca-java-1.3/samples/calculator-osgi:671193,680620-680628
Copied: tuscany/java/sca/samples/calculator-osgi/pom.xml (from r709261,
tuscany/branches/sca-equinox/samples/calculator-osgi/pom.xml)
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/samples/calculator-osgi/pom.xml?p2=tuscany/java/sca/samples/calculator-osgi/pom.xml&p1=tuscany/branches/sca-equinox/samples/calculator-osgi/pom.xml&r1=709261&r2=734283&rev=734283&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/samples/calculator-osgi/pom.xml (original)
+++ tuscany/java/sca/samples/calculator-osgi/pom.xml Tue Jan 13 16:32:52 2009
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-sca</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>sample-calculator-osgi</artifactId>
@@ -39,27 +39,27 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-node-api</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-node-impl</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-implementation-node-runtime</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
@@ -73,7 +73,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-extensibility-equinox</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
