You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2007/09/17 01:37:53 UTC
svn commit: r576211 [2/5] - in /incubator/tuscany/branches/sca-java-1.0:
itest/ itest/osgi-contribution/
itest/osgi-contribution/contribution-classes-v2/
itest/osgi-contribution/contribution-classes-v2/src/
itest/osgi-contribution/contribution-classes-...
Propchange: incubator/tuscany/branches/sca-java-1.0/itest/osgi-contribution/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Sep 16 16:37:32 2007
@@ -0,0 +1,17 @@
+dojo
+target
+*.iws
+*.ipr
+*.iml
+.project
+.classpath
+derby.log
+maven.log
+velocity.log*
+junit*.properties
+surefire*.properties
+.settings
+.deployables
+.wtpmodules
+.felix
+
Propchange: incubator/tuscany/branches/sca-java-1.0/itest/osgi-contribution/contribution-classes/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Sep 16 16:37:32 2007
@@ -0,0 +1,18 @@
+dojo
+target
+*.iws
+*.ipr
+*.iml
+.project
+.classpath
+derby.log
+maven.log
+velocity.log*
+junit*.properties
+surefire*.properties
+.settings
+.deployables
+.wtpmodules
+.felix
+.externalToolBuilders
+maven-eclipse.xml
Propchange: incubator/tuscany/branches/sca-java-1.0/itest/osgi-contribution/contribution-classes-v2/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Sep 16 16:37:32 2007
@@ -0,0 +1,17 @@
+dojo
+target
+*.iws
+*.ipr
+*.iml
+.project
+.classpath
+derby.log
+maven.log
+velocity.log*
+junit*.properties
+surefire*.properties
+.settings
+.deployables
+.wtpmodules
+.felix
+
Copied: incubator/tuscany/branches/sca-java-1.0/itest/osgi-contribution/contribution-classes-v2/pom.xml (from r575799, incubator/tuscany/java/sca/itest/osgi-contribution/contribution-classes-v2/pom.xml)
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/itest/osgi-contribution/contribution-classes-v2/pom.xml?p2=incubator/tuscany/branches/sca-java-1.0/itest/osgi-contribution/contribution-classes-v2/pom.xml&p1=incubator/tuscany/java/sca/itest/osgi-contribution/contribution-classes-v2/pom.xml&r1=575799&r2=576211&rev=576211&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/osgi-contribution/contribution-classes-v2/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-1.0/itest/osgi-contribution/contribution-classes-v2/pom.xml Sun Sep 16 16:37:32 2007
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-itest</artifactId>
- <version>1.1-incubating-SNAPSHOT</version>
+ <version>1.0-incubating-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>itest-osgi-contribution-classes</artifactId>
@@ -32,34 +32,34 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-host-embedded</artifactId>
- <version>1.1-incubating-SNAPSHOT</version>
+ <version>1.0-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>1.1-incubating-SNAPSHOT</version>
+ <version>1.0-incubating-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-implementation-osgi</artifactId>
- <version>1.1-incubating-SNAPSHOT</version>
+ <version>1.0-incubating-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-contribution-osgi</artifactId>
- <version>1.1-incubating-SNAPSHOT</version>
+ <version>1.0-incubating-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-osgi-runtime</artifactId>
- <version>1.1-incubating-SNAPSHOT</version>
+ <version>1.0-incubating-SNAPSHOT</version>
</dependency>
Copied: incubator/tuscany/branches/sca-java-1.0/itest/osgi-contribution/contribution-classes/pom.xml (from r575799, incubator/tuscany/java/sca/itest/osgi-contribution/contribution-classes/pom.xml)
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/itest/osgi-contribution/contribution-classes/pom.xml?p2=incubator/tuscany/branches/sca-java-1.0/itest/osgi-contribution/contribution-classes/pom.xml&p1=incubator/tuscany/java/sca/itest/osgi-contribution/contribution-classes/pom.xml&r1=575799&r2=576211&rev=576211&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/osgi-contribution/contribution-classes/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-1.0/itest/osgi-contribution/contribution-classes/pom.xml Sun Sep 16 16:37:32 2007
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-itest</artifactId>
- <version>1.1-incubating-SNAPSHOT</version>
+ <version>1.0-incubating-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>itest-osgi-contribution-classes-v2</artifactId>
@@ -32,34 +32,34 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-host-embedded</artifactId>
- <version>1.1-incubating-SNAPSHOT</version>
+ <version>1.0-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>1.1-incubating-SNAPSHOT</version>
+ <version>1.0-incubating-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-implementation-osgi</artifactId>
- <version>1.1-incubating-SNAPSHOT</version>
+ <version>1.0-incubating-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-contribution-osgi</artifactId>
- <version>1.1-incubating-SNAPSHOT</version>
+ <version>1.0-incubating-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-osgi-runtime</artifactId>
- <version>1.1-incubating-SNAPSHOT</version>
+ <version>1.0-incubating-SNAPSHOT</version>
</dependency>
Propchange: incubator/tuscany/branches/sca-java-1.0/itest/osgi-contribution/contribution-test/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Sep 16 16:37:32 2007
@@ -0,0 +1,18 @@
+dojo
+target
+*.iws
+*.ipr
+*.iml
+.project
+.classpath
+derby.log
+maven.log
+velocity.log*
+junit*.properties
+surefire*.properties
+.settings
+.deployables
+.wtpmodules
+.felix
+maven-eclipse.xml
+.externalToolBuilders
Copied: incubator/tuscany/branches/sca-java-1.0/itest/osgi-contribution/contribution-test/pom.xml (from r575799, incubator/tuscany/java/sca/itest/osgi-contribution/contribution-test/pom.xml)
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/itest/osgi-contribution/contribution-test/pom.xml?p2=incubator/tuscany/branches/sca-java-1.0/itest/osgi-contribution/contribution-test/pom.xml&p1=incubator/tuscany/java/sca/itest/osgi-contribution/contribution-test/pom.xml&r1=575799&r2=576211&rev=576211&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/osgi-contribution/contribution-test/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-1.0/itest/osgi-contribution/contribution-test/pom.xml Sun Sep 16 16:37:32 2007
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-itest</artifactId>
- <version>1.1-incubating-SNAPSHOT</version>
+ <version>1.0-incubating-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>itest-osgi-contribution-test</artifactId>
@@ -32,34 +32,34 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-host-embedded</artifactId>
- <version>1.1-incubating-SNAPSHOT</version>
+ <version>1.0-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>1.1-incubating-SNAPSHOT</version>
+ <version>1.0-incubating-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-implementation-osgi</artifactId>
- <version>1.1-incubating-SNAPSHOT</version>
+ <version>1.0-incubating-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-contribution-osgi</artifactId>
- <version>1.1-incubating-SNAPSHOT</version>
+ <version>1.0-incubating-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-osgi-runtime</artifactId>
- <version>1.1-incubating-SNAPSHOT</version>
+ <version>1.0-incubating-SNAPSHOT</version>
</dependency>
<dependency>
Copied: incubator/tuscany/branches/sca-java-1.0/itest/osgi-contribution/pom.xml (from r575799, incubator/tuscany/java/sca/itest/osgi-contribution/pom.xml)
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/itest/osgi-contribution/pom.xml?p2=incubator/tuscany/branches/sca-java-1.0/itest/osgi-contribution/pom.xml&p1=incubator/tuscany/java/sca/itest/osgi-contribution/pom.xml&r1=575799&r2=576211&rev=576211&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/osgi-contribution/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-1.0/itest/osgi-contribution/pom.xml Sun Sep 16 16:37:32 2007
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-itest</artifactId>
- <version>1.1-incubating-SNAPSHOT</version>
+ <version>1.0-incubating-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>itest-contribution-osgi</artifactId>
@@ -39,13 +39,13 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-host-embedded</artifactId>
- <version>1.1-incubating-SNAPSHOT</version>
+ <version>1.0-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-contribution-impl</artifactId>
- <version>1.1-incubating-SNAPSHOT</version>
+ <version>1.0-incubating-SNAPSHOT</version>
</dependency>
</dependencies>
Modified: incubator/tuscany/branches/sca-java-1.0/itest/osgi-implementation/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/itest/osgi-implementation/pom.xml?rev=576211&r1=576210&r2=576211&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/itest/osgi-implementation/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-1.0/itest/osgi-implementation/pom.xml Sun Sep 16 16:37:32 2007
@@ -75,6 +75,13 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-osgi-runtime</artifactId>
+ <version>1.0-incubating-SNAPSHOT</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-implementation-osgi</artifactId>
<version>1.0-incubating-SNAPSHOT</version>
<scope>runtime</scope>
@@ -82,6 +89,13 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-contribution</artifactId>
+ <version>1.0-incubating-SNAPSHOT</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-binding-ws-axis2</artifactId>
<version>1.0-incubating-SNAPSHOT</version>
<scope>runtime</scope>
@@ -104,7 +118,6 @@
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.2</version>
- <scope>test</scope>
</dependency>
</dependencies>
@@ -134,7 +147,7 @@
<configuration>
<tasks>
<ant antfile="./build-bundles.xml" target="create-bundles">
- <property name="jar.dir" value="target/wiring"/>
+ <property name="jar.dir" value="target/classes/wiring"/>
<property name="files.dir" value="target/classes"/>
<property name="jar.file.name" value="Customer.jar"/>
<property name="manifest.file.name" value="osgi/wiring/Customer.mf"/>
@@ -145,7 +158,7 @@
</ant>
<ant antfile="./build-bundles.xml" target="create-bundles">
- <property name="jar.dir" value="target/wiring"/>
+ <property name="jar.dir" value="target/classes/wiring"/>
<property name="files.dir" value="target/classes"/>
<property name="jar.file.name" value="Retailer.jar"/>
<property name="manifest.file.name" value="osgi/wiring/Retailer.mf"/>
@@ -157,7 +170,7 @@
</ant>
<ant antfile="./build-bundles.xml" target="create-bundles">
- <property name="jar.dir" value="target/wiring"/>
+ <property name="jar.dir" value="target/classes/wiring"/>
<property name="files.dir" value="target/classes"/>
<property name="jar.file.name" value="Shipper.jar"/>
<property name="manifest.file.name" value="osgi/wiring/Shipper.mf"/>
@@ -169,7 +182,7 @@
</ant>
<ant antfile="./build-bundles.xml" target="create-bundles">
- <property name="jar.dir" value="target/wiring"/>
+ <property name="jar.dir" value="target/classes/wiring"/>
<property name="files.dir" value="target/classes"/>
<property name="jar.file.name" value="Warehouse.jar"/>
<property name="manifest.file.name" value="osgi/wiring/Warehouse.mf"/>
@@ -181,7 +194,7 @@
</ant>
<ant antfile="./build-bundles.xml" target="create-bundles">
- <property name="jar.dir" value="target/wiring/ds"/>
+ <property name="jar.dir" value="target/classes/wiring/ds"/>
<property name="files.dir" value="target/classes"/>
<property name="jar.file.name" value="Customer.jar"/>
<property name="manifest.file.name" value="osgi/wiring/ds/Customer.mf"/>
@@ -192,7 +205,7 @@
</ant>
<ant antfile="./build-bundles.xml" target="create-bundles">
- <property name="jar.dir" value="target/wiring/ds"/>
+ <property name="jar.dir" value="target/classes/wiring/ds"/>
<property name="files.dir" value="target/classes"/>
<property name="jar.file.name" value="Retailer.jar"/>
<property name="manifest.file.name" value="osgi/wiring/ds/Retailer.mf"/>
@@ -204,7 +217,7 @@
</ant>
<ant antfile="./build-bundles.xml" target="create-bundles">
- <property name="jar.dir" value="target/wiring/ds"/>
+ <property name="jar.dir" value="target/classes/wiring/ds"/>
<property name="files.dir" value="target/classes"/>
<property name="jar.file.name" value="Shipper.jar"/>
<property name="manifest.file.name" value="osgi/wiring/ds/Shipper.mf"/>
@@ -216,7 +229,7 @@
</ant>
<ant antfile="./build-bundles.xml" target="create-bundles">
- <property name="jar.dir" value="target/wiring/ds"/>
+ <property name="jar.dir" value="target/classes/wiring/ds"/>
<property name="files.dir" value="target/classes"/>
<property name="jar.file.name" value="Warehouse.jar"/>
<property name="manifest.file.name" value="osgi/wiring/ds/Warehouse.mf"/>
@@ -228,7 +241,7 @@
</ant>
<ant antfile="./build-bundles.xml" target="create-bundles">
- <property name="jar.dir" value="target/factory"/>
+ <property name="jar.dir" value="target/classes/factory"/>
<property name="files.dir" value="target/classes"/>
<property name="jar.file.name" value="Customer.jar"/>
<property name="manifest.file.name" value="osgi/factory/Customer.mf"/>
@@ -236,11 +249,12 @@
value="supplychain/customer/Customer.class \
supplychain/OSGiBundleImpl.class \
supplychain/customer/OSGiCustomerImpl.class \
+ supplychain/customer/OSGiStatelessCustomerImpl.class \
supplychain/customer/OSGiCustomerFactoryImpl.class"/>
</ant>
<ant antfile="./build-bundles.xml" target="create-bundles">
- <property name="jar.dir" value="target/factory"/>
+ <property name="jar.dir" value="target/classes/factory"/>
<property name="files.dir" value="target/classes"/>
<property name="jar.file.name" value="Retailer.jar"/>
<property name="manifest.file.name" value="osgi/factory/Retailer.mf"/>
@@ -252,7 +266,7 @@
</ant>
<ant antfile="./build-bundles.xml" target="create-bundles">
- <property name="jar.dir" value="target/factory"/>
+ <property name="jar.dir" value="target/classes/factory"/>
<property name="files.dir" value="target/classes"/>
<property name="jar.file.name" value="Shipper.jar"/>
<property name="manifest.file.name" value="osgi/factory/Shipper.mf"/>
@@ -261,22 +275,24 @@
supplychain/OSGiBundleImpl.class \
supplychain/shipper/OSGiShipperImpl.class \
supplychain/shipper/OSGiShipperServiceImpl.class \
+ supplychain/shipper/OSGiStatelessShipperServiceImpl.class \
supplychain/shipper/OSGiShipperFactoryImpl.class"/>
</ant>
<ant antfile="./build-bundles.xml" target="create-bundles">
- <property name="jar.dir" value="target/factory/ds"/>
+ <property name="jar.dir" value="target/classes/factory/ds"/>
<property name="files.dir" value="target/classes"/>
<property name="jar.file.name" value="Customer.jar"/>
<property name="manifest.file.name" value="osgi/factory/ds/Customer.mf"/>
<property name="files.list"
value="supplychain/customer/Customer.class \
osgi/factory/ds/Customer.xml \
+ supplychain/customer/OSGiStatelessCustomerComponentImpl.class \
supplychain/customer/OSGiCustomerComponentImpl.class"/>
</ant>
<ant antfile="./build-bundles.xml" target="create-bundles">
- <property name="jar.dir" value="target/factory/ds"/>
+ <property name="jar.dir" value="target/classes/factory/ds"/>
<property name="files.dir" value="target/classes"/>
<property name="jar.file.name" value="Retailer.jar"/>
<property name="manifest.file.name" value="osgi/factory/ds/Retailer.mf"/>
@@ -288,7 +304,7 @@
</ant>
<ant antfile="./build-bundles.xml" target="create-bundles">
- <property name="jar.dir" value="target/factory/ds"/>
+ <property name="jar.dir" value="target/classes/factory/ds"/>
<property name="files.dir" value="target/classes"/>
<property name="jar.file.name" value="Shipper.jar"/>
<property name="manifest.file.name" value="osgi/factory/ds/Shipper.mf"/>
@@ -296,11 +312,12 @@
value="supplychain/shipper/Shipper.class \
osgi/factory/ds/Shipper1.xml \
osgi/factory/ds/Shipper2.xml \
+ supplychain/shipper/OSGiStatelessShipperComponentImpl.class \
supplychain/shipper/OSGiShipperComponentImpl.class"/>
</ant>
<ant antfile="./build-bundles.xml" target="create-bundles">
- <property name="jar.dir" value="target/factory/ds"/>
+ <property name="jar.dir" value="target/classes/factory/ds"/>
<property name="files.dir" value="target/classes"/>
<property name="jar.file.name" value="Warehouse.jar"/>
<property name="manifest.file.name" value="osgi/factory/ds/Warehouse.mf"/>
@@ -311,7 +328,7 @@
</ant>
<ant antfile="./build-bundles.xml" target="create-bundles">
- <property name="jar.dir" value="target/services"/>
+ <property name="jar.dir" value="target/classes/services"/>
<property name="files.dir" value="target/classes"/>
<property name="jar.file.name" value="Customer.jar"/>
<property name="manifest.file.name" value="osgi/services/Customer.mf"/>
@@ -322,7 +339,7 @@
</ant>
<ant antfile="./build-bundles.xml" target="create-bundles">
- <property name="jar.dir" value="target/services"/>
+ <property name="jar.dir" value="target/classes/services"/>
<property name="files.dir" value="target/classes"/>
<property name="jar.file.name" value="Retailer.jar"/>
<property name="manifest.file.name" value="osgi/services/Retailer.mf"/>
@@ -334,7 +351,7 @@
</ant>
<ant antfile="./build-bundles.xml" target="create-bundles">
- <property name="jar.dir" value="target/services"/>
+ <property name="jar.dir" value="target/classes/services"/>
<property name="files.dir" value="target/classes"/>
<property name="jar.file.name" value="Shipper.jar"/>
<property name="manifest.file.name" value="osgi/services/Shipper.mf"/>
@@ -346,7 +363,7 @@
</ant>
<ant antfile="./build-bundles.xml" target="create-bundles">
- <property name="jar.dir" value="target/services"/>
+ <property name="jar.dir" value="target/classes/services"/>
<property name="files.dir" value="target/classes"/>
<property name="jar.file.name" value="Warehouse.jar"/>
<property name="manifest.file.name" value="osgi/services/Warehouse.mf"/>
@@ -358,7 +375,7 @@
</ant>
<ant antfile="./build-bundles.xml" target="create-bundles">
- <property name="jar.dir" value="target/services/ds"/>
+ <property name="jar.dir" value="target/classes/services/ds"/>
<property name="files.dir" value="target/classes"/>
<property name="jar.file.name" value="Customer.jar"/>
<property name="manifest.file.name" value="osgi/services/ds/Customer.mf"/>
@@ -369,7 +386,7 @@
</ant>
<ant antfile="./build-bundles.xml" target="create-bundles">
- <property name="jar.dir" value="target/services/ds"/>
+ <property name="jar.dir" value="target/classes/services/ds"/>
<property name="files.dir" value="target/classes"/>
<property name="jar.file.name" value="Retailer.jar"/>
<property name="manifest.file.name" value="osgi/services/ds/Retailer.mf"/>
@@ -381,7 +398,7 @@
</ant>
<ant antfile="./build-bundles.xml" target="create-bundles">
- <property name="jar.dir" value="target/services/ds"/>
+ <property name="jar.dir" value="target/classes/services/ds"/>
<property name="files.dir" value="target/classes"/>
<property name="jar.file.name" value="Shipper.jar"/>
<property name="manifest.file.name" value="osgi/services/ds/Shipper.mf"/>
@@ -393,7 +410,7 @@
</ant>
<ant antfile="./build-bundles.xml" target="create-bundles">
- <property name="jar.dir" value="target/services/ds"/>
+ <property name="jar.dir" value="target/classes/services/ds"/>
<property name="files.dir" value="target/classes"/>
<property name="jar.file.name" value="Warehouse.jar"/>
<property name="manifest.file.name" value="osgi/services/ds/Warehouse.mf"/>
@@ -405,7 +422,7 @@
</ant>
<ant antfile="./build-bundles.xml" target="create-bundles">
- <property name="jar.dir" value="target/interfaces"/>
+ <property name="jar.dir" value="target/classes/interfaces"/>
<property name="files.dir" value="target/classes"/>
<property name="jar.file.name" value="Customer.jar"/>
<property name="manifest.file.name" value="osgi/interfaces/Customer.mf"/>
@@ -416,7 +433,7 @@
</ant>
<ant antfile="./build-bundles.xml" target="create-bundles">
- <property name="jar.dir" value="target/interfaces"/>
+ <property name="jar.dir" value="target/classes/interfaces"/>
<property name="files.dir" value="target/classes"/>
<property name="jar.file.name" value="Retailer.jar"/>
<property name="manifest.file.name" value="osgi/interfaces/Retailer.mf"/>
@@ -428,7 +445,7 @@
</ant>
<ant antfile="./build-bundles.xml" target="create-bundles">
- <property name="jar.dir" value="target/interfaces"/>
+ <property name="jar.dir" value="target/classes/interfaces"/>
<property name="files.dir" value="target/classes"/>
<property name="jar.file.name" value="Shipper.jar"/>
<property name="manifest.file.name" value="osgi/interfaces/Shipper.mf"/>
@@ -440,7 +457,7 @@
</ant>
<ant antfile="./build-bundles.xml" target="create-bundles">
- <property name="jar.dir" value="target/interfaces/ds"/>
+ <property name="jar.dir" value="target/classes/interfaces/ds"/>
<property name="files.dir" value="target/classes"/>
<property name="jar.file.name" value="Customer.jar"/>
<property name="manifest.file.name" value="osgi/interfaces/ds/Customer.mf"/>
@@ -451,7 +468,7 @@
</ant>
<ant antfile="./build-bundles.xml" target="create-bundles">
- <property name="jar.dir" value="target/interfaces/ds"/>
+ <property name="jar.dir" value="target/classes/interfaces/ds"/>
<property name="files.dir" value="target/classes"/>
<property name="jar.file.name" value="Retailer.jar"/>
<property name="manifest.file.name" value="osgi/interfaces/ds/Retailer.mf"/>
@@ -463,7 +480,7 @@
</ant>
<ant antfile="./build-bundles.xml" target="create-bundles">
- <property name="jar.dir" value="target/interfaces/ds"/>
+ <property name="jar.dir" value="target/classes/interfaces/ds"/>
<property name="files.dir" value="target/classes"/>
<property name="jar.file.name" value="Shipper.jar"/>
<property name="manifest.file.name" value="osgi/interfaces/ds/Shipper.mf"/>
@@ -474,7 +491,7 @@
</ant>
<ant antfile="./build-bundles.xml" target="create-bundles">
- <property name="jar.dir" value="target/version"/>
+ <property name="jar.dir" value="target/classes/version"/>
<property name="files.dir" value="target/classes"/>
<property name="jar.file.name" value="Customer1.jar"/>
<property name="manifest.file.name" value="osgi/version/Customer1.mf"/>
@@ -485,7 +502,7 @@
</ant>
<ant antfile="./build-bundles.xml" target="create-bundles">
- <property name="jar.dir" value="target/version"/>
+ <property name="jar.dir" value="target/classes/version"/>
<property name="files.dir" value="target/classes"/>
<property name="jar.file.name" value="Retailer1.jar"/>
<property name="manifest.file.name" value="osgi/version/Retailer1.mf"/>
@@ -497,7 +514,7 @@
</ant>
<ant antfile="./build-bundles.xml" target="create-bundles">
- <property name="jar.dir" value="target/version"/>
+ <property name="jar.dir" value="target/classes/version"/>
<property name="files.dir" value="target/classes"/>
<property name="jar.file.name" value="Shipper1.jar"/>
<property name="manifest.file.name" value="osgi/version/Shipper1.mf"/>
@@ -509,7 +526,7 @@
</ant>
<ant antfile="./build-bundles.xml" target="create-bundles">
- <property name="jar.dir" value="target/version"/>
+ <property name="jar.dir" value="target/classes/version"/>
<property name="files.dir" value="target/classes"/>
<property name="jar.file.name" value="Warehouse1.jar"/>
<property name="manifest.file.name" value="osgi/version/Warehouse1.mf"/>
@@ -521,7 +538,7 @@
</ant>
<ant antfile="./build-bundles.xml" target="create-bundles">
- <property name="jar.dir" value="target/version"/>
+ <property name="jar.dir" value="target/classes/version"/>
<property name="files.dir" value="target/classes"/>
<property name="jar.file.name" value="Customer2.jar"/>
<property name="manifest.file.name" value="osgi/version/Customer2.mf"/>
@@ -532,7 +549,7 @@
</ant>
<ant antfile="./build-bundles.xml" target="create-bundles">
- <property name="jar.dir" value="target/version"/>
+ <property name="jar.dir" value="target/classes/version"/>
<property name="files.dir" value="target/classes"/>
<property name="jar.file.name" value="Retailer2.jar"/>
<property name="manifest.file.name" value="osgi/version/Retailer2.mf"/>
@@ -544,7 +561,7 @@
</ant>
<ant antfile="./build-bundles.xml" target="create-bundles">
- <property name="jar.dir" value="target/version"/>
+ <property name="jar.dir" value="target/classes/version"/>
<property name="files.dir" value="target/classes"/>
<property name="jar.file.name" value="Shipper2.jar"/>
<property name="manifest.file.name" value="osgi/version/Shipper2.mf"/>
@@ -556,7 +573,7 @@
</ant>
<ant antfile="./build-bundles.xml" target="create-bundles">
- <property name="jar.dir" value="target/version"/>
+ <property name="jar.dir" value="target/classes/version"/>
<property name="files.dir" value="target/classes"/>
<property name="jar.file.name" value="Warehouse2.jar"/>
<property name="manifest.file.name" value="osgi/version/Warehouse2.mf"/>
@@ -568,7 +585,7 @@
</ant>
<ant antfile="./build-bundles.xml" target="create-bundles">
- <property name="jar.dir" value="target/version/ds"/>
+ <property name="jar.dir" value="target/classes/version/ds"/>
<property name="files.dir" value="target/classes"/>
<property name="jar.file.name" value="Customer1.jar"/>
<property name="manifest.file.name" value="osgi/version/ds/Customer1.mf"/>
@@ -579,7 +596,7 @@
</ant>
<ant antfile="./build-bundles.xml" target="create-bundles">
- <property name="jar.dir" value="target/version/ds"/>
+ <property name="jar.dir" value="target/classes/version/ds"/>
<property name="files.dir" value="target/classes"/>
<property name="jar.file.name" value="Customer2.jar"/>
<property name="manifest.file.name" value="osgi/version/ds/Customer2.mf"/>
@@ -590,7 +607,7 @@
</ant>
<ant antfile="./build-bundles.xml" target="create-bundles">
- <property name="jar.dir" value="target/version/ds"/>
+ <property name="jar.dir" value="target/classes/version/ds"/>
<property name="files.dir" value="target/classes"/>
<property name="jar.file.name" value="Retailer1.jar"/>
<property name="manifest.file.name" value="osgi/version/ds/Retailer1.mf"/>
@@ -602,7 +619,7 @@
</ant>
<ant antfile="./build-bundles.xml" target="create-bundles">
- <property name="jar.dir" value="target/version/ds"/>
+ <property name="jar.dir" value="target/classes/version/ds"/>
<property name="files.dir" value="target/classes"/>
<property name="jar.file.name" value="Retailer2.jar"/>
<property name="manifest.file.name" value="osgi/version/ds/Retailer2.mf"/>
@@ -614,7 +631,7 @@
</ant>
<ant antfile="./build-bundles.xml" target="create-bundles">
- <property name="jar.dir" value="target/version/ds"/>
+ <property name="jar.dir" value="target/classes/version/ds"/>
<property name="files.dir" value="target/classes"/>
<property name="jar.file.name" value="Shipper1.jar"/>
<property name="manifest.file.name" value="osgi/version/ds/Shipper1.mf"/>
@@ -626,7 +643,7 @@
</ant>
<ant antfile="./build-bundles.xml" target="create-bundles">
- <property name="jar.dir" value="target/version/ds"/>
+ <property name="jar.dir" value="target/classes/version/ds"/>
<property name="files.dir" value="target/classes"/>
<property name="jar.file.name" value="Shipper2.jar"/>
<property name="manifest.file.name" value="osgi/version/ds/Shipper2.mf"/>
@@ -638,7 +655,7 @@
</ant>
<ant antfile="./build-bundles.xml" target="create-bundles">
- <property name="jar.dir" value="target/version/ds"/>
+ <property name="jar.dir" value="target/classes/version/ds"/>
<property name="files.dir" value="target/classes"/>
<property name="jar.file.name" value="Warehouse1.jar"/>
<property name="manifest.file.name" value="osgi/version/ds/Warehouse1.mf"/>
@@ -650,7 +667,7 @@
</ant>
<ant antfile="./build-bundles.xml" target="create-bundles">
- <property name="jar.dir" value="target/version/ds"/>
+ <property name="jar.dir" value="target/classes/version/ds"/>
<property name="files.dir" value="target/classes"/>
<property name="jar.file.name" value="Warehouse2.jar"/>
<property name="manifest.file.name" value="osgi/version/ds/Warehouse2.mf"/>
@@ -662,7 +679,7 @@
</ant>
<ant antfile="./build-bundles.xml" target="create-bundles">
- <property name="jar.dir" value="target/ws"/>
+ <property name="jar.dir" value="target/classes/ws"/>
<property name="files.dir" value="target/classes"/>
<property name="jar.file.name" value="HelloWorld.jar"/>
<property name="manifest.file.name" value="osgi/ws/HelloWorld.mf"/>
@@ -672,7 +689,7 @@
</ant>
<ant antfile="./build-bundles.xml" target="create-bundles">
- <property name="jar.dir" value="target/passbyref"/>
+ <property name="jar.dir" value="target/classes/passbyref"/>
<property name="files.dir" value="target/classes"/>
<property name="jar.file.name" value="Greetings.jar"/>
<property name="manifest.file.name" value="osgi/passbyref/Greetings.mf"/>
@@ -682,7 +699,79 @@
</ant>
<ant antfile="./build-bundles.xml" target="create-bundles">
- <property name="jar.dir" value="target/properties"/>
+ <property name="jar.dir" value="target/classes/callback"/>
+ <property name="files.dir" value="target/classes"/>
+ <property name="jar.file.name" value="CallbackClient.jar"/>
+ <property name="manifest.file.name" value="osgi/callback/CallbackClient.mf"/>
+ <property name="files.list"
+ value="callback/client/CallbackClient.class \
+ callback/client/CallbackCallback.class \
+ callback/client/OSGiCallbackClientImpl.class"/>
+
+ </ant>
+ <ant antfile="./build-bundles.xml" target="create-bundles">
+ <property name="jar.dir" value="target/classes/callback"/>
+ <property name="files.dir" value="target/classes"/>
+ <property name="jar.file.name" value="CallbackService.jar"/>
+ <property name="manifest.file.name" value="osgi/callback/CallbackService.mf"/>
+ <property name="files.list"
+ value="callback/service/CallbackService.class \
+ callback/service/OSGiCallbackServiceImpl.class"/>
+
+ </ant>
+ <ant antfile="./build-bundles.xml" target="create-bundles">
+ <property name="jar.dir" value="target/classes/conversation"/>
+ <property name="files.dir" value="target/classes"/>
+ <property name="jar.file.name" value="ConversationalClient.jar"/>
+ <property name="manifest.file.name" value="osgi/conversation/ConversationalClient.mf"/>
+ <property name="files.list"
+ value="conversation/client/ConversationalClientStatefulImpl.class \
+ conversation/client/ConversationalClientStatelessImpl.class \
+ conversation/client/ConversationalCallback.class \
+ conversation/client/ConversationalClient.class \
+ conversation/client/ConversationalClientServiceFactory.class \
+ conversation/client/ConversationalClientActivator.class" />
+
+ </ant>
+ <ant antfile="./build-bundles.xml" target="create-bundles">
+ <property name="jar.dir" value="target/classes/conversation"/>
+ <property name="files.dir" value="target/classes"/>
+ <property name="jar.file.name" value="ConversationalReferenceClient.jar"/>
+ <property name="manifest.file.name" value="osgi/conversation/ConversationalReferenceClient.mf"/>
+ <property name="files.list"
+ value="conversation/referenceclient/ConversationalReferenceClient.class \
+ conversation/referenceclient/ConversationalReferenceClientImpl.class \
+ conversation/referenceclient/ConversationalReferenceClientActivator.class" />
+
+ </ant>
+ <ant antfile="./build-bundles.xml" target="create-bundles">
+ <property name="jar.dir" value="target/classes/conversation"/>
+ <property name="files.dir" value="target/classes"/>
+ <property name="jar.file.name" value="ConversationalService.jar"/>
+ <property name="manifest.file.name" value="osgi/conversation/ConversationalService.mf"/>
+ <property name="files.list"
+ value="conversation/service/ConversationalService.class \
+ conversation/service/ConversationalServiceStatefulImpl.class \
+ conversation/service/ConversationalServiceStatelessImpl.class
+ conversation/service/ConversationalServiceFactory.class \
+ conversation/service/ConversationalServiceActivator.class" />
+
+ </ant>
+ <ant antfile="./build-bundles.xml" target="create-bundles">
+ <property name="jar.dir" value="target/classes/conversation"/>
+ <property name="files.dir" value="target/classes"/>
+ <property name="jar.file.name" value="ConversationalService.jar"/>
+ <property name="manifest.file.name" value="osgi/conversation/ConversationalService.mf"/>
+ <property name="files.list"
+ value="conversation/ConversationalService.class \
+ conversation/ConversationalServiceStatefulImpl.class \
+ conversation/ConversationalServiceStatelessImpl.class
+ conversation/ConversationalServiceFactory.class \
+ conversation/OSGiConversationTestActivator.class" />
+
+ </ant>
+ <ant antfile="./build-bundles.xml" target="create-bundles">
+ <property name="jar.dir" value="target/classes/properties"/>
<property name="files.dir" value="target/classes"/>
<property name="jar.file.name" value="StockQuote.jar"/>
<property name="manifest.file.name" value="osgi/properties/StockQuote.mf"/>
@@ -692,7 +781,7 @@
</ant>
<ant antfile="./build-bundles.xml" target="create-bundles">
- <property name="jar.dir" value="target/properties/ds"/>
+ <property name="jar.dir" value="target/classes/properties/ds"/>
<property name="files.dir" value="target/classes"/>
<property name="jar.file.name" value="StockQuote.jar"/>
<property name="manifest.file.name" value="osgi/properties/ds/StockQuote.mf"/>
@@ -703,7 +792,7 @@
</ant>
<ant antfile="./build-bundles.xml" target="create-bundles">
- <property name="jar.dir" value="target/properties"/>
+ <property name="jar.dir" value="target/classes/properties"/>
<property name="files.dir" value="target/classes"/>
<property name="jar.file.name" value="StockQuoteFactory.jar"/>
<property name="manifest.file.name" value="osgi/properties/StockQuoteFactory.mf"/>
@@ -714,7 +803,7 @@
</ant>
<ant antfile="./build-bundles.xml" target="create-bundles">
- <property name="jar.dir" value="target/properties/ds"/>
+ <property name="jar.dir" value="target/classes/properties/ds"/>
<property name="files.dir" value="target/classes"/>
<property name="jar.file.name" value="StockQuoteFactory.jar"/>
<property name="manifest.file.name" value="osgi/properties/ds/StockQuoteFactory.mf"/>
Copied: incubator/tuscany/branches/sca-java-1.0/itest/osgi-implementation/src/main/java/callback/client/OSGiCallbackClientImpl.java (from r575799, incubator/tuscany/java/sca/itest/osgi-implementation/src/main/java/callback/client/OSGiCallbackClientImpl.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/itest/osgi-implementation/src/main/java/callback/client/OSGiCallbackClientImpl.java?p2=incubator/tuscany/branches/sca-java-1.0/itest/osgi-implementation/src/main/java/callback/client/OSGiCallbackClientImpl.java&p1=incubator/tuscany/java/sca/itest/osgi-implementation/src/main/java/callback/client/OSGiCallbackClientImpl.java&r1=575799&r2=576211&rev=576211&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/osgi-implementation/src/main/java/callback/client/OSGiCallbackClientImpl.java (original)
+++ incubator/tuscany/branches/sca-java-1.0/itest/osgi-implementation/src/main/java/callback/client/OSGiCallbackClientImpl.java Sun Sep 16 16:37:32 2007
@@ -159,7 +159,7 @@
bundleContext.registerService("callback.client.CallbackClient", this, serviceProps);
Hashtable<String, Object> callbackProps = new Hashtable<String, Object>();
- callbackProps.put("component.service.name", "CallbackClient/$callback$.callbackService");
+ callbackProps.put("component.service.name", "CallbackClient/callbackService");
callbackProps.put("component.name", "CallbackClient");
bundleContext.registerService("callback.client.CallbackCallback", this, callbackProps);
Modified: incubator/tuscany/branches/sca-java-1.0/itest/osgi-implementation/src/main/java/helloworld/OSGiGreetingsImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/itest/osgi-implementation/src/main/java/helloworld/OSGiGreetingsImpl.java?rev=576211&r1=576210&r2=576211&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/itest/osgi-implementation/src/main/java/helloworld/OSGiGreetingsImpl.java (original)
+++ incubator/tuscany/branches/sca-java-1.0/itest/osgi-implementation/src/main/java/helloworld/OSGiGreetingsImpl.java Sun Sep 16 16:37:32 2007
@@ -27,6 +27,7 @@
import org.osgi.framework.ServiceListener;
import org.osgi.framework.ServiceReference;
import org.osgi.framework.BundleActivator;
+import org.osoa.sca.annotations.AllowsPassByReference;
public class OSGiGreetingsImpl implements Greetings, ServiceListener, BundleActivator {
@@ -51,6 +52,7 @@
return s;
}
+ @AllowsPassByReference
public String[] getModifiedGreetingsFromOSGi(String s[]) {
for (int i = 0; i < s.length; i++) {
s[i] = "Hello " + s[i] + "(From OSGi)";
@@ -59,6 +61,7 @@
return greetingsService.getModifiedGreetingsFromOSGi(s);
}
+ @AllowsPassByReference
public String[] getModifiedGreetingsFromJava(String s[]) {
for (int i = 0; i < s.length; i++) {
s[i] = s[i] + "(From OSGi)";
Modified: incubator/tuscany/branches/sca-java-1.0/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteComponentImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteComponentImpl.java?rev=576211&r1=576210&r2=576211&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteComponentImpl.java (original)
+++ incubator/tuscany/branches/sca-java-1.0/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteComponentImpl.java Sun Sep 16 16:37:32 2007
@@ -21,12 +21,14 @@
import java.util.Dictionary;
import org.osgi.service.component.ComponentContext;
+import org.osoa.sca.annotations.Property;
/**
* Declarative Stock quote with configurable properties.
*/
public class OSGiStockQuoteComponentImpl implements StockQuote {
+ @Property
public double exchangeRate;
private String currency;
@@ -35,6 +37,7 @@
public double configExchangeRate;
public String configCurrency;
+ @Property
public void setCurrency(String currency) {
this.currency = currency;
}
Modified: incubator/tuscany/branches/sca-java-1.0/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteImpl.java?rev=576211&r1=576210&r2=576211&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteImpl.java (original)
+++ incubator/tuscany/branches/sca-java-1.0/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteImpl.java Sun Sep 16 16:37:32 2007
@@ -27,6 +27,7 @@
import org.osgi.framework.ServiceReference;
import org.osgi.service.cm.Configuration;
import org.osgi.service.cm.ConfigurationAdmin;
+import org.osoa.sca.annotations.Property;
/**
*
@@ -37,6 +38,7 @@
public String pid;
+ @Property
public double exchangeRate;
private String currency;
@@ -51,6 +53,7 @@
this.bundleContext = bc;
}
+ @Property
public void setCurrency(String currency) {
this.currency = currency;
}
Modified: incubator/tuscany/branches/sca-java-1.0/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerImpl.java?rev=576211&r1=576210&r2=576211&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerImpl.java (original)
+++ incubator/tuscany/branches/sca-java-1.0/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerImpl.java Sun Sep 16 16:37:32 2007
@@ -21,12 +21,15 @@
import java.util.ArrayList;
+import org.osoa.sca.annotations.AllowsPassByReference;
+
import supplychain.OSGiBundleImpl;
import supplychain.retailer.Retailer;
/**
* This class implements the Customer service component.
*/
+@AllowsPassByReference
public class OSGiCustomerImpl extends OSGiBundleImpl implements Customer {
private ArrayList<String> outstandingOrders = new ArrayList<String>();
Modified: incubator/tuscany/branches/sca-java-1.0/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryImpl.java?rev=576211&r1=576210&r2=576211&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryImpl.java (original)
+++ incubator/tuscany/branches/sca-java-1.0/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryImpl.java Sun Sep 16 16:37:32 2007
@@ -37,8 +37,8 @@
public OSGiCustomerWithQueryImpl() {
super( new String[]{"retailer", "retailerQuery"},
- new String[]{"(retailerName=amazon.com)",
- "(retailerName=amazon.com)"
+ new String[]{"(component.service.name=RetailerComponent/Retailer)",
+ "(component.service.name=RetailerComponent/RetailerQuery)"
});
registerService(this, "supplychain.customer.Customer", null);
Modified: incubator/tuscany/branches/sca-java-1.0/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperFactoryImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperFactoryImpl.java?rev=576211&r1=576210&r2=576211&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperFactoryImpl.java (original)
+++ incubator/tuscany/branches/sca-java-1.0/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperFactoryImpl.java Sun Sep 16 16:37:32 2007
@@ -64,7 +64,7 @@
public Object getService(Bundle bundle, ServiceRegistration reg) {
OSGiShipperImpl shipper = new OSGiShipperImpl(false);
shipper.start(bundleContext);
- OSGiShipperServiceImpl shipperService = new OSGiShipperServiceImpl(shipper,
+ OSGiStatelessShipperServiceImpl shipperService = new OSGiStatelessShipperServiceImpl(shipper,
(String)reg.getReference().getProperty("shipperName"));
return shipperService;
}
Modified: incubator/tuscany/branches/sca-java-1.0/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperImpl.java?rev=576211&r1=576210&r2=576211&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperImpl.java (original)
+++ incubator/tuscany/branches/sca-java-1.0/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperImpl.java Sun Sep 16 16:37:32 2007
@@ -52,19 +52,21 @@
Hashtable<String, Object> props1 = new Hashtable<String, Object>();
props1.put("shipperName", "RoyalMail");
+ props1.put("component.service.name", "ShipperComponent"+version+"/ShipperService1");
bc.registerService("supplychain.shipper.Shipper",
new OSGiVersionedShipperServiceImpl(this, "RoyalMail", version),
props1);
Hashtable<String, Object> props2 = new Hashtable<String, Object>();
props2.put("shipperName", "ParcelForce");
+ props2.put("component.service.name", "ShipperComponent"+version+"/ShipperService2");
bc.registerService("supplychain.shipper.Shipper",
new OSGiVersionedShipperServiceImpl(this, "ParcelForce", version),
props2);
try {
ServiceReference[] refs = bc.getServiceReferences(Customer.class.getName(),
- "(component.service.name=CustomerComponent" + version + ".CustomerService)");
+ "(component.service.name=CustomerComponent" + version + "/CustomerService)");
if (refs != null && refs.length > 0) {
customer = (Customer) bc.getService(refs[0]);
}
Modified: incubator/tuscany/branches/sca-java-1.0/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.xml?rev=576211&r1=576210&r2=576211&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.xml (original)
+++ incubator/tuscany/branches/sca-java-1.0/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.xml Sun Sep 16 16:37:32 2007
@@ -27,7 +27,7 @@
interface="supplychain.retailer.Retailer"
bind="setRetailer"
unbind="unsetRetailer"
- target="(retailerName=amazon.com)"
+ target="(component.service.name=RetailerComponent/Retailer)"
policy="dynamic"
/>
@@ -36,7 +36,7 @@
interface="supplychain.retailer.RetailerQuery"
bind="setRetailerQuery"
unbind="unsetRetailerQuery"
- target="(retailerName=amazon.com)"
+ target="(component.service.name=RetailerComponent/RetailerQuery)"
policy="dynamic"
/>
Modified: incubator/tuscany/branches/sca-java-1.0/itest/osgi-implementation/src/main/resources/osgi/passbyref/Greetings.mf
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/itest/osgi-implementation/src/main/resources/osgi/passbyref/Greetings.mf?rev=576211&r1=576210&r2=576211&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/itest/osgi-implementation/src/main/resources/osgi/passbyref/Greetings.mf (original)
+++ incubator/tuscany/branches/sca-java-1.0/itest/osgi-implementation/src/main/resources/osgi/passbyref/Greetings.mf Sun Sep 16 16:37:32 2007
@@ -1,10 +1,11 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Greetings
-Bundle-SymbolicName: helloworld.Greetings
+Bundle-SymbolicName: passbyref.helloworld.Greetings
Bundle-Version: 1.0.0
Bundle-Localization: plugin
Import-Package: org.osgi.framework
Export-Package: helloworld
Bundle-Activator: helloworld.OSGiGreetingsImpl
+
Modified: incubator/tuscany/branches/sca-java-1.0/itest/osgi-implementation/src/main/resources/osgi/properties/ManagedStockQuoteFactory.mf
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/itest/osgi-implementation/src/main/resources/osgi/properties/ManagedStockQuoteFactory.mf?rev=576211&r1=576210&r2=576211&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/itest/osgi-implementation/src/main/resources/osgi/properties/ManagedStockQuoteFactory.mf (original)
+++ incubator/tuscany/branches/sca-java-1.0/itest/osgi-implementation/src/main/resources/osgi/properties/ManagedStockQuoteFactory.mf Sun Sep 16 16:37:32 2007
@@ -1,10 +1,11 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: StockQuote
-Bundle-SymbolicName: stockquote.StockQuote
+Bundle-SymbolicName: stockquote.ManagedStockQuoteFactory
Bundle-Version: 1.0.0
Bundle-Localization: plugin
Import-Package: org.osgi.framework, org.osgi.service.cm
Export-Package: stockquote
Bundle-Activator: stockquote.OSGiManagedStockQuoteFactoryImpl
+
Modified: incubator/tuscany/branches/sca-java-1.0/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuoteFactory.mf
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuoteFactory.mf?rev=576211&r1=576210&r2=576211&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuoteFactory.mf (original)
+++ incubator/tuscany/branches/sca-java-1.0/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuoteFactory.mf Sun Sep 16 16:37:32 2007
@@ -1,10 +1,11 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: StockQuote
-Bundle-SymbolicName: stockquote.StockQuote
+Bundle-SymbolicName: stockquote.StockQuoteFactory
Bundle-Version: 1.0.0
Bundle-Localization: plugin
Import-Package: org.osgi.framework, org.osgi.service.cm
Export-Package: stockquote
Bundle-Activator: stockquote.OSGiStockQuoteFactoryImpl
+
Modified: incubator/tuscany/branches/sca-java-1.0/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.mf
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.mf?rev=576211&r1=576210&r2=576211&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.mf (original)
+++ incubator/tuscany/branches/sca-java-1.0/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.mf Sun Sep 16 16:37:32 2007
@@ -1,11 +1,12 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: StockQuote
-Bundle-SymbolicName: stockquote.StockQuote
+Bundle-SymbolicName: ds.stockquote.StockQuote
Bundle-Version: 1.0.0
Bundle-Localization: plugin
Import-Package: org.osgi.framework, org.osgi.service.component, org.osgi.service.cm
Export-Package: stockquote
Service-Component: osgi/properties/ds/StockQuote.xml
+
Modified: incubator/tuscany/branches/sca-java-1.0/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.mf
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.mf?rev=576211&r1=576210&r2=576211&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.mf (original)
+++ incubator/tuscany/branches/sca-java-1.0/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.mf Sun Sep 16 16:37:32 2007
@@ -1,11 +1,12 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: StockQuote
-Bundle-SymbolicName: stockquote.StockQuote
+Bundle-SymbolicName: ds.stockquote.StockQuoteFactory
Bundle-Version: 1.0.0
Bundle-Localization: plugin
Import-Package: org.osgi.framework, org.osgi.service.component, org.osgi.service.cm
Export-Package: stockquote
Service-Component: osgi/properties/ds/StockQuoteFactory.xml
+
Modified: incubator/tuscany/branches/sca-java-1.0/itest/osgi-implementation/src/main/resources/osgi/version/Shipper1.mf
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/itest/osgi-implementation/src/main/resources/osgi/version/Shipper1.mf?rev=576211&r1=576210&r2=576211&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/itest/osgi-implementation/src/main/resources/osgi/version/Shipper1.mf (original)
+++ incubator/tuscany/branches/sca-java-1.0/itest/osgi-implementation/src/main/resources/osgi/version/Shipper1.mf Sun Sep 16 16:37:32 2007
@@ -5,6 +5,6 @@
Bundle-Version: 1.0.0
Bundle-Localization: plugin
Import-Package: org.osgi.framework,
- supplychain.customer
+ supplychain.customer;version="[1.0.0,2.0.0)"
Export-Package: supplychain.shipper;version="1.0.0"
Bundle-Activator: supplychain.shipper.OSGiVersionedShipperImpl
Modified: incubator/tuscany/branches/sca-java-1.0/itest/osgi-implementation/src/main/resources/osgi/version/Shipper2.mf
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/itest/osgi-implementation/src/main/resources/osgi/version/Shipper2.mf?rev=576211&r1=576210&r2=576211&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/itest/osgi-implementation/src/main/resources/osgi/version/Shipper2.mf (original)
+++ incubator/tuscany/branches/sca-java-1.0/itest/osgi-implementation/src/main/resources/osgi/version/Shipper2.mf Sun Sep 16 16:37:32 2007
@@ -5,6 +5,6 @@
Bundle-Version: 2.0.0
Bundle-Localization: plugin
Import-Package: org.osgi.framework,
- supplychain.customer
+ supplychain.customer;version="[2.0.0,3.0.0)"
Export-Package: supplychain.shipper;version="2.0.0"
Bundle-Activator: supplychain.shipper.OSGiVersionedShipperImpl
Modified: incubator/tuscany/branches/sca-java-1.0/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse1.mf
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse1.mf?rev=576211&r1=576210&r2=576211&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse1.mf (original)
+++ incubator/tuscany/branches/sca-java-1.0/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse1.mf Sun Sep 16 16:37:32 2007
@@ -5,6 +5,6 @@
Bundle-Version: 1.0.0
Bundle-Localization: plugin
Import-Package: org.osgi.framework,
- supplychain.shipper
+ supplychain.shipper;version="[1.0.0,2.0.0)"
Export-Package: supplychain.warehouse;version="1.0.0"
Bundle-Activator: supplychain.warehouse.OSGiWarehouseImpl
Modified: incubator/tuscany/branches/sca-java-1.0/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse2.mf
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse2.mf?rev=576211&r1=576210&r2=576211&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse2.mf (original)
+++ incubator/tuscany/branches/sca-java-1.0/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse2.mf Sun Sep 16 16:37:32 2007
@@ -5,6 +5,6 @@
Bundle-Version: 2.0.0
Bundle-Localization: plugin
Import-Package: org.osgi.framework,
- supplychain.shipper
+ supplychain.shipper;version="2.0.0"
Export-Package: supplychain.warehouse;version="2.0.0"
Bundle-Activator: supplychain.warehouse.OSGiWarehouseImpl
Modified: incubator/tuscany/branches/sca-java-1.0/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse1.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse1.xml?rev=576211&r1=576210&r2=576211&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse1.xml (original)
+++ incubator/tuscany/branches/sca-java-1.0/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse1.xml Sun Sep 16 16:37:32 2007
@@ -28,5 +28,6 @@
bind="setShipper"
unbind="unsetShipper"
policy="dynamic"
+ target="(shipperName=ParcelForce)"
/>
</component>
Modified: incubator/tuscany/branches/sca-java-1.0/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse2.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse2.xml?rev=576211&r1=576210&r2=576211&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse2.xml (original)
+++ incubator/tuscany/branches/sca-java-1.0/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse2.xml Sun Sep 16 16:37:32 2007
@@ -28,5 +28,6 @@
bind="setShipper"
unbind="unsetShipper"
policy="dynamic"
+ target="(shipperName=RoyalMail)"
/>
</component>
Modified: incubator/tuscany/branches/sca-java-1.0/itest/osgi-implementation/src/test/java/helloworld/HelloWorldTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/itest/osgi-implementation/src/test/java/helloworld/HelloWorldTestCase.java?rev=576211&r1=576210&r2=576211&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/itest/osgi-implementation/src/test/java/helloworld/HelloWorldTestCase.java (original)
+++ incubator/tuscany/branches/sca-java-1.0/itest/osgi-implementation/src/test/java/helloworld/HelloWorldTestCase.java Sun Sep 16 16:37:32 2007
@@ -1,55 +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 helloworld;
-
-import helloworld.HelloWorld;
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-import util.OSGiTestUtil;
-
-
-public class HelloWorldTestCase extends TestCase {
-
- private SCADomain scaDomain;
- private HelloWorld helloWorld;
-
- protected void setUp() throws Exception {
- OSGiTestUtil.setUpOSGiTestRutime();
-
- scaDomain = SCADomain.newInstance("sca/ws-helloworld.composite");
- helloWorld = scaDomain.getService(HelloWorld.class, "HelloWorldComponent");
- }
-
- protected void tearDown() throws Exception {
- scaDomain.close();
- OSGiTestUtil.shutdownOSGiRuntime();
- }
-
-
- public void testHelloWorld() throws Exception {
- String greetings = helloWorld.getGreetings("petra");
- System.out.println(greetings);
- assertEquals("Hello petra", greetings);
- }
-
-
-}
Modified: incubator/tuscany/branches/sca-java-1.0/itest/osgi-implementation/src/test/java/helloworld/PassByRefTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/itest/osgi-implementation/src/test/java/helloworld/PassByRefTestCase.java?rev=576211&r1=576210&r2=576211&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/itest/osgi-implementation/src/test/java/helloworld/PassByRefTestCase.java (original)
+++ incubator/tuscany/branches/sca-java-1.0/itest/osgi-implementation/src/test/java/helloworld/PassByRefTestCase.java Sun Sep 16 16:37:32 2007
@@ -1,135 +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 helloworld;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-import util.OSGiTestUtil;
-
-
-public class PassByRefTestCase extends TestCase {
-
- private SCADomain scaDomain;
- private Greetings greetingsJava;
- private Greetings greetingsOSGi;
- private String[] origNames = {"world"};
- private String[] names;
-
- protected void setUp() throws Exception {
- OSGiTestUtil.setUpOSGiTestRutime();
-
- scaDomain = SCADomain.newInstance("sca/passbyref-test.composite");
- greetingsJava = scaDomain.getService(Greetings.class, "JavaGreetingsComponent");
- greetingsOSGi = scaDomain.getService(Greetings.class, "OSGiGreetingsComponent");
-
- names = new String[origNames.length];
- System.arraycopy(origNames, 0, names, 0, names.length);
- }
-
- protected void tearDown() throws Exception {
- scaDomain.close();
- OSGiTestUtil.shutdownOSGiRuntime();
- }
-
- public void test() throws Exception {
-
- javaOSGiPassByValue();
- osgiJavaPassByValue();
- javaOSGiPassByRef();
-// osgiJavaPassByRef(); // FIXME
-
- }
-
-
- public void javaOSGiPassByValue() throws Exception {
-
- String[] greetings = greetingsJava.getGreetingsFromJava(names);
- for (int i = 0; i < origNames.length; i++) {
- assertEquals(origNames[i], names[i]);
- }
- for (int i = 0; i < origNames.length; i++) {
-
- System.out.println(greetings[i]);
-
- assertEquals(greetings[i],
- "Hello " + origNames[i] + "(From Java)(From OSGi)");
- }
-
- }
-
- public void osgiJavaPassByValue() throws Exception {
- String[] names = {
- "world"
- };
- String[] greetings = greetingsOSGi.getGreetingsFromOSGi(names);
-
- for (int i = 0; i < origNames.length; i++) {
- assertEquals(origNames[i], names[i]);
- }
- for (int i = 0; i < origNames.length; i++) {
-
- System.out.println(greetings[i]);
-
- assertEquals(greetings[i],
- "Hello " + origNames[i] + "(From OSGi)(From Java)");
- }
-
-
-
- }
-
- public void javaOSGiPassByRef() throws Exception {
- String[] names = {
- "world"
- };
- String[] greetings = greetingsJava.getModifiedGreetingsFromJava(names);
- for (int i = 0; i < origNames.length; i++) {
- assertEquals("Hello " + origNames[i] + "(From Java)(From OSGi)", names[i]);
- }
- for (int i = 0; i < origNames.length; i++) {
-
- System.out.println(greetings[i]);
-
- assertEquals(greetings[i],
- "Hello " + origNames[i] + "(From Java)(From OSGi)");
- }
- }
-
- public void osgiJavaPassByRef() throws Exception {
- String[] names = {
- "world"
- };
- String[] greetings = greetingsOSGi.getModifiedGreetingsFromOSGi(names);
- for (int i = 0; i < origNames.length; i++) {
- assertEquals("Hello " + origNames[i] + "(From OSGi)(From Java)", names[i]);
- }
- for (int i = 0; i < origNames.length; i++) {
-
- System.out.println(greetings[i]);
-
- assertEquals(greetings[i],
- "Hello " + origNames[i] + "(From OSGi)(From Java)");
- }
- }
-
-
-}
Modified: incubator/tuscany/branches/sca-java-1.0/itest/osgi-implementation/src/test/java/supplychain/SupplyChainTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/itest/osgi-implementation/src/test/java/supplychain/SupplyChainTestCase.java?rev=576211&r1=576210&r2=576211&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/itest/osgi-implementation/src/test/java/supplychain/SupplyChainTestCase.java (original)
+++ incubator/tuscany/branches/sca-java-1.0/itest/osgi-implementation/src/test/java/supplychain/SupplyChainTestCase.java Sun Sep 16 16:37:32 2007
@@ -43,7 +43,7 @@
protected void setUp() throws Exception {
- OSGiTestUtil.setUpOSGiTestRutime();
+ OSGiTestUtil.setUpOSGiTestRuntime();
scaDomain = SCADomain.newInstance(compositeName);
customer = scaDomain.getService(Customer.class, "CustomerComponent");
Modified: incubator/tuscany/branches/sca-java-1.0/itest/osgi-implementation/src/test/java/supplychain/VersionedSupplyChainTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/itest/osgi-implementation/src/test/java/supplychain/VersionedSupplyChainTestCase.java?rev=576211&r1=576210&r2=576211&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/itest/osgi-implementation/src/test/java/supplychain/VersionedSupplyChainTestCase.java (original)
+++ incubator/tuscany/branches/sca-java-1.0/itest/osgi-implementation/src/test/java/supplychain/VersionedSupplyChainTestCase.java Sun Sep 16 16:37:32 2007
@@ -43,7 +43,7 @@
protected void setUp() throws Exception {
- OSGiTestUtil.setUpOSGiTestRutime();
+ OSGiTestUtil.setUpOSGiTestRuntime();
scaDomain = SCADomain.newInstance(compositeName);
customer1 = scaDomain.getService(Customer.class, "CustomerComponent1");
@@ -54,6 +54,7 @@
scaDomain.close();
OSGiTestUtil.shutdownOSGiRuntime();
+ Thread.sleep(1000);
}
public void test() throws Exception {
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org