jboss-remoting-commits November 2011

jboss-remoting-commits@lists.jboss.org

1 participants
15 discussions

JBoss Remoting SVN: r6412 - remoting2/branches/2.x/src/main/org/jboss/remoting/transport/web.

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

Author: ron.sigal(a)jboss.com Date: 2011-11-22 12:55:58 -0500 (Tue, 22 Nov 2011) New Revision: 6412 Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/transport/web/WebUtil.java Log: JBREM-1301: Convert content-type to lower case before comparison. Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/transport/web/WebUtil.java =================================================================== --- remoting2/branches/2.x/src/main/org/jboss/remoting/transport/web/WebUtil.java 2011-11-22 17:54:53 UTC (rev 6411) +++ remoting2/branches/2.x/src/main/org/jboss/remoting/transport/web/WebUtil.java 2011-11-22 17:55:58 UTC (rev 6412) @@ -36,7 +36,7 @@ public static boolean isBinary(String requestContentType) { - if (requestContentType != null && requestContentType.startsWith(BINARY)) + if (requestContentType != null && requestContentType.toLowerCase().startsWith(BINARY)) { return true; }

13 years, 1 month

1
0
0 / 0

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

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

Author: ron.sigal(a)jboss.com Date: 2011-11-22 12:54:53 -0500 (Tue, 22 Nov 2011) New Revision: 6411 Added: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/http/marshal/ContentTypePrefixTestCase.java Log: JBREM-1301: New unit test. Added: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/http/marshal/ContentTypePrefixTestCase.java =================================================================== --- remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/http/marshal/ContentTypePrefixTestCase.java (rev 0) +++ remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/http/marshal/ContentTypePrefixTestCase.java 2011-11-22 17:54:53 UTC (rev 6411) @@ -0,0 +1,166 @@ +/* +* JBoss, Home of Professional Open Source +* Copyright 2009, 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.http.marshal; + +import java.net.InetAddress; +import java.util.HashMap; +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.transport.Connector; +import org.jboss.remoting.transport.PortUtil; + + +/** + * Unit test for JBREM-1301 + * + * @author <a href="ron.sigal(a)jboss.com">Ron Sigal</a> + * @version + * @version $Rev$, $Date$ + */ +public class ContentTypePrefixTestCase extends TestCase +{ + private static Logger log = Logger.getLogger(ContentTypePrefixTestCase.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 testContentType() throws Throwable + { + log.info("entering " + getName()); + + // Start server. + setupServer(); + + // Create client. + InvokerLocator clientLocator = new InvokerLocator(locatorURI); + HashMap clientConfig = new HashMap(); + clientConfig.put(InvokerLocator.FORCE_REMOTE, "true"); + addExtraClientConfig(clientConfig); + Client client = new Client(clientLocator, clientConfig); + client.connect(); + log.info("client is connected"); + + // Test connection. + assertEquals("abc", client.invoke("abc")); + log.info("connection is good"); + + client.disconnect(); + shutdownServer(); + log.info(getName() + " PASSES"); + } + + + protected String getTransport() + { + return "http"; + } + + + 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; + 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(); + } + + + 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 + { + // Adding some upper case characters for test. + invocation.getReturnPayload().put("Content-Type", "Application/Octet-stream?charSet=UTF-8"); + return invocation.getParameter(); + } + public void removeListener(InvokerCallbackHandler callbackHandler) {} + public void setMBeanServer(MBeanServer server) {} + public void setInvoker(ServerInvoker invoker) {} + } +} \ No newline at end of file

13 years, 1 month

1
0
0 / 0

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

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

Author: ron.sigal(a)jboss.com Date: 2011-11-22 12:54:20 -0500 (Tue, 22 Nov 2011) New Revision: 6410 Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/transport/web/WebUtil.java Log: JBREM-1301: Tests for prefix of content-type instead of equality. Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/transport/web/WebUtil.java =================================================================== --- remoting2/branches/2.2/src/main/org/jboss/remoting/transport/web/WebUtil.java 2011-11-22 17:42:22 UTC (rev 6409) +++ remoting2/branches/2.2/src/main/org/jboss/remoting/transport/web/WebUtil.java 2011-11-22 17:54:20 UTC (rev 6410) @@ -36,7 +36,7 @@ public static boolean isBinary(String requestContentType) { - if(BINARY.equalsIgnoreCase(requestContentType)) + if (requestContentType != null && requestContentType.toLowerCase().startsWith(BINARY)) { return true; }

13 years, 1 month

1
0
0 / 0

JBoss Remoting SVN: r6409 - remoting2/branches/2.x/src/main/org/jboss/remoting/transport/web.

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

Author: ron.sigal(a)jboss.com Date: 2011-11-22 12:42:22 -0500 (Tue, 22 Nov 2011) New Revision: 6409 Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/transport/web/WebUtil.java Log: JBREM-1301: Tests for prefix of content-type instead of equality. Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/transport/web/WebUtil.java =================================================================== --- remoting2/branches/2.x/src/main/org/jboss/remoting/transport/web/WebUtil.java 2011-11-22 17:41:20 UTC (rev 6408) +++ remoting2/branches/2.x/src/main/org/jboss/remoting/transport/web/WebUtil.java 2011-11-22 17:42:22 UTC (rev 6409) @@ -36,7 +36,7 @@ public static boolean isBinary(String requestContentType) { - if(BINARY.equalsIgnoreCase(requestContentType)) + if (requestContentType != null && requestContentType.startsWith(BINARY)) { return true; }

13 years, 1 month

1
0
0 / 0

JBoss Remoting SVN: r6408 - remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/http/marshal.

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

Author: ron.sigal(a)jboss.com Date: 2011-11-22 12:41:20 -0500 (Tue, 22 Nov 2011) New Revision: 6408 Added: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/http/marshal/ContentTypePrefixTestCase.java Log: JBREM-1301: New unit test. Added: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/http/marshal/ContentTypePrefixTestCase.java =================================================================== --- remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/http/marshal/ContentTypePrefixTestCase.java (rev 0) +++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/http/marshal/ContentTypePrefixTestCase.java 2011-11-22 17:41:20 UTC (rev 6408) @@ -0,0 +1,165 @@ +/* +* JBoss, Home of Professional Open Source +* Copyright 2009, 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.http.marshal; + +import java.net.InetAddress; +import java.util.HashMap; +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.transport.Connector; +import org.jboss.remoting.transport.PortUtil; + + +/** + * Unit test for JBREM-1301 + * + * @author <a href="ron.sigal(a)jboss.com">Ron Sigal</a> + * @version + * @version $Rev$, $Date$ + */ +public class ContentTypePrefixTestCase extends TestCase +{ + private static Logger log = Logger.getLogger(ContentTypePrefixTestCase.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 testContentType() throws Throwable + { + log.info("entering " + getName()); + + // Start server. + setupServer(); + + // Create client. + InvokerLocator clientLocator = new InvokerLocator(locatorURI); + HashMap clientConfig = new HashMap(); + clientConfig.put(InvokerLocator.FORCE_REMOTE, "true"); + addExtraClientConfig(clientConfig); + Client client = new Client(clientLocator, clientConfig); + client.connect(); + log.info("client is connected"); + + // Test connection. + assertEquals("abc", client.invoke("abc")); + log.info("connection is good"); + + client.disconnect(); + shutdownServer(); + log.info(getName() + " PASSES"); + } + + + protected String getTransport() + { + return "http"; + } + + + 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; + 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(); + } + + + 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 + { + invocation.getReturnPayload().put("Content-Type", "application/octet-stream?charSet=UTF-8"); + return invocation.getParameter(); + } + public void removeListener(InvokerCallbackHandler callbackHandler) {} + public void setMBeanServer(MBeanServer server) {} + public void setInvoker(ServerInvoker invoker) {} + } +} \ No newline at end of file

13 years, 1 month

1
0
0 / 0

← Newer
1
2
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

jboss-remoting-commits November 2011