June 2008 - jboss-remoting-commits

JBoss Remoting SVN: r4303 - remoting2/branches/2.2/src/main/org/jboss/remoting/marshal.

by jboss-remoting-commits＠lists.jboss.org

Author: ron.sigal(a)jboss.com Date: 2008-06-20 00:58:44 -0400 (Fri, 20 Jun 2008) New Revision: 4303 Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/marshal/MarshallerLoaderHandler.java Log: JBREM-962: loadClassBytes() skips rest of loop if repository returns null class. Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/marshal/MarshallerLoaderHandler.java =================================================================== --- remoting2/branches/2.2/src/main/org/jboss/remoting/marshal/MarshallerLoaderHandler.java 2008-06-20 01:42:53 UTC (rev 4302) +++ remoting2/branches/2.2/src/main/org/jboss/remoting/marshal/MarshallerLoaderHandler.java 2008-06-20 04:58:44 UTC (rev 4303) @@ -179,12 +179,18 @@ while (it.hasNext()) { ObjectName name = (ObjectName) it.next(); - + log.debug("searching repository " + name); + try { Object o = server.getAttribute(name, "Instance"); LoaderRepository repository = (LoaderRepository) o; Class c = repository.getCachedClass(className); + if (c == null) + { + continue; + } + log.debug("found class in repository " + name); RepositoryClassLoader cl = (RepositoryClassLoader) c.getClassLoader(); classDefinition = loadByteCode(cl, className); }

15 years, 10 months

1
0
0 / 0

JBoss Remoting SVN: r4302 - remoting2/branches/2.2/src/main/org/jboss/remoting.

by jboss-remoting-commits＠lists.jboss.org

Author: ron.sigal(a)jboss.com Date: 2008-06-19 21:42:53 -0400 (Thu, 19 Jun 2008) New Revision: 4302 Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/Version.java Log: JBREM-962: Added JBREM-962 to version. Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/Version.java =================================================================== --- remoting2/branches/2.2/src/main/org/jboss/remoting/Version.java 2008-06-20 01:41:53 UTC (rev 4301) +++ remoting2/branches/2.2/src/main/org/jboss/remoting/Version.java 2008-06-20 01:42:53 UTC (rev 4302) @@ -32,10 +32,15 @@ public static final byte VERSION_2 = 2; public static final byte VERSION_2_2 = 22; - public static final String VERSION = "2.2.2.SP7 (Bluto)"; + public static final String VERSION = "2.2.2.SP8-preview:JBREM-949+JBREM-954+JBREM-965+JBREM-981+JBREM-960+JBREM-962"; 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); + } public static final String PRE_2_0_COMPATIBLE = "jboss.remoting.pre_2_0_compatible";

15 years, 10 months

1
0
0 / 0

JBoss Remoting SVN: r4301 - remoting2/branches/2.2/src/main/org/jboss/remoting/transport/http.

by jboss-remoting-commits＠lists.jboss.org

Author: ron.sigal(a)jboss.com Date: 2008-06-19 21:41:53 -0400 (Thu, 19 Jun 2008) New Revision: 4301 Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/transport/http/HTTPClientInvoker.java Log: JBREM-960: (1) useHttpURLConnection() tries to add responseMessage and responseCode to CannotConnectException(); (2) readResponse() checks for EOF on inputStream and throws EOFException. Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/transport/http/HTTPClientInvoker.java =================================================================== --- remoting2/branches/2.2/src/main/org/jboss/remoting/transport/http/HTTPClientInvoker.java 2008-06-20 01:35:20 UTC (rev 4300) +++ remoting2/branches/2.2/src/main/org/jboss/remoting/transport/http/HTTPClientInvoker.java 2008-06-20 01:41:53 UTC (rev 4301) @@ -48,6 +48,7 @@ import org.jboss.util.threadpool.Task; import org.jboss.util.threadpool.ThreadPool; +import java.io.EOFException; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; @@ -330,8 +331,21 @@ } catch (Exception e) { - log.debug("Error invoking http client invoker.", e); - throw new CannotConnectException("Can not connect http client invoker.", e); + String message = "Can not connect http client invoker."; + if (e.getMessage() != null) + message += " " + e.getMessage() + "."; + + try + { + String responseMessage = conn.getResponseMessage(); + int code = conn.getResponseCode(); + message += " Response: " + responseMessage + "/" + code + "."; + } + catch (IOException e1) + { + log.debug("Unable to retrieve response message", e1); + } + throw new CannotConnectException(message, e); } // now check for error response and throw exception unless configured to not do so @@ -478,9 +492,9 @@ } private Object readResponse(Map metadata, Map headers, UnMarshaller unmarshaller, InputStream is) - throws IOException, ClassNotFoundException + throws ClassNotFoundException, IOException { - Object result; + Object result = null; String encoding = null; Object ceObj = headers.get("Content-Encoding"); if (ceObj != null) @@ -495,11 +509,26 @@ unmarshaller = new CompressingUnMarshaller(MarshalFactory.getUnMarshaller(SerializableUnMarshaller.DATATYPE)); } - Map map = metadata == null ? headers : metadata; - if (unmarshaller instanceof VersionedUnMarshaller) - result = ((VersionedUnMarshaller)unmarshaller).read(is, map, Version.getDefaultVersion()); - else - result = unmarshaller.read(is, map); + try + { + Map map = metadata == null ? headers : metadata; + if (unmarshaller instanceof VersionedUnMarshaller) + result = ((VersionedUnMarshaller)unmarshaller).read(is, map, Version.getDefaultVersion()); + else + result = unmarshaller.read(is, map); + } + catch (ClassNotFoundException e) + { + throw e; + } + catch (IOException e) + { + if (-1 == is.read()) + { + throw new EOFException(); + } + throw e; + } return result; }

15 years, 10 months

1
0
0 / 0

JBoss Remoting SVN: r4300 - remoting2/branches/2.2/src/main/org/jboss/remoting/transport.

by jboss-remoting-commits＠lists.jboss.org

Author: ron.sigal(a)jboss.com Date: 2008-06-19 21:35:20 -0400 (Thu, 19 Jun 2008) New Revision: 4300 Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/transport/Connector.java Log: JBREM-962: Added ability to read <repositories> element from xml config file. Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/transport/Connector.java =================================================================== --- remoting2/branches/2.2/src/main/org/jboss/remoting/transport/Connector.java 2008-06-20 01:33:33 UTC (rev 4299) +++ remoting2/branches/2.2/src/main/org/jboss/remoting/transport/Connector.java 2008-06-20 01:35:20 UTC (rev 4300) @@ -44,8 +44,10 @@ import javax.net.ServerSocketFactory; import javax.net.SocketFactory; import java.net.InetAddress; +import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; +import java.util.List; import java.util.Map; import java.util.StringTokenizer; @@ -463,7 +465,8 @@ // if loaderLocator is null, then probably not defined to have loader service (i.e. no loader port specified) if (loaderLocator != null) { - marshallerLoader = MarshallLoaderFactory.createMarshallLoader(loaderLocator); + List repositories = getLoaderRepositories(); + marshallerLoader = MarshallLoaderFactory.createMarshallLoader(loaderLocator, repositories, server); } return marshallerLoader; } @@ -628,6 +631,41 @@ } } + private List getLoaderRepositories() + { + if (xml == null) + { + return null; + } + + NodeList repositoryNodes = xml.getElementsByTagName("repository"); + if (repositoryNodes.getLength() == 0) + { + return null; + } + + List repositories = new ArrayList(); + for (int i = 0; i < repositoryNodes.getLength(); i++) + { + Node node = repositoryNodes.item(i); + String repositoryName = node.getFirstChild().getNodeValue(); + + try + { + ObjectName objName = new ObjectName(repositoryName); + repositories.add(objName); + log.info("repository: " + repositoryName); + } + catch (MalformedObjectNameException e) + { + log.debug("repository name is not an object name: " + repositoryName); + continue; + } + } + + return repositories; + } + private ServerInvocationHandler createHandlerProxy(ObjectName objName) { ServerInvocationHandler handler;

15 years, 10 months

1
0
0 / 0

JBoss Remoting SVN: r4299 - remoting2/branches/2.2/src/main/org/jboss/remoting/marshal.

by jboss-remoting-commits＠lists.jboss.org

Author: ron.sigal(a)jboss.com Date: 2008-06-19 21:33:33 -0400 (Thu, 19 Jun 2008) New Revision: 4299 Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/marshal/MarshallLoaderFactory.java Log: JBREM-962: Changed repositories from set to list. Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/marshal/MarshallLoaderFactory.java =================================================================== --- remoting2/branches/2.2/src/main/org/jboss/remoting/marshal/MarshallLoaderFactory.java 2008-06-20 01:33:09 UTC (rev 4298) +++ remoting2/branches/2.2/src/main/org/jboss/remoting/marshal/MarshallLoaderFactory.java 2008-06-20 01:33:33 UTC (rev 4299) @@ -23,8 +23,8 @@ package org.jboss.remoting.marshal; import java.util.HashMap; +import java.util.List; import java.util.Map; -import java.util.Set; import javax.management.MBeanServer; @@ -51,7 +51,7 @@ * @param mbeanServer * @return */ - public static Connector createMarshallLoader(InvokerLocator locator, Set repositories, MBeanServer mbeanServer) + public static Connector createMarshallLoader(InvokerLocator locator, List repositories, MBeanServer mbeanServer) { Connector marshallerConnector = null; try

15 years, 10 months

1
0
0 / 0

JBoss Remoting SVN: r4298 - remoting2/branches/2.2/src/main/org/jboss/remoting/marshal.

by jboss-remoting-commits＠lists.jboss.org

Author: ron.sigal(a)jboss.com Date: 2008-06-19 21:33:09 -0400 (Thu, 19 Jun 2008) New Revision: 4298 Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/marshal/MarshallerLoaderHandler.java Log: JBREM-962: Removed unused imports. Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/marshal/MarshallerLoaderHandler.java =================================================================== --- remoting2/branches/2.2/src/main/org/jboss/remoting/marshal/MarshallerLoaderHandler.java 2008-06-20 01:31:37 UTC (rev 4297) +++ remoting2/branches/2.2/src/main/org/jboss/remoting/marshal/MarshallerLoaderHandler.java 2008-06-20 01:33:09 UTC (rev 4298) @@ -25,18 +25,11 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; -import java.io.ObjectOutputStream; import java.net.URL; import java.util.Iterator; import java.util.List; import java.util.Map; -import java.util.Set; - -import javax.management.MBeanAttributeInfo; -import javax.management.MBeanInfo; -import javax.management.MBeanOperationInfo; import javax.management.MBeanServer; -import javax.management.MalformedObjectNameException; import javax.management.ObjectName; import org.jboss.logging.Logger;

15 years, 10 months

1
0
0 / 0

JBoss Remoting SVN: r4297 - remoting2/branches/2.2/src/main/org/jboss/remoting/marshal.

by jboss-remoting-commits＠lists.jboss.org

Author: ron.sigal(a)jboss.com Date: 2008-06-19 21:31:37 -0400 (Thu, 19 Jun 2008) New Revision: 4297 Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/marshal/MarshallerLoaderHandler.java Log: JBREM-962: Changed repositories from set to list. Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/marshal/MarshallerLoaderHandler.java =================================================================== --- remoting2/branches/2.2/src/main/org/jboss/remoting/marshal/MarshallerLoaderHandler.java 2008-06-20 01:25:46 UTC (rev 4296) +++ remoting2/branches/2.2/src/main/org/jboss/remoting/marshal/MarshallerLoaderHandler.java 2008-06-20 01:31:37 UTC (rev 4297) @@ -28,6 +28,7 @@ import java.io.ObjectOutputStream; import java.net.URL; import java.util.Iterator; +import java.util.List; import java.util.Map; import java.util.Set; @@ -59,11 +60,11 @@ { private ServerInvoker invoker = null; private MBeanServer server = null; - private Set repositories; + private List repositories; protected final static Logger log = Logger.getLogger(MarshallerLoaderHandler.class); - public MarshallerLoaderHandler(Set repositories) + public MarshallerLoaderHandler(List repositories) { this.repositories = repositories; }

15 years, 10 months

1
0
0 / 0

JBoss Remoting SVN: r4296 - remoting2/branches/2.2/src/main/org/jboss/remoting/marshal.

by jboss-remoting-commits＠lists.jboss.org

Author: ron.sigal(a)jboss.com Date: 2008-06-19 21:25:46 -0400 (Thu, 19 Jun 2008) New Revision: 4296 Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/marshal/MarshallLoaderFactory.java Log: JBREM-962: MarshallerLoaderHandler gets repositories set and MBeanServer. Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/marshal/MarshallLoaderFactory.java =================================================================== --- remoting2/branches/2.2/src/main/org/jboss/remoting/marshal/MarshallLoaderFactory.java 2008-06-20 01:23:12 UTC (rev 4295) +++ remoting2/branches/2.2/src/main/org/jboss/remoting/marshal/MarshallLoaderFactory.java 2008-06-20 01:25:46 UTC (rev 4296) @@ -24,6 +24,10 @@ import java.util.HashMap; import java.util.Map; +import java.util.Set; + +import javax.management.MBeanServer; + import org.jboss.logging.Logger; import org.jboss.remoting.InvokerLocator; import org.jboss.remoting.transport.Connector; @@ -43,9 +47,11 @@ * listen on. Will return null if can not create the connector. * * @param locator + * @param repositories + * @param mbeanServer * @return */ - public static Connector createMarshallLoader(InvokerLocator locator) + public static Connector createMarshallLoader(InvokerLocator locator, Set repositories, MBeanServer mbeanServer) { Connector marshallerConnector = null; try @@ -54,8 +60,11 @@ marshallerConnector.setInvokerLocator(locator.getLocatorURI()); marshallerConnector.start(); - MarshallerLoaderHandler loader = new MarshallerLoaderHandler(); + MarshallerLoaderHandler loader = new MarshallerLoaderHandler(repositories); marshallerConnector.addInvocationHandler("loader", loader); + + // Set after Connector.addInvocationHandler(), which also sets MBeanServer. + loader.setMBeanServer(mbeanServer); } catch(Exception e) {

15 years, 10 months

1
0
0 / 0

JBoss Remoting SVN: r4295 - remoting2/branches/2.2/src/main/org/jboss/remoting/marshal.

by jboss-remoting-commits＠lists.jboss.org

Author: ron.sigal(a)jboss.com Date: 2008-06-19 21:23:12 -0400 (Thu, 19 Jun 2008) New Revision: 4295 Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/marshal/MarshallerLoaderHandler.java Log: JBREM-962: Can look in HeirarchicalLoaderRepository3s for scoped classes. Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/marshal/MarshallerLoaderHandler.java =================================================================== --- remoting2/branches/2.2/src/main/org/jboss/remoting/marshal/MarshallerLoaderHandler.java 2008-06-20 01:18:25 UTC (rev 4294) +++ remoting2/branches/2.2/src/main/org/jboss/remoting/marshal/MarshallerLoaderHandler.java 2008-06-20 01:23:12 UTC (rev 4295) @@ -22,9 +22,25 @@ package org.jboss.remoting.marshal; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.ObjectOutputStream; +import java.net.URL; +import java.util.Iterator; import java.util.Map; +import java.util.Set; + +import javax.management.MBeanAttributeInfo; +import javax.management.MBeanInfo; +import javax.management.MBeanOperationInfo; import javax.management.MBeanServer; +import javax.management.MalformedObjectNameException; +import javax.management.ObjectName; + import org.jboss.logging.Logger; +import org.jboss.mx.loading.LoaderRepository; +import org.jboss.mx.loading.RepositoryClassLoader; import org.jboss.remoting.InvocationRequest; import org.jboss.remoting.InvokerLocator; import org.jboss.remoting.ServerInvocationHandler; @@ -43,10 +59,15 @@ { private ServerInvoker invoker = null; private MBeanServer server = null; + private Set repositories; protected final static Logger log = Logger.getLogger(MarshallerLoaderHandler.class); - + public MarshallerLoaderHandler(Set repositories) + { + this.repositories = repositories; + } + /** * set the mbean server that the handler can reference * @@ -102,9 +123,11 @@ else if(LOAD_CLASS_METHOD.equals(param)) { String className = (String) metadMap.get(CLASSNAME); + log.debug("MarshallerLoaderHandler: loading class: " + className); if(className != null) { ret = loadClassBytes(className, invoker.getClassLoader()); + log.debug("MarshallerLoaderHandler: returning class: " + className + ": " + ret); } else { @@ -155,6 +178,33 @@ if(className != null) { byte[] classDefinition = ClassUtil.getClassBytes(className, classLoader); + + if (classDefinition == null && repositories != null) + { + Iterator it = repositories.iterator(); + while (it.hasNext()) + { + ObjectName name = (ObjectName) it.next(); + + try + { + Object o = server.getAttribute(name, "Instance"); + LoaderRepository repository = (LoaderRepository) o; + Class c = repository.getCachedClass(className); + RepositoryClassLoader cl = (RepositoryClassLoader) c.getClassLoader(); + classDefinition = loadByteCode(cl, className); + } + catch (Exception e) + { + log.debug("unable to get class from " + name + ": " + e.getMessage(), e); + } + } + } + + if (classDefinition == null) + { + log.debug("unable to load class " + className); + } classBytes = new ClassBytes(className, classDefinition); } return classBytes; @@ -179,4 +229,62 @@ { //NO OP as don't won't allow listeners } + + /** + * Adapted from org.jboss.mx.loading.RepositoryClassLoader. + * + * @param cl + * @param classname + * @return + * @throws ClassNotFoundException + * @throws IOException + */ + protected byte[] loadByteCode(ClassLoader cl, String classname) + throws ClassNotFoundException, IOException + { + byte[] bytecode = null; + URL classURL = getClassURL(cl, classname); + + // Load the class bytecode + InputStream is = null; + try + { + is = classURL.openStream(); + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + byte[] tmp = new byte[1024]; + int read = 0; + while( (read = is.read(tmp)) > 0 ) + { + baos.write(tmp, 0, read); + } + bytecode = baos.toByteArray(); + } + finally + { + if( is != null ) + is.close(); + } + + return bytecode; + } + + /** + * Adapted from org.jboss.mx.loading.RepositoryClassLoader. + * + * @param cl + * @param classname + * @return + * @throws ClassNotFoundException + */ + private URL getClassURL(ClassLoader cl, String classname) throws ClassNotFoundException + { + String classRsrcName = classname.replace('.', '/') + ".class"; + URL classURL = cl.getResource(classRsrcName); + if( classURL == null ) + { + String msg = "Failed to find: "+classname+" as resource: "+classRsrcName; + throw new ClassNotFoundException(msg); + } + return classURL; + } }

15 years, 10 months

1
0
0 / 0

JBoss Remoting SVN: r4294 - remoting2/branches/2.2/src/main/org/jboss/remoting/loading.

by jboss-remoting-commits＠lists.jboss.org

Author: ron.sigal(a)jboss.com Date: 2008-06-19 21:18:25 -0400 (Thu, 19 Jun 2008) New Revision: 4294 Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/loading/ClassByteClassLoader.java Log: JBREM-962: Added two log.debug() calls. 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 2008-06-16 13:16:21 UTC (rev 4293) +++ remoting2/branches/2.2/src/main/org/jboss/remoting/loading/ClassByteClassLoader.java 2008-06-20 01:18:25 UTC (rev 4294) @@ -388,7 +388,9 @@ { loaderClient.connect(); } + log.debug("attempting to load from network: " + className); Object obj = loaderClient.invoke(marshallerMethodName, metadata); + log.debug("loaded from network: " + obj); if(obj != null) {

15 years, 10 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

jboss-remoting-commits June 2008