You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rs...@apache.org on 2008/02/19 10:41:29 UTC

svn commit: r629049 [1/3] - in /incubator/tuscany/java/sca: itest/osgi-contribution/contribution-test/ itest/osgi-contribution/contribution-test/src/test/resources/osgi/felix/ itest/osgi-implementation/ itest/osgi-implementation/src/main/java/conversat...

Author: rsivaram
Date: Tue Feb 19 01:41:25 2008
New Revision: 629049

URL: http://svn.apache.org/viewvc?rev=629049&view=rev
Log:
Migrate implementation.osgi to the latest version of Felix

Modified:
    incubator/tuscany/java/sca/itest/osgi-contribution/contribution-test/pom.xml
    incubator/tuscany/java/sca/itest/osgi-contribution/contribution-test/src/test/resources/osgi/felix/felix.config.properties
    incubator/tuscany/java/sca/itest/osgi-implementation/pom.xml
    incubator/tuscany/java/sca/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientActivator.java
    incubator/tuscany/java/sca/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientServiceFactory.java
    incubator/tuscany/java/sca/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceFactory.java
    incubator/tuscany/java/sca/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
    incubator/tuscany/java/sca/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryComponentImpl.java
    incubator/tuscany/java/sca/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
    incubator/tuscany/java/sca/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryComponentImpl.java
    incubator/tuscany/java/sca/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
    incubator/tuscany/java/sca/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
    incubator/tuscany/java/sca/itest/osgi-implementation/src/test/resources/osgi/felix/felix.config.properties
    incubator/tuscany/java/sca/modules/contribution-osgi/pom.xml
    incubator/tuscany/java/sca/modules/implementation-osgi/pom.xml
    incubator/tuscany/java/sca/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiInstanceWrapper.java
    incubator/tuscany/java/sca/modules/osgi-runtime/pom.xml
    incubator/tuscany/java/sca/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/FelixRuntime.java
    incubator/tuscany/java/sca/samples/osgi-supplychain/pom.xml

Modified: incubator/tuscany/java/sca/itest/osgi-contribution/contribution-test/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/osgi-contribution/contribution-test/pom.xml?rev=629049&r1=629048&r2=629049&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/osgi-contribution/contribution-test/pom.xml (original)
+++ incubator/tuscany/java/sca/itest/osgi-contribution/contribution-test/pom.xml Tue Feb 19 01:41:25 2008
@@ -65,7 +65,7 @@
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.main</artifactId>
-            <version>1.0.0</version>
+            <version>1.1.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -77,19 +77,13 @@
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.configadmin</artifactId>
-            <version>0.9.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.log</artifactId>
-            <version>0.9.0-incubator-SNAPSHOT</version>
+            <version>1.0.0</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.scr</artifactId>
-            <version>0.9.0-SNAPSHOT</version>
+            <version>1.0.0</version>
         </dependency>
 
 

Modified: incubator/tuscany/java/sca/itest/osgi-contribution/contribution-test/src/test/resources/osgi/felix/felix.config.properties
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/osgi-contribution/contribution-test/src/test/resources/osgi/felix/felix.config.properties?rev=629049&r1=629048&r2=629049&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/osgi-contribution/contribution-test/src/test/resources/osgi/felix/felix.config.properties (original)
+++ incubator/tuscany/java/sca/itest/osgi-contribution/contribution-test/src/test/resources/osgi/felix/felix.config.properties Tue Feb 19 01:41:25 2008
@@ -22,16 +22,16 @@
 org.osgi.framework.system.packages=org.osgi.framework; version=1.3.0, \
  org.osgi.service.packageadmin; version=1.2.0, \
  org.osgi.service.startlevel; version=1.0.0, \
- org.osgi.service.url; version=1.0.0
+ org.osgi.service.url; version=1.0.0 \
+ org.osgi.util.tracker; version=1.3.2 
 
 
 felix.auto.start.1= \
     "file://${FELIX_DIR}/org.apache.felix.shell/1.0.0/org.apache.felix.shell-1.0.0.jar" \
     "file://${FELIX_DIR}/org.apache.felix.shell.tui/1.0.0/org.apache.felix.shell.tui-1.0.0.jar" \
-    "file://${FELIX_DIR}/org.apache.felix.bundlerepository/1.0.0/org.apache.felix.bundlerepository-1.0.0.jar" \
-    "file://${FELIX_DIR}/org.apache.felix.scr/0.9.0-SNAPSHOT/org.apache.felix.scr-0.9.0-SNAPSHOT.jar" \
-    "file://${FELIX_DIR}/org.apache.felix.log/0.9.0-incubator-SNAPSHOT/org.apache.felix.log-0.9.0-incubator-SNAPSHOT.jar" \
-    "file://${FELIX_DIR}/org.apache.felix.configadmin/0.9.0-SNAPSHOT/org.apache.felix.configadmin-0.9.0-SNAPSHOT.jar" 
+    "file://${FELIX_DIR}/org.apache.felix.bundlerepository/1.0.2/org.apache.felix.bundlerepository-1.0.2.jar" \
+    "file://${FELIX_DIR}/org.apache.felix.scr/1.0.0/org.apache.felix.scr-1.0.0.jar" \
+    "file://${FELIX_DIR}/org.apache.felix.configadmin/1.0.0/org.apache.felix.configadmin-1.0.0.jar" 
 
 
 felix.startlevel.framework=1



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