You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by an...@apache.org on 2008/09/02 11:00:40 UTC

svn commit: r691162 - in /tuscany/java/sca/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl: RemoteBindingHelper.java RuntimeSCAReferenceBindingProvider.java RuntimeSCAServiceBindingProvider.java

Author: antelder
Date: Tue Sep  2 02:00:39 2008
New Revision: 691162

URL: http://svn.apache.org/viewvc?rev=691162&view=rev
Log:
Add an interim workaround for TUSCANY-2578 - a pluggable mechanism so sca binding impls add their own code to the decision on whether or not to use the remote binding provider. Just a work around fix for now so i can make progress

Added:
    tuscany/java/sca/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RemoteBindingHelper.java
Modified:
    tuscany/java/sca/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAReferenceBindingProvider.java
    tuscany/java/sca/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAServiceBindingProvider.java

Added: tuscany/java/sca/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RemoteBindingHelper.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RemoteBindingHelper.java?rev=691162&view=auto
==============================================================================
--- tuscany/java/sca/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RemoteBindingHelper.java (added)
+++ tuscany/java/sca/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RemoteBindingHelper.java Tue Sep  2 02:00:39 2008
@@ -0,0 +1,43 @@
+/*
+ * 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.binding.sca.impl;
+
+/**
+ * TODO: TUSCANY-2578, implement a pluggable mechanism so sca binding impls can 
+ *               add their own code to the decision on whether or not to use
+ *               the remote binding provider.
+ */
+public class RemoteBindingHelper {
+    
+    private static boolean alwaysRemote;
+    static {
+        try {
+            Class.forName("org.apache.tuscany.sca.binding.sca.jms.JMSSCABindingProviderFactory");
+            alwaysRemote = true;
+        } catch (ClassNotFoundException e) {
+            alwaysRemote = false;
+        }
+    }
+    
+    public static boolean isTargetRemote() {
+        return alwaysRemote;
+    }
+
+}

Modified: tuscany/java/sca/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAReferenceBindingProvider.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAReferenceBindingProvider.java?rev=691162&r1=691161&r2=691162&view=diff
==============================================================================
--- tuscany/java/sca/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAReferenceBindingProvider.java (original)
+++ tuscany/java/sca/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAReferenceBindingProvider.java Tue Sep  2 02:00:39 2008
@@ -95,7 +95,9 @@
         //        act as though there is a local wire and sometimes as if there is a remote wire
         //        what are the implications of this here?
 
-        if (optimizableBinding.getTargetComponentService() != null) {
+        if (RemoteBindingHelper.isTargetRemote()) {
+            targetIsRemote = true;
+        } else if (optimizableBinding.getTargetComponentService() != null) {
             if (optimizableBinding.getTargetComponentService().isUnresolved() == true) {
                 targetIsRemote = true;
             } else {

Modified: tuscany/java/sca/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAServiceBindingProvider.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAServiceBindingProvider.java?rev=691162&r1=691161&r2=691162&view=diff
==============================================================================
--- tuscany/java/sca/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAServiceBindingProvider.java (original)
+++ tuscany/java/sca/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAServiceBindingProvider.java Tue Sep  2 02:00:39 2008
@@ -76,7 +76,7 @@
                     
                 }
                 
-                if ((serviceURI != null) && (serviceURI.isAbsolute())) {          
+                if (RemoteBindingHelper.isTargetRemote() || ((serviceURI != null) && (serviceURI.isAbsolute()))) {          
                     
                     //  create a nested provider to handle the remote case
                     distributedBinding = new DistributedSCABindingImpl();