From 44e3f27b8c841716bcdf5a20d85dc395b554b5e2 Mon Sep 17 00:00:00 2001
From: slaws <slaws@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 14 Jan 2010 14:20:30 +0000
Subject: TUSCANY-3424 inject the SCAClientFactory default instance into the
 SCAClientFactory interface so that it doesn't have to look it up. This
 doesn't yet address the lack of domain specific client factories when using
 the injected default factory approach.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@899210 13f79535-47bb-0310-9956-ffa450edef68
---
 .../sca/client/impl/SCAClientFactoryImpl.java      | 13 +++++-
 .../sca/client/impl/SCAClientModuleActivator.java  | 49 ++++++++++++++++++++++
 2 files changed, 61 insertions(+), 1 deletion(-)
 create mode 100644 sca-java-2.x/trunk/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientModuleActivator.java

(limited to 'sca-java-2.x/trunk/modules/sca-client-impl/src/main/java')

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() {
+
+    }
+}
-- 
cgit v1.2.3