Fixes for itest/osgi-tuscany and Felix versions

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

7 files changed, 17 insertions, 9 deletions

diff --git a/java/sca/modules/binding-jsonrpc-runtime/pom.xml b/java/sca/modules/binding-jsonrpc-runtime/pom.xml
index 8bb1d52552..598f92f324 100644
--- a/java/sca/modules/binding-jsonrpc-runtime/pom.xml
+++ b/java/sca/modules/binding-jsonrpc-runtime/pom.xml
@@ -146,8 +146,15 @@
                         <Bundle-Version>${tuscany.version}</Bundle-Version>
                         <Bundle-SymbolicName>org.apache.tuscany.sca.binding.jsonrpc.runtime</Bundle-SymbolicName>
                         <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.binding.jsonrpc*</Export-Package>
-                        <Import-Package>org.apache.tuscany.sca.assembly.xml,*</Import-Package>
+                        <Export-Package>
+                            !org.apache.tuscany.sca.binding.jsonrpc,
+                            org.apache.tuscany.sca.binding.jsonrpc*
+                        </Export-Package>
+                        <Import-Package>
+                            org.apache.tuscany.sca.assembly.xml,
+                            org.apache.tuscany.sca.binding.jsonrpc,
+                            *
+                        </Import-Package>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/java/sca/modules/contribution-osgi/pom.xml b/java/sca/modules/contribution-osgi/pom.xml
index 7f5859cad4..9e3c5b6917 100644
--- a/java/sca/modules/contribution-osgi/pom.xml
+++ b/java/sca/modules/contribution-osgi/pom.xml
@@ -50,7 +50,7 @@
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.main</artifactId>
-            <version>1.1.0-SNAPSHOT</version>
+            <version>1.0.4</version>
         </dependency>
 
 
diff --git a/java/sca/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscovery.java b/java/sca/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscovery.java
index fcf7843fa9..45a4494f24 100644
--- a/java/sca/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscovery.java
+++ b/java/sca/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscovery.java
@@ -96,7 +96,7 @@ public class ServiceDiscovery {
      * @return set of service declarations
      * @throws IOException
      */
-    public Set<ServiceDeclaration> getServiceDeclarations(String name) throws IOException {
+    public synchronized Set<ServiceDeclaration> getServiceDeclarations(String name) throws IOException {
 
         Set<ServiceDeclaration> classSet = new HashSet<ServiceDeclaration>();
 
@@ -126,7 +126,7 @@ public class ServiceDiscovery {
      * @throws IOException
      * @throws ClassNotFoundException
      */
-    public Class<?> loadFirstServiceClass(Class<?> serviceInterface) throws IOException, ClassNotFoundException {
+    public synchronized Class<?> loadFirstServiceClass(Class<?> serviceInterface) throws IOException, ClassNotFoundException {
 
         Set<ServiceDeclaration> classSet = new HashSet<ServiceDeclaration>();
 
@@ -151,7 +151,7 @@ public class ServiceDiscovery {
      * @return Table of URLs with associated ClassLoaders
      * @throws IOException
      */
-    public Hashtable<ClassLoader, Set<URL>> getServiceResources(final String name) throws IOException {
+    public synchronized Hashtable<ClassLoader, Set<URL>> getServiceResources(final String name) throws IOException {
 
         Hashtable<ClassLoader, Set<URL>> resourceTable = new Hashtable<ClassLoader, Set<URL>>();
 
diff --git a/java/sca/modules/implementation-osgi/pom.xml b/java/sca/modules/implementation-osgi/pom.xml
index 5d695b91ab..55e61fda93 100644
--- a/java/sca/modules/implementation-osgi/pom.xml
+++ b/java/sca/modules/implementation-osgi/pom.xml
@@ -37,7 +37,7 @@
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.main</artifactId>
-            <version>1.1.0-SNAPSHOT</version>
+            <version>1.0.4</version>
         </dependency>
 
 
diff --git a/java/sca/modules/node2-api/pom.xml b/java/sca/modules/node2-api/pom.xml
index 05d3ce6e57..8e52a99014 100644
--- a/java/sca/modules/node2-api/pom.xml
+++ b/java/sca/modules/node2-api/pom.xml
@@ -51,6 +51,7 @@
                         <Bundle-SymbolicName>org.apache.tuscany.sca.node2.api</Bundle-SymbolicName>

                         <Bundle-Description>${pom.name}</Bundle-Description>

                         <Export-Package>org.apache.tuscany.sca.node*</Export-Package>

+                        <DynamicImport-Package>org.apache.tuscany.sca.node.impl</DynamicImport-Package>

                     </instructions>

                 </configuration>

             </plugin>

diff --git a/java/sca/modules/osgi-runtime/pom.xml b/java/sca/modules/osgi-runtime/pom.xml
index 8bd1b7160d..cf3a379c13 100644
--- a/java/sca/modules/osgi-runtime/pom.xml
+++ b/java/sca/modules/osgi-runtime/pom.xml
@@ -35,7 +35,7 @@
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.main</artifactId>
-            <version>1.1.0-SNAPSHOT</version>
+            <version>1.0.4</version>
         </dependency>
 
 
diff --git a/java/sca/modules/pom.xml b/java/sca/modules/pom.xml
index 7be9d31881..ae010db670 100644
--- a/java/sca/modules/pom.xml
+++ b/java/sca/modules/pom.xml
@@ -30,7 +30,7 @@
     <name>Apache Tuscany SCA Implementation Modules</name>
 
     <properties>
-        <tuscany.version>2.0</tuscany.version>
+        <tuscany.version>1.4</tuscany.version>
     </properties>
 
     <profiles>