JBoss Remoting SVN: r5686 - remoting2/branches/2.x/src/main/org/jboss/remoting.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2010-02-15 13:50:41 -0500 (Mon, 15 Feb 2010)
New Revision: 5686
Modified:
remoting2/branches/2.x/src/main/org/jboss/remoting/Version.java
Log:
JBREM-1179: Prints version number to System.out when class is loaded.
Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/Version.java
===================================================================
--- remoting2/branches/2.x/src/main/org/jboss/remoting/Version.java 2010-02-15 17:07:59 UTC (rev 5685)
+++ remoting2/branches/2.x/src/main/org/jboss/remoting/Version.java 2010-02-15 18:50:41 UTC (rev 5686)
@@ -53,7 +53,7 @@
// have a static block to load the user defined version to use
static
{
-// System.out.println("Remoting version: " + VERSION);
+ System.out.println("Remoting version: " + VERSION);
boolean precompatibleFlag = false;
String precompatible = getSystemProperty(PRE_2_0_COMPATIBLE);
14 years, 9 months
JBoss Remoting SVN: r5685 - remoting2/branches/2.x/src/tests/org/jboss/test/remoting/classloader.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2010-02-15 12:07:59 -0500 (Mon, 15 Feb 2010)
New Revision: 5685
Added:
remoting2/branches/2.x/src/tests/org/jboss/test/remoting/classloader/RemoteClassloaderTestCase.java
Log:
JBREM-1184: New unit test.
Added: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/classloader/RemoteClassloaderTestCase.java
===================================================================
--- remoting2/branches/2.x/src/tests/org/jboss/test/remoting/classloader/RemoteClassloaderTestCase.java (rev 0)
+++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/classloader/RemoteClassloaderTestCase.java 2010-02-15 17:07:59 UTC (rev 5685)
@@ -0,0 +1,214 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.classloader;
+
+import java.lang.reflect.Field;
+import java.net.InetAddress;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.management.MBeanServer;
+
+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.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.InvokerCallbackHandler;
+import org.jboss.remoting.loading.ClassByteClassLoader;
+import org.jboss.remoting.loading.ClassBytes;
+import org.jboss.remoting.marshal.MarshallLoaderFactory;
+import org.jboss.remoting.marshal.MarshallerLoaderConstants;
+import org.jboss.remoting.marshal.MarshallerLoaderHandler;
+import org.jboss.remoting.transport.Connector;
+import org.jboss.remoting.transport.PortUtil;
+
+
+/**
+ * Unit test for JBREM-1184.
+ *
+ * Note that testClassNotFound() passes even in the presence of the NullPointerException
+ * described in JBREM-1184, so it's not really a regression test. However, I'm committing
+ * the test for its documentation value. The NPE should not be seen in the log file.
+ *
+ * @author <a href="ron.sigal(a)jboss.com">Ron Sigal</a>
+ * @version $Revision: 1.1 $
+ * <p>
+ * Copyright Feb 15, 2010
+ */
+public class RemoteClassloaderTestCase extends TestCase
+{
+ private static Logger log = Logger.getLogger(RemoteClassloaderTestCase.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(Level.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 testClassNotFound() throws Throwable
+ {
+ log.info("entering " + getName());
+
+ // Start server.
+ setupServer();
+
+ TestClassLoader tcl = new TestClassLoader();
+ InvokerLocator loaderLocator = MarshallLoaderFactory.convertLocator(serverLocator);
+ tcl.setClientInvoker(new Client(loaderLocator));
+
+ try
+ {
+ tcl.findClass("a.b.c");
+ fail("expected ClassNotFoundException");
+ }
+ catch (ClassNotFoundException e)
+ {
+ log.info("got expected ClassNotFoundException");
+ }
+ catch (Throwable t)
+ {
+ fail("expected ClassNotFoundException: got " + t);
+ }
+
+ shutdownServer();
+ log.info(getName() + " PASSES");
+ }
+
+
+ protected String getTransport()
+ {
+ return "socket";
+ }
+
+
+ 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;
+ locatorURI += "/?loaderport=4873";
+ String metadata = System.getProperty("remoting.metadata");
+ if (metadata != null)
+ {
+ locatorURI += "&" + metadata;
+ }
+ 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);
+ connector = new Connector(serverLocator, config);
+ connector.create();
+ invocationHandler = new TestInvocationHandler();
+ connector.addInvocationHandler("test", invocationHandler);
+ connector.start();
+
+ // Install TestMarshallerLoaderHandler.
+ Field field = Connector.class.getDeclaredField("marshallerLoaderConnector");
+ field.setAccessible(true);
+ Connector marshallerLoaderConnector = (Connector) field.get(connector);
+ MarshallerLoaderHandler loader = new TestMarshallerLoaderHandler(null);
+ marshallerLoaderConnector.addInvocationHandler("loader", loader);
+ }
+
+
+ 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 TestMarshallerLoaderHandler extends MarshallerLoaderHandler
+ {
+ public TestMarshallerLoaderHandler(List repositories)
+ {
+ super(repositories);
+ }
+
+ public Object invoke(InvocationRequest invocation) throws Throwable
+ {
+ Map metadMap = invocation.getRequestPayload();
+ String className = (String) metadMap.get(MarshallerLoaderConstants.CLASSNAME);
+ return new ClassBytes(className, null);
+ }
+ }
+
+
+ static class TestClassLoader extends ClassByteClassLoader
+ {
+ public Class findClass(String name) throws ClassNotFoundException
+ {
+ return super.findClass(name);
+ }
+ }
+}
\ No newline at end of file
14 years, 9 months
JBoss Remoting SVN: r5684 - remoting2/branches/2.2/src/tests/org/jboss/test/remoting/classloader.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2010-02-15 12:07:13 -0500 (Mon, 15 Feb 2010)
New Revision: 5684
Added:
remoting2/branches/2.2/src/tests/org/jboss/test/remoting/classloader/RemoteClassloaderTestCase.java
Log:
JBREM-1184: New unit test.
Added: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/classloader/RemoteClassloaderTestCase.java
===================================================================
--- remoting2/branches/2.2/src/tests/org/jboss/test/remoting/classloader/RemoteClassloaderTestCase.java (rev 0)
+++ remoting2/branches/2.2/src/tests/org/jboss/test/remoting/classloader/RemoteClassloaderTestCase.java 2010-02-15 17:07:13 UTC (rev 5684)
@@ -0,0 +1,214 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.classloader;
+
+import java.lang.reflect.Field;
+import java.net.InetAddress;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.management.MBeanServer;
+
+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.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.InvokerCallbackHandler;
+import org.jboss.remoting.loading.ClassByteClassLoader;
+import org.jboss.remoting.loading.ClassBytes;
+import org.jboss.remoting.marshal.MarshallLoaderFactory;
+import org.jboss.remoting.marshal.MarshallerLoaderConstants;
+import org.jboss.remoting.marshal.MarshallerLoaderHandler;
+import org.jboss.remoting.transport.Connector;
+import org.jboss.remoting.transport.PortUtil;
+
+
+/**
+ * Unit test for JBREM-1184.
+ *
+ * Note that testClassNotFound() passes even in the presence of the NullPointerException
+ * described in JBREM-1184, so it's not really a regression test. However, I'm committing
+ * the test for its documentation value. The NPE should not be seen in the log file.
+ *
+ * @author <a href="ron.sigal(a)jboss.com">Ron Sigal</a>
+ * @version $Revision: 1.1 $
+ * <p>
+ * Copyright Feb 15, 2010
+ */
+public class RemoteClassloaderTestCase extends TestCase
+{
+ private static Logger log = Logger.getLogger(RemoteClassloaderTestCase.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(Level.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 testClassNotFound() throws Throwable
+ {
+ log.info("entering " + getName());
+
+ // Start server.
+ setupServer();
+
+ TestClassLoader tcl = new TestClassLoader();
+ InvokerLocator loaderLocator = MarshallLoaderFactory.convertLocator(serverLocator);
+ tcl.setClientInvoker(new Client(loaderLocator));
+
+ try
+ {
+ tcl.findClass("a.b.c");
+ fail("expected ClassNotFoundException");
+ }
+ catch (ClassNotFoundException e)
+ {
+ log.info("got expected ClassNotFoundException");
+ }
+ catch (Throwable t)
+ {
+ fail("expected ClassNotFoundException: got " + t);
+ }
+
+ shutdownServer();
+ log.info(getName() + " PASSES");
+ }
+
+
+ protected String getTransport()
+ {
+ return "socket";
+ }
+
+
+ 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;
+ locatorURI += "/?loaderport=4873";
+ String metadata = System.getProperty("remoting.metadata");
+ if (metadata != null)
+ {
+ locatorURI += "&" + metadata;
+ }
+ 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);
+ connector = new Connector(serverLocator, config);
+ connector.create();
+ invocationHandler = new TestInvocationHandler();
+ connector.addInvocationHandler("test", invocationHandler);
+ connector.start();
+
+ // Install TestMarshallerLoaderHandler.
+ Field field = Connector.class.getDeclaredField("marshallerLoaderConnector");
+ field.setAccessible(true);
+ Connector marshallerLoaderConnector = (Connector) field.get(connector);
+ MarshallerLoaderHandler loader = new TestMarshallerLoaderHandler(null);
+ marshallerLoaderConnector.addInvocationHandler("loader", loader);
+ }
+
+
+ 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 TestMarshallerLoaderHandler extends MarshallerLoaderHandler
+ {
+ public TestMarshallerLoaderHandler(List repositories)
+ {
+ super(repositories);
+ }
+
+ public Object invoke(InvocationRequest invocation) throws Throwable
+ {
+ Map metadMap = invocation.getRequestPayload();
+ String className = (String) metadMap.get(MarshallerLoaderConstants.CLASSNAME);
+ return new ClassBytes(className, null);
+ }
+ }
+
+
+ static class TestClassLoader extends ClassByteClassLoader
+ {
+ public Class findClass(String name) throws ClassNotFoundException
+ {
+ return super.findClass(name);
+ }
+ }
+}
\ No newline at end of file
14 years, 9 months
JBoss Remoting SVN: r5683 - remoting2/branches/2.x/src/main/org/jboss/remoting/loading.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2010-02-15 12:06:30 -0500 (Mon, 15 Feb 2010)
New Revision: 5683
Modified:
remoting2/branches/2.x/src/main/org/jboss/remoting/loading/ClassByteClassLoader.java
Log:
JBREM-1184: Tests for returned null class.
Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/loading/ClassByteClassLoader.java
===================================================================
--- remoting2/branches/2.x/src/main/org/jboss/remoting/loading/ClassByteClassLoader.java 2010-02-15 16:55:07 UTC (rev 5682)
+++ remoting2/branches/2.x/src/main/org/jboss/remoting/loading/ClassByteClassLoader.java 2010-02-15 17:06:30 UTC (rev 5683)
@@ -405,9 +405,14 @@
if(obj instanceof ClassBytes)
{
ClassBytes classBytes = (ClassBytes) obj;
- String name = classBytes.getClassName();
-
- loadedClass = addClass(classBytes);
+ if (classBytes.getClassBytes() != null)
+ {
+ loadedClass = addClass(classBytes);
+ }
+ else
+ {
+ log.debug("Can not load remote class bytes: server returned null class");
+ }
}
else
{
14 years, 9 months
JBoss Remoting SVN: r5682 - remoting2/branches/2.2/src/main/org/jboss/remoting/loading.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2010-02-15 11:55:07 -0500 (Mon, 15 Feb 2010)
New Revision: 5682
Modified:
remoting2/branches/2.2/src/main/org/jboss/remoting/loading/ClassByteClassLoader.java
Log:
JBREM-1184: Tests for returned null class.
Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/loading/ClassByteClassLoader.java
===================================================================
--- remoting2/branches/2.2/src/main/org/jboss/remoting/loading/ClassByteClassLoader.java 2010-02-15 16:17:23 UTC (rev 5681)
+++ remoting2/branches/2.2/src/main/org/jboss/remoting/loading/ClassByteClassLoader.java 2010-02-15 16:55:07 UTC (rev 5682)
@@ -397,9 +397,14 @@
if(obj instanceof ClassBytes)
{
ClassBytes classBytes = (ClassBytes) obj;
- String name = classBytes.getClassName();
-
- loadedClass = addClass(classBytes);
+ if (classBytes.getClassBytes() != null)
+ {
+ loadedClass = addClass(classBytes);
+ }
+ else
+ {
+ log.debug("Can not load remote class bytes: server returned null class");
+ }
}
else
{
14 years, 9 months
JBoss Remoting SVN: r5681 - remoting2/branches/2.2/src/main/org/jboss/remoting.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2010-02-15 11:17:23 -0500 (Mon, 15 Feb 2010)
New Revision: 5681
Modified:
remoting2/branches/2.2/src/main/org/jboss/remoting/Version.java
Log:
JBREM-1179: Prints version number to System.out when class is loaded.
Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/Version.java
===================================================================
--- remoting2/branches/2.2/src/main/org/jboss/remoting/Version.java 2010-01-28 19:19:39 UTC (rev 5680)
+++ remoting2/branches/2.2/src/main/org/jboss/remoting/Version.java 2010-02-15 16:17:23 UTC (rev 5681)
@@ -32,15 +32,15 @@
public static final byte VERSION_2 = 2;
public static final byte VERSION_2_2 = 22;
- public static final String VERSION = "2.2.3.SP1";
+ public static final String VERSION = "2.2.3.SP2-preview";
private static final byte byteVersion = VERSION_2_2;
private static byte defaultByteVersion = byteVersion;
private static boolean performVersioning = true;
-// static
-// {
-// System.out.println("Remoting version: " + VERSION + ": 9/14/2009 - 19:39");
-// }
+ static
+ {
+ System.out.println("Remoting version: " + VERSION);
+ }
public static final String PRE_2_0_COMPATIBLE = "jboss.remoting.pre_2_0_compatible";
14 years, 9 months