[jboss-cvs] JBoss Messaging SVN: r2671 - in trunk: docs/examples/distributed-queue and 19 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon May 14 11:51:13 EDT 2007
Author: timfox
Date: 2007-05-14 11:51:13 -0400 (Mon, 14 May 2007)
New Revision: 2671
Removed:
trunk/docs/examples/distributed-queue/do-not-distribute.properties
trunk/docs/examples/distributed-topic/do-not-distribute.properties
trunk/docs/examples/ejb3mdb/do-not-distribute.properties
trunk/docs/examples/http/do-not-distribute.properties
trunk/docs/examples/mdb-failure/do-not-distribute.properties
trunk/docs/examples/mdb/do-not-distribute.properties
trunk/docs/examples/queue-failover/do-not-distribute.properties
trunk/docs/examples/queue/do-not-distribute.properties
trunk/docs/examples/secure-socket/do-not-distribute.properties
trunk/docs/examples/stateless/do-not-distribute.properties
trunk/docs/examples/topic/do-not-distribute.properties
trunk/src/etc/jndi.properties
trunk/src/etc/server/default/config/login-config.xml
trunk/src/etc/server/default/config/roles.properties
trunk/src/etc/server/default/config/standardjboss.xml
trunk/src/etc/server/default/config/users.properties
Modified:
trunk/build-messaging.xml
trunk/docs/examples/distributed-queue/build.xml
trunk/docs/examples/distributed-topic/build.xml
trunk/docs/examples/ejb3mdb/build.xml
trunk/docs/examples/http/build.xml
trunk/docs/examples/http/etc/messaging-http-service.xml
trunk/docs/examples/mdb-failure/build.xml
trunk/docs/examples/mdb/build.xml
trunk/docs/examples/queue-failover/build.xml
trunk/docs/examples/queue/build.xml
trunk/docs/examples/secure-socket/build.xml
trunk/docs/examples/secure-socket/etc/messaging-secure-socket-service.xml
trunk/docs/examples/stateless/build.xml
trunk/docs/examples/topic/build.xml
trunk/src/etc/server/default/deploy/jboss-service.xml
trunk/src/etc/server/default/deploy/remoting-service.xml
trunk/tests/build.xml
trunk/tests/smoke/build.xml
trunk/tests/src/org/jboss/test/messaging/jms/SecurityTest.java
trunk/util/release-admin.xml
Log:
Remove scoping and script cleanup interim commit
Modified: trunk/build-messaging.xml
===================================================================
--- trunk/build-messaging.xml 2007-05-12 14:43:53 UTC (rev 2670)
+++ trunk/build-messaging.xml 2007-05-14 15:51:13 UTC (rev 2671)
@@ -516,7 +516,6 @@
<copy todir="${release.output}/util">
<fileset dir="./util">
<include name="**"/>
- <exclude name="do-not-distribute*"/>
</fileset>
</copy>
<zip destfile="${build.lib}/jboss-messaging-${module.version}.zip"
@@ -539,7 +538,6 @@
<copy todir="${release.output}/examples">
<fileset dir="./docs/examples">
<exclude name="programmatic-deployment"/>
- <exclude name="**/do-not-distribute*"/>
</fileset>
</copy>
<copy todir="${release.output}/examples/config">
@@ -556,7 +554,6 @@
<copy todir="${release.output}/docs/userguide">
<fileset dir="${project.output}/docs/userguide/en">
<include name="**"/>
- <exclude name="**/do-not-distribute*"/>
</fileset>
</copy>
</target>
@@ -646,7 +643,8 @@
<ant dir="./docs/examples/secure-socket" antfile="build.xml" inheritAll="false" target="clean"/>
<ant dir="./docs/examples/distributed-queue" antfile="build.xml" inheritAll="false" target="clean"/>
<ant dir="./docs/examples/distributed-topic" antfile="build.xml" inheritAll="false" target="clean"/>
- <ant dir="./docs/examples/queue-failover" antfile="build.xml" inheritAll="false" target="clean"/>
+ <ant dir="./docs/examples/queue-failover" antfile="build.xml" inheritAll="false" target="clean"/>
+ <ant dir="./docs/examples/http" antfile="build.xml" inheritAll="false" target="clean"/>
<ant dir="./tests" antfile="build.xml" inheritAll="false" target="clean"/>
</target>
Modified: trunk/docs/examples/distributed-queue/build.xml
===================================================================
--- trunk/docs/examples/distributed-queue/build.xml 2007-05-12 14:43:53 UTC (rev 2670)
+++ trunk/docs/examples/distributed-queue/build.xml 2007-05-14 15:51:13 UTC (rev 2671)
@@ -12,14 +12,8 @@
<property environment="ENV"/>
- <!--
- If you don't find this file in the current directory, it's ok, it's intended to provide
- defaults for in-workarea testing and it's not meant for distribution with the example bundle.
- -->
- <property file="do-not-distribute.properties"/>
-
<!-- These properties may be overriden by calling ants when this example is used in a smoke test -->
- <property name="messaging.client.jar.path" value="../.."/>
+ <property name="messaging.client.jar.path" value="../../../output/lib"/>
<property name="messaging.client.jar.name" value="jboss-messaging-client.jar"/>
<property name="jboss.home" value="${ENV.JBOSS_HOME}"/>
<property name="example.queue.name" value="testDistributedQueue"/>
@@ -31,19 +25,19 @@
<path id="example.compilation.classpath">
<path refid="common.compilation.classpath"/>
- <pathelement path="../common/output"/>
+ <pathelement path="../common/output/classes"/>
</path>
<path id="execution.classpath">
<pathelement path="./etc"/>
- <pathelement path="../common/output"/>
- <pathelement path="./output"/>
+ <pathelement path="../common/output/classes"/>
+ <pathelement path="./output/classes"/>
<fileset file="${messaging.client.jar.path}/${messaging.client.jar.name}"/>
<fileset file="${jboss.home}/client/jbossall-client.jar"/>
- <fileset file="../../../thirdparty/jboss/aop/lib/jboss-aop.jar"/>
- <fileset file="../../../thirdparty/javassist/lib/javassist.jar"/>
- <fileset file="../../../thirdparty/trove/lib/trove.jar"/>
- <fileset file="../../../thirdparty/apache-log4j/lib/log4j.jar"/>
+ <fileset file="${jboss.home}/server/${jboss.configuration}/lib/log4j.jar"/>
+ <fileset file="${jboss.home}/server/${jboss.configuration}/lib/javassist.jar"/>
+ <fileset file="${jboss.home}/server/${jboss.configuration}/deploy/jboss-aop-jdk50.deployer/jboss-aop-jdk50.jar"/>
+ <fileset file="${jboss.home}/server/${jboss.configuration}/deploy/jboss-aop-jdk50.deployer/trove.jar"/>
</path>
<target name="identify">
@@ -61,16 +55,16 @@
</target>
<target name="init" depends="sanity-check">
- <mkdir dir="./output"/>
- <mkdir dir="../common/output"/>
+ <mkdir dir="./output/classes"/>
+ <mkdir dir="../common/output/classes"/>
</target>
<target name="compile" depends="init">
- <javac destdir="../common/output" debug="on" debuglevel="lines,vars,source">
+ <javac destdir="../common/output/classes" debug="on" debuglevel="lines,vars,source">
<src path="../common/src"/>
<classpath refid="common.compilation.classpath"/>
</javac>
- <javac destdir="./output" debug="on" debuglevel="lines,vars,source">
+ <javac destdir="./output/classes" debug="on" debuglevel="lines,vars,source">
<src path="./src"/>
<classpath refid="example.compilation.classpath"/>
</javac>
Deleted: trunk/docs/examples/distributed-queue/do-not-distribute.properties
===================================================================
--- trunk/docs/examples/distributed-queue/do-not-distribute.properties 2007-05-12 14:43:53 UTC (rev 2670)
+++ trunk/docs/examples/distributed-queue/do-not-distribute.properties 2007-05-14 15:51:13 UTC (rev 2671)
@@ -1,7 +0,0 @@
-#
-# This file provides values for in-workarea example testing.
-# DO NOT DISTRIBUTE!
-#
-messaging.client.jar.path=../../../output/lib
-messaging.client.jar.name=jboss-messaging-client.jar
-#jboss.home=C:\\work\\src\\jboss-4.0.4.GA-src\\build\\output\\jboss-4.0.4.GA
Modified: trunk/docs/examples/distributed-topic/build.xml
===================================================================
--- trunk/docs/examples/distributed-topic/build.xml 2007-05-12 14:43:53 UTC (rev 2670)
+++ trunk/docs/examples/distributed-topic/build.xml 2007-05-14 15:51:13 UTC (rev 2671)
@@ -12,14 +12,8 @@
<property environment="ENV"/>
- <!--
- If you don't find this file in the current directory, it's ok, it's intended to provide
- defaults for in-workarea testing and it's not meant for distribution with the example bundle.
- -->
- <property file="do-not-distribute.properties"/>
-
<!-- These properties may be overriden by calling ants when this example is used in a smoke test -->
- <property name="messaging.client.jar.path" value="../.."/>
+ <property name="messaging.client.jar.path" value="../../../output/lib"/>
<property name="messaging.client.jar.name" value="jboss-messaging-client.jar"/>
<property name="jboss.home" value="${ENV.JBOSS_HOME}"/>
<property name="example.topic.name" value="testDistributedTopic"/>
@@ -31,19 +25,19 @@
<path id="example.compilation.classpath">
<path refid="common.compilation.classpath"/>
- <pathelement path="../common/output"/>
+ <pathelement path="../common/output/classes"/>
</path>
<path id="execution.classpath">
<pathelement path="./etc"/>
- <pathelement path="../common/output"/>
- <pathelement path="./output"/>
+ <pathelement path="../common/output/classes"/>
+ <pathelement path="./output/classes"/>
<fileset file="${messaging.client.jar.path}/${messaging.client.jar.name}"/>
<fileset file="${jboss.home}/client/jbossall-client.jar"/>
- <fileset file="../../../thirdparty/jboss/aop/lib/jboss-aop.jar"/>
- <fileset file="../../../thirdparty/javassist/lib/javassist.jar"/>
- <fileset file="../../../thirdparty/trove/lib/trove.jar"/>
- <fileset file="../../../thirdparty/apache-log4j/lib/log4j.jar"/>
+ <fileset file="${jboss.home}/server/${jboss.configuration}/lib/log4j.jar"/>
+ <fileset file="${jboss.home}/server/${jboss.configuration}/lib/javassist.jar"/>
+ <fileset file="${jboss.home}/server/${jboss.configuration}/deploy/jboss-aop-jdk50.deployer/jboss-aop-jdk50.jar"/>
+ <fileset file="${jboss.home}/server/${jboss.configuration}/deploy/jboss-aop-jdk50.deployer/trove.jar"/>
</path>
<target name="identify">
@@ -61,16 +55,17 @@
</target>
<target name="init" depends="sanity-check">
- <mkdir dir="./output"/>
- <mkdir dir="../common/output"/>
+ <mkdir dir="./output/classes"/>
+ <mkdir dir="../output/classes"/>
+ <mkdir dir="../common/output/classes"/>
</target>
<target name="compile" depends="init">
- <javac destdir="../common/output" debug="on" debuglevel="lines,vars,source">
+ <javac destdir="../common/output/classes" debug="on" debuglevel="lines,vars,source">
<src path="../common/src"/>
<classpath refid="common.compilation.classpath"/>
</javac>
- <javac destdir="./output" debug="on" debuglevel="lines,vars,source">
+ <javac destdir="./output/classes" debug="on" debuglevel="lines,vars,source">
<src path="./src"/>
<classpath refid="example.compilation.classpath"/>
</javac>
Deleted: trunk/docs/examples/distributed-topic/do-not-distribute.properties
===================================================================
--- trunk/docs/examples/distributed-topic/do-not-distribute.properties 2007-05-12 14:43:53 UTC (rev 2670)
+++ trunk/docs/examples/distributed-topic/do-not-distribute.properties 2007-05-14 15:51:13 UTC (rev 2671)
@@ -1,7 +0,0 @@
-#
-# This file provides values for in-workarea example testing.
-# DO NOT DISTRIBUTE!
-#
-messaging.client.jar.path=../../../output/lib
-messaging.client.jar.name=jboss-messaging-client.jar
-#jboss.home=C:\\work\\src\\jboss-4.0.4.GA-src\\build\\output\\jboss-4.0.4.GA
Modified: trunk/docs/examples/ejb3mdb/build.xml
===================================================================
--- trunk/docs/examples/ejb3mdb/build.xml 2007-05-12 14:43:53 UTC (rev 2670)
+++ trunk/docs/examples/ejb3mdb/build.xml 2007-05-14 15:51:13 UTC (rev 2671)
@@ -12,14 +12,8 @@
<property environment="ENV"/>
- <!--
- If you don't find this file in the current directory, it's ok, it's intended to provide
- defaults for in-workarea testing and it's not meant for distribution with the example bundle.
- -->
- <property file="do-not-distribute.properties"/>
-
<!-- These properties may be overriden by calling ants when this example is used in a smoke test -->
- <property name="messaging.client.jar.path" value="../.."/>
+ <property name="messaging.client.jar.path" value="../../../output/lib"/>
<property name="messaging.client.jar.name" value="jboss-messaging-client.jar"/>
<property name="jboss.home" value="${ENV.JBOSS_HOME}"/>
<property name="jboss.configuration" value="messaging"/>
@@ -28,23 +22,24 @@
<path id="common.compilation.classpath">
<fileset file="${jboss.home}/client/jboss-j2ee.jar"/>
<fileset file="${messaging.client.jar.path}/${messaging.client.jar.name}"/>
+ <fileset file="${jboss.home}/client/jboss-ejb3x.jar"/>
</path>
<path id="example.compilation.classpath">
<path refid="common.compilation.classpath"/>
- <pathelement path="../common/output"/>
+ <pathelement path="../common/output/classes"/>
</path>
<path id="execution.classpath">
<pathelement path="./etc"/>
- <pathelement path="../common/output"/>
- <pathelement path="./output"/>
+ <pathelement path="../common/output/classes"/>
+ <pathelement path="./output/classes"/>
<fileset file="${messaging.client.jar.path}/${messaging.client.jar.name}"/>
<fileset file="${jboss.home}/client/jbossall-client.jar"/>
- <fileset file="../../../thirdparty/jboss/aop/lib/jboss-aop.jar"/>
- <fileset file="../../../thirdparty/javassist/lib/javassist.jar"/>
- <fileset file="../../../thirdparty/trove/lib/trove.jar"/>
- <fileset file="../../../thirdparty/apache-log4j/lib/log4j.jar"/>
+ <fileset file="${jboss.home}/server/${jboss.configuration}/lib/log4j.jar"/>
+ <fileset file="${jboss.home}/server/${jboss.configuration}/lib/javassist.jar"/>
+ <fileset file="${jboss.home}/server/${jboss.configuration}/deploy/jboss-aop-jdk50.deployer/jboss-aop-jdk50.jar"/>
+ <fileset file="${jboss.home}/server/${jboss.configuration}/deploy/jboss-aop-jdk50.deployer/trove.jar"/>
</path>
<target name="identify">
@@ -67,11 +62,11 @@
<target name="init" depends="sanity-check">
<mkdir dir="./output/classes/META-INF"/>
<mkdir dir="./output/lib/META-INF"/>
- <mkdir dir="../common/output"/>
+ <mkdir dir="../common/output/classes"/>
</target>
<target name="compile" depends="init">
- <javac destdir="../common/output" debug="on" debuglevel="lines,vars,source">
+ <javac destdir="../common/output/classes" debug="on" debuglevel="lines,vars,source">
<src path="../common/src"/>
<classpath refid="common.compilation.classpath"/>
</javac>
Deleted: trunk/docs/examples/ejb3mdb/do-not-distribute.properties
===================================================================
--- trunk/docs/examples/ejb3mdb/do-not-distribute.properties 2007-05-12 14:43:53 UTC (rev 2670)
+++ trunk/docs/examples/ejb3mdb/do-not-distribute.properties 2007-05-14 15:51:13 UTC (rev 2671)
@@ -1,8 +0,0 @@
-#
-# This file provides values for in-workarea example testing.
-# DO NOT DISTRIBUTE!
-#
-messaging.client.jar.path=../../../output/lib
-messaging.client.jar.name=jboss-messaging-client.jar
-jboss.configuration=messaging
-
Modified: trunk/docs/examples/http/build.xml
===================================================================
--- trunk/docs/examples/http/build.xml 2007-05-12 14:43:53 UTC (rev 2670)
+++ trunk/docs/examples/http/build.xml 2007-05-14 15:51:13 UTC (rev 2671)
@@ -12,14 +12,8 @@
<property environment="ENV"/>
- <!--
- If you don't find this file in the current directory, it's ok, it's intended to provide
- defaults for in-workarea testing and it's not meant for distribution with the example bundle.
- -->
- <property file="./do-not-distribute.properties"/>
-
<!-- These properties may be overriden by calling ants when this example is used in a smoke test -->
- <property name="messaging.client.jar.path" value="../.."/>
+ <property name="messaging.client.jar.path" value="../../../output/lib"/>
<property name="messaging.client.jar.name" value="jboss-messaging-client.jar"/>
<property name="jboss.home" value="${ENV.JBOSS_HOME}"/>
<property name="jboss.configuration" value="messaging"/>
@@ -32,19 +26,19 @@
<path id="example.compilation.classpath">
<path refid="common.compilation.classpath"/>
- <pathelement path="../common/output"/>
+ <pathelement path="../common/output/classes"/>
</path>
<path id="execution.classpath">
<pathelement path="./etc"/>
- <pathelement path="../common/output"/>
- <pathelement path="./output"/>
+ <pathelement path="../common/output/classes"/>
+ <pathelement path="./output/classes"/>
<fileset file="${messaging.client.jar.path}/${messaging.client.jar.name}"/>
<fileset file="${jboss.home}/client/jbossall-client.jar"/>
- <fileset file="../../../thirdparty/jboss/aop/lib/jboss-aop.jar"/>
- <fileset file="../../../thirdparty/javassist/lib/javassist.jar"/>
- <fileset file="../../../thirdparty/trove/lib/trove.jar"/>
- <fileset file="../../../thirdparty/apache-log4j/lib/log4j.jar"/>
+ <fileset file="${jboss.home}/server/${jboss.configuration}/lib/log4j.jar"/>
+ <fileset file="${jboss.home}/server/${jboss.configuration}/lib/javassist.jar"/>
+ <fileset file="${jboss.home}/server/${jboss.configuration}/deploy/jboss-aop-jdk50.deployer/jboss-aop-jdk50.jar"/>
+ <fileset file="${jboss.home}/server/${jboss.configuration}/deploy/jboss-aop-jdk50.deployer/trove.jar"/>
</path>
<target name="identify">
@@ -62,16 +56,16 @@
</target>
<target name="init" depends="sanity-check">
- <mkdir dir="./output"/>
- <mkdir dir="../common/output"/>
+ <mkdir dir="./output/classes"/>
+ <mkdir dir="../common/output/classes"/>
</target>
<target name="compile" depends="init">
- <javac destdir="../common/output" debug="on" debuglevel="lines,vars,source">
+ <javac destdir="../common/output/classes" debug="on" debuglevel="lines,vars,source">
<src path="../common/src"/>
<classpath refid="common.compilation.classpath"/>
</javac>
- <javac destdir="./output" debug="on" debuglevel="lines,vars,source">
+ <javac destdir="./output/classes" debug="on" debuglevel="lines,vars,source">
<src path="./src"/>
<classpath refid="example.compilation.classpath"/>
</javac>
Deleted: trunk/docs/examples/http/do-not-distribute.properties
===================================================================
--- trunk/docs/examples/http/do-not-distribute.properties 2007-05-12 14:43:53 UTC (rev 2670)
+++ trunk/docs/examples/http/do-not-distribute.properties 2007-05-14 15:51:13 UTC (rev 2671)
@@ -1,7 +0,0 @@
-#
-# This file provides values for in-workarea example testing.
-# DO NOT DISTRIBUTE!
-#
-messaging.client.jar.path=../../../output/lib
-messaging.client.jar.name=jboss-messaging-client.jar
-jboss.configuration=messaging
Modified: trunk/docs/examples/http/etc/messaging-http-service.xml
===================================================================
--- trunk/docs/examples/http/etc/messaging-http-service.xml 2007-05-12 14:43:53 UTC (rev 2670)
+++ trunk/docs/examples/http/etc/messaging-http-service.xml 2007-05-14 15:51:13 UTC (rev 2671)
@@ -21,10 +21,15 @@
<attribute name="unmarshaller" isParam="true">org.jboss.jms.server.remoting.JMSWireFormat</attribute>
<attribute name="serializationtype" isParam="true">jms</attribute>
<attribute name="dataType" isParam="true">jms</attribute>
+ <attribute name="socket.check_connection" isParam="true">false</attribute>
+ <attribute name="timeout" isParam="true">0</attribute>
<attribute name="serverBindAddress">${jboss.bind.address}</attribute>
<attribute name="serverBindPort">4458</attribute>
- <attribute name="leasePeriod">20000</attribute>
+ <attribute name="leasePeriod">10000</attribute>
<attribute name="callbackStore">org.jboss.remoting.callback.CallbackStore</attribute>
+
+
+
<attribute name="callbackPollPeriod" isParam="true">100</attribute>
</invoker>
<handlers>
@@ -36,7 +41,7 @@
</mbean>
<mbean code="org.jboss.jms.server.connectionfactory.ConnectionFactory"
- name="jboss.messaging.destination:service=SecureConnectionFactory"
+ name="jboss.messaging.destination:service=HttpConnectionFactory"
xmbean-dd="xmdesc/ConnectionFactory-xmbean.xml">
<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
<depends optional-attribute-name="Connector">jboss.messaging:service=Connector,transport=http</depends>
@@ -47,4 +52,4 @@
</attribute>
</mbean>
-</server>
\ No newline at end of file
+</server>
Modified: trunk/docs/examples/mdb/build.xml
===================================================================
--- trunk/docs/examples/mdb/build.xml 2007-05-12 14:43:53 UTC (rev 2670)
+++ trunk/docs/examples/mdb/build.xml 2007-05-14 15:51:13 UTC (rev 2671)
@@ -12,14 +12,8 @@
<property environment="ENV"/>
- <!--
- If you don't find this file in the current directory, it's ok, it's intended to provide
- defaults for in-workarea testing and it's not meant for distribution with the example bundle.
- -->
- <property file="do-not-distribute.properties"/>
-
<!-- These properties may be overriden by calling ants when this example is used in a smoke test -->
- <property name="messaging.client.jar.path" value="../.."/>
+ <property name="messaging.client.jar.path" value="../../../output/lib"/>
<property name="messaging.client.jar.name" value="jboss-messaging-client.jar"/>
<property name="jboss.home" value="${ENV.JBOSS_HOME}"/>
<property name="jboss.configuration" value="messaging"/>
@@ -32,19 +26,19 @@
<path id="example.compilation.classpath">
<path refid="common.compilation.classpath"/>
- <pathelement path="../common/output"/>
+ <pathelement path="../common/output/classes"/>
</path>
<path id="execution.classpath">
<pathelement path="./etc"/>
- <pathelement path="../common/output"/>
- <pathelement path="./output"/>
+ <pathelement path="../common/output/classes"/>
+ <pathelement path="./output/classes"/>
<fileset file="${messaging.client.jar.path}/${messaging.client.jar.name}"/>
<fileset file="${jboss.home}/client/jbossall-client.jar"/>
- <fileset file="../../../thirdparty/jboss/aop/lib/jboss-aop.jar"/>
- <fileset file="../../../thirdparty/javassist/lib/javassist.jar"/>
- <fileset file="../../../thirdparty/trove/lib/trove.jar"/>
- <fileset file="../../../thirdparty/apache-log4j/lib/log4j.jar"/>
+ <fileset file="${jboss.home}/server/${jboss.configuration}/lib/log4j.jar"/>
+ <fileset file="${jboss.home}/server/${jboss.configuration}/lib/javassist.jar"/>
+ <fileset file="${jboss.home}/server/${jboss.configuration}/deploy/jboss-aop-jdk50.deployer/jboss-aop-jdk50.jar"/>
+ <fileset file="${jboss.home}/server/${jboss.configuration}/deploy/jboss-aop-jdk50.deployer/trove.jar"/>
</path>
<target name="identify">
@@ -64,11 +58,11 @@
<target name="init" depends="sanity-check">
<mkdir dir="./output/classes/META-INF"/>
<mkdir dir="./output/lib/META-INF"/>
- <mkdir dir="../common/output"/>
+ <mkdir dir="../common/output/classes"/>
</target>
<target name="compile" depends="init">
- <javac destdir="../common/output" debug="on" debuglevel="lines,vars,source">
+ <javac destdir="../common/output/classes" debug="on" debuglevel="lines,vars,source">
<src path="../common/src"/>
<classpath refid="common.compilation.classpath"/>
</javac>
Deleted: trunk/docs/examples/mdb/do-not-distribute.properties
===================================================================
--- trunk/docs/examples/mdb/do-not-distribute.properties 2007-05-12 14:43:53 UTC (rev 2670)
+++ trunk/docs/examples/mdb/do-not-distribute.properties 2007-05-14 15:51:13 UTC (rev 2671)
@@ -1,7 +0,0 @@
-#
-# This file provides values for in-workarea example testing.
-# DO NOT DISTRIBUTE!
-#
-messaging.client.jar.path=../../../output/lib
-messaging.client.jar.name=jboss-messaging-client.jar
-jboss.configuration=messaging
Modified: trunk/docs/examples/mdb-failure/build.xml
===================================================================
--- trunk/docs/examples/mdb-failure/build.xml 2007-05-12 14:43:53 UTC (rev 2670)
+++ trunk/docs/examples/mdb-failure/build.xml 2007-05-14 15:51:13 UTC (rev 2671)
@@ -12,16 +12,11 @@
<property environment="ENV"/>
- <!--
- If you don't find this file in the current directory, it's ok, it's intended to provide
- defaults for in-workarea testing and it's not meant for distribution with the example bundle.
- -->
- <property file="do-not-distribute.properties"/>
<property name="undeploy.quiet" value="false"/>
<property name="undeploy.failonerror" value="true"/>
<!-- These properties may be overriden by calling ants when this example is used in a smoke test -->
- <property name="messaging.client.jar.path" value="../.."/>
+ <property name="messaging.client.jar.path" value="../../../output/lib"/>
<property name="messaging.client.jar.name" value="jboss-messaging-client.jar"/>
<property name="jboss.home" value="${ENV.JBOSS_HOME}"/>
<property name="jboss.configuration" value="messaging"/>
@@ -34,19 +29,19 @@
<path id="example.compilation.classpath">
<path refid="common.compilation.classpath"/>
- <pathelement path="../common/output"/>
+ <pathelement path="../common/output/classes"/>
</path>
<path id="execution.classpath">
<pathelement path="./etc"/>
- <pathelement path="../common/output"/>
- <pathelement path="./output"/>
+ <pathelement path="../common/output/classes"/>
+ <pathelement path="./output/classes"/>
<fileset file="${messaging.client.jar.path}/${messaging.client.jar.name}"/>
<fileset file="${jboss.home}/client/jbossall-client.jar"/>
- <fileset file="../../../thirdparty/jboss/aop/lib/jboss-aop.jar"/>
- <fileset file="../../../thirdparty/javassist/lib/javassist.jar"/>
- <fileset file="../../../thirdparty/trove/lib/trove.jar"/>
- <fileset file="../../../thirdparty/apache-log4j/lib/log4j.jar"/>
+ <fileset file="${jboss.home}/server/${jboss.configuration}/lib/log4j.jar"/>
+ <fileset file="${jboss.home}/server/${jboss.configuration}/lib/javassist.jar"/>
+ <fileset file="${jboss.home}/server/${jboss.configuration}/deploy/jboss-aop-jdk50.deployer/jboss-aop-jdk50.jar"/>
+ <fileset file="${jboss.home}/server/${jboss.configuration}/deploy/jboss-aop-jdk50.deployer/trove.jar"/>
</path>
<target name="identify">
@@ -66,11 +61,11 @@
<target name="init" depends="sanity-check">
<mkdir dir="./output/classes/META-INF"/>
<mkdir dir="./output/lib/META-INF"/>
- <mkdir dir="../common/output"/>
+ <mkdir dir="../common/output/classes"/>
</target>
<target name="compile" depends="init">
- <javac destdir="../common/output" debug="on" debuglevel="lines,vars,source">
+ <javac destdir="../common/output/classes" debug="on" debuglevel="lines,vars,source">
<src path="../common/src"/>
<classpath refid="common.compilation.classpath"/>
</javac>
@@ -100,7 +95,7 @@
<target name="run" depends="deploy">
<antcall target="send"/>
- <antcall target="sleep"><param name="sleep.interval" value="25"/></antcall>
+ <antcall target="sleep"><param name="sleep.interval" value="10"/></antcall>
<antcall target="undeploy">
<param name="undeploy.quiet" value="false"/>
<param name="undeploy.failonerror" value="true"/>
Deleted: trunk/docs/examples/mdb-failure/do-not-distribute.properties
===================================================================
--- trunk/docs/examples/mdb-failure/do-not-distribute.properties 2007-05-12 14:43:53 UTC (rev 2670)
+++ trunk/docs/examples/mdb-failure/do-not-distribute.properties 2007-05-14 15:51:13 UTC (rev 2671)
@@ -1,8 +0,0 @@
-#
-# This file provides values for in-workarea example testing.
-# DO NOT DISTRIBUTE!
-#
-messaging.client.jar.path=../../../output/lib
-messaging.client.jar.name=jboss-messaging-client.jar
-jboss.configuration=messaging
-
Modified: trunk/docs/examples/queue/build.xml
===================================================================
--- trunk/docs/examples/queue/build.xml 2007-05-12 14:43:53 UTC (rev 2670)
+++ trunk/docs/examples/queue/build.xml 2007-05-14 15:51:13 UTC (rev 2671)
@@ -12,16 +12,11 @@
<property environment="ENV"/>
- <!--
- If you don't find this file in the current directory, it's ok, it's intended to provide
- defaults for in-workarea testing and it's not meant for distribution with the example bundle.
- -->
- <property file="do-not-distribute.properties"/>
-
<!-- These properties may be overriden by calling ants when this example is used in a smoke test -->
<property name="messaging.client.jar.path" value="../../../output/lib"/>
<property name="messaging.client.jar.name" value="jboss-messaging-client.jar"/>
<property name="jboss.home" value="${ENV.JBOSS_HOME}"/>
+ <property name="jboss.configuration" value="messaging"/>
<property name="example.queue.name" value="testQueue"/>
<path id="common.compilation.classpath">
@@ -31,19 +26,19 @@
<path id="example.compilation.classpath">
<path refid="common.compilation.classpath"/>
- <pathelement path="../common/output"/>
+ <pathelement path="../common/output/classes"/>
</path>
<path id="execution.classpath">
<pathelement path="./etc"/>
- <pathelement path="../common/output"/>
- <pathelement path="./output"/>
+ <pathelement path="../common/output/classes"/>
+ <pathelement path="./output/classes"/>
<fileset file="${messaging.client.jar.path}/${messaging.client.jar.name}"/>
<fileset file="${jboss.home}/client/jbossall-client.jar"/>
- <fileset file="../../../thirdparty/jboss/aop/lib/jboss-aop.jar"/>
- <fileset file="../../../thirdparty/javassist/lib/javassist.jar"/>
- <fileset file="../../../thirdparty/trove/lib/trove.jar"/>
- <fileset file="../../../thirdparty/apache-log4j/lib/log4j.jar"/>
+ <fileset file="${jboss.home}/server/${jboss.configuration}/lib/log4j.jar"/>
+ <fileset file="${jboss.home}/server/${jboss.configuration}/lib/javassist.jar"/>
+ <fileset file="${jboss.home}/server/${jboss.configuration}/deploy/jboss-aop-jdk50.deployer/jboss-aop-jdk50.jar"/>
+ <fileset file="${jboss.home}/server/${jboss.configuration}/deploy/jboss-aop-jdk50.deployer/trove.jar"/>
</path>
<target name="identify">
@@ -61,16 +56,16 @@
</target>
<target name="init" depends="sanity-check">
- <mkdir dir="./output"/>
- <mkdir dir="../common/output"/>
+ <mkdir dir="./output/classes"/>
+ <mkdir dir="../common/output/classes"/>
</target>
<target name="compile" depends="init">
- <javac destdir="../common/output" debug="on" debuglevel="lines,vars,source">
+ <javac destdir="../common/output/classes" debug="on" debuglevel="lines,vars,source">
<src path="../common/src"/>
<classpath refid="common.compilation.classpath"/>
</javac>
- <javac destdir="./output" debug="on" debuglevel="lines,vars,source">
+ <javac destdir="./output/classes" debug="on" debuglevel="lines,vars,source">
<src path="./src"/>
<classpath refid="example.compilation.classpath"/>
</javac>
Deleted: trunk/docs/examples/queue/do-not-distribute.properties
===================================================================
--- trunk/docs/examples/queue/do-not-distribute.properties 2007-05-12 14:43:53 UTC (rev 2670)
+++ trunk/docs/examples/queue/do-not-distribute.properties 2007-05-14 15:51:13 UTC (rev 2671)
@@ -1,8 +0,0 @@
-#
-# This file provides values for in-workarea example testing.
-# DO NOT DISTRIBUTE!
-#
-messaging.client.jar.path=../../../output/lib
-messaging.client.jar.name=jboss-messaging-client.jar
-jboss.configuration=messaging
-#jboss.home=C:\\work\\src\\jboss-4.0.1sp1-src\\build\\output\\jboss-4.0.1sp1
Modified: trunk/docs/examples/queue-failover/build.xml
===================================================================
--- trunk/docs/examples/queue-failover/build.xml 2007-05-12 14:43:53 UTC (rev 2670)
+++ trunk/docs/examples/queue-failover/build.xml 2007-05-14 15:51:13 UTC (rev 2671)
@@ -8,18 +8,12 @@
-->
-<project name="DistributedTopicExample" default="run">
+<project name="QueueFailoverExample" default="run">
<property environment="ENV"/>
- <!--
- If you don't find this file in the current directory, it's ok, it's intended to provide
- defaults for in-workarea testing and it's not meant for distribution with the example bundle.
- -->
- <property file="do-not-distribute.properties"/>
-
<!-- These properties may be overriden by calling ants when this example is used in a smoke test -->
- <property name="messaging.client.jar.path" value="../.."/>
+ <property name="messaging.client.jar.path" value="../../../output/lib"/>
<property name="messaging.client.jar.name" value="jboss-messaging-client.jar"/>
<property name="jboss.home" value="${ENV.JBOSS_HOME}"/>
<property name="example.queue.name" value="testDistributedQueue"/>
@@ -31,19 +25,19 @@
<path id="example.compilation.classpath">
<path refid="common.compilation.classpath"/>
- <pathelement path="../common/output"/>
+ <pathelement path="../common/output/classes"/>
</path>
<path id="execution.classpath">
<pathelement path="./etc"/>
- <pathelement path="../common/output"/>
- <pathelement path="./output"/>
+ <pathelement path="../common/output/classes"/>
+ <pathelement path="./output/classes"/>
<fileset file="${messaging.client.jar.path}/${messaging.client.jar.name}"/>
<fileset file="${jboss.home}/client/jbossall-client.jar"/>
- <fileset file="../../../thirdparty/jboss/aop/lib/jboss-aop.jar"/>
- <fileset file="../../../thirdparty/javassist/lib/javassist.jar"/>
- <fileset file="../../../thirdparty/trove/lib/trove.jar"/>
- <fileset file="../../../thirdparty/apache-log4j/lib/log4j.jar"/>
+ <fileset file="${jboss.home}/server/${jboss.configuration}/lib/log4j.jar"/>
+ <fileset file="${jboss.home}/server/${jboss.configuration}/lib/javassist.jar"/>
+ <fileset file="${jboss.home}/server/${jboss.configuration}/deploy/jboss-aop-jdk50.deployer/jboss-aop-jdk50.jar"/>
+ <fileset file="${jboss.home}/server/${jboss.configuration}/deploy/jboss-aop-jdk50.deployer/trove.jar"/>
</path>
<target name="identify">
@@ -62,15 +56,16 @@
<target name="init" depends="sanity-check">
<mkdir dir="./output/lib"/>
- <mkdir dir="../common/output"/>
+ <mkdir dir="./output/classes"/>
+ <mkdir dir="../common/output/classes"/>
</target>
<target name="compile" depends="init">
- <javac destdir="../common/output" debug="on" debuglevel="lines,vars,source">
+ <javac destdir="../common/output/classes" debug="on" debuglevel="lines,vars,source">
<src path="../common/src"/>
<classpath refid="common.compilation.classpath"/>
</javac>
- <javac destdir="./output" debug="on" debuglevel="lines,vars,source">
+ <javac destdir="./output/classes" debug="on" debuglevel="lines,vars,source">
<src path="./src"/>
<classpath refid="example.compilation.classpath"/>
</javac>
@@ -79,7 +74,7 @@
<target name="jar" depends="compile">
<jar destfile="./output/lib/application-server-killer.jar">
<fileset dir="../common/etc" includes="META-INF/**"/>
- <fileset dir="../common/output" includes="org/jboss/example/jms/common/bean/*.class"/>
+ <fileset dir="../common/output/classes" includes="org/jboss/example/jms/common/bean/*.class"/>
</jar>
</target>
Deleted: trunk/docs/examples/queue-failover/do-not-distribute.properties
===================================================================
--- trunk/docs/examples/queue-failover/do-not-distribute.properties 2007-05-12 14:43:53 UTC (rev 2670)
+++ trunk/docs/examples/queue-failover/do-not-distribute.properties 2007-05-14 15:51:13 UTC (rev 2671)
@@ -1,7 +0,0 @@
-#
-# This file provides values for in-workarea example testing.
-# DO NOT DISTRIBUTE!
-#
-messaging.client.jar.path=../../../output/lib
-messaging.client.jar.name=jboss-messaging-client.jar
-#jboss.home=C:\\work\\src\\jboss-4.0.4.GA-src\\build\\output\\jboss-4.0.4.GA
Modified: trunk/docs/examples/secure-socket/build.xml
===================================================================
--- trunk/docs/examples/secure-socket/build.xml 2007-05-12 14:43:53 UTC (rev 2670)
+++ trunk/docs/examples/secure-socket/build.xml 2007-05-14 15:51:13 UTC (rev 2671)
@@ -12,14 +12,8 @@
<property environment="ENV"/>
- <!--
- If you don't find this file in the current directory, it's ok, it's intended to provide
- defaults for in-workarea testing and it's not meant for distribution with the example bundle.
- -->
- <property file="./do-not-distribute.properties"/>
-
<!-- These properties may be overriden by calling ants when this example is used in a smoke test -->
- <property name="messaging.client.jar.path" value="../.."/>
+ <property name="messaging.client.jar.path" value="../../../output/lib"/>
<property name="messaging.client.jar.name" value="jboss-messaging-client.jar"/>
<property name="jboss.home" value="${ENV.JBOSS_HOME}"/>
<property name="jboss.configuration" value="messaging"/>
@@ -32,19 +26,19 @@
<path id="example.compilation.classpath">
<path refid="common.compilation.classpath"/>
- <pathelement path="../common/output"/>
+ <pathelement path="../common/output/classes"/>
</path>
<path id="execution.classpath">
<pathelement path="./etc"/>
- <pathelement path="../common/output"/>
- <pathelement path="./output"/>
+ <pathelement path="../common/output/classes"/>
+ <pathelement path="./output/classes"/>
<fileset file="${messaging.client.jar.path}/${messaging.client.jar.name}"/>
<fileset file="${jboss.home}/client/jbossall-client.jar"/>
- <fileset file="../../../thirdparty/jboss/aop/lib/jboss-aop.jar"/>
- <fileset file="../../../thirdparty/javassist/lib/javassist.jar"/>
- <fileset file="../../../thirdparty/trove/lib/trove.jar"/>
- <fileset file="../../../thirdparty/apache-log4j/lib/log4j.jar"/>
+ <fileset file="${jboss.home}/server/${jboss.configuration}/lib/log4j.jar"/>
+ <fileset file="${jboss.home}/server/${jboss.configuration}/lib/javassist.jar"/>
+ <fileset file="${jboss.home}/server/${jboss.configuration}/deploy/jboss-aop-jdk50.deployer/jboss-aop-jdk50.jar"/>
+ <fileset file="${jboss.home}/server/${jboss.configuration}/deploy/jboss-aop-jdk50.deployer/trove.jar"/>
</path>
<target name="identify">
@@ -65,16 +59,16 @@
</target>
<target name="init" depends="sanity-check">
- <mkdir dir="./output"/>
- <mkdir dir="../common/output"/>
+ <mkdir dir="./output/classes"/>
+ <mkdir dir="../common/output/classes"/>
</target>
<target name="compile" depends="init">
- <javac destdir="../common/output" debug="on" debuglevel="lines,vars,source">
+ <javac destdir="../common/output/classes" debug="on" debuglevel="lines,vars,source">
<src path="../common/src"/>
<classpath refid="common.compilation.classpath"/>
</javac>
- <javac destdir="./output" debug="on" debuglevel="lines,vars,source">
+ <javac destdir="./output/classes" debug="on" debuglevel="lines,vars,source">
<src path="./src"/>
<classpath refid="example.compilation.classpath"/>
</javac>
Deleted: trunk/docs/examples/secure-socket/do-not-distribute.properties
===================================================================
--- trunk/docs/examples/secure-socket/do-not-distribute.properties 2007-05-12 14:43:53 UTC (rev 2670)
+++ trunk/docs/examples/secure-socket/do-not-distribute.properties 2007-05-14 15:51:13 UTC (rev 2671)
@@ -1,7 +0,0 @@
-#
-# This file provides values for in-workarea example testing.
-# DO NOT DISTRIBUTE!
-#
-messaging.client.jar.path=../../../output/lib
-messaging.client.jar.name=jboss-messaging-client.jar
-jboss.configuration=messaging
Modified: trunk/docs/examples/secure-socket/etc/messaging-secure-socket-service.xml
===================================================================
--- trunk/docs/examples/secure-socket/etc/messaging-secure-socket-service.xml 2007-05-12 14:43:53 UTC (rev 2670)
+++ trunk/docs/examples/secure-socket/etc/messaging-secure-socket-service.xml 2007-05-14 15:51:13 UTC (rev 2671)
@@ -20,13 +20,17 @@
<attribute name="serializationtype" isParam="true">jms</attribute>
<attribute name="dataType" isParam="true">jms</attribute>
<attribute name="socket.check_connection" isParam="true">false</attribute>
- <attribute name="timeout">0</attribute>
+ <attribute name="timeout" isParam="true">0</attribute>
<attribute name="serverBindAddress">${jboss.bind.address}</attribute>
<attribute name="serverBindPort">5457</attribute>
- <attribute name="leasePeriod">20000</attribute>
+ <attribute name="leasePeriod">10000</attribute>
<attribute name="serverSocketFactory">jboss.messaging:service=ServerSocketFactory,type=SSL</attribute>
<attribute name="clientSocketClass" isParam="true">org.jboss.jms.client.remoting.ClientSocketWrapper</attribute>
<attribute name="serverSocketClass">org.jboss.jms.server.remoting.ServerSocketWrapper</attribute>
+ <attribute name="callbackErrorsAllowed">1</attribute>
+ <attribute name="numberOfRetries" isParam="true">1</attribute>
+ <attribute name="NumberOfCallRetries" isParam="true">2</attribute>
+ <attribute name="clientMaxPoolSize" isParam="true">50</attribute>
</invoker>
<handlers>
<handler subsystem="JMS">org.jboss.jms.server.remoting.JMSServerInvocationHandler</handler>
@@ -104,4 +108,4 @@
<attribute name="KeyStoreType">JKS</attribute>
</mbean>
-</server>
\ No newline at end of file
+</server>
Modified: trunk/docs/examples/stateless/build.xml
===================================================================
--- trunk/docs/examples/stateless/build.xml 2007-05-12 14:43:53 UTC (rev 2670)
+++ trunk/docs/examples/stateless/build.xml 2007-05-14 15:51:13 UTC (rev 2671)
@@ -12,14 +12,8 @@
<property environment="ENV"/>
- <!--
- If you don't find this file in the current directory, it's ok, it's intended to provide
- defaults for in-workarea testing and it's not meant for distribution with the example bundle.
- -->
- <property file="do-not-distribute.properties"/>
-
<!-- These properties may be overriden by calling ants when this example is used in a smoke test -->
- <property name="messaging.client.jar.path" value="../.."/>
+ <property name="messaging.client.jar.path" value="../../../output/lib"/>
<property name="messaging.client.jar.name" value="jboss-messaging-client.jar"/>
<property name="jboss.home" value="${ENV.JBOSS_HOME}"/>
<property name="jboss.configuration" value="messaging"/>
@@ -32,19 +26,19 @@
<path id="example.compilation.classpath">
<path refid="common.compilation.classpath"/>
- <pathelement path="../common/output"/>
+ <pathelement path="../common/output/classes"/>
</path>
<path id="execution.classpath">
<pathelement path="./etc"/>
- <pathelement path="../common/output"/>
- <pathelement path="./output"/>
+ <pathelement path="../common/output/classes"/>
+ <pathelement path="./output/classes"/>
<fileset file="${messaging.client.jar.path}/${messaging.client.jar.name}"/>
<fileset file="${jboss.home}/client/jbossall-client.jar"/>
- <fileset file="../../../thirdparty/jboss/aop/lib/jboss-aop.jar"/>
- <fileset file="../../../thirdparty/javassist/lib/javassist.jar"/>
- <fileset file="../../../thirdparty/trove/lib/trove.jar"/>
- <fileset file="../../../thirdparty/apache-log4j/lib/log4j.jar"/>
+ <fileset file="${jboss.home}/server/${jboss.configuration}/lib/log4j.jar"/>
+ <fileset file="${jboss.home}/server/${jboss.configuration}/lib/javassist.jar"/>
+ <fileset file="${jboss.home}/server/${jboss.configuration}/deploy/jboss-aop-jdk50.deployer/jboss-aop-jdk50.jar"/>
+ <fileset file="${jboss.home}/server/${jboss.configuration}/deploy/jboss-aop-jdk50.deployer/trove.jar"/>
</path>
<target name="identify">
@@ -64,11 +58,11 @@
<target name="init" depends="sanity-check">
<mkdir dir="./output/classes/META-INF"/>
<mkdir dir="./output/lib"/>
- <mkdir dir="../common/output"/>
+ <mkdir dir="../common/output/classes"/>
</target>
<target name="compile" depends="init">
- <javac destdir="../common/output" debug="on" debuglevel="lines,vars,source">
+ <javac destdir="../common/output/classes" debug="on" debuglevel="lines,vars,source">
<src path="../common/src"/>
<classpath refid="common.compilation.classpath"/>
</javac>
Deleted: trunk/docs/examples/stateless/do-not-distribute.properties
===================================================================
--- trunk/docs/examples/stateless/do-not-distribute.properties 2007-05-12 14:43:53 UTC (rev 2670)
+++ trunk/docs/examples/stateless/do-not-distribute.properties 2007-05-14 15:51:13 UTC (rev 2671)
@@ -1,7 +0,0 @@
-#
-# This file provides values for in-workarea example testing.
-# DO NOT DISTRIBUTE!
-#
-messaging.client.jar.path=../../../output/lib
-messaging.client.jar.name=jboss-messaging-client.jar
-jboss.configuration=messaging
Modified: trunk/docs/examples/topic/build.xml
===================================================================
--- trunk/docs/examples/topic/build.xml 2007-05-12 14:43:53 UTC (rev 2670)
+++ trunk/docs/examples/topic/build.xml 2007-05-14 15:51:13 UTC (rev 2671)
@@ -12,19 +12,14 @@
<property environment="ENV"/>
- <!--
- If you don't find this file in the current directory, it's ok, it's intended to provide
- defaults for in-workarea testing and it's not meant for distribution with the example bundle.
- -->
- <property file="do-not-distribute.properties"/>
-
<!-- These properties may be overriden by calling ants when this example is used in a smoke test -->
- <property name="messaging.client.jar.path" value="../.."/>
+ <property name="messaging.client.jar.path" value="../../../output/lib"/>
<property name="messaging.client.jar.name" value="jboss-messaging-client.jar"/>
<property name="jboss.home" value="${ENV.JBOSS_HOME}"/>
+ <property name="jboss.configuration" value="messaging"/>
<property name="example.topic.name" value="testTopic"/>
- <path id="common.compilation.classpath">
+ <path id="common.compilation.classpath">
<fileset file="${jboss.home}/client/jboss-j2ee.jar"/>
<fileset file="${messaging.client.jar.path}/${messaging.client.jar.name}"/>
</path>
@@ -40,10 +35,10 @@
<pathelement path="./output"/>
<fileset file="${messaging.client.jar.path}/${messaging.client.jar.name}"/>
<fileset file="${jboss.home}/client/jbossall-client.jar"/>
- <fileset file="../../../thirdparty/jboss/aop/lib/jboss-aop.jar"/>
- <fileset file="../../../thirdparty/javassist/lib/javassist.jar"/>
- <fileset file="../../../thirdparty/trove/lib/trove.jar"/>
- <fileset file="../../../thirdparty/apache-log4j/lib/log4j.jar"/>
+ <fileset file="${jboss.home}/server/${jboss.configuration}/lib/log4j.jar"/>
+ <fileset file="${jboss.home}/server/${jboss.configuration}/lib/javassist.jar"/>
+ <fileset file="${jboss.home}/server/${jboss.configuration}/deploy/jboss-aop-jdk50.deployer/jboss-aop-jdk50.jar"/>
+ <fileset file="${jboss.home}/server/${jboss.configuration}/deploy/jboss-aop-jdk50.deployer/trove.jar"/>
</path>
<target name="identify">
Deleted: trunk/docs/examples/topic/do-not-distribute.properties
===================================================================
--- trunk/docs/examples/topic/do-not-distribute.properties 2007-05-12 14:43:53 UTC (rev 2670)
+++ trunk/docs/examples/topic/do-not-distribute.properties 2007-05-14 15:51:13 UTC (rev 2671)
@@ -1,7 +0,0 @@
-#
-# This file provides values for in-workarea example testing.
-# DO NOT DISTRIBUTE!
-#
-messaging.client.jar.path=../../../output/lib
-messaging.client.jar.name=jboss-messaging-client.jar
-jboss.configuration=messaging
\ No newline at end of file
Deleted: trunk/src/etc/jndi.properties
===================================================================
--- trunk/src/etc/jndi.properties 2007-05-12 14:43:53 UTC (rev 2670)
+++ trunk/src/etc/jndi.properties 2007-05-14 15:51:13 UTC (rev 2671)
@@ -1,4 +0,0 @@
-### JBossNS properties
-java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
-java.naming.provider.url=jnp://localhost:1099
-java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
Deleted: trunk/src/etc/server/default/config/login-config.xml
===================================================================
--- trunk/src/etc/server/default/config/login-config.xml 2007-05-12 14:43:53 UTC (rev 2670)
+++ trunk/src/etc/server/default/config/login-config.xml 2007-05-14 15:51:13 UTC (rev 2671)
@@ -1,155 +0,0 @@
-<?xml version='1.0'?>
-
-<!DOCTYPE policy PUBLIC
- "-//JBoss//DTD JBOSS Security Config 3.0//EN"
- "http://www.jboss.org/j2ee/dtd/security_config.dtd">
-
-<!-- The XML based JAAS login configuration read by the
-org.jboss.security.auth.login.XMLLoginConfig mbean. Add
-an application-policy element for each security domain.
-
-The outline of the application-policy is:
-<application-policy name="security-domain-name">
- <authentication>
- <login-module code="login.module1.class.name" flag="control_flag">
- <module-option name = "option1-name">option1-value</module-option>
- <module-option name = "option2-name">option2-value</module-option>
- ...
- </login-module>
-
- <login-module code="login.module2.class.name" flag="control_flag">
- ...
- </login-module>
- ...
- </authentication>
-</application-policy>
-
-$Revision$
--->
-
-<policy>
- <!-- Used by clients within the application server VM such as
- mbeans and servlets that access EJBs.
- -->
- <application-policy name="client-login">
- <authentication>
- <login-module code="org.jboss.security.ClientLoginModule"
- flag="required">
- </login-module>
- </authentication>
- </application-policy>
-
- <!-- Security domain for JBossMQ -->
- <application-policy name="jbossmessaging">
- <authentication>
- <login-module code="org.jboss.security.auth.spi.DatabaseServerLoginModule"
- flag="required">
- <module-option name="unauthenticatedIdentity">guest</module-option>
- <module-option name="dsJndiName">java:/DefaultDS</module-option>
- <module-option name="principalsQuery">SELECT PASSWD FROM JMS_USERS WHERE USERID=?</module-option>
- <module-option name="rolesQuery">SELECT ROLEID, 'Roles' FROM JMS_ROLES WHERE USERID=?</module-option>
- </login-module>
- </authentication>
- </application-policy>
-
- <!-- Security domain for JBossMQ when using file-state-service.xml
- <application-policy name = "jbossmq">
- <authentication>
- <login-module code = "org.jboss.mq.sm.file.DynamicLoginModule"
- flag = "required">
- <module-option name = "unauthenticatedIdentity">guest</module-option>
- <module-option name = "sm.objectname">jboss.mq:service=StateManager</module-option>
- </login-module>
- </authentication>
- </application-policy>
- -->
-
- <!-- Security domains for testing new jca framework -->
- <application-policy name="HsqlDbRealm">
- <authentication>
- <login-module code="org.jboss.resource.security.ConfiguredIdentityLoginModule"
- flag="required">
- <module-option name="principal">sa</module-option>
- <module-option name="userName">sa</module-option>
- <module-option name="password"></module-option>
- <module-option name="managedConnectionFactoryName">jboss.jca:service=LocalTxCM,name=DefaultDS</module-option>
- </login-module>
- </authentication>
- </application-policy>
-
- <application-policy name="JmsXARealm">
- <authentication>
- <login-module code="org.jboss.resource.security.ConfiguredIdentityLoginModule"
- flag="required">
- <module-option name="principal">guest</module-option>
- <module-option name="userName">guest</module-option>
- <module-option name="password">guest</module-option>
- <module-option name="managedConnectionFactoryName">jboss.jca:service=TxCM,name=JmsXA</module-option>
- </login-module>
- </authentication>
- </application-policy>
-
- <!-- A template configuration for the jmx-console web application. This
- defaults to the UsersRolesLoginModule the same as other and should be
- changed to a stronger authentication mechanism as required.
- -->
- <application-policy name="jmx-console">
- <authentication>
- <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule"
- flag="required">
- <module-option name="usersProperties">props/jmx-console-users.properties</module-option>
- <module-option name="rolesProperties">props/jmx-console-roles.properties</module-option>
- </login-module>
- </authentication>
- </application-policy>
-
- <!-- A template configuration for the web-console web application. This
- defaults to the UsersRolesLoginModule the same as other and should be
- changed to a stronger authentication mechanism as required.
- -->
- <application-policy name="web-console">
- <authentication>
- <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule"
- flag="required">
- <module-option name="usersProperties">web-console-users.properties</module-option>
- <module-option name="rolesProperties">web-console-roles.properties</module-option>
- </login-module>
- </authentication>
- </application-policy>
-
- <!-- A template configuration for the JBossWS web application (and transport layer!).
- This defaults to the UsersRolesLoginModule the same as other and should be
- changed to a stronger authentication mechanism as required.
- -->
- <application-policy name="JBossWS">
- <authentication>
- <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule"
- flag="required">
- <module-option name="unauthenticatedIdentity">anonymous</module-option>
- </login-module>
- </authentication>
- </application-policy>
-
- <!-- The default login configuration used by any security domain that
- does not have a application-policy entry with a matching name
- -->
- <application-policy name="other">
- <!-- A simple server login module, which can be used when the number
- of users is relatively small. It uses two properties files:
- users.properties, which holds users (key) and their password (value).
- roles.properties, which holds users (key) and a comma-separated list of
- their roles (value).
- The unauthenticatedIdentity property defines the name of the principal
- that will be used when a null username and password are presented as is
- the case for an unuathenticated web client or MDB. If you want to
- allow such users to be authenticated add the property, e.g.,
- unauthenticatedIdentity="nobody"
- -->
- <authentication>
- <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule"
- flag="required"/>
- </authentication>
- </application-policy>
-
-</policy>
-
Deleted: trunk/src/etc/server/default/config/roles.properties
===================================================================
--- trunk/src/etc/server/default/config/roles.properties 2007-05-12 14:43:53 UTC (rev 2670)
+++ trunk/src/etc/server/default/config/roles.properties 2007-05-14 15:51:13 UTC (rev 2671)
@@ -1,4 +0,0 @@
-#
-# user=role1,role2,...
-#
-guest=guest
Deleted: trunk/src/etc/server/default/config/standardjboss.xml
===================================================================
--- trunk/src/etc/server/default/config/standardjboss.xml 2007-05-12 14:43:53 UTC (rev 2670)
+++ trunk/src/etc/server/default/config/standardjboss.xml 2007-05-14 15:51:13 UTC (rev 2671)
@@ -1,1040 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!DOCTYPE jboss PUBLIC
- "-//JBoss//DTD JBOSS 4.0//EN"
- "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd">
-
-<!-- ===================================================================== -->
-<!-- Standard JBoss EJB Configurations -->
-<!-- ===================================================================== -->
-<!-- $Id$ -->
-
-<jboss>
- <enforce-ejb-restrictions>false</enforce-ejb-restrictions>
-
- <invoker-proxy-bindings>
-
- <invoker-proxy-binding>
- <name>entity-unified-invoker</name>
- <invoker-mbean>jboss:service=invoker,type=unified</invoker-mbean>
- <proxy-factory>org.jboss.proxy.ejb.ProxyFactory</proxy-factory>
- <proxy-factory-config>
- <client-interceptors>
- <home>
- <interceptor>org.jboss.proxy.ejb.HomeInterceptor</interceptor>
- <interceptor>org.jboss.proxy.SecurityInterceptor</interceptor>
- <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
- <interceptor call-by-value="false">org.jboss.invocation.InvokerInterceptor</interceptor>
- <interceptor call-by-value="true">org.jboss.invocation.MarshallingInvokerInterceptor</interceptor>
- </home>
- <bean>
- <interceptor>org.jboss.proxy.ejb.EntityInterceptor</interceptor>
- <interceptor>org.jboss.proxy.SecurityInterceptor</interceptor>
- <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
- <interceptor call-by-value="false">org.jboss.invocation.InvokerInterceptor</interceptor>
- <interceptor call-by-value="true">org.jboss.invocation.MarshallingInvokerInterceptor</interceptor>
- </bean>
- <list-entity>
- <interceptor>org.jboss.proxy.ejb.ListEntityInterceptor</interceptor>
- <interceptor>org.jboss.proxy.SecurityInterceptor</interceptor>
- <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
- <interceptor call-by-value="false">org.jboss.invocation.InvokerInterceptor</interceptor>
- <interceptor call-by-value="true">org.jboss.invocation.MarshallingInvokerInterceptor</interceptor>
- </list-entity>
- </client-interceptors>
- </proxy-factory-config>
- </invoker-proxy-binding>
-
- <invoker-proxy-binding>
- <name>clustered-entity-rmi-invoker</name>
- <invoker-mbean>jboss:service=invoker,type=jrmpha</invoker-mbean>
- <proxy-factory>org.jboss.proxy.ejb.ProxyFactoryHA</proxy-factory>
- <proxy-factory-config>
- <client-interceptors>
- <home>
- <interceptor>org.jboss.proxy.ejb.HomeInterceptor</interceptor>
- <interceptor>org.jboss.proxy.SecurityInterceptor</interceptor>
- <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
- <interceptor call-by-value="false">org.jboss.invocation.InvokerInterceptor</interceptor>
- <interceptor call-by-value="true">org.jboss.invocation.MarshallingInvokerInterceptor</interceptor>
- </home>
- <bean>
- <interceptor>org.jboss.proxy.ejb.EntityInterceptor</interceptor>
- <interceptor>org.jboss.proxy.SecurityInterceptor</interceptor>
- <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
- <interceptor call-by-value="false">org.jboss.invocation.InvokerInterceptor</interceptor>
- <interceptor call-by-value="true">org.jboss.invocation.MarshallingInvokerInterceptor</interceptor>
- </bean>
- <list-entity>
- <interceptor>org.jboss.proxy.ejb.ListEntityInterceptor</interceptor>
- <interceptor>org.jboss.proxy.SecurityInterceptor</interceptor>
- <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
- <interceptor call-by-value="false">org.jboss.invocation.InvokerInterceptor</interceptor>
- <interceptor call-by-value="true">org.jboss.invocation.MarshallingInvokerInterceptor</interceptor>
- </list-entity>
- </client-interceptors>
- </proxy-factory-config>
- </invoker-proxy-binding>
-
- <invoker-proxy-binding>
- <name>stateless-unified-invoker</name>
- <invoker-mbean>jboss:service=invoker,type=unified</invoker-mbean>
- <proxy-factory>org.jboss.proxy.ejb.ProxyFactory</proxy-factory>
- <proxy-factory-config>
- <client-interceptors>
- <home>
- <interceptor>org.jboss.proxy.ejb.HomeInterceptor</interceptor>
- <interceptor>org.jboss.proxy.SecurityInterceptor</interceptor>
- <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
- <interceptor call-by-value="false">org.jboss.invocation.InvokerInterceptor</interceptor>
- <interceptor call-by-value="true">org.jboss.invocation.MarshallingInvokerInterceptor</interceptor>
- </home>
- <bean>
- <interceptor>org.jboss.proxy.ejb.StatelessSessionInterceptor</interceptor>
- <interceptor>org.jboss.proxy.SecurityInterceptor</interceptor>
- <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
- <interceptor call-by-value="false">org.jboss.invocation.InvokerInterceptor</interceptor>
- <interceptor call-by-value="true">org.jboss.invocation.MarshallingInvokerInterceptor</interceptor>
- </bean>
- </client-interceptors>
- </proxy-factory-config>
- </invoker-proxy-binding>
-
- <invoker-proxy-binding>
- <name>clustered-stateless-rmi-invoker</name>
- <invoker-mbean>jboss:service=invoker,type=jrmpha</invoker-mbean>
- <proxy-factory>org.jboss.proxy.ejb.ProxyFactoryHA</proxy-factory>
- <proxy-factory-config>
- <client-interceptors>
- <home>
- <interceptor>org.jboss.proxy.ejb.HomeInterceptor</interceptor>
- <interceptor>org.jboss.proxy.SecurityInterceptor</interceptor>
- <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
- <interceptor call-by-value="false">org.jboss.invocation.InvokerInterceptor</interceptor>
- <interceptor call-by-value="true">org.jboss.invocation.MarshallingInvokerInterceptor</interceptor>
- </home>
- <bean>
- <interceptor>org.jboss.proxy.ejb.StatelessSessionInterceptor</interceptor>
- <interceptor>org.jboss.proxy.SecurityInterceptor</interceptor>
- <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
- <interceptor call-by-value="false">org.jboss.invocation.InvokerInterceptor</interceptor>
- <interceptor call-by-value="true">org.jboss.invocation.MarshallingInvokerInterceptor</interceptor>
- </bean>
- </client-interceptors>
- </proxy-factory-config>
- </invoker-proxy-binding>
-
- <invoker-proxy-binding>
- <name>stateful-unified-invoker</name>
- <invoker-mbean>jboss:service=invoker,type=unified</invoker-mbean>
- <proxy-factory>org.jboss.proxy.ejb.ProxyFactory</proxy-factory>
- <proxy-factory-config>
- <client-interceptors>
- <home>
- <interceptor>org.jboss.proxy.ejb.HomeInterceptor</interceptor>
- <interceptor>org.jboss.proxy.SecurityInterceptor</interceptor>
- <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
- <interceptor call-by-value="false">org.jboss.invocation.InvokerInterceptor</interceptor>
- <interceptor call-by-value="true">org.jboss.invocation.MarshallingInvokerInterceptor</interceptor>
- </home>
- <bean>
- <interceptor>org.jboss.proxy.ejb.StatefulSessionInterceptor</interceptor>
- <interceptor>org.jboss.proxy.SecurityInterceptor</interceptor>
- <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
- <interceptor call-by-value="false">org.jboss.invocation.InvokerInterceptor</interceptor>
- <interceptor call-by-value="true">org.jboss.invocation.MarshallingInvokerInterceptor</interceptor>
- </bean>
- </client-interceptors>
- </proxy-factory-config>
- </invoker-proxy-binding>
-
- <invoker-proxy-binding>
- <name>clustered-stateful-rmi-invoker</name>
- <invoker-mbean>jboss:service=invoker,type=jrmpha</invoker-mbean>
- <proxy-factory>org.jboss.proxy.ejb.ProxyFactoryHA</proxy-factory>
- <proxy-factory-config>
- <client-interceptors>
- <home>
- <interceptor>org.jboss.proxy.ejb.HomeInterceptor</interceptor>
- <interceptor>org.jboss.proxy.SecurityInterceptor</interceptor>
- <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
- <interceptor call-by-value="false">org.jboss.invocation.InvokerInterceptor</interceptor>
- <interceptor call-by-value="true">org.jboss.invocation.MarshallingInvokerInterceptor</interceptor>
- </home>
- <bean>
- <interceptor>org.jboss.proxy.ejb.StatefulSessionInterceptor</interceptor>
- <interceptor>org.jboss.proxy.SecurityInterceptor</interceptor>
- <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
- <interceptor call-by-value="false">org.jboss.invocation.InvokerInterceptor</interceptor>
- <interceptor call-by-value="true">org.jboss.invocation.MarshallingInvokerInterceptor</interceptor>
- </bean>
- </client-interceptors>
- </proxy-factory-config>
- </invoker-proxy-binding>
-
- <invoker-proxy-binding>
- <name>message-driven-bean</name>
- <invoker-mbean>default</invoker-mbean>
- <proxy-factory>org.jboss.ejb.plugins.jms.JMSContainerInvoker</proxy-factory>
- <proxy-factory-config>
- <JMSProviderAdapterJNDI>DefaultJMSProvider</JMSProviderAdapterJNDI>
- <ServerSessionPoolFactoryJNDI>StdJMSPool</ServerSessionPoolFactoryJNDI>
- <CreateJBossMQDestination>true</CreateJBossMQDestination>
- <!-- WARN: Don't set this to zero until a bug in the pooled executor is fixed -->
- <MinimumSize>1</MinimumSize>
- <MaximumSize>15</MaximumSize>
- <KeepAliveMillis>30000</KeepAliveMillis>
- <MaxMessages>1</MaxMessages>
- <MDBConfig>
- <ReconnectIntervalSec>10</ReconnectIntervalSec>
- <!--
- <DLQConfig>
- <DestinationQueue>queue/DLQ</DestinationQueue>
- <MaxTimesRedelivered>10</MaxTimesRedelivered>
- <TimeToLive>0</TimeToLive>
- </DLQConfig>
- -->
- </MDBConfig>
- </proxy-factory-config>
- </invoker-proxy-binding>
-
- <!-- Uncomment to use JMS message inflow from jmsra.rar
- <invoker-proxy-binding>
- <name>message-driven-bean</name>
- <invoker-mbean>default</invoker-mbean>
- <proxy-factory>org.jboss.ejb.plugins.inflow.JBossJMSMessageEndpointFactory</proxy-factory>
- <proxy-factory-config>
- <activation-config>
- <activation-config-property>
- <activation-config-property-name>providerAdapterJNDI</activation-config-property-name>
- <activation-config-property-value>DefaultJMSProvider</activation-config-property-value>
- </activation-config-property>
- <activation-config-property>
- <activation-config-property-name>minSession</activation-config-property-name>
- <activation-config-property-value>1</activation-config-property-value>
- </activation-config-property>
- <activation-config-property>
- <activation-config-property-name>maxSession</activation-config-property-name>
- <activation-config-property-value>15</activation-config-property-value>
- </activation-config-property>
- <activation-config-property>
- <activation-config-property-name>keepAlive</activation-config-property-name>
- <activation-config-property-value>60000</activation-config-property-value>
- </activation-config-property>
- <activation-config-property>
- <activation-config-property-name>maxMessages</activation-config-property-name>
- <activation-config-property-value>1</activation-config-property-value>
- </activation-config-property>
- <activation-config-property>
- <activation-config-property-name>reconnectInterval</activation-config-property-name>
- <activation-config-property-value>10</activation-config-property-value>
- </activation-config-property>
- <activation-config-property>
- <activation-config-property-name>useDLQ</activation-config-property-name>
- <activation-config-property-value>true</activation-config-property-value>
- </activation-config-property>
- <activation-config-property>
- <activation-config-property-name>DLQHandler</activation-config-property-name>
- <activation-config-property-value>org.jboss.resource.adapter.jms.inflow.dlq.GenericDLQHandler</activation-config-property-value>
- </activation-config-property>
- <activation-config-property>
- <activation-config-property-name>DLQJNDIName</activation-config-property-name>
- <activation-config-property-value>queue/DLQ</activation-config-property-value>
- </activation-config-property>
- <activation-config-property>
- <activation-config-property-name>DLQMaxResent</activation-config-property-name>
- <activation-config-property-value>10</activation-config-property-value>
- </activation-config-property>
- </activation-config>
- <endpoint-interceptors>
- <interceptor>org.jboss.proxy.ClientMethodInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.inflow.MessageEndpointInterceptor</interceptor>
- <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
- <interceptor>org.jboss.invocation.InvokerInterceptor</interceptor>
- </endpoint-interceptors>
- </proxy-factory-config>
- </invoker-proxy-binding>
- -->
-
- <invoker-proxy-binding>
- <name>singleton-message-driven-bean</name>
- <invoker-mbean>default</invoker-mbean>
- <proxy-factory>org.jboss.ejb.plugins.jms.JMSContainerInvoker</proxy-factory>
- <proxy-factory-config>
- <JMSProviderAdapterJNDI>DefaultJMSProvider</JMSProviderAdapterJNDI>
- <ServerSessionPoolFactoryJNDI>StdJMSPool</ServerSessionPoolFactoryJNDI>
- <CreateJBossMQDestination>true</CreateJBossMQDestination>
- <!-- WARN: Don't set this to zero until a bug in the pooled executor is fixed -->
- <MinimumSize>1</MinimumSize>
- <MaximumSize>1</MaximumSize>
- <KeepAliveMillis>30000</KeepAliveMillis>
- <MaxMessages>1</MaxMessages>
- <MDBConfig>
- <ReconnectIntervalSec>10</ReconnectIntervalSec>
- <DLQConfig>
- <DestinationQueue>queue/DLQ</DestinationQueue>
- <MaxTimesRedelivered>10</MaxTimesRedelivered>
- <TimeToLive>0</TimeToLive>
- </DLQConfig>
- </MDBConfig>
- </proxy-factory-config>
- </invoker-proxy-binding>
-
- <invoker-proxy-binding>
- <name>message-inflow-driven-bean</name>
- <invoker-mbean>default</invoker-mbean>
- <proxy-factory>org.jboss.ejb.plugins.inflow.JBossMessageEndpointFactory</proxy-factory>
- <proxy-factory-config>
- <endpoint-interceptors>
- <interceptor>org.jboss.proxy.ClientMethodInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.inflow.MessageEndpointInterceptor</interceptor>
- <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
- <interceptor>org.jboss.invocation.InvokerInterceptor</interceptor>
- </endpoint-interceptors>
- </proxy-factory-config>
- </invoker-proxy-binding>
-
- <invoker-proxy-binding>
- <name>iiop</name>
- <invoker-mbean>jboss:service=invoker,type=iiop</invoker-mbean>
- <proxy-factory>org.jboss.proxy.ejb.IORFactory</proxy-factory>
- <proxy-factory-config>
- <web-class-loader>org.jboss.iiop.WebCL</web-class-loader>
- <poa>per-servant</poa>
- <register-ejbs-in-jnp-context>true</register-ejbs-in-jnp-context>
- <jnp-context>iiop</jnp-context>
- <interface-repository-supported>false</interface-repository-supported>
- </proxy-factory-config>
- </invoker-proxy-binding>
-
- <invoker-proxy-binding>
- <name>jms-message-inflow-driven-bean</name>
- <invoker-mbean>default</invoker-mbean>
- <proxy-factory>org.jboss.ejb.plugins.inflow.JBossJMSMessageEndpointFactory</proxy-factory>
- <proxy-factory-config>
- <activation-config>
- <activation-config-property>
- <activation-config-property-name>providerAdapterJNDI</activation-config-property-name>
- <activation-config-property-value>DefaultJMSProvider</activation-config-property-value>
- </activation-config-property>
- <activation-config-property>
- <activation-config-property-name>minSession</activation-config-property-name>
- <activation-config-property-value>1</activation-config-property-value>
- </activation-config-property>
- <activation-config-property>
- <activation-config-property-name>maxSession</activation-config-property-name>
- <activation-config-property-value>15</activation-config-property-value>
- </activation-config-property>
- <activation-config-property>
- <activation-config-property-name>keepAlive</activation-config-property-name>
- <activation-config-property-value>60000</activation-config-property-value>
- </activation-config-property>
- <activation-config-property>
- <activation-config-property-name>maxMessages</activation-config-property-name>
- <activation-config-property-value>1</activation-config-property-value>
- </activation-config-property>
- <activation-config-property>
- <activation-config-property-name>reconnectInterval</activation-config-property-name>
- <activation-config-property-value>10</activation-config-property-value>
- </activation-config-property>
- <activation-config-property>
- <activation-config-property-name>useDLQ</activation-config-property-name>
- <activation-config-property-value>true</activation-config-property-value>
- </activation-config-property>
- <activation-config-property>
- <activation-config-property-name>DLQHandler</activation-config-property-name>
- <activation-config-property-value>org.jboss.resource.adapter.jms.inflow.dlq.GenericDLQHandler</activation-config-property-value>
- </activation-config-property>
- <activation-config-property>
- <activation-config-property-name>DLQJNDIName</activation-config-property-name>
- <activation-config-property-value>queue/DLQ</activation-config-property-value>
- </activation-config-property>
- <activation-config-property>
- <activation-config-property-name>DLQMaxResent</activation-config-property-name>
- <activation-config-property-value>10</activation-config-property-value>
- </activation-config-property>
- </activation-config>
- <endpoint-interceptors>
- <interceptor>org.jboss.proxy.ClientMethodInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.inflow.MessageEndpointInterceptor</interceptor>
- <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
- <interceptor>org.jboss.invocation.InvokerInterceptor</interceptor>
- </endpoint-interceptors>
- </proxy-factory-config>
- </invoker-proxy-binding>
- </invoker-proxy-bindings>
-
- <container-configurations>
-
- <container-configuration>
- <container-name>Standard CMP 2.x EntityBean</container-name>
- <call-logging>false</call-logging>
- <invoker-proxy-binding-name>entity-unified-invoker</invoker-proxy-binding-name>
- <sync-on-commit-only>false</sync-on-commit-only>
- <insert-after-ejb-post-create>false</insert-after-ejb-post-create>
- <call-ejb-store-on-clean>true</call-ejb-store-on-clean>
- <container-interceptors>
- <interceptor>org.jboss.ejb.plugins.ProxyFactoryFinderInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.LogInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.SecurityInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.TxInterceptorCMT</interceptor>
- <interceptor>org.jboss.ejb.plugins.CallValidationInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.EntityCreationInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.EntityLockInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.EntityInstanceInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.EntityReentranceInterceptor</interceptor>
- <interceptor>org.jboss.resource.connectionmanager.CachedConnectionInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.EntitySynchronizationInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.cmp.jdbc.JDBCRelationInterceptor</interceptor>
- </container-interceptors>
- <instance-pool>org.jboss.ejb.plugins.EntityInstancePool</instance-pool>
- <instance-cache>org.jboss.ejb.plugins.InvalidableEntityInstanceCache</instance-cache>
- <persistence-manager>org.jboss.ejb.plugins.cmp.jdbc.JDBCStoreManager</persistence-manager>
- <locking-policy>org.jboss.ejb.plugins.lock.QueuedPessimisticEJBLock</locking-policy>
- <container-cache-conf>
- <cache-policy>org.jboss.ejb.plugins.LRUEnterpriseContextCachePolicy</cache-policy>
- <cache-policy-conf>
- <min-capacity>50</min-capacity>
- <max-capacity>1000000</max-capacity>
- <overager-period>300</overager-period>
- <max-bean-age>600</max-bean-age>
- <resizer-period>400</resizer-period>
- <max-cache-miss-period>60</max-cache-miss-period>
- <min-cache-miss-period>1</min-cache-miss-period>
- <cache-load-factor>0.75</cache-load-factor>
- </cache-policy-conf>
- </container-cache-conf>
- <container-pool-conf>
- <MaximumSize>100</MaximumSize>
- </container-pool-conf>
- <commit-option>B</commit-option>
- </container-configuration>
-
- <container-configuration>
- <!--
- | This is like standard IPT but with global (cross-transactional) row cache behind,
- | i.e. no locking in EJB layer + global persistence data cache
- -->
- <container-name>cmp2.x jdbc2 pm</container-name>
- <call-logging>false</call-logging>
- <invoker-proxy-binding-name>entity-unified-invoker</invoker-proxy-binding-name>
- <sync-on-commit-only>false</sync-on-commit-only>
- <insert-after-ejb-post-create>true</insert-after-ejb-post-create>
- <call-ejb-store-on-clean>true</call-ejb-store-on-clean>
- <container-interceptors>
- <interceptor>org.jboss.ejb.plugins.ProxyFactoryFinderInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.LogInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.SecurityInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.TxInterceptorCMT</interceptor>
- <interceptor>org.jboss.ejb.plugins.EntityCreationInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.EntityInstanceInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.EntityReentranceInterceptor</interceptor>
- <interceptor>org.jboss.resource.connectionmanager.CachedConnectionInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.EntitySynchronizationInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.cmp.jdbc2.RelationInterceptor</interceptor>
- </container-interceptors>
- <instance-pool>org.jboss.ejb.plugins.EntityInstancePool</instance-pool>
- <instance-cache>org.jboss.ejb.plugins.PerTxEntityInstanceCache</instance-cache>
- <persistence-manager>org.jboss.ejb.plugins.cmp.jdbc2.JDBCStoreManager2</persistence-manager>
- <locking-policy>org.jboss.ejb.plugins.lock.NoLock</locking-policy>
- <container-cache-conf>
- <cache-policy-conf>
- <min-capacity>500</min-capacity>
- <max-capacity>10000</max-capacity>
- </cache-policy-conf>
- <cache-policy-conf-other>
- <partitions>10</partitions>
- <!-- uncomment to use JDBC java.sql.Statement.executeBatch()
- <batch-commit-strategy/>
- -->
- </cache-policy-conf-other>
- </container-cache-conf>
- <container-pool-conf>
- <MaximumSize>100</MaximumSize>
- </container-pool-conf>
- <commit-option>C</commit-option> <!-- don't change, irrelevant, use container-cache-conf -->
- </container-configuration>
-
- <container-configuration>
- <container-name>Clustered CMP 2.x EntityBean</container-name>
- <call-logging>false</call-logging>
- <invoker-proxy-binding-name>clustered-entity-rmi-invoker</invoker-proxy-binding-name>
- <sync-on-commit-only>false</sync-on-commit-only>
- <insert-after-ejb-post-create>false</insert-after-ejb-post-create>
- <container-interceptors>
- <interceptor>org.jboss.ejb.plugins.ProxyFactoryFinderInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.CleanShutdownInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.LogInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.SecurityInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.TxInterceptorCMT</interceptor>
- <interceptor>org.jboss.ejb.plugins.CallValidationInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.EntityCreationInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.EntityLockInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.EntityInstanceInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.EntityReentranceInterceptor</interceptor>
- <interceptor>org.jboss.resource.connectionmanager.CachedConnectionInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.EntitySynchronizationInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.cmp.jdbc.JDBCRelationInterceptor</interceptor>
- </container-interceptors>
- <instance-pool>org.jboss.ejb.plugins.EntityInstancePool</instance-pool>
- <instance-cache>org.jboss.ejb.plugins.EntityInstanceCache</instance-cache>
- <persistence-manager>org.jboss.ejb.plugins.cmp.jdbc.JDBCStoreManager</persistence-manager>
- <locking-policy>org.jboss.ejb.plugins.lock.QueuedPessimisticEJBLock</locking-policy>
- <container-cache-conf>
- <cache-policy>org.jboss.ejb.plugins.LRUEnterpriseContextCachePolicy</cache-policy>
- <cache-policy-conf>
- <min-capacity>50</min-capacity>
- <max-capacity>1000000</max-capacity>
- <overager-period>300</overager-period>
- <max-bean-age>600</max-bean-age>
- <resizer-period>400</resizer-period>
- <max-cache-miss-period>60</max-cache-miss-period>
- <min-cache-miss-period>1</min-cache-miss-period>
- <cache-load-factor>0.75</cache-load-factor>
- </cache-policy-conf>
- </container-cache-conf>
- <container-pool-conf>
- <MaximumSize>100</MaximumSize>
- </container-pool-conf>
- <commit-option>B</commit-option>
- <cluster-config>
- <partition-name>${jboss.partition.name:DefaultPartition}</partition-name>
- </cluster-config>
- </container-configuration>
-
- <container-configuration>
- <container-name>Standard CMP 2.x EntityBean with cache invalidation</container-name>
- <call-logging>false</call-logging>
- <invoker-proxy-binding-name>entity-unified-invoker</invoker-proxy-binding-name>
- <container-interceptors>
- <interceptor>org.jboss.ejb.plugins.ProxyFactoryFinderInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.LogInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.SecurityInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.TxInterceptorCMT</interceptor>
- <interceptor>org.jboss.ejb.plugins.CallValidationInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.EntityCreationInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.EntityLockInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.EntityInstanceInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.EntityReentranceInterceptor</interceptor>
- <interceptor>org.jboss.resource.connectionmanager.CachedConnectionInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.EntitySynchronizationInterceptor</interceptor>
- <interceptor>org.jboss.cache.invalidation.triggers.EntityBeanCacheBatchInvalidatorInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.cmp.jdbc.JDBCRelationInterceptor</interceptor>
- </container-interceptors>
- <instance-pool>org.jboss.ejb.plugins.EntityInstancePool</instance-pool>
- <instance-cache>org.jboss.ejb.plugins.InvalidableEntityInstanceCache</instance-cache>
- <persistence-manager>org.jboss.ejb.plugins.cmp.jdbc.JDBCStoreManager</persistence-manager>
- <locking-policy>org.jboss.ejb.plugins.lock.QueuedPessimisticEJBLock</locking-policy>
- <container-cache-conf>
- <cache-policy>org.jboss.ejb.plugins.LRUEnterpriseContextCachePolicy</cache-policy>
- <cache-policy-conf>
- <min-capacity>50</min-capacity>
- <max-capacity>1000000</max-capacity>
- <overager-period>300</overager-period>
- <max-bean-age>600</max-bean-age>
- <resizer-period>400</resizer-period>
- <max-cache-miss-period>60</max-cache-miss-period>
- <min-cache-miss-period>1</min-cache-miss-period>
- <cache-load-factor>0.75</cache-load-factor>
- </cache-policy-conf>
- </container-cache-conf>
- <container-pool-conf>
- <MaximumSize>100</MaximumSize>
- </container-pool-conf>
- <commit-option>A</commit-option>
- </container-configuration>
-
- <container-configuration>
- <container-name>Instance Per Transaction CMP 2.x EntityBean</container-name>
- <call-logging>false</call-logging>
- <invoker-proxy-binding-name>entity-unified-invoker</invoker-proxy-binding-name>
- <sync-on-commit-only>false</sync-on-commit-only>
- <insert-after-ejb-post-create>false</insert-after-ejb-post-create>
- <container-interceptors>
- <interceptor>org.jboss.ejb.plugins.ProxyFactoryFinderInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.LogInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.SecurityInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.TxInterceptorCMT</interceptor>
- <interceptor>org.jboss.ejb.plugins.CallValidationInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.EntityCreationInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.EntityLockInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.EntityInstanceInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.EntityReentranceInterceptor</interceptor>
- <interceptor>org.jboss.resource.connectionmanager.CachedConnectionInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.EntitySynchronizationInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.cmp.jdbc.JDBCRelationInterceptor</interceptor>
- </container-interceptors>
- <instance-pool>org.jboss.ejb.plugins.EntityInstancePool</instance-pool>
- <instance-cache>org.jboss.ejb.plugins.PerTxEntityInstanceCache</instance-cache>
- <persistence-manager>org.jboss.ejb.plugins.cmp.jdbc.JDBCStoreManager</persistence-manager>
- <locking-policy>org.jboss.ejb.plugins.lock.NoLock</locking-policy>
- <container-cache-conf/>
- <container-pool-conf>
- <MaximumSize>100</MaximumSize>
- </container-pool-conf>
- <commit-option>C</commit-option>
- </container-configuration>
-
- <container-configuration>
- <container-name>Standard CMP EntityBean</container-name>
- <call-logging>false</call-logging>
- <invoker-proxy-binding-name>entity-unified-invoker</invoker-proxy-binding-name>
- <sync-on-commit-only>false</sync-on-commit-only>
- <insert-after-ejb-post-create>false</insert-after-ejb-post-create>
- <container-interceptors>
- <interceptor>org.jboss.ejb.plugins.ProxyFactoryFinderInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.LogInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.SecurityInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.TxInterceptorCMT</interceptor>
- <interceptor>org.jboss.ejb.plugins.CallValidationInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.EntityCreationInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.EntityLockInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.EntityInstanceInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.EntityReentranceInterceptor</interceptor>
- <interceptor>org.jboss.resource.connectionmanager.CachedConnectionInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.EntitySynchronizationInterceptor</interceptor>
- </container-interceptors>
- <instance-pool>org.jboss.ejb.plugins.EntityInstancePool</instance-pool>
- <instance-cache>org.jboss.ejb.plugins.EntityInstanceCache</instance-cache>
- <persistence-manager>org.jboss.ejb.plugins.cmp.jdbc.JDBCStoreManager</persistence-manager>
- <locking-policy>org.jboss.ejb.plugins.lock.QueuedPessimisticEJBLock</locking-policy>
- <container-cache-conf>
- <cache-policy>org.jboss.ejb.plugins.LRUEnterpriseContextCachePolicy</cache-policy>
- <cache-policy-conf>
- <min-capacity>50</min-capacity>
- <max-capacity>1000000</max-capacity>
- <overager-period>300</overager-period>
- <max-bean-age>600</max-bean-age>
- <resizer-period>400</resizer-period>
- <max-cache-miss-period>60</max-cache-miss-period>
- <min-cache-miss-period>1</min-cache-miss-period>
- <cache-load-factor>0.75</cache-load-factor>
- </cache-policy-conf>
- </container-cache-conf>
- <container-pool-conf>
- <MaximumSize>100</MaximumSize>
- </container-pool-conf>
- <commit-option>A</commit-option>
- </container-configuration>
-
- <container-configuration>
- <container-name>Clustered CMP EntityBean</container-name>
- <call-logging>false</call-logging>
- <invoker-proxy-binding-name>clustered-entity-rmi-invoker</invoker-proxy-binding-name>
- <sync-on-commit-only>false</sync-on-commit-only>
- <insert-after-ejb-post-create>false</insert-after-ejb-post-create>
- <container-interceptors>
- <interceptor>org.jboss.ejb.plugins.ProxyFactoryFinderInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.CleanShutdownInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.LogInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.SecurityInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.TxInterceptorCMT</interceptor>
- <interceptor>org.jboss.ejb.plugins.CallValidationInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.EntityCreationInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.EntityLockInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.EntityInstanceInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.EntityReentranceInterceptor</interceptor>
- <interceptor>org.jboss.resource.connectionmanager.CachedConnectionInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.EntitySynchronizationInterceptor</interceptor>
- </container-interceptors>
- <instance-pool>org.jboss.ejb.plugins.EntityInstancePool</instance-pool>
- <instance-cache>org.jboss.ejb.plugins.EntityInstanceCache</instance-cache>
- <persistence-manager>org.jboss.ejb.plugins.cmp.jdbc.JDBCStoreManager</persistence-manager>
- <locking-policy>org.jboss.ejb.plugins.lock.QueuedPessimisticEJBLock</locking-policy>
- <container-cache-conf>
- <cache-policy>org.jboss.ejb.plugins.LRUEnterpriseContextCachePolicy</cache-policy>
- <cache-policy-conf>
- <min-capacity>50</min-capacity>
- <max-capacity>1000000</max-capacity>
- <overager-period>300</overager-period>
- <max-bean-age>600</max-bean-age>
- <resizer-period>400</resizer-period>
- <max-cache-miss-period>60</max-cache-miss-period>
- <min-cache-miss-period>1</min-cache-miss-period>
- <cache-load-factor>0.75</cache-load-factor>
- </cache-policy-conf>
- </container-cache-conf>
- <container-pool-conf>
- <MaximumSize>100</MaximumSize>
- </container-pool-conf>
- <commit-option>A</commit-option>
- <cluster-config>
- <partition-name>${jboss.partition.name:DefaultPartition}</partition-name>
- </cluster-config>
- </container-configuration>
-
- <container-configuration>
- <container-name>Instance Per Transaction CMP EntityBean</container-name>
- <call-logging>false</call-logging>
- <invoker-proxy-binding-name>entity-unified-invoker</invoker-proxy-binding-name>
- <sync-on-commit-only>false</sync-on-commit-only>
- <insert-after-ejb-post-create>false</insert-after-ejb-post-create>
- <container-interceptors>
- <interceptor>org.jboss.ejb.plugins.ProxyFactoryFinderInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.LogInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.SecurityInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.TxInterceptorCMT</interceptor>
- <interceptor>org.jboss.ejb.plugins.CallValidationInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.EntityCreationInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.EntityLockInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.EntityInstanceInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.EntityReentranceInterceptor</interceptor>
- <interceptor>org.jboss.resource.connectionmanager.CachedConnectionInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.EntitySynchronizationInterceptor</interceptor>
- </container-interceptors>
- <instance-pool>org.jboss.ejb.plugins.EntityInstancePool</instance-pool>
- <instance-cache>org.jboss.ejb.plugins.PerTxEntityInstanceCache</instance-cache>
- <persistence-manager>org.jboss.ejb.plugins.cmp.jdbc.JDBCStoreManager</persistence-manager>
- <locking-policy>org.jboss.ejb.plugins.lock.NoLock</locking-policy>
- <container-cache-conf/>
- <container-pool-conf>
- <MaximumSize>100</MaximumSize>
- </container-pool-conf>
- <commit-option>C</commit-option>
- </container-configuration>
-
- <container-configuration>
- <container-name>Standard Stateless SessionBean</container-name>
- <call-logging>false</call-logging>
- <invoker-proxy-binding-name>stateless-unified-invoker</invoker-proxy-binding-name>
- <container-interceptors>
- <interceptor>org.jboss.ejb.plugins.ProxyFactoryFinderInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.LogInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.SecurityInterceptor</interceptor>
- <!-- CMT -->
- <interceptor transaction="Container">org.jboss.ejb.plugins.TxInterceptorCMT</interceptor>
- <interceptor transaction="Container">org.jboss.ejb.plugins.CallValidationInterceptor</interceptor>
- <interceptor transaction="Container">org.jboss.ws.server.ServiceEndpointInterceptor</interceptor>
- <interceptor transaction="Container">org.jboss.ejb.plugins.StatelessSessionInstanceInterceptor</interceptor>
- <!-- BMT -->
- <interceptor transaction="Bean">org.jboss.ejb.plugins.StatelessSessionInstanceInterceptor</interceptor>
- <interceptor transaction="Bean">org.jboss.ejb.plugins.TxInterceptorBMT</interceptor>
- <interceptor transaction="Bean">org.jboss.ejb.plugins.CallValidationInterceptor</interceptor>
- <interceptor transaction="Bean">org.jboss.ws.server.ServiceEndpointInterceptor</interceptor>
- <interceptor>org.jboss.resource.connectionmanager.CachedConnectionInterceptor</interceptor>
- </container-interceptors>
- <instance-pool>org.jboss.ejb.plugins.StatelessSessionInstancePool</instance-pool>
- <instance-cache></instance-cache>
- <persistence-manager></persistence-manager>
- <container-pool-conf>
- <MaximumSize>100</MaximumSize>
- </container-pool-conf>
- </container-configuration>
-
- <container-configuration>
- <container-name>Clustered Stateless SessionBean</container-name>
- <call-logging>false</call-logging>
- <invoker-proxy-binding-name>clustered-stateless-rmi-invoker</invoker-proxy-binding-name>
- <container-interceptors>
- <interceptor>org.jboss.ejb.plugins.ProxyFactoryFinderInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.CleanShutdownInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.LogInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.SecurityInterceptor</interceptor>
- <!-- CMT -->
- <interceptor transaction="Container">org.jboss.ejb.plugins.TxInterceptorCMT</interceptor>
- <interceptor transaction="Container">org.jboss.ejb.plugins.CallValidationInterceptor</interceptor>
- <interceptor transaction="Container">org.jboss.ejb.plugins.ServiceEndpointInterceptor</interceptor>
- <interceptor transaction="Container">org.jboss.ejb.plugins.StatelessSessionInstanceInterceptor</interceptor>
- <!-- BMT -->
- <interceptor transaction="Bean">org.jboss.ejb.plugins.StatelessSessionInstanceInterceptor</interceptor>
- <interceptor transaction="Bean">org.jboss.ejb.plugins.TxInterceptorBMT</interceptor>
- <interceptor transaction="Bean">org.jboss.ejb.plugins.CallValidationInterceptor</interceptor>
- <interceptor transaction="Bean">org.jboss.ejb.plugins.ServiceEndpointInterceptor</interceptor>
- <interceptor>org.jboss.resource.connectionmanager.CachedConnectionInterceptor</interceptor>
- </container-interceptors>
- <instance-pool>org.jboss.ejb.plugins.StatelessSessionInstancePool</instance-pool>
- <instance-cache></instance-cache>
- <persistence-manager></persistence-manager>
- <container-pool-conf>
- <MaximumSize>100</MaximumSize>
- </container-pool-conf>
- <cluster-config>
- <partition-name>${jboss.partition.name:DefaultPartition}</partition-name>
- </cluster-config>
- </container-configuration>
-
-
- <container-configuration>
- <container-name>Standard Stateful SessionBean</container-name>
- <call-logging>false</call-logging>
- <invoker-proxy-binding-name>stateful-unified-invoker</invoker-proxy-binding-name>
- <container-interceptors>
- <interceptor>org.jboss.ejb.plugins.ProxyFactoryFinderInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.LogInterceptor</interceptor>
- <!-- CMT -->
- <interceptor transaction="Container">org.jboss.ejb.plugins.TxInterceptorCMT</interceptor>
- <interceptor transaction="Container">org.jboss.ejb.plugins.CallValidationInterceptor</interceptor>
- <interceptor transaction="Container">org.jboss.ejb.plugins.StatefulSessionInstanceInterceptor</interceptor>
- <!-- BMT -->
- <interceptor transaction="Bean">org.jboss.ejb.plugins.StatefulSessionInstanceInterceptor</interceptor>
- <interceptor transaction="Bean">org.jboss.ejb.plugins.TxInterceptorBMT</interceptor>
- <interceptor transaction="Bean">org.jboss.ejb.plugins.CallValidationInterceptor</interceptor>
- <interceptor>org.jboss.resource.connectionmanager.CachedConnectionInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.SecurityInterceptor</interceptor>
- </container-interceptors>
- <instance-cache>org.jboss.ejb.plugins.StatefulSessionInstanceCache</instance-cache>
- <persistence-manager>org.jboss.ejb.plugins.StatefulSessionFilePersistenceManager</persistence-manager>
- <container-cache-conf>
- <cache-policy>org.jboss.ejb.plugins.LRUStatefulContextCachePolicy</cache-policy>
- <cache-policy-conf>
- <min-capacity>50</min-capacity>
- <max-capacity>1000000</max-capacity>
- <remover-period>1800</remover-period>
- <max-bean-life>1800</max-bean-life>
- <overager-period>300</overager-period>
- <max-bean-age>600</max-bean-age>
- <resizer-period>400</resizer-period>
- <max-cache-miss-period>60</max-cache-miss-period>
- <min-cache-miss-period>1</min-cache-miss-period>
- <cache-load-factor>0.75</cache-load-factor>
- </cache-policy-conf>
- </container-cache-conf>
- <container-pool-conf>
- <MaximumSize>100</MaximumSize>
- </container-pool-conf>
- </container-configuration>
-
- <container-configuration>
- <container-name>Clustered Stateful SessionBean</container-name>
- <call-logging>false</call-logging>
- <invoker-proxy-binding-name>clustered-stateful-rmi-invoker</invoker-proxy-binding-name>
- <container-interceptors>
- <interceptor>org.jboss.ejb.plugins.ProxyFactoryFinderInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.CleanShutdownInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.LogInterceptor</interceptor>
- <!-- CMT -->
- <interceptor transaction="Container">org.jboss.ejb.plugins.TxInterceptorCMT</interceptor>
- <interceptor transaction="Container">org.jboss.ejb.plugins.CallValidationInterceptor</interceptor>
- <interceptor transaction="Container">org.jboss.ejb.plugins.StatefulSessionInstanceInterceptor</interceptor>
- <!-- BMT -->
- <interceptor transaction="Bean">org.jboss.ejb.plugins.StatefulSessionInstanceInterceptor</interceptor>
- <interceptor transaction="Bean">org.jboss.ejb.plugins.TxInterceptorBMT</interceptor>
- <interceptor transaction="Bean">org.jboss.ejb.plugins.CallValidationInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.SecurityInterceptor</interceptor>
- <interceptor>org.jboss.resource.connectionmanager.CachedConnectionInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.StatefulHASessionSynchronisationInterceptor</interceptor>
- </container-interceptors>
- <instance-cache>org.jboss.ejb.plugins.StatefulHASessionInstanceCache</instance-cache>
- <persistence-manager>org.jboss.ejb.plugins.StatefulHASessionPersistenceManager</persistence-manager>
- <container-cache-conf>
- <cache-policy>org.jboss.ejb.plugins.LRUStatefulContextCachePolicy</cache-policy>
- <cache-policy-conf>
- <min-capacity>50</min-capacity>
- <max-capacity>1000000</max-capacity>
- <remover-period>1800</remover-period>
- <max-bean-life>1800</max-bean-life>
- <overager-period>300</overager-period>
- <max-bean-age>600</max-bean-age>
- <resizer-period>400</resizer-period>
- <max-cache-miss-period>60</max-cache-miss-period>
- <min-cache-miss-period>1</min-cache-miss-period>
- <cache-load-factor>0.75</cache-load-factor>
- </cache-policy-conf>
- </container-cache-conf>
- <container-pool-conf>
- <MaximumSize>100</MaximumSize>
- </container-pool-conf>
- <cluster-config>
- <partition-name>${jboss.partition.name:DefaultPartition}</partition-name>
- </cluster-config>
- </container-configuration>
-
- <container-configuration>
- <container-name>Standard BMP EntityBean</container-name>
- <call-logging>false</call-logging>
- <invoker-proxy-binding-name>entity-unified-invoker</invoker-proxy-binding-name>
- <sync-on-commit-only>false</sync-on-commit-only>
- <insert-after-ejb-post-create>false</insert-after-ejb-post-create>
- <container-interceptors>
- <interceptor>org.jboss.ejb.plugins.ProxyFactoryFinderInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.LogInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.SecurityInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.TxInterceptorCMT</interceptor>
- <interceptor>org.jboss.ejb.plugins.CallValidationInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.EntityCreationInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.EntityLockInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.EntityInstanceInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.EntityReentranceInterceptor</interceptor>
- <interceptor>org.jboss.resource.connectionmanager.CachedConnectionInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.EntitySynchronizationInterceptor</interceptor>
- </container-interceptors>
- <instance-pool>org.jboss.ejb.plugins.EntityInstancePool</instance-pool>
- <instance-cache>org.jboss.ejb.plugins.EntityInstanceCache</instance-cache>
- <persistence-manager>org.jboss.ejb.plugins.BMPPersistenceManager</persistence-manager>
- <locking-policy>org.jboss.ejb.plugins.lock.QueuedPessimisticEJBLock</locking-policy>
- <container-cache-conf>
- <cache-policy>org.jboss.ejb.plugins.LRUEnterpriseContextCachePolicy</cache-policy>
- <cache-policy-conf>
- <min-capacity>50</min-capacity>
- <max-capacity>1000000</max-capacity>
- <overager-period>300</overager-period>
- <max-bean-age>600</max-bean-age>
- <resizer-period>400</resizer-period>
- <max-cache-miss-period>60</max-cache-miss-period>
- <min-cache-miss-period>1</min-cache-miss-period>
- <cache-load-factor>0.75</cache-load-factor>
- </cache-policy-conf>
- </container-cache-conf>
- <container-pool-conf>
- <MaximumSize>100</MaximumSize>
- </container-pool-conf>
- <commit-option>A</commit-option>
- </container-configuration>
-
- <container-configuration>
- <container-name>Clustered BMP EntityBean</container-name>
- <call-logging>false</call-logging>
- <invoker-proxy-binding-name>clustered-entity-rmi-invoker</invoker-proxy-binding-name>
- <sync-on-commit-only>false</sync-on-commit-only>
- <insert-after-ejb-post-create>false</insert-after-ejb-post-create>
- <container-interceptors>
- <interceptor>org.jboss.ejb.plugins.ProxyFactoryFinderInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.CleanShutdownInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.LogInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.SecurityInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.TxInterceptorCMT</interceptor>
- <interceptor>org.jboss.ejb.plugins.CallValidationInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.EntityCreationInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.EntityLockInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.EntityInstanceInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.EntityReentranceInterceptor</interceptor>
- <interceptor>org.jboss.resource.connectionmanager.CachedConnectionInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.EntitySynchronizationInterceptor</interceptor>
- </container-interceptors>
- <instance-pool>org.jboss.ejb.plugins.EntityInstancePool</instance-pool>
- <instance-cache>org.jboss.ejb.plugins.EntityInstanceCache</instance-cache>
- <persistence-manager>org.jboss.ejb.plugins.BMPPersistenceManager</persistence-manager>
- <locking-policy>org.jboss.ejb.plugins.lock.QueuedPessimisticEJBLock</locking-policy>
- <container-cache-conf>
- <cache-policy>org.jboss.ejb.plugins.LRUEnterpriseContextCachePolicy</cache-policy>
- <cache-policy-conf>
- <min-capacity>50</min-capacity>
- <max-capacity>1000000</max-capacity>
- <overager-period>300</overager-period>
- <max-bean-age>600</max-bean-age>
- <resizer-period>400</resizer-period>
- <max-cache-miss-period>60</max-cache-miss-period>
- <min-cache-miss-period>1</min-cache-miss-period>
- <cache-load-factor>0.75</cache-load-factor>
- </cache-policy-conf>
- </container-cache-conf>
- <container-pool-conf>
- <MaximumSize>100</MaximumSize>
- </container-pool-conf>
- <commit-option>A</commit-option>
- <cluster-config>
- <partition-name>${jboss.partition.name:DefaultPartition}</partition-name>
- </cluster-config>
- </container-configuration>
-
- <container-configuration>
- <container-name>Instance Per Transaction BMP EntityBean</container-name>
- <call-logging>false</call-logging>
- <invoker-proxy-binding-name>entity-unified-invoker</invoker-proxy-binding-name>
- <sync-on-commit-only>false</sync-on-commit-only>
- <insert-after-ejb-post-create>false</insert-after-ejb-post-create>
- <container-interceptors>
- <interceptor>org.jboss.ejb.plugins.ProxyFactoryFinderInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.LogInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.SecurityInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.TxInterceptorCMT</interceptor>
- <interceptor>org.jboss.ejb.plugins.CallValidationInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.EntityCreationInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.EntityLockInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.EntityInstanceInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.EntityReentranceInterceptor</interceptor>
- <interceptor>org.jboss.resource.connectionmanager.CachedConnectionInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.EntitySynchronizationInterceptor</interceptor>
- </container-interceptors>
- <instance-pool>org.jboss.ejb.plugins.EntityInstancePool</instance-pool>
- <instance-cache>org.jboss.ejb.plugins.PerTxEntityInstanceCache</instance-cache>
- <persistence-manager>org.jboss.ejb.plugins.BMPPersistenceManager</persistence-manager>
- <locking-policy>org.jboss.ejb.plugins.lock.NoLock</locking-policy>
- <container-cache-conf/>
- <container-pool-conf>
- <MaximumSize>100</MaximumSize>
- </container-pool-conf>
- <commit-option>C</commit-option>
- </container-configuration>
-
- <container-configuration>
- <container-name>Standard Message Driven Bean</container-name>
- <call-logging>false</call-logging>
- <invoker-proxy-binding-name>message-driven-bean</invoker-proxy-binding-name>
- <container-interceptors>
- <interceptor>org.jboss.ejb.plugins.ProxyFactoryFinderInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.LogInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.RunAsSecurityInterceptor</interceptor>
- <!-- CMT -->
- <interceptor transaction="Container">org.jboss.ejb.plugins.TxInterceptorCMT</interceptor>
- <interceptor transaction="Container">org.jboss.ejb.plugins.CallValidationInterceptor</interceptor>
- <interceptor transaction="Container">org.jboss.ejb.plugins.MessageDrivenInstanceInterceptor</interceptor>
- <!-- BMT -->
- <interceptor transaction="Bean">org.jboss.ejb.plugins.MessageDrivenInstanceInterceptor</interceptor>
- <interceptor transaction="Bean">org.jboss.ejb.plugins.MessageDrivenTxInterceptorBMT</interceptor>
- <interceptor transaction="Bean">org.jboss.ejb.plugins.CallValidationInterceptor</interceptor>
- <interceptor>org.jboss.resource.connectionmanager.CachedConnectionInterceptor</interceptor>
- </container-interceptors>
- <instance-pool>org.jboss.ejb.plugins.MessageDrivenInstancePool</instance-pool>
- <instance-cache></instance-cache>
- <persistence-manager></persistence-manager>
- <container-pool-conf>
- <MaximumSize>100</MaximumSize>
- </container-pool-conf>
- </container-configuration>
-
- <container-configuration>
- <container-name>Singleton Message Driven Bean</container-name>
- <call-logging>false</call-logging>
- <invoker-proxy-binding-name>singleton-message-driven-bean</invoker-proxy-binding-name>
- <container-interceptors>
- <interceptor>org.jboss.ejb.plugins.ProxyFactoryFinderInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.LogInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.RunAsSecurityInterceptor</interceptor>
- <!-- CMT -->
- <interceptor transaction="Container">org.jboss.ejb.plugins.TxInterceptorCMT</interceptor>
- <interceptor transaction="Container">org.jboss.ejb.plugins.CallValidationInterceptor</interceptor>
- <interceptor transaction="Container">org.jboss.ejb.plugins.MessageDrivenInstanceInterceptor</interceptor>
- <!-- BMT -->
- <interceptor transaction="Bean">org.jboss.ejb.plugins.MessageDrivenInstanceInterceptor</interceptor>
- <interceptor transaction="Bean">org.jboss.ejb.plugins.MessageDrivenTxInterceptorBMT</interceptor>
- <interceptor transaction="Bean">org.jboss.ejb.plugins.CallValidationInterceptor</interceptor>
- <interceptor>org.jboss.resource.connectionmanager.CachedConnectionInterceptor</interceptor>
- </container-interceptors>
- <instance-pool>org.jboss.ejb.plugins.MessageDrivenInstancePool</instance-pool>
- <instance-cache></instance-cache>
- <persistence-manager></persistence-manager>
- <container-pool-conf>
- <MaximumSize>100</MaximumSize>
- </container-pool-conf>
- </container-configuration>
-
- <container-configuration>
- <container-name>Standard Message Inflow Driven Bean</container-name>
- <call-logging>false</call-logging>
- <invoker-proxy-binding-name>message-inflow-driven-bean</invoker-proxy-binding-name>
- <container-interceptors>
- <interceptor>org.jboss.ejb.plugins.ProxyFactoryFinderInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.LogInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.RunAsSecurityInterceptor</interceptor>
- <!-- CMT -->
- <interceptor transaction="Container">org.jboss.ejb.plugins.TxInterceptorCMT</interceptor>
- <interceptor transaction="Container">org.jboss.ejb.plugins.CallValidationInterceptor</interceptor>
- <interceptor transaction="Container">org.jboss.ejb.plugins.MessageDrivenInstanceInterceptor</interceptor>
- <!-- BMT -->
- <interceptor transaction="Bean">org.jboss.ejb.plugins.MessageDrivenInstanceInterceptor</interceptor>
- <interceptor transaction="Bean">org.jboss.ejb.plugins.MessageDrivenTxInterceptorBMT</interceptor>
- <interceptor transaction="Bean">org.jboss.ejb.plugins.CallValidationInterceptor</interceptor>
- <interceptor>org.jboss.resource.connectionmanager.CachedConnectionInterceptor</interceptor>
- </container-interceptors>
- <instance-pool>org.jboss.ejb.plugins.MessageDrivenInstancePool</instance-pool>
- <instance-cache></instance-cache>
- <persistence-manager></persistence-manager>
- <container-pool-conf>
- <MaximumSize>100</MaximumSize>
- </container-pool-conf>
- </container-configuration>
-
- </container-configurations>
-
-</jboss>
Deleted: trunk/src/etc/server/default/config/users.properties
===================================================================
--- trunk/src/etc/server/default/config/users.properties 2007-05-12 14:43:53 UTC (rev 2670)
+++ trunk/src/etc/server/default/config/users.properties 2007-05-14 15:51:13 UTC (rev 2671)
@@ -1,4 +0,0 @@
-#
-# user=password
-#
-guest=guest
Modified: trunk/src/etc/server/default/deploy/jboss-service.xml
===================================================================
--- trunk/src/etc/server/default/deploy/jboss-service.xml 2007-05-12 14:43:53 UTC (rev 2670)
+++ trunk/src/etc/server/default/deploy/jboss-service.xml 2007-05-14 15:51:13 UTC (rev 2671)
@@ -1,15 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Scoped Messaging SAR deployment descriptor. This deployment descriptor is used only for scoped
- deployments.
+ Bootstrap - starts the messaging server peer
$Id$
-->
<server>
-
<mbean code="org.jboss.jms.server.Bootstrap"
name="jboss.messaging:service=Bootstrap"
xmbean-dd="xmdesc/Bootstrap-xmbean.xml">
Modified: trunk/src/etc/server/default/deploy/remoting-service.xml
===================================================================
--- trunk/src/etc/server/default/deploy/remoting-service.xml 2007-05-12 14:43:53 UTC (rev 2670)
+++ trunk/src/etc/server/default/deploy/remoting-service.xml 2007-05-14 15:51:13 UTC (rev 2671)
@@ -8,6 +8,9 @@
<server>
+ <!-- Standard bisocket connector - the bisocket transport only opens connection from client->server
+ so can be used with firewalls where only outgoing connections are allowed.
+ For examples of HTTP and SSL transports see docs/examples -->
<mbean code="org.jboss.remoting.transport.Connector"
name="jboss.messaging:service=Connector,transport=bisocket"
display-name="Bisocket transport Connector">
@@ -16,7 +19,6 @@
<invoker transport="bisocket">
<attribute name="marshaller" isParam="true">org.jboss.jms.server.remoting.JMSWireFormat</attribute>
<attribute name="unmarshaller" isParam="true">org.jboss.jms.server.remoting.JMSWireFormat</attribute>
- <!-- Serialization type must be jms - do not change! -->
<attribute name="serializationtype" isParam="true">jms</attribute>
<attribute name="dataType" isParam="true">jms</attribute>
<attribute name="socket.check_connection" isParam="true">false</attribute>
@@ -40,39 +42,9 @@
<depends>jboss.messaging:service=NetworkRegistry</depends>
</mbean>
- <!--
- HTTP Connector example
- -->
- <!--
- <mbean code="org.jboss.remoting.transport.Connector"
- name="jboss.messaging:service=Connector,transport=http"
- display-name="HTTP transport Connector">
- <attribute name="Configuration">
- <config>
- <invoker transport="http">
- <attribute name="marshaller" isParam="true">org.jboss.jms.server.remoting.JMSWireFormat</attribute>
- <attribute name="unmarshaller" isParam="true">org.jboss.jms.server.remoting.JMSWireFormat</attribute>
- <!== Serialization type must be jms - do not change! ==>
- <attribute name="serializationtype" isParam="true">jms</attribute>
- <attribute name="dataType" isParam="true">jms</attribute>
- <attribute name="serverBindAddress">${jboss.bind.address}</attribute>
- <attribute name="serverBindPort">4458</attribute>
- <attribute name="leasePeriod">20000</attribute>
- <attribute name="callbackStore">org.jboss.remoting.callback.CallbackStore</attribute>
- <attribute name="callbackPollPeriod" isParam="true">100</attribute>
- </invoker>
- <handlers>
- <handler subsystem="JMS">org.jboss.jms.server.remoting.JMSServerInvocationHandler</handler>
- </handlers>
- </config>
- </attribute>
- <depends>jboss.messaging:service=NetworkRegistry</depends>
- </mbean>
- -->
-
<!-- TODO: Do I need this> -->
<mbean code="org.jboss.remoting.network.NetworkRegistry"
name="jboss.messaging:service=NetworkRegistry"/>
-</server>
\ No newline at end of file
+</server>
Modified: trunk/tests/build.xml
===================================================================
--- trunk/tests/build.xml 2007-05-12 14:43:53 UTC (rev 2670)
+++ trunk/tests/build.xml 2007-05-14 15:51:13 UTC (rev 2671)
@@ -1333,6 +1333,7 @@
<include name=".*.classpath"/>
</fileset>
</delete>
+ <ant dir="./smoke" antfile="build.xml" inheritAll="false" target="clean"/>
</target>
<!-- ======================================================================================== -->
Modified: trunk/tests/smoke/build.xml
===================================================================
--- trunk/tests/smoke/build.xml 2007-05-12 14:43:53 UTC (rev 2670)
+++ trunk/tests/smoke/build.xml 2007-05-14 15:51:13 UTC (rev 2671)
@@ -731,7 +731,7 @@
<echo message="Checking current client's compatibility with a ${jboss.messaging.version} server"/>
<unzip src="${jboss.compatibility.home}/../jboss-messaging-${jboss.messaging.version}.zip" dest="./output">
<patternset>
- <include name="jboss-messaging-${jboss.messaging.version}/jboss-messaging-scoped.sar"/>
+ <include name="jboss-messaging-${jboss.messaging.version}/jboss-messaging.sar"/>
</patternset>
</unzip>
<antcall target="create-messaging-config">
@@ -983,12 +983,6 @@
todir="${jboss.home}/server/${jboss.configuration}/deploy"/>
</target>
-
- <target name="deploy-scoped-queue">
- <copy file="artifacts/smoketest-clustered-queue-service.xml"
- todir="${jboss.home}/server/${jboss.configuration}/deploy"/>
- </target>
-
<target name="ping-queue">
<java classname="org.jboss.console.twiddle.Twiddle" fork="yes" failonerror="yes"
dir="${jboss.home}/bin">
Modified: trunk/tests/src/org/jboss/test/messaging/jms/SecurityTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/SecurityTest.java 2007-05-12 14:43:53 UTC (rev 2670)
+++ trunk/tests/src/org/jboss/test/messaging/jms/SecurityTest.java 2007-05-14 15:51:13 UTC (rev 2671)
@@ -51,23 +51,6 @@
* Much of the basic idea of the tests come from SecurityUnitTestCase.java in JBossMQ by:
* @author <a href="pra at tim.se">Peter Antman</a>
*
- * In order for this test to run you must ensure:
- *
- * A JBoss instance is running at localhost
- * jboss-messaging.sar has been deployed to JBoss
- * login-config.xml should have an application-policy as follows:
- *
- * <application-policy name="messaging">
- * <authentication>
- * <login-module code="org.jboss.security.auth.spi.DatabaseServerLoginModule"
- * flag="required">
- * <module-option name="unauthenticatedIdentity">guest</module-option>
- * <module-option name="dsJndiName">java:/DefaultDS</module-option>
- * <module-option name="principalsQuery">SELECT PASSWD FROM JMS_USERS WHERE USERID=?</module-option>
- * <module-option name="rolesQuery">SELECT ROLEID, 'Roles' FROM JMS_ROLES WHERE USERID=?</module-option>
- * </login-module>
- * </authentication>
- * </application-policy>
*
* @version <tt>$Revision$</tt>
*
Modified: trunk/util/release-admin.xml
===================================================================
--- trunk/util/release-admin.xml 2007-05-12 14:43:53 UTC (rev 2670)
+++ trunk/util/release-admin.xml 2007-05-14 15:51:13 UTC (rev 2671)
@@ -2,8 +2,13 @@
<!-- ====================================================================== -->
<!-- -->
-<!-- Ant file to create a JBoss 4.x messaging configurations based on a -->
-<!-- default configuration. -->
+<!-- Ant file to create a JBoss 4.20 or later messaging configurations -->
+<!-- based on a default configuration. -->
+<!-- Please note that this script will only work with JBoss AS 4.2.0 or -->
+<!-- later JBoss 4 series. -->
+<!-- For installing in JBoss 4.0.x (not recommended due to various -->
+<!-- jar incompatibilities you must do a manual install - see -->
+<!-- user guide for more information -->
<!-- -->
<!-- ====================================================================== -->
@@ -22,7 +27,6 @@
<property name="javassist-version" value="3.5.0.GA-brew"/>
<property name="jboss-remoting-version" value="2.2.0.SP4"/>
-
<property name="jboss.home" value="${ENV.JBOSS_HOME}"/>
<property name="messaging.config.name" value="messaging"/>
<property name="messaging.config.source" value="default"/>
@@ -30,28 +34,33 @@
<property name="database" value="mysql"/>
<!--
- DO NOT change these values here, otherwise the installation script won't work. If you need
- to change them, to it in release-admin.properties.
+ DO NOT change these values here, otherwise the installation script might break. If you need
+ to change them, do it in release-admin.properties.
-->
- <property name="main.artifact.location" value="../output/lib"/>
- <property name="auxiliary.artifacts.location" value="../examples/config"/>
- <property name="auxiliary.lib.location" value="./lib"/>
- <property name="messaging.artifact.name" value="jboss-messaging.sar"/>
+ <!-- The location of the sar file -->
+ <property name="sar.location" value="../output/lib"/>
+
+ <!-- The name of the sar -->
+ <property name="sar.name" value="jboss-messaging.sar"/>
+
+ <!-- The location of datasource file - used for clustered install -->
+ <property name="datasource.location" value="../examples/config"/>
+
<!-- ======================================================================================== -->
<!-- Top level targets. These are the "modes" this script is supposed to work in. -->
<!-- ======================================================================================== -->
- <!-- An unscoped installation for JBoss 4.x -->
- <target name="default" depends="validate-ant, validate-database">
+ <!-- An standard installation for JBoss 4.x based on "default"-->
+ <target name="default" depends="validate-ant">
<set-config-name base="${messaging.config.name}" suffix=""/>
<antcall target="create-server-config"/>
</target>
<!--
- A "standalone" (non-scoped minimal configuration) installation for JBoss 4.x.
+ A "standalone" (minimal configuration) installation for JBoss 4.x.
-->
- <target name="standalone" depends="validate-ant, validate-database">
+ <target name="standalone" depends="validate-ant">
<condition property="config.name" value="${standalone.messaging.config.name}">
<isset property="standalone.messaging.config.name"/>
</condition>
@@ -60,7 +69,7 @@
</target>
<!--
- A cluster node installation for JBoss 4.x.
+ A cluster node installation for JBoss 4.2.0. or later JBoss 4 series
-->
<target name="cluster-node" depends="validate-ant, validate-database">
<set-config-name base="${messaging.config.name}" suffix="node${id}"/>
@@ -71,6 +80,7 @@
<!-- Internal targets -->
<!-- ======================================================================================== -->
+ <!-- We require ant 1.7.0 or later -->
<target name="validate-ant">
<condition property="ant.ok">
<antversion atleast="1.7.0"/>
@@ -78,8 +88,8 @@
<fail unless="ant.ok" message="The ant you're using (${ant.version}) is too old, you need at least 1.7.0!"/>
</target>
- <target name="validate-database">
-
+ <!-- For a cluster node installation - we require a shared (non hsqldb) database to be available -->
+ <target name="validate-database">
<condition property="supported.database">
<or>
<equals arg1="${database}" arg2="mysql"/>
@@ -91,75 +101,42 @@
</condition>
<fail unless="supported.database" message="Database type '${database}' not supported!"/>
+ </target>
- </target>
-
+ <!-- The JBOSS_HOME environment variable and the directory must exist, we also check we are running
+ in JBoss 4.2.0 or later JBoss 4 series -->
<target name="validate-jboss">
<fail unless="jboss.home" message="JBOSS_HOME environment variable not set! Set it and try again."/>
<available property="default-config" type="dir" file="${jboss.home}/server/${messaging.config.source}"/>
<fail unless="default-config" message="${jboss.home}/server/${messaging.config.source} not found!"/>
</target>
+ <!-- If the target configuration already exists, we don't overwrite it, since we don't want to delete
+ someone's important stuff -->
<target name="prevent-messaging-overwrite">
<available property="messaging-config" type="dir" file="${jboss.home}/server/${config.name}"/>
<fail if="messaging-config" message="'${config.name}' configuration already exists! Delete it manually and try again."/>
</target>
+ <!-- We make sure the sar file exists -->
<target name="validate-messaging-artifact">
- <available property="messaging-artifact-exists" type="file" file="${main.artifact.location}/${messaging.artifact.name}"/>
- <fail unless="messaging-artifact-exists" message="${main.artifact.location}/${messaging.artifact.name} does not exist! Build it and try again."/>
+ <available property="messaging-artifact-exists" type="file" file="${sar.location}/${sar.name}"/>
+ <fail unless="messaging-artifact-exists" message="${sar.location}/${sar.name} does not exist! Build it and try again."/>
</target>
-
- <target name="test-for-jars">
- <condition property="condition-replace-jars">
- <equals arg1="${install-jars}" arg2="yes"/>
- </condition>
- </target>
-
- <target name="get-jars" depends="test-for-jars" if="condition-replace-jars">
- <mkdir dir="./${download-jars}"/>
- <get src="http://repository.jboss.com/jboss/remoting/${jboss-remoting-version}/lib/jboss-remoting.jar" dest="./${download-jars}/jboss-remoting.jar" usetimestamp="yes"/>
- <get src="http://repository.jboss.com/javassist/${javassist-version}/lib/javassist.jar" dest="./${download-jars}/javassist.jar" usetimestamp="yes"/>
- <get src="http://repository.jboss.com/jboss/aop/${aop-version}/lib/common-softvaluehashmap.jar" dest="./${download-jars}/common-softvaluehashmap.jar" usetimestamp="yes"/>
- <get src="http://repository.jboss.com/jboss/aop/${aop-version}/lib/jboss-aop-jdk50-client.jar" dest="./${download-jars}/jboss-aop-jdk50-client.jar" usetimestamp="yes"/>
- <get src="http://repository.jboss.com/jboss/aop/${aop-version}/lib/jboss-aop-jdk50.jar" dest="./${download-jars}/jboss-aop-jdk50.jar" usetimestamp="yes"/>
- <get src="http://repository.jboss.com/jboss/aop/${aop-version}/lib/jboss-aop.jar" dest="./${download-jars}/jboss-aop.jar" usetimestamp="yes"/>
- <get src="http://repository.jboss.com/jboss/aop/${aop-version}/lib/jdk14-pluggable-instrumentor.jar" dest="./${download-jars}/jdk14-pluggable-instrumentor.jar" usetimestamp="yes"/>
- <get src="http://repository.jboss.com/jboss/aop/${aop-version}/lib/jrockit-pluggable-instrumentor.jar" dest="./${download-jars}/jrockit-pluggable-instrumentor.jar" usetimestamp="yes"/>
- <get src="http://repository.jboss.com/jboss/aop/${aop-version}/lib/pluggable-instrumentor.jar" dest="./${download-jars}/pluggable-instrumentor.jar" usetimestamp="yes"/>
- <get src="http://repository.jboss.com/jgroups/${jgroups-version}/lib/jgroups.jar" dest="./${download-jars}/jgroups.jar" usetimestamp="yes"/>
- </target>
-
- <!-- Replace server jars for jboss-4.0.X installations -->
- <target name="task-replace-server-jars" depends="test-for-jars, get-jars" if="condition-replace-jars">
-
- <echo>Replacing server jars in server/.../lib !!</echo>
-
- <copy todir="${jboss.home}/server/${config.name}/lib" overwrite="yes" flatten="yes">
- <fileset dir="./${download-jars}"/>
- </copy>
-
- </target>
-
-
- <target name="replace-server-jars" depends="task-replace-server-jars" if="replace-jars"/>
-
- <target name="install-driver" if="driver-jar">
- <copy file="${driver-jar}" todir="${jboss.home}/server/${config.name}/lib"/>
- </target>
-
+ <!-- Create a server configuration based on a default server configuration -->
<target name="create-server-config" depends="validate-jboss, prevent-messaging-overwrite, validate-messaging-artifact">
- <echo message="Creating JBoss Messaging configuration '${config.name}' for ${jboss.home} based on ${messaging.artifact.name}"/>
+ <echo message="Creating JBoss Messaging configuration '${config.name}' for ${jboss.home} based on ${sar.name}"/>
<mkdir dir="${jboss.home}/server/${config.name}"/>
+
<copy todir="${jboss.home}/server/${config.name}">
<fileset dir="${jboss.home}/server/${messaging.config.source}">
- <exclude name="data/**"/>
- <exclude name="work/**"/>
- <exclude name="log/**"/>
- <exclude name="tmp/**"/>
+ <include name="conf/**"/>
+ <include name="deploy/**"/>
+ <include name="lib/**"/>
+ <!-- Don't copy jbossmq -->
<exclude name="deploy/jms/**"/>
<exclude name="lib/jbossmq.jar"/>
</fileset>
@@ -172,75 +149,47 @@
<login-module code = "org.jboss.security.auth.spi.UsersRolesLoginModule"

flag = "required" >

<module-option name = "unauthenticatedIdentity">guest</module-option>

- <module-option name = "usersProperties">messaging-users.properties</module-option>

- <module-option name = "rolesProperties">messaging-roles.properties</module-option>

+ <module-option name = "usersProperties">props/messaging-users.properties</module-option>

+ <module-option name = "rolesProperties">props/messaging-roles.properties</module-option>

</login-module>
 </authentication>
 </application-policy>
"/>
</replaceregexp>
<!-- we deploy the archive exploded so that users can easily access the configuration files -->
- <condition property="is.sar" value="true">
- <contains substring=".sar" string="${messaging.artifact.name}"/>
- </condition>
- <antcall target="expand-jar"/>
<antcall target="expand-sar"/>
+ <!-- we only replace the server jars if 'install-jars' ENV variable = 'yes' -->
<antcall target="replace-server-jars"/>
- <antcall target="install-driver"/>
-
- <move todir="${jboss.home}/server/${config.name}/conf">
+ <!-- Copy the default security properties files to conf/props-->
+ <copy todir="${jboss.home}/server/${config.name}/conf/props">
<fileset dir="../src/etc/server/default/config">
<include name="messaging-*.properties"/>
</fileset>
- </move>
+ </copy>
+ <!-- Copy the JMS JCA resource adaptor -->
<copy file="${jboss.home}/server/${messaging.config.source}/deploy/jms/jms-ra.rar"
todir="${jboss.home}/server/${config.name}/deploy"/>
</target>
- <target name="expand-sar" if="is.sar">
- <unjar src="${main.artifact.location}/${messaging.artifact.name}"
+
+ <!-- Expand the sar file in the deploy directory -->
+ <target name="expand-sar">
+ <unjar src="${sar.location}/${sar.name}"
dest="${jboss.home}/server/${config.name}/deploy/jboss-messaging.sar">
</unjar>
</target>
- <target name="expand-jar" unless="is.sar">
- <unjar src="${main.artifact.location}/${messaging.artifact.name}"
- dest="${jboss.home}/server/${config.name}/deploy/jboss-messaging">
- </unjar>
- <jar jarfile="${jboss.home}/server/${config.name}/deploy/jboss-messaging/jboss-messaging.jar"
- manifest="${jboss.home}/server/${config.name}/deploy/jboss-messaging/META-INF/MANIFEST.MF">
- <fileset dir="${jboss.home}/server/${config.name}/deploy/jboss-messaging" includes="org/**,VERSION,aop-messaging*.xml"/>
- </jar>
- <delete>
- <fileset dir="${jboss.home}/server/${config.name}/deploy/jboss-messaging">
- <include name="VERSION"/>
- <include name="aop-messaging*.xml"/>
- </fileset>
- </delete>
- <delete dir="${jboss.home}/server/${config.name}/deploy/jboss-messaging/org"/>
- <delete dir="${jboss.home}/server/${config.name}/deploy/jboss-messaging/META-INF"/>
+ <!-- Create a standalone (stripped down) JBM installation based on default -->
- <move file="${jboss.home}/server/${config.name}/deploy/jboss-messaging/jboss-messaging.jar"
- todir="${jboss.home}/server/${config.name}/lib"/>
- <move todir="${jboss.home}/server/${config.name}/conf/xmdesc">
- <fileset dir="${jboss.home}/server/${config.name}/deploy/jboss-messaging/xmdesc">
- <include name="*.xml"/>
- </fileset>
- </move>
- <move todir="${jboss.home}/server/${config.name}/conf">
- <fileset dir="${jboss.home}/server/${config.name}/deploy/jboss-messaging">
- <include name="messaging-*.properties"/>
- </fileset>
- </move>
- <delete dir="${jboss.home}/server/${config.name}/deploy/jboss-messaging/xmdesc"/>
- </target>
-
+ <!-- FIXME - this is currently very brittle - since it may break if the default
+ installation structure changes in future versions of JBAS -
+ consider removing it -->
<target name="create-standalone-server-config" depends="validate-jboss, validate-messaging-artifact"
description="Creates a standalone Messaging server configuration based on a default JBoss instance">
- <echo message="Creating Standalone Messaging configuration '${config.name}' for ${jboss.home} based on ${messaging.artifact.name}"/>
+ <echo message="Creating Standalone Messaging configuration '${config.name}' for ${jboss.home} based on ${sar.name}"/>
<mkdir dir="${jboss.home}/server/${config.name}/conf"/>
<mkdir dir="${jboss.home}/server/${config.name}/lib"/>
@@ -248,8 +197,6 @@
<copy todir="${jboss.home}/server/${config.name}/conf">
<fileset dir="${jboss.home}/server/${messaging.config.source}/conf">
- <include name="jboss-service.xml"/>
- <include name="jndi.properties"/>
<include name="log4j.xml"/>
<include name="login-config.xml"/>
<include name="props/**"/>
@@ -384,7 +331,7 @@
<!-- deploy exploded messaging -->
- <unjar src="${main.artifact.location}/${messaging.artifact.name}"
+ <unjar src="${sar.location}/${sar.name}"
dest="${jboss.home}/server/${config.name}/deploy/jboss-messaging">
</unjar>
@@ -412,11 +359,12 @@
</patternset>
</unjar>
- <move todir="${jboss.home}/server/${config.name}/conf">
- <fileset dir="${jboss.home}/server/${config.name}/deploy/jboss-messaging">
- <include name="messaging-*.properties"/>
- </fileset>
- </move>
+ <!-- Copy the default security properties files to conf/props-->
+ <copy todir="${jboss.home}/server/${config.name}/conf/props">
+ <fileset dir="../src/etc/server/default/config">
+ <include name="messaging-*.properties"/>
+ </fileset>
+ </copy>
<delete dir="${jboss.home}/server/${config.name}/deploy/jboss-messaging/xmdesc"/>
<delete dir="${jboss.home}/server/${config.name}/deploy/jboss-messaging/META-INF"/>
@@ -465,24 +413,14 @@
<echo message="Enabling ${database}"/>
<delete file="${jboss.home}/server/${config.name}/deploy/hsqldb-ds.xml" quiet="false" failonerror="true"/>
- <copy file="${auxiliary.artifacts.location}/${database}-ds.xml" todir="${jboss.home}/server/${config.name}/deploy/"/>
+ <copy file="${datasource.location}/${database}-ds.xml" todir="${jboss.home}/server/${config.name}/deploy/"/>
<!--
- We may not distribute the driver for availability or copyright reasons, so the driver
- may not be under lib. We need to check and issue a warning if it isn't.
- -->
- <copy todir="${jboss.home}/server/${config.name}/lib">
- <fileset dir="${auxiliary.lib.location}">
- <include name="${database}-driver*.jar"/>
- </fileset>
- </copy>
-
- <!--
Use clustered persistence configuration file.
-->
<delete file="${jboss.home}/server/${config.name}/deploy/jboss-messaging.sar/hsqldb-persistence-service.xml" quiet="false" failonerror="true"/>
- <copy file="${auxiliary.artifacts.location}/clustered-${database}-persistence-service.xml" todir="${jboss.home}/server/${config.name}/deploy/jboss-messaging.sar/"/>
+ <copy file="${datasource.location}/clustered-${database}-persistence-service.xml" todir="${jboss.home}/server/${config.name}/deploy/jboss-messaging.sar/"/>
<antcall target="install-jgroups"/>
@@ -686,7 +624,7 @@
<target name="dump">
<echo message="jboss.home=${jboss.home}"/>
<echo message="messaging.config.name=${messaging.config.name}"/>
- <echo message="main.artifact.location=${main.artifact.location}"/>
+ <echo message="sar.location=${sar.location}"/>
</target>
<target name="test" depends="validate-ant">
More information about the jboss-cvs-commits
mailing list