jboss-remoting-commits
August 2010
jboss-remoting-commits@lists.jboss.org
- 1 participants
- 135 discussions
JBoss Remoting SVN: r6040 - remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/socket/connectionfailure.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2010-08-04 22:09:36 -0400 (Wed, 04 Aug 2010)
New Revision: 6040
Modified:
remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/socket/connectionfailure/SocketCallbackConnectionFailureTestCase.java
Log:
JBREM-1241: Added svn:eol-style subversion property.
Modified: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/socket/connectionfailure/SocketCallbackConnectionFailureTestCase.java
===================================================================
--- remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/socket/connectionfailure/SocketCallbackConnectionFailureTestCase.java 2010-08-05 02:09:00 UTC (rev 6039)
+++ remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/socket/connectionfailure/SocketCallbackConnectionFailureTestCase.java 2010-08-05 02:09:36 UTC (rev 6040)
@@ -1,45 +1,45 @@
-
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, 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.connectionfailure;
-
-import org.jboss.test.remoting.callback.connectionfailure.CallbackConnectionFailureTestParent;
-
-/**
- * Unit test for JBREM-873.
- *
- * org.jboss.test.remoting.callback.connectionfailure.CallbackConnectionFailureTestParent.
- *
- * @author <a href="ron.sigal(a)jboss.com">Ron Sigal</a>
- * @version $Revision: 1.1 $
- * <p>
- * Copyright Dec 10, 2007
- * </p>
- */
-public class SocketCallbackConnectionFailureTestCase extends CallbackConnectionFailureTestParent
-{
- protected String getTransport()
- {
- return "socket";
- }
-}
-
+
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2005, 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.connectionfailure;
+
+import org.jboss.test.remoting.callback.connectionfailure.CallbackConnectionFailureTestParent;
+
+/**
+ * Unit test for JBREM-873.
+ *
+ * org.jboss.test.remoting.callback.connectionfailure.CallbackConnectionFailureTestParent.
+ *
+ * @author <a href="ron.sigal(a)jboss.com">Ron Sigal</a>
+ * @version $Revision: 1.1 $
+ * <p>
+ * Copyright Dec 10, 2007
+ * </p>
+ */
+public class SocketCallbackConnectionFailureTestCase extends CallbackConnectionFailureTestParent
+{
+ protected String getTransport()
+ {
+ return "socket";
+ }
+}
+
Property changes on: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/socket/connectionfailure/SocketCallbackConnectionFailureTestCase.java
___________________________________________________________________
Name: svn:eol-style
+ native
14 years, 3 months
- 1
- 0
JBoss Remoting SVN: r6039 - remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/socket.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2010-08-04 22:09:00 -0400 (Wed, 04 Aug 2010)
New Revision: 6039
Modified:
remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/socket/ErrorTestCase.java
remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/socket/IdleTimerTaskNotifyTestCase.java
Log:
JBREM-1241: Added svn:eol-style subversion property.
Modified: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/socket/ErrorTestCase.java
===================================================================
--- remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/socket/ErrorTestCase.java 2010-08-05 02:07:37 UTC (rev 6038)
+++ remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/socket/ErrorTestCase.java 2010-08-05 02:09:00 UTC (rev 6039)
@@ -1,327 +1,327 @@
-/*
- * 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;
-
-import java.io.IOException;
-import java.net.InetAddress;
-import java.net.Socket;
-import java.util.HashMap;
-import java.util.LinkedList;
-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.InvokerRegistry;
-import org.jboss.remoting.ServerInvocationHandler;
-import org.jboss.remoting.ServerInvoker;
-import org.jboss.remoting.callback.InvokerCallbackHandler;
-import org.jboss.remoting.transport.ClientFactory;
-import org.jboss.remoting.transport.ClientInvoker;
-import org.jboss.remoting.transport.Connector;
-import org.jboss.remoting.transport.PortUtil;
-import org.jboss.remoting.transport.ServerFactory;
-import org.jboss.remoting.transport.socket.LRUPool;
-import org.jboss.remoting.transport.socket.ServerSocketWrapper;
-import org.jboss.remoting.transport.socket.ServerThread;
-import org.jboss.remoting.transport.socket.SocketClientInvoker;
-import org.jboss.remoting.transport.socket.SocketServerInvoker;
-import org.jboss.remoting.transport.socket.SocketWrapper;
-
-
-/**
- * Unit tests for JBREM-1183.
- *
- * @author <a href="ron.sigal(a)jboss.com">Ron Sigal</a>
- * @version $Revision: 1.1 $
- * <p>
- * Copyright Feb 16, 2010
- */
-public class ErrorTestCase extends TestCase
-{
- private static Logger log = Logger.getLogger(ErrorTestCase.class);
-
- private static boolean firstTime = true;
- private static int whenToFail;
-
- 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.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);
- }
- InvokerRegistry.registerInvokerFactories(getTransport(), TestClientFactory.class, TestServerFactory.class);
- TestServerThread.threadCounter = 0;
- }
-
-
- public void tearDown()
- {
- }
-
-
- public void testErrorFirstTime() throws Throwable
- {
- log.info("entering " + getName());
-
- // Start server.
- whenToFail = 0;
- setupServer();
-
- // Create client.
- InvokerLocator clientLocator = new InvokerLocator(locatorURI);
- HashMap clientConfig = new HashMap();
- clientConfig.put(InvokerLocator.FORCE_REMOTE, "true");
- clientConfig.put("timeout", "2000");
- addExtraClientConfig(clientConfig);
- Client client = new Client(clientLocator, clientConfig);
- client.connect();
- log.info("client is connected");
-
- // Test invocations.
- assertEquals("abc", client.invoke("abc"));
- log.info("first invocation succeeded");
- assertEquals("lmn", client.invoke("lmn"));
- log.info("second invocation succeeded");
- assertEquals("xyz", client.invoke("xyz"));
- log.info("third invocation succeeded");
- assertEquals(1, TestServerThread.threadCounter);
-
- client.disconnect();
- shutdownServer();
- log.info(getName() + " PASSES");
- }
-
-
- public void testErrorSecondTime() throws Throwable
- {
- log.info("entering " + getName());
-
- // Start server.
- whenToFail = 1;
- setupServer();
-
- // Create client.
- InvokerLocator clientLocator = new InvokerLocator(locatorURI);
- HashMap clientConfig = new HashMap();
- clientConfig.put(InvokerLocator.FORCE_REMOTE, "true");
- clientConfig.put("timeout", "2000");
- addExtraClientConfig(clientConfig);
- Client client = new Client(clientLocator, clientConfig);
- client.connect();
- log.info("client is connected");
-
- // Test invocations.
- assertEquals("abc", client.invoke("abc"));
- log.info("first invocation succeeded");
- assertEquals("lmn", client.invoke("lmn"));
- log.info("second invocation succeeded");
- assertEquals("xyz", client.invoke("xyz"));
- log.info("third invocation succeeded");
- assertEquals(1, TestServerThread.threadCounter);
-
- client.disconnect();
- shutdownServer();
- log.info(getName() + " PASSES");
- }
-
-
- public void testErrorThirdTime() throws Throwable
- {
- log.info("entering " + getName());
-
- // Start server.
- whenToFail = 2;
- setupServer();
-
- // Create client.
- InvokerLocator clientLocator = new InvokerLocator(locatorURI);
- HashMap clientConfig = new HashMap();
- clientConfig.put(InvokerLocator.FORCE_REMOTE, "true");
- clientConfig.put("timeout", "2000");
- addExtraClientConfig(clientConfig);
- Client client = new Client(clientLocator, clientConfig);
- client.connect();
- log.info("client is connected");
-
- // Test invocations.
- assertEquals("abc", client.invoke("abc"));
- log.info("first invocation succeeded");
- assertEquals("lmn", client.invoke("lmn"));
- log.info("second invocation succeeded");
- assertEquals("xyz", client.invoke("xyz"));
- log.info("third invocation succeeded");
- assertEquals(1, TestServerThread.threadCounter);
-
- client.disconnect();
- shutdownServer();
- log.info(getName() + " PASSES");
- }
-
-
- protected String getTransport()
- {
- return "test";
- }
-
-
- 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
- {
- return invocation.getParameter();
- }
- public void removeListener(InvokerCallbackHandler callbackHandler) {}
- public void setMBeanServer(MBeanServer server) {}
- public void setInvoker(ServerInvoker invoker) {}
- }
-
-
- static class TestServerInvoker extends SocketServerInvoker
- {
- int counter;
-
- public TestServerInvoker(InvokerLocator locator, Map configuration)
- {
- super(locator, configuration);
- }
- public TestServerInvoker(InvokerLocator locator)
- {
- super(locator);
- }
- protected void processInvocation(Socket socket) throws Exception
- {
- clientpool = new LRUPool(2, maxPoolSize);
- clientpool.create();
- threadpool = new LinkedList();
- ServerThread worker = new TestServerThread(socket, this, clientpool, threadpool, 0, 0, ServerSocketWrapper.class.getName());
- worker.start();
- }
- }
-
-
- public static class TestServerThread extends ServerThread
- {
- static public int threadCounter;
- private int counter;
-
- public TestServerThread(Socket socket, SocketServerInvoker invoker, LRUPool clientpool, LinkedList threadpool,
- int timeout, int writeTimeout, String serverSocketClassName) throws Exception
- {
- super(socket, invoker, clientpool, threadpool, timeout, writeTimeout, serverSocketClassName);
- threadCounter++;
- }
- protected void processInvocation(SocketWrapper socketWrapper) throws Exception
- {
- super.processInvocation(socketWrapper);
- if (counter++ == whenToFail)
- throw new Error("TestServerThread");
- }
- }
-
-
- public static class TestClientFactory implements ClientFactory
- {
- public ClientInvoker createClientInvoker(InvokerLocator locator, Map config) throws IOException
- {
- log.info("TestClientFaotory.createClientInvoker() called");
- return new SocketClientInvoker(locator, config);
- }
- public boolean supportsSSL()
- {
- return false;
- }
- }
-
-
- public static class TestServerFactory implements ServerFactory
- {
- public ServerInvoker createServerInvoker(InvokerLocator locator, Map config) throws IOException
- {
- log.info("TestServerFactory.createServerInvoker() called");
- return new TestServerInvoker(locator, config);
- }
- public boolean supportsSSL()
- {
- return false;
- }
- }
+/*
+ * 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;
+
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.Socket;
+import java.util.HashMap;
+import java.util.LinkedList;
+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.InvokerRegistry;
+import org.jboss.remoting.ServerInvocationHandler;
+import org.jboss.remoting.ServerInvoker;
+import org.jboss.remoting.callback.InvokerCallbackHandler;
+import org.jboss.remoting.transport.ClientFactory;
+import org.jboss.remoting.transport.ClientInvoker;
+import org.jboss.remoting.transport.Connector;
+import org.jboss.remoting.transport.PortUtil;
+import org.jboss.remoting.transport.ServerFactory;
+import org.jboss.remoting.transport.socket.LRUPool;
+import org.jboss.remoting.transport.socket.ServerSocketWrapper;
+import org.jboss.remoting.transport.socket.ServerThread;
+import org.jboss.remoting.transport.socket.SocketClientInvoker;
+import org.jboss.remoting.transport.socket.SocketServerInvoker;
+import org.jboss.remoting.transport.socket.SocketWrapper;
+
+
+/**
+ * Unit tests for JBREM-1183.
+ *
+ * @author <a href="ron.sigal(a)jboss.com">Ron Sigal</a>
+ * @version $Revision: 1.1 $
+ * <p>
+ * Copyright Feb 16, 2010
+ */
+public class ErrorTestCase extends TestCase
+{
+ private static Logger log = Logger.getLogger(ErrorTestCase.class);
+
+ private static boolean firstTime = true;
+ private static int whenToFail;
+
+ 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.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);
+ }
+ InvokerRegistry.registerInvokerFactories(getTransport(), TestClientFactory.class, TestServerFactory.class);
+ TestServerThread.threadCounter = 0;
+ }
+
+
+ public void tearDown()
+ {
+ }
+
+
+ public void testErrorFirstTime() throws Throwable
+ {
+ log.info("entering " + getName());
+
+ // Start server.
+ whenToFail = 0;
+ setupServer();
+
+ // Create client.
+ InvokerLocator clientLocator = new InvokerLocator(locatorURI);
+ HashMap clientConfig = new HashMap();
+ clientConfig.put(InvokerLocator.FORCE_REMOTE, "true");
+ clientConfig.put("timeout", "2000");
+ addExtraClientConfig(clientConfig);
+ Client client = new Client(clientLocator, clientConfig);
+ client.connect();
+ log.info("client is connected");
+
+ // Test invocations.
+ assertEquals("abc", client.invoke("abc"));
+ log.info("first invocation succeeded");
+ assertEquals("lmn", client.invoke("lmn"));
+ log.info("second invocation succeeded");
+ assertEquals("xyz", client.invoke("xyz"));
+ log.info("third invocation succeeded");
+ assertEquals(1, TestServerThread.threadCounter);
+
+ client.disconnect();
+ shutdownServer();
+ log.info(getName() + " PASSES");
+ }
+
+
+ public void testErrorSecondTime() throws Throwable
+ {
+ log.info("entering " + getName());
+
+ // Start server.
+ whenToFail = 1;
+ setupServer();
+
+ // Create client.
+ InvokerLocator clientLocator = new InvokerLocator(locatorURI);
+ HashMap clientConfig = new HashMap();
+ clientConfig.put(InvokerLocator.FORCE_REMOTE, "true");
+ clientConfig.put("timeout", "2000");
+ addExtraClientConfig(clientConfig);
+ Client client = new Client(clientLocator, clientConfig);
+ client.connect();
+ log.info("client is connected");
+
+ // Test invocations.
+ assertEquals("abc", client.invoke("abc"));
+ log.info("first invocation succeeded");
+ assertEquals("lmn", client.invoke("lmn"));
+ log.info("second invocation succeeded");
+ assertEquals("xyz", client.invoke("xyz"));
+ log.info("third invocation succeeded");
+ assertEquals(1, TestServerThread.threadCounter);
+
+ client.disconnect();
+ shutdownServer();
+ log.info(getName() + " PASSES");
+ }
+
+
+ public void testErrorThirdTime() throws Throwable
+ {
+ log.info("entering " + getName());
+
+ // Start server.
+ whenToFail = 2;
+ setupServer();
+
+ // Create client.
+ InvokerLocator clientLocator = new InvokerLocator(locatorURI);
+ HashMap clientConfig = new HashMap();
+ clientConfig.put(InvokerLocator.FORCE_REMOTE, "true");
+ clientConfig.put("timeout", "2000");
+ addExtraClientConfig(clientConfig);
+ Client client = new Client(clientLocator, clientConfig);
+ client.connect();
+ log.info("client is connected");
+
+ // Test invocations.
+ assertEquals("abc", client.invoke("abc"));
+ log.info("first invocation succeeded");
+ assertEquals("lmn", client.invoke("lmn"));
+ log.info("second invocation succeeded");
+ assertEquals("xyz", client.invoke("xyz"));
+ log.info("third invocation succeeded");
+ assertEquals(1, TestServerThread.threadCounter);
+
+ client.disconnect();
+ shutdownServer();
+ log.info(getName() + " PASSES");
+ }
+
+
+ protected String getTransport()
+ {
+ return "test";
+ }
+
+
+ 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
+ {
+ return invocation.getParameter();
+ }
+ public void removeListener(InvokerCallbackHandler callbackHandler) {}
+ public void setMBeanServer(MBeanServer server) {}
+ public void setInvoker(ServerInvoker invoker) {}
+ }
+
+
+ static class TestServerInvoker extends SocketServerInvoker
+ {
+ int counter;
+
+ public TestServerInvoker(InvokerLocator locator, Map configuration)
+ {
+ super(locator, configuration);
+ }
+ public TestServerInvoker(InvokerLocator locator)
+ {
+ super(locator);
+ }
+ protected void processInvocation(Socket socket) throws Exception
+ {
+ clientpool = new LRUPool(2, maxPoolSize);
+ clientpool.create();
+ threadpool = new LinkedList();
+ ServerThread worker = new TestServerThread(socket, this, clientpool, threadpool, 0, 0, ServerSocketWrapper.class.getName());
+ worker.start();
+ }
+ }
+
+
+ public static class TestServerThread extends ServerThread
+ {
+ static public int threadCounter;
+ private int counter;
+
+ public TestServerThread(Socket socket, SocketServerInvoker invoker, LRUPool clientpool, LinkedList threadpool,
+ int timeout, int writeTimeout, String serverSocketClassName) throws Exception
+ {
+ super(socket, invoker, clientpool, threadpool, timeout, writeTimeout, serverSocketClassName);
+ threadCounter++;
+ }
+ protected void processInvocation(SocketWrapper socketWrapper) throws Exception
+ {
+ super.processInvocation(socketWrapper);
+ if (counter++ == whenToFail)
+ throw new Error("TestServerThread");
+ }
+ }
+
+
+ public static class TestClientFactory implements ClientFactory
+ {
+ public ClientInvoker createClientInvoker(InvokerLocator locator, Map config) throws IOException
+ {
+ log.info("TestClientFaotory.createClientInvoker() called");
+ return new SocketClientInvoker(locator, config);
+ }
+ public boolean supportsSSL()
+ {
+ return false;
+ }
+ }
+
+
+ public static class TestServerFactory implements ServerFactory
+ {
+ public ServerInvoker createServerInvoker(InvokerLocator locator, Map config) throws IOException
+ {
+ log.info("TestServerFactory.createServerInvoker() called");
+ return new TestServerInvoker(locator, config);
+ }
+ public boolean supportsSSL()
+ {
+ return false;
+ }
+ }
}
\ No newline at end of file
Property changes on: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/socket/ErrorTestCase.java
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/socket/IdleTimerTaskNotifyTestCase.java
___________________________________________________________________
Name: svn:eol-style
+ native
14 years, 3 months
- 1
- 0
JBoss Remoting SVN: r6038 - remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/ssl.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2010-08-04 22:07:37 -0400 (Wed, 04 Aug 2010)
New Revision: 6038
Modified:
remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/ssl/SSLServletInvokerExceptionTestClient.java
Log:
JBREM-1241: Added svn:eol-style subversion property.
Modified: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/ssl/SSLServletInvokerExceptionTestClient.java
===================================================================
--- remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/ssl/SSLServletInvokerExceptionTestClient.java 2010-08-05 02:05:28 UTC (rev 6037)
+++ remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/ssl/SSLServletInvokerExceptionTestClient.java 2010-08-05 02:07:37 UTC (rev 6038)
@@ -1,65 +1,65 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, 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.servlet.ssl;
-
-import org.jboss.test.remoting.transport.web.WebInvokerTestClient;
-
-/**
- * This test is identical to ServletInvokerTestClient except that it, in the case
- * when an exception is thrown on the server, ServletServerInvoker is instructed
- * to return the actual exception.
- *
- * See JBREM-813.
- *
- * @author <a href="mailto:tom.elrod@jboss.com">Tom Elrod</a>
- * @author <a href="mailto:ron.sigal@jboss.com">Ron Sigal</a>
- */
-public class SSLServletInvokerExceptionTestClient extends WebInvokerTestClient
-{
- public static final Integer ERROR_RESPONSE_CODE = new Integer(500);
-
- public String getLocatorURI()
- {
- // since doing basic (using default ssl server socket factory)
- // need to set the system properties to the truststore
- String trustStoreFilePath = this.getClass().getResource("truststore").getFile();
- System.setProperty("javax.net.ssl.trustStore", trustStoreFilePath);
-
- return "sslservlet://localhost:8443/servlet-invoker/ServerInvokerServlet/?createUniqueObjectName=true";
- //return "http://localhost:8080/servlet-invoker/ServerInvokerServlet";
- }
-
- public static void main(String[] args)
- {
- SSLServletInvokerExceptionTestClient client = new SSLServletInvokerExceptionTestClient();
- try
- {
- client.testPostInvocation();
- }
- catch (Exception e)
- {
- e.printStackTrace();
- }
- }
-
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2005, 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.servlet.ssl;
+
+import org.jboss.test.remoting.transport.web.WebInvokerTestClient;
+
+/**
+ * This test is identical to ServletInvokerTestClient except that it, in the case
+ * when an exception is thrown on the server, ServletServerInvoker is instructed
+ * to return the actual exception.
+ *
+ * See JBREM-813.
+ *
+ * @author <a href="mailto:tom.elrod@jboss.com">Tom Elrod</a>
+ * @author <a href="mailto:ron.sigal@jboss.com">Ron Sigal</a>
+ */
+public class SSLServletInvokerExceptionTestClient extends WebInvokerTestClient
+{
+ public static final Integer ERROR_RESPONSE_CODE = new Integer(500);
+
+ public String getLocatorURI()
+ {
+ // since doing basic (using default ssl server socket factory)
+ // need to set the system properties to the truststore
+ String trustStoreFilePath = this.getClass().getResource("truststore").getFile();
+ System.setProperty("javax.net.ssl.trustStore", trustStoreFilePath);
+
+ return "sslservlet://localhost:8443/servlet-invoker/ServerInvokerServlet/?createUniqueObjectName=true";
+ //return "http://localhost:8080/servlet-invoker/ServerInvokerServlet";
+ }
+
+ public static void main(String[] args)
+ {
+ SSLServletInvokerExceptionTestClient client = new SSLServletInvokerExceptionTestClient();
+ try
+ {
+ client.testPostInvocation();
+ }
+ catch (Exception e)
+ {
+ e.printStackTrace();
+ }
+ }
+
}
\ No newline at end of file
Property changes on: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/ssl/SSLServletInvokerExceptionTestClient.java
___________________________________________________________________
Name: svn:eol-style
+ native
14 years, 3 months
- 1
- 0
JBoss Remoting SVN: r6037 - remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/preservelines.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2010-08-04 22:05:28 -0400 (Wed, 04 Aug 2010)
New Revision: 6037
Modified:
remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/preservelines/ServletLinePreservationTestClient.java
remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/preservelines/TestInvocationHandler.java
remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/preservelines/readme.txt
remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/preservelines/remoting-servlet-service.xml
Log:
JBREM-1241: Added svn:eol-style subversion property.
Modified: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/preservelines/ServletLinePreservationTestClient.java
===================================================================
--- remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/preservelines/ServletLinePreservationTestClient.java 2010-08-05 02:02:31 UTC (rev 6036)
+++ remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/preservelines/ServletLinePreservationTestClient.java 2010-08-05 02:05:28 UTC (rev 6037)
@@ -1,51 +1,51 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, 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.servlet.preservelines;
-
-import org.jboss.remoting.InvokerLocator;
-import org.jboss.test.remoting.transport.http.lines.HttpLinePreservationTestCase;
-
-
-/**
- * Unit tests for JBREM-809.
- *
- * @author <a href="ron.sigal(a)jboss.com">Ron Sigal</a>
- * @version $Revision: 1.1 $
- * <p>
- * Copyright Feb 8, 2008
- * </p>
- */
-public class ServletLinePreservationTestClient extends HttpLinePreservationTestCase
-{
- protected String getTransport()
- {
- return "servlet";
- }
-
- protected void setupServer(boolean addConfig, String preserveLines) throws Exception
- {
- locatorURI = "servlet://localhost:8080/servlet-invoker/ServerInvokerServlet";
- serverLocator = new InvokerLocator(locatorURI);
- }
-
- public void testPreservationClientNoPreservationServer() {}
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2005, 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.servlet.preservelines;
+
+import org.jboss.remoting.InvokerLocator;
+import org.jboss.test.remoting.transport.http.lines.HttpLinePreservationTestCase;
+
+
+/**
+ * Unit tests for JBREM-809.
+ *
+ * @author <a href="ron.sigal(a)jboss.com">Ron Sigal</a>
+ * @version $Revision: 1.1 $
+ * <p>
+ * Copyright Feb 8, 2008
+ * </p>
+ */
+public class ServletLinePreservationTestClient extends HttpLinePreservationTestCase
+{
+ protected String getTransport()
+ {
+ return "servlet";
+ }
+
+ protected void setupServer(boolean addConfig, String preserveLines) throws Exception
+ {
+ locatorURI = "servlet://localhost:8080/servlet-invoker/ServerInvokerServlet";
+ serverLocator = new InvokerLocator(locatorURI);
+ }
+
+ public void testPreservationClientNoPreservationServer() {}
}
\ No newline at end of file
Property changes on: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/preservelines/ServletLinePreservationTestClient.java
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/preservelines/TestInvocationHandler.java
===================================================================
--- remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/preservelines/TestInvocationHandler.java 2010-08-05 02:02:31 UTC (rev 6036)
+++ remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/preservelines/TestInvocationHandler.java 2010-08-05 02:05:28 UTC (rev 6037)
@@ -1,51 +1,51 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, 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.servlet.preservelines;
-
-import javax.management.MBeanServer;
-
-import org.jboss.remoting.InvocationRequest;
-import org.jboss.remoting.ServerInvocationHandler;
-import org.jboss.remoting.ServerInvoker;
-import org.jboss.remoting.callback.InvokerCallbackHandler;
-
-/**
- * For JBREM-809.
- *
- * @author <a href="ron.sigal(a)jboss.com">Ron Sigal</a>
- * @version $Revision: 1.1 $
- * <p>
- * Copyright Feb 8, 2008
- * </p>
- */
-public 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) {}
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2005, 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.servlet.preservelines;
+
+import javax.management.MBeanServer;
+
+import org.jboss.remoting.InvocationRequest;
+import org.jboss.remoting.ServerInvocationHandler;
+import org.jboss.remoting.ServerInvoker;
+import org.jboss.remoting.callback.InvokerCallbackHandler;
+
+/**
+ * For JBREM-809.
+ *
+ * @author <a href="ron.sigal(a)jboss.com">Ron Sigal</a>
+ * @version $Revision: 1.1 $
+ * <p>
+ * Copyright Feb 8, 2008
+ * </p>
+ */
+public 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) {}
}
\ No newline at end of file
Property changes on: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/preservelines/TestInvocationHandler.java
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/preservelines/readme.txt
===================================================================
--- remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/preservelines/readme.txt 2010-08-05 02:02:31 UTC (rev 6036)
+++ remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/preservelines/readme.txt 2010-08-05 02:05:28 UTC (rev 6037)
@@ -1,40 +1,40 @@
-The servlet (and sslservlet) transport tests require a web container. Currently, these tests have to be run
-manually (JBREM-139 has been created to automate this). Until then, here are the instructions for running
-the tests manually.
-
-*******************************************************
-***** JBREM-139 is done. *****
-***** See tests.functional.servlet in build.xml. *****
-*******************************************************
-
-servlet
-
-1. Get JBossAS and copy remoting's servlet-invoker.war (from distro or build) to the deploy directory.
-2. Copy the WEB-INF/web.xml under this directory into the that of the servlet-invoker.war/WEB-INF directory.
-3. Copy remoting-servlet-invoker-service.xml to deploy directory.
-4. Copy jboss-remoting-tests.jar to server lib directory
-5. Start web container (JBossAS).
-6. Run ServletLinePreservationTestClient.
-
-
-sslservlet
-
-1. Steps 1-4 above, except use the WEB-INF/web.xml and remoting-servlet-invoker-service.xml that is under the
-servlet/ssl directory.
-2. Copy the servlet/ssl/.keystore file to the server conf directory
-3. Edit jboss-web.deployer/server.xml to enable ssl connector. It should look like following:
-
- <Connector port="8443" protocol="HTTP/1.1" SSLEnabled="true"
- maxThreads="150"
- scheme="https" secure="true" clientAuth="false"
- address="${jboss.bind.address}"
- keystoreFile="${jboss.server.home.dir}/conf/.keystore"
- keystorePass="unit-tests-server"
- sslProtocol="TLS"/>
-
-
-4. Start web container (JBossAS).
-5. Run SSLServletInvokerTestClient or SSLServletClientAddressTestClient.
-
-
-
+The servlet (and sslservlet) transport tests require a web container. Currently, these tests have to be run
+manually (JBREM-139 has been created to automate this). Until then, here are the instructions for running
+the tests manually.
+
+*******************************************************
+***** JBREM-139 is done. *****
+***** See tests.functional.servlet in build.xml. *****
+*******************************************************
+
+servlet
+
+1. Get JBossAS and copy remoting's servlet-invoker.war (from distro or build) to the deploy directory.
+2. Copy the WEB-INF/web.xml under this directory into the that of the servlet-invoker.war/WEB-INF directory.
+3. Copy remoting-servlet-invoker-service.xml to deploy directory.
+4. Copy jboss-remoting-tests.jar to server lib directory
+5. Start web container (JBossAS).
+6. Run ServletLinePreservationTestClient.
+
+
+sslservlet
+
+1. Steps 1-4 above, except use the WEB-INF/web.xml and remoting-servlet-invoker-service.xml that is under the
+servlet/ssl directory.
+2. Copy the servlet/ssl/.keystore file to the server conf directory
+3. Edit jboss-web.deployer/server.xml to enable ssl connector. It should look like following:
+
+ <Connector port="8443" protocol="HTTP/1.1" SSLEnabled="true"
+ maxThreads="150"
+ scheme="https" secure="true" clientAuth="false"
+ address="${jboss.bind.address}"
+ keystoreFile="${jboss.server.home.dir}/conf/.keystore"
+ keystorePass="unit-tests-server"
+ sslProtocol="TLS"/>
+
+
+4. Start web container (JBossAS).
+5. Run SSLServletInvokerTestClient or SSLServletClientAddressTestClient.
+
+
+
Property changes on: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/preservelines/readme.txt
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/preservelines/remoting-servlet-service.xml
===================================================================
--- remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/preservelines/remoting-servlet-service.xml 2010-08-05 02:02:31 UTC (rev 6036)
+++ remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/preservelines/remoting-servlet-service.xml 2010-08-05 02:05:28 UTC (rev 6037)
@@ -1,22 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<server>
- <mbean code="org.jboss.remoting.transport.Connector"
- name="jboss.remoting:service=Connector,transport=Servlet"
- display-name="Servlet transport Connector">
-
- <attribute name="Configuration">
- <config>
- <invoker transport="servlet">
- <attribute name="serverBindAddress">localhost</attribute>
- <attribute name="serverBindPort">8080</attribute>
- <attribute name="preserveLines" isParam="true">true</attribute>
- <attribute name="path">servlet-invoker/ServerInvokerServlet</attribute>
- </invoker>
- <handlers>
- <handler subsystem="test">org.jboss.test.remoting.transport.servlet.preservelines.TestInvocationHandler</handler>
- </handlers>
- </config>
- </attribute>
- </mbean>
-</server>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<server>
+ <mbean code="org.jboss.remoting.transport.Connector"
+ name="jboss.remoting:service=Connector,transport=Servlet"
+ display-name="Servlet transport Connector">
+
+ <attribute name="Configuration">
+ <config>
+ <invoker transport="servlet">
+ <attribute name="serverBindAddress">localhost</attribute>
+ <attribute name="serverBindPort">8080</attribute>
+ <attribute name="preserveLines" isParam="true">true</attribute>
+ <attribute name="path">servlet-invoker/ServerInvokerServlet</attribute>
+ </invoker>
+ <handlers>
+ <handler subsystem="test">org.jboss.test.remoting.transport.servlet.preservelines.TestInvocationHandler</handler>
+ </handlers>
+ </config>
+ </attribute>
+ </mbean>
+</server>
Property changes on: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/preservelines/remoting-servlet-service.xml
___________________________________________________________________
Name: svn:eol-style
+ native
14 years, 3 months
- 1
- 0
JBoss Remoting SVN: r6036 - remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/nopreservelines.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2010-08-04 22:02:31 -0400 (Wed, 04 Aug 2010)
New Revision: 6036
Modified:
remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/nopreservelines/readme.txt
Log:
JBREM-1241: Added svn:eol-style subversion property.
Modified: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/nopreservelines/readme.txt
===================================================================
--- remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/nopreservelines/readme.txt 2010-08-05 01:59:38 UTC (rev 6035)
+++ remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/nopreservelines/readme.txt 2010-08-05 02:02:31 UTC (rev 6036)
@@ -1,40 +1,40 @@
-The servlet (and sslservlet) transport tests require a web container. Currently, these tests have to be run
-manually (JBREM-139 has been created to automate this). Until then, here are the instructions for running
-the tests manually.
-
-*******************************************************
-***** JBREM-139 is done. *****
-***** See tests.functional.servlet in build.xml. *****
-*******************************************************
-
-servlet
-
-1. Get JBossAS and copy remoting's servlet-invoker.war (from distro or build) to the deploy directory.
-2. Copy the WEB-INF/web.xml under this directory into the that of the servlet-invoker.war/WEB-INF directory.
-3. Copy remoting-servlet-invoker-service.xml to deploy directory.
-4. Copy jboss-remoting-tests.jar to server lib directory
-5. Start web container (JBossAS).
-6. Run ServletLinePreservationTestClient.
-
-
-sslservlet
-
-1. Steps 1-4 above, except use the WEB-INF/web.xml and remoting-servlet-invoker-service.xml that is under the
-servlet/ssl directory.
-2. Copy the servlet/ssl/.keystore file to the server conf directory
-3. Edit jboss-web.deployer/server.xml to enable ssl connector. It should look like following:
-
- <Connector port="8443" protocol="HTTP/1.1" SSLEnabled="true"
- maxThreads="150"
- scheme="https" secure="true" clientAuth="false"
- address="${jboss.bind.address}"
- keystoreFile="${jboss.server.home.dir}/conf/.keystore"
- keystorePass="unit-tests-server"
- sslProtocol="TLS"/>
-
-
-4. Start web container (JBossAS).
-5. Run SSLServletInvokerTestClient or SSLServletClientAddressTestClient.
-
-
-
+The servlet (and sslservlet) transport tests require a web container. Currently, these tests have to be run
+manually (JBREM-139 has been created to automate this). Until then, here are the instructions for running
+the tests manually.
+
+*******************************************************
+***** JBREM-139 is done. *****
+***** See tests.functional.servlet in build.xml. *****
+*******************************************************
+
+servlet
+
+1. Get JBossAS and copy remoting's servlet-invoker.war (from distro or build) to the deploy directory.
+2. Copy the WEB-INF/web.xml under this directory into the that of the servlet-invoker.war/WEB-INF directory.
+3. Copy remoting-servlet-invoker-service.xml to deploy directory.
+4. Copy jboss-remoting-tests.jar to server lib directory
+5. Start web container (JBossAS).
+6. Run ServletLinePreservationTestClient.
+
+
+sslservlet
+
+1. Steps 1-4 above, except use the WEB-INF/web.xml and remoting-servlet-invoker-service.xml that is under the
+servlet/ssl directory.
+2. Copy the servlet/ssl/.keystore file to the server conf directory
+3. Edit jboss-web.deployer/server.xml to enable ssl connector. It should look like following:
+
+ <Connector port="8443" protocol="HTTP/1.1" SSLEnabled="true"
+ maxThreads="150"
+ scheme="https" secure="true" clientAuth="false"
+ address="${jboss.bind.address}"
+ keystoreFile="${jboss.server.home.dir}/conf/.keystore"
+ keystorePass="unit-tests-server"
+ sslProtocol="TLS"/>
+
+
+4. Start web container (JBossAS).
+5. Run SSLServletInvokerTestClient or SSLServletClientAddressTestClient.
+
+
+
Property changes on: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/nopreservelines/readme.txt
___________________________________________________________________
Name: svn:eol-style
+ native
14 years, 3 months
- 1
- 0
JBoss Remoting SVN: r6035 - remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/nopreservelines.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2010-08-04 21:59:38 -0400 (Wed, 04 Aug 2010)
New Revision: 6035
Modified:
remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/nopreservelines/ServletNoLinePreservationTestClient.java
remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/nopreservelines/TestInvocationHandler.java
remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/nopreservelines/remoting-servlet-service.xml
Log:
JBREM-1241: Added svn:eol-style subversion property.
Modified: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/nopreservelines/ServletNoLinePreservationTestClient.java
===================================================================
--- remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/nopreservelines/ServletNoLinePreservationTestClient.java 2010-08-05 01:55:44 UTC (rev 6034)
+++ remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/nopreservelines/ServletNoLinePreservationTestClient.java 2010-08-05 01:59:38 UTC (rev 6035)
@@ -1,52 +1,52 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, 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.servlet.nopreservelines;
-
-import org.jboss.remoting.InvokerLocator;
-import org.jboss.test.remoting.transport.http.lines.HttpLinePreservationTestCase;
-
-
-/**
- * Unit tests for JBREM-809.
- *
- * @author <a href="ron.sigal(a)jboss.com">Ron Sigal</a>
- * @version $Revision: 1.1 $
- * <p>
- * Copyright Feb 8, 2008
- * </p>
- */
-public class ServletNoLinePreservationTestClient extends HttpLinePreservationTestCase
-{
- protected String getTransport()
- {
- return "servlet";
- }
-
- protected void setupServer(boolean addConfig, String preserveLines) throws Exception
- {
- locatorURI = "servlet://localhost:8080/servlet-invoker/ServerInvokerServlet";
- serverLocator = new InvokerLocator(locatorURI);
- }
-
- public void testLinePreservationClientConfig() {}
- public void testLinePreservationClientMetadata() {}
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2005, 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.servlet.nopreservelines;
+
+import org.jboss.remoting.InvokerLocator;
+import org.jboss.test.remoting.transport.http.lines.HttpLinePreservationTestCase;
+
+
+/**
+ * Unit tests for JBREM-809.
+ *
+ * @author <a href="ron.sigal(a)jboss.com">Ron Sigal</a>
+ * @version $Revision: 1.1 $
+ * <p>
+ * Copyright Feb 8, 2008
+ * </p>
+ */
+public class ServletNoLinePreservationTestClient extends HttpLinePreservationTestCase
+{
+ protected String getTransport()
+ {
+ return "servlet";
+ }
+
+ protected void setupServer(boolean addConfig, String preserveLines) throws Exception
+ {
+ locatorURI = "servlet://localhost:8080/servlet-invoker/ServerInvokerServlet";
+ serverLocator = new InvokerLocator(locatorURI);
+ }
+
+ public void testLinePreservationClientConfig() {}
+ public void testLinePreservationClientMetadata() {}
}
\ No newline at end of file
Property changes on: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/nopreservelines/ServletNoLinePreservationTestClient.java
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/nopreservelines/TestInvocationHandler.java
===================================================================
--- remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/nopreservelines/TestInvocationHandler.java 2010-08-05 01:55:44 UTC (rev 6034)
+++ remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/nopreservelines/TestInvocationHandler.java 2010-08-05 01:59:38 UTC (rev 6035)
@@ -1,51 +1,51 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, 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.servlet.nopreservelines;
-
-import javax.management.MBeanServer;
-
-import org.jboss.remoting.InvocationRequest;
-import org.jboss.remoting.ServerInvocationHandler;
-import org.jboss.remoting.ServerInvoker;
-import org.jboss.remoting.callback.InvokerCallbackHandler;
-
-/**
- * For JBREM-809.
- *
- * @author <a href="ron.sigal(a)jboss.com">Ron Sigal</a>
- * @version $Revision: 1.1 $
- * <p>
- * Copyright Feb 8, 2008
- * </p>
- */
-public 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) {}
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2005, 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.servlet.nopreservelines;
+
+import javax.management.MBeanServer;
+
+import org.jboss.remoting.InvocationRequest;
+import org.jboss.remoting.ServerInvocationHandler;
+import org.jboss.remoting.ServerInvoker;
+import org.jboss.remoting.callback.InvokerCallbackHandler;
+
+/**
+ * For JBREM-809.
+ *
+ * @author <a href="ron.sigal(a)jboss.com">Ron Sigal</a>
+ * @version $Revision: 1.1 $
+ * <p>
+ * Copyright Feb 8, 2008
+ * </p>
+ */
+public 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) {}
}
\ No newline at end of file
Property changes on: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/nopreservelines/TestInvocationHandler.java
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/nopreservelines/remoting-servlet-service.xml
===================================================================
--- remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/nopreservelines/remoting-servlet-service.xml 2010-08-05 01:55:44 UTC (rev 6034)
+++ remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/nopreservelines/remoting-servlet-service.xml 2010-08-05 01:59:38 UTC (rev 6035)
@@ -1,22 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<server>
- <mbean code="org.jboss.remoting.transport.Connector"
- name="jboss.remoting:service=Connector,transport=Servlet"
- display-name="Servlet transport Connector">
-
- <attribute name="Configuration">
- <config>
- <invoker transport="servlet">
- <attribute name="serverBindAddress">localhost</attribute>
- <attribute name="serverBindPort">8080</attribute>
- <attribute name="preserveLines" isParam="true">false</attribute>
- <attribute name="path">servlet-invoker/ServerInvokerServlet</attribute>
- </invoker>
- <handlers>
- <handler subsystem="test">org.jboss.test.remoting.transport.servlet.nopreservelines.TestInvocationHandler</handler>
- </handlers>
- </config>
- </attribute>
- </mbean>
-</server>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<server>
+ <mbean code="org.jboss.remoting.transport.Connector"
+ name="jboss.remoting:service=Connector,transport=Servlet"
+ display-name="Servlet transport Connector">
+
+ <attribute name="Configuration">
+ <config>
+ <invoker transport="servlet">
+ <attribute name="serverBindAddress">localhost</attribute>
+ <attribute name="serverBindPort">8080</attribute>
+ <attribute name="preserveLines" isParam="true">false</attribute>
+ <attribute name="path">servlet-invoker/ServerInvokerServlet</attribute>
+ </invoker>
+ <handlers>
+ <handler subsystem="test">org.jboss.test.remoting.transport.servlet.nopreservelines.TestInvocationHandler</handler>
+ </handlers>
+ </config>
+ </attribute>
+ </mbean>
+</server>
Property changes on: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/nopreservelines/remoting-servlet-service.xml
___________________________________________________________________
Name: svn:eol-style
+ native
14 years, 3 months
- 1
- 0
JBoss Remoting SVN: r6034 - remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/marshal/noconfig.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2010-08-04 21:55:44 -0400 (Wed, 04 Aug 2010)
New Revision: 6034
Modified:
remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/marshal/noconfig/ServletConfigurationMapTestClient.java
remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/marshal/noconfig/remoting-servlet-service.xml
Log:
JBREM-1241: Added svn:eol-style subversion property.
Modified: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/marshal/noconfig/ServletConfigurationMapTestClient.java
===================================================================
--- remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/marshal/noconfig/ServletConfigurationMapTestClient.java 2010-08-05 01:54:14 UTC (rev 6033)
+++ remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/marshal/noconfig/ServletConfigurationMapTestClient.java 2010-08-05 01:55:44 UTC (rev 6034)
@@ -1,96 +1,96 @@
-/*
- * 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.servlet.marshal.noconfig;
-
-import java.util.Map;
-
-import org.apache.log4j.Logger;
-import org.jboss.test.remoting.marshall.config.ConfigurationMapTestParent;
-
-/**
- * Unit tests for JBREM-1102.
- *
- * @author <a href="ron.sigal(a)jboss.com">Ron Sigal</a>
- * @version
- * <p>
- * Copyright Mar 21, 2009
- * </p>
- */
-public class ServletConfigurationMapTestClient extends ConfigurationMapTestParent
-{
- protected static Logger log = Logger.getLogger(ServletConfigurationMapTestClient.class);
-
- public void testDatatypePassConfigMapTrue() throws Throwable
- {
- log.info("skipping " + getName());
- }
-
- public void testFQNConfigPassConfigMapTrue() throws Throwable
- {
- log.info("skipping " + getName());
- }
-
- protected int marshallerCountDatatype()
- {
- return 2;
- }
-
- protected int unmarshallerCountDatatype()
- {
- return 2;
- }
-
- protected int marshallerCountFQN()
- {
- return 1;
- }
-
- protected int unmarshallerCountFQN()
- {
- return 1;
- }
-
- protected int marshallerDatatypeUnused()
- {
- return 0;
- }
-
- protected int marshallerFQNUnused()
- {
- return 0;
- }
-
- protected String getTransport()
- {
- return "servlet";
- }
-
- protected void setupServer(String parameter, Map extraConfig) throws Exception
- {
- locatorURI = "servlet://localhost:8080/servlet-invoker/ServerInvokerServlet/?" + parameter;
-// "marshaller=org.jboss.test.remoting.marshall.config.ConfigTestMarshaller&" +
-// "unmarshaller=org.jboss.test.remoting.marshall.config.ConfigTestUnmarshaller";
-
- log.info("setting InvokerLocator to " + locatorURI);
- }
-}
-
+/*
+ * 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.servlet.marshal.noconfig;
+
+import java.util.Map;
+
+import org.apache.log4j.Logger;
+import org.jboss.test.remoting.marshall.config.ConfigurationMapTestParent;
+
+/**
+ * Unit tests for JBREM-1102.
+ *
+ * @author <a href="ron.sigal(a)jboss.com">Ron Sigal</a>
+ * @version
+ * <p>
+ * Copyright Mar 21, 2009
+ * </p>
+ */
+public class ServletConfigurationMapTestClient extends ConfigurationMapTestParent
+{
+ protected static Logger log = Logger.getLogger(ServletConfigurationMapTestClient.class);
+
+ public void testDatatypePassConfigMapTrue() throws Throwable
+ {
+ log.info("skipping " + getName());
+ }
+
+ public void testFQNConfigPassConfigMapTrue() throws Throwable
+ {
+ log.info("skipping " + getName());
+ }
+
+ protected int marshallerCountDatatype()
+ {
+ return 2;
+ }
+
+ protected int unmarshallerCountDatatype()
+ {
+ return 2;
+ }
+
+ protected int marshallerCountFQN()
+ {
+ return 1;
+ }
+
+ protected int unmarshallerCountFQN()
+ {
+ return 1;
+ }
+
+ protected int marshallerDatatypeUnused()
+ {
+ return 0;
+ }
+
+ protected int marshallerFQNUnused()
+ {
+ return 0;
+ }
+
+ protected String getTransport()
+ {
+ return "servlet";
+ }
+
+ protected void setupServer(String parameter, Map extraConfig) throws Exception
+ {
+ locatorURI = "servlet://localhost:8080/servlet-invoker/ServerInvokerServlet/?" + parameter;
+// "marshaller=org.jboss.test.remoting.marshall.config.ConfigTestMarshaller&" +
+// "unmarshaller=org.jboss.test.remoting.marshall.config.ConfigTestUnmarshaller";
+
+ log.info("setting InvokerLocator to " + locatorURI);
+ }
+}
+
Property changes on: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/marshal/noconfig/ServletConfigurationMapTestClient.java
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/marshal/noconfig/remoting-servlet-service.xml
===================================================================
--- remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/marshal/noconfig/remoting-servlet-service.xml 2010-08-05 01:54:14 UTC (rev 6033)
+++ remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/marshal/noconfig/remoting-servlet-service.xml 2010-08-05 01:55:44 UTC (rev 6034)
@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<server>
-
- <mbean code="org.jboss.remoting.transport.Connector"
- name="jboss.remoting:service=Connector,transport=Servlet,target=tests"
- display-name="Servlet transport Connector">
-
- <attribute name="InvokerLocator">
- servlet://localhost:8080/servlet-invoker/ServerInvokerServlet
- </attribute>
-
- <attribute name="Configuration">
- <config>
- <handlers>
- <handler subsystem="test">org.jboss.test.remoting.marshall.config.TestInvocationHandler</handler>
- </handlers>
- </config>
- </attribute>
- </mbean>
-
-
-</server>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<server>
+
+ <mbean code="org.jboss.remoting.transport.Connector"
+ name="jboss.remoting:service=Connector,transport=Servlet,target=tests"
+ display-name="Servlet transport Connector">
+
+ <attribute name="InvokerLocator">
+ servlet://localhost:8080/servlet-invoker/ServerInvokerServlet
+ </attribute>
+
+ <attribute name="Configuration">
+ <config>
+ <handlers>
+ <handler subsystem="test">org.jboss.test.remoting.marshall.config.TestInvocationHandler</handler>
+ </handlers>
+ </config>
+ </attribute>
+ </mbean>
+
+
+</server>
Property changes on: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/marshal/noconfig/remoting-servlet-service.xml
___________________________________________________________________
Name: svn:eol-style
+ native
14 years, 3 months
- 1
- 0
JBoss Remoting SVN: r6033 - remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/marshal/config.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2010-08-04 21:54:14 -0400 (Wed, 04 Aug 2010)
New Revision: 6033
Modified:
remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/marshal/config/remoting-servlet-service.xml
Log:
JBREM-1241: Added svn:eol-style subversion property.
Modified: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/marshal/config/remoting-servlet-service.xml
===================================================================
--- remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/marshal/config/remoting-servlet-service.xml 2010-08-05 01:53:41 UTC (rev 6032)
+++ remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/marshal/config/remoting-servlet-service.xml 2010-08-05 01:54:14 UTC (rev 6033)
@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<server>
-
- <mbean code="org.jboss.remoting.transport.Connector"
- name="jboss.remoting:service=Connector,transport=Servlet,target=tests"
- display-name="Servlet transport Connector">
-
- <attribute name="InvokerLocator">
- servlet://localhost:8080/servlet-invoker/ServerInvokerServlet/?marshaller=org.jboss.test.remoting.marshall.config.ConfigTestMarshaller&unmarshaller=org.jboss.test.remoting.marshall.config.ConfigTestUnmarshaller
- </attribute>
-
- <attribute name="Configuration">
- <config>
- <handlers>
- <handler subsystem="test">org.jboss.test.remoting.marshall.config.TestInvocationHandler</handler>
- </handlers>
- </config>
- </attribute>
- </mbean>
-
-
-</server>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<server>
+
+ <mbean code="org.jboss.remoting.transport.Connector"
+ name="jboss.remoting:service=Connector,transport=Servlet,target=tests"
+ display-name="Servlet transport Connector">
+
+ <attribute name="InvokerLocator">
+ servlet://localhost:8080/servlet-invoker/ServerInvokerServlet/?marshaller=org.jboss.test.remoting.marshall.config.ConfigTestMarshaller&unmarshaller=org.jboss.test.remoting.marshall.config.ConfigTestUnmarshaller
+ </attribute>
+
+ <attribute name="Configuration">
+ <config>
+ <handlers>
+ <handler subsystem="test">org.jboss.test.remoting.marshall.config.TestInvocationHandler</handler>
+ </handlers>
+ </config>
+ </attribute>
+ </mbean>
+
+
+</server>
Property changes on: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/marshal/config/remoting-servlet-service.xml
___________________________________________________________________
Name: svn:eol-style
+ native
14 years, 3 months
- 1
- 0
JBoss Remoting SVN: r6032 - remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/marshal/config/WEB-INF.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2010-08-04 21:53:41 -0400 (Wed, 04 Aug 2010)
New Revision: 6032
Modified:
remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/marshal/config/WEB-INF/web.xml
Log:
JBREM-1241: Added svn:eol-style subversion property.
Modified: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/marshal/config/WEB-INF/web.xml
===================================================================
--- remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/marshal/config/WEB-INF/web.xml 2010-08-05 01:52:52 UTC (rev 6031)
+++ remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/marshal/config/WEB-INF/web.xml 2010-08-05 01:53:41 UTC (rev 6032)
@@ -1,29 +1,29 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE web-app PUBLIC
- "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
- "http://java.sun.com/dtd/web-app_2_3.dtd">
-
-<!-- The the JBossRemoting server invoker servlet web.xml descriptor
-$Id: web.xml 4903 2009-03-24 07:33:10Z ron.sigal(a)jboss.com $
--->
-<web-app>
- <servlet>
- <servlet-name>ServerInvokerServlet</servlet-name>
- <description>The ServerInvokerServlet receives requests via HTTP
- protocol from within a web container and passes it onto the
- ServletServerInvoker for processing.
- </description>
- <servlet-class>org.jboss.remoting.transport.servlet.web.ServerInvokerServlet</servlet-class>
- <init-param>
- <param-name>locatorUrl</param-name>
- <param-value>servlet://localhost:8080/servlet-invoker/ServerInvokerServlet/?marshaller=org.jboss.test.remoting.marshall.config.ConfigTestMarshaller&unmarshaller=org.jboss.test.remoting.marshall.config.ConfigTestUnmarshaller</param-value>
- <description>The servlet server invoker locator url</description>
- </init-param>
- <load-on-startup>1</load-on-startup>
- </servlet>
- <servlet-mapping>
- <servlet-name>ServerInvokerServlet</servlet-name>
- <url-pattern>/ServerInvokerServlet/*</url-pattern>
- </servlet-mapping>
-</web-app>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE web-app PUBLIC
+ "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+ "http://java.sun.com/dtd/web-app_2_3.dtd">
+
+<!-- The the JBossRemoting server invoker servlet web.xml descriptor
+$Id: web.xml 4903 2009-03-24 07:33:10Z ron.sigal(a)jboss.com $
+-->
+<web-app>
+ <servlet>
+ <servlet-name>ServerInvokerServlet</servlet-name>
+ <description>The ServerInvokerServlet receives requests via HTTP
+ protocol from within a web container and passes it onto the
+ ServletServerInvoker for processing.
+ </description>
+ <servlet-class>org.jboss.remoting.transport.servlet.web.ServerInvokerServlet</servlet-class>
+ <init-param>
+ <param-name>locatorUrl</param-name>
+ <param-value>servlet://localhost:8080/servlet-invoker/ServerInvokerServlet/?marshaller=org.jboss.test.remoting.marshall.config.ConfigTestMarshaller&unmarshaller=org.jboss.test.remoting.marshall.config.ConfigTestUnmarshaller</param-value>
+ <description>The servlet server invoker locator url</description>
+ </init-param>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>ServerInvokerServlet</servlet-name>
+ <url-pattern>/ServerInvokerServlet/*</url-pattern>
+ </servlet-mapping>
+</web-app>
+
Property changes on: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/marshal/config/WEB-INF/web.xml
___________________________________________________________________
Name: svn:eol-style
+ native
14 years, 3 months
- 1
- 0
JBoss Remoting SVN: r6031 - remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/marshal/config.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2010-08-04 21:52:52 -0400 (Wed, 04 Aug 2010)
New Revision: 6031
Modified:
remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/marshal/config/ServletConfigurationMapTestClient.java
Log:
JBREM-1241: Added svn:eol-style subversion property.
Modified: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/marshal/config/ServletConfigurationMapTestClient.java
===================================================================
--- remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/marshal/config/ServletConfigurationMapTestClient.java 2010-08-05 01:49:59 UTC (rev 6030)
+++ remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/marshal/config/ServletConfigurationMapTestClient.java 2010-08-05 01:52:52 UTC (rev 6031)
@@ -1,96 +1,96 @@
-/*
- * 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.servlet.marshal.config;
-
-import java.util.Map;
-
-import org.apache.log4j.Logger;
-import org.jboss.test.remoting.marshall.config.ConfigurationMapTestParent;
-
-/**
- * Unit tests for JBREM-1102.
- *
- * @author <a href="ron.sigal(a)jboss.com">Ron Sigal</a>
- * @version
- * <p>
- * Copyright Mar 21, 2009
- * </p>
- */
-public class ServletConfigurationMapTestClient extends ConfigurationMapTestParent
-{
- protected static Logger log = Logger.getLogger(ServletConfigurationMapTestClient.class);
-
- public void testDatatypeConfigDefault() throws Throwable
- {
- log.info("skipping " + getName());
- }
-
- public void testDatatypePassConfigMapFalse() throws Throwable
- {
- log.info("skipping " + getName());
- }
-
- public void testFQNConfigDefault() throws Throwable
- {
- log.info("skipping " + getName());
- }
-
- public void testFQNPassConfigMapFalse() throws Throwable
- {
- log.info("skipping " + getName());
- }
-
- protected int marshallerCountDatatype()
- {
- return 2;
- }
-
- protected int unmarshallerCountDatatype()
- {
- return 2;
- }
-
- protected int marshallerCountFQN()
- {
- return 1;
- }
-
- protected int unmarshallerCountFQN()
- {
- return 1;
- }
-
- protected String getTransport()
- {
- return "servlet";
- }
-
- protected void setupServer(String parameter, Map extraConfig) throws Exception
- {
- locatorURI = "servlet://localhost:8080/servlet-invoker/ServerInvokerServlet/?" + parameter;
-// "marshaller=org.jboss.test.remoting.marshall.config.ConfigTestMarshaller&" +
-// "unmarshaller=org.jboss.test.remoting.marshall.config.ConfigTestUnmarshaller";
-
- log.info("setting InvokerLocator to " + locatorURI);
- }
-}
-
+/*
+ * 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.servlet.marshal.config;
+
+import java.util.Map;
+
+import org.apache.log4j.Logger;
+import org.jboss.test.remoting.marshall.config.ConfigurationMapTestParent;
+
+/**
+ * Unit tests for JBREM-1102.
+ *
+ * @author <a href="ron.sigal(a)jboss.com">Ron Sigal</a>
+ * @version
+ * <p>
+ * Copyright Mar 21, 2009
+ * </p>
+ */
+public class ServletConfigurationMapTestClient extends ConfigurationMapTestParent
+{
+ protected static Logger log = Logger.getLogger(ServletConfigurationMapTestClient.class);
+
+ public void testDatatypeConfigDefault() throws Throwable
+ {
+ log.info("skipping " + getName());
+ }
+
+ public void testDatatypePassConfigMapFalse() throws Throwable
+ {
+ log.info("skipping " + getName());
+ }
+
+ public void testFQNConfigDefault() throws Throwable
+ {
+ log.info("skipping " + getName());
+ }
+
+ public void testFQNPassConfigMapFalse() throws Throwable
+ {
+ log.info("skipping " + getName());
+ }
+
+ protected int marshallerCountDatatype()
+ {
+ return 2;
+ }
+
+ protected int unmarshallerCountDatatype()
+ {
+ return 2;
+ }
+
+ protected int marshallerCountFQN()
+ {
+ return 1;
+ }
+
+ protected int unmarshallerCountFQN()
+ {
+ return 1;
+ }
+
+ protected String getTransport()
+ {
+ return "servlet";
+ }
+
+ protected void setupServer(String parameter, Map extraConfig) throws Exception
+ {
+ locatorURI = "servlet://localhost:8080/servlet-invoker/ServerInvokerServlet/?" + parameter;
+// "marshaller=org.jboss.test.remoting.marshall.config.ConfigTestMarshaller&" +
+// "unmarshaller=org.jboss.test.remoting.marshall.config.ConfigTestUnmarshaller";
+
+ log.info("setting InvokerLocator to " + locatorURI);
+ }
+}
+
Property changes on: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/marshal/config/ServletConfigurationMapTestClient.java
___________________________________________________________________
Name: svn:eol-style
+ native
14 years, 3 months
- 1
- 0