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/07/01 21:26:23 UTC
svn commit: r673187 - in /tuscany/branches/sca-java-1.3:
itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/
itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/META-INF/
itest/osgi-tuscany/tuscany-osgi-inst...
Author: rsivaram
Date: Tue Jul 1 12:26:23 2008
New Revision: 673187
URL: http://svn.apache.org/viewvc?rev=673187&view=rev
Log:
Fixes for Tuscany running in an OSGi runtime
Modified:
tuscany/branches/sca-java-1.3/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/NonOSGiSamplesTestCase.java
tuscany/branches/sca-java-1.3/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/META-INF/MANIFEST.MF
tuscany/branches/sca-java-1.3/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml
tuscany/branches/sca-java-1.3/itest/osgi-tuscany/tuscany-osgi-installer/src/main/java/org/apache/tuscany/sca/installer/InstallerBundleActivator.java
tuscany/branches/sca-java-1.3/modules/binding-jsonrpc-runtime/pom.xml
tuscany/branches/sca-java-1.3/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscovery.java
tuscany/branches/sca-java-1.3/modules/node2-api/pom.xml
tuscany/branches/sca-java-1.3/modules/pom.xml
Modified: tuscany/branches/sca-java-1.3/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/NonOSGiSamplesTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/NonOSGiSamplesTestCase.java?rev=673187&r1=673186&r2=673187&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.3/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/NonOSGiSamplesTestCase.java (original)
+++ tuscany/branches/sca-java-1.3/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/NonOSGiSamplesTestCase.java Tue Jul 1 12:26:23 2008
@@ -45,7 +45,7 @@
"calculator-implementation-policies",
"calculator-rmi-reference",
"calculator-rmi-service",
- "callback-ws-service",
+ //"callback-ws-service",
"helloworld-ws-service-jms",
"helloworld-ws-service-secure",
"helloworld-ws-service"
Modified: tuscany/branches/sca-java-1.3/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/META-INF/MANIFEST.MF?rev=673187&r1=673186&r2=673187&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.3/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/META-INF/MANIFEST.MF (original)
+++ tuscany/branches/sca-java-1.3/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/META-INF/MANIFEST.MF Tue Jul 1 12:26:23 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/branches/sca-java-1.3/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml?rev=673187&r1=673186&r2=673187&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.3/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml (original)
+++ tuscany/branches/sca-java-1.3/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml Tue Jul 1 12:26:23 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/branches/sca-java-1.3/itest/osgi-tuscany/tuscany-osgi-installer/src/main/java/org/apache/tuscany/sca/installer/InstallerBundleActivator.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3/itest/osgi-tuscany/tuscany-osgi-installer/src/main/java/org/apache/tuscany/sca/installer/InstallerBundleActivator.java?rev=673187&r1=673186&r2=673187&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.3/itest/osgi-tuscany/tuscany-osgi-installer/src/main/java/org/apache/tuscany/sca/installer/InstallerBundleActivator.java (original)
+++ tuscany/branches/sca-java-1.3/itest/osgi-tuscany/tuscany-osgi-installer/src/main/java/org/apache/tuscany/sca/installer/InstallerBundleActivator.java Tue Jul 1 12:26:23 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/branches/sca-java-1.3/modules/binding-jsonrpc-runtime/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3/modules/binding-jsonrpc-runtime/pom.xml?rev=673187&r1=673186&r2=673187&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.3/modules/binding-jsonrpc-runtime/pom.xml (original)
+++ tuscany/branches/sca-java-1.3/modules/binding-jsonrpc-runtime/pom.xml Tue Jul 1 12:26:23 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/branches/sca-java-1.3/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscovery.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscovery.java?rev=673187&r1=673186&r2=673187&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.3/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscovery.java (original)
+++ tuscany/branches/sca-java-1.3/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscovery.java Tue Jul 1 12:26:23 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/branches/sca-java-1.3/modules/node2-api/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3/modules/node2-api/pom.xml?rev=673187&r1=673186&r2=673187&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.3/modules/node2-api/pom.xml (original)
+++ tuscany/branches/sca-java-1.3/modules/node2-api/pom.xml Tue Jul 1 12:26:23 2008
@@ -50,7 +50,8 @@
<Bundle-Version>${tuscany.version}</Bundle-Version>
<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>
+ <Export-Package>org.apache.tuscany.sca.node*</Export-Package>
+ <DynamicImport-Package>org.apache.tuscany.sca.node.impl</DynamicImport-Package>
</instructions>
</configuration>
</plugin>
Modified: tuscany/branches/sca-java-1.3/modules/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3/modules/pom.xml?rev=673187&r1=673186&r2=673187&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.3/modules/pom.xml (original)
+++ tuscany/branches/sca-java-1.3/modules/pom.xml Tue Jul 1 12:26:23 2008
@@ -30,7 +30,7 @@
<name>Apache Tuscany SCA Implementation Modules</name>
<properties>
- <tuscany.version>2.0</tuscany.version>
+ <tuscany.version>1.3</tuscany.version>
</properties>
<profiles>