June 2011 - jboss-remoting-commits

JBoss Remoting SVN: r6390 - in remoting2/branches/2.5.3.SP1_JBREM-1245: src/main/org/jboss/remoting/transport/socket and 1 other directory.

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

Author: jbertram(a)redhat.com Date: 2011-06-24 17:24:52 -0400 (Fri, 24 Jun 2011) New Revision: 6390 Modified: remoting2/branches/2.5.3.SP1_JBREM-1245/ remoting2/branches/2.5.3.SP1_JBREM-1245/src/main/org/jboss/remoting/transport/socket/MicroSocketClientInvoker.java Log: JBPAPP-6767 Property changes on: remoting2/branches/2.5.3.SP1_JBREM-1245 ___________________________________________________________________ Modified: svn:mergeinfo - /remoting2/branches/2.x:6108-6110,6112 + /remoting2/branches/2.x:6107-6110,6112 Modified: remoting2/branches/2.5.3.SP1_JBREM-1245/src/main/org/jboss/remoting/transport/socket/MicroSocketClientInvoker.java =================================================================== --- remoting2/branches/2.5.3.SP1_JBREM-1245/src/main/org/jboss/remoting/transport/socket/MicroSocketClientInvoker.java 2011-06-24 21:22:29 UTC (rev 6389) +++ remoting2/branches/2.5.3.SP1_JBREM-1245/src/main/org/jboss/remoting/transport/socket/MicroSocketClientInvoker.java 2011-06-24 21:24:52 UTC (rev 6390) @@ -139,7 +139,7 @@ public static long serializeTime = 0; public static long deserializeTime = 0; - private static final String patternString = "^.*(?:connection.*reset|connection.*closed|broken.*pipe).*$"; + private static final String patternString = "^.*(?:connection.*reset|connection.*closed|broken.*pipe|connection.*shutdown).*$"; private static final Pattern RETRIABLE_ERROR_MESSAGE = Pattern.compile(patternString, Pattern.CASE_INSENSITIVE); /**

13 years, 5 months

1
0
0 / 0

JBoss Remoting SVN: r6389 - in remoting2/branches/2.5.3.SP1_JBREM-1245: src/tests/org/jboss/test/remoting/transport/http/marshal and 10 other directories.

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

Author: jbertram(a)redhat.com Date: 2011-06-24 17:22:29 -0400 (Fri, 24 Jun 2011) New Revision: 6389 Added: remoting2/branches/2.5.3.SP1_JBREM-1245/src/tests/org/jboss/test/remoting/transport/socket/retriable/ remoting2/branches/2.5.3.SP1_JBREM-1245/src/tests/org/jboss/test/remoting/transport/socket/retriable/SocketGeneralizedExceptionTestCase.java Removed: remoting2/branches/2.5.3.SP1_JBREM-1245/src/tests/org/jboss/test/remoting/transport/socket/retriable/SocketGeneralizedExceptionTestCase.java Modified: remoting2/branches/2.5.3.SP1_JBREM-1245/ remoting2/branches/2.5.3.SP1_JBREM-1245/src/tests/org/jboss/test/remoting/transport/http/marshal/HttpContentTypeTestCase.java remoting2/branches/2.5.3.SP1_JBREM-1245/src/tests/org/jboss/test/remoting/transport/servlet/mbeanserver/jboss/MBeanServerJBossTestClient.java remoting2/branches/2.5.3.SP1_JBREM-1245/src/tests/org/jboss/test/remoting/transport/servlet/mbeanserver/platform/MBeanServerPlatformTestClient.java remoting2/branches/2.5.3.SP1_JBREM-1245/src/tests/org/jboss/test/remoting/transport/servlet/multihome/remoting-servlet-service.xml remoting2/branches/2.5.3.SP1_JBREM-1245/src/tests/org/jboss/test/remoting/transport/servlet/nopreservelines/remoting-servlet-service.xml remoting2/branches/2.5.3.SP1_JBREM-1245/src/tests/org/jboss/test/remoting/transport/servlet/preservelines/remoting-servlet-service.xml remoting2/branches/2.5.3.SP1_JBREM-1245/src/tests/org/jboss/test/remoting/transport/servlet/remoting-servlet-service.xml remoting2/branches/2.5.3.SP1_JBREM-1245/src/tests/org/jboss/test/remoting/transport/servlet/ssl/keystore remoting2/branches/2.5.3.SP1_JBREM-1245/src/tests/org/jboss/test/remoting/transport/servlet/ssl/remoting-servlet-service.xml remoting2/branches/2.5.3.SP1_JBREM-1245/src/tests/org/jboss/test/remoting/transport/servlet/ssl/truststore remoting2/branches/2.5.3.SP1_JBREM-1245/src/tests/org/jboss/test/remoting/transport/socket/ssl/timeout/SSLSocketWriteTimeoutTestCase.java Log: JBPAPP-6767 Property changes on: remoting2/branches/2.5.3.SP1_JBREM-1245 ___________________________________________________________________ Added: svn:mergeinfo + /remoting2/branches/2.x:6108-6110,6112 Property changes on: remoting2/branches/2.5.3.SP1_JBREM-1245/src/tests/org/jboss/test/remoting/transport/http/marshal/HttpContentTypeTestCase.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: remoting2/branches/2.5.3.SP1_JBREM-1245/src/tests/org/jboss/test/remoting/transport/servlet/mbeanserver/jboss/MBeanServerJBossTestClient.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: remoting2/branches/2.5.3.SP1_JBREM-1245/src/tests/org/jboss/test/remoting/transport/servlet/mbeanserver/platform/MBeanServerPlatformTestClient.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: remoting2/branches/2.5.3.SP1_JBREM-1245/src/tests/org/jboss/test/remoting/transport/servlet/multihome/remoting-servlet-service.xml ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: remoting2/branches/2.5.3.SP1_JBREM-1245/src/tests/org/jboss/test/remoting/transport/servlet/nopreservelines/remoting-servlet-service.xml ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: remoting2/branches/2.5.3.SP1_JBREM-1245/src/tests/org/jboss/test/remoting/transport/servlet/preservelines/remoting-servlet-service.xml ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: remoting2/branches/2.5.3.SP1_JBREM-1245/src/tests/org/jboss/test/remoting/transport/servlet/remoting-servlet-service.xml ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: remoting2/branches/2.5.3.SP1_JBREM-1245/src/tests/org/jboss/test/remoting/transport/servlet/ssl/keystore ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: remoting2/branches/2.5.3.SP1_JBREM-1245/src/tests/org/jboss/test/remoting/transport/servlet/ssl/remoting-servlet-service.xml ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: remoting2/branches/2.5.3.SP1_JBREM-1245/src/tests/org/jboss/test/remoting/transport/servlet/ssl/truststore ___________________________________________________________________ Deleted: svn:mergeinfo - Deleted: remoting2/branches/2.5.3.SP1_JBREM-1245/src/tests/org/jboss/test/remoting/transport/socket/retriable/SocketGeneralizedExceptionTestCase.java =================================================================== --- remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/socket/retriable/SocketGeneralizedExceptionTestCase.java 2010-09-24 01:33:38 UTC (rev 6110) +++ remoting2/branches/2.5.3.SP1_JBREM-1245/src/tests/org/jboss/test/remoting/transport/socket/retriable/SocketGeneralizedExceptionTestCase.java 2011-06-24 21:22:29 UTC (rev 6389) @@ -1,341 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2010, 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.socket.retriable; - -import java.io.IOException; -import java.io.OutputStream; -import java.net.InetAddress; -import java.net.Socket; -import java.net.UnknownHostException; -import java.util.HashMap; -import java.util.Map; - -import javax.management.MBeanServer; -import javax.net.SocketFactory; -import javax.net.ssl.SSLException; - -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.Remoting; -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-1245. - * - * @author <a href="mailto:ron.sigal@jboss.com">Ron Sigal</a> - * @version $Rev$ - * - * Copyright Sep 22, 2010 - * - */ -public class SocketGeneralizedExceptionTestCase extends TestCase -{ - private static Logger log = Logger.getLogger(SocketGeneralizedExceptionTestCase.class); - - private static boolean firstTime = true; - protected static IOException exceptionToThrow; - - 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.TRACE); - 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); - } - - TestOutputStream.counter = 0; - TestOutputStream.threwException = false; - } - - - public void tearDown() - { - } - - - public void testSSLException() throws Throwable - { - log.info("entering " + getName()); - exceptionToThrow = new SSLException("Connection has been shutdown"); - doTest(); - log.info(getName() + " PASSES"); - } - - - public void testConnectionResetException() throws Throwable - { - log.info("entering " + getName()); - exceptionToThrow = new IOException("Connection reset by peer"); - doTest(); - log.info(getName() + " PASSES"); - } - - - public void testConnectionClosedException() throws Throwable - { - log.info("entering " + getName()); - exceptionToThrow = new IOException("Connection is closed"); - doTest(); - log.info(getName() + " PASSES"); - } - - - public void testBrokenPipeException() throws Throwable - { - log.info("entering " + getName()); - exceptionToThrow = new IOException("Broken pipe"); - doTest(); - log.info(getName() + " PASSES"); - } - - - protected void doTest() throws Throwable - { - // Start server. - setupServer(); - - // Create client. - InvokerLocator clientLocator = new InvokerLocator(locatorURI); - HashMap clientConfig = new HashMap(); - clientConfig.put(InvokerLocator.FORCE_REMOTE, "true"); - clientConfig.put(Remoting.CUSTOM_SOCKET_FACTORY, new TestSocketFactory(2)); - addExtraClientConfig(clientConfig); - Client client = new Client(clientLocator, clientConfig); - client.connect(); - log.info("client is connected"); - - // Verify invocation works in spite of exception. - assertEquals("xyz", client.invoke("xyz")); - assertTrue(TestOutputStream.threwException); - - client.disconnect(); - shutdownServer(); - } - - - protected String getTransport() - { - return "socket"; - } - - protected void addExtraServerConfig(Map config) {} - protected void addExtraClientConfig(Map config) {} - - - protected void setupServer() throws Exception - { - host = InetAddress.getLocalHost().getHostAddress(); - port = PortUtil.findFreePort(host); - locatorURI = getTransport() + "://" + host + ":" + port + "/?generalizeSocketException=true"; - 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 - { - return invocation.getParameter(); - } - public void removeListener(InvokerCallbackHandler callbackHandler) {} - public void setMBeanServer(MBeanServer server) {} - public void setInvoker(ServerInvoker invoker) {} - } - - - public static class TestSocketFactory extends SocketFactory - { - int initialSuccesses = 1; - - public TestSocketFactory() - { - } - public TestSocketFactory(int initialSuccesses) - { - this.initialSuccesses = initialSuccesses; - } - public Socket createSocket() - { - Socket s = new TestSocket(initialSuccesses); - log.info("returning " + s); - return s; - } - public Socket createSocket(String arg0, int arg1) throws IOException, UnknownHostException - { - Socket s = new TestSocket(arg0, arg1, initialSuccesses); - log.info("returning " + s); - return s; - } - - public Socket createSocket(InetAddress arg0, int arg1) throws IOException - { - Socket s = new TestSocket(arg0, arg1, initialSuccesses); - log.info("returning " + s); - return s; - } - - public Socket createSocket(String arg0, int arg1, InetAddress arg2, int arg3) throws IOException, UnknownHostException - { - Socket s = new TestSocket(arg0, arg1, arg2, arg3, initialSuccesses); - log.info("returning " + s); - return s; - } - - public Socket createSocket(InetAddress arg0, int arg1, InetAddress arg2, int arg3) throws IOException - { - Socket s = new TestSocket(arg0, arg1, arg2, arg3, initialSuccesses); - log.info("returning " + s); - return s; - } - } - - - static class TestSocket extends Socket - { - int initialSuccesses; - - public TestSocket(int initialWrites) - { - this.initialSuccesses = initialWrites; - } - public TestSocket(String host, int port, int initialWrites) throws UnknownHostException, IOException - { - super(host, port); - this.initialSuccesses = initialWrites; - } - public TestSocket(InetAddress address, int port, int initialWrites) throws IOException - { - super(address, port); - this.initialSuccesses = initialWrites; - } - public TestSocket(String host, int port, InetAddress localAddr, int localPort, int initialWrites) throws IOException - { - super(host, port, localAddr, localPort); - this.initialSuccesses = initialWrites; - } - public TestSocket(InetAddress address, int port, InetAddress localAddr, int localPort, int initialWrites) throws IOException - { - super(address, port, localAddr, localPort); - this.initialSuccesses = initialWrites; - } - public OutputStream getOutputStream() throws IOException - { - return new TestOutputStream(super.getOutputStream(), initialSuccesses); - } - public String toString() - { - return "TestSocket[" + getLocalPort() + "->" + getPort() + "]"; - } - } - - - static class TestOutputStream extends OutputStream - { - public static int counter; - public static boolean threwException; - - OutputStream os; - boolean closed; - int initialWrites; - boolean doThrow = true; - - public TestOutputStream(OutputStream os, int initialWrites) - { - this.os = os; - this.initialWrites = initialWrites; - } - public void write(int b) throws IOException - { - if (doThrow && ++counter == initialWrites) - { - log.info("throwing " + exceptionToThrow); - threwException = true; - throw exceptionToThrow; - } - os.write(b); - } - public void write(byte b[], int off, int len) throws IOException - { - log.info("TestOutputStream: counter = " + (counter + 1) + ", initialWrites = " + initialWrites); - if (++counter == initialWrites) - { - log.info("throwing " + exceptionToThrow); - threwException = true; - throw exceptionToThrow; - } - log.info(this + " calling write()"); - doThrow = false; - os.write(b, off, len); - os.flush(); - doThrow = true; - log.info(this + " back from write()"); - } - } -} \ No newline at end of file Copied: remoting2/branches/2.5.3.SP1_JBREM-1245/src/tests/org/jboss/test/remoting/transport/socket/retriable/SocketGeneralizedExceptionTestCase.java (from rev 6110, remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/socket/retriable/SocketGeneralizedExceptionTestCase.java) =================================================================== --- remoting2/branches/2.5.3.SP1_JBREM-1245/src/tests/org/jboss/test/remoting/transport/socket/retriable/SocketGeneralizedExceptionTestCase.java (rev 0) +++ remoting2/branches/2.5.3.SP1_JBREM-1245/src/tests/org/jboss/test/remoting/transport/socket/retriable/SocketGeneralizedExceptionTestCase.java 2011-06-24 21:22:29 UTC (rev 6389) @@ -0,0 +1,341 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2010, 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.socket.retriable; + +import java.io.IOException; +import java.io.OutputStream; +import java.net.InetAddress; +import java.net.Socket; +import java.net.UnknownHostException; +import java.util.HashMap; +import java.util.Map; + +import javax.management.MBeanServer; +import javax.net.SocketFactory; +import javax.net.ssl.SSLException; + +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.Remoting; +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-1245. + * + * @author <a href="mailto:ron.sigal@jboss.com">Ron Sigal</a> + * @version $Rev$ + * + * Copyright Sep 22, 2010 + * + */ +public class SocketGeneralizedExceptionTestCase extends TestCase +{ + private static Logger log = Logger.getLogger(SocketGeneralizedExceptionTestCase.class); + + private static boolean firstTime = true; + protected static IOException exceptionToThrow; + + 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); + } + + TestOutputStream.counter = 0; + TestOutputStream.threwException = false; + } + + + public void tearDown() + { + } + + + public void testSSLException() throws Throwable + { + log.info("entering " + getName()); + exceptionToThrow = new SSLException("Connection has been shutdown"); + doTest(); + log.info(getName() + " PASSES"); + } + + + public void testConnectionResetException() throws Throwable + { + log.info("entering " + getName()); + exceptionToThrow = new IOException("Connection reset by peer"); + doTest(); + log.info(getName() + " PASSES"); + } + + + public void testConnectionClosedException() throws Throwable + { + log.info("entering " + getName()); + exceptionToThrow = new IOException("Connection is closed"); + doTest(); + log.info(getName() + " PASSES"); + } + + + public void testBrokenPipeException() throws Throwable + { + log.info("entering " + getName()); + exceptionToThrow = new IOException("Broken pipe"); + doTest(); + log.info(getName() + " PASSES"); + } + + + protected void doTest() throws Throwable + { + // Start server. + setupServer(); + + // Create client. + InvokerLocator clientLocator = new InvokerLocator(locatorURI); + HashMap clientConfig = new HashMap(); + clientConfig.put(InvokerLocator.FORCE_REMOTE, "true"); + clientConfig.put(Remoting.CUSTOM_SOCKET_FACTORY, new TestSocketFactory(2)); + addExtraClientConfig(clientConfig); + Client client = new Client(clientLocator, clientConfig); + client.connect(); + log.info("client is connected"); + + // Verify invocation works in spite of exception. + assertEquals("xyz", client.invoke("xyz")); + assertTrue(TestOutputStream.threwException); + + client.disconnect(); + shutdownServer(); + } + + + protected String getTransport() + { + return "socket"; + } + + protected void addExtraServerConfig(Map config) {} + protected void addExtraClientConfig(Map config) {} + + + protected void setupServer() throws Exception + { + host = InetAddress.getLocalHost().getHostAddress(); + port = PortUtil.findFreePort(host); + locatorURI = getTransport() + "://" + host + ":" + port + "/?generalizeSocketException=true"; + 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 + { + return invocation.getParameter(); + } + public void removeListener(InvokerCallbackHandler callbackHandler) {} + public void setMBeanServer(MBeanServer server) {} + public void setInvoker(ServerInvoker invoker) {} + } + + + public static class TestSocketFactory extends SocketFactory + { + int initialSuccesses = 1; + + public TestSocketFactory() + { + } + public TestSocketFactory(int initialSuccesses) + { + this.initialSuccesses = initialSuccesses; + } + public Socket createSocket() + { + Socket s = new TestSocket(initialSuccesses); + log.info("returning " + s); + return s; + } + public Socket createSocket(String arg0, int arg1) throws IOException, UnknownHostException + { + Socket s = new TestSocket(arg0, arg1, initialSuccesses); + log.info("returning " + s); + return s; + } + + public Socket createSocket(InetAddress arg0, int arg1) throws IOException + { + Socket s = new TestSocket(arg0, arg1, initialSuccesses); + log.info("returning " + s); + return s; + } + + public Socket createSocket(String arg0, int arg1, InetAddress arg2, int arg3) throws IOException, UnknownHostException + { + Socket s = new TestSocket(arg0, arg1, arg2, arg3, initialSuccesses); + log.info("returning " + s); + return s; + } + + public Socket createSocket(InetAddress arg0, int arg1, InetAddress arg2, int arg3) throws IOException + { + Socket s = new TestSocket(arg0, arg1, arg2, arg3, initialSuccesses); + log.info("returning " + s); + return s; + } + } + + + static class TestSocket extends Socket + { + int initialSuccesses; + + public TestSocket(int initialWrites) + { + this.initialSuccesses = initialWrites; + } + public TestSocket(String host, int port, int initialWrites) throws UnknownHostException, IOException + { + super(host, port); + this.initialSuccesses = initialWrites; + } + public TestSocket(InetAddress address, int port, int initialWrites) throws IOException + { + super(address, port); + this.initialSuccesses = initialWrites; + } + public TestSocket(String host, int port, InetAddress localAddr, int localPort, int initialWrites) throws IOException + { + super(host, port, localAddr, localPort); + this.initialSuccesses = initialWrites; + } + public TestSocket(InetAddress address, int port, InetAddress localAddr, int localPort, int initialWrites) throws IOException + { + super(address, port, localAddr, localPort); + this.initialSuccesses = initialWrites; + } + public OutputStream getOutputStream() throws IOException + { + return new TestOutputStream(super.getOutputStream(), initialSuccesses); + } + public String toString() + { + return "TestSocket[" + getLocalPort() + "->" + getPort() + "]"; + } + } + + + static class TestOutputStream extends OutputStream + { + public static int counter; + public static boolean threwException; + + OutputStream os; + boolean closed; + int initialWrites; + boolean doThrow = true; + + public TestOutputStream(OutputStream os, int initialWrites) + { + this.os = os; + this.initialWrites = initialWrites; + } + public void write(int b) throws IOException + { + if (doThrow && ++counter == initialWrites) + { + log.info("throwing " + exceptionToThrow); + threwException = true; + throw exceptionToThrow; + } + os.write(b); + } + public void write(byte b[], int off, int len) throws IOException + { + log.info("TestOutputStream: counter = " + (counter + 1) + ", initialWrites = " + initialWrites); + if (++counter == initialWrites) + { + log.info("throwing " + exceptionToThrow); + threwException = true; + throw exceptionToThrow; + } + log.info(this + " calling write()"); + doThrow = false; + os.write(b, off, len); + os.flush(); + doThrow = true; + log.info(this + " back from write()"); + } + } +} \ No newline at end of file Property changes on: remoting2/branches/2.5.3.SP1_JBREM-1245/src/tests/org/jboss/test/remoting/transport/socket/ssl/timeout/SSLSocketWriteTimeoutTestCase.java ___________________________________________________________________ Deleted: svn:mergeinfo -

13 years, 5 months

1
0
0 / 0

JBoss Remoting SVN: r6388 - remoting2/branches.

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

Author: jbertram(a)redhat.com Date: 2011-06-24 17:11:49 -0400 (Fri, 24 Jun 2011) New Revision: 6388 Added: remoting2/branches/2.5.3.SP1_JBREM-1245/ Log: JBPAPP-6767

13 years, 5 months

1
0
0 / 0

JBoss Remoting SVN: r6387 - in remoting2/branches/2.2.3-SP2_JBREM-1269_JBREM-1275_JBREM-1261_JBREM-1277_JBREM-1280_JBREM-1281_JBREM-1292_JBREM-1293: src/main/org/jboss/remoting and 3 other directories.

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

Author: jbertram(a)redhat.com Date: 2011-06-20 15:26:02 -0400 (Mon, 20 Jun 2011) New Revision: 6387 Added: remoting2/branches/2.2.3-SP2_JBREM-1269_JBREM-1275_JBREM-1261_JBREM-1277_JBREM-1280_JBREM-1281_JBREM-1292_JBREM-1293/src/tests/org/jboss/test/remoting/transport/socket/idle/ remoting2/branches/2.2.3-SP2_JBREM-1269_JBREM-1275_JBREM-1261_JBREM-1277_JBREM-1280_JBREM-1281_JBREM-1292_JBREM-1293/src/tests/org/jboss/test/remoting/transport/socket/idle/ThreadPoolStackTestCase.java Removed: remoting2/branches/2.2.3-SP2_JBREM-1269_JBREM-1275_JBREM-1261_JBREM-1277_JBREM-1280_JBREM-1281_JBREM-1292_JBREM-1293/src/tests/org/jboss/test/remoting/transport/socket/idle/ThreadPoolStackTestCase.java Modified: remoting2/branches/2.2.3-SP2_JBREM-1269_JBREM-1275_JBREM-1261_JBREM-1277_JBREM-1280_JBREM-1281_JBREM-1292_JBREM-1293/ remoting2/branches/2.2.3-SP2_JBREM-1269_JBREM-1275_JBREM-1261_JBREM-1277_JBREM-1280_JBREM-1281_JBREM-1292_JBREM-1293/src/main/org/jboss/remoting/ServerInvoker.java remoting2/branches/2.2.3-SP2_JBREM-1269_JBREM-1275_JBREM-1261_JBREM-1277_JBREM-1280_JBREM-1281_JBREM-1292_JBREM-1293/src/main/org/jboss/remoting/transport/socket/SocketServerInvoker.java Log: JBPAPP-6750 Property changes on: remoting2/branches/2.2.3-SP2_JBREM-1269_JBREM-1275_JBREM-1261_JBREM-1277_JBREM-1280_JBREM-1281_JBREM-1292_JBREM-1293 ___________________________________________________________________ Modified: svn:mergeinfo - /remoting2/branches/2.2:6177-6178,6226,6253,6261-6263,6266-6267,6271-6273,6281-6284,6291-6292,6297,6313-6320,6322-6324 + /remoting2/branches/2.2:6177-6178,6226,6253,6261-6263,6266-6267,6271-6273,6281-6284,6291-6292,6297,6313-6320,6322-6324,6373,6375-6376,6379 Modified: remoting2/branches/2.2.3-SP2_JBREM-1269_JBREM-1275_JBREM-1261_JBREM-1277_JBREM-1280_JBREM-1281_JBREM-1292_JBREM-1293/src/main/org/jboss/remoting/ServerInvoker.java =================================================================== --- remoting2/branches/2.2.3-SP2_JBREM-1269_JBREM-1275_JBREM-1261_JBREM-1277_JBREM-1280_JBREM-1281_JBREM-1292_JBREM-1293/src/main/org/jboss/remoting/ServerInvoker.java 2011-06-20 18:39:35 UTC (rev 6386) +++ remoting2/branches/2.2.3-SP2_JBREM-1269_JBREM-1275_JBREM-1261_JBREM-1277_JBREM-1280_JBREM-1281_JBREM-1292_JBREM-1293/src/main/org/jboss/remoting/ServerInvoker.java 2011-06-20 19:26:02 UTC (rev 6387) @@ -255,7 +255,7 @@ // to avoid lookup in this common case - TLF protected volatile CallbackContainer singleCallbackContainer; - protected Map callbackHandlers = new HashMap(); + protected Map callbackHandlers = new ConcurrentHashMap(); protected Map clientCallbackListener = new HashMap(); protected boolean started = false; protected ConnectionNotifier connectionNotifier = new ConnectionNotifier(); @@ -1924,7 +1924,7 @@ { ServerInvokerCallbackHandler callbackHandler = null; String id = ServerInvokerCallbackHandler.getId(invocation); - synchronized(callbackHandlers) +// synchronized(callbackHandlers) { callbackHandler = (ServerInvokerCallbackHandler)callbackHandlers.get(id); @@ -1946,7 +1946,7 @@ String id = ServerInvokerCallbackHandler.getId(invocation); ServerInvokerCallbackHandler callbackHandler = null; - synchronized(callbackHandlers) +// synchronized(callbackHandlers) { callbackHandler = (ServerInvokerCallbackHandler) callbackHandlers.remove(id); } Modified: remoting2/branches/2.2.3-SP2_JBREM-1269_JBREM-1275_JBREM-1261_JBREM-1277_JBREM-1280_JBREM-1281_JBREM-1292_JBREM-1293/src/main/org/jboss/remoting/transport/socket/SocketServerInvoker.java =================================================================== --- remoting2/branches/2.2.3-SP2_JBREM-1269_JBREM-1275_JBREM-1261_JBREM-1277_JBREM-1280_JBREM-1281_JBREM-1292_JBREM-1293/src/main/org/jboss/remoting/transport/socket/SocketServerInvoker.java 2011-06-20 18:39:35 UTC (rev 6386) +++ remoting2/branches/2.2.3-SP2_JBREM-1269_JBREM-1275_JBREM-1261_JBREM-1277_JBREM-1280_JBREM-1281_JBREM-1292_JBREM-1293/src/main/org/jboss/remoting/transport/socket/SocketServerInvoker.java 2011-06-20 19:26:02 UTC (rev 6387) @@ -611,7 +611,7 @@ { if(threadpool.size() > 0) { - worker = (ServerThread)threadpool.removeFirst(); + worker = (ServerThread)threadpool.removeLast(); if(trace) { log.trace(this + (worker == null ? " found NO threads in threadpool" : " got " + worker + " from threadpool")); } } Deleted: remoting2/branches/2.2.3-SP2_JBREM-1269_JBREM-1275_JBREM-1261_JBREM-1277_JBREM-1280_JBREM-1281_JBREM-1292_JBREM-1293/src/tests/org/jboss/test/remoting/transport/socket/idle/ThreadPoolStackTestCase.java =================================================================== --- remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/socket/idle/ThreadPoolStackTestCase.java 2011-06-01 03:37:46 UTC (rev 6376) +++ remoting2/branches/2.2.3-SP2_JBREM-1269_JBREM-1275_JBREM-1261_JBREM-1277_JBREM-1280_JBREM-1281_JBREM-1292_JBREM-1293/src/tests/org/jboss/test/remoting/transport/socket/idle/ThreadPoolStackTestCase.java 2011-06-20 19:26:02 UTC (rev 6387) @@ -1,213 +0,0 @@ -/* - * 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.transport.socket.idle; - -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.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.InvokerCallbackHandler; -import org.jboss.remoting.transport.Connector; -import org.jboss.remoting.transport.PortUtil; -import org.jboss.remoting.transport.socket.LRUPool; -import org.jboss.remoting.transport.socket.SocketServerInvoker; - - -/** - * JBREM-1293. - * - * @author <a href="ron.sigal(a)jboss.com">Ron Sigal</a> - * @version $Revision: 1.1 $ - * - * Copyright May 31, 2011 - */ -public class ThreadPoolStackTestCase extends TestCase -{ - private static Logger log = Logger.getLogger(ThreadPoolStackTestCase.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.TRACE); - 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 testThreadpoolAsStack() throws Throwable - { - log.info("entering " + getName()); - - // Start server. - setupServer(); - - // Get threadpool and clientpool. - Field field = SocketServerInvoker.class.getDeclaredField("threadpool"); - field.setAccessible(true); - List threadpool = (List) field.get(connector.getServerInvoker()); - field = SocketServerInvoker.class.getDeclaredField("clientpool"); - field.setAccessible(true); - LRUPool clientpool = (LRUPool) field.get(connector.getServerInvoker()); - - // 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"); - - Thread.sleep(2000); - - // Create 5 connections. - for (int i = 0; i < 5; i++) - { - client.invokeOneway("4", null, true); - } - - Thread.sleep(2000); // time = 4000 - assertEquals(0, threadpool.size()); - assertEquals(5, clientpool.size()); - - // ServerThreads should be back in threadpool at 6000. - client.disconnect(); - Thread.sleep(4000); // time = 8000 - assertEquals(5, threadpool.size()); - assertEquals(0, clientpool.size()); - - // Wait until IdleTimerTask runs at 10000. - Thread.sleep(4000); // time = 12000 - - for (int i = 0; i < 6; i++) - { - client = new Client(clientLocator, clientConfig); - client.connect(); - log.info("i = " + i); - client.invoke("1"); - client.disconnect(); - } - - // Time = 18000. IdleTimerTask will run at 20000, at which point - // all but one ServerThread should be removed from threadpool. - Thread.sleep(4000); // time = 22000 - assertEquals(1, threadpool.size()); - - 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; - 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"); - config.put("idleTimeout", "10"); - 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 - { - Integer.valueOf((String) invocation.getParameter()).intValue(); - Thread.sleep(Integer.valueOf((String) invocation.getParameter()).intValue() * 1000); - log.info("parameter: " + invocation.getParameter()); - return invocation.getParameter(); - } - public void removeListener(InvokerCallbackHandler callbackHandler) {} - public void setMBeanServer(MBeanServer server) {} - public void setInvoker(ServerInvoker invoker) {} - } -} \ No newline at end of file Copied: remoting2/branches/2.2.3-SP2_JBREM-1269_JBREM-1275_JBREM-1261_JBREM-1277_JBREM-1280_JBREM-1281_JBREM-1292_JBREM-1293/src/tests/org/jboss/test/remoting/transport/socket/idle/ThreadPoolStackTestCase.java (from rev 6376, remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/socket/idle/ThreadPoolStackTestCase.java) =================================================================== --- remoting2/branches/2.2.3-SP2_JBREM-1269_JBREM-1275_JBREM-1261_JBREM-1277_JBREM-1280_JBREM-1281_JBREM-1292_JBREM-1293/src/tests/org/jboss/test/remoting/transport/socket/idle/ThreadPoolStackTestCase.java (rev 0) +++ remoting2/branches/2.2.3-SP2_JBREM-1269_JBREM-1275_JBREM-1261_JBREM-1277_JBREM-1280_JBREM-1281_JBREM-1292_JBREM-1293/src/tests/org/jboss/test/remoting/transport/socket/idle/ThreadPoolStackTestCase.java 2011-06-20 19:26:02 UTC (rev 6387) @@ -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.transport.socket.idle; + +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.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.InvokerCallbackHandler; +import org.jboss.remoting.transport.Connector; +import org.jboss.remoting.transport.PortUtil; +import org.jboss.remoting.transport.socket.LRUPool; +import org.jboss.remoting.transport.socket.SocketServerInvoker; + + +/** + * JBREM-1293. + * + * @author <a href="ron.sigal(a)jboss.com">Ron Sigal</a> + * @version $Revision: 1.1 $ + * + * Copyright May 31, 2011 + */ +public class ThreadPoolStackTestCase extends TestCase +{ + private static Logger log = Logger.getLogger(ThreadPoolStackTestCase.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.TRACE); + 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 testThreadpoolAsStack() throws Throwable + { + log.info("entering " + getName()); + + // Start server. + setupServer(); + + // Get threadpool and clientpool. + Field field = SocketServerInvoker.class.getDeclaredField("threadpool"); + field.setAccessible(true); + List threadpool = (List) field.get(connector.getServerInvoker()); + field = SocketServerInvoker.class.getDeclaredField("clientpool"); + field.setAccessible(true); + LRUPool clientpool = (LRUPool) field.get(connector.getServerInvoker()); + + // 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"); + + Thread.sleep(2000); + + // Create 5 connections. + for (int i = 0; i < 5; i++) + { + client.invokeOneway("4", null, true); + } + + Thread.sleep(2000); // time = 4000 + assertEquals(0, threadpool.size()); + assertEquals(5, clientpool.size()); + + // ServerThreads should be back in threadpool at 6000. + client.disconnect(); + Thread.sleep(4000); // time = 8000 + assertEquals(5, threadpool.size()); + assertEquals(0, clientpool.size()); + + // Wait until IdleTimerTask runs at 10000. + Thread.sleep(4000); // time = 12000 + + for (int i = 0; i < 5; i++) + { + client = new Client(clientLocator, clientConfig); + client.connect(); + log.info("i = " + i); + client.invoke("1"); + client.disconnect(); + Thread.sleep(500); + } + + // Time = 17500. IdleTimerTask will run at 20000, at which point + // all but one ServerThread should be removed from threadpool. + Thread.sleep(5000); // time = 22500 + assertEquals(1, threadpool.size()); + + 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; + 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"); + config.put("idleTimeout", "10"); + 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 + { + Integer.valueOf((String) invocation.getParameter()).intValue(); + Thread.sleep(Integer.valueOf((String) invocation.getParameter()).intValue() * 1000); + log.info("parameter: " + invocation.getParameter()); + 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, 5 months

1
0
0 / 0

JBoss Remoting SVN: r6386 - remoting2/branches.

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

Author: jbertram(a)redhat.com Date: 2011-06-20 14:39:35 -0400 (Mon, 20 Jun 2011) New Revision: 6386 Added: remoting2/branches/2.2.3-SP2_JBREM-1269_JBREM-1275_JBREM-1261_JBREM-1277_JBREM-1280_JBREM-1281_JBREM-1292_JBREM-1293/ Log: JBPAPP-6750

13 years, 5 months

1
0
0 / 0

JBoss Remoting SVN: r6385 - in remoting2/branches/2.2.3-SP1_JBREM-1269_JBREM-1275_JBREM-1261_JBREM-1277_JBREM-1280_JBREM-1281_JBREM-1292_JBREM-1293: src/main/org/jboss/remoting/transport/bisocket and 4 other directories.

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

Author: jbertram(a)redhat.com Date: 2011-06-13 12:18:06 -0400 (Mon, 13 Jun 2011) New Revision: 6385 Added: remoting2/branches/2.2.3-SP1_JBREM-1269_JBREM-1275_JBREM-1261_JBREM-1277_JBREM-1280_JBREM-1281_JBREM-1292_JBREM-1293/src/tests/org/jboss/test/remoting/transport/socket/idle/ remoting2/branches/2.2.3-SP1_JBREM-1269_JBREM-1275_JBREM-1261_JBREM-1277_JBREM-1280_JBREM-1281_JBREM-1292_JBREM-1293/src/tests/org/jboss/test/remoting/transport/socket/idle/ThreadPoolStackTestCase.java Removed: remoting2/branches/2.2.3-SP1_JBREM-1269_JBREM-1275_JBREM-1261_JBREM-1277_JBREM-1280_JBREM-1281_JBREM-1292_JBREM-1293/src/tests/org/jboss/test/remoting/transport/socket/idle/ThreadPoolStackTestCase.java Modified: remoting2/branches/2.2.3-SP1_JBREM-1269_JBREM-1275_JBREM-1261_JBREM-1277_JBREM-1280_JBREM-1281_JBREM-1292_JBREM-1293/ remoting2/branches/2.2.3-SP1_JBREM-1269_JBREM-1275_JBREM-1261_JBREM-1277_JBREM-1280_JBREM-1281_JBREM-1292_JBREM-1293/src/main/org/jboss/remoting/transport/bisocket/ remoting2/branches/2.2.3-SP1_JBREM-1269_JBREM-1275_JBREM-1261_JBREM-1277_JBREM-1280_JBREM-1281_JBREM-1292_JBREM-1293/src/main/org/jboss/remoting/transport/socket/SocketServerInvoker.java remoting2/branches/2.2.3-SP1_JBREM-1269_JBREM-1275_JBREM-1261_JBREM-1277_JBREM-1280_JBREM-1281_JBREM-1292_JBREM-1293/src/tests/org/jboss/test/remoting/transport/bisocket/dos/ Log: JBPAPP-6536 Property changes on: remoting2/branches/2.2.3-SP1_JBREM-1269_JBREM-1275_JBREM-1261_JBREM-1277_JBREM-1280_JBREM-1281_JBREM-1292_JBREM-1293 ___________________________________________________________________ Modified: svn:mergeinfo - /remoting2/branches/2.2:6177-6178,6226,6253,6261-6263,6266-6267,6271-6273,6281-6284,6291-6292,6297,6313-6320,6322-6324 /remoting2/branches/2.2.3-SP2_JBREM-1269_JBREM-1275_JBREM-1261_JBREM-1277_JBREM-1280_JBREM-1281_JBREM-1292:6370 + /remoting2/branches/2.2:6177-6178,6226,6253,6261-6263,6266-6267,6271-6273,6281-6284,6291-6292,6297,6313-6320,6322-6324,6375-6376,6379 /remoting2/branches/2.2.3-SP2_JBREM-1269_JBREM-1275_JBREM-1261_JBREM-1277_JBREM-1280_JBREM-1281_JBREM-1292:6370 Property changes on: remoting2/branches/2.2.3-SP1_JBREM-1269_JBREM-1275_JBREM-1261_JBREM-1277_JBREM-1280_JBREM-1281_JBREM-1292_JBREM-1293/src/main/org/jboss/remoting/transport/bisocket ___________________________________________________________________ Modified: svn:mergeinfo - /remoting2/branches/2.2/src/main/org/jboss/remoting/transport/bisocket:6272-6273 /remoting2/branches/2.2.3-SP2_JBREM-1269_JBREM-1275_JBREM-1261_JBREM-1277_JBREM-1280_JBREM-1281_JBREM-1292/src/main/org/jboss/remoting/transport/bisocket:6370 + /remoting2/branches/2.2/src/main/org/jboss/remoting/transport/bisocket:6272-6273,6375-6376,6379 /remoting2/branches/2.2.3-SP2_JBREM-1269_JBREM-1275_JBREM-1261_JBREM-1277_JBREM-1280_JBREM-1281_JBREM-1292/src/main/org/jboss/remoting/transport/bisocket:6370 Modified: remoting2/branches/2.2.3-SP1_JBREM-1269_JBREM-1275_JBREM-1261_JBREM-1277_JBREM-1280_JBREM-1281_JBREM-1292_JBREM-1293/src/main/org/jboss/remoting/transport/socket/SocketServerInvoker.java =================================================================== --- remoting2/branches/2.2.3-SP1_JBREM-1269_JBREM-1275_JBREM-1261_JBREM-1277_JBREM-1280_JBREM-1281_JBREM-1292_JBREM-1293/src/main/org/jboss/remoting/transport/socket/SocketServerInvoker.java 2011-06-13 15:58:41 UTC (rev 6384) +++ remoting2/branches/2.2.3-SP1_JBREM-1269_JBREM-1275_JBREM-1261_JBREM-1277_JBREM-1280_JBREM-1281_JBREM-1292_JBREM-1293/src/main/org/jboss/remoting/transport/socket/SocketServerInvoker.java 2011-06-13 16:18:06 UTC (rev 6385) @@ -611,7 +611,7 @@ { if(threadpool.size() > 0) { - worker = (ServerThread)threadpool.removeFirst(); + worker = (ServerThread)threadpool.removeLast(); if(trace) { log.trace(this + (worker == null ? " found NO threads in threadpool" : " got " + worker + " from threadpool")); } } Property changes on: remoting2/branches/2.2.3-SP1_JBREM-1269_JBREM-1275_JBREM-1261_JBREM-1277_JBREM-1280_JBREM-1281_JBREM-1292_JBREM-1293/src/tests/org/jboss/test/remoting/transport/bisocket/dos ___________________________________________________________________ Modified: svn:mergeinfo - /remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/bisocket/dos:6271 /remoting2/branches/2.2.3-SP2_JBREM-1269_JBREM-1275_JBREM-1261_JBREM-1277_JBREM-1280_JBREM-1281_JBREM-1292/src/tests/org/jboss/test/remoting/transport/bisocket/dos:6370 + /remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/bisocket/dos:6271,6375-6376,6379 /remoting2/branches/2.2.3-SP2_JBREM-1269_JBREM-1275_JBREM-1261_JBREM-1277_JBREM-1280_JBREM-1281_JBREM-1292/src/tests/org/jboss/test/remoting/transport/bisocket/dos:6370 Deleted: remoting2/branches/2.2.3-SP1_JBREM-1269_JBREM-1275_JBREM-1261_JBREM-1277_JBREM-1280_JBREM-1281_JBREM-1292_JBREM-1293/src/tests/org/jboss/test/remoting/transport/socket/idle/ThreadPoolStackTestCase.java =================================================================== --- remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/socket/idle/ThreadPoolStackTestCase.java 2011-06-01 03:37:46 UTC (rev 6376) +++ remoting2/branches/2.2.3-SP1_JBREM-1269_JBREM-1275_JBREM-1261_JBREM-1277_JBREM-1280_JBREM-1281_JBREM-1292_JBREM-1293/src/tests/org/jboss/test/remoting/transport/socket/idle/ThreadPoolStackTestCase.java 2011-06-13 16:18:06 UTC (rev 6385) @@ -1,213 +0,0 @@ -/* - * 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.transport.socket.idle; - -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.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.InvokerCallbackHandler; -import org.jboss.remoting.transport.Connector; -import org.jboss.remoting.transport.PortUtil; -import org.jboss.remoting.transport.socket.LRUPool; -import org.jboss.remoting.transport.socket.SocketServerInvoker; - - -/** - * JBREM-1293. - * - * @author <a href="ron.sigal(a)jboss.com">Ron Sigal</a> - * @version $Revision: 1.1 $ - * - * Copyright May 31, 2011 - */ -public class ThreadPoolStackTestCase extends TestCase -{ - private static Logger log = Logger.getLogger(ThreadPoolStackTestCase.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.TRACE); - 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 testThreadpoolAsStack() throws Throwable - { - log.info("entering " + getName()); - - // Start server. - setupServer(); - - // Get threadpool and clientpool. - Field field = SocketServerInvoker.class.getDeclaredField("threadpool"); - field.setAccessible(true); - List threadpool = (List) field.get(connector.getServerInvoker()); - field = SocketServerInvoker.class.getDeclaredField("clientpool"); - field.setAccessible(true); - LRUPool clientpool = (LRUPool) field.get(connector.getServerInvoker()); - - // 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"); - - Thread.sleep(2000); - - // Create 5 connections. - for (int i = 0; i < 5; i++) - { - client.invokeOneway("4", null, true); - } - - Thread.sleep(2000); // time = 4000 - assertEquals(0, threadpool.size()); - assertEquals(5, clientpool.size()); - - // ServerThreads should be back in threadpool at 6000. - client.disconnect(); - Thread.sleep(4000); // time = 8000 - assertEquals(5, threadpool.size()); - assertEquals(0, clientpool.size()); - - // Wait until IdleTimerTask runs at 10000. - Thread.sleep(4000); // time = 12000 - - for (int i = 0; i < 6; i++) - { - client = new Client(clientLocator, clientConfig); - client.connect(); - log.info("i = " + i); - client.invoke("1"); - client.disconnect(); - } - - // Time = 18000. IdleTimerTask will run at 20000, at which point - // all but one ServerThread should be removed from threadpool. - Thread.sleep(4000); // time = 22000 - assertEquals(1, threadpool.size()); - - 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; - 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"); - config.put("idleTimeout", "10"); - 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 - { - Integer.valueOf((String) invocation.getParameter()).intValue(); - Thread.sleep(Integer.valueOf((String) invocation.getParameter()).intValue() * 1000); - log.info("parameter: " + invocation.getParameter()); - return invocation.getParameter(); - } - public void removeListener(InvokerCallbackHandler callbackHandler) {} - public void setMBeanServer(MBeanServer server) {} - public void setInvoker(ServerInvoker invoker) {} - } -} \ No newline at end of file Copied: remoting2/branches/2.2.3-SP1_JBREM-1269_JBREM-1275_JBREM-1261_JBREM-1277_JBREM-1280_JBREM-1281_JBREM-1292_JBREM-1293/src/tests/org/jboss/test/remoting/transport/socket/idle/ThreadPoolStackTestCase.java (from rev 6376, remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/socket/idle/ThreadPoolStackTestCase.java) =================================================================== --- remoting2/branches/2.2.3-SP1_JBREM-1269_JBREM-1275_JBREM-1261_JBREM-1277_JBREM-1280_JBREM-1281_JBREM-1292_JBREM-1293/src/tests/org/jboss/test/remoting/transport/socket/idle/ThreadPoolStackTestCase.java (rev 0) +++ remoting2/branches/2.2.3-SP1_JBREM-1269_JBREM-1275_JBREM-1261_JBREM-1277_JBREM-1280_JBREM-1281_JBREM-1292_JBREM-1293/src/tests/org/jboss/test/remoting/transport/socket/idle/ThreadPoolStackTestCase.java 2011-06-13 16:18:06 UTC (rev 6385) @@ -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.transport.socket.idle; + +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.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.InvokerCallbackHandler; +import org.jboss.remoting.transport.Connector; +import org.jboss.remoting.transport.PortUtil; +import org.jboss.remoting.transport.socket.LRUPool; +import org.jboss.remoting.transport.socket.SocketServerInvoker; + + +/** + * JBREM-1293. + * + * @author <a href="ron.sigal(a)jboss.com">Ron Sigal</a> + * @version $Revision: 1.1 $ + * + * Copyright May 31, 2011 + */ +public class ThreadPoolStackTestCase extends TestCase +{ + private static Logger log = Logger.getLogger(ThreadPoolStackTestCase.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.TRACE); + 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 testThreadpoolAsStack() throws Throwable + { + log.info("entering " + getName()); + + // Start server. + setupServer(); + + // Get threadpool and clientpool. + Field field = SocketServerInvoker.class.getDeclaredField("threadpool"); + field.setAccessible(true); + List threadpool = (List) field.get(connector.getServerInvoker()); + field = SocketServerInvoker.class.getDeclaredField("clientpool"); + field.setAccessible(true); + LRUPool clientpool = (LRUPool) field.get(connector.getServerInvoker()); + + // 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"); + + Thread.sleep(2000); + + // Create 5 connections. + for (int i = 0; i < 5; i++) + { + client.invokeOneway("4", null, true); + } + + Thread.sleep(2000); // time = 4000 + assertEquals(0, threadpool.size()); + assertEquals(5, clientpool.size()); + + // ServerThreads should be back in threadpool at 6000. + client.disconnect(); + Thread.sleep(4000); // time = 8000 + assertEquals(5, threadpool.size()); + assertEquals(0, clientpool.size()); + + // Wait until IdleTimerTask runs at 10000. + Thread.sleep(4000); // time = 12000 + + for (int i = 0; i < 5; i++) + { + client = new Client(clientLocator, clientConfig); + client.connect(); + log.info("i = " + i); + client.invoke("1"); + client.disconnect(); + Thread.sleep(500); + } + + // Time = 17500. IdleTimerTask will run at 20000, at which point + // all but one ServerThread should be removed from threadpool. + Thread.sleep(5000); // time = 22500 + assertEquals(1, threadpool.size()); + + 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; + 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"); + config.put("idleTimeout", "10"); + 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 + { + Integer.valueOf((String) invocation.getParameter()).intValue(); + Thread.sleep(Integer.valueOf((String) invocation.getParameter()).intValue() * 1000); + log.info("parameter: " + invocation.getParameter()); + 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, 5 months

1
0
0 / 0

JBoss Remoting SVN: r6384 - remoting2/branches.

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

Author: jbertram(a)redhat.com Date: 2011-06-13 11:58:41 -0400 (Mon, 13 Jun 2011) New Revision: 6384 Added: remoting2/branches/2.2.3-SP1_JBREM-1269_JBREM-1275_JBREM-1261_JBREM-1277_JBREM-1280_JBREM-1281_JBREM-1292_JBREM-1293/ Removed: remoting2/branches/2.2.3-SP1_JBREM-1269_JBREM-1275_JBREM-1261_JBREM-1277_JBREM-1280_JBREM-1281_JBREM-1292/ Log: JBPAPP-6536

13 years, 5 months

1
0
0 / 0

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

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

Author: ron.sigal(a)jboss.com Date: 2011-06-11 14:43:22 -0400 (Sat, 11 Jun 2011) New Revision: 6383 Added: remoting2/branches/2.2/pom.xml Log: JBREM-1264: For releasing to maven repository. Added: remoting2/branches/2.2/pom.xml =================================================================== --- remoting2/branches/2.2/pom.xml (rev 0) +++ remoting2/branches/2.2/pom.xml 2011-06-11 18:43:22 UTC (rev 6383) @@ -0,0 +1,51 @@ + + +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + + <modelVersion>4.0.0</modelVersion> + + <name>JBoss Remoting 2</name> + <description>JBoss Remoting 2</description> + + <parent> + <groupId>org.jboss</groupId> + <artifactId>jboss-parent</artifactId> + <version>5-beta-5</version> + </parent> + + <groupId>org.jboss.remoting</groupId> + <artifactId>jboss-remoting</artifactId> + <packaging>jar</packaging> + <version>2.2.4</version> + + <distributionManagement> + <repository> + <id>jboss-releases-repository</id> + <name>JBoss Releases Repository</name> + <url>https://repository.jboss.org/nexus/service/local/staging/deploy/maven2/</url> + </repository> + </distributionManagement> + +</project>

13 years, 5 months

1
0
0 / 0

JBoss Remoting SVN: r6382 - remoting2/branches/2.2/src/etc.

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

Author: ron.sigal(a)jboss.com Date: 2011-06-11 14:41:18 -0400 (Sat, 11 Jun 2011) New Revision: 6382 Added: remoting2/branches/2.2/src/etc/maven_deploy Log: JBREM-1264: Script for releasing to maven repository. Added: remoting2/branches/2.2/src/etc/maven_deploy =================================================================== --- remoting2/branches/2.2/src/etc/maven_deploy (rev 0) +++ remoting2/branches/2.2/src/etc/maven_deploy 2011-06-11 18:41:18 UTC (rev 6382) @@ -0,0 +1,18 @@ +if [ $# -lt 1 ] +then + echo usage: maven_deploy version + exit +fi + +version=$1 +echo version: $version + +cp output/lib/jboss-remoting.jar output/lib/jboss-remoting-${version}.jar +cp output/lib/jboss-remoting-src.jar output/lib/jboss-remoting-${version}-sources.jar + +echo mvn deploy:deploy-file -DpomFile=pom.xml -Dfile=output/lib/jboss-remoting-${version}.jar -Dpackaging=jar -DrepositoryId=jboss-releases-repository -Durl=https://repository.jboss.org/nexus/service/local/staging/deploy/maven2/ + mvn deploy:deploy-file -DpomFile=pom.xml -Dfile=output/lib/jboss-remoting-${version}.jar -Dpackaging=jar -DrepositoryId=jboss-releases-repository -Durl=https://repository.jboss.org/nexus/service/local/staging/deploy/maven2/ + +echo mvn deploy:deploy-file -DpomFile=pom.xml -Dfile=output/lib/jboss-remoting-${version}-sources.jar -Dpackaging=java-source -DrepositoryId=jboss-releases-repository -Durl=https://repository.jboss.org/nexus/service/local/staging/deploy/maven2/ + mvn deploy:deploy-file -DpomFile=pom.xml -Dfile=output/lib/jboss-remoting-${version}-sources.jar -Dpackaging=java-source -DrepositoryId=jboss-releases-repository -Durl=https://repository.jboss.org/nexus/service/local/staging/deploy/maven2/ + Property changes on: remoting2/branches/2.2/src/etc/maven_deploy ___________________________________________________________________ Added: svn:executable + *

13 years, 5 months

1
0
0 / 0

JBoss Remoting SVN: r6381 - remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/socket/idle.

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

Author: ron.sigal(a)jboss.com Date: 2011-06-07 20:44:43 -0400 (Tue, 07 Jun 2011) New Revision: 6381 Modified: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/socket/idle/ThreadPoolStackTestCase.java Log: JBREM-1293: Changed Level.TRACE to XLevel.TRACE. Modified: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/socket/idle/ThreadPoolStackTestCase.java =================================================================== --- remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/socket/idle/ThreadPoolStackTestCase.java 2011-06-04 01:58:06 UTC (rev 6380) +++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/socket/idle/ThreadPoolStackTestCase.java 2011-06-08 00:44:43 UTC (rev 6381) @@ -36,6 +36,7 @@ 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; @@ -75,7 +76,7 @@ if (firstTime) { firstTime = false; - Logger.getLogger("org.jboss.remoting").setLevel(Level.TRACE); + Logger.getLogger("org.jboss.remoting").setLevel(XLevel.TRACE); Logger.getLogger("org.jboss.test.remoting").setLevel(Level.INFO); String pattern = "[%d{ABSOLUTE}] [%t] %5p (%F:%L) - %m%n"; PatternLayout layout = new PatternLayout(pattern);

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