From 2d44eb00b5a7c3cd4c735216de1bd1abe6402c14 Mon Sep 17 00:00:00 2001
From: rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68>
Date: Tue, 6 Jan 2009 19:10:33 +0000
Subject: Fix the binding.rmi dependency and remove the dead code

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@732064 13f79535-47bb-0310-9956-ffa450edef68
---
 .../binding/rmi/provider/RMIReferenceInvoker.java  | 88 ----------------------
 java/sca/modules/binding-rmi/META-INF/MANIFEST.MF  |  5 +-
 2 files changed, 2 insertions(+), 91 deletions(-)
 delete mode 100644 java/sca/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIReferenceInvoker.java

(limited to 'java/sca/modules')

diff --git a/java/sca/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIReferenceInvoker.java b/java/sca/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIReferenceInvoker.java
deleted file mode 100644
index d300cb7d05..0000000000
--- a/java/sca/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIReferenceInvoker.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * 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.rmi.provider;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.rmi.Remote;
-
-import org.apache.tuscany.sca.host.rmi.RMIHost;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.invocation.Message;
-import org.apache.tuscany.sca.invocation.DataExchangeSemantics;
-
-/**
- * Invoker for RMI References.
- *
- * @version $Rev$ $Date$
- */
-public class RMIReferenceInvoker implements Invoker, DataExchangeSemantics {
-
-    private RMIHost rmiHost;
-    private String host;
-    private String port;
-    private String svcName;
-    private Method remoteMethod;
-    private Remote proxy;
-
-    public RMIReferenceInvoker(RMIHost rmiHost, String host, String port, String svcName, Method remoteMethod) {
-        this.rmiHost = rmiHost;
-        this.remoteMethod = remoteMethod;
-        this.host = host;
-        this.port = port;
-        this.svcName = svcName;
-    }
-
-    public Message invoke(Message msg) {
-        try {
-
-            Object[] args = msg.getBody();
-            Object resp = invokeTarget(args);
-            msg.setBody(resp);
-    
-        } catch (InvocationTargetException e) {
-            msg.setFaultBody(e.getCause());
-        } catch (Throwable e) {
-            msg.setFaultBody(e);
-        }
-
-        return msg;
-    }
-
-    public Object invokeTarget(final Object payload) throws InvocationTargetException, SecurityException, NoSuchMethodException, IllegalArgumentException, IllegalAccessException {
-        if (proxy == null) {
-            proxy = rmiHost.findService(host, port, svcName);
-            // proxy = Naming.lookup(serviceURI);
-        }
-
-        remoteMethod = proxy.getClass().getMethod(remoteMethod.getName(), remoteMethod.getParameterTypes());
-
-        if (payload != null && !payload.getClass().isArray()) {
-            return remoteMethod.invoke(proxy, payload);
-        } else {
-            return remoteMethod.invoke(proxy, (Object[])payload);
-        }
-    }
-
-    public boolean allowsPassByReference() {
-        // RMI always pass by value
-        return true;
-    }
-
-}
diff --git a/java/sca/modules/binding-rmi/META-INF/MANIFEST.MF b/java/sca/modules/binding-rmi/META-INF/MANIFEST.MF
index 10d09e6a03..81c66abbfc 100644
--- a/java/sca/modules/binding-rmi/META-INF/MANIFEST.MF
+++ b/java/sca/modules/binding-rmi/META-INF/MANIFEST.MF
@@ -11,9 +11,8 @@ Bnd-LastModified: 1225397320062
 Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
 Bundle-Description: Apache Tuscany SCA RMI Binding Model
-Import-Package: org.apache.tuscany.sca.assembly;version="1.4",org.apac
- he.tuscany.sca.assembly.xml;version="1.4",org.apache.tuscany.sca.bind
- ing.rmi;version="1.4"
+Import-Package: org.apache.tuscany.sca.assembly;version="1.4",
+ org.apache.tuscany.sca.binding.rmi;version="1.4"
 Bundle-SymbolicName: org.apache.tuscany.sca.binding.rmi
 Bundle-DocURL: http://www.apache.org/
 
-- 
cgit v1.2.3