JBoss Remoting SVN: r4935 - in remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/servlet: mbeanserver and 1 other directories.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2009-04-05 02:21:40 -0400 (Sun, 05 Apr 2009)
New Revision: 4935
Added:
remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/servlet/mbeanserver/
remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/servlet/mbeanserver/jboss/
remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/servlet/mbeanserver/jboss/MBeanServerJBossTestClient.java
Log:
JBREM-139: Moved MBeanServer tests to their own directory.
Copied: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/servlet/mbeanserver/jboss/MBeanServerJBossTestClient.java (from rev 4674, remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/servlet/MBeanServerJBossTestClient.java)
===================================================================
--- remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/servlet/mbeanserver/jboss/MBeanServerJBossTestClient.java (rev 0)
+++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/servlet/mbeanserver/jboss/MBeanServerJBossTestClient.java 2009-04-05 06:21:40 UTC (rev 4935)
@@ -0,0 +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.servlet.mbeanserver.jboss;
+
+import org.jboss.test.remoting.transport.servlet.MBeanServerSelectionTestParent;
+
+/**
+ * Used to test JBREM-746.
+ *
+ * @author <a href="ron.sigal(a)jboss.com">Ron Sigal</a>
+ * @version $Revision: 1.1 $
+ * <p>
+ * Copyright Nov 29, 2007
+ * </p>
+ */
+public class MBeanServerJBossTestClient extends MBeanServerSelectionTestParent
+{
+
+ protected String getDefaultDomain()
+ {
+ return "jboss";
+ }
+
+}
+
Property changes on: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/servlet/mbeanserver/jboss/MBeanServerJBossTestClient.java
___________________________________________________________________
Name: svn:mergeinfo
+
15 years, 10 months
JBoss Remoting SVN: r4934 - in remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/servlet: marshal and 1 other directory.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2009-04-05 02:21:03 -0400 (Sun, 05 Apr 2009)
New Revision: 4934
Added:
remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/servlet/marshal/
remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/servlet/marshal/ServletConfigurationMapTestClient.java
remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/servlet/marshal/remoting-servlet-service.xml
Log:
JBREM-139: Moved marshalling tests to their own directory.
Added: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/servlet/marshal/ServletConfigurationMapTestClient.java
===================================================================
--- remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/servlet/marshal/ServletConfigurationMapTestClient.java (rev 0)
+++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/servlet/marshal/ServletConfigurationMapTestClient.java 2009-04-05 06:21:03 UTC (rev 4934)
@@ -0,0 +1,71 @@
+/*
+ * 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;
+
+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 testDatatypeConfig() throws Throwable
+ {
+ log.info("skipping " + getName());
+ }
+
+ protected int configTestMarshallerCount()
+ {
+ return 1;
+ }
+
+ protected int configTestUnmarshallerCount()
+ {
+ return 1;
+ }
+
+ protected String getTransport()
+ {
+ return "servlet";
+ }
+
+ protected void setupServer(String parameter, Map extraConfig) throws Exception
+ {
+ locatorURI = "servlet://localhost:8080/servlet-invoker/ServerInvokerServlet/?" +
+ "marshaller=org.jboss.test.remoting.marshall.config.ConfigTestMarshaller&" +
+ "unmarshaller=org.jboss.test.remoting.marshall.config.ConfigTestUnmarshaller";
+
+ log.info("setting InvokerLocator to " + locatorURI);
+ }
+}
+
Added: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/servlet/marshal/remoting-servlet-service.xml
===================================================================
--- remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/servlet/marshal/remoting-servlet-service.xml (rev 0)
+++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/servlet/marshal/remoting-servlet-service.xml 2009-04-05 06:21:03 UTC (rev 4934)
@@ -0,0 +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>
15 years, 10 months
JBoss Remoting SVN: r4933 - in remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/servlet: callback and 1 other directory.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2009-04-05 02:20:09 -0400 (Sun, 05 Apr 2009)
New Revision: 4933
Added:
remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/servlet/callback/
remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/servlet/callback/CallbackTestClient.java
remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/servlet/callback/TestInvocationHandler.java
remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/servlet/callback/remoting-servlet-service.xml
Log:
JBREM-139: Moved callback tests to their own directory.
Added: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/servlet/callback/CallbackTestClient.java
===================================================================
--- remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/servlet/callback/CallbackTestClient.java (rev 0)
+++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/servlet/callback/CallbackTestClient.java 2009-04-05 06:20:09 UTC (rev 4933)
@@ -0,0 +1,141 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, 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.callback;
+
+import java.util.HashMap;
+
+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.InvokerLocator;
+import org.jboss.remoting.callback.Callback;
+import org.jboss.remoting.callback.HandleCallbackException;
+import org.jboss.remoting.callback.InvokerCallbackHandler;
+import org.jboss.remoting.transport.Connector;
+
+
+/**
+ * Unit test for pull callbacks over servlet transport: JBREM-1079.
+ *
+ * @author <a href="ron.sigal(a)jboss.com">Ron Sigal</a>
+ * @version
+ * <p>
+ * Copyright Jan 16, 2009
+ * </p>
+ */
+public class CallbackTestClient extends TestCase
+{
+ private static Logger log = Logger.getLogger(CallbackTestClient.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.INFO);
+ Logger.getLogger("org.jboss.test.remoting").setLevel(Level.INFO);
+ String pattern = "[%d{ABSOLUTE}] [%t] %5p (%F:%L) - %m%n";
+ PatternLayout layout = new PatternLayout(pattern);
+ ConsoleAppender consoleAppender = new ConsoleAppender(layout);
+ Logger.getRootLogger().addAppender(consoleAppender);
+ }
+ }
+
+
+ public void tearDown()
+ {
+ }
+
+
+ public void testMethod() throws Throwable
+ {
+ log.info("entering " + getName());
+
+ // Create client.
+ locatorURI = "servlet://localhost:8080/servlet-invoker/ServerInvokerServlet";
+ locatorURI += "/?createUniqueObjectName=true&useAllParams=true&blockingMode=blocking";
+ InvokerLocator clientLocator = new InvokerLocator(locatorURI);
+ HashMap clientConfig = new HashMap();
+ Client client = new Client(clientLocator, clientConfig);
+ client.connect();
+ log.info("client is connected");
+
+ // Test connection.
+ log.info("result: " + client.invoke("abc"));
+ assertEquals(null, client.invoke("abc"));
+ log.info("connection is good");
+
+ // Install client side callback handlers.
+ TestCallbackHandler callbackHandler1 = new TestCallbackHandler();
+ TestCallbackHandler callbackHandler2 = new TestCallbackHandler();
+ HashMap metadata = new HashMap();
+ client.addListener(callbackHandler1, metadata);
+ client.addListener(callbackHandler2, metadata);
+
+ // Request callbacks.
+ int COUNT = 100;
+ for (int i = 0; i < COUNT; i++)
+ {
+ client.invoke("callback");
+ }
+
+ log.info("sleeping for 2000 ms");
+ Thread.sleep(2000);
+ log.info("waking up");
+
+ // Verify all callbacks arrived.
+ assertEquals(COUNT, callbackHandler1.counter);
+ assertEquals(COUNT, callbackHandler1.counter);
+
+ client.removeListener(callbackHandler1);
+ client.removeListener(callbackHandler2);
+ client.disconnect();
+ log.info(getName() + " PASSES");
+ }
+
+
+ static class TestCallbackHandler implements InvokerCallbackHandler
+ {
+ public int counter;
+
+ public void handleCallback(Callback callback) throws HandleCallbackException
+ {
+ counter++;
+ }
+ }
+}
\ No newline at end of file
Added: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/servlet/callback/TestInvocationHandler.java
===================================================================
--- remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/servlet/callback/TestInvocationHandler.java (rev 0)
+++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/servlet/callback/TestInvocationHandler.java 2009-04-05 06:20:09 UTC (rev 4933)
@@ -0,0 +1,75 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, 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.callback;
+
+import java.util.HashSet;
+import java.util.Iterator;
+
+import javax.management.MBeanServer;
+
+import org.apache.log4j.Logger;
+import org.jboss.remoting.InvocationRequest;
+import org.jboss.remoting.ServerInvocationHandler;
+import org.jboss.remoting.ServerInvoker;
+import org.jboss.remoting.callback.Callback;
+import org.jboss.remoting.callback.InvokerCallbackHandler;
+
+public class TestInvocationHandler implements ServerInvocationHandler
+{
+ private static Logger log = Logger.getLogger(TestInvocationHandler.class);
+ private HashSet listeners = new HashSet();
+
+ public void addListener(InvokerCallbackHandler callbackHandler)
+ {
+ listeners.add(callbackHandler);
+ log.info("added " + callbackHandler);
+ }
+
+ public Object invoke(InvocationRequest invocation) throws Throwable
+ {
+ log.debug("invocation: " + invocation.getParameter());
+ Iterator it = listeners.iterator();
+ Callback callback = new Callback("callback");
+ while (it.hasNext())
+ {
+ InvokerCallbackHandler handler = (InvokerCallbackHandler) it.next();
+ handler.handleCallback(callback);
+ log.debug("sent callback to " + handler);
+ }
+ return null;
+ }
+
+ public void removeListener(InvokerCallbackHandler callbackHandler)
+ {
+ listeners.remove(callbackHandler);
+ log.info("removed " + callbackHandler);
+ }
+
+ public void setInvoker(ServerInvoker invoker)
+ {
+ }
+
+ public void setMBeanServer(MBeanServer server)
+ {
+ }
+}
+
Added: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/servlet/callback/remoting-servlet-service.xml
===================================================================
--- remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/servlet/callback/remoting-servlet-service.xml (rev 0)
+++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/servlet/callback/remoting-servlet-service.xml 2009-04-05 06:20:09 UTC (rev 4933)
@@ -0,0 +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/?createUniqueObjectName=true&useAllParams=true&blockingMode=blocking
+ </attribute>
+
+ <attribute name="Configuration">
+ <config>
+ <handlers>
+ <handler subsystem="test">org.jboss.test.remoting.transport.servlet.callback.TestInvocationHandler</handler>
+ </handlers>
+ </config>
+ </attribute>
+ </mbean>
+
+
+</server>
15 years, 10 months
JBoss Remoting SVN: r4932 - remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/servlet.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2009-04-05 02:19:23 -0400 (Sun, 05 Apr 2009)
New Revision: 4932
Added:
remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/servlet/server.xml
Log:
JBREM-139: Created a single server.xml for all servlet tests.
Added: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/servlet/server.xml
===================================================================
--- remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/servlet/server.xml (rev 0)
+++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/servlet/server.xml 2009-04-05 06:19:23 UTC (rev 4932)
@@ -0,0 +1,186 @@
+<Server>
+
+ <!--APR library loader. Documentation at /docs/apr.html -->
+ <Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" />
+ <!--Initialize Jasper prior to webapps are loaded. Documentation at /docs/jasper-howto.html -->
+ <Listener className="org.apache.catalina.core.JasperListener" />
+
+ <!-- Use a custom version of StandardService that allows the
+ connectors to be started independent of the normal lifecycle
+ start to allow web apps to be deployed before starting the
+ connectors.
+ -->
+ <Service name="jboss.web">
+
+ <!-- A "Connector" represents an endpoint by which requests are received
+ and responses are returned. Documentation at :
+ Java HTTP Connector: /docs/config/http.html (blocking & non-blocking)
+ Java AJP Connector: /docs/config/ajp.html
+ APR (HTTP/AJP) Connector: /docs/apr.html
+ Define a non-SSL HTTP/1.1 Connector on port 8080
+ -->
+ <Connector port="8080" address="${jboss.bind.address}"
+ maxThreads="250" maxHttpHeaderSize="8192"
+ emptySessionPath="true" protocol="HTTP/1.1"
+ enableLookups="false" redirectPort="8443" acceptCount="100"
+ connectionTimeout="20000" disableUploadTimeout="true" />
+
+ <!-- The following Connectors are used by ServletMultihomeTestCase. -->
+ <Connector port="7071" address="localhost"
+ maxThreads="250" maxHttpHeaderSize="8192"
+ emptySessionPath="true" protocol="HTTP/1.1"
+ enableLookups="false" redirectPort="8443" acceptCount="100"
+ connectionTimeout="20000" disableUploadTimeout="true" />
+ <Connector port="7082" address="localhost"
+ maxThreads="250" maxHttpHeaderSize="8192"
+ emptySessionPath="true" protocol="HTTP/1.1"
+ enableLookups="false" redirectPort="8443" acceptCount="100"
+ connectionTimeout="20000" disableUploadTimeout="true" />
+ <Connector port="7093" address="localhost"
+ maxThreads="250" maxHttpHeaderSize="8192"
+ emptySessionPath="true" protocol="HTTP/1.1"
+ enableLookups="false" redirectPort="8443" acceptCount="100"
+ connectionTimeout="20000" disableUploadTimeout="true" />
+
+ <!-- Define a SSL HTTP/1.1 Connector on port 8443
+ This connector uses the JSSE configuration, when using APR, the
+ connector should be using the OpenSSL style configuration
+ described in the APR documentation -->
+ <!---->
+ <Connector port="8443" protocol="HTTP/1.1" SSLEnabled="true"
+ maxThreads="150" scheme="https" secure="true"
+ clientAuth="false" sslProtocol="TLS"
+ keystoreFile="${jboss.server.home.dir}/conf/keystore"
+ keystorePass="unit-tests-server"/>
+ <!---->
+
+ <!-- Define an AJP 1.3 Connector on port 8009 -->
+ <Connector port="8009" address="${jboss.bind.address}" protocol="AJP/1.3"
+ emptySessionPath="true" enableLookups="false" redirectPort="8443" />
+
+ <Engine name="jboss.web" defaultHost="localhost">
+
+ <!-- The JAAS based authentication and authorization realm implementation
+ that is compatible with the jboss 3.2.x realm implementation.
+ - certificatePrincipal : the class name of the
+ org.jboss.security.auth.certs.CertificatePrincipal impl
+ used for mapping X509[] cert chains to a Princpal.
+ - allRolesMode : how to handle an auth-constraint with a role-name=*,
+ one of strict, authOnly, strictAuthOnly
+ + strict = Use the strict servlet spec interpretation which requires
+ that the user have one of the web-app/security-role/role-name
+ + authOnly = Allow any authenticated user
+ + strictAuthOnly = Allow any authenticated user only if there are no
+ web-app/security-roles
+ -->
+ <Realm className="org.jboss.web.tomcat.security.JBossSecurityMgrRealm"
+ certificatePrincipal="org.jboss.security.auth.certs.SubjectDNMapping"
+ allRolesMode="authOnly"
+ />
+ <!-- A subclass of JBossSecurityMgrRealm that uses the authentication
+ behavior of JBossSecurityMgrRealm, but overrides the authorization
+ checks to use JACC permissions with the current java.security.Policy
+ to determine authorized access.
+ - allRolesMode : how to handle an auth-constraint with a role-name=*,
+ one of strict, authOnly, strictAuthOnly
+ + strict = Use the strict servlet spec interpretation which requires
+ that the user have one of the web-app/security-role/role-name
+ + authOnly = Allow any authenticated user
+ + strictAuthOnly = Allow any authenticated user only if there are no
+ web-app/security-roles
+ <Realm className="org.jboss.web.tomcat.security.JaccAuthorizationRealm"
+ certificatePrincipal="org.jboss.security.auth.certs.SubjectDNMapping"
+ allRolesMode="authOnly"
+ />
+ -->
+
+ <Host name="localhost"
+ autoDeploy="false" deployOnStartup="false" deployXML="false"
+ configClass="org.jboss.web.tomcat.security.config.JBossContextConfig"
+ >
+
+ <!-- Uncomment to enable request dumper. This Valve "logs interesting
+ contents from the specified Request (before processing) and the
+ corresponding Response (after processing). It is especially useful
+ in debugging problems related to headers and cookies."
+ -->
+ <!--
+ <Valve className="org.apache.catalina.valves.RequestDumperValve" />
+ -->
+
+ <!-- Access logger -->
+ <!--
+ <Valve className="org.apache.catalina.valves.AccessLogValve"
+ prefix="localhost_access_log." suffix=".log"
+ pattern="common" directory="${jboss.server.home.dir}/log"
+ resolveHosts="false" />
+ -->
+
+ <!-- Uncomment to enable single sign-on across web apps
+ deployed to this host. Does not provide SSO across a cluster.
+
+ If this valve is used, do not use the JBoss ClusteredSingleSignOn
+ valve shown below.
+
+ A new configuration attribute is available beginning with
+ release 4.0.4:
+
+ cookieDomain configures the domain to which the SSO cookie
+ will be scoped (i.e. the set of hosts to
+ which the cookie will be presented). By default
+ the cookie is scoped to "/", meaning the host
+ that presented it. Set cookieDomain to a
+ wider domain (e.g. "xyz.com") to allow an SSO
+ to span more than one hostname.
+ -->
+ <!--
+ <Valve className="org.apache.catalina.authenticator.SingleSignOn" />
+ -->
+
+ <!-- Uncomment to enable single sign-on across web apps
+ deployed to this host AND to all other hosts in the cluster.
+
+ If this valve is used, do not use the standard Tomcat SingleSignOn
+ valve shown above.
+
+ Valve uses a JBossCache instance to support SSO credential
+ caching and replication across the cluster. The JBossCache
+ instance must be configured separately. By default, the valve
+ shares a JBossCache with the service that supports HttpSession
+ replication. See the "jboss-web-cluster-service.xml" file in the
+ server/all/deploy directory for cache configuration details.
+
+ Besides the attributes supported by the standard Tomcat
+ SingleSignOn valve (see the Tomcat docs), this version also
+ supports the following attributes:
+
+ cookieDomain see above
+
+ treeCacheName JMX ObjectName of the JBossCache MBean used to
+ support credential caching and replication across
+ the cluster. If not set, the default value is
+ "jboss.cache:service=TomcatClusteringCache", the
+ standard ObjectName of the JBossCache MBean used
+ to support session replication.
+ -->
+ <!--
+ <Valve className="org.jboss.web.tomcat.service.sso.ClusteredSingleSignOn" />
+ -->
+
+ <!-- Check for unclosed connections and transaction terminated checks
+ in servlets/jsps.
+
+ Important: The dependency on the CachedConnectionManager
+ in META-INF/jboss-service.xml must be uncommented, too
+ -->
+ <Valve className="org.jboss.web.tomcat.service.jca.CachedConnectionValve"
+ cachedConnectionManagerObjectName="jboss.jca:service=CachedConnectionManager"
+ transactionManagerObjectName="jboss:service=TransactionManager" />
+
+ </Host>
+
+ </Engine>
+
+ </Service>
+
+</Server>
\ No newline at end of file
15 years, 10 months
JBoss Remoting SVN: r4931 - remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/servlet.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2009-04-05 02:18:46 -0400 (Sun, 05 Apr 2009)
New Revision: 4931
Added:
remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/servlet/remoting-servlet-service.xml
Removed:
remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/servlet/remoting-servlet-server-invoker-service.xml
Log:
JBREM-139: Renamed remoting-servlet-server-invoker-service.xml to remoting-servlet-service.xml.
Deleted: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/servlet/remoting-servlet-server-invoker-service.xml
===================================================================
--- remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/servlet/remoting-servlet-server-invoker-service.xml 2009-04-05 06:18:00 UTC (rev 4930)
+++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/servlet/remoting-servlet-server-invoker-service.xml 2009-04-05 06:18:46 UTC (rev 4931)
@@ -1,22 +0,0 @@
-<?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="InvokerLocator">
- servlet://localhost:8080/servlet-invoker/ServerInvokerServlet
- </attribute>
-
- <attribute name="Configuration">
- <config>
- <handlers>
- <handler subsystem="test">org.jboss.test.remoting.transport.web.WebInvocationHandler</handler>
- </handlers>
- </config>
- </attribute>
- </mbean>
-
-</server>
Copied: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/servlet/remoting-servlet-service.xml (from rev 4674, remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/servlet/remoting-servlet-server-invoker-service.xml)
===================================================================
--- remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/servlet/remoting-servlet-service.xml (rev 0)
+++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/servlet/remoting-servlet-service.xml 2009-04-05 06:18:46 UTC (rev 4931)
@@ -0,0 +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="InvokerLocator">
+ servlet://localhost:8080/servlet-invoker/ServerInvokerServlet
+ </attribute>
+
+ <attribute name="Configuration">
+ <config>
+ <handlers>
+ <handler subsystem="test">org.jboss.test.remoting.transport.web.WebInvocationHandler</handler>
+ </handlers>
+ </config>
+ </attribute>
+ </mbean>
+
+</server>
Property changes on: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/servlet/remoting-servlet-service.xml
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:mergeinfo
+
Name: svn:eol-style
+ native
15 years, 10 months
JBoss Remoting SVN: r4930 - remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/servlet.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2009-04-05 02:18:00 -0400 (Sun, 05 Apr 2009)
New Revision: 4930
Removed:
remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/servlet/MBeanServerJBossTestClient.java
remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/servlet/MBeanServerPlatformTestClient.java
Log:
JBREM-139: Moved MBeanServer tests to their own directory.
Deleted: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/servlet/MBeanServerJBossTestClient.java
===================================================================
--- remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/servlet/MBeanServerJBossTestClient.java 2009-04-05 06:14:13 UTC (rev 4929)
+++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/servlet/MBeanServerJBossTestClient.java 2009-04-05 06:18:00 UTC (rev 4930)
@@ -1,43 +0,0 @@
-
-/*
-* 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;
-
-/**
- * Used to test JBREM-746.
- *
- * @author <a href="ron.sigal(a)jboss.com">Ron Sigal</a>
- * @version $Revision: 1.1 $
- * <p>
- * Copyright Nov 29, 2007
- * </p>
- */
-public class MBeanServerJBossTestClient extends MBeanServerSelectionTestParent
-{
-
- protected String getDefaultDomain()
- {
- return "jboss";
- }
-
-}
-
Deleted: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/servlet/MBeanServerPlatformTestClient.java
===================================================================
--- remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/servlet/MBeanServerPlatformTestClient.java 2009-04-05 06:14:13 UTC (rev 4929)
+++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/servlet/MBeanServerPlatformTestClient.java 2009-04-05 06:18:00 UTC (rev 4930)
@@ -1,44 +0,0 @@
-
-/*
-* 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;
-
-/**
- *
- * Used to test JBREM-746.
- *
- * @author <a href="ron.sigal(a)jboss.com">Ron Sigal</a>
- * @version $Revision: 1.1 $
- * <p>
- * Copyright Nov 29, 2007
- * </p>
- */
-public class MBeanServerPlatformTestClient extends MBeanServerSelectionTestParent
-{
-
- protected String getDefaultDomain()
- {
- return "platform";
- }
-
-}
-
15 years, 10 months
JBoss Remoting SVN: r4929 - remoting2/branches/2.x.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2009-04-05 02:14:13 -0400 (Sun, 05 Apr 2009)
New Revision: 4929
Added:
remoting2/branches/2.x/local.properties
Log:
JBREM-139: Local properties for automated servlet transport tests.
Added: remoting2/branches/2.x/local.properties
===================================================================
--- remoting2/branches/2.x/local.properties (rev 0)
+++ remoting2/branches/2.x/local.properties 2009-04-05 06:14:13 UTC (rev 4929)
@@ -0,0 +1,4 @@
+jboss.home=c://cygwin/home/rsigal/workspace.new/jboss-as-parent-trunk/build/output/jboss-5.0.0.GA
+as.startup.time=220
+as.shutdown.time=10
+shell=c:/cygwin/bin/sh.exe
\ No newline at end of file
15 years, 10 months
JBoss Remoting SVN: r4928 - remoting2/branches/2.x.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2009-04-05 02:12:48 -0400 (Sun, 05 Apr 2009)
New Revision: 4928
Modified:
remoting2/branches/2.x/build.xml
Log:
JBREM-139: Added automated servlet transport tests.
Modified: remoting2/branches/2.x/build.xml
===================================================================
--- remoting2/branches/2.x/build.xml 2009-04-05 04:14:26 UTC (rev 4927)
+++ remoting2/branches/2.x/build.xml 2009-04-05 06:12:48 UTC (rev 4928)
@@ -217,8 +217,9 @@
<!-- ================================================================== -->
<target name="configure" depends="get-jvm,configure.jrunit" unless="configure.disable">
-
- <!-- This is for the jrunit benchmark results -->
+ <property file="local.properties" />
+
+ <!-- This is for the jrunit benchmark results -->
<property file="database.properties"/>
<!-- Module name(s) & version -->
@@ -1612,6 +1613,400 @@
</junit>
</target>
+
+ <!--=====================================================================-->
+ <!--=====================================================================-->
+ <!-- servlet tests -->
+ <!--=====================================================================-->
+ <!--=====================================================================-->
+ <target name="tests.servlet.config" depends="configure">
+ <echo>jboss home: ${jboss.home}</echo>
+ <property name="jboss.conf.dir" value="${jboss.home}/server/default/conf/"/>
+ <property name="jboss.deploy.dir" value="${jboss.home}/server/default/deploy/"/>
+ <property name="jboss.log.dir" value="${jboss.home}/server/default/log"/>
+ <property name="jboss.lib.dir" value="${jboss.home}/common/lib"/>
+ <property name="servlet.tests.dir" value="${tests.dir}/org/jboss/test/remoting/transport/servlet"/>
+ </target>
+
+ <target name="tests.servlet.setup" depends="tests.jars,tests.servlet.config,tests.servlet.clean">
+ <mkdir dir="${output.tests.results}"/>
+ <mkdir dir="${basedir}/Save"/>
+ <copy file="${jboss.lib.dir}/jboss-remoting.jar" todir="${basedir}/Save" overwrite="true"/>
+ <copy file="${jboss.deploy.dir}/jbossweb.sar/server.xml" todir="${basedir}/Save" overwrite="true"/>
+ <copy file="${output.lib.dir}/jboss-remoting.jar" todir="${jboss.lib.dir}" overwrite="true"/>
+ <copy file="${output.lib.dir}/jboss-remoting-tests.jar" todir="${jboss.lib.dir}" overwrite="true"/>
+ <copy file="${servlet.tests.dir}/server.xml" todir="${jboss.deploy.dir}/jbossweb.sar" overwrite="true"/>
+ <copy file="${servlet.tests.dir}/ssl/keystore" tofile="${jboss.conf.dir}/keystore"/>
+ </target>
+
+ <target name="tests.servlet.teardown" depends="tests.servlet.clean">
+ <copy file="${basedir}/Save/jboss-remoting.jar" todir="${jboss.lib.dir}" overwrite="true"/>
+ <copy file="${basedir}/Save/server.xml" todir="${jboss.deploy.dir}/jbossweb.sar"/>
+ </target>
+
+ <target name="tests.servlet.clean">
+ <delete file="${jboss.lib.dir}/jboss-remoting-tests.jar" quiet="true"/>
+ <delete file="${jboss.conf.dir}/keystore" quiet="true"/>
+ <delete file="${jboss.deploy.dir}/remoting-servlet-service.xml" quiet="true"/>
+ <delete dir="${jboss.deploy.dir}/servlet-invoker.war" quiet="true"/>
+ </target>
+
+ <target name="AS.start">
+ <property environment="env"/>
+ <exec executable="${shell}" searchpath="true" dir="${jboss.home}" spawn="true">
+ <env key="Path" path="${env.Path}${path.separator}c:/cygwin/usr/bin"/>
+ <env key="JBOSS_HOME" value="${jboss.home}"/>
+ <arg file="${jboss.home}/bin/run.sh"/>
+ </exec>
+ <echo>Going to sleep for ${as.startup.time} seconds</echo>
+ <sleep seconds="${as.startup.time}"/>
+ </target>
+
+ <target name="AS.start.opts">
+ <property environment="env"/>
+ <exec executable="${shell}" searchpath="true" dir="${jboss.home}" spawn="true">
+ <env key="Path" path="${env.Path}${path.separator}c:/cygwin/usr/bin"/>
+ <env key="JAVA_OPTS" value="${java.opts}"/>
+ <env key="JBOSS_HOME" value="${jboss.home}"/>
+ <arg file="${jboss.home}/bin/run.sh"/>
+ </exec>
+ <echo>Going to sleep for ${as.startup.time} seconds</echo>
+ <sleep seconds="${as.startup.time}"/>
+ </target>
+
+ <target name="AS.shutdown" depends="tests.servlet.config">
+ <property environment="env"/>
+ <exec executable="${shell}" searchpath="true" dir="${jboss.home}" spawn="true">
+ <env key="Path" path="${env.Path}${path.separator}c:/cygwin/usr/bin"/>
+ <env key="JBOSS_HOME" value="${jboss.home}"/>
+ <arg file="${jboss.home}/bin/shutdown.sh"/>
+ <arg value="-S"/>
+ </exec>
+ <sleep seconds="${as.shutdown.time}"/>
+ </target>
+
+ <target name="tests.functional.servlet" depends="tests.servlet.setup">
+ <antcall target="tests.servlet.simple" inheritrefs="true"/>
+ <sleep seconds="${as.shutdown.time}"/>
+ <antcall target="tests.servlet.mbeanserver.platform" inheritrefs="true"/>
+ <antcall target="tests.servlet.teardown"/>
+ </target>
+
+ <target name="tests.servlet.simple">
+ <antcall target="AS.start"/>
+ <antcall target="tests.servlet" inheritrefs="true"/>
+ <antcall target="tests.servlet.callback" inheritrefs="true"/>
+ <antcall target="tests.servlet.marshal" inheritrefs="true"/>
+ <antcall target="tests.servlet.mbeanserver.jboss" inheritrefs="true"/>
+ <antcall target="tests.servlet.multihome" inheritrefs="true"/>
+ <antcall target="tests.servlet.nopreservelines" inheritrefs="true"/>
+ <antcall target="tests.servlet.preservelines" inheritrefs="true"/>
+ <antcall target="tests.servlet.ssl" inheritrefs="true"/>
+ <antcall target="AS.shutdown"/>
+ </target>
+
+ <target name="tests.servlet">
+ <copy file="${servlet.tests.dir}/remoting-servlet-service.xml" todir="${jboss.deploy.dir}" overwrite="true"/>
+ <sleep seconds="2"/>
+ <copy todir="${jboss.deploy.dir}">
+ <fileset dir="${output.lib.dir}">
+ <include name="servlet-invoker.war/**"/>
+ </fileset>
+ </copy>
+ <copy file="${servlet.tests.dir}/WEB-INF/web.xml"
+ todir="${jboss.deploy.dir}/servlet-invoker.war/WEB-INF" overwrite="true"/>
+ <sleep seconds="2"/>
+ <junit printsummary="true" fork="yes" includeantruntime="true">
+ <jvmarg value="-Dloader.path=${output.lib.dir}/jboss-remoting-loading-tests.jar"/>
+ <jvmarg value="-D${remoting.metadata.key}=${metadata}"/>
+ <classpath>
+ <path refid="tests.classpath"/>
+ <pathelement location="${output.lib.dir}/jboss-remoting-tests.jar"/>
+ </classpath>
+ <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"
+ extension="-java_serialization.xml"/>
+ <batchtest fork="yes" todir="${output.tests.results}" haltonfailure="no">
+ <fileset dir="${tests.compile.dir}">
+ <include name="**/remoting/transport/servlet/*TestClient.class"/>
+ </fileset>
+ </batchtest>
+ </junit>
+ <delete dir="${jboss.deploy.dir}/servlet-invoker.war"/>
+ <delete file="${jboss.deploy.dir}/remoting-servlet-service.xml"/>
+ </target>
+
+ <target name="tests.servlet.callback">
+ <copy file="${servlet.tests.dir}/callback/remoting-servlet-service.xml" todir="${jboss.deploy.dir}" overwrite="true"/>
+ <sleep seconds="2"/>
+ <copy todir="${jboss.deploy.dir}">
+ <fileset dir="${output.lib.dir}">
+ <include name="servlet-invoker.war/**"/>
+ </fileset>
+ </copy>
+ <copy file="${servlet.tests.dir}/callback/WEB-INF/web.xml"
+ todir="${jboss.deploy.dir}/servlet-invoker.war/WEB-INF" overwrite="true"/>
+ <sleep seconds="2"/>
+ <junit printsummary="true" fork="yes" includeantruntime="true">
+ <jvmarg value="-Dloader.path=${output.lib.dir}/jboss-remoting-loading-tests.jar"/>
+ <jvmarg value="-D${remoting.metadata.key}=${metadata}"/>
+ <classpath>
+ <path refid="tests.classpath"/>
+ <pathelement location="${output.lib.dir}/jboss-remoting-tests.jar"/>
+ </classpath>
+ <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"
+ extension="-java_serialization.xml"/>
+ <batchtest fork="yes" todir="${output.tests.results}" haltonfailure="no">
+ <fileset dir="${tests.compile.dir}">
+ <include name="**/remoting/transport/servlet/callback/*TestClient.class"/>
+ </fileset>
+ </batchtest>
+ </junit>
+ <delete dir="${jboss.deploy.dir}/servlet-invoker.war"/>
+ <delete file="${jboss.deploy.dir}/remoting-servlet-service.xml"/>
+ </target>
+
+ <target name="tests.servlet.marshal">
+ <copy file="${servlet.tests.dir}/marshal/remoting-servlet-service.xml" todir="${jboss.deploy.dir}" overwrite="true"/>
+ <sleep seconds="2"/>
+ <copy todir="${jboss.deploy.dir}">
+ <fileset dir="${output.lib.dir}">
+ <include name="servlet-invoker.war/**"/>
+ </fileset>
+ </copy>
+ <copy file="${servlet.tests.dir}/marshal/WEB-INF/web.xml"
+ todir="${jboss.deploy.dir}/servlet-invoker.war/WEB-INF" overwrite="true"/>
+ <sleep seconds="2"/>
+ <junit printsummary="true" fork="yes" includeantruntime="true">
+ <jvmarg value="-Dloader.path=${output.lib.dir}/jboss-remoting-loading-tests.jar"/>
+ <jvmarg value="-D${remoting.metadata.key}=${metadata}"/>
+ <classpath>
+ <path refid="tests.classpath"/>
+ <pathelement location="${output.lib.dir}/jboss-remoting-tests.jar"/>
+ </classpath>
+ <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"
+ extension="-java_serialization.xml"/>
+ <batchtest fork="yes" todir="${output.tests.results}" haltonfailure="no">
+ <fileset dir="${tests.compile.dir}">
+ <include name="**/remoting/transport/servlet/marshal/*TestClient.class"/>
+ </fileset>
+ </batchtest>
+ </junit>
+ <delete dir="${jboss.deploy.dir}/servlet-invoker.war"/>
+ <delete file="${jboss.deploy.dir}/remoting-servlet-service.xml"/>
+ </target>
+
+ <target name="tests.servlet.mbeanserver.jboss">
+ <copy file="${servlet.tests.dir}/remoting-servlet-service.xml" todir="${jboss.deploy.dir}" overwrite="true"/>
+ <sleep seconds="2"/>
+ <copy todir="${jboss.deploy.dir}">
+ <fileset dir="${output.lib.dir}">
+ <include name="servlet-invoker.war/**"/>
+ </fileset>
+ </copy>
+ <copy file="${servlet.tests.dir}/mbeanserver/jboss/WEB-INF/web.xml"
+ todir="${jboss.deploy.dir}/servlet-invoker.war/WEB-INF" overwrite="true"/>
+ <sleep seconds="2"/>
+ <junit printsummary="true" fork="yes" includeantruntime="true">
+ <jvmarg value="-Dloader.path=${output.lib.dir}/jboss-remoting-loading-tests.jar"/>
+ <jvmarg value="-D${remoting.metadata.key}=${metadata}"/>
+ <classpath>
+ <path refid="tests.classpath"/>
+ <pathelement location="${output.lib.dir}/jboss-remoting-tests.jar"/>
+ </classpath>
+ <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"
+ extension="-java_serialization.xml"/>
+ <batchtest fork="yes" todir="${output.tests.results}" haltonfailure="no">
+ <fileset dir="${tests.compile.dir}">
+ <include name="**/remoting/transport/servlet/mbeanserver/jboss/*TestClient.class"/>
+ </fileset>
+ </batchtest>
+ </junit>
+ <delete dir="${jboss.deploy.dir}/servlet-invoker.war"/>
+ <delete file="${jboss.deploy.dir}/remoting-servlet-service.xml"/>
+ </target>
+
+ <target name="tests.servlet.mbeanserver.platform">
+ <copy file="${servlet.tests.dir}/remoting-servlet-service.xml" todir="${jboss.deploy.dir}" overwrite="true"/>
+ <sleep seconds="2"/>
+ <copy todir="${jboss.deploy.dir}">
+ <fileset dir="${output.lib.dir}">
+ <include name="servlet-invoker.war/**"/>
+ </fileset>
+ </copy>
+ <copy file="${servlet.tests.dir}/mbeanserver/platform/WEB-INF/web.xml"
+ todir="${jboss.deploy.dir}/servlet-invoker.war/WEB-INF" overwrite="true"/>
+ <antcall target="AS.start.opts">
+ <!--param name="java.opts" value="-Djavax.management.builder.initial=org.jboss.system.server.jmx.MBeanServerBuilderImpl -Djboss.platform.mbeanserver -Dcom.sun.management.jmxremote"/-->
+ <param name="java.opts" value=" -Djboss.platform.mbeanserver"/>
+ </antcall>
+ <junit printsummary="true" fork="yes" includeantruntime="true">
+ <jvmarg value="-Dloader.path=${output.lib.dir}/jboss-remoting-loading-tests.jar"/>
+ <jvmarg value="-D${remoting.metadata.key}=${metadata}"/>
+ <classpath>
+ <path refid="tests.classpath"/>
+ <pathelement location="${output.lib.dir}/jboss-remoting-tests.jar"/>
+ </classpath>
+ <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"
+ extension="-java_serialization.xml"/>
+ <batchtest fork="yes" todir="${output.tests.results}" haltonfailure="no">
+ <fileset dir="${tests.compile.dir}">
+ <include name="**/remoting/transport/servlet/mbeanserver/platform/*TestClient.class"/>
+ </fileset>
+ </batchtest>
+ </junit>
+ <antcall target="AS.shutdown"/>
+ </target>
+
+ <target name="tests.servlet.multihome">
+ <copy file="${servlet.tests.dir}/multihome/remoting-servlet-service.xml" todir="${jboss.deploy.dir}" overwrite="true"/>
+ <sleep seconds="2"/>
+ <copy todir="${jboss.deploy.dir}">
+ <fileset dir="${output.lib.dir}">
+ <include name="servlet-invoker.war/**"/>
+ </fileset>
+ </copy>
+ <copy file="${servlet.tests.dir}/multihome/WEB-INF/web.xml"
+ todir="${jboss.deploy.dir}/servlet-invoker.war/WEB-INF" overwrite="true"/>
+ <sleep seconds="2"/>
+ <junit printsummary="true" fork="yes" includeantruntime="true">
+ <jvmarg value="-Dloader.path=${output.lib.dir}/jboss-remoting-loading-tests.jar"/>
+ <jvmarg value="-D${remoting.metadata.key}=${metadata}"/>
+ <classpath>
+ <path refid="tests.classpath"/>
+ <pathelement location="${output.lib.dir}/jboss-remoting-tests.jar"/>
+ </classpath>
+ <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"
+ extension="-java_serialization.xml"/>
+ <batchtest fork="yes" todir="${output.tests.results}" haltonfailure="no">
+ <fileset dir="${tests.compile.dir}">
+ <include name="**/remoting/transport/servlet/multihome/*TestClient.class"/>
+ </fileset>
+ </batchtest>
+ </junit>
+ <delete dir="${jboss.deploy.dir}/servlet-invoker.war"/>
+ <delete file="${jboss.deploy.dir}/remoting-servlet-service.xml"/>
+ </target>
+
+ <target name="tests.servlet.nopreservelines">
+ <copy file="${servlet.tests.dir}/nopreservelines/remoting-servlet-service.xml" todir="${jboss.deploy.dir}" overwrite="true"/>
+ <sleep seconds="2"/>
+ <copy todir="${jboss.deploy.dir}">
+ <fileset dir="${output.lib.dir}">
+ <include name="servlet-invoker.war/**"/>
+ </fileset>
+ </copy>
+ <copy file="${servlet.tests.dir}/nopreservelines/WEB-INF/web.xml"
+ todir="${jboss.deploy.dir}/servlet-invoker.war/WEB-INF" overwrite="true"/>
+ <sleep seconds="2"/>
+ <junit printsummary="true" fork="yes" includeantruntime="true">
+ <jvmarg value="-Dloader.path=${output.lib.dir}/jboss-remoting-loading-tests.jar"/>
+ <jvmarg value="-D${remoting.metadata.key}=${metadata}"/>
+ <classpath>
+ <path refid="tests.classpath"/>
+ <pathelement location="${output.lib.dir}/jboss-remoting-tests.jar"/>
+ </classpath>
+ <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"
+ extension="-java_serialization.xml"/>
+ <batchtest fork="yes" todir="${output.tests.results}" haltonfailure="no">
+ <fileset dir="${tests.compile.dir}">
+ <include name="**/remoting/transport/servlet/nopreservelines/*TestClient.class"/>
+ </fileset>
+ </batchtest>
+ </junit>
+ <delete dir="${jboss.deploy.dir}/servlet-invoker.war"/>
+ <delete file="${jboss.deploy.dir}/remoting-servlet-service.xml"/>
+ </target>
+
+ <target name="tests.servlet.preservelines">
+ <copy file="${servlet.tests.dir}/preservelines/remoting-servlet-service.xml" todir="${jboss.deploy.dir}" overwrite="true"/>
+ <sleep seconds="4"/>
+ <copy todir="${jboss.deploy.dir}">
+ <fileset dir="${output.lib.dir}">
+ <include name="servlet-invoker.war/**"/>
+ </fileset>
+ </copy>
+ <copy file="${servlet.tests.dir}/preservelines/WEB-INF/web.xml"
+ todir="${jboss.deploy.dir}/servlet-invoker.war/WEB-INF" overwrite="true"/>
+ <sleep seconds="2"/>
+ <junit printsummary="true" fork="yes" includeantruntime="true">
+ <jvmarg value="-Dloader.path=${output.lib.dir}/jboss-remoting-loading-tests.jar"/>
+ <jvmarg value="-D${remoting.metadata.key}=${metadata}"/>
+ <classpath>
+ <path refid="tests.classpath"/>
+ <pathelement location="${output.lib.dir}/jboss-remoting-tests.jar"/>
+ </classpath>
+ <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"
+ extension="-java_serialization.xml"/>
+ <batchtest fork="yes" todir="${output.tests.results}" haltonfailure="no">
+ <fileset dir="${tests.compile.dir}">
+ <include name="**/remoting/transport/servlet/preservelines/*TestClient.class"/>
+ </fileset>
+ </batchtest>
+ </junit>
+ <delete dir="${jboss.deploy.dir}/servlet-invoker.war"/>
+ <delete file="${jboss.deploy.dir}/remoting-servlet-service.xml"/>
+ </target>
+
+ <target name="tests.servlet.ssl">
+ <copy file="${servlet.tests.dir}/ssl/remoting-servlet-service.xml" todir="${jboss.deploy.dir}" overwrite="true"/>
+ <sleep seconds="4"/>
+ <copy todir="${jboss.deploy.dir}">
+ <fileset dir="${output.lib.dir}">
+ <include name="servlet-invoker.war/**"/>
+ </fileset>
+ </copy>
+ <copy file="${servlet.tests.dir}/ssl/WEB-INF/web.xml"
+ todir="${jboss.deploy.dir}/servlet-invoker.war/WEB-INF" overwrite="true"/>
+ <sleep seconds="2"/>
+ <junit printsummary="true" fork="yes" includeantruntime="true">
+ <jvmarg value="-Dloader.path=${output.lib.dir}/jboss-remoting-loading-tests.jar"/>
+ <jvmarg value="-D${remoting.metadata.key}=${metadata}"/>
+ <classpath>
+ <path refid="tests.classpath"/>
+ <pathelement location="${output.lib.dir}/jboss-remoting-tests.jar"/>
+ </classpath>
+ <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"
+ extension="-java_serialization.xml"/>
+ <batchtest fork="yes" todir="${output.tests.results}" haltonfailure="no">
+ <fileset dir="${tests.compile.dir}">
+ <include name="**/remoting/transport/servlet/ssl/*TestClient.class"/>
+ </fileset>
+ </batchtest>
+ </junit>
+ <delete dir="${jboss.deploy.dir}/servlet-invoker.war"/>
+ <delete file="${jboss.deploy.dir}/remoting-servlet-service.xml"/>
+ </target>
+
+ <target name="tests.servlet.ssl.multihome">
+ <copy file="${servlet.tests.dir}/multihome/remoting-servlet-service.xml" todir="${jboss.deploy.dir}" overwrite="true"/>
+ <sleep seconds="2"/>
+ <copy todir="${jboss.deploy.dir}">
+ <fileset dir="${output.lib.dir}">
+ <include name="servlet-invoker.war/**"/>
+ </fileset>
+ </copy>
+ <copy file="${servlet.tests.dir}/multihome/WEB-INF/web.xml"
+ todir="${jboss.deploy.dir}/servlet-invoker.war/WEB-INF" overwrite="true"/>
+ <sleep seconds="2"/>
+ <junit printsummary="true" fork="yes" includeantruntime="true">
+ <jvmarg value="-Dloader.path=${output.lib.dir}/jboss-remoting-loading-tests.jar"/>
+ <jvmarg value="-D${remoting.metadata.key}=${metadata}"/>
+ <classpath>
+ <path refid="tests.classpath"/>
+ <pathelement location="${output.lib.dir}/jboss-remoting-tests.jar"/>
+ </classpath>
+ <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"
+ extension="-java_serialization.xml"/>
+ <batchtest fork="yes" todir="${output.tests.results}" haltonfailure="no">
+ <fileset dir="${tests.compile.dir}">
+ <include name="**/remoting/transport/servlet/multihome/*TestClient.class"/>
+ </fileset>
+ </batchtest>
+ </junit>
+ <delete dir="${jboss.deploy.dir}/servlet-invoker.war"/>
+ <delete file="${jboss.deploy.dir}/remoting-servlet-service.xml"/>
+ </target>
+
<target name="tests.versioning.beta2.client" depends="jars, tests.jars">
<!--<antcall target="tests.versioning.all_transports" inheritrefs="true">-->
<antcall target="tests.versioning.no_multiplex" inheritrefs="true">
15 years, 10 months
JBoss Remoting SVN: r4927 - in remoting2/branches: 2.x/src/main/org/jboss/remoting and 1 other directory.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2009-04-05 00:14:26 -0400 (Sun, 05 Apr 2009)
New Revision: 4927
Modified:
remoting2/branches/2.2/src/main/org/jboss/remoting/ConnectionValidator.java
remoting2/branches/2.x/src/main/org/jboss/remoting/ConnectionValidator.java
Log:
JBREM-1082: Removed mistakenly added second extraction of "NumberOfCallRetries" value from configuration map.
Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/ConnectionValidator.java
===================================================================
--- remoting2/branches/2.2/src/main/org/jboss/remoting/ConnectionValidator.java 2009-04-05 03:56:21 UTC (rev 4926)
+++ remoting2/branches/2.2/src/main/org/jboss/remoting/ConnectionValidator.java 2009-04-05 04:14:26 UTC (rev 4927)
@@ -205,12 +205,6 @@
". Using default value " + DEFAULT_PING_TIMEOUT);
}
}
- o = config.get("NumberOfCallRetries");
- if (o != null)
- {
- localConfig.put("NumberOfCallRetries", o);
- }
-
}
if (localConfig.get(ServerInvoker.TIMEOUT) == null)
Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/ConnectionValidator.java
===================================================================
--- remoting2/branches/2.x/src/main/org/jboss/remoting/ConnectionValidator.java 2009-04-05 03:56:21 UTC (rev 4926)
+++ remoting2/branches/2.x/src/main/org/jboss/remoting/ConnectionValidator.java 2009-04-05 04:14:26 UTC (rev 4927)
@@ -205,11 +205,6 @@
". Using default value " + DEFAULT_PING_TIMEOUT);
}
}
- o = config.get("NumberOfCallRetries");
- if (o != null)
- {
- localConfig.put("NumberOfCallRetries", o);
- }
}
if (localConfig.get(ServerInvoker.TIMEOUT) == null)
15 years, 10 months
JBoss Remoting SVN: r4926 - remoting2/branches/2.2/src/tests/org/jboss/test/remoting/connection.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2009-04-04 23:56:21 -0400 (Sat, 04 Apr 2009)
New Revision: 4926
Modified:
remoting2/branches/2.2/src/tests/org/jboss/test/remoting/connection/ConnectionValidatorDisconnectTimeoutTestCase.java
Log:
JBREM-1112: Fixed InvokerLocator in a couple of places to accommodate metadata.
Modified: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/connection/ConnectionValidatorDisconnectTimeoutTestCase.java
===================================================================
--- remoting2/branches/2.2/src/tests/org/jboss/test/remoting/connection/ConnectionValidatorDisconnectTimeoutTestCase.java 2009-04-05 03:55:07 UTC (rev 4925)
+++ remoting2/branches/2.2/src/tests/org/jboss/test/remoting/connection/ConnectionValidatorDisconnectTimeoutTestCase.java 2009-04-05 03:56:21 UTC (rev 4926)
@@ -225,8 +225,9 @@
// Create client.
String clientLocatorURI = locatorURI;
- clientLocatorURI += "/?" + Client.USE_ALL_PARAMS + "=true";
+ clientLocatorURI += "&" + Client.USE_ALL_PARAMS + "=true";
clientLocatorURI += "&" + ConnectionValidator.FAILURE_DISCONNECT_TIMEOUT + "=0";
+ log.info("clientLocatorURI: " + clientLocatorURI);
InvokerLocator clientLocator = new InvokerLocator(clientLocatorURI);
HashMap clientConfig = new HashMap();
clientConfig.put(InvokerLocator.FORCE_REMOTE, "true");
@@ -268,8 +269,9 @@
// Create client.
String clientLocatorURI = locatorURI;
- clientLocatorURI += "/?" + Client.USE_ALL_PARAMS + "=true";
+ clientLocatorURI += "&" + Client.USE_ALL_PARAMS + "=true";
clientLocatorURI += "&" + ConnectionValidator.FAILURE_DISCONNECT_TIMEOUT + "=10000";
+ log.info("clientLocatorURI: " + clientLocatorURI);
InvokerLocator clientLocator = new InvokerLocator(clientLocatorURI);
HashMap clientConfig = new HashMap();
clientConfig.put(InvokerLocator.FORCE_REMOTE, "true");
@@ -478,11 +480,11 @@
InvokerRegistry.registerInvokerFactories("socket", org.jboss.remoting.transport.socket.TransportClientFactory.class, TestServerInvokerFactory.class);
host = InetAddress.getLocalHost().getHostAddress();
port = PortUtil.findFreePort(host);
- locatorURI = getTransport() + "://" + host + ":" + port;
+ locatorURI = getTransport() + "://" + host + ":" + port + "/?x=x";
String metadata = System.getProperty("remoting.metadata");
if (metadata != null)
{
- locatorURI += "/?" + metadata;
+ locatorURI += "&" + metadata;
}
serverLocator = new InvokerLocator(locatorURI);
log.info("Starting remoting server with locator uri of: " + locatorURI);
15 years, 10 months