April 2011 - jboss-remoting-commits

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

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

Author: ron.sigal(a)jboss.com Date: 2011-04-15 15:20:27 -0400 (Fri, 15 Apr 2011) New Revision: 6323 Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/transport/coyote/CoyoteInvoker.java Log: JBREM-1281: Added special handling for setting the tomcat executor. Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/transport/coyote/CoyoteInvoker.java =================================================================== --- remoting2/branches/2.2/src/main/org/jboss/remoting/transport/coyote/CoyoteInvoker.java 2011-04-15 19:17:31 UTC (rev 6322) +++ remoting2/branches/2.2/src/main/org/jboss/remoting/transport/coyote/CoyoteInvoker.java 2011-04-15 19:20:27 UTC (rev 6323) @@ -17,6 +17,9 @@ package org.jboss.remoting.transport.coyote; +import org.apache.catalina.Executor; +import org.apache.catalina.LifecycleException; +import org.apache.catalina.core.StandardThreadExecutor; import org.apache.coyote.ActionCode; import org.apache.coyote.Adapter; import org.apache.coyote.ProtocolHandler; @@ -51,6 +54,7 @@ import java.net.InetAddress; import java.net.UnknownHostException; import java.util.Enumeration; +import java.util.HashMap; import java.util.Iterator; import java.util.Map; @@ -162,6 +166,11 @@ { String key = (String) keys.next(); Object obj = config.get(key); + if ("executor".equals(key) && obj instanceof String) + { + createAndSetExecutor(protocolHandler, (String) obj); + continue; + } setProperty(protocolHandler, key, obj); } @@ -961,6 +970,7 @@ Method methods[] = o.getClass().getMethods(); Method setPropertyMethod = null; Method setAttributeMethod = null; + Method setExecutorMethod = null; // Try a setFoo( String) or setFoo ( int ) or ( boolean ) if (value instanceof String) @@ -1061,13 +1071,24 @@ else if("setProperty".equals(methods[i].getName())) { setPropertyMethod = methods[i]; - } + } + else if ("setExecutor".equals(methods[i].getName())) + { + setExecutorMethod = methods[i]; + } } } // Ok, no setXXX found, try a setProperty("name", "value") or setAttribute("name", "value") - if(setAttributeMethod != null) + if(setExecutorMethod != null && value instanceof Executor) { + Object params[] = new Object[1]; + params[0] = value; + setExecutorMethod.invoke(o, params); + return true; + } + else if(setAttributeMethod != null) + { Object params[] = new Object[2]; params[0] = name; params[1] = value; @@ -1082,10 +1103,10 @@ setPropertyMethod.invoke(o, params); return true; } - } catch(Exception e) { + log.debug("unable to set property " + name + " to " + value + ": " + e.getMessage()); return false; } return false; @@ -1110,6 +1131,32 @@ { return contentType.indexOf('\n') + contentType.indexOf('\r') > -2; } + + static private void createAndSetExecutor(ProtocolHandler protocolHandler, String executorConfig) + { + Executor executor = new StandardThreadExecutor(); + if (executorConfig != null) + { + String[] ss = executorConfig.split(","); + for (int i = 0; i < ss.length; i++) + { + int pos = ss[i].indexOf('='); + setProperty(executor, ss[i].substring(0, pos).trim(), ss[i].substring(pos + 1).trim()); + } + } + + try + { + executor.start(); + } + catch (LifecycleException e) + { + log.warn("unable to start executor " + executor, e); + return; + } + + setProperty(protocolHandler, "executor", executor); + } public boolean event(Request req, Response res, SocketStatus status) throws Exception {

13 years, 7 months

1
0
0 / 0

JBoss Remoting SVN: r6322 - remoting2/branches/2.2/lib/jbossweb.

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

Author: ron.sigal(a)jboss.com Date: 2011-04-15 15:17:31 -0400 (Fri, 15 Apr 2011) New Revision: 6322 Added: remoting2/branches/2.2/lib/jbossweb/README Log: JBREM-1280, JBREM-1281: Added README file. Added: remoting2/branches/2.2/lib/jbossweb/README ===================================================================

13 years, 7 months

1
0
0 / 0

JBoss Remoting SVN: r6321 - remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/coyote.

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

Author: ron.sigal(a)jboss.com Date: 2011-04-15 15:13:03 -0400 (Fri, 15 Apr 2011) New Revision: 6321 Modified: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/coyote/SetAttributeTestCase.java Log: Added tests for configuration of executor. Modified: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/coyote/SetAttributeTestCase.java =================================================================== --- remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/coyote/SetAttributeTestCase.java 2011-04-14 16:02:00 UTC (rev 6320) +++ remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/coyote/SetAttributeTestCase.java 2011-04-15 19:13:03 UTC (rev 6321) @@ -31,6 +31,7 @@ import junit.framework.TestCase; +import org.apache.catalina.core.StandardThreadExecutor; import org.apache.coyote.http11.Http11Protocol; import org.apache.log4j.ConsoleAppender; import org.apache.log4j.Level; @@ -89,7 +90,7 @@ } - public void testSetExecutor() throws Throwable + public void testSetProperties() throws Throwable { log.info("entering " + getName()); @@ -106,7 +107,7 @@ log.info("Starting remoting server with locator uri of: " + locatorURI); HashMap config = new HashMap(); config.put(InvokerLocator.FORCE_REMOTE, "true"); - + // Attributes set directly on Http11Protocol config.put("maxSavePostSize", "3"); config.put("keepAlive", "false"); @@ -117,6 +118,12 @@ config.put("soTimeout", "7"); config.put("tcpNoDelay", "true"); config.put("address", InetAddress.getLocalHost()); + + // Executor + String s = "daemon=false,maxIdleTime=11, minSpareThreads =13,maxThreads = 17 ,"; + s += " name= test ,namePrefix=prefix,threadPriority=" + (Thread.NORM_PRIORITY + 1); + s += ", bogus=fake"; + config.put("executor", s); connector = new Connector(serverLocator, config); connector.create(); @@ -145,6 +152,23 @@ assertEquals(Boolean.TRUE, new Boolean(protocolHandler.getTcpNoDelay())); assertEquals(InetAddress.getLocalHost(), protocolHandler.getAddress()); + StandardThreadExecutor executor = (StandardThreadExecutor) protocolHandler.getExecutor(); + log.info("daemon: " + executor.isDaemon()); + log.info("maxIdleTime: " + executor.getMaxIdleTime()); + log.info("minSpareThreads: " + executor.getMinSpareThreads()); + log.info("maxThreads: " + executor.getMaxThreads()); + log.info("name: " + executor.getName()); + log.info("namePrefix: " + executor.getNamePrefix()); + log.info("threadPriority: " + executor.getThreadPriority()); + + assertFalse(executor.isDaemon()); + assertEquals(11, executor.getMaxIdleTime()); + assertEquals(13, executor.getMinSpareThreads()); + assertEquals(17, executor.getMaxThreads()); + assertEquals("test", executor.getName()); + assertEquals("prefix", executor.getNamePrefix()); + assertEquals(Thread.NORM_PRIORITY + 1, executor.getThreadPriority()); + if (connector != null) connector.stop(); log.info(getName() + " PASSES");

13 years, 7 months

1
0
0 / 0

JBoss Remoting SVN: r6320 - remoting2/branches/2.2.

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

Author: ron.sigal(a)jboss.com Date: 2011-04-14 12:02:00 -0400 (Thu, 14 Apr 2011) New Revision: 6320 Modified: remoting2/branches/2.2/build.xml Log: JBREM-1280, JBREM-1281: Eliminated http transports when using jdk 1.4. Modified: remoting2/branches/2.2/build.xml =================================================================== --- remoting2/branches/2.2/build.xml 2011-04-13 23:39:31 UTC (rev 6319) +++ remoting2/branches/2.2/build.xml 2011-04-14 16:02:00 UTC (rev 6320) @@ -189,7 +189,7 @@   <target name="compile" description="Compile all source files." depends="configure"> - + <echo>${java.runtime.version}</echo> <mkdir dir="${compile.dir}"/>  @@ -200,8 +200,19 @@ deprecation="on" optimize="off" includes="**/*.java" - failonerror="true"> + failonerror="true" + sourcepath=""> <src path="${src.dir}"/> + <exclude name="org/jboss/remoting/transport/coyote/**" if="isJDK4"/> + <exclude name="org/jboss/remoting/transport/http/HTTPServerInvoker.java" if="isJDK4"/> + <exclude name="org/jboss/remoting/transport/http/TransportServerFactory.java" if="isJDK4"/> + <exclude name="org/jboss/remoting/transport/http/ssl/HTTPSServerInvoker.java" if="isJDK4"/> + <exclude name="org/jboss/remoting/transport/https/HTTPSServerInvoker.java" if="isJDK4"/> + <exclude name="org/jboss/remoting/transport/https/TransportServerFactory.java" if="isJDK4"/> + <exclude name="org/jboss/remoting/transport/servlet/ServletServerInvoker.java" if="isJDK4"/> + <exclude name="org/jboss/remoting/transport/servlet/TransportServerFactory.java" if="isJDK4"/> + <exclude name="org/jboss/remoting/transport/sslservlet/TransportServerFactory.java" if="isJDK4"/> + <exclude name="org/jboss/remoting/transport/web/WebServerInvoker.java" if="isJDK4"/> <classpath refid="library.classpath"/> </javac> @@ -288,6 +299,13 @@ includes="**/*.java" failonerror="true"> <src path="${tests.src.dir}"/> + <include name="**/*.java"/> + <exclude name="org/jboss/test/remoting/**/coyote/**" if="isJDK4"/> + <exclude name="org/jboss/test/remoting/**/http/**" if="isJDK4"/> + <exclude name="org/jboss/test/remoting/**/*HTTP*" if="isJDK4"/> + <exclude name="org/jboss/test/remoting/**/*Http*" if="isJDK4"/> + <exclude name="org/jboss/test/remoting/**/https/**" if="isJDK4"/> + <exclude name="org/jboss/test/remoting/**/servlet/**" if="isJDK4"/> <classpath refid="tests.classpath"/> </javac> @@ -851,6 +869,12 @@ haltonfailure="no"> <fileset dir="${tests.compile.dir}"> <include name="**/remoting/**/*TestCase.class"/> + <exclude name="**/remoting/**/coyote/**/*TestCase.class"/> + <exclude name="**/remoting/**/coyote/**/*oyot*TestCase.class"/> + <exclude name="**/remoting/**/http/**/*TestCase.class"/> + <exclude name="**/remoting/**/*HTTP*TestCase.class"/> + <exclude name="**/remoting/**/*Http*TestCase.class"/> + <exclude name="**/remoting/**/*http*TestCase.class"/> <exclude name="**/remoting/**/ServerBindingTestCase.class"/> <exclude name="**/remoting/marshall/dynamic/remote/**/*TestCase.class"/> <exclude name="**/remoting/serialization/**/jboss/*TestCase.class"/> @@ -872,7 +896,7 @@ </batchtest> </junit> </target> - + <target name="tests.functional.serialization.java.http.core" unless="isJDK4"> <antcall target="tests.functional.http.jbossweb.core" inheritrefs="true"> <param name="serialization" value="java"/> @@ -894,7 +918,7 @@ <param name="version" value="jbossweb"/> </antcall> </target> - + <target name="tests.functional.main.http.core"> <mkdir dir="${output.tests.results}"/> <echo>http with ${version}: ${metadata}</echo> @@ -922,12 +946,14 @@ <batchtest fork="yes" todir="${output.tests.results}" haltonfailure="no"> <fileset dir="${tests.compile.dir}"> + <include name="**/remoting/**/coyote/**/*TestCase.class"/> + <include name="**/remoting/**/coyote/**/*oyot*TestCase.class"/> <include name="**/remoting/**/http/**/*TestCase.class"/> <include name="**/remoting/**/*HTTP*TestCase.class"/> <include name="**/remoting/**/*Http*TestCase.class"/> <include name="**/remoting/**/*http*TestCase.class"/> <exclude name="**/remoting/**/HTTPSAsynchCallbackTestCase.class"/> - <exclude name="**/remoting/**/HTTPInvokerClientTestCase.class"/> + <exclude name="**/remoting/**/HTTPInvokerClientTestCase.class"/> <exclude name="**/remoting/transport/http/compression/*CompressedHTTPInvokerTestCase*"/> <exclude name="**/remoting/**/performance/**"/> <exclude name="**/remoting/**/nonserializable/**"/> @@ -1110,7 +1136,7 @@ <condition property="isJDK5"> <or> <equals arg1="${ant.java.version}" arg2="1.5"/> - <equals arg1="${ant.java.version}" arg2="1.6"/> + <equals arg1="${ant.java.version}" arg2="1.6"/> </or> </condition> <condition property="isJDK4"> @@ -1773,7 +1799,7 @@ <param name="clientImplementsServerIdentity" value="true"/> <param name="serverImplementsServerIdentity" value="false"/> </antcall> - +   <antcall target="tests.versioning.all_transports" inheritrefs="true">

13 years, 7 months

1
0
0 / 0

Newsletter Thu, 14 Apr 2011 02:03:34 -0300

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

Hello! Do you want an extraordinary future, increase in money, and the praise of all? Today only: We can assist with Diplomas from prestigious universities based on your present knowledge and professional experience. Get a Degree in 6 weeks with our program! ~Our program will help ANYONE with professional experience get a 100% verified Degree: ~Doctorate ~Bachelors ~Masters - Think about it... - Follow YOUR Dreams! - Live a wonderful life by earning or upgrading your degree. This is a nice way to make a right move and receive your due benefits... if you are qualified but are lacking that piece of paper. Get one from us in a fraction of the time. Call Us to start improving your life! ~CALL US~ 1-310-205-2502 You should leave us a message with your phone number with country code if outside USA and name and we'll contact you as soon as possible. It is your move... Make the right move. Best regards. Do Not Reply to this Email. We do not reply to text inquiries, and our server will reject all response traffic. We apologize for any inconvenience this may have caused you.

13 years, 7 months

1
0
0 / 0

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

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

Author: ron.sigal(a)jboss.com Date: 2011-04-13 19:39:31 -0400 (Wed, 13 Apr 2011) New Revision: 6319 Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/transport/coyote/CoyoteInvoker.java Log: JBREM-1281: In setProperty(), added test for setAttribute() and setProperty() to for loop. Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/transport/coyote/CoyoteInvoker.java =================================================================== --- remoting2/branches/2.2/src/main/org/jboss/remoting/transport/coyote/CoyoteInvoker.java 2011-04-13 20:56:55 UTC (rev 6318) +++ remoting2/branches/2.2/src/main/org/jboss/remoting/transport/coyote/CoyoteInvoker.java 2011-04-13 23:39:31 UTC (rev 6319) @@ -1038,6 +1038,15 @@ return true; } } + // save "setProperty" for later + if ("setAttribute".equals(methods[i].getName())) + { + setAttributeMethod = methods[i]; + } + else if("setProperty".equals(methods[i].getName())) + { + setPropertyMethod = methods[i]; + } } } else

13 years, 7 months

1
0
0 / 0

JBoss Remoting SVN: r6318 - remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/http.

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

Author: ron.sigal(a)jboss.com Date: 2011-04-13 16:56:55 -0400 (Wed, 13 Apr 2011) New Revision: 6318 Modified: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/http/EmptyURITestCase.java Log: JBREM-1280: Changed expected message to be compatible with JBossWeb. Modified: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/http/EmptyURITestCase.java =================================================================== --- remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/http/EmptyURITestCase.java 2011-04-13 20:55:26 UTC (rev 6317) +++ remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/http/EmptyURITestCase.java 2011-04-13 20:56:55 UTC (rev 6318) @@ -120,7 +120,7 @@ catch (CannotConnectException e) { String message = e.getMessage(); - assertTrue("expected CannotConnectException message to contain \"Invalid URI\"", message != null && message.indexOf("Invalid URI") > 0); + assertTrue("expected CannotConnectException message to contain response code \"400\"", message != null && message.indexOf("400") > 0); log.info("got expected CannotConnectException"); } catch (Throwable t)

13 years, 7 months

1
0
0 / 0

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

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

Author: ron.sigal(a)jboss.com Date: 2011-04-13 16:55:26 -0400 (Wed, 13 Apr 2011) New Revision: 6317 Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/transport/coyote/ssl/RemotingSSLImplementation.java Log: JBREM-1280: Added overloaded getSSLSupport() method to be compatible with JBossWeb. Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/transport/coyote/ssl/RemotingSSLImplementation.java =================================================================== --- remoting2/branches/2.2/src/main/org/jboss/remoting/transport/coyote/ssl/RemotingSSLImplementation.java 2011-04-13 20:39:04 UTC (rev 6316) +++ remoting2/branches/2.2/src/main/org/jboss/remoting/transport/coyote/ssl/RemotingSSLImplementation.java 2011-04-13 20:55:26 UTC (rev 6317) @@ -26,6 +26,7 @@ import java.util.HashMap; import java.util.Map; import javax.management.MBeanServer; +import javax.net.ssl.SSLSession; import javax.net.ssl.SSLSocket; import org.apache.tomcat.util.net.SSLImplementation; import org.apache.tomcat.util.net.SSLSupport; @@ -63,4 +64,9 @@ { mbeanServerMap.put(locator, mBeanServer); } + + public SSLSupport getSSLSupport(SSLSession arg0) + { + return null; + } } \ No newline at end of file

13 years, 7 months

1
0
0 / 0

JBoss Remoting SVN: r6316 - remoting2/branches/2.2.

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

Author: ron.sigal(a)jboss.com Date: 2011-04-13 16:39:04 -0400 (Wed, 13 Apr 2011) New Revision: 6316 Modified: remoting2/branches/2.2/build.xml Log: JBREM-1280: Broke out http tests since JBossWeb depends on jdk1.5. Modified: remoting2/branches/2.2/build.xml =================================================================== --- remoting2/branches/2.2/build.xml 2011-04-13 20:36:28 UTC (rev 6315) +++ remoting2/branches/2.2/build.xml 2011-04-13 20:39:04 UTC (rev 6316) @@ -682,8 +682,10 @@ </target> <target name="tests.functional.core" depends="configure"> -  + <antcall target="tests.functional.serialization.java.core" inheritrefs="true"/> + <antcall target="tests.functional.serialization.java.http.core" inheritrefs="true"/> <antcall target="tests.functional.serialization.jboss.core" inheritrefs="true"/> + <antcall target="tests.functional.serialization.jboss.http.core" inheritrefs="true"/> </target>  @@ -821,6 +823,7 @@ </target> <target name="tests.functional.main.core" depends="tests.jars"> + <echo>bisocket/rmi/socket: ${metadata}</echo> <mkdir dir="${output.tests.results}"/> <junit printsummary="true" fork="yes" includeantruntime="true"> <jvmarg value="-Dloader.path=${output.lib.dir}/jboss-remoting-loading-tests.jar"/> @@ -869,6 +872,71 @@ </batchtest> </junit> </target> + + <target name="tests.functional.serialization.java.http.core" unless="isJDK4"> + <antcall target="tests.functional.http.jbossweb.core" inheritrefs="true"> + <param name="serialization" value="java"/> + </antcall> + </target> + + <target name="tests.functional.serialization.jboss.http.core" unless="isJDK4"> + <antcall target="tests.functional.http.jbossweb.core" inheritrefs="true"> + <param name="serialization" value="jboss"/> + </antcall> + </target> + + <target name="tests.functional.http.jbossweb.core" unless="isJDK4"> + <antcall target="tests.functional.main.http.core" inheritrefs="true"> + <param name="remoting.metadata.key" value="remoting.metadata"/> + <param name="metadata" value="serializationtype=${serialization}"/> + <param name="jboss-junit-configuration" value="${serialization}_serialization_jbossweb"/> + <param name="classpath" value="tests.classpath"/> + <param name="version" value="jbossweb"/> + </antcall> + </target> + + <target name="tests.functional.main.http.core"> + <mkdir dir="${output.tests.results}"/> + <echo>http with ${version}: ${metadata}</echo> + <junit printsummary="true" fork="yes" includeantruntime="true" maxmemory="1024m"> + <jvmarg value="-Dloader.path=${output.lib.dir}/jboss-remoting-loading-tests.jar"/> + <jvmarg value="-D${remoting.metadata.key}=${metadata}"/> + <classpath> + <path refid="${classpath}"/> + <pathelement location="${output.lib.dir}/jboss-remoting-tests.jar"/> + </classpath> +  + <sysproperty key="jrunit.bind_addr" value="${bind.address}"/> + <sysproperty key="jrunit.mcast_addr" value="${multicast.address}"/> + <sysproperty key="jrunit.mcast_port" value="${multicast.port}"/> + <sysproperty key="jrunit.receive_on_all_interfaces" value="${receiveOnAllInterfaces}"/> + <sysproperty key="jrunit.send_on_all_interfaces" value="${sendOnAllInterfaces}"/> + <sysproperty key="jrunit.send_interfaces" value="${sendInterfaces}"/> + <sysproperty key="jrunit.logdir" value="${output.tests}"/> + <sysproperty key="remoting.jar.dir" value="${basedir}/output/lib"/> + <sysproperty key="ant.library.dir" value="${ant.library.dir}"/> + <sysproperty key="build.home" value="${basedir}"/> + <sysproperty key="jboss-junit-configuration" value="${jboss-junit-configuration}"/> + <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" + extension="-${jboss-junit-configuration}.xml"/> + <batchtest fork="yes" todir="${output.tests.results}" + haltonfailure="no"> + <fileset dir="${tests.compile.dir}"> + <include name="**/remoting/**/http/**/*TestCase.class"/> + <include name="**/remoting/**/*HTTP*TestCase.class"/> + <include name="**/remoting/**/*Http*TestCase.class"/> + <include name="**/remoting/**/*http*TestCase.class"/> + <exclude name="**/remoting/**/HTTPSAsynchCallbackTestCase.class"/> + <exclude name="**/remoting/**/HTTPInvokerClientTestCase.class"/> + <exclude name="**/remoting/transport/http/compression/*CompressedHTTPInvokerTestCase*"/> + <exclude name="**/remoting/**/performance/**"/> + <exclude name="**/remoting/**/nonserializable/**"/> + <exclude name="**/remoting/marshall/dynamic/remote/**/*TestCase.class"/> + <exclude name="**/remoting/versioning/**/*TestCase.class"/> + </fileset> + </batchtest> + </junit> + </target> <target name="tests.functional.main.isJDK5" depends="tests.jars" if="isJDK5"> <mkdir dir="${output.tests.results}"/> @@ -1045,6 +1113,9 @@ <equals arg1="${ant.java.version}" arg2="1.6"/> </or> </condition> + <condition property="isJDK4"> + <contains string="${java.runtime.version}" substring="1.4"/> + </condition> </target>

13 years, 7 months

1
0
0 / 0

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

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

Author: ron.sigal(a)jboss.com Date: 2011-04-13 16:36:28 -0400 (Wed, 13 Apr 2011) New Revision: 6315 Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/transport/coyote/CoyoteInvoker.java Log: JBREM-1280: Added event() method to be compatible with JBossWeb; JBREM-1281: Changed setProperty() to handle Object values. Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/transport/coyote/CoyoteInvoker.java =================================================================== --- remoting2/branches/2.2/src/main/org/jboss/remoting/transport/coyote/CoyoteInvoker.java 2011-04-13 20:32:10 UTC (rev 6314) +++ remoting2/branches/2.2/src/main/org/jboss/remoting/transport/coyote/CoyoteInvoker.java 2011-04-13 20:36:28 UTC (rev 6315) @@ -21,11 +21,13 @@ import org.apache.coyote.Adapter; import org.apache.coyote.ProtocolHandler; import org.apache.coyote.Request; +import org.apache.coyote.Response; import org.apache.tomcat.util.buf.B2CConverter; import org.apache.tomcat.util.buf.ByteChunk; import org.apache.tomcat.util.buf.CharChunk; import org.apache.tomcat.util.buf.MessageBytes; import org.apache.tomcat.util.http.MimeHeaders; +import org.apache.tomcat.util.net.SocketStatus; import org.jboss.remoting.InvocationRequest; import org.jboss.remoting.InvocationResponse; import org.jboss.remoting.InvokerLocator; @@ -160,11 +162,7 @@ { String key = (String) keys.next(); Object obj = config.get(key); - if (obj instanceof String) - { - String val = (String) obj; - setProperty(protocolHandler, key, val); - } + setProperty(protocolHandler, key, obj); } // need to convert standard remoting timeout config to tomcat timeout @@ -954,7 +952,7 @@ * int or boolean we'll convert value to the right type before) - that means * you can have setDebug(1). */ - public static boolean setProperty(Object o, String name, String value) + public static boolean setProperty(Object o, String name, Object value) { String setter = "set" + capitalize(name); @@ -962,102 +960,116 @@ { Method methods[] = o.getClass().getMethods(); Method setPropertyMethod = null; + Method setAttributeMethod = null; - // First, the ideal case - a setFoo( String ) method - for(int i = 0; i < methods.length; i++) + // Try a setFoo( String) or setFoo ( int ) or ( boolean ) + if (value instanceof String) { - Class paramT[] = methods[i].getParameterTypes(); - if(setter.equals(methods[i].getName()) && paramT.length == 1 - && "java.lang.String".equals(paramT[0].getName())) + String stringValue = (String) value; + for(int i = 0; i < methods.length; i++) { + boolean ok = true; + if(setter.equals(methods[i].getName()) + && methods[i].getParameterTypes().length == 1) + { - methods[i].invoke(o, new Object[]{value}); - return true; - } - } + // match - find the type and invoke it + Class paramType = methods[i].getParameterTypes()[0]; + Object params[] = new Object[1]; - // Try a setFoo ( int ) or ( boolean ) - for(int i = 0; i < methods.length; i++) - { - boolean ok = true; - if(setter.equals(methods[i].getName()) - && methods[i].getParameterTypes().length == 1) - { - - // match - find the type and invoke it - Class paramType = methods[i].getParameterTypes()[0]; - Object params[] = new Object[1]; - - // Try a setFoo ( int ) - if("java.lang.Integer".equals(paramType.getName()) - || "int".equals(paramType.getName())) - { - try + // Try a setFoo ( String ) + if("java.lang.String".equals(paramType.getName())) { - params[0] = new Integer(value); + params[0] = stringValue; } - catch(NumberFormatException ex) + // Try a setFoo ( int ) + else if("java.lang.Integer".equals(paramType.getName()) + || "int".equals(paramType.getName())) { - ok = false; + try + { + params[0] = new Integer(stringValue); + } + catch(NumberFormatException ex) + { + ok = false; + } + // Try a setFoo ( long ) } - // Try a setFoo ( long ) - } - else if("java.lang.Long".equals(paramType.getName()) - || "long".equals(paramType.getName())) - { - try + else if("java.lang.Long".equals(paramType.getName()) + || "long".equals(paramType.getName())) { - params[0] = new Long(value); + try + { + params[0] = new Long(stringValue); + } + catch(NumberFormatException ex) + { + ok = false; + } + + // Try a setFoo ( boolean ) } - catch(NumberFormatException ex) + else if("java.lang.Boolean".equals(paramType.getName()) + || "boolean".equals(paramType.getName())) { - ok = false; + params[0] = new Boolean(stringValue); + + // Try a setFoo ( InetAddress ) } + else if("java.net.InetAddress".equals(paramType + .getName())) + { + try + { + params[0] = InetAddress.getByName(stringValue); + } + catch(UnknownHostException exc) + { + ok = false; + } - // Try a setFoo ( boolean ) - } - else if("java.lang.Boolean".equals(paramType.getName()) - || "boolean".equals(paramType.getName())) - { - params[0] = new Boolean(value); + // Unknown type + } - // Try a setFoo ( InetAddress ) - } - else if("java.net.InetAddress".equals(paramType - .getName())) - { - try + if(ok) { - params[0] = InetAddress.getByName(value); + methods[i].invoke(o, params); + return true; } - catch(UnknownHostException exc) - { - ok = false; - } - - // Unknown type } - - if(ok) + } + } + else + { + for(int i = 0; i < methods.length; i++) + { + // save "setProperty" for later + if ("setAttribute".equals(methods[i].getName())) { - methods[i].invoke(o, params); - return true; + setAttributeMethod = methods[i]; } + else if("setProperty".equals(methods[i].getName())) + { + setPropertyMethod = methods[i]; + } } - - // save "setProperty" for later - if("setProperty".equals(methods[i].getName())) - { - setPropertyMethod = methods[i]; - } } - // Ok, no setXXX found, try a setProperty("name", "value") - if(setPropertyMethod != null) + // Ok, no setXXX found, try a setProperty("name", "value") or setAttribute("name", "value") + if(setAttributeMethod != null) { Object params[] = new Object[2]; params[0] = name; params[1] = value; + setAttributeMethod.invoke(o, params); + return true; + } + else if(setPropertyMethod != null) + { + Object params[] = new Object[2]; + params[0] = name; + params[1] = value; setPropertyMethod.invoke(o, params); return true; } @@ -1089,4 +1101,9 @@ { return contentType.indexOf('\n') + contentType.indexOf('\r') > -2; } + + public boolean event(Request req, Response res, SocketStatus status) throws Exception + { + return false; + } }

13 years, 7 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 April 2011