jboss-remoting-commits
August 2010
jboss-remoting-commits@lists.jboss.org
- 1 participants
- 135 discussions
JBoss Remoting SVN: r6060 - remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/servlet/nopreservelines/WEB-INF.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2010-08-05 14:48:46 -0400 (Thu, 05 Aug 2010)
New Revision: 6060
Modified:
remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/servlet/nopreservelines/WEB-INF/web.xml
Log:
JBREM-1241: Fixed invokerName.
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 2010-08-05 18:47:26 UTC (rev 6059)
+++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/servlet/nopreservelines/WEB-INF/web.xml 2010-08-05 18:48:46 UTC (rev 6060)
@@ -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:host=localhost,port=8080,service=invoker,transport=servlet</param-value>
+ <param-value>jboss.remoting:service=invoker,transport=servlet</param-value>
<description>The servlet server invoker</description>
</init-param>
<load-on-startup>1</load-on-startup>
14 years, 3 months
- 1
- 0
JBoss Remoting SVN: r6059 - remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/marshal/WEB-INF.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2010-08-05 14:47:26 -0400 (Thu, 05 Aug 2010)
New Revision: 6059
Modified:
remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/marshal/WEB-INF/web.xml
Log:
JBREM-1241: Added svn:eol-style subversion property.
Property changes on: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/marshal/WEB-INF/web.xml
___________________________________________________________________
Name: svn:eol-style
+ native
14 years, 3 months
- 1
- 0
JBoss Remoting SVN: r6058 - remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/contenttype.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2010-08-05 14:46:50 -0400 (Thu, 05 Aug 2010)
New Revision: 6058
Modified:
remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/contenttype/remoting-servlet-service.xml
Log:
JBREM-1241: Added svn:eol-style subversion property.
Property changes on: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/contenttype/remoting-servlet-service.xml
___________________________________________________________________
Name: svn:eol-style
+ native
14 years, 3 months
- 1
- 0
JBoss Remoting SVN: r6057 - remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/callback.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2010-08-05 14:45:59 -0400 (Thu, 05 Aug 2010)
New Revision: 6057
Modified:
remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/callback/remoting-servlet-service.xml
Log:
JBREM-1241: Added svn:eol-style subversion property.
Modified: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/callback/remoting-servlet-service.xml
===================================================================
--- remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/callback/remoting-servlet-service.xml 2010-08-05 18:43:45 UTC (rev 6056)
+++ remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/callback/remoting-servlet-service.xml 2010-08-05 18:45:59 UTC (rev 6057)
@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<server>
-
- <mbean code="org.jboss.remoting.transport.Connector"
- name="jboss.remoting:service=Connector,transport=Servlet,target=tests"
- display-name="Servlet transport Connector">
-
- <attribute name="InvokerLocator">
- servlet://localhost:8080/servlet-invoker/ServerInvokerServlet/?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>
+<?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>
Property changes on: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/callback/remoting-servlet-service.xml
___________________________________________________________________
Name: svn:eol-style
+ native
14 years, 3 months
- 1
- 0
JBoss Remoting SVN: r6056 - remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/callback/WEB-INF.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2010-08-05 14:43:45 -0400 (Thu, 05 Aug 2010)
New Revision: 6056
Modified:
remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/callback/WEB-INF/web.xml
Log:
JBREM-1241: Committing unx eol version.
Modified: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/callback/WEB-INF/web.xml
===================================================================
--- remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/callback/WEB-INF/web.xml 2010-08-05 18:42:19 UTC (rev 6055)
+++ remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/callback/WEB-INF/web.xml 2010-08-05 18:43:45 UTC (rev 6056)
@@ -1,29 +1,29 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE web-app PUBLIC
- "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
- "http://java.sun.com/dtd/web-app_2_3.dtd">
-
-<!-- The the JBossRemoting server invoker servlet web.xml descriptor
-$Id: web.xml 4837 2009-01-18 05:40:05Z ron.sigal(a)jboss.com $
--->
-<web-app>
- <servlet>
- <servlet-name>ServerInvokerServlet</servlet-name>
- <description>The ServerInvokerServlet receives requests via HTTP
- protocol from within a web container and passes it onto the
- ServletServerInvoker for processing.
- </description>
- <servlet-class>org.jboss.remoting.transport.servlet.web.ServerInvokerServlet</servlet-class>
- <init-param>
- <param-name>locatorUrl</param-name>
- <param-value>servlet://localhost:8080/servlet-invoker/ServerInvokerServlet/?createUniqueObjectName=true&useAllParams=true&blockingMode=blocking</param-value>
- <description>The servlet server invoker locator url</description>
- </init-param>
- <load-on-startup>1</load-on-startup>
- </servlet>
- <servlet-mapping>
- <servlet-name>ServerInvokerServlet</servlet-name>
- <url-pattern>/ServerInvokerServlet/*</url-pattern>
- </servlet-mapping>
-</web-app>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE web-app PUBLIC
+ "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+ "http://java.sun.com/dtd/web-app_2_3.dtd">
+
+<!-- The the JBossRemoting server invoker servlet web.xml descriptor
+$Id: web.xml 4837 2009-01-18 05:40:05Z ron.sigal(a)jboss.com $
+-->
+<web-app>
+ <servlet>
+ <servlet-name>ServerInvokerServlet</servlet-name>
+ <description>The ServerInvokerServlet receives requests via HTTP
+ protocol from within a web container and passes it onto the
+ ServletServerInvoker for processing.
+ </description>
+ <servlet-class>org.jboss.remoting.transport.servlet.web.ServerInvokerServlet</servlet-class>
+ <init-param>
+ <param-name>locatorUrl</param-name>
+ <param-value>servlet://localhost:8080/servlet-invoker/ServerInvokerServlet/?createUniqueObjectName=true&useAllParams=true&blockingMode=blocking</param-value>
+ <description>The servlet server invoker locator url</description>
+ </init-param>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>ServerInvokerServlet</servlet-name>
+ <url-pattern>/ServerInvokerServlet/*</url-pattern>
+ </servlet-mapping>
+</web-app>
+
Property changes on: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/callback/WEB-INF/web.xml
___________________________________________________________________
Name: svn:eol-style
+ native
14 years, 3 months
- 1
- 0
JBoss Remoting SVN: r6055 - remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2010-08-05 14:42:19 -0400 (Thu, 05 Aug 2010)
New Revision: 6055
Modified:
remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/server.xml
Log:
JBREM-1241: Committing unx eol version.
Modified: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/server.xml
===================================================================
--- remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/server.xml 2010-08-05 18:38:38 UTC (rev 6054)
+++ remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/server.xml 2010-08-05 18:42:19 UTC (rev 6055)
@@ -1,186 +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>
+
+ <!--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
Property changes on: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/server.xml
___________________________________________________________________
Name: svn:eol-style
+ native
14 years, 3 months
- 1
- 0
JBoss Remoting SVN: r6054 - remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/marshal/config/WEB-INF.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2010-08-05 14:38:38 -0400 (Thu, 05 Aug 2010)
New Revision: 6054
Modified:
remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/marshal/config/WEB-INF/web.xml
Log:
JBREM-1241: Fixed locatorUrl.
Modified: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/marshal/config/WEB-INF/web.xml
===================================================================
--- remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/marshal/config/WEB-INF/web.xml 2010-08-05 02:33:17 UTC (rev 6053)
+++ remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/marshal/config/WEB-INF/web.xml 2010-08-05 18:38:38 UTC (rev 6054)
@@ -16,7 +16,7 @@
<servlet-class>org.jboss.remoting.transport.servlet.web.ServerInvokerServlet</servlet-class>
<init-param>
<param-name>locatorUrl</param-name>
- <param-value>servlet://localhost:8080/servlet-invoker/ServerInvokerServlet/?marshaller=org.jboss.test.remoting.marshall.config.ConfigTestMarshaller&unmarshaller=org.jboss.test.remoting.marshall.config.ConfigTestUnmarshaller</param-value>
+ <param-value>servlet://localhost:8080/servlet-invoker/ServerInvokerServlet</param-value>
<description>The servlet server invoker locator url</description>
</init-param>
<load-on-startup>1</load-on-startup>
14 years, 3 months
- 1
- 0
JBoss Remoting SVN: r6053 - remoting2/branches/2.2.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2010-08-04 22:33:17 -0400 (Wed, 04 Aug 2010)
New Revision: 6053
Modified:
remoting2/branches/2.2/build.xml
Log:
JBREM-1239: Added release 2.2.3.SP1 to tests.versioning.all.
Modified: remoting2/branches/2.2/build.xml
===================================================================
--- remoting2/branches/2.2/build.xml 2010-08-05 02:18:14 UTC (rev 6052)
+++ remoting2/branches/2.2/build.xml 2010-08-05 02:33:17 UTC (rev 6053)
@@ -44,36 +44,36 @@
<!-- ================================================================== -->
<!-- Sets bind address and port used by jrunit/jgroups multicast socket -->
<!-- ================================================================== -->
-
+
<condition property="bind.address" value="${jrunit.bind_addr}" else="127.0.0.1">
- <isset property="jrunit.bind_addr"/>
+ <isset property="jrunit.bind_addr"/>
</condition>
<condition property="multicast.address" value="${jrunit.mcast_addr}" else="228.15.2.3">
- <isset property="jrunit.mcast_addr"/>
+ <isset property="jrunit.mcast_addr"/>
</condition>
<condition property="multicast.port" value="${jrunit.mcast_port}" else="45566">
- <isset property="jrunit.mcast_port"/>
+ <isset property="jrunit.mcast_port"/>
</condition>
<condition property="receiveOnAllInterfaces" value="${jrunit.receive_on_all_interfaces}" else="false">
- <isset property="jrunit.receive_on_all_interfaces"/>
+ <isset property="jrunit.receive_on_all_interfaces"/>
</condition>
<condition property="sendOnAllInterfaces" value="${jrunit.send_on_all_interfaces}" else="false">
- <isset property="jrunit.send_on_all_interfaces"/>
+ <isset property="jrunit.send_on_all_interfaces"/>
</condition>
<condition property="sendInterfaces" value="${jrunit.send_interfaces}" else="none">
- <isset property="jrunit.send_interfaces"/>
+ <isset property="jrunit.send_interfaces"/>
</condition>
- <echo>
- JRunit system property values:
- jrunit.bind_addr=${bind.address}
- jrunit.mcast_addr=${multicast.address}
- jrunit.mcast_port=${multicast.port}
- jrunit.receiveOnAllInterfaces=${receiveOnAllInterfaces}
- jrunit.sendOnAllInterfaces=${sendOnAllInterfaces}
- jrunit.sendInterfaces=${sendInterfaces}
+ <echo>
+ JRunit system property values:
+ jrunit.bind_addr=${bind.address}
+ jrunit.mcast_addr=${multicast.address}
+ jrunit.mcast_port=${multicast.port}
+ jrunit.receiveOnAllInterfaces=${receiveOnAllInterfaces}
+ jrunit.sendOnAllInterfaces=${sendOnAllInterfaces}
+ jrunit.sendInterfaces=${sendInterfaces}
</echo>
-
-
+
+
<target name="configure" depends="get-jvm" unless="configure.disable">
<property file="local.properties" />
@@ -336,7 +336,7 @@
<include name="org/jboss/**/*.key"/>
</fileset>
</jar>
-
+
<jar jarfile="${output.lib.dir}/jboss-remoting-src.jar"
manifest="${manifest.file}">
<fileset dir="${src.dir}">
@@ -474,19 +474,19 @@
<fileset dir="${compile.dir}">
<include name="org/jboss/remoting/transport/bisocket/**"/>
<include name="org/jboss/remoting/transport/sslbisocket/**"/>
- <include name="org/jboss/remoting/transport/bisocket/**"/>
- <include name="org/jboss/remoting/transport/socket/LRUPool*"/>
+ <include name="org/jboss/remoting/transport/bisocket/**"/>
+ <include name="org/jboss/remoting/transport/socket/LRUPool*"/>
<include name="org/jboss/remoting/transport/socket/SocketClientInvoker*"/>
<include name="org/jboss/remoting/transport/socket/SocketServerInvoker*"/>
<include name="org/jboss/remoting/transport/socket/MicroSocketClientInvoker*"/>
- <include name="org/jboss/remoting/transport/socket/OpenConnectionChecker*"/>
- <include name="org/jboss/remoting/transport/socket/ServerAddress*"/>
+ <include name="org/jboss/remoting/transport/socket/OpenConnectionChecker*"/>
+ <include name="org/jboss/remoting/transport/socket/ServerAddress*"/>
<include name="org/jboss/remoting/transport/socket/ServerThread*"/>
<include name="org/jboss/remoting/transport/socket/SocketWrapper*"/>
- <include name="org/jboss/remoting/transport/socket/ClientSocketWrapper*"/>
+ <include name="org/jboss/remoting/transport/socket/ClientSocketWrapper*"/>
<include name="org/jboss/remoting/transport/socket/ServerSocketWrapper*"/>
<include name="org/jboss/remoting/transport/socket/TimedOutputStream*"/>
- <include name="org/jboss/remoting/transport/sslsocket/SSLSocketServerInvokerMBean*"/>
+ <include name="org/jboss/remoting/transport/sslsocket/SSLSocketServerInvokerMBean*"/>
</fileset>
</jar>
@@ -498,14 +498,14 @@
<include name="org/jboss/remoting/transport/bisocket/BisocketServerInvoker*"/>
<include name="org/jboss/remoting/transport/socket/SocketClientInvoker*"/>
<include name="org/jboss/remoting/transport/socket/SocketWrapper*"/>
- <include name="org/jboss/remoting/transport/socket/ClientSocketWrapper*"/>
+ <include name="org/jboss/remoting/transport/socket/ClientSocketWrapper*"/>
<include name="org/jboss/remoting/transport/socket/ServerSocketWrapper*"/>
- <include name="org/jboss/remoting/transport/socket/LRUPool*"/>
- <include name="org/jboss/remoting/transport/socket/MicroSocketClientInvoker*"/>
- <include name="org/jboss/remoting/transport/socket/OpenConnectionChecker*"/>
- <include name="org/jboss/remoting/transport/socket/ServerAddress*"/>
- <include name="org/jboss/remoting/transport/socket/SocketServerInvoker*"/>
- <include name="org/jboss/remoting/transport/socket/ServerThread*"/>
+ <include name="org/jboss/remoting/transport/socket/LRUPool*"/>
+ <include name="org/jboss/remoting/transport/socket/MicroSocketClientInvoker*"/>
+ <include name="org/jboss/remoting/transport/socket/OpenConnectionChecker*"/>
+ <include name="org/jboss/remoting/transport/socket/ServerAddress*"/>
+ <include name="org/jboss/remoting/transport/socket/SocketServerInvoker*"/>
+ <include name="org/jboss/remoting/transport/socket/ServerThread*"/>
<include name="org/jboss/remoting/transport/socket/TimedOutputStream*"/>
</fileset>
</jar>
@@ -524,7 +524,7 @@
<include name="org/jboss/remoting/transport/http/**"/>
<include name="org/jboss/remoting/transport/https/**"/>
<include name="org/jboss/remoting/transport/web/**"/>
- <include name="org/jboss/remoting/transport/servlet/ServletThrowable*"/>
+ <include name="org/jboss/remoting/transport/servlet/ServletThrowable*"/>
</fileset>
</jar>
@@ -539,7 +539,7 @@
<include name="org/jboss/remoting/transport/web/*WebUtil*"/>
<include name="org/jboss/remoting/transport/servlet/*Client*"/>
<include name="org/jboss/remoting/transport/sslservlet/*Client*"/>
- <include name="org/jboss/remoting/transport/servlet/ServletThrowable*"/>
+ <include name="org/jboss/remoting/transport/servlet/ServletThrowable*"/>
</fileset>
</jar>
@@ -569,7 +569,7 @@
<fileset dir="${compile.dir}">
<include name="org/jboss/remoting/transport/multiplex/**"/>
<include name="org/jboss/remoting/transport/sslmultiplex/**"/>
- <include name="org/jboss/remoting/transport/socket/*"/>
+ <include name="org/jboss/remoting/transport/socket/*"/>
</fileset>
</jar>
@@ -601,7 +601,7 @@
</junit>
<antcall target="tests.report.quick"/>
</target>
-
+
<target name="one-test" depends="tests.jars">
<mkdir dir="${output.tests.results}"/>
<mkdir dir="${output.tests.tmp}"/>
@@ -787,7 +787,7 @@
<path refid="tests.classpath"/>
<pathelement location="${output.lib.dir}/jboss-remoting-tests.jar"/>
</classpath>
- <!-- set system properties required by JRunit -->
+ <!-- set system properties required by JRunit -->
<sysproperty key="jrunit.bind_addr" value="${bind.address}"/>
<sysproperty key="jrunit.mcast_addr" value="${multicast.address}"/>
<sysproperty key="jrunit.mcast_port" value="${multicast.port}"/>
@@ -829,7 +829,7 @@
<path refid="tests.classpath"/>
<pathelement location="${output.lib.dir}/jboss-remoting-tests.jar"/>
</classpath>
- <!-- set system properties required by JRunit -->
+ <!-- set system properties required by JRunit -->
<sysproperty key="jrunit.bind_addr" value="${bind.address}"/>
<sysproperty key="jrunit.mcast_addr" value="${multicast.address}"/>
<sysproperty key="jrunit.mcast_port" value="${multicast.port}"/>
@@ -840,7 +840,7 @@
<sysproperty key="remoting.jar.dir" value="${basedir}/output/lib"/>
<sysproperty key="ant.library.dir" value="${ant.library.dir}"/>
<sysproperty key="build.home" value="${basedir}"/>
-
+
<sysproperty key="jboss-junit-configuration" value="${jboss-junit-configuration}"/>
<formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"
extension="-${jboss-junit-configuration}.xml"/>
@@ -879,7 +879,7 @@
<path refid="tests.classpath"/>
<pathelement location="${output.lib.dir}/jboss-remoting-tests.jar"/>
</classpath>
- <!-- set system properties required by JRunit -->
+ <!-- set system properties required by JRunit -->
<sysproperty key="jrunit.bind_addr" value="${bind.address}"/>
<sysproperty key="jrunit.mcast_addr" value="${multicast.address}"/>
<sysproperty key="jrunit.mcast_port" value="${multicast.port}"/>
@@ -912,7 +912,7 @@
<path refid="tests.classpath"/>
<pathelement location="${output.lib.dir}/jboss-remoting-tests.jar"/>
</classpath>
- <!-- set system properties required by JRunit -->
+ <!-- set system properties required by JRunit -->
<sysproperty key="jrunit.bind_addr" value="${bind.address}"/>
<sysproperty key="jrunit.mcast_addr" value="${multicast.address}"/>
<sysproperty key="jrunit.mcast_port" value="${multicast.port}"/>
@@ -945,7 +945,7 @@
<path refid="tests.classpath"/>
<pathelement location="${output.lib.dir}/jboss-remoting-tests.jar"/>
</classpath>
- <!-- set system properties required by JRunit -->
+ <!-- set system properties required by JRunit -->
<sysproperty key="jrunit.bind_addr" value="${bind.address}"/>
<sysproperty key="jrunit.mcast_addr" value="${multicast.address}"/>
<sysproperty key="jrunit.mcast_port" value="${multicast.port}"/>
@@ -979,7 +979,7 @@
<path refid="tests.classpath"/>
<pathelement location="${output.lib.dir}/jboss-remoting-tests.jar"/>
</classpath>
- <!-- set system properties required by JRunit -->
+ <!-- set system properties required by JRunit -->
<sysproperty key="jrunit.bind_addr" value="${bind.address}"/>
<sysproperty key="jrunit.mcast_addr" value="${multicast.address}"/>
<sysproperty key="jrunit.mcast_port" value="${multicast.port}"/>
@@ -1010,7 +1010,7 @@
<path refid="tests.classpath"/>
<pathelement location="${output.lib.dir}/jboss-remoting-tests.jar"/>
</classpath>
- <!-- set system properties required by JRunit -->
+ <!-- set system properties required by JRunit -->
<sysproperty key="jrunit.bind_addr" value="${bind.address}"/>
<sysproperty key="jrunit.mcast_addr" value="${multicast.address}"/>
<sysproperty key="jrunit.mcast_port" value="${multicast.port}"/>
@@ -1021,7 +1021,7 @@
<sysproperty key="remoting.jar.dir" value="${basedir}/output/lib"/>
<sysproperty key="ant.library.dir" value="${ant.library.dir}"/>
<sysproperty key="build.home" value="${basedir}"/>
-
+
<!-- this is needed for the remoting.marshall.dynamic.remote.MarshallerLoadingServer -->
<jvmarg value="-Dloader.path=${output.lib.dir}/jboss-remoting-loading-tests.jar"/>
<formatter type="xml"/>
@@ -1067,7 +1067,7 @@
<path refid="tests.classpath"/>
<pathelement location="${output.lib.dir}/jboss-remoting-tests.jar"/>
</classpath>
- <!-- set system properties required by JRunit -->
+ <!-- set system properties required by JRunit -->
<sysproperty key="jrunit.bind_addr" value="${bind.address}"/>
<sysproperty key="jrunit.mcast_addr" value="${multicast.address}"/>
<sysproperty key="jrunit.mcast_port" value="${multicast.port}"/>
@@ -1078,7 +1078,7 @@
<sysproperty key="remoting.jar.dir" value="${basedir}/output/lib"/>
<sysproperty key="ant.library.dir" value="${ant.library.dir}"/>
<sysproperty key="build.home" value="${basedir}"/>
-
+
<!-- this is needed for the remoting.marshall.dynamic.remote.MarshallerLoadingServer -->
<jvmarg value="-Dloader.path=${output.lib.dir}/jboss-remoting-loading-tests.jar"/>
<jvmarg value="-Dremoting.metadata=${metadata}"/>
@@ -1116,7 +1116,7 @@
<sysproperty key="remoting.jar.dir" value="${basedir}/output/lib"/>
<sysproperty key="ant.library.dir" value="${ant.library.dir}"/>
<sysproperty key="build.home" value="${basedir}"/>
-
+
<!-- this is needed for the remoting.marshall.dynamic.remote.MarshallerLoadingServer -->
<jvmarg value="-Dloader.path=${output.lib.dir}/jboss-remoting-loading-tests.jar"/>
<formatter type="xml"/>
@@ -1304,7 +1304,7 @@
<delete dir="${jboss.deploy.dir}/servlet-invoker.war"/>
<delete file="${jboss.deploy.dir}/remoting-servlet-service.xml"/>
</target>
-
+
<target name="tests.servlet.contenttype">
<copy file="${servlet.tests.dir}/contenttype/remoting-servlet-service.xml" todir="${jboss.deploy.dir}" overwrite="true"/>
<sleep seconds="2"/>
@@ -1346,7 +1346,7 @@
<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"/>
@@ -1388,7 +1388,7 @@
<delete dir="${jboss.deploy.dir}/servlet-invoker.war"/>
<delete file="${jboss.deploy.dir}/remoting-servlet-service.xml"/>
</target>
-
+
<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="4"/>
@@ -1449,7 +1449,7 @@
<path refid="tests.classpath"/>
<pathelement location="${output.lib.dir}/jboss-remoting-tests.jar"/>
</classpath>
-
+
<!-- set system properties required by JRunit -->
<sysproperty key="jrunit.bind_addr" value="${bind.address}"/>
<sysproperty key="jrunit.mcast_addr" value="${multicast.address}"/>
@@ -1473,7 +1473,7 @@
<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="4"/>
@@ -1670,8 +1670,31 @@
<param name="client.classpath" value="${output.lib.dir}/jboss-remoting.jar"/>
<param name="server.classpath" value="${output.lib.dir}/jboss-remoting.jar"/>
</antcall>
-
+
<!-- ******************************************************************************** -->
+ <!-- Current <- -> 2.2.3.SP2 -->
+ <antcall target="tests.versioning.all_transports" inheritrefs="true">
+ <param name="jboss-junit-configuration" value="2_2_3_SP2-client"/>
+ <param name="client.classpath" value="${etc.dir}/lib/remoting_2_2_3_SP2/jboss-remoting.jar"/>
+ <param name="server.classpath" value="${output.lib.dir}/jboss-remoting.jar"/>
+ <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" inheritrefs="true">
+ <param name="jboss-junit-configuration" value="2_2_3_SP2-server"/>
+ <param name="server.classpath" value="${etc.dir}/lib/remoting_2_2_3_SP2/jboss-remoting.jar"/>
+ <param name="client.classpath" value="${output.lib.dir}/jboss-remoting.jar"/>
+ <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"/>
+ </antcall>
+
+ <!-- ******************************************************************************** -->
<!-- Current <- -> 2.2.3.SP1 -->
<antcall target="tests.versioning.all_transports" inheritrefs="true">
<param name="jboss-junit-configuration" value="2_2_3_SP1-client"/>
@@ -1693,7 +1716,7 @@
<param name="server.version" value=""/>
<param name="check_connection" value="false"/>
</antcall>
-
+
<!-- ******************************************************************************** -->
<!-- Current <- -> 2.2.3 -->
<antcall target="tests.versioning.all_transports" inheritrefs="true">
@@ -1716,7 +1739,7 @@
<param name="server.version" value=""/>
<param name="check_connection" value="false"/>
</antcall>
-
+
<!-- ******************************************************************************** -->
<!-- Current <- -> 2.2.2.SP11 -->
<antcall target="tests.versioning.all_transports" inheritrefs="true">
@@ -2201,7 +2224,7 @@
<jvmarg value="-Dserver.pre_2_0_compatible=${server.pre_2_0_compatible}"/>
<jvmarg value="-Dremoting.metadata=check_connection=${check_connection}"/>
- <!-- set system properties required by JRunit -->
+ <!-- set system properties required by JRunit -->
<sysproperty key="jrunit.bind_addr" value="${bind.address}"/>
<sysproperty key="jrunit.mcast_addr" value="${multicast.address}"/>
<sysproperty key="jrunit.mcast_port" value="${multicast.port}"/>
@@ -2212,7 +2235,7 @@
<sysproperty key="remoting.jar.dir" value="${basedir}/output/lib"/>
<sysproperty key="ant.library.dir" value="${ant.library.dir}"/>
<sysproperty key="build.home" value="${basedir}"/>
-
+
<sysproperty key="jboss-junit-configuration" value="${jboss-junit-configuration}"/>
<formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"
extension="-${jboss-junit-configuration}.xml"/>
@@ -2231,7 +2254,7 @@
description="Runs remoting fuctional tests with different remoting versions for client and server."
depends="jars, tests.jars">
<mkdir dir="${output.tests.results}"/>
- <echo>Running: ${jboss-junit-configuration}</echo>
+ <echo>Running: ${jboss-junit-configuration}</echo>
<junit printsummary="true" fork="yes" includeantruntime="true">
<classpath>
<path refid="third_party.classpath"/>
@@ -2371,7 +2394,7 @@
<jvmarg value="-Dserver.pre_2_0_compatible=${server.pre_2_0_compatible}"/>
<jvmarg value="-Dclient.check_connection=${client.check_connection}"/>
<jvmarg value="-Dserver.check_connection=${server.check_connection}"/>
-
+
<!-- set system properties required by JRunit -->
<sysproperty key="jrunit.bind_addr" value="${bind.address}"/>
<sysproperty key="jrunit.mcast_addr" value="${multicast.address}"/>
@@ -2383,7 +2406,7 @@
<sysproperty key="remoting.jar.dir" value="${basedir}/output/lib"/>
<sysproperty key="ant.library.dir" value="${ant.library.dir}"/>
<sysproperty key="build.home" value="${basedir}"/>
-
+
<sysproperty key="jboss-junit-configuration" value="${jboss-junit-configuration}"/>
<formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"
extension="-${jboss-junit-configuration}.xml"/>
@@ -2457,7 +2480,7 @@
<sysproperty key="remoting.jar.dir" value="${basedir}/output/lib"/>
<sysproperty key="ant.library.dir" value="${ant.library.dir}"/>
<sysproperty key="build.home" value="${basedir}"/>
-
+
<sysproperty key="jboss-junit-configuration" value="${jboss-junit-configuration}"/>
<formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"
extension="-${jboss-junit-configuration}.xml"/>
@@ -2479,24 +2502,24 @@
<param name="server.classpath" value="${output.lib.dir}/jboss-remoting.jar"/>
</antcall>
</target>
-
- <target name="tests.versioning.lease.sub"
- description="Runs remoting fuctional tests with different remoting versions for client and server."
- depends="jars, tests.jars">
- <mkdir dir="${output.tests.results}"/>
- <echo>Running: ${jboss-junit-configuration}</echo>
- <junit printsummary="true" fork="yes" includeantruntime="true">
- <classpath>
- <path refid="third_party.classpath"/>
- <path refid="tests.version.classpath"/>
- </classpath>
- <jvmarg value="-Dclient.path=${client.classpath}"/>
- <jvmarg value="-Dserver.path=${server.classpath}"/>
- <jvmarg value="-Dclient.version=2.2"/>
- <jvmarg value="-Dserver.version=2.2"/>
- <jvmarg value="-Dclient.pre_2_0_compatible=false"/>
- <jvmarg value="-Dserver.pre_2_0_compatible=false"/>
- <jvmarg value="-Dremoting.metadata=check_connection=false"/>
+
+ <target name="tests.versioning.lease.sub"
+ description="Runs remoting fuctional tests with different remoting versions for client and server."
+ depends="jars, tests.jars">
+ <mkdir dir="${output.tests.results}"/>
+ <echo>Running: ${jboss-junit-configuration}</echo>
+ <junit printsummary="true" fork="yes" includeantruntime="true">
+ <classpath>
+ <path refid="third_party.classpath"/>
+ <path refid="tests.version.classpath"/>
+ </classpath>
+ <jvmarg value="-Dclient.path=${client.classpath}"/>
+ <jvmarg value="-Dserver.path=${server.classpath}"/>
+ <jvmarg value="-Dclient.version=2.2"/>
+ <jvmarg value="-Dserver.version=2.2"/>
+ <jvmarg value="-Dclient.pre_2_0_compatible=false"/>
+ <jvmarg value="-Dserver.pre_2_0_compatible=false"/>
+ <jvmarg value="-Dremoting.metadata=check_connection=false"/>
<!-- set system properties required by JRunit -->
<sysproperty key="jrunit.bind_addr" value="${bind.address}"/>
<sysproperty key="jrunit.mcast_addr" value="${multicast.address}"/>
@@ -2508,19 +2531,19 @@
<sysproperty key="remoting.jar.dir" value="${basedir}/output/lib"/>
<sysproperty key="ant.library.dir" value="${ant.library.dir}"/>
<sysproperty key="build.home" value="${basedir}"/>
-
- <sysproperty key="jboss-junit-configuration" value="${jboss-junit-configuration}"/>
- <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"
- extension="-${jboss-junit-configuration}.xml"/>
- <batchtest fork="yes" todir="${output.tests.results}"
- haltonfailure="no">
- <fileset dir="${tests.compile.dir}">
- <include name="**/remoting/versioning/lease/*TestCase.class"/>
- </fileset>
- </batchtest>
- </junit>
- </target>
-
+
+ <sysproperty key="jboss-junit-configuration" value="${jboss-junit-configuration}"/>
+ <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"
+ extension="-${jboss-junit-configuration}.xml"/>
+ <batchtest fork="yes" todir="${output.tests.results}"
+ haltonfailure="no">
+ <fileset dir="${tests.compile.dir}">
+ <include name="**/remoting/versioning/lease/*TestCase.class"/>
+ </fileset>
+ </batchtest>
+ </junit>
+ </target>
+
<!-- Tests only the multiplex transport -->
<target name="tests.multiplex" depends="tests.jars">
<mkdir dir="${output.tests.results}"/>
@@ -2857,7 +2880,7 @@
<path refid="tests.classpath"/>
<pathelement location="${output.lib.dir}/jboss-remoting-tests.jar"/>
</classpath>
-
+
<!-- set system properties required by JRunit -->
<sysproperty key="jrunit.bind_addr" value="${bind.address}"/>
<sysproperty key="jrunit.mcast_addr" value="${multicast.address}"/>
@@ -2869,7 +2892,7 @@
<sysproperty key="remoting.jar.dir" value="${basedir}/output/lib"/>
<sysproperty key="ant.library.dir" value="${ant.library.dir}"/>
<sysproperty key="build.home" value="${basedir}"/>
-
+
<sysproperty key="jboss-junit-configuration" value="${jboss-junit-configuration}"/>
<formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"
extension="-${jboss-junit-configuration}.xml"/>
@@ -2897,7 +2920,7 @@
<!--<jvmarg value="-Djrunit.result_timeout=300000"/>-->
<!--<jvmarg value="-Djrunit.tear_down_timeout=300000"/>-->
<!--<jvmarg value="-Djrunit.run_test_timeout=300000"/>-->
-
+
<!-- set system properties required by JRunit -->
<sysproperty key="jrunit.bind_addr" value="${bind.address}"/>
<sysproperty key="jrunit.mcast_addr" value="${multicast.address}"/>
@@ -3176,7 +3199,7 @@
<path refid="tests.classpath"/>
<pathelement location="${output.lib.dir}/jboss-remoting-tests.jar"/>
</classpath>
-
+
<!-- set system properties required by JRunit -->
<sysproperty key="jrunit.bind_addr" value="${bind.address}"/>
<sysproperty key="jrunit.mcast_addr" value="${multicast.address}"/>
@@ -3188,7 +3211,7 @@
<sysproperty key="remoting.jar.dir" value="${basedir}/output/lib"/>
<sysproperty key="ant.library.dir" value="${ant.library.dir}"/>
<sysproperty key="build.home" value="${basedir}"/>
-
+
<sysproperty key="jboss-junit-configuration" value="${jboss-junit-configuration}"/>
<formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"
extension="-${jboss-junit-configuration}.xml"/>
@@ -3222,7 +3245,7 @@
<path refid="tests.classpath"/>
<pathelement location="${output.lib.dir}/jboss-remoting-tests.jar"/>
</classpath>
-
+
<!-- set system properties required by JRunit -->
<sysproperty key="jrunit.bind_addr" value="${bind.address}"/>
<sysproperty key="jrunit.mcast_addr" value="${multicast.address}"/>
@@ -3234,7 +3257,7 @@
<sysproperty key="remoting.jar.dir" value="${basedir}/output/lib"/>
<sysproperty key="ant.library.dir" value="${ant.library.dir}"/>
<sysproperty key="build.home" value="${basedir}"/>
-
+
<sysproperty key="jboss-junit-configuration" value="${jboss-junit-configuration}"/>
<formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"
extension="-${jboss-junit-configuration}.xml"/>
@@ -3307,7 +3330,7 @@
<path refid="tests.classpath"/>
<pathelement location="${output.lib.dir}/jboss-remoting-tests.jar"/>
</classpath>
-
+
<!-- set system properties required by JRunit -->
<sysproperty key="jrunit.bind_addr" value="${bind.address}"/>
<sysproperty key="jrunit.mcast_addr" value="${multicast.address}"/>
@@ -3319,7 +3342,7 @@
<sysproperty key="remoting.jar.dir" value="${basedir}/output/lib"/>
<sysproperty key="ant.library.dir" value="${ant.library.dir}"/>
<sysproperty key="build.home" value="${basedir}"/>
-
+
<sysproperty key="jboss-junit-configuration" value="${jboss-junit-configuration}"/>
<formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"
extension="-${jboss-junit-configuration}.xml"/>
@@ -3350,7 +3373,7 @@
<path refid="tests.classpath"/>
<pathelement location="${output.lib.dir}/jboss-remoting-tests.jar"/>
</classpath>
-
+
<!-- set system properties required by JRunit -->
<sysproperty key="jrunit.bind_addr" value="${bind.address}"/>
<sysproperty key="jrunit.mcast_addr" value="${multicast.address}"/>
@@ -3362,7 +3385,7 @@
<sysproperty key="remoting.jar.dir" value="${basedir}/output/lib"/>
<sysproperty key="ant.library.dir" value="${ant.library.dir}"/>
<sysproperty key="build.home" value="${basedir}"/>
-
+
<sysproperty key="jboss-junit-configuration" value="${jboss-junit-configuration}"/>
<formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"
extension="-${jboss-junit-configuration}.xml"/>
@@ -3393,7 +3416,7 @@
<path refid="tests.classpath"/>
<pathelement location="${output.lib.dir}/jboss-remoting-tests.jar"/>
</classpath>
-
+
<!-- set system properties required by JRunit -->
<sysproperty key="jrunit.bind_addr" value="${bind.address}"/>
<sysproperty key="jrunit.mcast_addr" value="${multicast.address}"/>
@@ -3405,7 +3428,7 @@
<sysproperty key="remoting.jar.dir" value="${basedir}/output/lib"/>
<sysproperty key="ant.library.dir" value="${ant.library.dir}"/>
<sysproperty key="build.home" value="${basedir}"/>
-
+
<sysproperty key="jboss-junit-configuration" value="${jboss-junit-configuration}"/>
<formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"
extension="-${jboss-junit-configuration}.xml"/>
@@ -3436,7 +3459,7 @@
<path refid="tests.classpath"/>
<pathelement location="${output.lib.dir}/jboss-remoting-tests.jar"/>
</classpath>
-
+
<!-- set system properties required by JRunit -->
<sysproperty key="jrunit.bind_addr" value="${bind.address}"/>
<sysproperty key="jrunit.mcast_addr" value="${multicast.address}"/>
@@ -3448,7 +3471,7 @@
<sysproperty key="remoting.jar.dir" value="${basedir}/output/lib"/>
<sysproperty key="ant.library.dir" value="${ant.library.dir}"/>
<sysproperty key="build.home" value="${basedir}"/>
-
+
<sysproperty key="jboss-junit-configuration" value="${jboss-junit-configuration}"/>
<formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"
extension="-${jboss-junit-configuration}.xml"/>
@@ -3480,7 +3503,7 @@
<path refid="tests.classpath"/>
<pathelement location="${output.lib.dir}/jboss-remoting-tests.jar"/>
</classpath>
-
+
<!-- set system properties required by JRunit -->
<sysproperty key="jrunit.bind_addr" value="${bind.address}"/>
<sysproperty key="jrunit.mcast_addr" value="${multicast.address}"/>
@@ -3492,7 +3515,7 @@
<sysproperty key="remoting.jar.dir" value="${basedir}/output/lib"/>
<sysproperty key="ant.library.dir" value="${ant.library.dir}"/>
<sysproperty key="build.home" value="${basedir}"/>
-
+
<sysproperty key="jboss-junit-configuration" value="${jboss-junit-configuration}"/>
<formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"
extension="-${jboss-junit-configuration}.xml"/>
@@ -3676,7 +3699,7 @@
<path refid="tests.classpath"/>
<pathelement location="${output.lib.dir}/jboss-remoting-tests.jar"/>
</classpath>
-
+
<!-- set system properties required by JRunit -->
<sysproperty key="jrunit.bind_addr" value="${bind.address}"/>
<sysproperty key="jrunit.mcast_addr" value="${multicast.address}"/>
@@ -3688,7 +3711,7 @@
<sysproperty key="remoting.jar.dir" value="${basedir}/output/lib"/>
<sysproperty key="ant.library.dir" value="${ant.library.dir}"/>
<sysproperty key="build.home" value="${basedir}"/>
-
+
<sysproperty key="jboss-junit-configuration" value="${jboss-junit-configuration}"/>
<formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"
extension="-${jboss-junit-configuration}.xml"/>
@@ -3724,7 +3747,7 @@
<path refid="tests.classpath"/>
<pathelement location="${output.lib.dir}/jboss-remoting-tests.jar"/>
</classpath>
-
+
<!-- set system properties required by JRunit -->
<sysproperty key="jrunit.bind_addr" value="${bind.address}"/>
<sysproperty key="jrunit.mcast_addr" value="${multicast.address}"/>
@@ -3736,7 +3759,7 @@
<sysproperty key="remoting.jar.dir" value="${basedir}/output/lib"/>
<sysproperty key="ant.library.dir" value="${ant.library.dir}"/>
<sysproperty key="build.home" value="${basedir}"/>
-
+
<sysproperty key="jboss-junit-configuration" value="${jboss-junit-configuration}"/>
<formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"
extension="-${jboss-junit-configuration}.xml"/>
@@ -3768,7 +3791,7 @@
<path refid="tests.classpath"/>
<pathelement location="${output.lib.dir}/jboss-remoting-tests.jar"/>
</classpath>
-
+
<!-- set system properties required by JRunit -->
<sysproperty key="jrunit.bind_addr" value="${bind.address}"/>
<sysproperty key="jrunit.mcast_addr" value="${multicast.address}"/>
@@ -3780,7 +3803,7 @@
<sysproperty key="remoting.jar.dir" value="${basedir}/output/lib"/>
<sysproperty key="ant.library.dir" value="${ant.library.dir}"/>
<sysproperty key="build.home" value="${basedir}"/>
-
+
<sysproperty key="jboss-junit-configuration" value="${jboss-junit-configuration}"/>
<formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"
extension="-${jboss-junit-configuration}.xml"/>
@@ -3986,15 +4009,15 @@
<delete dir="${dist.dir}"/>
</target>
-
+
<target name="findbugs" depends="jars">
<taskdef name="findbugs" classname="edu.umd.cs.findbugs.anttask.FindBugsTask"/>
<findbugs home="${findbugs.home}" output="html" outputFile="${output.dir}/findbugs.html" >
<class location="${output.lib.dir}/jboss-remoting.jar" />
<sourcePath path="${src.dir}" />
- <auxClasspath refid="third_party.classpath"/>
+ <auxClasspath refid="third_party.classpath"/>
</findbugs>
</target>
-
+
</project>
14 years, 3 months
- 1
- 0
JBoss Remoting SVN: r6052 - remoting2/branches/2.2/src/tests/org/jboss/test/remoting/versioning/transport/bisocket.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2010-08-04 22:18:14 -0400 (Wed, 04 Aug 2010)
New Revision: 6052
Modified:
remoting2/branches/2.2/src/tests/org/jboss/test/remoting/versioning/transport/bisocket/VersionBisocketInvokerTestCase.java
Log:
JBREM-1241: Added svn:eol-style subversion property.
Modified: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/versioning/transport/bisocket/VersionBisocketInvokerTestCase.java
===================================================================
--- remoting2/branches/2.2/src/tests/org/jboss/test/remoting/versioning/transport/bisocket/VersionBisocketInvokerTestCase.java 2010-08-05 02:17:21 UTC (rev 6051)
+++ remoting2/branches/2.2/src/tests/org/jboss/test/remoting/versioning/transport/bisocket/VersionBisocketInvokerTestCase.java 2010-08-05 02:18:14 UTC (rev 6052)
@@ -1,45 +1,45 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.test.remoting.versioning.transport.bisocket;
-
-import org.jboss.test.remoting.versioning.transport.VersionInvokerTestCaseBase;
-
-/**
- * @author <a href="mailto:tom.elrod@jboss.com">Tom Elrod</a>
- */
-public class VersionBisocketInvokerTestCase extends VersionInvokerTestCaseBase
-{
-// protected String getJVMArguments()
-// {
-// String vmArgs = super.getJVMArguments();
-// vmArgs = vmArgs + " -D" + Version.PRE_2_0_COMPATIBLE + "=" + Boolean.TRUE.toString();
-// return vmArgs;
-// }
-
- public void declareTestClasses()
- {
- addTestClasses("org.jboss.test.remoting.transport.bisocket.BisocketInvokerClientTest",
- 1,
- "org.jboss.test.remoting.transport.bisocket.BisocketInvokerServerTest");
- }
-
+/*
+* 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.versioning.transport.bisocket;
+
+import org.jboss.test.remoting.versioning.transport.VersionInvokerTestCaseBase;
+
+/**
+ * @author <a href="mailto:tom.elrod@jboss.com">Tom Elrod</a>
+ */
+public class VersionBisocketInvokerTestCase extends VersionInvokerTestCaseBase
+{
+// protected String getJVMArguments()
+// {
+// String vmArgs = super.getJVMArguments();
+// vmArgs = vmArgs + " -D" + Version.PRE_2_0_COMPATIBLE + "=" + Boolean.TRUE.toString();
+// return vmArgs;
+// }
+
+ public void declareTestClasses()
+ {
+ addTestClasses("org.jboss.test.remoting.transport.bisocket.BisocketInvokerClientTest",
+ 1,
+ "org.jboss.test.remoting.transport.bisocket.BisocketInvokerServerTest");
+ }
+
}
\ No newline at end of file
Property changes on: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/versioning/transport/bisocket/VersionBisocketInvokerTestCase.java
___________________________________________________________________
Name: svn:eol-style
+ native
14 years, 3 months
- 1
- 0
JBoss Remoting SVN: r6051 - remoting2/branches/2.2/src/tests/org/jboss/test/remoting/versioning/lease.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2010-08-04 22:17:21 -0400 (Wed, 04 Aug 2010)
New Revision: 6051
Modified:
remoting2/branches/2.2/src/tests/org/jboss/test/remoting/versioning/lease/LeaseVersionTestCase.java
remoting2/branches/2.2/src/tests/org/jboss/test/remoting/versioning/lease/LeaseVersionTestClient.java
remoting2/branches/2.2/src/tests/org/jboss/test/remoting/versioning/lease/LeaseVersionTestServer.java
Log:
JBREM-1241: Added svn:eol-style subversion property.
Modified: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/versioning/lease/LeaseVersionTestCase.java
===================================================================
--- remoting2/branches/2.2/src/tests/org/jboss/test/remoting/versioning/lease/LeaseVersionTestCase.java 2010-08-05 02:16:33 UTC (rev 6050)
+++ remoting2/branches/2.2/src/tests/org/jboss/test/remoting/versioning/lease/LeaseVersionTestCase.java 2010-08-05 02:17:21 UTC (rev 6051)
@@ -1,133 +1,133 @@
-package org.jboss.test.remoting.versioning.lease;
-
-import org.apache.log4j.Level;
-import org.jboss.test.remoting.transport.InvokerTestDriver;
-
-/**
- * @author <a href="mailto:tom.elrod@jboss.com">Tom Elrod</a>
- */
-public class LeaseVersionTestCase extends InvokerTestDriver
-{
- public void declareTestClasses()
- {
- addTestClasses("org.jboss.test.remoting.versioning.lease.LeaseVersionTestClient",
- 1,
- "org.jboss.test.remoting.versioning.lease.LeaseVersionTestServer");
- }
-
- /**
- * Returns the classpath to be added to the classpath used to start the client tests.
- * Default return is null, which means no extra classpath will be added.
- *
- * @return
- */
- protected String getExtendedServerClasspath()
- {
- return System.getProperty("server.path");
- }
-
- /**
- * Returns the classpath to be added to the classpath used to start the client tests.
- * Default return is null, which means no extra classpath will be added.
- *
- * @return
- */
- protected String getExtendedClientClasspath()
- {
- return System.getProperty("client.path");
- }
-
- protected String getClientJVMArguments()
- {
- String prop = System.getProperty("client.pre_2_0_compatible");
- String args = "";
- if (prop != null && !"".equals(prop))
- {
- args = "-Djboss.remoting.pre_2_0_compatible=" + prop;
- }
- else
- {
- prop = System.getProperty("client.version");
- if (prop != null && !"".equals(prop))
- args = "-Djboss.remoting.version=" + prop;
- }
- prop = System.getProperty("client.check_connection");
- if (prop != null && !"".equals(prop))
- {
- args += " -Dremoting.metadata=socket.check_connection=" + prop;
- }
- System.out.println("client arg: " + args);
- return args;
- }
-
-
- protected String getServerJVMArguments()
- {
- String prop = System.getProperty("server.pre_2_0_compatible");
- String args = "";
- if (prop != null && !"".equals(prop))
- {
- args = "-Djboss.remoting.pre_2_0_compatible=" + prop;
- }
- else
- {
- prop = System.getProperty("server.version");
- if (prop != null && !"".equals(prop))
- args = "-Djboss.remoting.version=" + prop;
- }
- prop = System.getProperty("server.check_connection");
- if (prop != null && !"".equals(prop))
- {
- args += " -Dremoting.metadata=socket.check_connection=" + prop;
- }
- System.out.println("server arg: " + args);
- return args;
- }
-
-
- protected Level getTestHarnessLogLevel()
- {
- return Level.INFO;
- }
-
- protected Level getTestLogLevel()
- {
- return Level.INFO;
- }
-
- /**
- * How long to wait for test results to be returned from the client(s). If goes longer than the
- * specified limit, will throw an exception and kill the running test cases. Default value is
- * RESULTS_TIMEOUT.
- *
- * @return
- */
- protected long getResultsTimeout()
- {
- return 60000;
- }
-
- /**
- * How long for the server test case to wait for tear down message. If exceeds timeout,
- * will throw exception. The default value is TEARDOWN_TIMEOUT.
- *
- * @return
- */
- protected long getTearDownTimeout()
- {
- return 60000;
- }
-
- /**
- * How long to allow each of the test cases to run their tests. If exceeds this timeout
- * will throw exception and kill tests. The default value is RUN_TEST_TIMEOUT.
- *
- * @return
- */
- protected long getRunTestTimeout()
- {
- return 60000;
- }
-
-
-}
+package org.jboss.test.remoting.versioning.lease;
+
+import org.apache.log4j.Level;
+import org.jboss.test.remoting.transport.InvokerTestDriver;
+
+/**
+ * @author <a href="mailto:tom.elrod@jboss.com">Tom Elrod</a>
+ */
+public class LeaseVersionTestCase extends InvokerTestDriver
+{
+ public void declareTestClasses()
+ {
+ addTestClasses("org.jboss.test.remoting.versioning.lease.LeaseVersionTestClient",
+ 1,
+ "org.jboss.test.remoting.versioning.lease.LeaseVersionTestServer");
+ }
+
+ /**
+ * Returns the classpath to be added to the classpath used to start the client tests.
+ * Default return is null, which means no extra classpath will be added.
+ *
+ * @return
+ */
+ protected String getExtendedServerClasspath()
+ {
+ return System.getProperty("server.path");
+ }
+
+ /**
+ * Returns the classpath to be added to the classpath used to start the client tests.
+ * Default return is null, which means no extra classpath will be added.
+ *
+ * @return
+ */
+ protected String getExtendedClientClasspath()
+ {
+ return System.getProperty("client.path");
+ }
+
+ protected String getClientJVMArguments()
+ {
+ String prop = System.getProperty("client.pre_2_0_compatible");
+ String args = "";
+ if (prop != null && !"".equals(prop))
+ {
+ args = "-Djboss.remoting.pre_2_0_compatible=" + prop;
+ }
+ else
+ {
+ prop = System.getProperty("client.version");
+ if (prop != null && !"".equals(prop))
+ args = "-Djboss.remoting.version=" + prop;
+ }
+ prop = System.getProperty("client.check_connection");
+ if (prop != null && !"".equals(prop))
+ {
+ args += " -Dremoting.metadata=socket.check_connection=" + prop;
+ }
+ System.out.println("client arg: " + args);
+ return args;
+ }
+
+
+ protected String getServerJVMArguments()
+ {
+ String prop = System.getProperty("server.pre_2_0_compatible");
+ String args = "";
+ if (prop != null && !"".equals(prop))
+ {
+ args = "-Djboss.remoting.pre_2_0_compatible=" + prop;
+ }
+ else
+ {
+ prop = System.getProperty("server.version");
+ if (prop != null && !"".equals(prop))
+ args = "-Djboss.remoting.version=" + prop;
+ }
+ prop = System.getProperty("server.check_connection");
+ if (prop != null && !"".equals(prop))
+ {
+ args += " -Dremoting.metadata=socket.check_connection=" + prop;
+ }
+ System.out.println("server arg: " + args);
+ return args;
+ }
+
+
+ protected Level getTestHarnessLogLevel()
+ {
+ return Level.INFO;
+ }
+
+ protected Level getTestLogLevel()
+ {
+ return Level.INFO;
+ }
+
+ /**
+ * How long to wait for test results to be returned from the client(s). If goes longer than the
+ * specified limit, will throw an exception and kill the running test cases. Default value is
+ * RESULTS_TIMEOUT.
+ *
+ * @return
+ */
+ protected long getResultsTimeout()
+ {
+ return 60000;
+ }
+
+ /**
+ * How long for the server test case to wait for tear down message. If exceeds timeout,
+ * will throw exception. The default value is TEARDOWN_TIMEOUT.
+ *
+ * @return
+ */
+ protected long getTearDownTimeout()
+ {
+ return 60000;
+ }
+
+ /**
+ * How long to allow each of the test cases to run their tests. If exceeds this timeout
+ * will throw exception and kill tests. The default value is RUN_TEST_TIMEOUT.
+ *
+ * @return
+ */
+ protected long getRunTestTimeout()
+ {
+ return 60000;
+ }
+
+
+}
Property changes on: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/versioning/lease/LeaseVersionTestCase.java
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/versioning/lease/LeaseVersionTestClient.java
===================================================================
--- remoting2/branches/2.2/src/tests/org/jboss/test/remoting/versioning/lease/LeaseVersionTestClient.java 2010-08-05 02:16:33 UTC (rev 6050)
+++ remoting2/branches/2.2/src/tests/org/jboss/test/remoting/versioning/lease/LeaseVersionTestClient.java 2010-08-05 02:17:21 UTC (rev 6051)
@@ -1,129 +1,129 @@
-/*
- * 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.versioning.lease;
-
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.util.HashMap;
-import java.util.Map;
-
-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.ClientDisconnectedException;
-import org.jboss.remoting.InvokerLocator;
-
-
-/**
- * @author <a href="ron.sigal(a)jboss.com">Ron Sigal</a>
- * @version $Revision: 1.1 $
- * <p>
- * Copyright May 08, 2009
- * </p>
- */
-public class LeaseVersionTestClient extends TestCase
-{
- private static Logger log = Logger.getLogger(LeaseVersionTestClient.class);
-
- protected static long LEASE_PERIOD = 2000;
- protected static String LEASE_PERIOD_STRING = "2000";
-
- private static boolean firstTime = true;
-
-
- 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 testLease() throws Throwable
- {
- log.info("entering " + getName());
-
- // Create client.
- InvokerLocator clientLocator = new InvokerLocator(createLocatorURI());
- HashMap clientConfig = new HashMap();
- clientConfig.put(Client.ENABLE_LEASE, "true");
- addExtraClientConfig(clientConfig);
- Client client = new Client(clientLocator, clientConfig);
- client.connect();
- log.info("client is connected");
-
- // Test connection.
- assertEquals("abc", client.invoke("abc"));
- log.info("connection is good");
-
- // Test lease behavior.
- client.disconnect();
- client.connect();
- Map info = (Map) client.invoke(LeaseVersionTestServer.GET_LISTENER_INFO);
- log.info("listener info: " + info);
- assertEquals(1, ((Integer)info.get(LeaseVersionTestServer.LISTENER_COUNT)).intValue());
- assertTrue(info.get(LeaseVersionTestServer.THROWABLE) instanceof ClientDisconnectedException);
- client.disconnect();
-
- log.info(getName() + " PASSES");
- }
-
-
- protected String getTransport()
- {
- return "socket";
- }
-
-
- protected void addExtraClientConfig(Map config) {}
-
-
- protected String createLocatorURI() throws UnknownHostException
- {
- String locatorURI = getTransport() + "://" + InetAddress.getLocalHost().getHostAddress() + ":" + LeaseVersionTestServer.PORT;
- locatorURI += "/?useClientConnectionIdentity=true";
- String metadata = System.getProperty("remoting.metadata");
- if (metadata != null)
- {
- locatorURI += "&" + metadata;
- }
- return locatorURI;
- }
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.test.remoting.versioning.lease;
+
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.HashMap;
+import java.util.Map;
+
+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.ClientDisconnectedException;
+import org.jboss.remoting.InvokerLocator;
+
+
+/**
+ * @author <a href="ron.sigal(a)jboss.com">Ron Sigal</a>
+ * @version $Revision: 1.1 $
+ * <p>
+ * Copyright May 08, 2009
+ * </p>
+ */
+public class LeaseVersionTestClient extends TestCase
+{
+ private static Logger log = Logger.getLogger(LeaseVersionTestClient.class);
+
+ protected static long LEASE_PERIOD = 2000;
+ protected static String LEASE_PERIOD_STRING = "2000";
+
+ private static boolean firstTime = true;
+
+
+ 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 testLease() throws Throwable
+ {
+ log.info("entering " + getName());
+
+ // Create client.
+ InvokerLocator clientLocator = new InvokerLocator(createLocatorURI());
+ HashMap clientConfig = new HashMap();
+ clientConfig.put(Client.ENABLE_LEASE, "true");
+ addExtraClientConfig(clientConfig);
+ Client client = new Client(clientLocator, clientConfig);
+ client.connect();
+ log.info("client is connected");
+
+ // Test connection.
+ assertEquals("abc", client.invoke("abc"));
+ log.info("connection is good");
+
+ // Test lease behavior.
+ client.disconnect();
+ client.connect();
+ Map info = (Map) client.invoke(LeaseVersionTestServer.GET_LISTENER_INFO);
+ log.info("listener info: " + info);
+ assertEquals(1, ((Integer)info.get(LeaseVersionTestServer.LISTENER_COUNT)).intValue());
+ assertTrue(info.get(LeaseVersionTestServer.THROWABLE) instanceof ClientDisconnectedException);
+ client.disconnect();
+
+ log.info(getName() + " PASSES");
+ }
+
+
+ protected String getTransport()
+ {
+ return "socket";
+ }
+
+
+ protected void addExtraClientConfig(Map config) {}
+
+
+ protected String createLocatorURI() throws UnknownHostException
+ {
+ String locatorURI = getTransport() + "://" + InetAddress.getLocalHost().getHostAddress() + ":" + LeaseVersionTestServer.PORT;
+ locatorURI += "/?useClientConnectionIdentity=true";
+ String metadata = System.getProperty("remoting.metadata");
+ if (metadata != null)
+ {
+ locatorURI += "&" + metadata;
+ }
+ return locatorURI;
+ }
}
\ No newline at end of file
Property changes on: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/versioning/lease/LeaseVersionTestClient.java
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/versioning/lease/LeaseVersionTestServer.java
===================================================================
--- remoting2/branches/2.2/src/tests/org/jboss/test/remoting/versioning/lease/LeaseVersionTestServer.java 2010-08-05 02:16:33 UTC (rev 6050)
+++ remoting2/branches/2.2/src/tests/org/jboss/test/remoting/versioning/lease/LeaseVersionTestServer.java 2010-08-05 02:17:21 UTC (rev 6051)
@@ -1,191 +1,191 @@
-/*
- * 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.versioning.lease;
-
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.management.MBeanServer;
-
-import org.apache.log4j.ConsoleAppender;
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
-import org.apache.log4j.PatternLayout;
-import org.jboss.jrunit.extensions.ServerTestCase;
-import org.jboss.logging.XLevel;
-import org.jboss.remoting.Client;
-import org.jboss.remoting.ConnectionListener;
-import org.jboss.remoting.InvocationRequest;
-import org.jboss.remoting.InvokerLocator;
-import org.jboss.remoting.ServerInvocationHandler;
-import org.jboss.remoting.ServerInvoker;
-import org.jboss.remoting.callback.InvokerCallbackHandler;
-import org.jboss.remoting.transport.Connector;
-
-
-/**
- * @author <a href="ron.sigal(a)jboss.com">Ron Sigal</a>
- * @version $Revision: 1.1 $
- * <p>
- * Copyright May 08, 2009
- * </p>
- */
-public class LeaseVersionTestServer extends ServerTestCase
-{
- public static final String REMOTING_METADATA = "remoting.metadata";
- public static final String JVM_MAX_HEAP_SIZE = "jvm.mx";
- public static final String GET_LISTENER_INFO = "getListenerCount";
- public static final String LISTENER_COUNT = "listenerCount";
- public static final String THROWABLE = "throwable";
- public static final String PORT = "9091";
-
- private static Logger log = Logger.getLogger(LeaseVersionTestServer.class);
-
- protected static long LEASE_PERIOD = 2000;
- protected static String LEASE_PERIOD_STRING = "2000";
-
- protected Connector connector;
- protected TestConnectionListener listener;
-
-
- public static void main(String[] args)
- {
- try
- {
- LeaseVersionTestServer p = new LeaseVersionTestServer();
- p.setUp();
- Thread.sleep(3000000);
- p.tearDown();
- }
- catch (Exception e)
- {
- log.error("Error", e);
- }
- }
-
-
- public void setUp() throws Exception
- {
- 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);
- setupServer();
- }
-
-
- public void tearDown()
- {
- if(connector != null)
- {
- connector.stop();
- connector.destroy();
- }
- }
-
-
- protected String getTransport()
- {
- return "socket";
- }
-
-
- protected void addExtraServerConfig(Map config) {}
-
-
- protected void setupServer() throws Exception
- {
- String locatorURI = createLocatorURI();
- String metadata = System.getProperty("remoting.metadata");
- if (metadata != null)
- {
- locatorURI += "/?" + metadata;
- }
- InvokerLocator serverLocator = new InvokerLocator(locatorURI);
- log.info("Starting remoting server with locator uri of: " + locatorURI);
- HashMap config = new HashMap();
- config.put("leasePeriod", LEASE_PERIOD_STRING);
- addExtraServerConfig(config);
- connector = new Connector(serverLocator, config);
- connector.create();
- ServerInvocationHandler invocationHandler = new TestInvocationHandler();
- connector.addInvocationHandler("test", invocationHandler);
- connector.start();
- listener = new TestConnectionListener();
- connector.addConnectionListener(listener);
- }
-
-
- protected String createLocatorURI() throws UnknownHostException
- {
- String locatorURI = getTransport() + "://" + InetAddress.getLocalHost().getHostAddress() + ":" + PORT;
- locatorURI += "/?useClientConnectionIdentity=true";
- String metadata = System.getProperty("remoting.metadata");
- if (metadata != null)
- {
- locatorURI += "&" + metadata;
- }
- return locatorURI;
- }
-
-
- class TestInvocationHandler implements ServerInvocationHandler
- {
- public void addListener(InvokerCallbackHandler callbackHandler) {}
- public Object invoke(final InvocationRequest invocation) throws Throwable
- {
- Object o = invocation.getParameter();
- if (GET_LISTENER_INFO.equals(o))
- {
- HashMap map = new HashMap();
- map.put(LISTENER_COUNT, new Integer(listener.counter));
- map.put(THROWABLE, listener.throwable);
- listener.counter = 0;
- listener.throwable = null;
- return map;
- }
- return o;
- }
- public void removeListener(InvokerCallbackHandler callbackHandler) {}
- public void setMBeanServer(MBeanServer server) {}
- public void setInvoker(ServerInvoker invoker) {}
- }
-
-
- static class TestConnectionListener implements ConnectionListener
- {
- public int counter;
- public Throwable throwable;
-
- public void handleConnectionException(Throwable throwable, Client client)
- {
- counter++;
- this.throwable = throwable;
- log.info("called: throwable = " + throwable);
- }
- }
+/*
+ * 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.versioning.lease;
+
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.management.MBeanServer;
+
+import org.apache.log4j.ConsoleAppender;
+import org.apache.log4j.Level;
+import org.apache.log4j.Logger;
+import org.apache.log4j.PatternLayout;
+import org.jboss.jrunit.extensions.ServerTestCase;
+import org.jboss.logging.XLevel;
+import org.jboss.remoting.Client;
+import org.jboss.remoting.ConnectionListener;
+import org.jboss.remoting.InvocationRequest;
+import org.jboss.remoting.InvokerLocator;
+import org.jboss.remoting.ServerInvocationHandler;
+import org.jboss.remoting.ServerInvoker;
+import org.jboss.remoting.callback.InvokerCallbackHandler;
+import org.jboss.remoting.transport.Connector;
+
+
+/**
+ * @author <a href="ron.sigal(a)jboss.com">Ron Sigal</a>
+ * @version $Revision: 1.1 $
+ * <p>
+ * Copyright May 08, 2009
+ * </p>
+ */
+public class LeaseVersionTestServer extends ServerTestCase
+{
+ public static final String REMOTING_METADATA = "remoting.metadata";
+ public static final String JVM_MAX_HEAP_SIZE = "jvm.mx";
+ public static final String GET_LISTENER_INFO = "getListenerCount";
+ public static final String LISTENER_COUNT = "listenerCount";
+ public static final String THROWABLE = "throwable";
+ public static final String PORT = "9091";
+
+ private static Logger log = Logger.getLogger(LeaseVersionTestServer.class);
+
+ protected static long LEASE_PERIOD = 2000;
+ protected static String LEASE_PERIOD_STRING = "2000";
+
+ protected Connector connector;
+ protected TestConnectionListener listener;
+
+
+ public static void main(String[] args)
+ {
+ try
+ {
+ LeaseVersionTestServer p = new LeaseVersionTestServer();
+ p.setUp();
+ Thread.sleep(3000000);
+ p.tearDown();
+ }
+ catch (Exception e)
+ {
+ log.error("Error", e);
+ }
+ }
+
+
+ public void setUp() throws Exception
+ {
+ 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);
+ setupServer();
+ }
+
+
+ public void tearDown()
+ {
+ if(connector != null)
+ {
+ connector.stop();
+ connector.destroy();
+ }
+ }
+
+
+ protected String getTransport()
+ {
+ return "socket";
+ }
+
+
+ protected void addExtraServerConfig(Map config) {}
+
+
+ protected void setupServer() throws Exception
+ {
+ String locatorURI = createLocatorURI();
+ String metadata = System.getProperty("remoting.metadata");
+ if (metadata != null)
+ {
+ locatorURI += "/?" + metadata;
+ }
+ InvokerLocator serverLocator = new InvokerLocator(locatorURI);
+ log.info("Starting remoting server with locator uri of: " + locatorURI);
+ HashMap config = new HashMap();
+ config.put("leasePeriod", LEASE_PERIOD_STRING);
+ addExtraServerConfig(config);
+ connector = new Connector(serverLocator, config);
+ connector.create();
+ ServerInvocationHandler invocationHandler = new TestInvocationHandler();
+ connector.addInvocationHandler("test", invocationHandler);
+ connector.start();
+ listener = new TestConnectionListener();
+ connector.addConnectionListener(listener);
+ }
+
+
+ protected String createLocatorURI() throws UnknownHostException
+ {
+ String locatorURI = getTransport() + "://" + InetAddress.getLocalHost().getHostAddress() + ":" + PORT;
+ locatorURI += "/?useClientConnectionIdentity=true";
+ String metadata = System.getProperty("remoting.metadata");
+ if (metadata != null)
+ {
+ locatorURI += "&" + metadata;
+ }
+ return locatorURI;
+ }
+
+
+ class TestInvocationHandler implements ServerInvocationHandler
+ {
+ public void addListener(InvokerCallbackHandler callbackHandler) {}
+ public Object invoke(final InvocationRequest invocation) throws Throwable
+ {
+ Object o = invocation.getParameter();
+ if (GET_LISTENER_INFO.equals(o))
+ {
+ HashMap map = new HashMap();
+ map.put(LISTENER_COUNT, new Integer(listener.counter));
+ map.put(THROWABLE, listener.throwable);
+ listener.counter = 0;
+ listener.throwable = null;
+ return map;
+ }
+ return o;
+ }
+ public void removeListener(InvokerCallbackHandler callbackHandler) {}
+ public void setMBeanServer(MBeanServer server) {}
+ public void setInvoker(ServerInvoker invoker) {}
+ }
+
+
+ static class TestConnectionListener implements ConnectionListener
+ {
+ public int counter;
+ public Throwable throwable;
+
+ public void handleConnectionException(Throwable throwable, Client client)
+ {
+ counter++;
+ this.throwable = throwable;
+ log.info("called: throwable = " + throwable);
+ }
+ }
}
\ No newline at end of file
Property changes on: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/versioning/lease/LeaseVersionTestServer.java
___________________________________________________________________
Name: svn:eol-style
+ native
14 years, 3 months
- 1
- 0