tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rsiva...@apache.org
Subject svn commit: r673669 - in /tuscany/java/sca: itest/osgi-contribution/contribution-classes-v2/ itest/osgi-contribution/contribution-classes/ itest/osgi-contribution/contribution-test/ itest/osgi-contribution/contribution-test/src/test/resources/osgi/feli...
Date Thu, 03 Jul 2008 12:59:49 GMT
Author: rsivaram
Date: Thu Jul  3 05:59:48 2008
New Revision: 673669

URL: http://svn.apache.org/viewvc?rev=673669&view=rev
Log:
Fixes for itest/osgi-tuscany and Felix versions

Modified:
    tuscany/java/sca/itest/osgi-contribution/contribution-classes-v2/pom.xml
    tuscany/java/sca/itest/osgi-contribution/contribution-classes/pom.xml
    tuscany/java/sca/itest/osgi-contribution/contribution-test/pom.xml
    tuscany/java/sca/itest/osgi-contribution/contribution-test/src/test/resources/osgi/felix/felix.config.properties
    tuscany/java/sca/itest/osgi-implementation/pom.xml
    tuscany/java/sca/itest/osgi-implementation/src/test/resources/osgi/felix/felix.config.properties
    tuscany/java/sca/itest/osgi-tuscany/osgi-tuscany-test/pom.xml
    tuscany/java/sca/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/META-INF/MANIFEST.MF
    tuscany/java/sca/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/felix/felix.config.properties
    tuscany/java/sca/itest/osgi-tuscany/sca-api/pom.xml
    tuscany/java/sca/itest/osgi-tuscany/test-bundles/pom.xml
    tuscany/java/sca/itest/osgi-tuscany/tuscany-3rdparty/pom.xml
    tuscany/java/sca/itest/osgi-tuscany/tuscany-extensions/pom.xml
    tuscany/java/sca/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml
    tuscany/java/sca/itest/osgi-tuscany/tuscany-osgi-installer/src/main/java/org/apache/tuscany/sca/installer/InstallerBundleActivator.java
    tuscany/java/sca/itest/osgi-tuscany/tuscany-runtime/pom.xml
    tuscany/java/sca/itest/osgi-tuscany/tuscany-spi/pom.xml
    tuscany/java/sca/modules/binding-jsonrpc-runtime/pom.xml
    tuscany/java/sca/modules/contribution-osgi/pom.xml
    tuscany/java/sca/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscovery.java
    tuscany/java/sca/modules/implementation-osgi/pom.xml
    tuscany/java/sca/modules/node2-api/pom.xml
    tuscany/java/sca/modules/osgi-runtime/pom.xml
    tuscany/java/sca/modules/pom.xml
    tuscany/java/sca/samples/osgi-supplychain/pom.xml

Modified: tuscany/java/sca/itest/osgi-contribution/contribution-classes-v2/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/osgi-contribution/contribution-classes-v2/pom.xml?rev=673669&r1=673668&r2=673669&view=diff
==============================================================================
--- tuscany/java/sca/itest/osgi-contribution/contribution-classes-v2/pom.xml (original)
+++ tuscany/java/sca/itest/osgi-contribution/contribution-classes-v2/pom.xml Thu Jul  3 05:59:48
2008
@@ -66,7 +66,7 @@
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.osgi.core</artifactId>
-            <version>1.0.0</version>
+            <version>1.0.1</version>
         </dependency>
         
 

Modified: tuscany/java/sca/itest/osgi-contribution/contribution-classes/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/osgi-contribution/contribution-classes/pom.xml?rev=673669&r1=673668&r2=673669&view=diff
==============================================================================
--- tuscany/java/sca/itest/osgi-contribution/contribution-classes/pom.xml (original)
+++ tuscany/java/sca/itest/osgi-contribution/contribution-classes/pom.xml Thu Jul  3 05:59:48
2008
@@ -66,7 +66,7 @@
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.osgi.core</artifactId>
-            <version>1.0.0</version>
+            <version>1.0.1</version>
         </dependency>
         
         <dependency>

Modified: tuscany/java/sca/itest/osgi-contribution/contribution-test/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/osgi-contribution/contribution-test/pom.xml?rev=673669&r1=673668&r2=673669&view=diff
==============================================================================
--- tuscany/java/sca/itest/osgi-contribution/contribution-test/pom.xml (original)
+++ tuscany/java/sca/itest/osgi-contribution/contribution-test/pom.xml Thu Jul  3 05:59:48
2008
@@ -65,25 +65,19 @@
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.main</artifactId>
-            <version>1.1.0-SNAPSHOT</version>
+            <version>1.0.4</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.felix</groupId>
-            <artifactId>org.osgi.core</artifactId>
-            <version>1.0.0</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.configadmin</artifactId>
-            <version>1.0.0</version>
+            <version>1.0.1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.scr</artifactId>
-            <version>1.0.0</version>
+            <version>1.0.2</version>
         </dependency>
 
 

Modified: tuscany/java/sca/itest/osgi-contribution/contribution-test/src/test/resources/osgi/felix/felix.config.properties
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/osgi-contribution/contribution-test/src/test/resources/osgi/felix/felix.config.properties?rev=673669&r1=673668&r2=673669&view=diff
==============================================================================
--- tuscany/java/sca/itest/osgi-contribution/contribution-test/src/test/resources/osgi/felix/felix.config.properties
(original)
+++ tuscany/java/sca/itest/osgi-contribution/contribution-test/src/test/resources/osgi/felix/felix.config.properties
Thu Jul  3 05:59:48 2008
@@ -27,12 +27,12 @@
 
 
 felix.auto.start.1= \     
-    "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"

+    "file://${FELIX_DIR}/org.apache.felix.scr/1.0.2/org.apache.felix.scr-1.0.2.jar" \
+    "file://${FELIX_DIR}/org.apache.felix.configadmin/1.0.1/org.apache.felix.configadmin-1.0.1.jar"

 
-# "file://${FELIX_DIR}/org.apache.felix.bundlerepository/1.1.0-SNAPSHOT/org.apache.felix.bundlerepository-1.1.0-SNAPSHOT.jar"
\
-# "file://${FELIX_DIR}/org.apache.felix.shell/1.1.0-SNAPSHOT/org.apache.felix.shell-1.1.0-SNAPSHOT.jar"
\
-# "file://${FELIX_DIR}/org.apache.felix.shell.tui/1.1.0-SNAPSHOT/org.apache.felix.shell.tui-1.1.0-SNAPSHOT.jar"
\
+# "file://${FELIX_DIR}/org.apache.felix.bundlerepository/1.0.3/org.apache.felix.bundlerepository-1.0.3.jar"
\
+# "file://${FELIX_DIR}/org.apache.felix.shell/1.0.1/org.apache.felix.shell-1.0.1.jar" \
+# "file://${FELIX_DIR}/org.apache.felix.shell.tui/1.0.1/org.apache.felix.shell.tui-1.0.1.jar"
\
 
 felix.startlevel.framework=1
 felix.startlevel.bundle=1

Modified: tuscany/java/sca/itest/osgi-implementation/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/osgi-implementation/pom.xml?rev=673669&r1=673668&r2=673669&view=diff
==============================================================================
--- tuscany/java/sca/itest/osgi-implementation/pom.xml (original)
+++ tuscany/java/sca/itest/osgi-implementation/pom.xml Thu Jul  3 05:59:48 2008
@@ -33,19 +33,13 @@
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.main</artifactId>
-            <version>1.1.0-SNAPSHOT</version>
+            <version>1.0.4</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.felix</groupId>
-            <artifactId>org.osgi.core</artifactId>
-            <version>1.0.0</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.configadmin</artifactId>
-            <version>1.0.0</version>
+            <version>1.0.1</version>
             <!-- Exclude the javax.servlet to avoid conflict -->
             <exclusions>
                 <exclusion>
@@ -58,7 +52,7 @@
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.scr</artifactId>
-            <version>1.0.0</version>
+            <version>1.0.2</version>
         </dependency>
 
         <dependency>

Modified: tuscany/java/sca/itest/osgi-implementation/src/test/resources/osgi/felix/felix.config.properties
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/osgi-implementation/src/test/resources/osgi/felix/felix.config.properties?rev=673669&r1=673668&r2=673669&view=diff
==============================================================================
--- tuscany/java/sca/itest/osgi-implementation/src/test/resources/osgi/felix/felix.config.properties
(original)
+++ tuscany/java/sca/itest/osgi-implementation/src/test/resources/osgi/felix/felix.config.properties
Thu Jul  3 05:59:48 2008
@@ -27,13 +27,13 @@
 
 
 felix.auto.start.1= \
-    "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"

+    "file://${FELIX_DIR}/org.apache.felix.scr/1.0.2/org.apache.felix.scr-1.0.2.jar" \
+    "file://${FELIX_DIR}/org.apache.felix.configadmin/1.0.1/org.apache.felix.configadmin-1.0.1.jar"

 
 
-#    "file://${FELIX_DIR}/org.apache.felix.shell/1.1.0-SNAPSHOT/org.apache.felix.shell-1.1.0-SNAPSHOT.jar"
\
-#    "file://${FELIX_DIR}/org.apache.felix.shell.tui/1.1.0-SNAPSHOT/org.apache.felix.shell.tui-1.1.0-SNAPSHOT.jar"
\
-#    "file://${FELIX_DIR}/org.apache.felix.bundlerepository/1.1.0-SNAPSHOT/org.apache.felix.bundlerepository-1.1.0-SNAPSHOT.jar"
\
+#    "file://${FELIX_DIR}/org.apache.felix.shell/1.0.1/org.apache.felix.shell-1.0.1.jar"
\
+#    "file://${FELIX_DIR}/org.apache.felix.shell.tui/1.0.1/org.apache.felix.shell.tui-1.0.1.jar"
\
+#    "file://${FELIX_DIR}/org.apache.felix.bundlerepository/1.0.3/org.apache.felix.bundlerepository-1.0.3.jar"
\
 
 felix.startlevel.framework=1
 felix.startlevel.bundle=1

Modified: tuscany/java/sca/itest/osgi-tuscany/osgi-tuscany-test/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/osgi-tuscany/osgi-tuscany-test/pom.xml?rev=673669&r1=673668&r2=673669&view=diff
==============================================================================
--- tuscany/java/sca/itest/osgi-tuscany/osgi-tuscany-test/pom.xml (original)
+++ tuscany/java/sca/itest/osgi-tuscany/osgi-tuscany-test/pom.xml Thu Jul  3 05:59:48 2008
@@ -42,19 +42,13 @@
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.main</artifactId>
-            <version>1.1.0-SNAPSHOT</version>
+            <version>1.0.4</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.felix</groupId>
-            <artifactId>org.osgi.core</artifactId>
-            <version>1.0.0</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.configadmin</artifactId>
-            <version>1.0.0</version>
+            <version>1.0.1</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.apache.felix</groupId>
@@ -66,7 +60,7 @@
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.scr</artifactId>
-            <version>1.0.0</version>
+            <version>1.0.2</version>
         </dependency>
 
 End Felix dependencies -->

Modified: tuscany/java/sca/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/META-INF/MANIFEST.MF?rev=673669&r1=673668&r2=673669&view=diff
==============================================================================
--- tuscany/java/sca/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/META-INF/MANIFEST.MF
(original)
+++ tuscany/java/sca/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/META-INF/MANIFEST.MF
Thu Jul  3 05:59:48 2008
@@ -10,7 +10,5 @@
   org.apache.tuscany.sca.host.embedded,
   org.osoa.sca,
   org.osoa.sca.annotations,
-  org.apache.tuscany.sca.databinding.annotation,
-  org.apache.tuscany.sca.domain,
-  org.apache.tuscany.sca.node
+  org.apache.tuscany.sca.databinding.annotation
 DynamicImport-Package: *

Modified: tuscany/java/sca/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/felix/felix.config.properties
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/felix/felix.config.properties?rev=673669&r1=673668&r2=673669&view=diff
==============================================================================
--- tuscany/java/sca/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/felix/felix.config.properties
(original)
+++ tuscany/java/sca/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/felix/felix.config.properties
Thu Jul  3 05:59:48 2008
@@ -27,12 +27,12 @@
 
 
 felix.auto.start.1= \   
-    "file://${FELIX_DIR}/org.apache.felix.scr/1.0.0/org.apache.felix.scr-1.0.0.jar" 
+    "file://${FELIX_DIR}/org.apache.felix.scr/1.0.2/org.apache.felix.scr-1.0.2.jar" 
     
-# "file://${FELIX_DIR}/org.apache.felix.configadmin/1.0.0/org.apache.felix.configadmin-1.0.0.jar"

-# "file://${FELIX_DIR}/org.apache.felix.shell/1.1.0-SNAPSHOT/org.apache.felix.shell-1.1.0-SNAPSHOT.jar"
\
-# "file://${FELIX_DIR}/org.apache.felix.shell.tui/1.1.0-SNAPSHOT/org.apache.felix.shell.tui-1.1.0-SNAPSHOT.jar"
\
-# "file://${FELIX_DIR}/org.apache.felix.bundlerepository/1.1.0-SNAPSHOT/org.apache.felix.bundlerepository-1.1.0-SNAPSHOT.jar"
\
+# "file://${FELIX_DIR}/org.apache.felix.configadmin/1.0.1/org.apache.felix.configadmin-1.0.1.jar"

+# "file://${FELIX_DIR}/org.apache.felix.shell/1.0.1/org.apache.felix.shell-1.0.1.jar" \
+# "file://${FELIX_DIR}/org.apache.felix.shell.tui/1.0.1/org.apache.felix.shell.tui-1.0.1.jar"
\
+# "file://${FELIX_DIR}/org.apache.felix.bundlerepository/1.0.3/org.apache.felix.bundlerepository-1.0.3.jar"
\
 
 
 felix.startlevel.framework=1

Modified: tuscany/java/sca/itest/osgi-tuscany/sca-api/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/osgi-tuscany/sca-api/pom.xml?rev=673669&r1=673668&r2=673669&view=diff
==============================================================================
--- tuscany/java/sca/itest/osgi-tuscany/sca-api/pom.xml (original)
+++ tuscany/java/sca/itest/osgi-tuscany/sca-api/pom.xml Thu Jul  3 05:59:48 2008
@@ -43,7 +43,7 @@
             <plugin>    
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>1.2.1</version>
+                <version>1.4.0</version>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>

Modified: tuscany/java/sca/itest/osgi-tuscany/test-bundles/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/osgi-tuscany/test-bundles/pom.xml?rev=673669&r1=673668&r2=673669&view=diff
==============================================================================
--- tuscany/java/sca/itest/osgi-tuscany/test-bundles/pom.xml (original)
+++ tuscany/java/sca/itest/osgi-tuscany/test-bundles/pom.xml Thu Jul  3 05:59:48 2008
@@ -44,7 +44,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>
 
 

Modified: tuscany/java/sca/itest/osgi-tuscany/tuscany-3rdparty/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/osgi-tuscany/tuscany-3rdparty/pom.xml?rev=673669&r1=673668&r2=673669&view=diff
==============================================================================
--- tuscany/java/sca/itest/osgi-tuscany/tuscany-3rdparty/pom.xml (original)
+++ tuscany/java/sca/itest/osgi-tuscany/tuscany-3rdparty/pom.xml Thu Jul  3 05:59:48 2008
@@ -291,7 +291,7 @@
             <plugin>    
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>1.2.1</version>
+                <version>1.4.0</version>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>

Modified: tuscany/java/sca/itest/osgi-tuscany/tuscany-extensions/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/osgi-tuscany/tuscany-extensions/pom.xml?rev=673669&r1=673668&r2=673669&view=diff
==============================================================================
--- tuscany/java/sca/itest/osgi-tuscany/tuscany-extensions/pom.xml (original)
+++ tuscany/java/sca/itest/osgi-tuscany/tuscany-extensions/pom.xml Thu Jul  3 05:59:48 2008
@@ -324,7 +324,7 @@
             <plugin>    
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>1.2.1</version>
+                <version>1.4.0</version>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>

Modified: tuscany/java/sca/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml?rev=673669&r1=673668&r2=673669&view=diff
==============================================================================
--- tuscany/java/sca/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml (original)
+++ tuscany/java/sca/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml Thu Jul  3 05:59:48
2008
@@ -480,7 +480,6 @@
             <artifactId>tuscany-implementation-widget-runtime</artifactId>
             <version>${pom.version}</version>
         </dependency>
-<!--
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>tuscany-node2-api</artifactId>
@@ -496,7 +495,6 @@
             <artifactId>tuscany-node2-launcher</artifactId>
             <version>${pom.version}</version>
         </dependency>
--->
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>tuscany-policy</artifactId>

Modified: tuscany/java/sca/itest/osgi-tuscany/tuscany-osgi-installer/src/main/java/org/apache/tuscany/sca/installer/InstallerBundleActivator.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/osgi-tuscany/tuscany-osgi-installer/src/main/java/org/apache/tuscany/sca/installer/InstallerBundleActivator.java?rev=673669&r1=673668&r2=673669&view=diff
==============================================================================
--- tuscany/java/sca/itest/osgi-tuscany/tuscany-osgi-installer/src/main/java/org/apache/tuscany/sca/installer/InstallerBundleActivator.java
(original)
+++ tuscany/java/sca/itest/osgi-tuscany/tuscany-osgi-installer/src/main/java/org/apache/tuscany/sca/installer/InstallerBundleActivator.java
Thu Jul  3 05:59:48 2008
@@ -42,9 +42,6 @@
     };
     
     private static final String[] tuscanyModulesToIgnore = {
-        "node2-api",
-        "node2-impl",
-        "node2-launcher",
         "node2-launcher-webapp",
         "implementation-node-runtime", // uses node2
         "saxon",

Modified: tuscany/java/sca/itest/osgi-tuscany/tuscany-runtime/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/osgi-tuscany/tuscany-runtime/pom.xml?rev=673669&r1=673668&r2=673669&view=diff
==============================================================================
--- tuscany/java/sca/itest/osgi-tuscany/tuscany-runtime/pom.xml (original)
+++ tuscany/java/sca/itest/osgi-tuscany/tuscany-runtime/pom.xml Thu Jul  3 05:59:48 2008
@@ -153,7 +153,7 @@
             <plugin>    
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>1.2.1</version>
+                <version>1.4.0</version>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>

Modified: tuscany/java/sca/itest/osgi-tuscany/tuscany-spi/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/osgi-tuscany/tuscany-spi/pom.xml?rev=673669&r1=673668&r2=673669&view=diff
==============================================================================
--- tuscany/java/sca/itest/osgi-tuscany/tuscany-spi/pom.xml (original)
+++ tuscany/java/sca/itest/osgi-tuscany/tuscany-spi/pom.xml Thu Jul  3 05:59:48 2008
@@ -98,7 +98,7 @@
             <plugin>    
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>1.2.1</version>
+                <version>1.4.0</version>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>

Modified: tuscany/java/sca/modules/binding-jsonrpc-runtime/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-jsonrpc-runtime/pom.xml?rev=673669&r1=673668&r2=673669&view=diff
==============================================================================
--- tuscany/java/sca/modules/binding-jsonrpc-runtime/pom.xml (original)
+++ tuscany/java/sca/modules/binding-jsonrpc-runtime/pom.xml Thu Jul  3 05:59:48 2008
@@ -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>

Modified: tuscany/java/sca/modules/contribution-osgi/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/contribution-osgi/pom.xml?rev=673669&r1=673668&r2=673669&view=diff
==============================================================================
--- tuscany/java/sca/modules/contribution-osgi/pom.xml (original)
+++ tuscany/java/sca/modules/contribution-osgi/pom.xml Thu Jul  3 05:59:48 2008
@@ -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>
 
 

Modified: tuscany/java/sca/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscovery.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscovery.java?rev=673669&r1=673668&r2=673669&view=diff
==============================================================================
--- tuscany/java/sca/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscovery.java
(original)
+++ tuscany/java/sca/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscovery.java
Thu Jul  3 05:59:48 2008
@@ -96,7 +96,7 @@
      * @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 @@
      * @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 @@
      * @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>>();
 

Modified: tuscany/java/sca/modules/implementation-osgi/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-osgi/pom.xml?rev=673669&r1=673668&r2=673669&view=diff
==============================================================================
--- tuscany/java/sca/modules/implementation-osgi/pom.xml (original)
+++ tuscany/java/sca/modules/implementation-osgi/pom.xml Thu Jul  3 05:59:48 2008
@@ -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>
 
 

Modified: tuscany/java/sca/modules/node2-api/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/node2-api/pom.xml?rev=673669&r1=673668&r2=673669&view=diff
==============================================================================
--- tuscany/java/sca/modules/node2-api/pom.xml (original)
+++ tuscany/java/sca/modules/node2-api/pom.xml Thu Jul  3 05:59:48 2008
@@ -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>

Modified: tuscany/java/sca/modules/osgi-runtime/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/osgi-runtime/pom.xml?rev=673669&r1=673668&r2=673669&view=diff
==============================================================================
--- tuscany/java/sca/modules/osgi-runtime/pom.xml (original)
+++ tuscany/java/sca/modules/osgi-runtime/pom.xml Thu Jul  3 05:59:48 2008
@@ -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>
 
 

Modified: tuscany/java/sca/modules/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/pom.xml?rev=673669&r1=673668&r2=673669&view=diff
==============================================================================
--- tuscany/java/sca/modules/pom.xml (original)
+++ tuscany/java/sca/modules/pom.xml Thu Jul  3 05:59:48 2008
@@ -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>

Modified: tuscany/java/sca/samples/osgi-supplychain/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/samples/osgi-supplychain/pom.xml?rev=673669&r1=673668&r2=673669&view=diff
==============================================================================
--- tuscany/java/sca/samples/osgi-supplychain/pom.xml (original)
+++ tuscany/java/sca/samples/osgi-supplychain/pom.xml Thu Jul  3 05:59:48 2008
@@ -33,7 +33,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>
 
         <dependency>



Mime
View raw message