JBoss Remoting SVN: r5276 - remoting2/branches/2.x/src/main/org/jboss/remoting/detection/jndi.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2009-05-19 14:51:16 -0400 (Tue, 19 May 2009)
New Revision: 5276
Modified:
remoting2/branches/2.x/src/main/org/jboss/remoting/detection/jndi/JNDIDetector.java
Log:
JBREM-1137: Wrapped call to new InitialContext() in PrivilegedExceptionAction.
Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/detection/jndi/JNDIDetector.java
===================================================================
--- remoting2/branches/2.x/src/main/org/jboss/remoting/detection/jndi/JNDIDetector.java 2009-05-19 18:50:16 UTC (rev 5275)
+++ remoting2/branches/2.x/src/main/org/jboss/remoting/detection/jndi/JNDIDetector.java 2009-05-19 18:51:16 UTC (rev 5276)
@@ -504,7 +504,7 @@
env.put(Context.PROVIDER_URL, host + ":" + port);
env.put(Context.URL_PKG_PREFIXES, urlPackage);
- InitialContext initialContext = new InitialContext(env);
+ InitialContext initialContext = createContext(env);
try
{
context = initialContextLookup(initialContext, subContextName);
@@ -770,4 +770,27 @@
throw (NamingException) e.getCause();
}
}
+
+ static private InitialContext createContext(final Properties env) throws NamingException
+ {
+ if (SecurityUtility.skipAccessControl())
+ {
+ return new InitialContext(env);
+ }
+
+ try
+ {
+ return (InitialContext) AccessController.doPrivileged( new PrivilegedExceptionAction()
+ {
+ public Object run() throws Exception
+ {
+ return new InitialContext(env);
+ }
+ });
+ }
+ catch (PrivilegedActionException e)
+ {
+ throw (RuntimeException) e.getCause();
+ }
+ }
}
14 years, 11 months
JBoss Remoting SVN: r5275 - remoting2/branches/2.x/src/etc.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2009-05-19 14:50:16 -0400 (Tue, 19 May 2009)
New Revision: 5275
Modified:
remoting2/branches/2.x/src/etc/remoting.security.policy.core
remoting2/branches/2.x/src/etc/remoting.security.policy.tests
Log:
JBREM-1137: Added read permission for system property "jboss.global.jnp.disableDiscovery".
Modified: remoting2/branches/2.x/src/etc/remoting.security.policy.core
===================================================================
--- remoting2/branches/2.x/src/etc/remoting.security.policy.core 2009-05-19 07:46:16 UTC (rev 5274)
+++ remoting2/branches/2.x/src/etc/remoting.security.policy.core 2009-05-19 18:50:16 UTC (rev 5275)
@@ -196,6 +196,7 @@
// Used by org.jboss.remoting.detection.jndi.JNDIDetector
permission java.util.PropertyPermission "java.naming.factory.initial", "write";
+ permission java.util.PropertyPermission "jboss.global.jnp.disableDiscovery", "read";
// Used by org.jboss.remoting.detection.util.DetectorUtil
permission java.util.PropertyPermission "jboss.identity", "read, write";
Modified: remoting2/branches/2.x/src/etc/remoting.security.policy.tests
===================================================================
--- remoting2/branches/2.x/src/etc/remoting.security.policy.tests 2009-05-19 07:46:16 UTC (rev 5274)
+++ remoting2/branches/2.x/src/etc/remoting.security.policy.tests 2009-05-19 18:50:16 UTC (rev 5275)
@@ -188,11 +188,13 @@
// jndi detection test cases
permission java.util.PropertyPermission "java.naming.factory.initial", "write";
+ permission java.util.PropertyPermission "jboss.global.jnp.disableDiscovery", "read";
permission org.jboss.naming.JndiPermission "detection", "createSubcontext";
permission org.jboss.naming.JndiPermission "detection", "listBindings";
permission org.jboss.naming.JndiPermission "detection", "lookup";
permission org.jboss.naming.JndiPermission "detection/*", "rebind";
permission org.jboss.naming.JndiPermission "detection/*", "unbind";
+
// TODO - this stuff ought to be in privileged blocks within the Ant JUnit task
permission java.util.PropertyPermission "*", "read, write"; // ugh
14 years, 11 months
JBoss Remoting SVN: r5274 - remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/socket/ssl/timeout.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2009-05-19 03:46:16 -0400 (Tue, 19 May 2009)
New Revision: 5274
Added:
remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/socket/ssl/timeout/SSLSocketWriteTimeoutTest.java
Log:
JBREM-1120: Temporarily disabled test.
Copied: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/socket/ssl/timeout/SSLSocketWriteTimeoutTest.java (from rev 5091, remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/socket/ssl/timeout/SSLSocketWriteTimeoutTestCase.java)
===================================================================
--- remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/socket/ssl/timeout/SSLSocketWriteTimeoutTest.java (rev 0)
+++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/socket/ssl/timeout/SSLSocketWriteTimeoutTest.java 2009-05-19 07:46:16 UTC (rev 5274)
@@ -0,0 +1,41 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2009, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.test.remoting.transport.socket.ssl.timeout;
+
+import org.jboss.test.remoting.transport.socket.timeout.SSLWriteTimeoutTestParent;
+
+/**
+ * Unit tests for JBREM-1120.
+ *
+ * @author <a href="ron.sigal(a)jboss.com">Ron Sigal</a>
+ * @version $Rev$
+ * <p>
+ * Copyright Apr 22, 2009
+ * </p>
+ */
+public class SSLSocketWriteTimeoutTest extends SSLWriteTimeoutTestParent
+{
+ protected String getTransport()
+ {
+ return "sslsocket";
+ }
+}
Property changes on: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/socket/ssl/timeout/SSLSocketWriteTimeoutTest.java
___________________________________________________________________
Name: svn:mergeinfo
+
14 years, 11 months
JBoss Remoting SVN: r5272 - remoting2/branches/2.x/src/tests/org/jboss/test/remoting/marshall/config.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2009-05-18 00:49:46 -0400 (Mon, 18 May 2009)
New Revision: 5272
Modified:
remoting2/branches/2.x/src/tests/org/jboss/test/remoting/marshall/config/ConfigTestMarshaller.java
Log:
JBREM-1102: Added log statement to reset().
Modified: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/marshall/config/ConfigTestMarshaller.java
===================================================================
--- remoting2/branches/2.x/src/tests/org/jboss/test/remoting/marshall/config/ConfigTestMarshaller.java 2009-05-17 21:39:34 UTC (rev 5271)
+++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/marshall/config/ConfigTestMarshaller.java 2009-05-18 04:49:46 UTC (rev 5272)
@@ -67,6 +67,7 @@
{
cloned = 0;
wrote = false;
+ log.info("reset(): wrote: " + wrote + ", cloned: " + cloned);
}
}
14 years, 11 months
JBoss Remoting SVN: r5271 - remoting2/branches/2.x/src/main/org/jboss/remoting.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2009-05-17 17:39:34 -0400 (Sun, 17 May 2009)
New Revision: 5271
Modified:
remoting2/branches/2.x/src/main/org/jboss/remoting/AbstractInvoker.java
Log:
JBREM-1102: Changed reference from configuration to this.configuration.
Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/AbstractInvoker.java
===================================================================
--- remoting2/branches/2.x/src/main/org/jboss/remoting/AbstractInvoker.java 2009-05-17 21:38:24 UTC (rev 5270)
+++ remoting2/branches/2.x/src/main/org/jboss/remoting/AbstractInvoker.java 2009-05-17 21:39:34 UTC (rev 5271)
@@ -162,7 +162,7 @@
" must be a String: " + o + ". Using " + getVersion());
}
- o = configuration.get(Remoting.PASS_CONFIG_MAP_TO_MARSHAL_FACTORY);
+ o = this.configuration.get(Remoting.PASS_CONFIG_MAP_TO_MARSHAL_FACTORY);
if (o instanceof String)
{
this.passConfigMapToMarshalFactory = Boolean.valueOf((String) o).booleanValue();
14 years, 11 months
JBoss Remoting SVN: r5270 - remoting2/branches/2.2/src/main/org/jboss/remoting.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2009-05-17 17:38:24 -0400 (Sun, 17 May 2009)
New Revision: 5270
Modified:
remoting2/branches/2.2/src/main/org/jboss/remoting/AbstractInvoker.java
Log:
JBREM-1102: Changed reference from configuration to this.configuration.
Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/AbstractInvoker.java
===================================================================
--- remoting2/branches/2.2/src/main/org/jboss/remoting/AbstractInvoker.java 2009-05-17 08:05:24 UTC (rev 5269)
+++ remoting2/branches/2.2/src/main/org/jboss/remoting/AbstractInvoker.java 2009-05-17 21:38:24 UTC (rev 5270)
@@ -122,7 +122,7 @@
this.setSerializationType(locator.findSerializationType());
}
- Object o = configuration.get(Remoting.PASS_CONFIG_MAP_TO_MARSHAL_FACTORY);
+ Object o = this.configuration.get(Remoting.PASS_CONFIG_MAP_TO_MARSHAL_FACTORY);
if (o instanceof String)
{
this.passConfigMapToMarshalFactory = Boolean.valueOf((String) o).booleanValue();
14 years, 11 months
JBoss Remoting SVN: r5269 - remoting2/branches/2.x.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2009-05-17 04:05:24 -0400 (Sun, 17 May 2009)
New Revision: 5269
Modified:
remoting2/branches/2.x/build.xml
Log:
(1) JBREM-1135: Updated version to 2.5.2; (2) JBREM-1102: split up servlet marshalling tests; (3) JBREM-1133, JBREM-1134: add latest versions to versioning test suite, and added lease tests to versioning test suite.
Modified: remoting2/branches/2.x/build.xml
===================================================================
--- remoting2/branches/2.x/build.xml 2009-05-17 08:00:26 UTC (rev 5268)
+++ remoting2/branches/2.x/build.xml 2009-05-17 08:05:24 UTC (rev 5269)
@@ -225,9 +225,9 @@
<!-- Module name(s) & version -->
<property name="module.name" value="remoting"/>
<property name="module.Name" value="JBoss Remoting"/>
- <property name="module.version" value="2.5.1"/>
+ <property name="module.version" value="2.5.2"/>
<!-- extension is for the file suffix to use for dtribution build -->
- <property name="module.version.extension" value="2_5_1"/>
+ <property name="module.version.extension" value="2_5_2"/>
<property name="implementation.url" value="http://www.jboss.org/products/remoting"/>
<property name="root.dir" value="${basedir}"/>
@@ -1696,12 +1696,14 @@
<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.marshal.config" inheritrefs="true"/>
+ <antcall target="tests.servlet.marshal.noconfig" 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="tests.servlet.ssl.multihome" inheritrefs="true"/>
<antcall target="AS.shutdown"/>
</target>
@@ -1715,7 +1717,7 @@
</copy>
<copy file="${servlet.tests.dir}/WEB-INF/web.xml"
todir="${jboss.deploy.dir}/servlet-invoker.war/WEB-INF" overwrite="true"/>
- <sleep seconds="2"/>
+ <sleep seconds="4"/>
<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}"/>
@@ -1745,7 +1747,7 @@
</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"/>
+ <sleep seconds="4"/>
<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}"/>
@@ -1765,17 +1767,47 @@
<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"/>
+ <target name="tests.servlet.marshal.config">
+ <copy file="${servlet.tests.dir}/marshal/config/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"
+ <copy file="${servlet.tests.dir}/marshal/config/WEB-INF/web.xml"
todir="${jboss.deploy.dir}/servlet-invoker.war/WEB-INF" overwrite="true"/>
+ <sleep seconds="4"/>
+ <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/config/*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.noconfig">
+ <copy file="${servlet.tests.dir}/marshal/noconfig/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/noconfig/WEB-INF/web.xml"
+ todir="${jboss.deploy.dir}/servlet-invoker.war/WEB-INF" overwrite="true"/>
+ <sleep seconds="4"/>
<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}"/>
@@ -1787,7 +1819,7 @@
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"/>
+ <include name="**/remoting/transport/servlet/marshal/noconfig/*TestClient.class"/>
</fileset>
</batchtest>
</junit>
@@ -1805,7 +1837,7 @@
</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"/>
+ <sleep seconds="4"/>
<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}"/>
@@ -1839,6 +1871,7 @@
<!--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>
+ <sleep seconds="4"/>
<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}"/>
@@ -1867,7 +1900,7 @@
</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"/>
+ <sleep seconds="4"/>
<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}"/>
@@ -1897,7 +1930,7 @@
</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"/>
+ <sleep seconds="4"/>
<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}"/>
@@ -1927,7 +1960,7 @@
</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"/>
+ <sleep seconds="4"/>
<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}"/>
@@ -1957,7 +1990,7 @@
</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"/>
+ <sleep seconds="5"/>
<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}"/>
@@ -1987,7 +2020,7 @@
</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"/>
+ <sleep seconds="5"/>
<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}"/>
@@ -2125,6 +2158,25 @@
</antcall>
<!-- ******************************************************************************** -->
+
+ <!-- Current <- -> 2.5.1 -->
+ <antcall target="download.version">
+ <param name="version" value="2.5.1"/>
+ </antcall>
+ <antcall target="tests.versioning.all_transports" inheritrefs="true">
+ <param name="jboss-junit-configuration" value="2_5_1-client"/>
+ <param name="client.classpath" value="${etc.dir}/lib/2.5.1/jboss-remoting.jar${extended.classpath}"/>
+ <param name="server.classpath" value="${output.lib.dir}/jboss-remoting.jar${extended.classpath}"/>
+ <param name="check_content_type" value="true"/>
+ </antcall>
+ <antcall target="tests.versioning.all_transports" inheritrefs="true">
+ <param name="jboss-junit-configuration" value="2_5_1-server"/>
+ <param name="server.classpath" value="${etc.dir}/lib/2.5.1/jboss-remoting.jar${extended.classpath}"/>
+ <param name="client.classpath" value="${output.lib.dir}/jboss-remoting.jar${extended.classpath}"/>
+ <param name="check_content_type" value="true"/>
+ </antcall>
+
+ <!-- ******************************************************************************** -->
<!-- Current <- -> 2.5.0.SP2 -->
<antcall target="download.version">
<param name="version" value="2.5.0.SP2"/>
@@ -2213,7 +2265,61 @@
<param name="client.classpath" value="${output.lib.dir}/jboss-remoting.jar${extended.classpath}"/>
<param name="check_content_type" value="true"/>
</antcall>
-
+
+ <!-- ******************************************************************************** -->
+ <!-- Current <- -> 2.2.3 -->
+ <antcall target="download.version">
+ <param name="version" value="2.2.3"/>
+ </antcall>
+ <antcall target="tests.versioning.all_transports_pre_2.4" inheritrefs="true">
+ <param name="jboss-junit-configuration" value="2_2_3"/>
+ <param name="client.classpath" value="${etc.dir}/lib/2.2.3/jboss-remoting.jar${old.extended.classpath}"/>
+ <param name="server.classpath" value="${output.lib.dir}/jboss-remoting.jar${extended.classpath}"/>
+ <param name="client.pre_2_0_compatible" value=""/>
+ <param name="server.pre_2_0_compatible" value=""/>
+ <param name="client.version" value=""/>
+ <param name="server.version" value="2"/>
+ <param name="check_connection" value="false"/>
+ </antcall>
+ <antcall target="tests.versioning.all_transports_pre_2.4" inheritrefs="true">
+ <param name="jboss-junit-configuration" value="2_2_3-server"/>
+ <param name="server.classpath" value="${etc.dir}/lib/2.2.3/jboss-remoting.jar${old.extended.classpath}"/>
+ <param name="client.classpath" value="${output.lib.dir}/jboss-remoting.jar${extended.classpath}"/>
+ <param name="client.pre_2_0_compatible" value=""/>
+ <param name="server.pre_2_0_compatible" value=""/>
+ <param name="client.version" value="2"/>
+ <param name="server.version" value=""/>
+ <param name="check_connection" value="false"/>
+ <param name="check_content_type" value="true"/>
+ </antcall>
+
+ <!-- ******************************************************************************** -->
+ <!-- Current <- -> 2.2.2.SP11 -->
+ <antcall target="download.version">
+ <param name="version" value="2.2.2.SP11"/>
+ </antcall>
+ <antcall target="tests.versioning.all_transports_pre_2.4" inheritrefs="true">
+ <param name="jboss-junit-configuration" value="2_2_2_SP11-client"/>
+ <param name="client.classpath" value="${etc.dir}/lib/2.2.2.SP11/jboss-remoting.jar${old.extended.classpath}"/>
+ <param name="server.classpath" value="${output.lib.dir}/jboss-remoting.jar${extended.classpath}"/>
+ <param name="client.pre_2_0_compatible" value=""/>
+ <param name="server.pre_2_0_compatible" value=""/>
+ <param name="client.version" value=""/>
+ <param name="server.version" value="2"/>
+ <param name="check_connection" value="false"/>
+ </antcall>
+ <antcall target="tests.versioning.all_transports_pre_2.4" inheritrefs="true">
+ <param name="jboss-junit-configuration" value="2_2_2_SP11-server"/>
+ <param name="server.classpath" value="${etc.dir}/lib/2.2.2.SP11/jboss-remoting.jar${old.extended.classpath}"/>
+ <param name="client.classpath" value="${output.lib.dir}/jboss-remoting.jar${extended.classpath}"/>
+ <param name="client.pre_2_0_compatible" value=""/>
+ <param name="server.pre_2_0_compatible" value=""/>
+ <param name="client.version" value="2"/>
+ <param name="server.version" value=""/>
+ <param name="check_connection" value="false"/>
+ <param name="check_content_type" value="true"/>
+ </antcall>
+
<!-- ******************************************************************************** -->
<!-- Current <- -> 2.2.2.SP10 -->
<antcall target="download.version">
@@ -2719,6 +2825,7 @@
haltonfailure="no">
<fileset dir="${tests.compile.dir}">
<include name="**/remoting/versioning/transport/**/*TestCase.class"/>
+ <include name="**/remoting/versioning/lease/**/*TestCase.class"/>
<exclude name="**/multiplex/**"/>
</fileset>
</batchtest>
@@ -2758,6 +2865,7 @@
haltonfailure="no">
<fileset dir="${tests.compile.dir}">
<include name="**/remoting/versioning/transport/**/*TestCase.class"/>
+ <include name="**/remoting/versioning/lease/**/*TestCase.class"/>
<exclude name="**/VersionRMISerializableMarshallerTestCase.class"/>
<exclude name="**/multiplex/**"/>
</fileset>
14 years, 11 months
JBoss Remoting SVN: r5268 - in remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/servlet: preservelines/WEB-INF and 1 other directory.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2009-05-17 04:00:26 -0400 (Sun, 17 May 2009)
New Revision: 5268
Modified:
remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/servlet/nopreservelines/WEB-INF/web.xml
remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/servlet/preservelines/WEB-INF/web.xml
Log:
JBREM-809: Corrected ObjectName.
Modified: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/servlet/nopreservelines/WEB-INF/web.xml
===================================================================
--- remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/servlet/nopreservelines/WEB-INF/web.xml 2009-05-17 07:58:37 UTC (rev 5267)
+++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/servlet/nopreservelines/WEB-INF/web.xml 2009-05-17 08:00:26 UTC (rev 5268)
@@ -16,7 +16,7 @@
<servlet-class>org.jboss.remoting.transport.servlet.web.ServerInvokerServlet</servlet-class>
<init-param>
<param-name>invokerName</param-name>
- <param-value>jboss.remoting:service=invoker,transport=servlet</param-value>
+ <param-value>jboss.remoting:host=localhost,port=8080,service=invoker,transport=servlet</param-value>
<description>The servlet server invoker</description>
</init-param>
<load-on-startup>1</load-on-startup>
Modified: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/servlet/preservelines/WEB-INF/web.xml
===================================================================
--- remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/servlet/preservelines/WEB-INF/web.xml 2009-05-17 07:58:37 UTC (rev 5267)
+++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/servlet/preservelines/WEB-INF/web.xml 2009-05-17 08:00:26 UTC (rev 5268)
@@ -16,7 +16,7 @@
<servlet-class>org.jboss.remoting.transport.servlet.web.ServerInvokerServlet</servlet-class>
<init-param>
<param-name>invokerName</param-name>
- <param-value>jboss.remoting:service=invoker,transport=servlet</param-value>
+ <param-value>jboss.remoting:host=localhost,port=8080,service=invoker,transport=servlet</param-value>
<description>The servlet server invoker</description>
</init-param>
<load-on-startup>1</load-on-startup>
14 years, 11 months
JBoss Remoting SVN: r5267 - in remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/servlet/marshal: config and 1 other directories.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2009-05-17 03:58:37 -0400 (Sun, 17 May 2009)
New Revision: 5267
Added:
remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/servlet/marshal/config/
remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/servlet/marshal/config/ServletConfigurationMapTestClient.java
remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/servlet/marshal/config/remoting-servlet-service.xml
remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/servlet/marshal/noconfig/
remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/servlet/marshal/noconfig/ServletConfigurationMapTestClient.java
remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/servlet/marshal/noconfig/remoting-servlet-service.xml
Removed:
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-1102: Broke org.jboss.tests.remoting.transport.servlet.marshal into ...marshal.config and ...marshal.noconfig.
Deleted: 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 2009-05-17 07:55:16 UTC (rev 5266)
+++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/servlet/marshal/ServletConfigurationMapTestClient.java 2009-05-17 07:58:37 UTC (rev 5267)
@@ -1,71 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2009, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.remoting.transport.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/config/ServletConfigurationMapTestClient.java
===================================================================
--- remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/servlet/marshal/config/ServletConfigurationMapTestClient.java (rev 0)
+++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/servlet/marshal/config/ServletConfigurationMapTestClient.java 2009-05-17 07:58:37 UTC (rev 5267)
@@ -0,0 +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);
+ }
+}
+
Added: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/servlet/marshal/config/remoting-servlet-service.xml
===================================================================
--- remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/servlet/marshal/config/remoting-servlet-service.xml (rev 0)
+++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/servlet/marshal/config/remoting-servlet-service.xml 2009-05-17 07:58:37 UTC (rev 5267)
@@ -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>
Added: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/servlet/marshal/noconfig/ServletConfigurationMapTestClient.java
===================================================================
--- remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/servlet/marshal/noconfig/ServletConfigurationMapTestClient.java (rev 0)
+++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/servlet/marshal/noconfig/ServletConfigurationMapTestClient.java 2009-05-17 07:58:37 UTC (rev 5267)
@@ -0,0 +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);
+ }
+}
+
Added: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/servlet/marshal/noconfig/remoting-servlet-service.xml
===================================================================
--- remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/servlet/marshal/noconfig/remoting-servlet-service.xml (rev 0)
+++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/servlet/marshal/noconfig/remoting-servlet-service.xml 2009-05-17 07:58:37 UTC (rev 5267)
@@ -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
+ </attribute>
+
+ <attribute name="Configuration">
+ <config>
+ <handlers>
+ <handler subsystem="test">org.jboss.test.remoting.marshall.config.TestInvocationHandler</handler>
+ </handlers>
+ </config>
+ </attribute>
+ </mbean>
+
+
+</server>
Deleted: 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 2009-05-17 07:55:16 UTC (rev 5266)
+++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/servlet/marshal/remoting-servlet-service.xml 2009-05-17 07:58:37 UTC (rev 5267)
@@ -1,23 +0,0 @@
-<?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>
14 years, 11 months