JBoss Remoting SVN: r3536 - remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/bisocket.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2008-02-28 23:04:36 -0500 (Thu, 28 Feb 2008)
New Revision: 3536
Modified:
remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/bisocket/BisocketTestCase.java
Log:
JBREM-800: Extended sleep() in testOneClientTwoConnectorsTwoHandlers().
Modified: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/bisocket/BisocketTestCase.java
===================================================================
--- remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/bisocket/BisocketTestCase.java 2008-02-28 06:16:19 UTC (rev 3535)
+++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/bisocket/BisocketTestCase.java 2008-02-29 04:04:36 UTC (rev 3536)
@@ -928,7 +928,7 @@
client.invokeOneway(CALLBACK_TEST);
client.invokeOneway(CALLBACK_TEST);
- Thread.sleep(500);
+ Thread.sleep(2000);
int count1 = callbackHandler1.callbackCounter;
int count2 = callbackHandler2.callbackCounter;
assertTrue(count1 == 2 && count2 == 0 || count1 == 0 && count2 == 2);
16 years, 2 months
JBoss Remoting SVN: r3535 - in remoting2/branches/2.x/src/tests/org/jboss/test/remoting/callback: sslsocketfactory and 1 other directory.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2008-02-28 01:16:19 -0500 (Thu, 28 Feb 2008)
New Revision: 3535
Added:
remoting2/branches/2.x/src/tests/org/jboss/test/remoting/callback/sslsocketfactory/
remoting2/branches/2.x/src/tests/org/jboss/test/remoting/callback/sslsocketfactory/HttpsSSLSocketFactoryTestCase.java
remoting2/branches/2.x/src/tests/org/jboss/test/remoting/callback/sslsocketfactory/SSLRMISSLSocketFactoryTestCase.java
remoting2/branches/2.x/src/tests/org/jboss/test/remoting/callback/sslsocketfactory/SSLSocketFactoryTestParent.java
remoting2/branches/2.x/src/tests/org/jboss/test/remoting/callback/sslsocketfactory/SSLSocketSSLSocketFactoryTestCase.java
remoting2/branches/2.x/src/tests/org/jboss/test/remoting/callback/sslsocketfactory/keystore
remoting2/branches/2.x/src/tests/org/jboss/test/remoting/callback/sslsocketfactory/truststore
Log:
JBREM-522: New unit tests.
Added: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/callback/sslsocketfactory/HttpsSSLSocketFactoryTestCase.java
===================================================================
--- remoting2/branches/2.x/src/tests/org/jboss/test/remoting/callback/sslsocketfactory/HttpsSSLSocketFactoryTestCase.java (rev 0)
+++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/callback/sslsocketfactory/HttpsSSLSocketFactoryTestCase.java 2008-02-28 06:16:19 UTC (rev 3535)
@@ -0,0 +1,50 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2005, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.test.remoting.callback.sslsocketfactory;
+
+import java.util.Map;
+
+import org.jboss.remoting.transport.http.ssl.HTTPSClientInvoker;
+
+
+/**
+ * Unit test for JBREM-522.
+ *
+ * @author <a href="ron.sigal(a)jboss.com">Ron Sigal</a>
+ * @version $Revision: 1.1 $
+ * <p>
+ * Copyright Feb 27, 2008
+ * </p>
+ */
+public class HttpsSSLSocketFactoryTestCase extends SSLSocketFactoryTestParent
+{
+ protected String getTransport()
+ {
+ return "https";
+ }
+
+ protected void addExtraClientConfig(Map config)
+ {
+ config.put(HTTPSClientInvoker.IGNORE_HTTPS_HOST, "true");
+ }
+}
+
Added: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/callback/sslsocketfactory/SSLRMISSLSocketFactoryTestCase.java
===================================================================
--- remoting2/branches/2.x/src/tests/org/jboss/test/remoting/callback/sslsocketfactory/SSLRMISSLSocketFactoryTestCase.java (rev 0)
+++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/callback/sslsocketfactory/SSLRMISSLSocketFactoryTestCase.java 2008-02-28 06:16:19 UTC (rev 3535)
@@ -0,0 +1,41 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2005, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.test.remoting.callback.sslsocketfactory;
+
+
+/**
+ * Unit test for JBREM-522.
+ *
+ * @author <a href="ron.sigal(a)jboss.com">Ron Sigal</a>
+ * @version $Revision: 1.1 $
+ * <p>
+ * Copyright Feb 27, 2008
+ * </p>
+ */
+public class SSLRMISSLSocketFactoryTestCase extends SSLSocketFactoryTestParent
+{
+ protected String getTransport()
+ {
+ return "sslrmi";
+ }
+}
+
Added: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/callback/sslsocketfactory/SSLSocketFactoryTestParent.java
===================================================================
--- remoting2/branches/2.x/src/tests/org/jboss/test/remoting/callback/sslsocketfactory/SSLSocketFactoryTestParent.java (rev 0)
+++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/callback/sslsocketfactory/SSLSocketFactoryTestParent.java 2008-02-28 06:16:19 UTC (rev 3535)
@@ -0,0 +1,193 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2005, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.test.remoting.callback.sslsocketfactory;
+
+import java.net.InetAddress;
+import java.net.ServerSocket;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
+import javax.management.MBeanServer;
+import javax.net.ServerSocketFactory;
+import javax.net.ssl.SSLServerSocket;
+import javax.net.ssl.SSLServerSocketFactory;
+
+import junit.framework.TestCase;
+
+import org.apache.log4j.ConsoleAppender;
+import org.apache.log4j.Level;
+import org.apache.log4j.Logger;
+import org.apache.log4j.PatternLayout;
+import org.jboss.logging.XLevel;
+import org.jboss.remoting.Client;
+import org.jboss.remoting.InvocationRequest;
+import org.jboss.remoting.InvokerLocator;
+import org.jboss.remoting.ServerInvocationHandler;
+import org.jboss.remoting.ServerInvoker;
+import org.jboss.remoting.callback.Callback;
+import org.jboss.remoting.callback.HandleCallbackException;
+import org.jboss.remoting.callback.InvokerCallbackHandler;
+import org.jboss.remoting.security.SSLSocketBuilder;
+import org.jboss.remoting.transport.Connector;
+import org.jboss.remoting.transport.PortUtil;
+
+
+abstract public class SSLSocketFactoryTestParent extends TestCase
+{
+ private static Logger log = Logger.getLogger(SSLSocketFactoryTestParent.class);
+
+ private static boolean firstTime = true;
+
+ protected String host;
+ protected int port;
+ protected String locatorURI;
+ protected InvokerLocator serverLocator;
+ protected Connector connector;
+ protected TestInvocationHandler invocationHandler;
+
+
+ public void setUp() throws Exception
+ {
+ if (firstTime)
+ {
+ firstTime = false;
+ Logger.getLogger("org.jboss.remoting").setLevel(XLevel.INFO);
+ Logger.getLogger("org.jboss.test.remoting").setLevel(Level.INFO);
+ String pattern = "[%d{ABSOLUTE}] [%t] %5p (%F:%L) - %m%n";
+ PatternLayout layout = new PatternLayout(pattern);
+ ConsoleAppender consoleAppender = new ConsoleAppender(layout);
+ Logger.getRootLogger().addAppender(consoleAppender);
+ }
+ }
+
+
+ public void tearDown()
+ {
+ }
+
+
+ public void testSSLServerSocketFactory() throws Throwable
+ {
+ log.info("entering " + getName());
+
+ // Start server.
+ setupServer();
+
+ // Create client.
+ InvokerLocator clientLocator = new InvokerLocator(locatorURI);
+ HashMap clientConfig = new HashMap();
+ clientConfig.put(SSLSocketBuilder.REMOTING_TRUST_STORE_TYPE, "JKS");
+ String trustStoreFilePath = this.getClass().getResource("truststore").getFile();
+ clientConfig.put(SSLSocketBuilder.REMOTING_TRUST_STORE_FILE_PATH, trustStoreFilePath);
+ clientConfig.put(SSLSocketBuilder.REMOTING_TRUST_STORE_PASSWORD, "unit-tests-client");
+ clientConfig.put(InvokerLocator.FORCE_REMOTE, "true");
+ addExtraClientConfig(clientConfig);
+ Client client = new Client(clientLocator, clientConfig);
+ client.connect();
+ log.info("client is connected");
+
+ // Test connections.
+ assertEquals("abc", client.invoke("abc"));
+ log.info("connection is good");
+
+ // Add callback listener.
+ TestCallbackHandler callbackHandler = new TestCallbackHandler();
+ client.addListener(callbackHandler, null, null, true);
+
+ // Test callback SSLServerSocketFactory.
+ Set callbackConnectors = client.getCallbackConnectors(callbackHandler);
+ assertEquals(1, callbackConnectors.size());
+ Connector callbackConnector = (Connector) callbackConnectors.iterator().next();
+ ServerInvoker callbackServerInvoker = callbackConnector.getServerInvoker();
+ ServerSocketFactory serverSocketFactory = callbackServerInvoker.getServerSocketFactory();
+ assertTrue(serverSocketFactory instanceof SSLServerSocketFactory);
+ InetAddress address = InetAddress.getLocalHost();
+ int port = PortUtil.findFreePort(address.getHostAddress());
+ ServerSocket serverSocket = serverSocketFactory.createServerSocket(port, 100, address);
+ SSLServerSocket sslServerSocket = (SSLServerSocket) serverSocket;
+ assertTrue(sslServerSocket.getUseClientMode());
+
+ client.removeListener(callbackHandler);
+ client.disconnect();
+ shutdownServer();
+ log.info(getName() + " PASSES");
+ }
+
+
+ abstract protected String getTransport();
+
+
+ protected void addExtraClientConfig(Map config) {}
+ protected void addExtraServerConfig(Map config) {}
+
+
+ protected void setupServer() throws Exception
+ {
+ host = InetAddress.getLocalHost().getHostAddress();
+ port = PortUtil.findFreePort(host);
+ locatorURI = getTransport() + "://" + host + ":" + port;
+ serverLocator = new InvokerLocator(locatorURI);
+ log.info("Starting remoting server with locator uri of: " + locatorURI);
+ HashMap config = new HashMap();
+ config.put(SSLSocketBuilder.REMOTING_KEY_STORE_TYPE, "JKS");
+ String keyStoreFilePath = this.getClass().getResource("keystore").getFile();
+ config.put(SSLSocketBuilder.REMOTING_KEY_STORE_FILE_PATH, keyStoreFilePath);
+ config.put(SSLSocketBuilder.REMOTING_KEY_STORE_PASSWORD, "unit-tests-server");
+ config.put(InvokerLocator.FORCE_REMOTE, "true");
+ addExtraServerConfig(config);
+ connector = new Connector(serverLocator, config);
+ connector.create();
+ invocationHandler = new TestInvocationHandler();
+ connector.addInvocationHandler("test", invocationHandler);
+ connector.start();
+ }
+
+
+ protected void shutdownServer() throws Exception
+ {
+ if (connector != null)
+ connector.stop();
+ }
+
+
+ static class TestInvocationHandler implements ServerInvocationHandler
+ {
+ public void addListener(InvokerCallbackHandler callbackHandler) {}
+ public Object invoke(final InvocationRequest invocation) throws Throwable
+ {
+ return invocation.getParameter();
+ }
+ public void removeListener(InvokerCallbackHandler callbackHandler) {}
+ public void setMBeanServer(MBeanServer server) {}
+ public void setInvoker(ServerInvoker invoker) {}
+ }
+
+
+ static class TestCallbackHandler implements InvokerCallbackHandler
+ {
+ public void handleCallback(Callback callback) throws HandleCallbackException
+ {
+ log.info("received callback");
+ }
+ }
+}
\ No newline at end of file
Added: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/callback/sslsocketfactory/SSLSocketSSLSocketFactoryTestCase.java
===================================================================
--- remoting2/branches/2.x/src/tests/org/jboss/test/remoting/callback/sslsocketfactory/SSLSocketSSLSocketFactoryTestCase.java (rev 0)
+++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/callback/sslsocketfactory/SSLSocketSSLSocketFactoryTestCase.java 2008-02-28 06:16:19 UTC (rev 3535)
@@ -0,0 +1,41 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2005, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.test.remoting.callback.sslsocketfactory;
+
+
+/**
+ * Unit test for JBREM-522.
+ *
+ * @author <a href="ron.sigal(a)jboss.com">Ron Sigal</a>
+ * @version $Revision: 1.1 $
+ * <p>
+ * Copyright Feb 27, 2008
+ * </p>
+ */
+public class SSLSocketSSLSocketFactoryTestCase extends SSLSocketFactoryTestParent
+{
+ protected String getTransport()
+ {
+ return "sslsocket";
+ }
+}
+
Added: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/callback/sslsocketfactory/keystore
===================================================================
(Binary files differ)
Property changes on: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/callback/sslsocketfactory/keystore
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/callback/sslsocketfactory/truststore
===================================================================
(Binary files differ)
Property changes on: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/callback/sslsocketfactory/truststore
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
16 years, 2 months
JBoss Remoting SVN: r3534 - remoting2/branches/2.x/src/main/org/jboss/remoting.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2008-02-28 01:15:39 -0500 (Thu, 28 Feb 2008)
New Revision: 3534
Modified:
remoting2/branches/2.x/src/main/org/jboss/remoting/Client.java
Log:
JBREM-522: Puts callback SSLServerSocketFactory in client mode.
Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/Client.java
===================================================================
--- remoting2/branches/2.x/src/main/org/jboss/remoting/Client.java 2008-02-28 03:15:55 UTC (rev 3533)
+++ remoting2/branches/2.x/src/main/org/jboss/remoting/Client.java 2008-02-28 06:15:39 UTC (rev 3534)
@@ -31,6 +31,7 @@
import org.jboss.remoting.invocation.OnewayInvocation;
import org.jboss.remoting.marshal.Marshaller;
import org.jboss.remoting.marshal.UnMarshaller;
+import org.jboss.remoting.security.SSLSocketBuilder;
import org.jboss.remoting.stream.StreamServer;
import org.jboss.remoting.transport.BidirectionalClientInvoker;
import org.jboss.remoting.transport.ClientInvoker;
@@ -940,6 +941,8 @@
{
callbackConfig.putAll(locator.getParameters());
}
+
+ configureCallbackServerSocketFactory(callbackConfig);
Connector callbackServerConnector = new Connector(callbackLocator, callbackConfig);
synchronized (callbackConnectors)
@@ -1793,6 +1796,14 @@
}
}
+ private void configureCallbackServerSocketFactory(Map map) throws Exception
+ {
+ if (InvokerRegistry.isSSLSupported(locator.getProtocol()) &&
+ !map.containsKey(Remoting.CUSTOM_SERVER_SOCKET_FACTORY) &&
+ !map.containsKey(ServerInvoker.SERVER_SOCKET_FACTORY) &&
+ !map.containsKey(SSLSocketBuilder.REMOTING_SERVER_SOCKET_USE_CLIENT_MODE))
+ map.put(SSLSocketBuilder.REMOTING_SERVER_SOCKET_USE_CLIENT_MODE, "true");
+ }
// Inner classes --------------------------------------------------------------------------------
class InvokerDestructionTimerTask extends TimerTask
16 years, 2 months
JBoss Remoting SVN: r3533 - remoting2/branches/2.x/src/tests/org/jboss/test/remoting/ssl.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2008-02-27 22:15:55 -0500 (Wed, 27 Feb 2008)
New Revision: 3533
Modified:
remoting2/branches/2.x/src/tests/org/jboss/test/remoting/ssl/SSLSocketBuilderTestCase.java
Log:
JBREM-510: Added testSocketFactoryInClientMode().
Modified: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/ssl/SSLSocketBuilderTestCase.java
===================================================================
--- remoting2/branches/2.x/src/tests/org/jboss/test/remoting/ssl/SSLSocketBuilderTestCase.java 2008-02-28 03:12:31 UTC (rev 3532)
+++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/ssl/SSLSocketBuilderTestCase.java 2008-02-28 03:15:55 UTC (rev 3533)
@@ -60,6 +60,9 @@
assertNotNull(svrSocketFactory);
}
+ /**
+ * Added for JBREM-510.
+ */
public void testSocketFactoryInServerMode() throws Throwable
{
try
@@ -76,5 +79,25 @@
assertEquals("Error initializing socket factory SSL context: Can not find keystore url.", e.getMessage());
}
}
+
+ /**
+ * Added for JBREM-510.
+ */
+ public void testSocketFactoryInClientMode() throws IOException
+ {
+ SSLSocketBuilder socketBuilder = new SSLSocketBuilder();
+ socketBuilder.setUseSSLServerSocketFactory(false);
+ socketBuilder.setSecureSocketProtocol("TLS");
+ socketBuilder.setKeyStoreAlgorithm("SunX509");
+
+ socketBuilder.setKeyStoreType("JKS");
+ String trustStoreFilePath = this.getClass().getResource("ssl.truststore").getFile();
+ socketBuilder.setTrustStoreURL(trustStoreFilePath);
+ socketBuilder.setTrustStorePassword("foobar");
+
+ SocketFactory socketFactory = socketBuilder.createSSLSocketFactory();
+ assertNotNull(socketFactory);
+ }
+
}
\ No newline at end of file
16 years, 2 months
JBoss Remoting SVN: r3532 - remoting2/branches/2.x/src/tests/org/jboss/test/remoting/ssl.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2008-02-27 22:12:31 -0500 (Wed, 27 Feb 2008)
New Revision: 3532
Modified:
remoting2/branches/2.x/src/tests/org/jboss/test/remoting/ssl/SSLSocketBuilderTestCase.java
Log:
JBREM-510: Added testSocketFactoryInServerMode().
Modified: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/ssl/SSLSocketBuilderTestCase.java
===================================================================
--- remoting2/branches/2.x/src/tests/org/jboss/test/remoting/ssl/SSLSocketBuilderTestCase.java 2008-02-28 03:11:48 UTC (rev 3531)
+++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/ssl/SSLSocketBuilderTestCase.java 2008-02-28 03:12:31 UTC (rev 3532)
@@ -25,7 +25,11 @@
import org.jboss.remoting.security.SSLSocketBuilder;
import javax.net.ServerSocketFactory;
+import javax.net.SocketFactory;
+
import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
/**
* Test case to validate behavior of SSLSocketBuilder.
@@ -55,5 +59,22 @@
ServerSocketFactory svrSocketFactory = socketBuilder.createSSLServerSocketFactory();
assertNotNull(svrSocketFactory);
}
+
+ public void testSocketFactoryInServerMode() throws Throwable
+ {
+ try
+ {
+ Map config = new HashMap();
+ config.put(SSLSocketBuilder.REMOTING_SOCKET_USE_CLIENT_MODE, "false");
+ SSLSocketBuilder socketBuilder = new SSLSocketBuilder(config);
+ socketBuilder.setUseSSLSocketFactory(false);
+ socketBuilder.createSSLSocketFactory();
+ fail("should have thrown IOException");
+ }
+ catch (IOException e)
+ {
+ assertEquals("Error initializing socket factory SSL context: Can not find keystore url.", e.getMessage());
+ }
+ }
}
\ No newline at end of file
16 years, 2 months
JBoss Remoting SVN: r3531 - remoting2/branches/2.x/src/main/org/jboss/remoting/security.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2008-02-27 22:11:48 -0500 (Wed, 27 Feb 2008)
New Revision: 3531
Modified:
remoting2/branches/2.x/src/main/org/jboss/remoting/security/SSLSocketBuilder.java
Log:
JBREM-510: SocketFactory in server mode must have keystore.
Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/security/SSLSocketBuilder.java
===================================================================
--- remoting2/branches/2.x/src/main/org/jboss/remoting/security/SSLSocketBuilder.java 2008-02-28 00:46:09 UTC (rev 3530)
+++ remoting2/branches/2.x/src/main/org/jboss/remoting/security/SSLSocketBuilder.java 2008-02-28 03:11:48 UTC (rev 3531)
@@ -1315,9 +1315,18 @@
}
catch (NullStoreURLException e)
{
- // this is allowable since would be the normal scenario
- keyManagers = null;
- log.debug("Could not find keystore url. " + e.getMessage());
+ if (isSocketUseClientMode())
+ {
+ // this is allowable since would be the normal scenario
+ keyManagers = null;
+ log.debug("Could not find keystore url. " + e.getMessage());
+ }
+ else
+ {
+ IOException ioe = new IOException("Can not find keystore url.");
+ ioe.initCause(e);
+ throw ioe;
+ }
}
try
16 years, 2 months
JBoss Remoting SVN: r3530 - remoting2/branches/2.x/src/main/org/jboss/remoting/transport.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2008-02-27 19:46:09 -0500 (Wed, 27 Feb 2008)
New Revision: 3530
Modified:
remoting2/branches/2.x/src/main/org/jboss/remoting/transport/Connector.java
Log:
JBREM-909: init() calls ServerInvoker.create() before ServerInvoker.getMBeanObjectName().
Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/transport/Connector.java
===================================================================
--- remoting2/branches/2.x/src/main/org/jboss/remoting/transport/Connector.java 2008-02-28 00:44:18 UTC (rev 3529)
+++ remoting2/branches/2.x/src/main/org/jboss/remoting/transport/Connector.java 2008-02-28 00:46:09 UTC (rev 3530)
@@ -411,7 +411,20 @@
{
// create the server invoker
invoker = InvokerRegistry.createServerInvoker(locator, configuration);
+ invoker.setMBeanServer(server);
+ // set the server socket factory if has been already set on the connector
+ invoker.setServerSocketFactory(svrSocketFactory);
+ // seting to null as don't want to keep reference in connector, but the server invoker
+ // see JBREM-367
+ this.svrSocketFactory = null;
+
+ // set the socket factory if has been already set on the connector
+ invoker.setSocketFactory(socketFactory);
+ this.socketFactory = null;
+
+ invoker.create();
+
// this will set the mbean server on the invoker and register it with mbean server
if (server != null)
{
@@ -426,25 +439,12 @@
{
log.warn(objName + " is already registered with MBeanServer");
}
- invoker.setMBeanServer(server);
}
catch (Throwable e)
{
log.warn("Error registering invoker " + invoker + " with MBeanServer.", e);
}
}
-
- // set the server socket factory if has been already set on the connector
- invoker.setServerSocketFactory(svrSocketFactory);
- // seting to null as don't want to keep reference in connector, but the server invoker
- // see JBREM-367
- this.svrSocketFactory = null;
-
- // set the socket factory if has been already set on the connector
- invoker.setSocketFactory(socketFactory);
- this.socketFactory = null;
-
- invoker.create();
}
// if using a generic locator (such as socket://localhost:0), the locator may change so
16 years, 2 months
JBoss Remoting SVN: r3529 - remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/connector.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2008-02-27 19:44:18 -0500 (Wed, 27 Feb 2008)
New Revision: 3529
Added:
remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/connector/ObjectNameWithZeroesAddressTestCase.java
Log:
JBREM-909: New unit test.
Added: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/connector/ObjectNameWithZeroesAddressTestCase.java
===================================================================
--- remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/connector/ObjectNameWithZeroesAddressTestCase.java (rev 0)
+++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/connector/ObjectNameWithZeroesAddressTestCase.java 2008-02-28 00:44:18 UTC (rev 3529)
@@ -0,0 +1,175 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2005, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.test.remoting.transport.connector;
+
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+
+import javax.management.MBeanServer;
+import javax.management.MBeanServerFactory;
+import javax.management.ObjectInstance;
+import javax.management.ObjectName;
+
+import junit.framework.TestCase;
+
+import org.apache.log4j.ConsoleAppender;
+import org.apache.log4j.Level;
+import org.apache.log4j.Logger;
+import org.apache.log4j.PatternLayout;
+import org.jboss.logging.XLevel;
+import org.jboss.remoting.InvocationRequest;
+import org.jboss.remoting.InvokerLocator;
+import org.jboss.remoting.ServerInvocationHandler;
+import org.jboss.remoting.ServerInvoker;
+import org.jboss.remoting.callback.InvokerCallbackHandler;
+import org.jboss.remoting.transport.Connector;
+
+
+/**
+ * Unit test for JBREM-910.
+ *
+ * @author <a href="ron.sigal(a)jboss.com">Ron Sigal</a>
+ * @version $Revision: 1.1 $
+ * <p>
+ * Copyright Feb 25, 2008
+ * </p>
+ */
+public class ObjectNameWithZeroesAddressTestCase extends TestCase
+{
+ private static Logger log = Logger.getLogger(ObjectNameWithZeroesAddressTestCase.class);
+
+ private static boolean firstTime = true;
+
+ protected String host;
+ protected int port;
+ protected String locatorURI;
+ protected InvokerLocator serverLocator;
+ protected Connector connector;
+ protected TestInvocationHandler invocationHandler;
+ protected MBeanServer mbeanServer;
+
+
+ public void setUp() throws Exception
+ {
+ if (firstTime)
+ {
+ firstTime = false;
+ Logger.getLogger("org.jboss.remoting").setLevel(XLevel.INFO);
+ Logger.getLogger("org.jboss.test.remoting").setLevel(Level.INFO);
+ String pattern = "[%d{ABSOLUTE}] [%t] %5p (%F:%L) - %m%n";
+ PatternLayout layout = new PatternLayout(pattern);
+ ConsoleAppender consoleAppender = new ConsoleAppender(layout);
+ Logger.getRootLogger().addAppender(consoleAppender);
+ }
+ }
+
+
+ public void tearDown()
+ {
+ }
+
+
+ public void testMethod() throws Throwable
+ {
+ log.info("entering " + getName());
+
+ // Start server.
+ setupServer();
+
+ log.info("Updated locator: " + connector.getInvokerLocator());
+ ServerInvoker invoker = connector.getServerInvoker();
+ String name = invoker.getMBeanObjectName();
+ ObjectName objectName = new ObjectName(name);
+ log.info("objectName:" + objectName);
+ printMBeans();
+ assertTrue(mbeanServer.isRegistered(objectName));
+ shutdownServer();
+ printMBeans();
+ assertFalse(mbeanServer.isRegistered(objectName));
+
+ log.info(getName() + " PASSES");
+ }
+
+
+ protected void printMBeans()
+ {
+ log.info("MBean count: " + mbeanServer.getMBeanCount());
+ Set mbeans = mbeanServer.queryMBeans(null, null);
+ Iterator it = mbeans.iterator();
+ int i = 0;
+ while (it.hasNext())
+ {
+ ObjectInstance mbean = (ObjectInstance) it.next();
+ log.info("MBean " + i++ + ": " + mbean.getObjectName());
+ }
+ }
+
+
+ protected String getTransport()
+ {
+ return "socket";
+ }
+
+
+ protected void addExtraClientConfig(Map config) {}
+ protected void addExtraServerConfig(Map config) {}
+
+
+ protected void setupServer() throws Exception
+ {
+ locatorURI = getTransport() + "://0.0.0.0:5555";
+ serverLocator = new InvokerLocator(locatorURI);
+ log.info("Starting remoting server with locator uri of: " + locatorURI);
+ HashMap config = new HashMap();
+ config.put(InvokerLocator.FORCE_REMOTE, "true");
+ addExtraServerConfig(config);
+ mbeanServer = MBeanServerFactory.createMBeanServer();
+ connector = new Connector(serverLocator, config);
+ connector.preRegister(mbeanServer, new ObjectName("remoting:service=connector"));
+ connector.create();
+ invocationHandler = new TestInvocationHandler();
+ connector.addInvocationHandler("test", invocationHandler);
+ connector.start();
+ }
+
+
+ protected void shutdownServer() throws Exception
+ {
+ if (connector != null)
+ connector.stop();
+ }
+
+
+ static class TestInvocationHandler implements ServerInvocationHandler
+ {
+ public void addListener(InvokerCallbackHandler callbackHandler) {}
+ public Object invoke(final InvocationRequest invocation) throws Throwable
+ {
+ return invocation.getParameter();
+ }
+ public void removeListener(InvokerCallbackHandler callbackHandler) {}
+ public void setMBeanServer(MBeanServer server) {}
+ public void setInvoker(ServerInvoker invoker) {}
+ }
+}
\ No newline at end of file
16 years, 2 months
JBoss Remoting SVN: r3528 - remoting2/branches/2.x/src/tests/org/jboss/test/remoting/soak.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2008-02-27 19:22:03 -0500 (Wed, 27 Feb 2008)
New Revision: 3528
Modified:
remoting2/branches/2.x/src/tests/org/jboss/test/remoting/soak/ProducerConsumerSoakTestParent.java
Log:
JBREM-911: Added oneway callbacks.
Modified: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/soak/ProducerConsumerSoakTestParent.java
===================================================================
--- remoting2/branches/2.x/src/tests/org/jboss/test/remoting/soak/ProducerConsumerSoakTestParent.java 2008-02-28 00:16:48 UTC (rev 3527)
+++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/soak/ProducerConsumerSoakTestParent.java 2008-02-28 00:22:03 UTC (rev 3528)
@@ -46,6 +46,7 @@
import org.jboss.remoting.callback.Callback;
import org.jboss.remoting.callback.HandleCallbackException;
import org.jboss.remoting.callback.InvokerCallbackHandler;
+import org.jboss.remoting.callback.ServerInvokerCallbackHandler;
import org.jboss.remoting.transport.Connector;
import org.jboss.remoting.transport.PortUtil;
import org.jboss.remoting.transport.bisocket.Bisocket;
@@ -217,7 +218,8 @@
Iterator it = listeners.iterator();
while(it.hasNext())
{
- InvokerCallbackHandler handler = (InvokerCallbackHandler) it.next();
+ ServerInvokerCallbackHandler handler = (ServerInvokerCallbackHandler) it.next();
+ handler.handleCallbackOneway(c);
handler.handleCallback(c);
}
16 years, 2 months
JBoss Remoting SVN: r3527 - remoting2/branches/2.x/src/main/org/jboss/remoting/transport/socket.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2008-02-27 19:16:48 -0500 (Wed, 27 Feb 2008)
New Revision: 3527
Modified:
remoting2/branches/2.x/src/main/org/jboss/remoting/transport/socket/MicroSocketClientInvoker.java
Log:
JBREM-786: If numberOfCallRetries == 1, will not create new socket on last attempt.
Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/transport/socket/MicroSocketClientInvoker.java
===================================================================
--- remoting2/branches/2.x/src/main/org/jboss/remoting/transport/socket/MicroSocketClientInvoker.java 2008-02-28 00:15:17 UTC (rev 3526)
+++ remoting2/branches/2.x/src/main/org/jboss/remoting/transport/socket/MicroSocketClientInvoker.java 2008-02-28 00:16:48 UTC (rev 3527)
@@ -634,7 +634,9 @@
try
{
- boolean tryPool = retryCount < (numberOfCallRetries - 1) || maxPoolSize == 1;
+ boolean tryPool = retryCount < (numberOfCallRetries - 1)
+ || maxPoolSize == 1
+ || numberOfCallRetries == 1;
long l = System.currentTimeMillis();
socketWrapper = getConnection(marshaller, unmarshaller, tryPool, timeLeft);
long d = System.currentTimeMillis() - l;
16 years, 2 months