diff options
Diffstat (limited to '')
5 files changed, 86 insertions, 2 deletions
diff --git a/sca-java-2.x/trunk/modules/sca-client-impl/META-INF/MANIFEST.MF b/sca-java-2.x/trunk/modules/sca-client-impl/META-INF/MANIFEST.MF index 828ccf6cce..ddfe8a0276 100644 --- a/sca-java-2.x/trunk/modules/sca-client-impl/META-INF/MANIFEST.MF +++ b/sca-java-2.x/trunk/modules/sca-client-impl/META-INF/MANIFEST.MF @@ -6,7 +6,8 @@ Bundle-Version: 2.0.0 Bundle-ManifestVersion: 2
Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
Bundle-Description: Apache Tuscany SCA Client Impl
-Import-Package: org.apache.tuscany.sca.node;version="2.0.0",
+Import-Package: org.apache.tuscany.sca.core;version="2.0.0",
+ org.apache.tuscany.sca.node;version="2.0.0",
org.oasisopen.sca;version="2.0.0",
org.oasisopen.sca.client;version="2.0.0"
Bundle-SymbolicName: org.apache.tuscany.sca.client.impl
diff --git a/sca-java-2.x/trunk/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientFactoryImpl.java b/sca-java-2.x/trunk/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientFactoryImpl.java index ba8d6793e2..ec9d073ca9 100644 --- a/sca-java-2.x/trunk/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientFactoryImpl.java +++ b/sca-java-2.x/trunk/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientFactoryImpl.java @@ -20,6 +20,7 @@ package org.apache.tuscany.sca.client.impl; import java.net.URI; +import java.net.URISyntaxException; import java.util.List; import org.apache.tuscany.sca.node.Node; @@ -30,10 +31,20 @@ import org.oasisopen.sca.ServiceUnavailableException; import org.oasisopen.sca.client.SCAClientFactory; public class SCAClientFactoryImpl extends SCAClientFactory { + + // required when a registry is used to create the factory + // need to extend to have domain uri configuration + public SCAClientFactoryImpl() throws URISyntaxException { + super(new URI(Node.DEFAULT_DOMAIN_URI)); + } public SCAClientFactoryImpl(URI domainURI) { super(domainURI); - } + } + + public static void setDefaultClientFactory(SCAClientFactory clientFactory){ + defaultFactory = clientFactory; + } @Override public <T> T getService(Class<T> serviceInterface, String serviceName) throws NoSuchServiceException, NoSuchDomainException { diff --git a/sca-java-2.x/trunk/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientModuleActivator.java b/sca-java-2.x/trunk/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientModuleActivator.java new file mode 100644 index 0000000000..8501b37b24 --- /dev/null +++ b/sca-java-2.x/trunk/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientModuleActivator.java @@ -0,0 +1,49 @@ +/* + * 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. + */ + +package org.apache.tuscany.sca.client.impl; + +import org.apache.tuscany.sca.core.ExtensionPointRegistry; +import org.apache.tuscany.sca.core.ModuleActivator; +import org.oasisopen.sca.client.SCAClientFactory; + +public class SCAClientModuleActivator implements ModuleActivator { + + private ExtensionPointRegistry registry; + + public SCAClientModuleActivator(ExtensionPointRegistry registry) { + this.registry = registry; + } + + public void start() { + // look up the SCAClientFactory. We could instantiate one directly here but + // looking it up brings the META-INF/services mechanism into play + SCAClientFactory clientFactory = registry.getExtensionPoint(SCAClientFactory.class); + + // inject this client factory as the default client factory + // so that the SCAClientFactory interface doesn't have to use the + // finder to look for it. + // TODO - handle multiple domains + SCAClientFactoryImpl.setDefaultClientFactory(clientFactory); + } + + public void stop() { + + } +} diff --git a/sca-java-2.x/trunk/modules/sca-client-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-2.x/trunk/modules/sca-client-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator new file mode 100644 index 0000000000..a20c805862 --- /dev/null +++ b/sca-java-2.x/trunk/modules/sca-client-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator @@ -0,0 +1,18 @@ +# 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. +# Implementation class for the ModuleActivator +org.apache.tuscany.sca.client.impl.SCAClientModuleActivator;priority=9999 diff --git a/sca-java-2.x/trunk/modules/sca-client-rmi/src/main/java/org/apache/tuscany/sca/client/rmi/SCAClientFactoryImpl.java b/sca-java-2.x/trunk/modules/sca-client-rmi/src/main/java/org/apache/tuscany/sca/client/rmi/SCAClientFactoryImpl.java index 39dd71048b..07ac0b960c 100644 --- a/sca-java-2.x/trunk/modules/sca-client-rmi/src/main/java/org/apache/tuscany/sca/client/rmi/SCAClientFactoryImpl.java +++ b/sca-java-2.x/trunk/modules/sca-client-rmi/src/main/java/org/apache/tuscany/sca/client/rmi/SCAClientFactoryImpl.java @@ -22,6 +22,7 @@ package org.apache.tuscany.sca.client.rmi; import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Proxy;
import java.net.URI;
+import java.net.URISyntaxException;
import java.util.List;
import org.apache.tuscany.sca.core.ExtensionPointRegistry;
@@ -41,6 +42,10 @@ public class SCAClientFactoryImpl extends SCAClientFactory { private EndpointRegistry endpointRegistry;
private ExtensionPointRegistry extensionsRegistry;
+
+ public SCAClientFactoryImpl() throws URISyntaxException {
+ super(new URI(Node.DEFAULT_DOMAIN_URI));
+ }
public SCAClientFactoryImpl(URI domainURI) {
super(domainURI);
|