[jboss-cvs] JBoss Messaging SVN: r5065 - in branches/Branch_1_4: .settings and 2 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Fri Oct 3 13:58:39 EDT 2008


Author: timfox
Date: 2008-10-03 13:58:39 -0400 (Fri, 03 Oct 2008)
New Revision: 5065

Modified:
   branches/Branch_1_4/.classpath
   branches/Branch_1_4/.settings/org.eclipse.jdt.core.prefs
   branches/Branch_1_4/integration/AS5/etc/remoting/remoting-bisocket-service.xml
   branches/Branch_1_4/integration/EAP4/etc/remoting/remoting-bisocket-service.xml
Log:
https://jira.jboss.org/jira/browse/JBMESSAGING-1428


Modified: branches/Branch_1_4/.classpath
===================================================================
--- branches/Branch_1_4/.classpath	2008-10-03 16:39:06 UTC (rev 5064)
+++ branches/Branch_1_4/.classpath	2008-10-03 17:58:39 UTC (rev 5065)
@@ -1,120 +1,65 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+	<classpathentry kind="src" path="docs/examples/queue-failover/src"/>
+	<classpathentry kind="src" path="integration/EAP4/src"/>
+	<classpathentry kind="src" path="integration/EAP4/tests-src"/>
 	<classpathentry kind="src" path="docs/examples/bridge/src"/>
-	<classpathentry kind="src" path="integration/AS5/tests-src"/>
-	<classpathentry kind="src" path="integration/AS5/src"/>
-	<classpathentry kind="src" path="docs/examples/common/src"/>
+	<classpathentry kind="src" path="docs/examples/stateless-clustered/src"/>
+	<classpathentry kind="src" path="docs/examples/web-service/src-client"/>
+	<classpathentry kind="src" path="docs/examples/web-service/src"/>
+	<classpathentry kind="src" path="docs/examples/mdb-failure/src"/>
 	<classpathentry kind="src" path="docs/examples/distributed-queue/src"/>
+	<classpathentry kind="src" path="output/gen-parsers"/>
+	<classpathentry kind="src" path="docs/examples/common/src"/>
 	<classpathentry kind="src" path="docs/examples/distributed-topic/src"/>
 	<classpathentry kind="src" path="docs/examples/ejb3mdb/src"/>
 	<classpathentry kind="src" path="docs/examples/http/src"/>
-	<classpathentry kind="src" path="docs/examples/mdb-failure/src"/>
 	<classpathentry kind="src" path="docs/examples/mdb/src"/>
-	<classpathentry kind="src" path="docs/examples/queue-failover/src"/>
 	<classpathentry kind="src" path="docs/examples/queue/src"/>
 	<classpathentry kind="src" path="docs/examples/secure-socket/src"/>
-	<classpathentry kind="src" path="docs/examples/stateless-clustered/src"/>
 	<classpathentry kind="src" path="docs/examples/stateless/src"/>
 	<classpathentry kind="src" path="docs/examples/topic/src"/>
-	<classpathentry kind="src" path="docs/examples/web-service/src"/>
-	<classpathentry kind="src" path="docs/examples/web-service/src-client"/>
-	<classpathentry kind="src" path="output/gen-parsers"/>
-	<classpathentry kind="src" path="src/main"/>
-	<classpathentry kind="src" path="tests/src"/>
-	<classpathentry kind="lib" path="lib/docbook-support/support/lib/avalon-framework-cvs-20020806.jar"/>
-	<classpathentry kind="lib" path="lib/docbook-support/support/lib/batik.jar"/>
-	<classpathentry kind="lib" path="lib/docbook-support/support/lib/fop.jar"/>
-	<classpathentry kind="lib" path="lib/docbook-support/support/lib/jai_codec.jar"/>
-	<classpathentry kind="lib" path="lib/docbook-support/support/lib/jai_core.jar"/>
-	<classpathentry kind="lib" path="lib/docbook-support/support/lib/rowan-0.1.jar"/>
-	<classpathentry kind="lib" path="output/lib/jboss-messaging.jar"/>
+	<classpathentry excluding="**/.svn/**/*" kind="src" path="src/main"/>
+	<classpathentry excluding="**/.svn/**/*" kind="src" path="tests/src"/>
+	<classpathentry kind="lib" path="thirdparty/oswego-concurrent/lib/concurrent.jar" sourcepath="/extra/work-clebert/concurrent/concurrent/src"/>
+	<classpathentry kind="lib" path="thirdparty/jgroups/lib/jgroups.jar"/>
 	<classpathentry kind="lib" path="thirdparty/apache-log4j/lib/log4j.jar"/>
+	<classpathentry kind="lib" path="thirdparty/junit/lib/junit.jar"/>
+	<classpathentry kind="lib" path="thirdparty/jboss/profiler/jvmti/lib/jboss-profiler-jvmti.jar"/>
+	<classpathentry kind="lib" path="thirdparty/hsqldb/lib/hsqldb.jar"/>
 	<classpathentry kind="lib" path="thirdparty/apache-logging/lib/commons-logging.jar"/>
-	<classpathentry kind="lib" path="thirdparty/apache-modeler/lib/commons-modeler.jar"/>
-	<classpathentry kind="lib" path="thirdparty/apache-tomcat/lib/catalina-manager.jar"/>
-	<classpathentry kind="lib" path="thirdparty/apache-tomcat/lib/catalina-optional.jar"/>
-	<classpathentry kind="lib" path="thirdparty/apache-tomcat/lib/catalina.jar"/>
-	<classpathentry kind="lib" path="thirdparty/apache-tomcat/lib/jasper-compiler-jdt.jar"/>
-	<classpathentry kind="lib" path="thirdparty/apache-tomcat/lib/jasper-compiler.jar"/>
-	<classpathentry kind="lib" path="thirdparty/apache-tomcat/lib/jasper-runtime.jar"/>
-	<classpathentry kind="lib" path="thirdparty/apache-tomcat/lib/naming-resources.jar"/>
-	<classpathentry kind="lib" path="thirdparty/apache-tomcat/lib/servlets-default.jar"/>
-	<classpathentry kind="lib" path="thirdparty/apache-tomcat/lib/servlets-invoker.jar"/>
-	<classpathentry kind="lib" path="thirdparty/apache-tomcat/lib/servlets-webdav.jar"/>
-	<classpathentry kind="lib" path="thirdparty/apache-tomcat/lib/tomcat-ajp.jar"/>
-	<classpathentry kind="lib" path="thirdparty/apache-tomcat/lib/tomcat-apr.jar"/>
-	<classpathentry kind="lib" path="thirdparty/apache-tomcat/lib/tomcat-coyote.jar"/>
-	<classpathentry kind="lib" path="thirdparty/apache-tomcat/lib/tomcat-http.jar"/>
-	<classpathentry kind="lib" path="thirdparty/apache-tomcat/lib/tomcat-util.jar"/>
+	<classpathentry kind="lib" path="thirdparty/jboss/serialization/lib/jboss-serialization.jar"/>
+	<classpathentry kind="lib" path="thirdparty/sun-javacc/lib/javacc.jar"/>
 	<classpathentry kind="lib" path="thirdparty/apache-xerces/lib/xercesImpl.jar"/>
-	<classpathentry kind="lib" path="thirdparty/commons-el/lib/commons-el.jar"/>
 	<classpathentry kind="lib" path="thirdparty/dom4j/lib/dom4j.jar"/>
-	<classpathentry kind="lib" path="thirdparty/hsqldb/lib/hsqldb.jar"/>
-	<classpathentry kind="lib" path="thirdparty/javassist/lib/javassist-src.jar"/>
 	<classpathentry kind="lib" path="thirdparty/javassist/lib/javassist.jar"/>
-	<classpathentry kind="lib" path="thirdparty/jboss/aop/lib/jboss-aop-jdk50-client.jar"/>
-	<classpathentry kind="lib" path="thirdparty/jboss/aop/lib/jboss-aop-jdk50.jar"/>
+	<classpathentry kind="lib" path="thirdparty/jboss/aop/lib/jdk14-pluggable-instrumentor.jar"/>
 	<classpathentry kind="lib" path="thirdparty/jboss/aop/lib/jrockit-pluggable-instrumentor.jar"/>
 	<classpathentry kind="lib" path="thirdparty/jboss/aop/lib/pluggable-instrumentor.jar"/>
-	<classpathentry kind="lib" path="thirdparty/jboss/backport-concurrent/lib/jboss-backport-concurrent.jar"/>
-	<classpathentry kind="lib" path="thirdparty/jboss/jbossretro-rt/lib/jbossretro-rt.jar"/>
-	<classpathentry kind="lib" path="thirdparty/jboss/jbossts14/lib/jbossjta-integration.jar"/>
-	<classpathentry kind="lib" path="thirdparty/jboss/jbossts14/lib/jbossjta.jar"/>
-	<classpathentry kind="lib" path="thirdparty/jboss/jbossts14/lib/jbossts-common.jar"/>
-	<classpathentry kind="lib" path="thirdparty/jboss/jbossxb/lib/jboss-xml-binding-sources.jar"/>
 	<classpathentry kind="lib" path="thirdparty/jboss/jbossxb/lib/jboss-xml-binding.jar"/>
-	<classpathentry kind="lib" path="thirdparty/jboss/profiler/jvmti/lib/jboss-profiler-jvmti.jar"/>
-	<classpathentry kind="lib" path="thirdparty/jboss/remoting/lib/jboss-remoting-src.jar"/>
+	<classpathentry kind="lib" path="thirdparty/retrotranslator/lib/backport-util-concurrent.jar"/>
+	<classpathentry kind="lib" path="thirdparty/retrotranslator/lib/retrotranslator-runtime.jar"/>
+	<classpathentry kind="lib" path="thirdparty/retrotranslator/lib/retrotranslator-transformer.jar"/>
+	<classpathentry kind="lib" path="thirdparty/trove/lib/trove.jar"/>
 	<classpathentry kind="lib" path="thirdparty/jboss/remoting/lib/jboss-remoting.jar"/>
-	<classpathentry kind="lib" path="thirdparty/jboss/serialization/lib/jboss-serialization.jar"/>
-	<classpathentry kind="lib" path="thirdparty/jboss/test14/lib/jboss-test14.jar"/>
-	<classpathentry kind="lib" path="thirdparty/jbossas/core-libs/lib/jboss-common-jdbc-wrapper.jar"/>
-	<classpathentry kind="lib" path="thirdparty/jbossas/core-libs/lib/jboss-common.jar"/>
+	<classpathentry kind="lib" path="thirdparty/jboss/jbossts14/lib/jbossjta.jar"/>
+	<classpathentry kind="var" path="ANT_HOME/lib/ant.jar"/>
+	<classpathentry kind="var" path="ANT_HOME/lib/ant-junit.jar"/>
+	<classpathentry kind="lib" path="thirdparty/jboss/common/lib/jboss-common.jar"/>
 	<classpathentry kind="lib" path="thirdparty/jbossas/core-libs/lib/jboss-j2ee.jar"/>
-	<classpathentry kind="lib" path="thirdparty/jbossas/core-libs/lib/jboss-jca.jar"/>
-	<classpathentry kind="lib" path="thirdparty/jbossas/core-libs/lib/jboss-jmx.jar"/>
-	<classpathentry kind="lib" path="thirdparty/jbossas/core-libs/lib/jboss-local-jdbc.jar"/>
+	<classpathentry kind="lib" path="thirdparty/jboss/aop/lib/jboss-aop.jar"/>
 	<classpathentry kind="lib" path="thirdparty/jbossas/core-libs/lib/jboss-system.jar"/>
+	<classpathentry kind="lib" path="thirdparty/jbossas/core-libs/lib/jboss-jmx.jar"/>
 	<classpathentry kind="lib" path="thirdparty/jbossas/core-libs/lib/jboss-transaction-client.jar"/>
-	<classpathentry kind="lib" path="thirdparty/jbossas/core-libs/lib/jboss-xml-binding.jar"/>
-	<classpathentry kind="lib" path="thirdparty/jbossas/core-libs/lib/jboss.jar"/>
-	<classpathentry kind="lib" path="thirdparty/jbossas/core-libs/lib/jbosscx-client.jar"/>
 	<classpathentry kind="lib" path="thirdparty/jbossas/core-libs/lib/jbosssx-client.jar"/>
+	<classpathentry kind="lib" path="thirdparty/jbossas/core-libs/lib/jboss.jar"/>
 	<classpathentry kind="lib" path="thirdparty/jbossas/core-libs/lib/jms-ra.jar"/>
-	<classpathentry kind="lib" path="thirdparty/jbossas/core-libs/lib/jnp-client.jar"/>
-	<classpathentry kind="lib" path="thirdparty/junit/lib/junit.jar"/>
-	<classpathentry kind="lib" path="thirdparty/oswego-concurrent/lib/concurrent.jar"/>
-	<classpathentry kind="lib" path="thirdparty/retrotranslator/lib/backport-util-concurrent.jar"/>
-	<classpathentry kind="lib" path="thirdparty/retrotranslator/lib/retrotranslator-runtime.jar"/>
-	<classpathentry kind="lib" path="thirdparty/retrotranslator/lib/retrotranslator-transformer.jar"/>
-	<classpathentry kind="lib" path="thirdparty/sun-javacc/lib/javacc.jar"/>
-	<classpathentry kind="lib" path="thirdparty/trove/lib/trove.jar"/>
-	<classpathentry kind="lib" path="thirdparty/wutka-dtdparser/lib/dtdparser.jar"/>
-	<classpathentry kind="lib" path="tools/lib/jbossbuild.jar"/>
+	<classpathentry kind="lib" path="thirdparty/jbossas/core-libs/lib/jboss-common.jar"/>
+	<classpathentry kind="lib" path="thirdparty/jbossas/core-libs/lib/jboss-common-jdbc-wrapper.jar"/>
+	<classpathentry kind="lib" path="thirdparty/jbossas/core-libs/lib/jbosscx-client.jar"/>
+	<classpathentry kind="lib" path="thirdparty/jbossas/core-libs/lib/jboss-jca.jar"/>
+	<classpathentry kind="lib" path="thirdparty/jbossas/core-libs/lib/jboss-local-jdbc.jar"/>
+	<classpathentry kind="lib" path="thirdparty/jbossas/core-libs/lib/jboss-xml-binding.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="lib" path="output/lib/jboss-messaging-client.jar"/>
-	<classpathentry kind="var" path="ANT_HOME/lib/ant-junit.jar"/>
-	<classpathentry kind="var" path="ANT_HOME/lib/ant.jar"/>
-	<classpathentry kind="lib" path="thirdparty/jgroups/lib/jgroups.jar" sourcepath="thirdparty/jgroups/lib/jgroups-sources.jar"/>
-	<classpathentry kind="lib" path="thirdparty/apache-log4j/lib/snmpTrapAppender.jar"/>
-	<classpathentry kind="lib" path="thirdparty/apache-logging/lib/commons-logging-src.zip"/>
-	<classpathentry kind="lib" path="thirdparty/apache-xerces/lib/resolver.jar"/>
-	<classpathentry kind="lib" path="thirdparty/apache-xerces/lib/xml-apis.jar"/>
-	<classpathentry kind="lib" path="thirdparty/jboss/common-core/lib/jboss-common-core.jar"/>
-	<classpathentry kind="lib" path="thirdparty/jboss/common-core/lib/jboss-common-core-sources.jar"/>
-	<classpathentry kind="lib" path="thirdparty/jboss/common-logging-jdk/lib/jboss-logging-jdk.jar"/>
-	<classpathentry kind="lib" path="thirdparty/jboss/common-logging-jdk/lib/jboss-logging-jdk-sources.jar"/>
-	<classpathentry kind="lib" path="thirdparty/jboss/common-logging-log4j/lib/jboss-logging-log4j.jar"/>
-	<classpathentry kind="lib" path="thirdparty/jboss/common-logging-log4j/lib/jboss-logging-log4j-sources.jar"/>
-	<classpathentry kind="lib" path="thirdparty/jboss/common-logging-spi/lib/jboss-logging-spi.jar"/>
-	<classpathentry kind="lib" path="thirdparty/jboss/common-logging-spi/lib/jboss-logging-spi-sources.jar"/>
-	<classpathentry kind="lib" path="thirdparty/jboss/jboss-mdr/lib/jboss-mdr.jar"/>
-	<classpathentry kind="lib" path="thirdparty/jboss/jboss-mdr/lib/jboss-mdr-sources.jar"/>
-	<classpathentry kind="lib" path="thirdparty/jgroups/lib/jgroups-sources.jar"/>
-	<classpathentry kind="lib" path="thirdparty/oswego-concurrent/lib/concurrent-src.zip"/>
-	<classpathentry kind="lib" path="thirdparty/jboss/aop/lib/jboss-aop-as4-deployer.jar"/>
-	<classpathentry kind="lib" path="thirdparty/jboss/aop/lib/jboss-aop-deployer-jdk50.jar"/>
-	<classpathentry kind="lib" path="thirdparty/jboss/aop/lib/jboss-aop-jboss4-jdk50.jar"/>
-	<classpathentry kind="lib" path="thirdparty/jboss/aop/lib/jboss-standalone-aspect-library-jdk50.jar"/>
-	<classpathentry kind="output" path="tests/output/classes"/>
+	<classpathentry kind="output" path="bin"/>
 </classpath>

Modified: branches/Branch_1_4/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- branches/Branch_1_4/.settings/org.eclipse.jdt.core.prefs	2008-10-03 16:39:06 UTC (rev 5064)
+++ branches/Branch_1_4/.settings/org.eclipse.jdt.core.prefs	2008-10-03 17:58:39 UTC (rev 5065)
@@ -1,4 +1,4 @@
-#Thu Sep 18 18:31:17 BST 2008
+#Sat Sep 27 08:56:30 BST 2008
 eclipse.preferences.version=1
 org.eclipse.jdt.core.codeComplete.argumentPrefixes=
 org.eclipse.jdt.core.codeComplete.argumentSuffixes=
@@ -63,10 +63,10 @@
 org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=next_line
 org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=true
 org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=true
-org.eclipse.jdt.core.formatter.comment.format_block_comments=true
-org.eclipse.jdt.core.formatter.comment.format_header=true
+org.eclipse.jdt.core.formatter.comment.format_block_comments=false
+org.eclipse.jdt.core.formatter.comment.format_header=false
 org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=false
 org.eclipse.jdt.core.formatter.comment.format_line_comments=true
 org.eclipse.jdt.core.formatter.comment.format_source_code=true
 org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true

Modified: branches/Branch_1_4/integration/AS5/etc/remoting/remoting-bisocket-service.xml
===================================================================
--- branches/Branch_1_4/integration/AS5/etc/remoting/remoting-bisocket-service.xml	2008-10-03 16:39:06 UTC (rev 5064)
+++ branches/Branch_1_4/integration/AS5/etc/remoting/remoting-bisocket-service.xml	2008-10-03 17:58:39 UTC (rev 5065)
@@ -39,11 +39,14 @@
                
                <!-- Periodicity of client pings. Server window by default is twice this figure -->                               
                <attribute name="clientLeasePeriod" isParam="true">10000</attribute>
+               <attribute name="validatorPingPeriod" isParam="true">10000</attribute>
+               <attribute name="validatorPingTimeout" isParam="true">5000</attribute>
+               <attribute name="registerCallbackListener">false</attribute>
 	       	       
-	       <attribute name="timeout" isParam="true">0</attribute>
+	            <attribute name="timeout" isParam="true">0</attribute>
 
                <!-- Number of seconds to wait for a connection in the client pool to become free -->
-	       <attribute name="connectionWait" isParam="true">10</attribute>
+	            <attribute name="connectionWait" isParam="true">10</attribute>
 
                <!-- Max Number of connections in client pool. This should be significantly higher than
                     the max number of sessions/consumers you expect -->

Modified: branches/Branch_1_4/integration/EAP4/etc/remoting/remoting-bisocket-service.xml
===================================================================
--- branches/Branch_1_4/integration/EAP4/etc/remoting/remoting-bisocket-service.xml	2008-10-03 16:39:06 UTC (rev 5064)
+++ branches/Branch_1_4/integration/EAP4/etc/remoting/remoting-bisocket-service.xml	2008-10-03 17:58:39 UTC (rev 5065)
@@ -39,8 +39,11 @@
                
                <!-- Periodicity of client pings. Server window by default is twice this figure -->                               
                <attribute name="clientLeasePeriod" isParam="true">10000</attribute>
+               <attribute name="validatorPingPeriod" isParam="true">10000</attribute>
+               <attribute name="validatorPingTimeout" isParam="true">5000</attribute>
+               <attribute name="registerCallbackListener">false</attribute>
 	       	       
-	       <attribute name="timeout" isParam="true">0</attribute>
+	            <attribute name="timeout" isParam="true">0</attribute>
 
                <!-- Number of seconds to wait for a connection in the client pool to become free -->
                <attribute name="numberOfRetries" isParam="true">10</attribute>




More information about the jboss-cvs-commits mailing list