Update to Equinox 3.5 to take advantage of the hook services API

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@794552 13f79535-47bb-0310-9956-ffa450edef68

13 files changed, 66 insertions, 23 deletions

diff --git a/java/sca/distribution/all/src/main/release/bin/LICENSE b/java/sca/distribution/all/src/main/release/bin/LICENSE
index cc44a9beb0..b6414bd07d 100644
--- a/java/sca/distribution/all/src/main/release/bin/LICENSE
+++ b/java/sca/distribution/all/src/main/release/bin/LICENSE
@@ -384,8 +384,8 @@ OF THE POSSIBILITY OF SUCH DAMAGE.
 

 ===============================================================================

 The Equinox OSGi Runtime jars;

-   osgi-3.4.0-v20080605-1900.jar

-   common-3.4.0-v20080421-2006.jar

+   osgi-3.5.0-v20090520.jar

+   common-3.5.0-v20090520-1800.jar

    services-3.1.200-v20071203.jar

 

 Eclipse Public License - v 1.0

diff --git a/java/sca/modules/contribution-osgi/pom.xml b/java/sca/modules/contribution-osgi/pom.xml
index 147db9f204..7ec856f3e2 100644
--- a/java/sca/modules/contribution-osgi/pom.xml
+++ b/java/sca/modules/contribution-osgi/pom.xml
@@ -44,7 +44,7 @@
         <dependency>
             <groupId>org.eclipse</groupId>
             <artifactId>osgi</artifactId>
-            <version>3.4.0-v20080605-1900</version>
+            <version>3.5.0-v20090520</version>
             <scope>compile</scope>
         </dependency>
 
diff --git a/java/sca/modules/extensibility-equinox/pom.xml b/java/sca/modules/extensibility-equinox/pom.xml
index f360fe7c12..6643dd01d6 100644
--- a/java/sca/modules/extensibility-equinox/pom.xml
+++ b/java/sca/modules/extensibility-equinox/pom.xml
@@ -37,7 +37,7 @@
         <dependency>
             <groupId>org.eclipse</groupId>
             <artifactId>osgi</artifactId>
-            <version>3.4.0-v20080605-1900</version>
+            <version>3.5.0-v20090520</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>
diff --git a/java/sca/modules/host-http-osgi/pom.xml b/java/sca/modules/host-http-osgi/pom.xml
index 078caead01..a384ff6c9a 100644
--- a/java/sca/modules/host-http-osgi/pom.xml
+++ b/java/sca/modules/host-http-osgi/pom.xml
@@ -37,19 +37,19 @@
         <dependency>
             <groupId>org.eclipse</groupId>
             <artifactId>osgi</artifactId>
-            <version>3.4.0-v20080605-1900</version>
+            <version>3.5.0-v20090520</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.eclipse.osgi</groupId>
             <artifactId>services</artifactId>
-            <version>3.1.200-v20071203</version>
+            <version>3.2.0-v20090520-1800</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.eclipse.equinox</groupId>
             <artifactId>http</artifactId>
-            <version>1.0.200-v20080421-2006</version>
+            <version>1.0.300-v20090520-1800</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
diff --git a/java/sca/modules/implementation-osgi-runtime/pom.xml b/java/sca/modules/implementation-osgi-runtime/pom.xml
index 73ebac7e75..24dab87527 100644
--- a/java/sca/modules/implementation-osgi-runtime/pom.xml
+++ b/java/sca/modules/implementation-osgi-runtime/pom.xml
@@ -50,7 +50,7 @@
         <dependency>
             <groupId>org.eclipse</groupId>
             <artifactId>osgi</artifactId>
-            <version>3.4.0-v20080605-1900</version>
+            <version>3.5.0-v20090520</version>
             <scope>compile</scope>
         </dependency>
 
diff --git a/java/sca/modules/implementation-osgi/pom.xml b/java/sca/modules/implementation-osgi/pom.xml
index 0d6f2afd7c..a648421425 100644
--- a/java/sca/modules/implementation-osgi/pom.xml
+++ b/java/sca/modules/implementation-osgi/pom.xml
@@ -37,7 +37,7 @@
         <dependency>
             <groupId>org.eclipse</groupId>
             <artifactId>osgi</artifactId>
-            <version>3.4.0-v20080605-1900</version>
+            <version>3.5.0-v20090520</version>
             <scope>compile</scope>
         </dependency>
 
diff --git a/java/sca/modules/node-impl-osgi/pom.xml b/java/sca/modules/node-impl-osgi/pom.xml
index 9a0167acb5..75bc2991ef 100644
--- a/java/sca/modules/node-impl-osgi/pom.xml
+++ b/java/sca/modules/node-impl-osgi/pom.xml
@@ -45,13 +45,13 @@
         <dependency>
             <groupId>org.eclipse</groupId>
             <artifactId>osgi</artifactId>
-            <version>3.4.0-v20080605-1900</version>
+            <version>3.5.0-v20090520</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.eclipse.osgi</groupId>
             <artifactId>services</artifactId>
-            <version>3.1.200-v20071203</version>
+            <version>3.2.0-v20090520-1800</version>
             <scope>test</scope>
         </dependency>
 
@@ -59,14 +59,14 @@
         <dependency>
             <groupId>org.eclipse.equinox</groupId>
             <artifactId>ds</artifactId>
-            <version>1.0.0-v20080427-0830</version>
+            <version>1.1.0-v20090601</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.eclipse.equinox</groupId>
             <artifactId>util</artifactId>
-            <version>1.0.0-v20080414</version>
+            <version>1.0.100-v20090520-1800</version>
             <scope>test</scope>
         </dependency>
 
@@ -100,7 +100,7 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-osgi</artifactId>
             <version>2.0-SNAPSHOT</version>
-            <scope>test</scope>
+            <scope>compile</scope>
         </dependency>
 
         <dependency>
diff --git a/java/sca/pom.xml b/java/sca/pom.xml
index f1bd69a0ec..f818f795b6 100644
--- a/java/sca/pom.xml
+++ b/java/sca/pom.xml
@@ -285,7 +285,7 @@
                    <plugin> 
                        <groupId>org.apache.tuscany.maven.plugins</groupId> 
                        <artifactId>maven-bundle-plugin</artifactId> 
-                       <version>1.0.2</version> 
+                       <version>1.0.4-SNAPSHOT</version> 
                        <extensions>true</extensions> 
                     </plugin>
                     <plugin>
@@ -473,6 +473,7 @@
             <resource>
                 <directory>src/main/resources</directory>
             </resource>
+<!--
             <resource>
                 <directory>${notice.dir}</directory>
                 <targetPath>META-INF</targetPath>
@@ -497,6 +498,18 @@
                     <include>**/*</include>
                 </includes>
             </resource>
+-->
+            <resource>
+                <directory>${basedir}</directory>
+                <includes>
+                    <include>LICENSE</include>
+                    <include>NOTICE</include>
+                    <include>README</include>
+                    <include>META-INF/**/*</include>
+                    <include>OSGI-INF/**/*</include>
+                </includes>
+            </resource>
+
         </resources>
 
         <pluginManagement>
diff --git a/java/sca/samples/dosgi-calculator-operations/pom.xml b/java/sca/samples/dosgi-calculator-operations/pom.xml
index fd08e25e72..add9380c55 100644
--- a/java/sca/samples/dosgi-calculator-operations/pom.xml
+++ b/java/sca/samples/dosgi-calculator-operations/pom.xml
@@ -54,7 +54,7 @@
         <dependency>

             <groupId>org.eclipse.osgi</groupId>

             <artifactId>services</artifactId>

-            <version>3.1.200-v20071203</version>

+            <version>3.2.0-v20090520-1800</version>

             <scope>test</scope>

         </dependency>

 

@@ -62,14 +62,14 @@
         <dependency>

             <groupId>org.eclipse.equinox</groupId>

             <artifactId>ds</artifactId>

-            <version>1.0.0-v20080427-0830</version>

+            <version>1.1.0-v20090601</version>

             <scope>test</scope>

         </dependency>

 

         <dependency>

             <groupId>org.eclipse.equinox</groupId>

             <artifactId>util</artifactId>

-            <version>1.0.0-v20080414</version>

+            <version>1.0.100-v20090520-1800</version>

             <scope>test</scope>

         </dependency>

 

diff --git a/java/sca/samples/dosgi-calculator/OSGI-INF/sca/calculator-service.bindings b/java/sca/samples/dosgi-calculator/OSGI-INF/sca/calculator-service.bindings
new file mode 100644
index 0000000000..65a5a76194
--- /dev/null
+++ b/java/sca/samples/dosgi-calculator/OSGI-INF/sca/calculator-service.bindings
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+* Licensed to the Apache Software Foundation (ASF) under one

+* or more contributor license agreements.  See the NOTICE file

+* distributed with this work for additional information

+* regarding copyright ownership.  The ASF licenses this file

+* to you under the Apache License, Version 2.0 (the

+* "License"); you may not use this file except in compliance

+* with the License.  You may obtain a copy of the License at

+*

+*   http://www.apache.org/licenses/LICENSE-2.0

+*

+* Unless required by applicable law or agreed to in writing,

+* software distributed under the License is distributed on an

+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+* KIND, either express or implied.  See the License for the

+* specific language governing permissions and limitations

+* under the License.

+-->

+<!-- A consumer-side service description file for RFC 119 -->

+<bindings xmlns="http://www.osgi.org/xmlns/sd/v1.0.0" 

+    xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903">

+    <sca:binding.ws uri="http://localhost:8086/CalculatorService"/>

+</bindings>    
\ No newline at end of file
diff --git a/java/sca/samples/dosgi-calculator/pom.xml b/java/sca/samples/dosgi-calculator/pom.xml
index 2033338434..115dd15003 100644
--- a/java/sca/samples/dosgi-calculator/pom.xml
+++ b/java/sca/samples/dosgi-calculator/pom.xml
@@ -60,7 +60,7 @@
         <dependency>

             <groupId>org.eclipse.osgi</groupId>

             <artifactId>services</artifactId>

-            <version>3.1.200-v20071203</version>

+            <version>3.2.0-v20090520-1800</version>

         </dependency>

 

         <dependency>

@@ -74,14 +74,14 @@
         <dependency>

             <groupId>org.eclipse.equinox</groupId>

             <artifactId>ds</artifactId>

-            <version>1.0.0-v20080427-0830</version>

+            <version>1.1.0-v20090601</version>

             <scope>test</scope>

         </dependency>

 

         <dependency>

             <groupId>org.eclipse.equinox</groupId>

             <artifactId>util</artifactId>

-            <version>1.0.0-v20080414</version>

+            <version>1.0.100-v20090520-1800</version>

             <scope>test</scope>

         </dependency>

 

diff --git a/java/sca/samples/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorActivator.java b/java/sca/samples/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorActivator.java
index ac49cbcb12..8bfa6772da 100644
--- a/java/sca/samples/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorActivator.java
+++ b/java/sca/samples/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorActivator.java
@@ -59,6 +59,9 @@ public class CalculatorActivator implements BundleActivator {
         Dictionary<String, Object> props = new Hashtable<String, Object>();

         props.put("sca.service", "CalculatorComponent#service-name(Calculator)");

         props.put("calculator", "Calculator");

+        props.put("osgi.remote.configuration.type", "sca");

+        props.put("osgi.remote.configuration.sca.bindings", new String[] {"OSGI-INF/sca/calculator-service.bindings"});

+        props.put("osgi.remote.interfaces", new String[] {"*"});

         logger.info("Registering " + CalculatorService.class.getName());

         CalculatorService calculator = new CalculatorServiceImpl(context);

         context.registerService(CalculatorService.class.getName(), calculator, props);

diff --git a/java/sca/samples/pom.xml b/java/sca/samples/pom.xml
index 36e0049d60..55582f903a 100644
--- a/java/sca/samples/pom.xml
+++ b/java/sca/samples/pom.xml
@@ -56,13 +56,16 @@
                 
                 <module>implementation-java-calculator</module>
                 <module>binding-ws-calculator</module>
-                <!-- module>host-webapp-calculator</module -->
 
                 <module>webapps/helloworld</module>
                 <module>webapps/helloworld-bpel</module>
                 <module>webapps/helloworld-jsp</module>
                 <module>webapps/helloworld-stripes</module>
-
+                <module>webapps/helloworld-servlet</module>
+<!--
+                <module>webapps/helloworld-rest</module>
+                <module>webapps/helloworld-wicket</module>
+-->
             </modules>
         </profile>
     </profiles>