diff options
Diffstat (limited to 'branches')
8 files changed, 17 insertions, 16 deletions
diff --git a/branches/sca-java-1.3/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/NonOSGiSamplesTestCase.java b/branches/sca-java-1.3/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/NonOSGiSamplesTestCase.java index eac9979f56..a3b77aa77b 100644 --- a/branches/sca-java-1.3/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/NonOSGiSamplesTestCase.java +++ b/branches/sca-java-1.3/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/NonOSGiSamplesTestCase.java @@ -45,7 +45,7 @@ public class NonOSGiSamplesTestCase { "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" diff --git a/branches/sca-java-1.3/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/META-INF/MANIFEST.MF b/branches/sca-java-1.3/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/META-INF/MANIFEST.MF index 651945ba13..8985947286 100644 --- a/branches/sca-java-1.3/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/META-INF/MANIFEST.MF +++ b/branches/sca-java-1.3/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/META-INF/MANIFEST.MF @@ -10,7 +10,5 @@ Import-Package: org.osgi.framework, 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: *
diff --git a/branches/sca-java-1.3/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml b/branches/sca-java-1.3/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml index 262332911a..2d2c67f769 100644 --- a/branches/sca-java-1.3/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml +++ b/branches/sca-java-1.3/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml @@ -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> diff --git a/branches/sca-java-1.3/itest/osgi-tuscany/tuscany-osgi-installer/src/main/java/org/apache/tuscany/sca/installer/InstallerBundleActivator.java b/branches/sca-java-1.3/itest/osgi-tuscany/tuscany-osgi-installer/src/main/java/org/apache/tuscany/sca/installer/InstallerBundleActivator.java index f87e22d464..17b187a86f 100644 --- a/branches/sca-java-1.3/itest/osgi-tuscany/tuscany-osgi-installer/src/main/java/org/apache/tuscany/sca/installer/InstallerBundleActivator.java +++ b/branches/sca-java-1.3/itest/osgi-tuscany/tuscany-osgi-installer/src/main/java/org/apache/tuscany/sca/installer/InstallerBundleActivator.java @@ -42,9 +42,6 @@ public class InstallerBundleActivator implements BundleActivator { }; private static final String[] tuscanyModulesToIgnore = { - "node2-api", - "node2-impl", - "node2-launcher", "node2-launcher-webapp", "implementation-node-runtime", // uses node2 "saxon", diff --git a/branches/sca-java-1.3/modules/binding-jsonrpc-runtime/pom.xml b/branches/sca-java-1.3/modules/binding-jsonrpc-runtime/pom.xml index 4bef10c6e4..a1ae939d6f 100644 --- a/branches/sca-java-1.3/modules/binding-jsonrpc-runtime/pom.xml +++ b/branches/sca-java-1.3/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/branches/sca-java-1.3/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscovery.java b/branches/sca-java-1.3/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscovery.java index fcf7843fa9..45a4494f24 100644 --- a/branches/sca-java-1.3/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscovery.java +++ b/branches/sca-java-1.3/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/branches/sca-java-1.3/modules/node2-api/pom.xml b/branches/sca-java-1.3/modules/node2-api/pom.xml index 55b8e36982..8b48a6e581 100644 --- a/branches/sca-java-1.3/modules/node2-api/pom.xml +++ b/branches/sca-java-1.3/modules/node2-api/pom.xml @@ -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> diff --git a/branches/sca-java-1.3/modules/pom.xml b/branches/sca-java-1.3/modules/pom.xml index f7d2ed806d..f4fd68f443 100644 --- a/branches/sca-java-1.3/modules/pom.xml +++ b/branches/sca-java-1.3/modules/pom.xml @@ -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> |