From fb3dd9a9095abc40027318b1712d0184f6d60e73 Mon Sep 17 00:00:00 2001 From: antelder Date: Fri, 30 Oct 2009 08:00:47 +0000 Subject: Delete old M4 branch and start again to pick up all the recent trunk changes git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@831223 13f79535-47bb-0310-9956-ffa450edef68 --- .../tuscany/sca/host/rmi/DefaultRMIHost.java | 170 --------------------- .../sca/host/rmi/DefaultRMIHostExtensionPoint.java | 67 -------- .../tuscany/sca/host/rmi/ExtensibleRMIHost.java | 62 -------- .../org/apache/tuscany/sca/host/rmi/RMIHost.java | 60 -------- .../tuscany/sca/host/rmi/RMIHostException.java | 45 ------ .../sca/host/rmi/RMIHostExtensionPoint.java | 51 ------- .../sca/host/rmi/RMIHostRuntimeException.java | 46 ------ .../tuscany/sca/host/rmi/RMISocketFactoryImpl.java | 57 ------- 8 files changed, 558 deletions(-) delete mode 100644 branches/sca-java-2.0-M4/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/DefaultRMIHost.java delete mode 100644 branches/sca-java-2.0-M4/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/DefaultRMIHostExtensionPoint.java delete mode 100644 branches/sca-java-2.0-M4/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/ExtensibleRMIHost.java delete mode 100644 branches/sca-java-2.0-M4/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHost.java delete mode 100644 branches/sca-java-2.0-M4/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostException.java delete mode 100644 branches/sca-java-2.0-M4/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostExtensionPoint.java delete mode 100644 branches/sca-java-2.0-M4/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostRuntimeException.java delete mode 100644 branches/sca-java-2.0-M4/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMISocketFactoryImpl.java (limited to 'branches/sca-java-2.0-M4/modules/host-rmi/src/main/java/org/apache/tuscany') diff --git a/branches/sca-java-2.0-M4/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/DefaultRMIHost.java b/branches/sca-java-2.0-M4/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/DefaultRMIHost.java deleted file mode 100644 index cc819d194c..0000000000 --- a/branches/sca-java-2.0-M4/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/DefaultRMIHost.java +++ /dev/null @@ -1,170 +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.host.rmi; - -import java.net.URI; -import java.rmi.AlreadyBoundException; -import java.rmi.NoSuchObjectException; -import java.rmi.NotBoundException; -import java.rmi.Remote; -import java.rmi.RemoteException; -import java.rmi.registry.LocateRegistry; -import java.rmi.registry.Registry; -import java.rmi.server.RMISocketFactory; -import java.rmi.server.UnicastRemoteObject; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; -import java.util.logging.Logger; - - -/** - * Default implementation of a RMI host. - * - * @version $Rev$ $Date$ - */ -public class DefaultRMIHost implements RMIHost { - private final static Logger logger = Logger.getLogger(DefaultRMIHost.class.getName()); - private static final int CONNECTION_TIMEOUT = 3000; // 3 seconds - - // Map of RMI registries started and running - private Map rmiRegistries; - - private RMISocketFactory socketFactory; - - public DefaultRMIHost() { - rmiRegistries = new ConcurrentHashMap(); - this.socketFactory = new RMISocketFactoryImpl(CONNECTION_TIMEOUT); - } - - public void registerService(String uri, Remote serviceObject) throws RMIHostException, RMIHostRuntimeException { - RMIURI rmiURI = new RMIURI(uri); - - Registry registry; - try { - registry = rmiRegistries.get(Integer.toString(rmiURI.port)); - if (registry == null) { - try { - registry = LocateRegistry.createRegistry(rmiURI.port, socketFactory, socketFactory); - } catch (RemoteException e) { - registry = LocateRegistry.getRegistry(null, rmiURI.port, socketFactory); - } - rmiRegistries.put(Integer.toString(rmiURI.port), registry); - } - registry.bind(rmiURI.serviceName, serviceObject); - logger.info("RMI service registered: " + rmiURI); - } catch (AlreadyBoundException e) { - throw new RMIHostException(e); - } catch (RemoteException e) { - RMIHostRuntimeException rmiExec = new RMIHostRuntimeException(e.getMessage()); - rmiExec.setStackTrace(e.getStackTrace()); - throw rmiExec; - } - - } - - public void unregisterService(String uri) throws RMIHostException, RMIHostRuntimeException { - RMIURI rmiURI = new RMIURI(uri); - - try { - Registry registry = rmiRegistries.get(Integer.toString(rmiURI.port)); - if (registry == null) { - registry = LocateRegistry.getRegistry(null, rmiURI.port, socketFactory); - rmiRegistries.put(Integer.toString(rmiURI.port), registry); - } - registry.unbind(rmiURI.serviceName); - logger.info("RMI service unregistered: " + rmiURI); - } catch (RemoteException e) { - RMIHostRuntimeException rmiExec = new RMIHostRuntimeException(e.getMessage()); - rmiExec.setStackTrace(e.getStackTrace()); - throw rmiExec; - } catch (NotBoundException e) { - throw new RMIHostException(e.getMessage()); - } - } - - public Remote findService(String uri) throws RMIHostException, RMIHostRuntimeException { - RMIURI rmiURI = new RMIURI(uri); - - Remote remoteService = null; - try { - // Requires permission java.net.SocketPermission "host:port", "connect,accept,resolve" - // in security policy. - Registry registry = LocateRegistry.getRegistry(rmiURI.host, rmiURI.port, socketFactory); - - if (registry != null) { - remoteService = registry.lookup(rmiURI.serviceName); - } - } catch (RemoteException e) { - RMIHostRuntimeException rmiExec = new RMIHostRuntimeException(e.getMessage()); - rmiExec.setStackTrace(e.getStackTrace()); - throw rmiExec; - } catch (NotBoundException e) { - throw new RMIHostException(e.getMessage()); - } - return remoteService; - } - - /** - * A representation of an RMI URI. - * - * rmi://[host][:port][/[object]] - * rmi:[/][object] - */ - private static class RMIURI { - private String uriStr; - private String host; - private int port; - private String serviceName; - - private RMIURI(String uriStr) { - this.uriStr = uriStr; - URI uri = URI.create(uriStr); - host = uri.getHost(); - if (host == null) { - host = "localhost"; - } - port = uri.getPort(); - if (port <= 0) { - port = RMI_DEFAULT_PORT; - } - String path = uri.getPath(); - if (path != null && path.charAt(0) == '/') { - path = path.substring(1); - } - serviceName = path; - } - - public String toString() { - return uriStr; - } - } - - public void stop() { - for (Registry registry : rmiRegistries.values()) { - try { - UnicastRemoteObject.unexportObject(registry, false); - } catch (NoSuchObjectException e) { - e.printStackTrace(); - } - } - rmiRegistries.clear(); - } - -} diff --git a/branches/sca-java-2.0-M4/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/DefaultRMIHostExtensionPoint.java b/branches/sca-java-2.0-M4/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/DefaultRMIHostExtensionPoint.java deleted file mode 100644 index 541ee8ba06..0000000000 --- a/branches/sca-java-2.0-M4/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/DefaultRMIHostExtensionPoint.java +++ /dev/null @@ -1,67 +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.host.rmi; - -import java.util.ArrayList; -import java.util.List; - -import org.apache.tuscany.sca.core.LifeCycleListener; - -/** - * Default implementation of an RMI host extension point. - * - * @version $Rev$ $Date$ - */ -public class DefaultRMIHostExtensionPoint implements RMIHostExtensionPoint, LifeCycleListener { - - private List rmiHosts = new ArrayList(); - - public DefaultRMIHostExtensionPoint() { - } - - public void addRMIHost(RMIHost rmiHost) { - rmiHosts.add(rmiHost); - if(rmiHost instanceof LifeCycleListener) { - ((LifeCycleListener) rmiHost).start(); - } - } - - public void removeRMIHost(RMIHost rmiHost) { - rmiHosts.remove(rmiHost); - } - - public synchronized List getRMIHosts() { - if(rmiHosts.isEmpty()) { - addRMIHost(new DefaultRMIHost()); - } - return rmiHosts; - } - - public void start() { - } - - public void stop() { - for (RMIHost host : rmiHosts) { - if(host instanceof LifeCycleListener) { - ((LifeCycleListener) host).stop(); - } - } - } -} diff --git a/branches/sca-java-2.0-M4/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/ExtensibleRMIHost.java b/branches/sca-java-2.0-M4/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/ExtensibleRMIHost.java deleted file mode 100644 index 2f3e2311ed..0000000000 --- a/branches/sca-java-2.0-M4/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/ExtensibleRMIHost.java +++ /dev/null @@ -1,62 +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.host.rmi; - -import java.rmi.Remote; - - -/** - * Default implementation of an extensible RMI host. - * - * @version $Rev$ $Date$ - */ -public class ExtensibleRMIHost implements RMIHost { - - private RMIHostExtensionPoint rmiHosts; - - public ExtensibleRMIHost(RMIHostExtensionPoint rmiHosts) { - this.rmiHosts = rmiHosts; - } - - public void registerService(String uri, Remote serviceObject) throws RMIHostException, RMIHostRuntimeException { - if (rmiHosts.getRMIHosts().isEmpty()) { - throw new RMIHostException("No RMI host available"); - } - getDefaultHost().registerService(uri, serviceObject); - } - - public void unregisterService(String uri) throws RMIHostException, RMIHostRuntimeException { - if (rmiHosts.getRMIHosts().isEmpty()) { - throw new RMIHostException("No RMI host available"); - } - getDefaultHost().unregisterService(uri); - } - - public Remote findService(String uri) throws RMIHostException, RMIHostRuntimeException { - if (rmiHosts.getRMIHosts().isEmpty()) { - throw new RMIHostException("No RMI host available"); - } - return getDefaultHost().findService(uri); - } - - protected RMIHost getDefaultHost() { - return rmiHosts.getRMIHosts().get(0); - } -} diff --git a/branches/sca-java-2.0-M4/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHost.java b/branches/sca-java-2.0-M4/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHost.java deleted file mode 100644 index bf8659c254..0000000000 --- a/branches/sca-java-2.0-M4/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHost.java +++ /dev/null @@ -1,60 +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.host.rmi; - -import java.rmi.Remote; - -/** - * RMI Service hosting interface to be implemented by host environments that allows SCA Components - * to register RMI Services to handle inbound service requests over RMI to SCA Components - * - * @version $Rev$ $Date$ - */ -public interface RMIHost { - int RMI_DEFAULT_PORT = 1099; - - /** - * Register an RMI service with the given name and port - * - * @param uri the URI against which the server is to be registered - * @param serviceObject the server object to be registered - * @throws RMIHostException - * @throws RMIHostRuntimeException - */ - void registerService(String uri, Remote serviceObject) throws RMIHostException, RMIHostRuntimeException; - - /** - * Unregister a service registered under the given service name and port number - * - * @param uri the URI of the server - * @throws RMIHostException - * @throws RMIHostRuntimeException - */ - void unregisterService(String uri) throws RMIHostException, RMIHostRuntimeException; - - /** - * find a remote service hosted on the given host, port and service name - * - * @param uri the URI of the service - * @return the RMI server object - * @throws RMIHostException - * @throws RMIHostRuntimeException - */ - Remote findService(String uri) throws RMIHostException, RMIHostRuntimeException; -} diff --git a/branches/sca-java-2.0-M4/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostException.java b/branches/sca-java-2.0-M4/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostException.java deleted file mode 100644 index 5ea46b9e0b..0000000000 --- a/branches/sca-java-2.0-M4/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostException.java +++ /dev/null @@ -1,45 +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.host.rmi; - - -/** - * This exception will relate to situations where the end applicaition's input is the cause of the exception - * - * @version $Rev$ $Date$ - */ -public class RMIHostException extends RuntimeException { - - private static final long serialVersionUID = 3378300080918544410L; - - public RMIHostException() { - } - - public RMIHostException(String message) { - super(message); - } - - public RMIHostException(Throwable e) { - super(e); - } - - public RMIHostException(String message, Throwable cause) { - super(message, cause); - } -} diff --git a/branches/sca-java-2.0-M4/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostExtensionPoint.java b/branches/sca-java-2.0-M4/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostExtensionPoint.java deleted file mode 100644 index 40d6013940..0000000000 --- a/branches/sca-java-2.0-M4/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostExtensionPoint.java +++ /dev/null @@ -1,51 +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.host.rmi; - -import java.util.List; - -/** - * An extension point for RMI hosts. - * - * @version $Rev$ $Date$ - */ -public interface RMIHostExtensionPoint { - - /** - * Adds a Servlet host extension. - * - * @param rmiHost - */ - void addRMIHost(RMIHost rmiHost); - - /** - * Removes a Servlet host extension. - * - * @param rmiHost - */ - void removeRMIHost(RMIHost rmiHost); - - /** - * Returns a list of Servlet host extensions. - * - * @return - */ - List getRMIHosts(); - -} diff --git a/branches/sca-java-2.0-M4/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostRuntimeException.java b/branches/sca-java-2.0-M4/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostRuntimeException.java deleted file mode 100644 index dfbcc62939..0000000000 --- a/branches/sca-java-2.0-M4/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostRuntimeException.java +++ /dev/null @@ -1,46 +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.host.rmi; - - -/** - * This exception relates to cases where there is a problem with the - * Host runtime - * - * @version $Rev$ $Date$ - */ -public class RMIHostRuntimeException extends RuntimeException { - - private static final long serialVersionUID = -2639598547028423686L; - - public RMIHostRuntimeException() { - } - - public RMIHostRuntimeException(String message) { - super(message); - } - - public RMIHostRuntimeException(Throwable e) { - super(e); - } - - public RMIHostRuntimeException(String message, Throwable cause) { - super(message, cause); - } -} diff --git a/branches/sca-java-2.0-M4/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMISocketFactoryImpl.java b/branches/sca-java-2.0-M4/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMISocketFactoryImpl.java deleted file mode 100644 index 763e5c1315..0000000000 --- a/branches/sca-java-2.0-M4/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMISocketFactoryImpl.java +++ /dev/null @@ -1,57 +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.host.rmi; - -import java.io.IOException; -import java.net.ServerSocket; -import java.net.Socket; -import java.rmi.server.RMISocketFactory; - -import javax.net.ServerSocketFactory; -import javax.net.SocketFactory; - -class RMISocketFactoryImpl extends RMISocketFactory { - private int clientTimeout; - private SocketFactory factory; - private ServerSocketFactory serverSocketFactory; - - /** - * @param timeout - */ - public RMISocketFactoryImpl(int clientTimeout) { - super(); - this.clientTimeout = clientTimeout; - this.factory = SocketFactory.getDefault(); - this.serverSocketFactory = ServerSocketFactory.getDefault(); - } - - public Socket createSocket(String host, int port) throws IOException { - Socket socket = factory.createSocket(host, port); - socket.setSoTimeout(clientTimeout); - return socket; - } - - @Override - public ServerSocket createServerSocket(int port) throws IOException { - ServerSocket socket = serverSocketFactory.createServerSocket(port); - return socket; - } - -} -- cgit v1.2.3