[jboss-cvs] JBossAS SVN: r65305 - in branches/JBPAPP_4_2: build and 54 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Sep 11 17:15:24 EDT 2007
Author: fnasser at redhat.com
Date: 2007-09-11 17:15:24 -0400 (Tue, 11 Sep 2007)
New Revision: 65305
Added:
branches/JBPAPP_4_2/ejb3/src/resources/test-configs/removedislocal/
branches/JBPAPP_4_2/ejb3/src/resources/test-configs/removedislocal/deploy/
branches/JBPAPP_4_2/ejb3/src/resources/test-configs/removedislocal/deploy/ejb3-interceptors-aop.xml
branches/JBPAPP_4_2/ejb3/src/resources/test/ejbthree994/
branches/JBPAPP_4_2/ejb3/src/resources/test/ejbthree994/ejbthree994-connectors-service.xml
branches/JBPAPP_4_2/ejb3/src/resources/test/webservices/application.xml
branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree994/
branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree994/BusinessInterface.java
branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree994/StatefulBean.java
branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree994/unit/
branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree994/unit/MultiBindingsTestCase.java
branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/removedislocal/
branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/removedislocal/StatelessBean.java
branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/removedislocal/StatelessRemote.java
branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/removedislocal/unit/
branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/removedislocal/unit/RemovedIsLocalUnitTestCase.java
branches/JBPAPP_4_2/testsuite/src/main/org/jboss/test/jacc/test/TestJBossPolicyConfiguration.java
branches/JBPAPP_4_2/testsuite/src/main/org/jboss/test/jacc/test/WebPermissionsValidationTestCase.java
branches/JBPAPP_4_2/testsuite/src/resources/security/jacc/webperm/
branches/JBPAPP_4_2/testsuite/src/resources/security/jacc/webperm/web.xml
Removed:
branches/JBPAPP_4_2/ejb3/src/resources/test-configs/arjuna/
branches/JBPAPP_4_2/ejb3/src/resources/test-configs/removedislocal/deploy/
branches/JBPAPP_4_2/ejb3/src/resources/test-configs/removedislocal/deploy/ejb3-interceptors-aop.xml
branches/JBPAPP_4_2/ejb3/src/resources/test/ejbthree994/ejbthree994-connectors-service.xml
branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree994/BusinessInterface.java
branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree994/StatefulBean.java
branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree994/unit/
branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree994/unit/MultiBindingsTestCase.java
branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/removedislocal/StatelessBean.java
branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/removedislocal/StatelessRemote.java
branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/removedislocal/unit/
branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/removedislocal/unit/RemovedIsLocalUnitTestCase.java
branches/JBPAPP_4_2/testsuite/src/resources/security/jacc/webperm/web.xml
Modified:
branches/JBPAPP_4_2/aspects/src/main/org/jboss/aspects/tx/TxPropagationInterceptor.java
branches/JBPAPP_4_2/build/build-thirdparty.xml
branches/JBPAPP_4_2/build/build.xml
branches/JBPAPP_4_2/console/src/resources/webconsole.war/WEB-INF/classes/web-console-users.properties
branches/JBPAPP_4_2/console/src/resources/webconsole.war/WEB-INF/jboss-web.xml
branches/JBPAPP_4_2/console/src/resources/webconsole.war/WEB-INF/web.xml
branches/JBPAPP_4_2/ejb3/
branches/JBPAPP_4_2/ejb3/build-test.xml
branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/BaseSessionContext.java
branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/EJB3Util.java
branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/EJBContainer.java
branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/InitialContextFactory.java
branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/ThreadlocalPool.java
branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/client/ClientContainer.java
branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3ClientDeployer.java
branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/embedded/EJB3StandaloneDeployer.java
branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/embedded/JaasSecurityManagerService.java
branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/iiop/IORFactory.java
branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/EjbJarDDObjectFactory.java
branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/EnterpriseBean.java
branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/naming/SimpleMultiplexer.java
branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/proxy/handle/HomeHandleImpl.java
branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/service/ServiceRemoteProxy.java
branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/session/BaseSessionProxyFactory.java
branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/stateful/BaseStatefulProxyFactory.java
branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/stateful/StatefulBeanContext.java
branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/stateful/StatefulClusterProxyFactory.java
branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/stateful/StatefulLocalProxy.java
branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/stateful/StatefulLocalProxyFactory.java
branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/stateful/StatefulRemoteProxy.java
branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/stateful/StatefulRemoteProxyFactory.java
branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/stateless/BaseStatelessProxyFactory.java
branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/stateless/StatelessHandleImpl.java
branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/stateless/StatelessRemoteProxy.java
branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/jboss/JBossTimerServiceFactory.java
branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/quartz/PersistentTimer.java
branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/quartz/QuartzTimerServiceFactory.java
branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/quartz/TimerServiceImpl.java
branches/JBPAPP_4_2/ejb3/src/main/org/jboss/injection/JndiMethodInjector.java
branches/JBPAPP_4_2/ejb3/src/main/org/jboss/injection/JndiPropertyInjector.java
branches/JBPAPP_4_2/ejb3/src/resources/test/security/META-INF/ejb-jar.xml
branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredjms/unit/MDBUnitTestCase.java
branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/SimpleIsLocalInterceptorUnitTestCase.java
branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/localfromremote/unit/LocalTestCase.java
branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/security/CallerBean.java
branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/stateless/unit/MetricsUnitTestCase.java
branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/statelesscreation/unit/MetricsUnitTestCase.java
branches/JBPAPP_4_2/server/src/bin/jboss_init_hpux.sh
branches/JBPAPP_4_2/server/src/bin/jboss_init_redhat.sh
branches/JBPAPP_4_2/server/src/bin/jboss_init_suse.sh
branches/JBPAPP_4_2/server/src/etc/conf/default/jboss-log4j.xml
branches/JBPAPP_4_2/server/src/etc/conf/default/props/jmx-console-users.properties
branches/JBPAPP_4_2/server/src/main/org/jboss/web/WebPermissionMapping.java
branches/JBPAPP_4_2/server/src/resources/jmx-invoker-adaptor/META-INF/jboss-service.xml
branches/JBPAPP_4_2/system/src/bin/run.sh
branches/JBPAPP_4_2/system/src/main/org/jboss/system/server/ServerConfig.java
branches/JBPAPP_4_2/testsuite/build.xml
branches/JBPAPP_4_2/testsuite/src/main/org/jboss/test/util/test/TwiddleUnitTestCase.java
branches/JBPAPP_4_2/tomcat/src/main/org/jboss/web/tomcat/service/session/JvmRouteValve.java
branches/JBPAPP_4_2/tools/etc/buildmagic/buildmagic.ent
branches/JBPAPP_4_2/tools/etc/buildmagic/version-info.xml
branches/JBPAPP_4_2/varia/src/resources/jmx/jmx-console-web.xml
branches/JBPAPP_4_2/varia/src/resources/jmx/web-inf/jboss-web.xml
branches/JBPAPP_4_2/varia/src/resources/services/invoker/http/web.xml
branches/JBPAPP_4_2/varia/src/resources/services/invoker/httpha/web.xml
Log:
Merged JBPAPP_4_2_0_GA_CP changes r63736:65304 into JBPAPP_4_2
Modified: branches/JBPAPP_4_2/aspects/src/main/org/jboss/aspects/tx/TxPropagationInterceptor.java
===================================================================
--- branches/JBPAPP_4_2/aspects/src/main/org/jboss/aspects/tx/TxPropagationInterceptor.java 2007-09-11 18:18:20 UTC (rev 65304)
+++ branches/JBPAPP_4_2/aspects/src/main/org/jboss/aspects/tx/TxPropagationInterceptor.java 2007-09-11 21:15:24 UTC (rev 65305)
@@ -25,9 +25,12 @@
import javax.transaction.TransactionManager;
import org.jboss.aop.advice.Interceptor;
import org.jboss.aop.joinpoint.Invocation;
+import org.jboss.logging.Logger;
import org.jboss.tm.TransactionManagerLocator;
+import org.jboss.tm.TransactionPropagationContextFactory;
import org.jboss.tm.TransactionPropagationContextUtil;
+
/**
* Comment
*
@@ -55,12 +58,27 @@
public Object invoke(Invocation invocation) throws Throwable
{
- Object tpc = invocation.getMetaData(ClientTxPropagationInterceptor.TRANSACTION_PROPAGATION_CONTEXT, ClientTxPropagationInterceptor.TRANSACTION_PROPAGATION_CONTEXT);
- if (tpc != null)
+ Object importedTpc = invocation.getMetaData(ClientTxPropagationInterceptor.TRANSACTION_PROPAGATION_CONTEXT, ClientTxPropagationInterceptor.TRANSACTION_PROPAGATION_CONTEXT);
+ if (importedTpc != null)
{
+
Transaction tx = tm.getTransaction();
- if (tx != null) throw new RuntimeException("cannot import a transaction context when a transaction is already associated with the thread");
- Transaction importedTx = TransactionPropagationContextUtil.getTPCImporter().importTransactionPropagationContext(tpc);
+
+ if (tx != null)
+ {
+ TransactionPropagationContextFactory tpcFactory = TransactionPropagationContextUtil.getTPCFactory();
+ Object tpc = null;
+ if (tpcFactory != null)
+ tpc = tpcFactory.getTransactionPropagationContext();
+
+ if (importedTpc.equals(tpc))
+ return invocation.invokeNext();
+ else
+ throw new RuntimeException("cannot import a transaction context when a transaction is already associated with the thread");
+ }
+
+ Transaction importedTx = TransactionPropagationContextUtil.getTPCImporter().importTransactionPropagationContext(importedTpc);
+
tm.resume(importedTx);
try
{
Modified: branches/JBPAPP_4_2/build/build-thirdparty.xml
===================================================================
--- branches/JBPAPP_4_2/build/build-thirdparty.xml 2007-09-11 18:18:20 UTC (rev 65304)
+++ branches/JBPAPP_4_2/build/build-thirdparty.xml 2007-09-11 21:15:24 UTC (rev 65305)
@@ -73,26 +73,26 @@
<componentref name="gjt-jpl-util" version="1.0"/>
<componentref name="gnu-getopt" version="1.0.12-brew"/>
<componentref name="hibernate" version="3.2.4.SP1_CP01-brew"/>
- <componentref name="hibernate-annotations" version="3.2.1.GA"/>
- <componentref name="hibernate-entitymanager" version="3.2.1.GA"/>
+ <componentref name="hibernate-annotations" version="3.2.1.GA.patch01-brew"/>
+ <componentref name="hibernate-entitymanager" version="3.2.1.GA-brew"/>
<componentref name="hsqldb" version="1.8.0.2"/>
<componentref name="jacorb" version="2.3.0jboss.patch4-brew"/>
<componentref name="javassist" version="3.5.0.GA-brew"/>
<componentref name="jaxen" version="1.1-brew"/>
- <componentref name="jboss/aop" version="1.5.5.GA"/>
- <componentref name="jboss/cache" version="1.4.1.SP3"/>
+ <componentref name="jboss/aop" version="1.5.5.GA-brew"/>
+ <componentref name="jboss/cache" version="1.4.1.SP3-brew"/>
<componentref name="jboss/common" version="1.2.0.GA-brew"/>
<componentref name="jboss/dom4j-jarjar" version="1.6.1"/>
<componentref name="jboss/jaxr" version="1.2.0.GA"/>
- <componentref name="jboss/jbossts14" version="4.2.3.SP5"/>
- <componentref name="jboss/jbossws-jboss42" version="1.2.1.GA"/>
- <componentref name="jboss/jbossxb" version="1.0.0.GA-brew"/>
+ <componentref name="jboss/jbossts14" version="4.2.3.SP5-brew"/>
+ <componentref name="jboss/jbossws-jboss42" version="1.2.1.GA_CP01"/>
+ <componentref name="jboss/jbossxb" version="1.0.0.GA_CP01-brew"/>
<componentref name="jboss/microcontainer" version="1.0.2"/>
<componentref name="jboss/profiler/jvmti" version="1.0.0.CR5-brew"/>
- <componentref name="jboss/remoting" version="2.2.0.SP4"/>
- <componentref name="jboss/serialization" version="1.0.3.GA"/>
+ <componentref name="jboss/remoting" version="2.2.2.GA-brew"/>
+ <componentref name="jboss/serialization" version="1.0.3.GA-brew"/>
<componentref name="jboss/jboss-vfs" version="1.0.0.GA"/>
- <componentref name="jboss/web" version="2.0.0.GA"/>
+ <componentref name="jboss/web" version="2.0.0.GA_CP01-brew"/>
<componentref name="jfreechart" version="0.9.20"/>
<componentref name="jgroups" version="2.4.1.SP3-brew"/>
<componentref name="joesnmp" version="0.3.4-brew"/>
@@ -105,7 +105,7 @@
<componentref name="qdox" version="1.6.1-brew"/>
<componentref name="stax-api" version="1.0"/>
<componentref name="sun-jaf" version="1.1"/>
- <componentref name="sun-javacc" version="3.2"/>
+ <componentref name="sun-javacc" version="3.2-brew"/>
<componentref name="sun-javamail" version="1.4"/>
<componentref name="sun-jsf" version="1.2_04_P02"/>
<componentref name="sun-jstl" version="1.2"/>
Modified: branches/JBPAPP_4_2/build/build.xml
===================================================================
--- branches/JBPAPP_4_2/build/build.xml 2007-09-11 18:18:20 UTC (rev 65304)
+++ branches/JBPAPP_4_2/build/build.xml 2007-09-11 21:15:24 UTC (rev 65305)
@@ -247,6 +247,11 @@
<property name="install.all.conf" value="${install.all}/conf"/>
<property name="install.all.deploy.hasingleton" value="${install.all}/deploy-hasingleton"/>
+ <property name="install.production" value="${install.server}/production"/>
+ <property name="install.production.lib" value="${install.production}/lib"/>
+ <property name="install.production.deploy" value="${install.production}/deploy"/>
+ <property name="install.production.conf" value="${install.production}/conf"/>
+
<property name="install.default" value="${install.server}/default"/>
<property name="install.default.lib" value="${install.default}/lib"/>
<property name="install.default.deploy" value="${install.default}/deploy"/>
@@ -618,16 +623,38 @@
</target>
- <!-- Partition the default single configuration build into a minimal,
- default and all configs with a minimal set of jars in the root lib dir.
+ <!-- Partition the default single configuration build into a all, production,
+ default and minimal configs with a minimal set of jars in the root lib dir.
-->
<target name="partition-build" depends="init">
+ <antcall target="partition-production"/>
+ <antcall target="makeProductionConfigChanges"/>
<antcall target="partition-default"/>
<antcall target="partition-minimal"/>
<antcall target="jboss-all-client"/>
<!--<antcall target="setup-ejb3-dist"/>-->
</target>
+ <target name="partition-production"
+ description="A configuration tailored for production environments">
+ <!-- Copy server/all to server/production and then customize the settings
+ to values appropriate to production runs -->
+ <copy todir="${install.production}">
+ <fileset dir="${install.all}">
+ </fileset>
+ </copy>
+
+ <!-- The customizationd for "production" runs go here -->
+
+ <!-- JAVA_OPTS="-Xms512m -Xmx1024m -XX:PermSize=256m -XX:MaxPermSize=512" -->
+ <copy tofile="${install.production}/run.conf"
+ file="${install.bin}/run.conf" overwrite="true"/>
+ <replace file="${install.production}/run.conf"
+ token="Xms128m" value="Xms1503m"/>
+ <replace file="${install.production}/run.conf"
+ token="Xmx512m" value="Xmx1503m"/>
+ </target>
+
<target name="partition-default"
description="The legacy jboss base j2ee 1.4 compatible configuration">
<!-- Copy server/all to server/default and then remove the services and
@@ -840,6 +867,413 @@
</condition>
</target>
+ <!-- Modify run.sh for production config -->
+ <target name="makeProductionConfigChanges"
+ depends="partition-production">
+
+ <!-- Fix up the EOL characters for Windows files -->
+ <antcall target="fixEOL"/>
+
+ <!-- Set all JVMs except darwin to use -server -->
+
+ <replace file="${install.bin}/run.sh"
+ summary="true">
+
+ <replacetoken><![CDATA[
+# If -server not set in JAVA_OPTS, set it, if supported
+SERVER_SET=`echo $JAVA_OPTS | $GREP "\-server"`
+if [ "x$SERVER_SET" = "x" ]; then
+
+ # Check for SUN(tm) JVM w/ HotSpot support
+ if [ "x$HAS_HOTSPOT" = "x" ]; then
+ HAS_HOTSPOT=`"$JAVA" -version 2>&1 | $GREP -i HotSpot`
+ fi
+
+ # Enable -server if we have Hotspot, unless we can't
+ if [ "x$HAS_HOTSPOT" != "x" ]; then
+ # MacOS does not support -server flag
+ if [ "$darwin" != "true" ]; then
+ JAVA_OPTS="-server $JAVA_OPTS"
+ fi
+ fi
+fi
+]]></replacetoken>
+
+ <replacevalue><![CDATA[
+# If -server not set in JAVA_OPTS, set it, if supported
+SERVER_SET=`echo $JAVA_OPTS | $GREP "\-server"`
+if [ "x$SERVER_SET" = "x" ]; then
+
+ # Check for SUN(tm) JVM w/ HotSpot support
+ if [ "x$HAS_HOTSPOT" = "x" ]; then
+ HAS_HOTSPOT=`"$JAVA" -version 2>&1 | $GREP -i HotSpot`
+ fi
+
+ # Enable -server if we have Hotspot, unless we can't
+ # MacOS does not support -server flag
+ if [ "$darwin" != "true" ]; then
+ JAVA_OPTS="-server $JAVA_OPTS"
+ fi
+fi
+]]></replacevalue>
+
+ </replace>
+
+ <!-- Uncomment the configuration to make the key generation cluster safe -->
+
+ <replace file="${install.production}/deploy/uuid-key-generator.sar/META-INF/jboss-service.xml"
+ summary="true">
+
+ <replacetoken><![CDATA[
+ <!-- Uncomment to make it cluster-safe: Select current Hi value query (FOR UPDATE is recommended)
+ <attribute name="SelectHiSql">
+ select HIGHVALUES from HILOSEQUENCES where SEQUENCENAME='general' FOR UPDATE
+ </attribute>
+ -->
+]]></replacetoken>
+
+ <replacevalue><![CDATA[
+ <!-- Uncomment to make it cluster-safe: Select current Hi value query (FOR UPDATE is recommended) -->
+ <attribute name="SelectHiSql">
+ select HIGHVALUES from HILOSEQUENCES where SEQUENCENAME='general' FOR UPDATE
+ </attribute>
+]]></replacevalue>
+
+ </replace>
+
+ <!-- Only the customers explicit production queues should be configured in the mq destinations file -->
+
+ <replace file="${install.production}/deploy-hasingleton/jms/jbossmq-destinations-service.xml"
+ summary="true">
+
+ <replacetoken><![CDATA[
+<server>
+ <!-- Destination without a configured SecurityManager or without a
+ a SecurityConf will default to role guest with read=true, write=true,
+ create=false.
+ -->
+]]></replacetoken>
+
+ <replacevalue><![CDATA[
+<server>
+ <!-- Destination without a configured SecurityManager or without a
+ a SecurityConf will default to role guest with read=true, write=true,
+ create=false.
+]]></replacevalue>
+
+ </replace>
+
+ <replace file="${install.production}/deploy-hasingleton/jms/jbossmq-destinations-service.xml"
+ summary="true">
+
+ <replacetoken><![CDATA[
+</server>
+]]></replacetoken>
+
+ <replacevalue><![CDATA[
+-->
+</server>
+]]></replacevalue>
+
+ </replace>
+
+ <!-- Reduce log verbosity -->
+
+ <replace file="${install.production.conf}/jboss-log4j.xml"
+ summary="true">
+
+ <replacetoken><![CDATA[
+ <!-- ============================== -->
+ <!-- Append messages to the console -->
+ <!-- ============================== -->
+
+ <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+ <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+ <param name="Target" value="System.out"/>
+ <param name="Threshold" value="INFO"/>
+
+ <layout class="org.apache.log4j.PatternLayout">
+ <!-- The default pattern: Date Priority [Category] Message\n -->
+ <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
+ </layout>
+ </appender>
+]]></replacetoken>
+
+ <replacevalue><![CDATA[
+ <!-- ============================== -->
+ <!-- Append messages to the console -->
+ <!-- ============================== -->
+ <!--
+ <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+ <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+ <param name="Target" value="System.out"/>
+ <param name="Threshold" value="INFO"/>
+
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
+ </layout>
+ </appender>
+ -->
+]]></replacevalue>
+
+ </replace>
+
+ <replace file="${install.production.conf}/jboss-log4j.xml"
+ summary="true">
+
+ <replacetoken><![CDATA[
+ <!-- Buffer events and log them asynchronously
+ <appender name="ASYNC" class="org.apache.log4j.AsyncAppender">
+ <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+ <appender-ref ref="FILE"/>
+ <appender-ref ref="CONSOLE"/>
+ <appender-ref ref="SMTP"/>
+ </appender>
+ -->
+]]></replacetoken>
+
+ <replacevalue><![CDATA[
+ <!-- Buffer events and log them asynchronously -->
+ <appender name="ASYNC" class="org.apache.log4j.AsyncAppender">
+ <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+ <appender-ref ref="FILE"/>
+ <!--
+ <appender-ref ref="CONSOLE"/>
+ <appender-ref ref="SMTP"/>
+ -->
+ </appender>
+]]></replacevalue>
+
+ </replace>
+
+ <replace file="${install.production.conf}/jboss-log4j.xml"
+ summary="true">
+
+ <replacetoken><![CDATA[
+ <!-- Limit the org.apache category to INFO as its DEBUG is verbose -->
+ <category name="org.apache">
+ <priority value="INFO"/>
+ </category>
+
+ <!-- Limit the org.jboss.serial (jboss-serialization) to INFO as its DEBUG is verbose -->
+ <category name="org.jboss.serial">
+ <priority value="INFO"/>
+ </category>
+]]></replacetoken>
+
+ <replacevalue><![CDATA[
+ <!-- Limit the org.apache category to INFO as its DEBUG is verbose -->
+ <category name="org.apache">
+ <priority value="WARN"/>
+ </category>
+
+ <!-- Limit the org.jboss.serial (jboss-serialization) to INFO as its DEBUG is verbose -->
+ <category name="org.jboss.serial">
+ <priority value="WARN"/>
+ </category>
+]]></replacevalue>
+
+ </replace>
+
+ <replace file="${install.production.conf}/jboss-log4j.xml"
+ summary="true">
+
+ <replacetoken><![CDATA[
+ <!-- Limit the JSR77 categories -->
+ <category name="org.jboss.management">
+ <priority value="INFO"/>
+ </category>
+]]></replacetoken>
+
+ <replacevalue><![CDATA[
+ <!-- Limit the JSR77 categories -->
+ <category name="org.jboss.management">
+ <priority value="WARN"/>
+ </category>
+
+ <!-- Limit seam logging -->
+ <category name="org.jboss.seam">
+ <priority value="WARN"/>
+ </category>
+]]></replacevalue>
+
+ </replace>
+
+ <replace file="${install.production.conf}/jboss-log4j.xml"
+ summary="true">
+
+ <replacetoken><![CDATA[
+ <root>
+ <appender-ref ref="CONSOLE"/>
+ <appender-ref ref="FILE"/>
+ </root>
+
+]]></replacetoken>
+
+ <replacevalue><![CDATA[
+ <root>
+ <!-- <appender-ref ref="CONSOLE"/> -->
+ <appender-ref ref="ASYNC"/>
+ </root>
+]]></replacevalue>
+
+ </replace>
+
+ <replace file="${install.production.conf}/jboss-log4j.xml"
+ summary="true">
+
+ <replacetoken><![CDATA[
+ <!-- Clustering logging -->
+ <!-- Uncomment the following to redirect the org.jgroups and
+ org.jboss.ha categories to a cluster.log file.
+
+ <appender name="CLUSTER" class="org.jboss.logging.appender.RollingFileAppender">
+ <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+ <param name="File" value="${jboss.server.log.dir}/cluster.log"/>
+ <param name="Append" value="false"/>
+ <param name="MaxFileSize" value="500KB"/>
+ <param name="MaxBackupIndex" value="1"/>
+
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/>
+ </layout>
+ </appender>
+ <category name="org.jgroups">
+ <priority value="DEBUG" />
+ <appender-ref ref="CLUSTER"/>
+ </category>
+ <category name="org.jboss.ha">
+ <priority value="DEBUG" />
+ <appender-ref ref="CLUSTER"/>
+ </category>
+ -->
+]]></replacetoken>
+
+ <replacevalue><![CDATA[
+]]></replacevalue>
+
+ </replace>
+
+ <replace file="${install.production.conf}/jboss-log4j.xml"
+ summary="true">
+
+ <replacetoken><![CDATA[
+ <!-- ================ -->
+ <!-- Limit categories -->
+ <!-- ================ -->
+]]></replacetoken>
+
+ <replacevalue><![CDATA[
+ <!-- Clustering logging -->
+ <!-- Uncomment the following to redirect the org.jgroups and
+ org.jboss.ha categories to a cluster.log file. -->
+ <!--
+ <appender name="CLUSTER" class="org.jboss.logging.appender.RollingFileAppender">
+ <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+ <param name="File" value="${jboss.server.log.dir}/cluster.log"/>
+ <param name="Append" value="false"/>
+ <param name="MaxFileSize" value="500KB"/>
+ <param name="MaxBackupIndex" value="1"/>
+
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/>
+ </layout>
+ </appender>
+ -->
+
+ <!-- ================ -->
+ <!-- Limit categories -->
+ <!-- ================ -->
+
+ <category name="org.jboss.ha">
+ <priority value="INFO" />
+ </category>
+]]></replacevalue>
+
+ </replace>
+
+ <replace file="${install.production.conf}/jboss-log4j.xml"
+ summary="true">
+
+ <replacetoken><![CDATA[
+ <!-- ================ -->
+ <!-- Limit categories -->
+ <!-- ================ -->
+]]></replacetoken>
+
+ <replacevalue><![CDATA[
+ <!-- ================ -->
+ <!-- Limit categories -->
+ <!-- ================ -->
+
+ <category name="org.jboss.web">
+ <priority value="INFO" />
+ </category>
+]]></replacevalue>
+
+ </replace>
+
+ <!-- Increase time between scans for hot deploy -->
+
+ <replace file="${install.production.conf}/jboss-minimal.xml"
+ summary="true">
+
+ <replacetoken><![CDATA[
+ <attribute name="ScanPeriod">5000</attribute>
+]]></replacetoken>
+
+ <replacevalue><![CDATA[
+ <attribute name="ScanPeriod">60000</attribute>
+]]></replacevalue>
+
+ </replace>
+
+ <replace file="${install.production.conf}/jboss-service.xml"
+ summary="true">
+
+ <replacetoken><![CDATA[
+ <attribute name="ScanPeriod">5000</attribute>
+]]></replacetoken>
+
+ <replacevalue><![CDATA[
+ <attribute name="ScanPeriod">60000</attribute>
+]]></replacevalue>
+
+ </replace>
+
+ <!-- Disable connection close debug monitoring -->
+
+ <replace file="${install.production}/deploy/jbossjca-service.xml"
+ summary="true">
+
+ <replacetoken><![CDATA[
+ <!-- Enable connection close debug monitoring -->
+ <attribute name="Debug">true</attribute>
+]]></replacetoken>
+
+ <replacevalue><![CDATA[
+ <!-- Enable connection close debug monitoring -->
+ <attribute name="Debug">false</attribute>
+]]></replacevalue>
+
+ </replace>
+ </target>
+
+ <!-- Before executing <replace> task on Windows, convert the target files from -->
+ <!-- UNIX line termination (LF) to Windows line termination (CRLF) so that -->
+ <!-- <replace> does not break due to line termination inconsistencies -->
+ <target name="fixEOL" depends="check.windows" if="is.windows">
+ <echo message="Fixing EOL characters for multi-line text replacement on Windows"/>
+ <fixcrlf srcdir="${install.bin}" includes="run.conf" eol="crlf"/>
+ <fixcrlf srcdir="${install.bin}" includes="run.sh" eol="crlf"/>
+ <fixcrlf srcdir="${install.production}/deploy/uuid-key-generator.sar/META-INF" includes="jboss-service.xml" eol="crlf"/>
+ <fixcrlf srcdir="${install.production}/deploy-hasingleton/jms" includes="jbossmq-destinations-service.xml" eol="crlf"/>
+ <fixcrlf srcdir="${install.production.conf}" includes="jboss-log4j.xml" eol="crlf"/>
+ <fixcrlf srcdir="${install.production.conf}" includes="jboss-minimal.xml" eol="crlf"/>
+ <fixcrlf srcdir="${install.production.conf}" includes="jboss-service.xml" eol="crlf"/>
+ <fixcrlf srcdir="${install.production}/deploy" includes="jbossjca-service.xml" eol="crlf"/>
+ </target>
+
<!-- set proxy settings -->
<condition property="hasproxyauth">
<and>
@@ -868,5 +1302,11 @@
<setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}" proxyuser="${proxy.username}" proxypassword="${proxy.password}"/>
</target>
+ <target name="check.windows">
+ <condition property="is.windows">
+ <os family="windows"/>
+ </condition>
+ </target>
+
</project>
Modified: branches/JBPAPP_4_2/console/src/resources/webconsole.war/WEB-INF/classes/web-console-users.properties
===================================================================
--- branches/JBPAPP_4_2/console/src/resources/webconsole.war/WEB-INF/classes/web-console-users.properties 2007-09-11 18:18:20 UTC (rev 65304)
+++ branches/JBPAPP_4_2/console/src/resources/webconsole.war/WEB-INF/classes/web-console-users.properties 2007-09-11 21:15:24 UTC (rev 65305)
@@ -1,2 +1,2 @@
# A sample users.properties file for use with the UsersRolesLoginModule
-admin=admin
+#admin=admin
Modified: branches/JBPAPP_4_2/console/src/resources/webconsole.war/WEB-INF/jboss-web.xml
===================================================================
--- branches/JBPAPP_4_2/console/src/resources/webconsole.war/WEB-INF/jboss-web.xml 2007-09-11 18:18:20 UTC (rev 65304)
+++ branches/JBPAPP_4_2/console/src/resources/webconsole.war/WEB-INF/jboss-web.xml 2007-09-11 21:15:24 UTC (rev 65305)
@@ -8,9 +8,8 @@
<!-- Uncomment the security-domain to enable security. You will
need to edit the htmladaptor login configuration to setup the
- login modules used to authentication users.
+ login modules used to authentication users. -->
<security-domain>java:/jaas/web-console</security-domain>
- -->
<!-- The war depends on the -->
<depends>jboss.admin:service=PluginManager</depends>
Modified: branches/JBPAPP_4_2/console/src/resources/webconsole.war/WEB-INF/web.xml
===================================================================
--- branches/JBPAPP_4_2/console/src/resources/webconsole.war/WEB-INF/web.xml 2007-09-11 18:18:20 UTC (rev 65304)
+++ branches/JBPAPP_4_2/console/src/resources/webconsole.war/WEB-INF/web.xml 2007-09-11 21:15:24 UTC (rev 65305)
@@ -338,7 +338,7 @@
<!-- A security constraint that restricts access to the HTML JMX console
to users with the role JBossAdmin. Edit the roles to what you want and
uncomment the WEB-INF/jboss-web.xml/security-domain element to enable
- secured access to the HTML JMX console.
+ secured access to the HTML JMX console. -->
<security-constraint>
<web-resource-collection>
@@ -354,7 +354,6 @@
<role-name>JBossAdmin</role-name>
</auth-constraint>
</security-constraint>
- -->
<login-config>
<auth-method>BASIC</auth-method>
Property changes on: branches/JBPAPP_4_2/ejb3
___________________________________________________________________
Name: subclipse:tags
- 61366,trunk,/trunk/ejb3,branch
61085,JBoss_4_2_0_CR1,/tags/JBoss_4_2_0_CR1/ejb3,tag
62356,JBoss_4_2_0_CR2,/tags/JBoss_4_2_0_CR2/ejb3,tag
63000,JBoss_4_2_0_GA,/tags/JBoss_4_2_0_GA/ejb3,tag
+ 61366,trunk,/trunk/ejb3,branch
63934,Branch_4_2,/branches/Branch_4_2/ejb3,branch
61085,JBoss_4_2_0_CR1,/tags/JBoss_4_2_0_CR1/ejb3,tag
62356,JBoss_4_2_0_CR2,/tags/JBoss_4_2_0_CR2/ejb3,tag
63000,JBoss_4_2_0_GA,/tags/JBoss_4_2_0_GA/ejb3,tag
Modified: branches/JBPAPP_4_2/ejb3/build-test.xml
===================================================================
--- branches/JBPAPP_4_2/ejb3/build-test.xml 2007-09-11 18:18:20 UTC (rev 65304)
+++ branches/JBPAPP_4_2/ejb3/build-test.xml 2007-09-11 21:15:24 UTC (rev 65305)
@@ -840,11 +840,12 @@
<fileset dir="${build.classes}">
<include name="org/jboss/ejb3/test/webservices/jsr181/EJB3*.class"/>
<include name="org/jboss/ejb3/test/webservices/jsr181/Stateless*.class"/>
+ <include name="org/jboss/ejb3/test/webservices/jsr181/Injected*.class"/>
</fileset>
<fileset dir="${resources}/test/webservices">
<include name="META-INF/ejb-jar.xml"/>
<!-- TODO: Wolf: This is plain silly. I have to include the wsdl the container is about to generate to get injection to work. -->
- <include name="META-INF/wsdl/*.wsdl"/>
+ <!--include name="META-INF/wsdl/*.wsdl"/-->
</fileset>
</jar>
@@ -859,6 +860,13 @@
<include name="META-INF/wsdl/*.wsdl"/>
</fileset>
</jar>
+
+ <ear earfile="${build.lib}/jsr181.ear" appxml="${resources}/test/webservices/application.xml">
+ <zipfileset dir="${build.lib}">
+ <include name="jsr181.jar"/>
+ <include name="jsr181-client.jar"/>
+ </zipfileset>
+ </ear>
</target>
<target name="interceptors"
@@ -1838,6 +1846,19 @@
<build-simple-jar name="ejbthree963"/>
</target>
+ <target name="ejbthree994"
+ description="Builds a simple jar files."
+ depends="compile-classes">
+
+ <build-simple-jar name="ejbthree994"/>
+
+ <copy todir="${build.lib}">
+ <fileset dir="${resources}/test/ejbthree994">
+ <include name="ejbthree994-connectors-service.xml"/>
+ </fileset>
+ </copy>
+ </target>
+
<target name="jbas4489"
description="Builds a simple jar files."
depends="compile-classes">
@@ -2666,8 +2687,8 @@
<include name="security-spec.sar"/>
</fileset>
<fileset dir="${resources}/test/security">
- <include name="META-INF/ejb-jar.xml"/>
- </fileset>
+ <include name="META-INF/ejb-jar.xml"/>
+ </fileset>
</jar>
<jar jarfile="${build.lib}/timer-runas-security.jar">
@@ -2785,6 +2806,19 @@
</jar>
</target>
+ <target name="removedislocal"
+ description="Builds all jar files."
+ depends="compile-classes">
+
+ <mkdir dir="${build.lib}"/>
+
+ <jar jarfile="${build.lib}/removedislocal-test.jar">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/ejb3/test/removedislocal/*.class"/>
+ </fileset>
+ </jar>
+ </target>
+
<target name="defaultremotebindings"
description="Builds all jar files."
depends="compile-classes">
@@ -3298,10 +3332,10 @@
</copy>
</target>
- <target name="jars" depends="statelesscreation, defaultremotebindings, localfromremote, clusteredjms, entityoptimisticlocking, concurrentnaming, propertyreplacement, persistenceunits, invalidtxmdb, descriptortypo, libdeployment, homeinterface, timestampentity, servicexmbean, arjuna, mdbtransactions, unauthenticatedprincipal, clusteredservice, invoker, classloader,
+ <target name="jars" depends="removedislocal, statelesscreation, defaultremotebindings, localfromremote, clusteredjms, entityoptimisticlocking, concurrentnaming, propertyreplacement, persistenceunits, invalidtxmdb, descriptortypo, libdeployment, homeinterface, timestampentity, servicexmbean, arjuna, mdbtransactions, unauthenticatedprincipal, clusteredservice, invoker, classloader,
circulardependency, jsp, timerdependency, servicedependency, servlet, stateless14, webservices, ear, ejbthree440,
ejbthree454, ejbthree653, ejbthree670, ejbthree712, ejbthree724, ejbthree751, ejbthree832, ejbthree921,
- ejbthree959, ejbthree963,
+ ejbthree959, ejbthree963, ejbthree994,
jbas4489,
aspectdomain, ejbcontext, schema, mail, scopedclassloader, dependency, jaxws,
pkg, securitydomain, enventry,
@@ -3576,13 +3610,13 @@
<antcall target="ssl-advanced-test" inheritRefs="true"/>
<antcall target="jacc-test" inheritRefs="true"/>
<antcall target="clustered-tests" inheritRefs="true"/>
- <antcall target="clustered-jms-test" inheritRefs="true"/>
+ <antcall target="clustered-jms-test" inheritRefs="true"/>
<antcall target="invoker-test" inheritRefs="true"/>
<antcall target="iiop-tests" inheritRefs="true"/>
- <antcall target="arjuna-test" inheritRefs="true"/>
<antcall target="libdeployment-test" inheritRefs="true"/>
<antcall target="multi-instance-localfromremote-test" inheritRefs="true"/>
<antcall target="statelesscreation-test" inheritRefs="true"/>
+ <antcall target="removedislocal-test" inheritRefs="true"/>
</target>
<target name="no-start-jboss-tests" depends="init" description="Execute all tests">
@@ -3615,6 +3649,9 @@
<target name="no-start-jboss-ejb-tests" depends="init" description="Execute all tests">
<antcall target="test" inheritRefs="true">
+ <param name="test" value="arjuna"/>
+ </antcall>
+ <antcall target="test" inheritRefs="true">
<param name="test" value="webservices"/>
</antcall>
<antcall target="test" inheritRefs="true">
@@ -3839,6 +3876,9 @@
<param name="test" value="ejbthree963"/>
</antcall>
<antcall target="test" inheritRefs="true">
+ <param name="test" value="ejbthree994"/>
+ </antcall>
+ <antcall target="test" inheritRefs="true">
<param name="test" value="jbas4489"/>
</antcall>
</target>
@@ -3987,26 +4027,6 @@
</target>
- <target name="arjuna-test" depends="init">
- <create-config baseconf="default" newconf="arjuna" jboss.dist="${ejb3.dist}">
- <patternset>
- <include name="conf/**"/>
- <include name="deploy*/**"/>
- <include name="lib/**"/>
- </patternset>
- </create-config>
-
- <start-jboss conf="arjuna" host="${node0}" jboss.dist="${ejb3.dist}" jvmargs="${ejb3.jboss.jvmargs}"/>
- <wait-on-host/>
-
- <antcall target="test" inheritRefs="true">
- <param name="test" value="arjuna"/>
- </antcall>
-
- <stop-jboss jboss.dist="${ejb3.dist}"/>
- <wait-on-shutdown conf="arjuna"/>
- </target>
-
<target name="libdeployment-test" depends="init">
<create-config baseconf="all" newconf="libdeployment" jboss.dist="${ejb3.dist}">
<patternset>
@@ -4175,8 +4195,30 @@
</antcall>
<stop-jboss url="${node0.jndi.url}" jboss.dist="${ejb3.dist}"/>
+ <wait-on-shutdown conf="all"/>
</target>
+ <target name="removedislocal-test">
+ <create-config baseconf="all" newconf="removedislocal">
+ <patternset>
+ <include name="conf/**"/>
+ <include name="deploy*/**"/>
+ <include name="lib/**"/>
+ </patternset>
+ </create-config>
+
+ <start-jboss conf="removedislocal" host="${node0}" jvmargs="${ejb3.jboss.jvmargs}"/>
+ <wait-on-host/>
+
+ <antcall target="test-with-jvmargs" inheritRefs="true">
+ <param name="test" value="removedislocal"/>
+ <param name="jvmargs" value=""/>
+ </antcall>
+
+ <stop-jboss url="${node0.jndi.url}" jboss.dist="${ejb3.dist}"/>
+ <wait-on-shutdown conf="all"/>
+ </target>
+
<target name="multi-instance-localfromremote-test">
<create-config baseconf="default" newconf="localfromremote1">
<patternset>
@@ -4206,10 +4248,12 @@
<stop-jboss url="${node0.jndi.url}" jboss.dist="${ejb3.dist}"/>
<stop-jboss url="${node0.jndi.port1.url}" jboss.dist="${ejb3.dist}"/>
+ <wait-on-shutdown conf="localfromremote1"/>
+ <wait-on-shutdown conf="localfromremote2"/>
</target>
<target name="clustered-jms-test">
- <create-config baseconf="all" newconf="clusteredjms">
+ <create-config baseconf="all" newconf="clusteredjms" jboss.dist="${ejb3.dist}">
<patternset>
<include name="conf/**"/>
<include name="deploy*/**"/>
@@ -4217,7 +4261,7 @@
<include name="deploy-hasingleton/**"/>
</patternset>
</create-config>
- <create-config baseconf="clusteredjms" newconf="clusteredjms2">
+ <create-config baseconf="clusteredjms" newconf="clusteredjms2" jboss.dist="${ejb3.dist}">
<patternset>
<include name="conf/**"/>
<include name="deploy*/**"/>
@@ -4226,10 +4270,10 @@
</patternset>
</create-config>
- <start-jboss conf="clusteredjms2" host="${node1}" jboss.dist="${ejb3.dist}" jvmargs="${ejb3.jboss.jvmargs}"/>
- <antcall target="tests-clusteredjms2-wait"/>
- <start-jboss conf="clusteredjms" host="${node0}" jboss.dist="${ejb3.dist}" jvmargs="${ejb3.jboss.jvmargs}"/>
- <antcall target="tests-clusteredjms-wait"/>
+ <start-jboss conf="clusteredjms2" host="${node1}" jboss.dist="${ejb3.dist}" jvmargs="${ejb3.jboss.jvmargs}"/>
+ <antcall target="tests-clusteredjms2-wait"/>
+ <start-jboss conf="clusteredjms" host="${node0}" jboss.dist="${ejb3.dist}" jvmargs="${ejb3.jboss.jvmargs}"/>
+ <antcall target="tests-clusteredjms-wait"/>
<antcall target="test-with-jvmargs" inheritRefs="true">
<param name="test" value="clusteredjms"/>
@@ -4239,52 +4283,54 @@
<stop-jboss url="${node0.jndi.url}" jboss.dist="${ejb3.dist}"/>
<stop-jboss url="${node1.jndi.url}" jboss.dist="${ejb3.dist}"/>
+ <wait-on-shutdown conf="clusteredjms"/>
+ <wait-on-shutdown conf="clusteredjms2"/>
</target>
- <target name="tests-clustering-wait" unless="${tests.clustering.skip.startup}">
+ <target name="tests-multi-instance-wait" unless="${tests.clustering.skip.startup}">
<echo message="Waiting for nodes to start..."/>
<waitfor maxwait="120" maxwaitunit="second"
checkevery="5" checkeveryunit="second" timeoutproperty="cluster.timeout">
<and>
<http url="${node0.http.url}"/>
- <http url="${node1.http.url}"/>
+ <http url="${node0.http.port1.url}"/>
</and>
</waitfor>
<fail message="Timeout waiting for nodes to start" if="cluster.timeout"/>
<echo message="Nodes have started, waiting for cluster to stablize..."/>
</target>
-
- <target name="tests-clusteredjms-wait" unless="${tests.clustering.skip.startup}">
- <echo message="Waiting for node to start..."/>
+
+ <target name="tests-clustering-wait" unless="${tests.clustering.skip.startup}">
+ <echo message="Waiting for nodes to start..."/>
<waitfor maxwait="120" maxwaitunit="second"
checkevery="5" checkeveryunit="second" timeoutproperty="cluster.timeout">
<and>
<http url="${node0.http.url}"/>
+ <http url="${node1.http.url}"/>
</and>
</waitfor>
<fail message="Timeout waiting for nodes to start" if="cluster.timeout"/>
<echo message="Nodes have started, waiting for cluster to stablize..."/>
</target>
- <target name="tests-clusteredjms2-wait" unless="${tests.clustering.skip.startup}">
+ <target name="tests-clusteredjms-wait" unless="${tests.clustering.skip.startup}">
<echo message="Waiting for node to start..."/>
<waitfor maxwait="120" maxwaitunit="second"
checkevery="5" checkeveryunit="second" timeoutproperty="cluster.timeout">
<and>
- <http url="${node1.http.url}"/>
+ <http url="${node0.http.url}"/>
</and>
</waitfor>
<fail message="Timeout waiting for nodes to start" if="cluster.timeout"/>
<echo message="Nodes have started, waiting for cluster to stablize..."/>
</target>
- <target name="tests-multi-instance-wait" unless="${tests.clustering.skip.startup}">
- <echo message="Waiting for nodes to start..."/>
+ <target name="tests-clusteredjms2-wait" unless="${tests.clustering.skip.startup}">
+ <echo message="Waiting for node to start..."/>
<waitfor maxwait="120" maxwaitunit="second"
checkevery="5" checkeveryunit="second" timeoutproperty="cluster.timeout">
<and>
- <http url="${node0.http.url}"/>
- <http url="${node0.http.port1.url}"/>
+ <http url="${node1.http.url}"/>
</and>
</waitfor>
<fail message="Timeout waiting for nodes to start" if="cluster.timeout"/>
@@ -4332,6 +4378,8 @@
<target name="tests-clustering-shutdown" unless="${tests.clustering.skip.startup}">
<stop-jboss url="${node0.jndi.url}" jboss.dist="${ejb3.dist}"/>
<stop-jboss url="${node1.jndi.url}" jboss.dist="${ejb3.dist}"/>
+ <wait-on-shutdown conf="node0"/>
+ <wait-on-shutdown conf="node1"/>
</target>
<!-- ================================================================== -->
Modified: branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/BaseSessionContext.java
===================================================================
--- branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/BaseSessionContext.java 2007-09-11 18:18:20 UTC (rev 65304)
+++ branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/BaseSessionContext.java 2007-09-11 21:15:24 UTC (rev 65305)
@@ -215,7 +215,7 @@
throw new IllegalStateException(msg);
}
- // Ensure that you go through the security role references that may be configured
+ //Ensure that you go through the security role references that may be configured
EJBContainer ejbc = (EJBContainer)container;
if(ejbc.getXml() != null)
{
Modified: branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/EJB3Util.java
===================================================================
--- branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/EJB3Util.java 2007-09-11 18:18:20 UTC (rev 65304)
+++ branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/EJB3Util.java 2007-09-11 21:15:24 UTC (rev 65305)
@@ -22,6 +22,7 @@
package org.jboss.ejb3;
import java.util.Hashtable;
+import javax.naming.Context;
import javax.naming.InitialContext;
import javax.naming.NamingException;
import javassist.bytecode.AnnotationsAttribute;
Modified: branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/EJBContainer.java
===================================================================
--- branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/EJBContainer.java 2007-09-11 18:18:20 UTC (rev 65304)
+++ branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/EJBContainer.java 2007-09-11 21:15:24 UTC (rev 65305)
@@ -437,8 +437,7 @@
{
try
{
- InitialContext ctx = InitialContextFactory.getInitialContext(initialContextProperties);
- return ctx;
+ return InitialContextFactory.getInitialContext(initialContextProperties);
}
catch (NamingException e)
{
Modified: branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/InitialContextFactory.java
===================================================================
--- branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/InitialContextFactory.java 2007-09-11 18:18:20 UTC (rev 65304)
+++ branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/InitialContextFactory.java 2007-09-11 21:15:24 UTC (rev 65305)
@@ -51,7 +51,7 @@
public static InitialContext getInitialContext() throws NamingException
{
InitialContext jndiContext;
-
+
if (props == null)
{
if (baseInitialContext == null)
@@ -152,6 +152,5 @@
securityProperties.put(Context.INITIAL_CONTEXT_FACTORY, "org.jboss.security.jndi.JndiLoginInitialContextFactory");
}
}
-
}
Modified: branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/ThreadlocalPool.java
===================================================================
--- branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/ThreadlocalPool.java 2007-09-11 18:18:20 UTC (rev 65304)
+++ branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/ThreadlocalPool.java 2007-09-11 21:15:24 UTC (rev 65305)
@@ -34,8 +34,8 @@
*/
public class ThreadlocalPool extends AbstractPool
{
-private static final Logger log = Logger.getLogger(ThreadlocalPool.class);
-
+ private static final Logger log = Logger.getLogger(ThreadlocalPool.class);
+
protected Pool pool = new InfinitePool();
protected WeakThreadLocal<BeanContext> currentBeanContext = new WeakThreadLocal<BeanContext>();
private int inUse = 0;
@@ -44,7 +44,7 @@
public ThreadlocalPool()
{
}
-
+
protected BeanContext create()
{
return pool.get();
@@ -54,7 +54,7 @@
{
return pool.get(initTypes, initValues);
}
-
+
public void discard(BeanContext obj)
{
pool.discard(obj);
@@ -93,7 +93,7 @@
return ctx;
}
-
+
public BeanContext get(Class[] initTypes, Object[] initValues)
{
BeanContext ctx = null;
@@ -113,7 +113,7 @@
return ctx;
}
-
+
public void initialize(Container container, Class contextClass, Class beanClass, int maxSize, long timeout)
{
pool.initialize(container, contextClass, beanClass, maxSize, timeout);
@@ -166,7 +166,7 @@
{
return maxSize;
}
-
+
public int getRemoveCount()
{
return pool.getRemoveCount();
Modified: branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/client/ClientContainer.java
===================================================================
--- branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/client/ClientContainer.java 2007-09-11 18:18:20 UTC (rev 65304)
+++ branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/client/ClientContainer.java 2007-09-11 21:15:24 UTC (rev 65305)
@@ -35,12 +35,14 @@
import javax.annotation.PostConstruct;
import javax.naming.Context;
+import javax.naming.InitialContext;
import javax.naming.NameClassPair;
import javax.naming.NameNotFoundException;
import javax.naming.NamingEnumeration;
import org.jboss.ejb3.Container;
import org.jboss.ejb3.DependencyPolicy;
+import org.jboss.ejb3.EJB3Util;
import org.jboss.ejb3.InitialContextFactory;
import org.jboss.ejb3.entity.PersistenceUnitDeployment;
import org.jboss.ejb3.metamodel.ApplicationClientDD;
Modified: branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3ClientDeployer.java
===================================================================
--- branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3ClientDeployer.java 2007-09-11 18:18:20 UTC (rev 65304)
+++ branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3ClientDeployer.java 2007-09-11 21:15:24 UTC (rev 65305)
@@ -24,6 +24,7 @@
import org.jboss.deployers.plugins.deployers.helpers.AbstractSimpleRealDeployer;
import org.jboss.deployers.spi.DeploymentException;
import org.jboss.deployers.spi.deployer.DeploymentUnit;
+import org.jboss.ejb3.EJB3Util;
import org.jboss.ejb3.InitialContextFactory;
import org.jboss.ejb3.KernelAbstraction;
import org.jboss.ejb3.MCKernelAbstraction;
@@ -73,7 +74,7 @@
try
{
// I create the namespace here, because I destroy it in undeploy
- InitialContext iniCtx = InitialContextFactory.getInitialContext();
+ InitialContext iniCtx = InitialContextFactory.getInitialContext();;
Context encCtx = Util.createSubcontext(iniCtx, appClientName);
log.debug("Creating client ENC binding under: " + appClientName);
@@ -205,7 +206,7 @@
log.debug("Removing client ENC from: " + jndiName);
try
{
- InitialContext iniCtx = InitialContextFactory.getInitialContext();
+ InitialContext iniCtx = InitialContextFactory.getInitialContext();;
Util.unbind(iniCtx, jndiName);
}
catch(NameNotFoundException e)
Modified: branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/embedded/EJB3StandaloneDeployer.java
===================================================================
--- branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/embedded/EJB3StandaloneDeployer.java 2007-09-11 18:18:20 UTC (rev 65304)
+++ branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/embedded/EJB3StandaloneDeployer.java 2007-09-11 21:15:24 UTC (rev 65305)
@@ -45,6 +45,7 @@
import org.jboss.dependency.spi.ControllerContext;
import org.jboss.ejb3.DeploymentUnit;
+import org.jboss.ejb3.EJB3Util;
import org.jboss.ejb3.InitialContextFactory;
import org.jboss.ejb3.interceptor.InterceptorInfoRepository;
import org.jboss.kernel.Kernel;
@@ -317,6 +318,7 @@
public void setArchives(Set archives)
{
+ new Exception().printStackTrace();
this.archives = archives;
}
@@ -547,7 +549,7 @@
{
System.out.println("lookup " + name);
try {
- InitialContext jndiContext = InitialContextFactory.getInitialContext();
+ InitialContext jndiContext = InitialContextFactory.getInitialContext();;
NamingEnumeration names = jndiContext.list(name);
if (names != null){
while (names.hasMore()){
Modified: branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/embedded/JaasSecurityManagerService.java
===================================================================
--- branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/embedded/JaasSecurityManagerService.java 2007-09-11 18:18:20 UTC (rev 65304)
+++ branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/embedded/JaasSecurityManagerService.java 2007-09-11 21:15:24 UTC (rev 65305)
@@ -22,6 +22,7 @@
package org.jboss.ejb3.embedded;
+import org.jboss.ejb3.EJB3Util;
import org.jboss.ejb3.InitialContextFactory;
import org.jboss.ejb3.naming.BrainlessContext;
import org.jboss.logging.Logger;
Modified: branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/iiop/IORFactory.java
===================================================================
--- branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/iiop/IORFactory.java 2007-09-11 18:18:20 UTC (rev 65304)
+++ branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/iiop/IORFactory.java 2007-09-11 21:15:24 UTC (rev 65305)
@@ -37,6 +37,7 @@
import org.jboss.annotation.ejb.RemoteBinding;
import org.jboss.aop.Advisor;
import org.jboss.ejb3.Container;
+import org.jboss.ejb3.EJB3Util;
import org.jboss.ejb3.InitialContextFactory;
import org.jboss.ejb3.NonSerializableFactory;
import org.jboss.ejb3.ProxyFactoryHelper;
Modified: branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/EjbJarDDObjectFactory.java
===================================================================
--- branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/EjbJarDDObjectFactory.java 2007-09-11 18:18:20 UTC (rev 65304)
+++ branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/EjbJarDDObjectFactory.java 2007-09-11 21:15:24 UTC (rev 65305)
@@ -807,11 +807,6 @@
parent.addCmpField(field);
}
- public void addChild(EntityEnterpriseBean parent, SecurityRoleRef roleRef, UnmarshallingContext navigator, String namespaceURI, String localName)
- {
- parent.addSecurityRoleRef(roleRef);
- }
-
/**
* Called when parsing character is complete.
*/
Modified: branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/EnterpriseBean.java
===================================================================
--- branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/EnterpriseBean.java 2007-09-11 18:18:20 UTC (rev 65304)
+++ branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/EnterpriseBean.java 2007-09-11 21:15:24 UTC (rev 65305)
@@ -28,12 +28,12 @@
import javax.ejb.TransactionManagementType;
import org.jboss.logging.Logger;
-import org.jboss.metamodel.descriptor.SecurityRoleRef;
import org.jboss.metamodel.descriptor.EnvironmentRefGroup;
import org.jboss.metamodel.descriptor.InjectionTarget;
import org.jboss.metamodel.descriptor.MessageDestinationRef;
import org.jboss.metamodel.descriptor.ResourceEnvRef;
import org.jboss.metamodel.descriptor.ResourceRef;
+import org.jboss.metamodel.descriptor.SecurityRoleRef;
/**
* Represents an EJB element of the ejb-jar.xml deployment descriptor for the
Modified: branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/naming/SimpleMultiplexer.java
===================================================================
--- branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/naming/SimpleMultiplexer.java 2007-09-11 18:18:20 UTC (rev 65304)
+++ branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/naming/SimpleMultiplexer.java 2007-09-11 21:15:24 UTC (rev 65305)
@@ -31,6 +31,7 @@
import javax.naming.NamingException;
import javax.naming.spi.ObjectFactory;
+import org.jboss.ejb3.EJB3Util;
import org.jboss.ejb3.InitialContextFactory;
import org.jboss.logging.Logger;
Modified: branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/proxy/handle/HomeHandleImpl.java
===================================================================
--- branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/proxy/handle/HomeHandleImpl.java 2007-09-11 18:18:20 UTC (rev 65304)
+++ branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/proxy/handle/HomeHandleImpl.java 2007-09-11 21:15:24 UTC (rev 65305)
@@ -34,6 +34,7 @@
import java.io.ObjectOutputStream;
import java.util.Hashtable;
+import org.jboss.ejb3.EJB3Util;
import org.jboss.ejb3.InitialContextFactory;
import org.jboss.naming.NamingContextFactory;
Modified: branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/service/ServiceRemoteProxy.java
===================================================================
--- branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/service/ServiceRemoteProxy.java 2007-09-11 18:18:20 UTC (rev 65304)
+++ branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/service/ServiceRemoteProxy.java 2007-09-11 21:15:24 UTC (rev 65305)
@@ -32,7 +32,6 @@
import org.jboss.aspects.asynch.AsynchProvider;
import org.jboss.aspects.remoting.InvokeRemoteInterceptor;
import org.jboss.ejb3.Container;
-import org.jboss.ejb3.Ejb3Registry;
import org.jboss.ejb3.JBossProxy;
import org.jboss.ejb3.ProxyUtils;
import org.jboss.ejb3.asynchronous.AsynchronousInterceptor;
Modified: branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/session/BaseSessionProxyFactory.java
===================================================================
--- branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/session/BaseSessionProxyFactory.java 2007-09-11 18:18:20 UTC (rev 65304)
+++ branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/session/BaseSessionProxyFactory.java 2007-09-11 21:15:24 UTC (rev 65305)
@@ -50,7 +50,7 @@
* @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
* @version $Revision$
*/
-public abstract class BaseSessionProxyFactory implements ProxyFactory , Externalizable
+public abstract class BaseSessionProxyFactory implements ProxyFactory, Externalizable
{
private static final Logger log = Logger.getLogger(BaseSessionProxyFactory.class);
@@ -94,7 +94,7 @@
proxy.setHomeHandle(getHomeHandle());
proxy.setEjbMetaData(getEjbMetaData());
}
-
+
protected HomeHandle getHomeHandle()
{
EJBContainer ejbContainer = (EJBContainer)container;
Modified: branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/stateful/BaseStatefulProxyFactory.java
===================================================================
--- branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/stateful/BaseStatefulProxyFactory.java 2007-09-11 18:18:20 UTC (rev 65304)
+++ branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/stateful/BaseStatefulProxyFactory.java 2007-09-11 21:15:24 UTC (rev 65305)
@@ -94,7 +94,6 @@
{
super.writeExternal(out);
}
-
- protected abstract void initializeJndiName();
+ protected abstract void initializeJndiName();
}
Modified: branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/stateful/StatefulBeanContext.java
===================================================================
--- branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/stateful/StatefulBeanContext.java 2007-09-11 18:18:20 UTC (rev 65304)
+++ branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/stateful/StatefulBeanContext.java 2007-09-11 21:15:24 UTC (rev 65305)
@@ -87,7 +87,7 @@
protected HashMap<String, EntityManager> persistenceContexts;
protected boolean removed;
-
+
protected String containerClusterUid;
protected String containerGuid;
protected boolean isClustered = false;
@@ -740,7 +740,6 @@
}
return container;
-
}
@Override
@@ -834,6 +833,7 @@
out.writeLong(lastUsed);
out.writeBoolean(isClustered);
+
if (beanMO == null)
{
Object[] beanAndInterceptors = new Object[4];
Modified: branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/stateful/StatefulClusterProxyFactory.java
===================================================================
--- branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/stateful/StatefulClusterProxyFactory.java 2007-09-11 18:18:20 UTC (rev 65304)
+++ branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/stateful/StatefulClusterProxyFactory.java 2007-09-11 21:15:24 UTC (rev 65305)
@@ -63,7 +63,7 @@
{
private static final Logger log = Logger.getLogger(StatefulClusterProxyFactory.class);
- public static final String FACTORY_ATTRIBUTE = ",element=ProxyFactory,partition=";
+// public static final String FACTORY_ATTRIBUTE = ",element=ProxyFactory,partition=";
private RemoteBinding binding;
private InvokerLocator locator;
@@ -131,6 +131,7 @@
namingException.setRootCause(e);
throw namingException;
}
+ assert !Dispatcher.singleton.isRegistered(targetId) : targetId + " is already registered";
Dispatcher.singleton.registerTarget(targetId, this);
}
@@ -195,10 +196,14 @@
return handle;
}
+ /**
+ * @return unique name for this proxy factory
+ */
protected String getTargetId()
- {
+ {
+ assert jndiName != null : "jndiName is null";
String partition = ((StatefulContainer) getContainer()).getPartitionName();
- return getContainer().getObjectName().getCanonicalName() + FACTORY_ATTRIBUTE + partition;
+ return jndiName + PROXY_FACTORY_NAME + "@" + partition;
}
public synchronized void replicantsChanged (String key,
Modified: branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/stateful/StatefulLocalProxy.java
===================================================================
--- branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/stateful/StatefulLocalProxy.java 2007-09-11 18:18:20 UTC (rev 65304)
+++ branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/stateful/StatefulLocalProxy.java 2007-09-11 21:15:24 UTC (rev 65305)
@@ -75,7 +75,7 @@
{
}
- //@Override
+ // @Override
public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException
{
super.readExternal(in);
Modified: branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/stateful/StatefulLocalProxyFactory.java
===================================================================
--- branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/stateful/StatefulLocalProxyFactory.java 2007-09-11 18:18:20 UTC (rev 65304)
+++ branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/stateful/StatefulLocalProxyFactory.java 2007-09-11 21:15:24 UTC (rev 65305)
@@ -27,18 +27,20 @@
import java.lang.reflect.InvocationTargetException;
import java.rmi.dgc.VMID;
+import javax.ejb.EJBException;
import javax.ejb.LocalHome;
import javax.naming.NamingException;
import org.jboss.annotation.ejb.LocalBinding;
import org.jboss.aop.Advisor;
+import org.jboss.ejb3.Container;
import org.jboss.ejb3.EJBContainer;
import org.jboss.ejb3.Ejb3Registry;
import org.jboss.ejb3.JBossProxy;
-import org.jboss.ejb3.NonSerializableFactory;
import org.jboss.ejb3.ProxyFactoryHelper;
import org.jboss.logging.Logger;
import org.jboss.naming.Util;
+
/**
* Comment
*
@@ -88,6 +90,11 @@
{
jndiName = ProxyFactoryHelper.getLocalJndiName(getContainer());
}
+
+ public VMID getVMID()
+ {
+ return vmid;
+ }
public void start() throws Exception
{
@@ -111,7 +118,7 @@
Class[] interfaces = {localHome.value()};
Object homeProxy = java.lang.reflect.Proxy.newProxyInstance(getContainer().getBeanClass().getClassLoader(),
interfaces, new StatefulLocalHomeProxy(getContainer()));
- NonSerializableFactory.rebind(getContainer().getInitialContext(), ProxyFactoryHelper.getLocalHomeJndiName(getContainer()), homeProxy);
+ Util.rebind(getContainer().getInitialContext(), ProxyFactoryHelper.getLocalHomeJndiName(getContainer()), homeProxy);
}
}
@@ -124,7 +131,7 @@
LocalHome localHome = (LocalHome) ((EJBContainer) getContainer()).resolveAnnotation(LocalHome.class);
if (localHome != null && !bindHomeAndBusinessTogether(statefulContainer))
{
- NonSerializableFactory.unbind(getContainer().getInitialContext(), ProxyFactoryHelper.getLocalHomeJndiName(getContainer()));
+ Util.unbind(getContainer().getInitialContext(), ProxyFactoryHelper.getLocalHomeJndiName(getContainer()));
}
}
Modified: branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/stateful/StatefulRemoteProxy.java
===================================================================
--- branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/stateful/StatefulRemoteProxy.java 2007-09-11 18:18:20 UTC (rev 65304)
+++ branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/stateful/StatefulRemoteProxy.java 2007-09-11 21:15:24 UTC (rev 65305)
@@ -34,6 +34,7 @@
import org.jboss.aspects.asynch.AsynchProvider;
import org.jboss.aspects.remoting.InvokeRemoteInterceptor;
import org.jboss.ejb3.Container;
+import org.jboss.ejb3.Ejb3Registry;
import org.jboss.ejb3.ProxyUtils;
import org.jboss.ejb3.asynchronous.AsynchronousInterceptor;
import org.jboss.ejb3.remoting.IsLocalInterceptor;
Modified: branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/stateful/StatefulRemoteProxyFactory.java
===================================================================
--- branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/stateful/StatefulRemoteProxyFactory.java 2007-09-11 18:18:20 UTC (rev 65304)
+++ branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/stateful/StatefulRemoteProxyFactory.java 2007-09-11 21:15:24 UTC (rev 65305)
@@ -55,7 +55,7 @@
{
private static final Logger log = Logger.getLogger(StatefulRemoteProxyFactory.class);
- public static final String FACTORY_ATTRIBUTE = ",element=ProxyFactory";
+// public static final String FACTORY_ATTRIBUTE = ",element=ProxyFactory";
private RemoteBinding binding;
private InvokerLocator locator;
@@ -127,6 +127,7 @@
namingException.setRootCause(e);
throw namingException;
}
+ assert !Dispatcher.singleton.isRegistered(targetId) : targetId + " is already registered";
Dispatcher.singleton.registerTarget(targetId, this);
StatefulContainer statefulContainer = (StatefulContainer) getContainer();
@@ -258,9 +259,13 @@
}
}
+ /**
+ * @return unique name for this proxy factory
+ */
protected String getTargetId()
{
- return getContainer().getObjectName().getCanonicalName() + FACTORY_ATTRIBUTE;
+ assert jndiName != null : "jndiName is null";
+ return jndiName + PROXY_FACTORY_NAME;
}
protected Object createPojiProxy(Object oid, Class[] interfaces, String uri) throws Exception
Modified: branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/stateless/BaseStatelessProxyFactory.java
===================================================================
--- branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/stateless/BaseStatelessProxyFactory.java 2007-09-11 18:18:20 UTC (rev 65304)
+++ branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/stateless/BaseStatelessProxyFactory.java 2007-09-11 21:15:24 UTC (rev 65305)
@@ -49,7 +49,7 @@
public abstract class BaseStatelessProxyFactory extends org.jboss.ejb3.session.BaseSessionProxyFactory implements ProxyFactory
{
private static final Logger log = Logger.getLogger(BaseStatelessProxyFactory.class);
-
+
/**
* Adapt the JDK to cglib.
*
@@ -221,6 +221,8 @@
Util.unbind(getContainer().getInitialContext(), jndiName);
}
+ protected abstract Class[] getInterfaces();
+
protected abstract void initializeJndiName();
protected void bindProxy(Object proxy) throws NamingException
@@ -237,5 +239,4 @@
}
}
-
}
Modified: branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/stateless/StatelessHandleImpl.java
===================================================================
--- branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/stateless/StatelessHandleImpl.java 2007-09-11 18:18:20 UTC (rev 65304)
+++ branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/stateless/StatelessHandleImpl.java 2007-09-11 21:15:24 UTC (rev 65305)
@@ -36,6 +36,7 @@
import javax.ejb.EJBObject;
import javax.ejb.EJBHome;
+import org.jboss.ejb3.EJB3Util;
import org.jboss.ejb3.InitialContextFactory;
import org.jboss.naming.NamingContextFactory;
Modified: branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/stateless/StatelessRemoteProxy.java
===================================================================
--- branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/stateless/StatelessRemoteProxy.java 2007-09-11 18:18:20 UTC (rev 65304)
+++ branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/stateless/StatelessRemoteProxy.java 2007-09-11 21:15:24 UTC (rev 65305)
@@ -99,7 +99,7 @@
sri.getMetaData().addMetaData(InvokeRemoteInterceptor.REMOTING, InvokeRemoteInterceptor.INVOKER_LOCATOR, uri, PayloadKey.AS_IS);
sri.getMetaData().addMetaData(InvokeRemoteInterceptor.REMOTING, InvokeRemoteInterceptor.SUBSYSTEM, "AOP", PayloadKey.AS_IS);
sri.getMetaData().addMetaData(IsLocalInterceptor.IS_LOCAL, IsLocalInterceptor.GUID, containerGuid, PayloadKey.AS_IS);
-
+
if (provider != null)
{
sri.getMetaData().addMetaData(AsynchronousInterceptor.ASYNCH, AsynchronousInterceptor.INVOKE_ASYNCH, "YES", PayloadKey.AS_IS);
Modified: branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/jboss/JBossTimerServiceFactory.java
===================================================================
--- branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/jboss/JBossTimerServiceFactory.java 2007-09-11 18:18:20 UTC (rev 65304)
+++ branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/jboss/JBossTimerServiceFactory.java 2007-09-11 21:15:24 UTC (rev 65305)
@@ -26,6 +26,7 @@
import org.jboss.ejb.txtimer.EJBTimerService;
import org.jboss.ejb3.Container;
+import org.jboss.ejb3.Ejb3Registry;
import org.jboss.ejb3.EJBContainer;
import org.jboss.ejb3.timerservice.TimedObjectInvoker;
import org.jboss.ejb3.timerservice.TimerServiceFactory;
Modified: branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/quartz/PersistentTimer.java
===================================================================
--- branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/quartz/PersistentTimer.java 2007-09-11 18:18:20 UTC (rev 65304)
+++ branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/quartz/PersistentTimer.java 2007-09-11 21:15:24 UTC (rev 65305)
@@ -57,20 +57,20 @@
private Serializable info;
- protected PersistentTimer(Trigger trigger, ObjectName objectName, Serializable info)
+ protected PersistentTimer(Trigger trigger, String containerGuid, Serializable info)
{
assert trigger != null;
- assert objectName != null;
+ assert containerGuid != null;
this.triggerName = trigger.getName();
this.triggerGroup = trigger.getGroup();
+ this.info = info;
this.containerGuid = containerGuid;
- this.info = info;
}
protected TimedObjectInvoker getTimedObjectInvoker()
{
-// TODO: a hack to get back the container. This needs thinking.
+ // TODO: a hack to get back the container. This needs thinking.
TimedObjectInvoker invoker = (TimedObjectInvoker) Ejb3Registry.getContainer(containerGuid);
assert invoker != null;
return invoker;
Modified: branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/quartz/QuartzTimerServiceFactory.java
===================================================================
--- branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/quartz/QuartzTimerServiceFactory.java 2007-09-11 18:18:20 UTC (rev 65304)
+++ branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/quartz/QuartzTimerServiceFactory.java 2007-09-11 21:15:24 UTC (rev 65305)
@@ -27,7 +27,6 @@
import java.util.Properties;
import javax.ejb.TimerService;
-import javax.management.ObjectName;
import javax.naming.InitialContext;
import javax.transaction.HeuristicMixedException;
import javax.transaction.HeuristicRollbackException;
Modified: branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/quartz/TimerServiceImpl.java
===================================================================
--- branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/quartz/TimerServiceImpl.java 2007-09-11 18:18:20 UTC (rev 65304)
+++ branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/quartz/TimerServiceImpl.java 2007-09-11 21:15:24 UTC (rev 65305)
@@ -31,6 +31,7 @@
import javax.management.ObjectName;
import org.jboss.ejb3.Container;
+import org.jboss.ejb3.Ejb3Registry;
import org.jboss.ejb3.timerservice.TimedObjectInvoker;
import org.jboss.logging.Logger;
import org.quartz.JobDetail;
@@ -79,7 +80,7 @@
Timer timer = new TimerImpl(scheduler, trigger, info);
- PersistentTimer persistentTimer = new PersistentTimer(trigger, objectName, info);
+ PersistentTimer persistentTimer = new PersistentTimer(trigger, Ejb3Registry.guid(container), info);
JobDetail jobDetail = new JobDetail(name, groupName, jobClass);
jobDetail.getJobDataMap().put("timer", persistentTimer);
Modified: branches/JBPAPP_4_2/ejb3/src/main/org/jboss/injection/JndiMethodInjector.java
===================================================================
--- branches/JBPAPP_4_2/ejb3/src/main/org/jboss/injection/JndiMethodInjector.java 2007-09-11 18:18:20 UTC (rev 65304)
+++ branches/JBPAPP_4_2/ejb3/src/main/org/jboss/injection/JndiMethodInjector.java 2007-09-11 21:15:24 UTC (rev 65305)
@@ -24,8 +24,10 @@
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import javax.naming.Context;
+import javax.naming.NameNotFoundException;
import javax.naming.NamingException;
import org.jboss.ejb3.BeanContext;
+import org.jboss.ejb3.EJB3Util;
import org.jboss.ejb3.JndiUtil;
import org.jboss.logging.Logger;
Modified: branches/JBPAPP_4_2/ejb3/src/main/org/jboss/injection/JndiPropertyInjector.java
===================================================================
--- branches/JBPAPP_4_2/ejb3/src/main/org/jboss/injection/JndiPropertyInjector.java 2007-09-11 18:18:20 UTC (rev 65304)
+++ branches/JBPAPP_4_2/ejb3/src/main/org/jboss/injection/JndiPropertyInjector.java 2007-09-11 21:15:24 UTC (rev 65305)
@@ -22,9 +22,11 @@
package org.jboss.injection;
import javax.naming.Context;
+import javax.naming.NameNotFoundException;
import javax.naming.NamingException;
import org.jboss.ejb3.BeanContext;
+import org.jboss.ejb3.EJB3Util;
import org.jboss.ejb3.JndiUtil;
import org.jboss.injection.lang.reflect.BeanProperty;
import org.jboss.logging.Logger;
Copied: branches/JBPAPP_4_2/ejb3/src/resources/test/ejbthree994 (from rev 65304, branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test/ejbthree994)
Deleted: branches/JBPAPP_4_2/ejb3/src/resources/test/ejbthree994/ejbthree994-connectors-service.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test/ejbthree994/ejbthree994-connectors-service.xml 2007-09-11 18:18:20 UTC (rev 65304)
+++ branches/JBPAPP_4_2/ejb3/src/resources/test/ejbthree994/ejbthree994-connectors-service.xml 2007-09-11 21:15:24 UTC (rev 65305)
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- JBoss EJB3Deployer
-
- $Id$
--->
-<server>
-
- <mbean code="org.jboss.remoting.transport.Connector"
- name="jboss.remoting:type=Connector,name=Ejbthree994Ejb3Connector,handler=ejb3">
- <attribute name="InvokerLocator">socket://${jboss.bind.address}:3874</attribute>
- <attribute name="Configuration">
- <handlers>
- <handler subsystem="AOP">org.jboss.aspects.remoting.AOPRemotingInvocationHandler</handler>
- </handlers>
- </attribute>
- </mbean>
-
-</server>
Copied: branches/JBPAPP_4_2/ejb3/src/resources/test/ejbthree994/ejbthree994-connectors-service.xml (from rev 65304, branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test/ejbthree994/ejbthree994-connectors-service.xml)
===================================================================
--- branches/JBPAPP_4_2/ejb3/src/resources/test/ejbthree994/ejbthree994-connectors-service.xml (rev 0)
+++ branches/JBPAPP_4_2/ejb3/src/resources/test/ejbthree994/ejbthree994-connectors-service.xml 2007-09-11 21:15:24 UTC (rev 65305)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ JBoss EJB3Deployer
+
+ $Id$
+-->
+<server>
+
+ <mbean code="org.jboss.remoting.transport.Connector"
+ name="jboss.remoting:type=Connector,name=Ejbthree994Ejb3Connector,handler=ejb3">
+ <attribute name="InvokerLocator">socket://${jboss.bind.address}:3874</attribute>
+ <attribute name="Configuration">
+ <handlers>
+ <handler subsystem="AOP">org.jboss.aspects.remoting.AOPRemotingInvocationHandler</handler>
+ </handlers>
+ </attribute>
+ </mbean>
+
+</server>
Modified: branches/JBPAPP_4_2/ejb3/src/resources/test/security/META-INF/ejb-jar.xml
===================================================================
--- branches/JBPAPP_4_2/ejb3/src/resources/test/security/META-INF/ejb-jar.xml 2007-09-11 18:18:20 UTC (rev 65304)
+++ branches/JBPAPP_4_2/ejb3/src/resources/test/security/META-INF/ejb-jar.xml 2007-09-11 21:15:24 UTC (rev 65305)
@@ -29,4 +29,9 @@
</security-role-ref>
</session>
</enterprise-beans>
+ <assembly-descriptor>
+ <security-role>
+ <role-name>Echo</role-name>
+ </security-role>
+ </assembly-descriptor>
</ejb-jar>
Copied: branches/JBPAPP_4_2/ejb3/src/resources/test/webservices/application.xml (from rev 65304, branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test/webservices/application.xml)
===================================================================
--- branches/JBPAPP_4_2/ejb3/src/resources/test/webservices/application.xml (rev 0)
+++ branches/JBPAPP_4_2/ejb3/src/resources/test/webservices/application.xml 2007-09-11 21:15:24 UTC (rev 65305)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE application PUBLIC '-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN' 'http://java.sun.com/dtd/application_1_3.dtd'>
+
+<application>
+ <module>
+ <ejb>jsr181.jar</ejb>
+ </module>
+
+ <module>
+ <ejb>jsr181-client.jar</ejb>
+ </module>
+</application>
+
+
Copied: branches/JBPAPP_4_2/ejb3/src/resources/test-configs/removedislocal (from rev 65304, branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/removedislocal)
Copied: branches/JBPAPP_4_2/ejb3/src/resources/test-configs/removedislocal/deploy (from rev 65304, branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/removedislocal/deploy)
Deleted: branches/JBPAPP_4_2/ejb3/src/resources/test-configs/removedislocal/deploy/ejb3-interceptors-aop.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/removedislocal/deploy/ejb3-interceptors-aop.xml 2007-09-11 18:18:20 UTC (rev 65304)
+++ branches/JBPAPP_4_2/ejb3/src/resources/test-configs/removedislocal/deploy/ejb3-interceptors-aop.xml 2007-09-11 21:15:24 UTC (rev 65305)
@@ -1,365 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE aop PUBLIC
- "-//JBoss//DTD JBOSS AOP 1.0//EN"
- "http://labs.jboss.com/portal/jbossaop/dtd/jboss-aop_1_0.dtd">
-
-<aop>
- <interceptor class="org.jboss.aspects.remoting.InvokeRemoteInterceptor" scope="PER_VM"/>
- <interceptor class="org.jboss.aspects.security.SecurityClientInterceptor" scope="PER_VM"/>
- <interceptor class="org.jboss.aspects.tx.ClientTxPropagationInterceptor" scope="PER_VM"/>
- <interceptor class="org.jboss.ejb3.remoting.IsLocalInterceptor" scope="PER_VM"/>
- <interceptor class="org.jboss.ejb3.remoting.ClusteredIsLocalInterceptor" scope="PER_VM"/>
- <interceptor class="org.jboss.aspects.remoting.ClusterChooserInterceptor" scope="PER_VM"/>
-
- <interceptor class="org.jboss.aspects.tx.TxPropagationInterceptor" scope="PER_VM"/>
-
- <stack name="ServiceClientInterceptors">
- <interceptor-ref name="org.jboss.ejb3.remoting.IsLocalInterceptor"/>
- <interceptor-ref name="org.jboss.aspects.security.SecurityClientInterceptor"/>
- <interceptor-ref name="org.jboss.aspects.tx.ClientTxPropagationInterceptor"/>
- <interceptor-ref name="org.jboss.aspects.remoting.InvokeRemoteInterceptor"/>
- </stack>
-
- <stack name="AsynchronousStatelessSessionClientInterceptors">
- <interceptor-ref name="org.jboss.ejb3.remoting.IsLocalInterceptor"/>
- <interceptor-ref name="org.jboss.aspects.security.SecurityClientInterceptor"/>
- <interceptor-ref name="org.jboss.aspects.tx.ClientTxPropagationInterceptor"/>
- <interceptor-ref name="org.jboss.aspects.remoting.InvokeRemoteInterceptor"/>
- </stack>
-
- <stack name="AsynchronousStatefulSessionClientInterceptors">
- <interceptor-ref name="org.jboss.ejb3.remoting.IsLocalInterceptor"/>
- <interceptor-ref name="org.jboss.aspects.security.SecurityClientInterceptor"/>
- <interceptor-ref name="org.jboss.aspects.tx.ClientTxPropagationInterceptor"/>
- <interceptor-ref name="org.jboss.aspects.remoting.InvokeRemoteInterceptor"/>
- </stack>
-
- <stack name="StatelessSessionClientInterceptors">
- <!--interceptor-ref name="org.jboss.ejb3.remoting.IsLocalInterceptor"/-->
- <interceptor-ref name="org.jboss.aspects.security.SecurityClientInterceptor"/>
- <interceptor-ref name="org.jboss.aspects.tx.ClientTxPropagationInterceptor"/>
- <interceptor-ref name="org.jboss.aspects.remoting.InvokeRemoteInterceptor"/>
- </stack>
-
- <stack name="StatefulSessionClientInterceptors">
- <interceptor-ref name="org.jboss.ejb3.remoting.IsLocalInterceptor"/>
- <interceptor-ref name="org.jboss.aspects.security.SecurityClientInterceptor"/>
- <interceptor-ref name="org.jboss.aspects.tx.ClientTxPropagationInterceptor"/>
- <interceptor-ref name="org.jboss.aspects.remoting.InvokeRemoteInterceptor"/>
- </stack>
-
- <stack name="ClusteredStatelessSessionClientInterceptors">
- <!--interceptor-ref name="org.jboss.ejb3.remoting.ClusteredIsLocalInterceptor"/-->
- <interceptor-ref name="org.jboss.aspects.security.SecurityClientInterceptor"/>
- <interceptor-ref name="org.jboss.aspects.tx.ClientTxPropagationInterceptor"/>
- <interceptor-ref name="org.jboss.aspects.remoting.ClusterChooserInterceptor"/>
- <interceptor-ref name="org.jboss.aspects.remoting.InvokeRemoteInterceptor"/>
- </stack>
-
- <stack name="ClusteredStatefulSessionClientInterceptors">
- <interceptor-ref name="org.jboss.ejb3.remoting.ClusteredIsLocalInterceptor"/>
- <interceptor-ref name="org.jboss.aspects.security.SecurityClientInterceptor"/>
- <interceptor-ref name="org.jboss.aspects.tx.ClientTxPropagationInterceptor"/>
- <interceptor-ref name="org.jboss.aspects.remoting.ClusterChooserInterceptor"/>
- <interceptor-ref name="org.jboss.aspects.remoting.InvokeRemoteInterceptor"/>
- </stack>
-
- <interceptor class="org.jboss.ejb3.asynchronous.AsynchronousInterceptor" scope="PER_CLASS"/>
- <interceptor class="org.jboss.ejb3.ENCPropagationInterceptor" scope="PER_VM"/>
- <interceptor name="Basic Authorization" factory="org.jboss.ejb3.security.RoleBasedAuthorizationInterceptorFactory" scope="PER_CLASS"/>
- <interceptor name="JACC Authorization" factory="org.jboss.ejb3.security.JaccAuthorizationInterceptorFactory" scope="PER_CLASS"/>
- <interceptor factory="org.jboss.ejb3.security.AuthenticationInterceptorFactory" scope="PER_CLASS"/>
- <interceptor factory="org.jboss.ejb3.security.RunAsSecurityInterceptorFactory" scope="PER_CLASS"/>
- <interceptor class="org.jboss.ejb3.entity.ExtendedPersistenceContextPropagationInterceptor" scope="PER_VM"/>
- <interceptor class="org.jboss.ejb3.stateless.StatelessInstanceInterceptor" scope="PER_VM"/>
- <interceptor class="org.jboss.ejb3.stateful.StatefulInstanceInterceptor" scope="PER_VM"/>
- <interceptor class="org.jboss.ejb3.stateful.SessionSynchronizationInterceptor" scope="PER_VM"/>
- <interceptor class="org.jboss.ejb3.service.ServiceSingletonInterceptor" scope="PER_VM"/>
- <interceptor class="org.jboss.ejb3.cache.StatefulReplicationInterceptor" scope="PER_VM"/>
- <interceptor factory="org.jboss.ejb3.stateful.StatefulRemoveFactory" scope="PER_CLASS_JOINPOINT"/>
- <interceptor factory="org.jboss.ejb3.tx.TxInterceptorFactory" scope="PER_CLASS_JOINPOINT"/>
- <interceptor factory="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory" scope="PER_CLASS_JOINPOINT"/>
- <interceptor factory="org.jboss.ejb3.remoting.ReplicantsManagerInterceptorFactory" scope="PER_CLASS"/>
- <interceptor class="org.jboss.ejb3.AllowedOperationsInterceptor" scope="PER_VM"/>
- <interceptor factory="org.jboss.ejb3.mdb.CurrentMessageInjectorInterceptorFactory" scope="PER_CLASS"/>
- <interceptor class="org.jboss.ejb3.entity.TransactionScopedEntityManagerInterceptor" scope="PER_VM"/>
-
- <domain name="Stateless Bean">
- <bind pointcut="execution(public * *->*(..))">
- <interceptor-ref name="org.jboss.ejb3.asynchronous.AsynchronousInterceptor"/>
- <interceptor-ref name="org.jboss.ejb3.ENCPropagationInterceptor"/>
- <interceptor-ref name="org.jboss.ejb3.security.AuthenticationInterceptorFactory"/>
- </bind>
- <bind pointcut="execution(public * @org.jboss.annotation.security.SecurityDomain->*(..))">
- <interceptor-ref name="Basic Authorization"/>
- </bind>
- <bind pointcut="execution(public * @javax.annotation.security.RunAs->*(..))">
- <interceptor-ref name="org.jboss.ejb3.security.RunAsSecurityInterceptorFactory"/>
- </bind>
- <bind pointcut="execution(public * @org.jboss.annotation.ejb.Clustered->*(..))">
- <interceptor-ref name="org.jboss.ejb3.remoting.ReplicantsManagerInterceptorFactory"/>
- </bind>
- <bind pointcut="execution(public * *->*(..))">
- <interceptor-ref name="org.jboss.ejb3.stateless.StatelessInstanceInterceptor"/>
- <interceptor-ref name="org.jboss.aspects.tx.TxPropagationInterceptor"/>
- <interceptor-ref name="org.jboss.ejb3.tx.TxInterceptorFactory"/>
- <interceptor-ref name="org.jboss.ejb3.AllowedOperationsInterceptor"/>
- <interceptor-ref name="org.jboss.ejb3.entity.TransactionScopedEntityManagerInterceptor"/>
- <interceptor-ref name="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory"/>
- </bind>
- <annotation expr="!class(@org.jboss.annotation.ejb.PoolClass)">
- @org.jboss.annotation.ejb.PoolClass (value=org.jboss.ejb3.ThreadlocalPool.class, maxSize=30, timeout=10000)
- </annotation>
- </domain>
-
- <domain name="JACC Stateless Bean">
- <bind pointcut="execution(public * *->*(..))">
- <interceptor-ref name="org.jboss.ejb3.asynchronous.AsynchronousInterceptor"/>
- <interceptor-ref name="org.jboss.ejb3.ENCPropagationInterceptor"/>
- <interceptor-ref name="org.jboss.ejb3.security.AuthenticationInterceptorFactory"/>
- </bind>
- <bind pointcut="execution(public * @org.jboss.annotation.security.SecurityDomain->*(..))">
- <interceptor-ref name="JACC Authorization"/>
- </bind>
- <bind pointcut="execution(public * @javax.annotation.security.RunAs->*(..))">
- <interceptor-ref name="org.jboss.ejb3.security.RunAsSecurityInterceptorFactory"/>
- </bind>
- <bind pointcut="execution(public * @org.jboss.annotation.ejb.Clustered->*(..))">
- <interceptor-ref name="org.jboss.ejb3.remoting.ReplicantsManagerInterceptorFactory"/>
- </bind>
- <bind pointcut="execution(public * *->*(..))">
- <interceptor-ref name="org.jboss.ejb3.stateless.StatelessInstanceInterceptor"/>
- <interceptor-ref name="org.jboss.aspects.tx.TxPropagationInterceptor"/>
- <interceptor-ref name="org.jboss.ejb3.tx.TxInterceptorFactory"/>
- <interceptor-ref name="org.jboss.ejb3.AllowedOperationsInterceptor"/>
- <interceptor-ref name="org.jboss.ejb3.entity.TransactionScopedEntityManagerInterceptor"/>
- <interceptor-ref name="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory"/>
- </bind>
- <annotation expr="!class(@org.jboss.annotation.ejb.PoolClass)">
- @org.jboss.annotation.ejb.PoolClass (value=org.jboss.ejb3.ThreadlocalPool.class, maxSize=30, timeout=10000)
- </annotation>
- </domain>
-
- <domain name="Base Stateful Bean">
- <bind pointcut="execution(public * *->*(..))">
- <interceptor-ref name="org.jboss.ejb3.asynchronous.AsynchronousInterceptor"/>
- <interceptor-ref name="org.jboss.ejb3.ENCPropagationInterceptor"/>
- <interceptor-ref name="org.jboss.ejb3.security.AuthenticationInterceptorFactory"/>
- </bind>
- <bind pointcut="execution(public * @org.jboss.annotation.security.SecurityDomain->*(..))">
- <interceptor-ref name="Basic Authorization"/>
- </bind>
- <bind pointcut="execution(public * @javax.annotation.security.RunAs->*(..))">
- <interceptor-ref name="org.jboss.ejb3.security.RunAsSecurityInterceptorFactory"/>
- </bind>
- <bind pointcut="execution(public * @org.jboss.annotation.ejb.Clustered->*(..))">
- <interceptor-ref name="org.jboss.ejb3.remoting.ReplicantsManagerInterceptorFactory"/>
- </bind>
- <bind pointcut="execution(public * *->@javax.ejb.Remove(..))">
- <interceptor-ref name="org.jboss.ejb3.stateful.StatefulRemoveFactory"/>
- </bind>
- <bind pointcut="execution(public * *->*(..))">
- <interceptor-ref name="org.jboss.ejb3.stateful.StatefulInstanceInterceptor"/>
- <interceptor-ref name="org.jboss.aspects.tx.TxPropagationInterceptor"/>
- <interceptor-ref name="org.jboss.ejb3.tx.TxInterceptorFactory"/>
- <interceptor-ref name="org.jboss.ejb3.AllowedOperationsInterceptor"/>
- </bind>
- <bind pointcut="execution(public * $instanceof{javax.ejb.SessionSynchronization}->*(..))">
- <interceptor-ref name="org.jboss.ejb3.stateful.SessionSynchronizationInterceptor"/>
- </bind>
- <bind pointcut="execution(public * *->*(..))">
- <interceptor-ref name="org.jboss.ejb3.entity.TransactionScopedEntityManagerInterceptor"/>
- <interceptor-ref name="org.jboss.ejb3.entity.ExtendedPersistenceContextPropagationInterceptor"/>
- </bind>
-
- <bind pointcut="execution(public * @org.jboss.annotation.ejb.Clustered->*(..)) AND !execution(public * *->@javax.ejb.Remove(..))">
- <interceptor-ref name="org.jboss.ejb3.cache.StatefulReplicationInterceptor"/>
- </bind>
-
- <bind pointcut="execution(public * *->*(..))">
- <interceptor-ref name="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory"/>
- </bind>
-
- <annotation expr="!class(@org.jboss.annotation.ejb.PoolClass)">
- @org.jboss.annotation.ejb.PoolClass (value=org.jboss.ejb3.ThreadlocalPool.class, maxSize=30, timeout=10000)
- </annotation>
- </domain>
-
- <domain name="Stateful Bean" extends="Base Stateful Bean" inheritBindings="true">
- <!-- NON Clustered cache configuration -->
- <annotation expr="!class(@org.jboss.annotation.ejb.cache.Cache) AND !class(@org.jboss.annotation.ejb.Clustered)">
- @org.jboss.annotation.ejb.cache.Cache (org.jboss.ejb3.cache.simple.SimpleStatefulCache.class)
- </annotation>
- <annotation expr="!class(@org.jboss.annotation.ejb.cache.simple.PersistenceManager) AND !class(@org.jboss.annotation.ejb.Clustered)">
- @org.jboss.annotation.ejb.cache.simple.PersistenceManager (org.jboss.ejb3.cache.simple.StatefulSessionFilePersistenceManager.class)
- </annotation>
- <annotation expr="!class(@org.jboss.annotation.ejb.cache.simple.CacheConfig) AND !class(@org.jboss.annotation.ejb.Clustered)">
- @org.jboss.annotation.ejb.cache.simple.CacheConfig (maxSize=100000, idleTimeoutSeconds=300, removalTimeoutSeconds=0)
- </annotation>
-
- <!-- Clustered cache configuration -->
- <annotation expr="!class(@org.jboss.annotation.ejb.cache.Cache) AND class(@org.jboss.annotation.ejb.Clustered)">
- @org.jboss.annotation.ejb.cache.Cache (org.jboss.ejb3.cache.tree.StatefulTreeCache.class)
- </annotation>
- <annotation expr="!class(@org.jboss.annotation.ejb.cache.tree.CacheConfig) AND class(@org.jboss.annotation.ejb.Clustered)">
- @org.jboss.annotation.ejb.cache.tree.CacheConfig (name="jboss.cache:service=EJB3SFSBClusteredCache", maxSize=100000, idleTimeoutSeconds=300, removalTimeoutSeconds=0)
- </annotation>
- </domain>
-
- <domain name="JACC Stateful Bean">
- <bind pointcut="execution(public * *->*(..))">
- <interceptor-ref name="org.jboss.ejb3.asynchronous.AsynchronousInterceptor"/>
- <interceptor-ref name="org.jboss.ejb3.ENCPropagationInterceptor"/>
- <interceptor-ref name="org.jboss.ejb3.security.AuthenticationInterceptorFactory"/>
- </bind>
- <bind pointcut="execution(public * @org.jboss.annotation.security.SecurityDomain->*(..))">
- <interceptor-ref name="JACC Authorization"/>
- </bind>
- <bind pointcut="execution(public * @javax.annotation.security.RunAs->*(..))">
- <interceptor-ref name="org.jboss.ejb3.security.RunAsSecurityInterceptorFactory"/>
- </bind>
- <bind pointcut="execution(public * @org.jboss.annotation.ejb.Clustered->*(..))">
- <interceptor-ref name="org.jboss.ejb3.remoting.ReplicantsManagerInterceptorFactory"/>
- </bind>
- <bind pointcut="execution(public * *->@javax.ejb.Remove(..))">
- <interceptor-ref name="org.jboss.ejb3.stateful.StatefulRemoveFactory"/>
- </bind>
- <bind pointcut="execution(public * *->*(..))">
- <interceptor-ref name="org.jboss.ejb3.stateful.StatefulInstanceInterceptor"/>
- <interceptor-ref name="org.jboss.aspects.tx.TxPropagationInterceptor"/>
- <interceptor-ref name="org.jboss.ejb3.tx.TxInterceptorFactory"/>
- <interceptor-ref name="org.jboss.ejb3.AllowedOperationsInterceptor"/>
- </bind>
- <bind pointcut="execution(public * $instanceof{javax.ejb.SessionSynchronization}->*(..))">
- <interceptor-ref name="org.jboss.ejb3.stateful.SessionSynchronizationInterceptor"/>
- </bind>
- <bind pointcut="execution(public * *->*(..))">
- <interceptor-ref name="org.jboss.ejb3.entity.TransactionScopedEntityManagerInterceptor"/>
- <interceptor-ref name="org.jboss.ejb3.entity.ExtendedPersistenceContextPropagationInterceptor"/>
- <interceptor-ref name="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory"/>
- </bind>
-
- <bind pointcut="execution(public * @org.jboss.annotation.ejb.Clustered->*(..)) AND !execution(public * *->@javax.ejb.Remove(..))">
- <interceptor-ref name="org.jboss.ejb3.cache.StatefulReplicationInterceptor"/>
- </bind>
- <annotation expr="!class(@org.jboss.annotation.ejb.PoolClass)">
- @org.jboss.annotation.ejb.PoolClass (value=org.jboss.ejb3.ThreadlocalPool.class, maxSize=30, timeout=10000)
- </annotation>
-
- <!-- NON Clustered cache configuration -->
- <annotation expr="!class(@org.jboss.annotation.ejb.cache.Cache) AND !class(@org.jboss.annotation.ejb.Clustered)">
- @org.jboss.annotation.ejb.cache.Cache (org.jboss.ejb3.cache.simple.SimpleStatefulCache.class)
- </annotation>
- <annotation expr="!class(@org.jboss.annotation.ejb.cache.simple.PersistenceManager) AND !class(@org.jboss.annotation.ejb.Clustered)">
- @org.jboss.annotation.ejb.cache.simple.PersistenceManager (org.jboss.ejb3.cache.simple.StatefulSessionFilePersistenceManager.class)
- </annotation>
- <annotation expr="!class(@org.jboss.annotation.ejb.cache.simple.CacheConfig) AND !class(@org.jboss.annotation.ejb.Clustered)">
- @org.jboss.annotation.ejb.cache.simple.CacheConfig (maxSize=100000, idleTimeoutSeconds=300, removalTimeoutSeconds=0)
- </annotation>
-
- <!-- Clustered cache configuration -->
- <annotation expr="!class(@org.jboss.annotation.ejb.cache.Cache) AND class(@org.jboss.annotation.ejb.Clustered)">
- @org.jboss.annotation.ejb.cache.Cache (org.jboss.ejb3.cache.tree.StatefulTreeCache.class)
- </annotation>
- <annotation expr="!class(@org.jboss.annotation.ejb.cache.tree.CacheConfig) AND class(@org.jboss.annotation.ejb.Clustered)">
- @org.jboss.annotation.ejb.cache.tree.CacheConfig (name="jboss.cache:service=EJB3SFSBClusteredCache", maxSize=100000, idleTimeoutSeconds=300, removalTimeoutSeconds=0)
- </annotation>
- </domain>
-
- <domain name="Embedded Stateful Bean" extends="Base Stateful Bean" inheritBindings="true">
- <!-- NON Clustered cache configuration -->
- <annotation expr="!class(@org.jboss.annotation.ejb.cache.Cache)">
- @org.jboss.annotation.ejb.cache.Cache (org.jboss.ejb3.cache.NoPassivationCache.class)
- </annotation>
-
- </domain>
-
- <domain name="Message Driven Bean">
- <bind pointcut="execution(public * @javax.annotation.security.RunAs->*(..))">
- <interceptor-ref name="org.jboss.ejb3.security.RunAsSecurityInterceptorFactory"/>
- </bind>
- <bind pointcut="execution(public * *->*(..))">
- <interceptor-ref name="org.jboss.ejb3.stateless.StatelessInstanceInterceptor"/>
- <interceptor-ref name="org.jboss.ejb3.tx.TxInterceptorFactory"/>
- <interceptor-ref name="org.jboss.ejb3.AllowedOperationsInterceptor"/>
- <interceptor-ref name="org.jboss.ejb3.entity.TransactionScopedEntityManagerInterceptor"/>
- <interceptor-ref name="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory"/>
- </bind>
- <annotation expr="!class(@org.jboss.annotation.ejb.PoolClass)">
- @org.jboss.annotation.ejb.PoolClass (value=org.jboss.ejb3.StrictMaxPool.class, maxSize=15, timeout=10000)
- </annotation>
- </domain>
-
- <domain name="Consumer Bean">
- <bind pointcut="execution(public * @javax.annotation.security.RunAs->*(..))">
- <interceptor-ref name="org.jboss.ejb3.security.RunAsSecurityInterceptorFactory"/>
- </bind>
- <bind pointcut="execution(public * *->*(..))">
- <interceptor-ref name="org.jboss.ejb3.stateless.StatelessInstanceInterceptor"/>
- <interceptor-ref name="org.jboss.ejb3.tx.TxInterceptorFactory"/>
- <interceptor-ref name="org.jboss.ejb3.AllowedOperationsInterceptor"/>
- <interceptor-ref name="org.jboss.ejb3.entity.TransactionScopedEntityManagerInterceptor"/>
- </bind>
- <bind pointcut="execution(public * *->*(..)) AND (has(* *->@org.jboss.annotation.ejb.CurrentMessage(..)) OR hasfield(* *->@org.jboss.annotation.ejb.CurrentMessage))">
- <interceptor-ref name="org.jboss.ejb3.mdb.CurrentMessageInjectorInterceptorFactory"/>
- </bind>
- <bind pointcut="execution(public * *->*(..))">
- <interceptor-ref name="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory"/>
- </bind>
- <annotation expr="!class(@org.jboss.annotation.ejb.PoolClass)">
- @org.jboss.annotation.ejb.PoolClass (value=org.jboss.ejb3.StrictMaxPool.class, maxSize=15, timeout=10000)
- </annotation>
- </domain>
-
- <domain name="Service Bean">
- <bind pointcut="execution(public * *->*(..))">
- <interceptor-ref name="org.jboss.ejb3.asynchronous.AsynchronousInterceptor"/>
- <interceptor-ref name="org.jboss.ejb3.ENCPropagationInterceptor"/>
- </bind>
- <bind pointcut="!execution(* *->create()) AND !execution(* *->start()) AND !execution(*->new(..))">
- <interceptor-ref name="org.jboss.ejb3.security.AuthenticationInterceptorFactory"/>
- </bind>
- <bind pointcut="execution(public * @org.jboss.annotation.security.SecurityDomain->*(..))">
- <interceptor-ref name="Basic Authorization"/>
- </bind>
- <bind pointcut="execution(public * @javax.annotation.security.RunAs->*(..))">
- <interceptor-ref name="org.jboss.ejb3.security.RunAsSecurityInterceptorFactory"/>
- </bind>
- <bind pointcut="execution(public * *->*(..))">
- <interceptor-ref name="org.jboss.aspects.tx.TxPropagationInterceptor"/>
- <interceptor-ref name="org.jboss.ejb3.tx.TxInterceptorFactory"/>
- <interceptor-ref name="org.jboss.ejb3.AllowedOperationsInterceptor"/>
- <interceptor-ref name="org.jboss.ejb3.entity.TransactionScopedEntityManagerInterceptor"/>
- </bind>
- <bind pointcut="execution(public * *->*(..)) AND !execution(* *->create()) AND !execution(* *->start())">
- <interceptor-ref name="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory"/>
- </bind>
- </domain>
-
- <domain name="JACC Service Bean">
- <bind pointcut="execution(public * *->*(..))">
- <interceptor-ref name="org.jboss.ejb3.asynchronous.AsynchronousInterceptor"/>
- <interceptor-ref name="org.jboss.ejb3.ENCPropagationInterceptor"/>
- </bind>
- <bind pointcut="!execution(* *->create()) AND !execution(* *->start()) AND !execution(*->new(..))">
- <interceptor-ref name="org.jboss.ejb3.security.AuthenticationInterceptorFactory"/>
- </bind>
- <bind pointcut="execution(public * @org.jboss.annotation.security.SecurityDomain->*(..))">
- <interceptor-ref name="Basic Authorization"/>
- </bind>
- <bind pointcut="execution(public * @javax.annotation.security.RunAs->*(..))">
- <interceptor-ref name="org.jboss.ejb3.security.RunAsSecurityInterceptorFactory"/>
- </bind>
- <bind pointcut="execution(public * *->*(..))">
- <interceptor-ref name="org.jboss.aspects.tx.TxPropagationInterceptor"/>
- <interceptor-ref name="org.jboss.ejb3.tx.TxInterceptorFactory"/>
- <interceptor-ref name="org.jboss.ejb3.AllowedOperationsInterceptor"/>
- <interceptor-ref name="org.jboss.ejb3.entity.TransactionScopedEntityManagerInterceptor"/>
- </bind>
- <bind pointcut="execution(public * *->*(..)) AND !execution(* *->create()) AND !execution(* *->start())">
- <interceptor-ref name="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory"/>
- </bind>
- </domain>
-
-
-</aop>
Copied: branches/JBPAPP_4_2/ejb3/src/resources/test-configs/removedislocal/deploy/ejb3-interceptors-aop.xml (from rev 65304, branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/removedislocal/deploy/ejb3-interceptors-aop.xml)
===================================================================
--- branches/JBPAPP_4_2/ejb3/src/resources/test-configs/removedislocal/deploy/ejb3-interceptors-aop.xml (rev 0)
+++ branches/JBPAPP_4_2/ejb3/src/resources/test-configs/removedislocal/deploy/ejb3-interceptors-aop.xml 2007-09-11 21:15:24 UTC (rev 65305)
@@ -0,0 +1,365 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE aop PUBLIC
+ "-//JBoss//DTD JBOSS AOP 1.0//EN"
+ "http://labs.jboss.com/portal/jbossaop/dtd/jboss-aop_1_0.dtd">
+
+<aop>
+ <interceptor class="org.jboss.aspects.remoting.InvokeRemoteInterceptor" scope="PER_VM"/>
+ <interceptor class="org.jboss.aspects.security.SecurityClientInterceptor" scope="PER_VM"/>
+ <interceptor class="org.jboss.aspects.tx.ClientTxPropagationInterceptor" scope="PER_VM"/>
+ <interceptor class="org.jboss.ejb3.remoting.IsLocalInterceptor" scope="PER_VM"/>
+ <interceptor class="org.jboss.ejb3.remoting.ClusteredIsLocalInterceptor" scope="PER_VM"/>
+ <interceptor class="org.jboss.aspects.remoting.ClusterChooserInterceptor" scope="PER_VM"/>
+
+ <interceptor class="org.jboss.aspects.tx.TxPropagationInterceptor" scope="PER_VM"/>
+
+ <stack name="ServiceClientInterceptors">
+ <interceptor-ref name="org.jboss.ejb3.remoting.IsLocalInterceptor"/>
+ <interceptor-ref name="org.jboss.aspects.security.SecurityClientInterceptor"/>
+ <interceptor-ref name="org.jboss.aspects.tx.ClientTxPropagationInterceptor"/>
+ <interceptor-ref name="org.jboss.aspects.remoting.InvokeRemoteInterceptor"/>
+ </stack>
+
+ <stack name="AsynchronousStatelessSessionClientInterceptors">
+ <interceptor-ref name="org.jboss.ejb3.remoting.IsLocalInterceptor"/>
+ <interceptor-ref name="org.jboss.aspects.security.SecurityClientInterceptor"/>
+ <interceptor-ref name="org.jboss.aspects.tx.ClientTxPropagationInterceptor"/>
+ <interceptor-ref name="org.jboss.aspects.remoting.InvokeRemoteInterceptor"/>
+ </stack>
+
+ <stack name="AsynchronousStatefulSessionClientInterceptors">
+ <interceptor-ref name="org.jboss.ejb3.remoting.IsLocalInterceptor"/>
+ <interceptor-ref name="org.jboss.aspects.security.SecurityClientInterceptor"/>
+ <interceptor-ref name="org.jboss.aspects.tx.ClientTxPropagationInterceptor"/>
+ <interceptor-ref name="org.jboss.aspects.remoting.InvokeRemoteInterceptor"/>
+ </stack>
+
+ <stack name="StatelessSessionClientInterceptors">
+ <!--interceptor-ref name="org.jboss.ejb3.remoting.IsLocalInterceptor"/-->
+ <interceptor-ref name="org.jboss.aspects.security.SecurityClientInterceptor"/>
+ <interceptor-ref name="org.jboss.aspects.tx.ClientTxPropagationInterceptor"/>
+ <interceptor-ref name="org.jboss.aspects.remoting.InvokeRemoteInterceptor"/>
+ </stack>
+
+ <stack name="StatefulSessionClientInterceptors">
+ <interceptor-ref name="org.jboss.ejb3.remoting.IsLocalInterceptor"/>
+ <interceptor-ref name="org.jboss.aspects.security.SecurityClientInterceptor"/>
+ <interceptor-ref name="org.jboss.aspects.tx.ClientTxPropagationInterceptor"/>
+ <interceptor-ref name="org.jboss.aspects.remoting.InvokeRemoteInterceptor"/>
+ </stack>
+
+ <stack name="ClusteredStatelessSessionClientInterceptors">
+ <!--interceptor-ref name="org.jboss.ejb3.remoting.ClusteredIsLocalInterceptor"/-->
+ <interceptor-ref name="org.jboss.aspects.security.SecurityClientInterceptor"/>
+ <interceptor-ref name="org.jboss.aspects.tx.ClientTxPropagationInterceptor"/>
+ <interceptor-ref name="org.jboss.aspects.remoting.ClusterChooserInterceptor"/>
+ <interceptor-ref name="org.jboss.aspects.remoting.InvokeRemoteInterceptor"/>
+ </stack>
+
+ <stack name="ClusteredStatefulSessionClientInterceptors">
+ <interceptor-ref name="org.jboss.ejb3.remoting.ClusteredIsLocalInterceptor"/>
+ <interceptor-ref name="org.jboss.aspects.security.SecurityClientInterceptor"/>
+ <interceptor-ref name="org.jboss.aspects.tx.ClientTxPropagationInterceptor"/>
+ <interceptor-ref name="org.jboss.aspects.remoting.ClusterChooserInterceptor"/>
+ <interceptor-ref name="org.jboss.aspects.remoting.InvokeRemoteInterceptor"/>
+ </stack>
+
+ <interceptor class="org.jboss.ejb3.asynchronous.AsynchronousInterceptor" scope="PER_CLASS"/>
+ <interceptor class="org.jboss.ejb3.ENCPropagationInterceptor" scope="PER_VM"/>
+ <interceptor name="Basic Authorization" factory="org.jboss.ejb3.security.RoleBasedAuthorizationInterceptorFactory" scope="PER_CLASS"/>
+ <interceptor name="JACC Authorization" factory="org.jboss.ejb3.security.JaccAuthorizationInterceptorFactory" scope="PER_CLASS"/>
+ <interceptor factory="org.jboss.ejb3.security.AuthenticationInterceptorFactory" scope="PER_CLASS"/>
+ <interceptor factory="org.jboss.ejb3.security.RunAsSecurityInterceptorFactory" scope="PER_CLASS"/>
+ <interceptor class="org.jboss.ejb3.entity.ExtendedPersistenceContextPropagationInterceptor" scope="PER_VM"/>
+ <interceptor class="org.jboss.ejb3.stateless.StatelessInstanceInterceptor" scope="PER_VM"/>
+ <interceptor class="org.jboss.ejb3.stateful.StatefulInstanceInterceptor" scope="PER_VM"/>
+ <interceptor class="org.jboss.ejb3.stateful.SessionSynchronizationInterceptor" scope="PER_VM"/>
+ <interceptor class="org.jboss.ejb3.service.ServiceSingletonInterceptor" scope="PER_VM"/>
+ <interceptor class="org.jboss.ejb3.cache.StatefulReplicationInterceptor" scope="PER_VM"/>
+ <interceptor factory="org.jboss.ejb3.stateful.StatefulRemoveFactory" scope="PER_CLASS_JOINPOINT"/>
+ <interceptor factory="org.jboss.ejb3.tx.TxInterceptorFactory" scope="PER_CLASS_JOINPOINT"/>
+ <interceptor factory="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory" scope="PER_CLASS_JOINPOINT"/>
+ <interceptor factory="org.jboss.ejb3.remoting.ReplicantsManagerInterceptorFactory" scope="PER_CLASS"/>
+ <interceptor class="org.jboss.ejb3.AllowedOperationsInterceptor" scope="PER_VM"/>
+ <interceptor factory="org.jboss.ejb3.mdb.CurrentMessageInjectorInterceptorFactory" scope="PER_CLASS"/>
+ <interceptor class="org.jboss.ejb3.entity.TransactionScopedEntityManagerInterceptor" scope="PER_VM"/>
+
+ <domain name="Stateless Bean">
+ <bind pointcut="execution(public * *->*(..))">
+ <interceptor-ref name="org.jboss.ejb3.asynchronous.AsynchronousInterceptor"/>
+ <interceptor-ref name="org.jboss.ejb3.ENCPropagationInterceptor"/>
+ <interceptor-ref name="org.jboss.ejb3.security.AuthenticationInterceptorFactory"/>
+ </bind>
+ <bind pointcut="execution(public * @org.jboss.annotation.security.SecurityDomain->*(..))">
+ <interceptor-ref name="Basic Authorization"/>
+ </bind>
+ <bind pointcut="execution(public * @javax.annotation.security.RunAs->*(..))">
+ <interceptor-ref name="org.jboss.ejb3.security.RunAsSecurityInterceptorFactory"/>
+ </bind>
+ <bind pointcut="execution(public * @org.jboss.annotation.ejb.Clustered->*(..))">
+ <interceptor-ref name="org.jboss.ejb3.remoting.ReplicantsManagerInterceptorFactory"/>
+ </bind>
+ <bind pointcut="execution(public * *->*(..))">
+ <interceptor-ref name="org.jboss.ejb3.stateless.StatelessInstanceInterceptor"/>
+ <interceptor-ref name="org.jboss.aspects.tx.TxPropagationInterceptor"/>
+ <interceptor-ref name="org.jboss.ejb3.tx.TxInterceptorFactory"/>
+ <interceptor-ref name="org.jboss.ejb3.AllowedOperationsInterceptor"/>
+ <interceptor-ref name="org.jboss.ejb3.entity.TransactionScopedEntityManagerInterceptor"/>
+ <interceptor-ref name="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory"/>
+ </bind>
+ <annotation expr="!class(@org.jboss.annotation.ejb.PoolClass)">
+ @org.jboss.annotation.ejb.PoolClass (value=org.jboss.ejb3.ThreadlocalPool.class, maxSize=30, timeout=10000)
+ </annotation>
+ </domain>
+
+ <domain name="JACC Stateless Bean">
+ <bind pointcut="execution(public * *->*(..))">
+ <interceptor-ref name="org.jboss.ejb3.asynchronous.AsynchronousInterceptor"/>
+ <interceptor-ref name="org.jboss.ejb3.ENCPropagationInterceptor"/>
+ <interceptor-ref name="org.jboss.ejb3.security.AuthenticationInterceptorFactory"/>
+ </bind>
+ <bind pointcut="execution(public * @org.jboss.annotation.security.SecurityDomain->*(..))">
+ <interceptor-ref name="JACC Authorization"/>
+ </bind>
+ <bind pointcut="execution(public * @javax.annotation.security.RunAs->*(..))">
+ <interceptor-ref name="org.jboss.ejb3.security.RunAsSecurityInterceptorFactory"/>
+ </bind>
+ <bind pointcut="execution(public * @org.jboss.annotation.ejb.Clustered->*(..))">
+ <interceptor-ref name="org.jboss.ejb3.remoting.ReplicantsManagerInterceptorFactory"/>
+ </bind>
+ <bind pointcut="execution(public * *->*(..))">
+ <interceptor-ref name="org.jboss.ejb3.stateless.StatelessInstanceInterceptor"/>
+ <interceptor-ref name="org.jboss.aspects.tx.TxPropagationInterceptor"/>
+ <interceptor-ref name="org.jboss.ejb3.tx.TxInterceptorFactory"/>
+ <interceptor-ref name="org.jboss.ejb3.AllowedOperationsInterceptor"/>
+ <interceptor-ref name="org.jboss.ejb3.entity.TransactionScopedEntityManagerInterceptor"/>
+ <interceptor-ref name="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory"/>
+ </bind>
+ <annotation expr="!class(@org.jboss.annotation.ejb.PoolClass)">
+ @org.jboss.annotation.ejb.PoolClass (value=org.jboss.ejb3.ThreadlocalPool.class, maxSize=30, timeout=10000)
+ </annotation>
+ </domain>
+
+ <domain name="Base Stateful Bean">
+ <bind pointcut="execution(public * *->*(..))">
+ <interceptor-ref name="org.jboss.ejb3.asynchronous.AsynchronousInterceptor"/>
+ <interceptor-ref name="org.jboss.ejb3.ENCPropagationInterceptor"/>
+ <interceptor-ref name="org.jboss.ejb3.security.AuthenticationInterceptorFactory"/>
+ </bind>
+ <bind pointcut="execution(public * @org.jboss.annotation.security.SecurityDomain->*(..))">
+ <interceptor-ref name="Basic Authorization"/>
+ </bind>
+ <bind pointcut="execution(public * @javax.annotation.security.RunAs->*(..))">
+ <interceptor-ref name="org.jboss.ejb3.security.RunAsSecurityInterceptorFactory"/>
+ </bind>
+ <bind pointcut="execution(public * @org.jboss.annotation.ejb.Clustered->*(..))">
+ <interceptor-ref name="org.jboss.ejb3.remoting.ReplicantsManagerInterceptorFactory"/>
+ </bind>
+ <bind pointcut="execution(public * *->@javax.ejb.Remove(..))">
+ <interceptor-ref name="org.jboss.ejb3.stateful.StatefulRemoveFactory"/>
+ </bind>
+ <bind pointcut="execution(public * *->*(..))">
+ <interceptor-ref name="org.jboss.ejb3.stateful.StatefulInstanceInterceptor"/>
+ <interceptor-ref name="org.jboss.aspects.tx.TxPropagationInterceptor"/>
+ <interceptor-ref name="org.jboss.ejb3.tx.TxInterceptorFactory"/>
+ <interceptor-ref name="org.jboss.ejb3.AllowedOperationsInterceptor"/>
+ </bind>
+ <bind pointcut="execution(public * $instanceof{javax.ejb.SessionSynchronization}->*(..))">
+ <interceptor-ref name="org.jboss.ejb3.stateful.SessionSynchronizationInterceptor"/>
+ </bind>
+ <bind pointcut="execution(public * *->*(..))">
+ <interceptor-ref name="org.jboss.ejb3.entity.TransactionScopedEntityManagerInterceptor"/>
+ <interceptor-ref name="org.jboss.ejb3.entity.ExtendedPersistenceContextPropagationInterceptor"/>
+ </bind>
+
+ <bind pointcut="execution(public * @org.jboss.annotation.ejb.Clustered->*(..)) AND !execution(public * *->@javax.ejb.Remove(..))">
+ <interceptor-ref name="org.jboss.ejb3.cache.StatefulReplicationInterceptor"/>
+ </bind>
+
+ <bind pointcut="execution(public * *->*(..))">
+ <interceptor-ref name="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory"/>
+ </bind>
+
+ <annotation expr="!class(@org.jboss.annotation.ejb.PoolClass)">
+ @org.jboss.annotation.ejb.PoolClass (value=org.jboss.ejb3.ThreadlocalPool.class, maxSize=30, timeout=10000)
+ </annotation>
+ </domain>
+
+ <domain name="Stateful Bean" extends="Base Stateful Bean" inheritBindings="true">
+ <!-- NON Clustered cache configuration -->
+ <annotation expr="!class(@org.jboss.annotation.ejb.cache.Cache) AND !class(@org.jboss.annotation.ejb.Clustered)">
+ @org.jboss.annotation.ejb.cache.Cache (org.jboss.ejb3.cache.simple.SimpleStatefulCache.class)
+ </annotation>
+ <annotation expr="!class(@org.jboss.annotation.ejb.cache.simple.PersistenceManager) AND !class(@org.jboss.annotation.ejb.Clustered)">
+ @org.jboss.annotation.ejb.cache.simple.PersistenceManager (org.jboss.ejb3.cache.simple.StatefulSessionFilePersistenceManager.class)
+ </annotation>
+ <annotation expr="!class(@org.jboss.annotation.ejb.cache.simple.CacheConfig) AND !class(@org.jboss.annotation.ejb.Clustered)">
+ @org.jboss.annotation.ejb.cache.simple.CacheConfig (maxSize=100000, idleTimeoutSeconds=300, removalTimeoutSeconds=0)
+ </annotation>
+
+ <!-- Clustered cache configuration -->
+ <annotation expr="!class(@org.jboss.annotation.ejb.cache.Cache) AND class(@org.jboss.annotation.ejb.Clustered)">
+ @org.jboss.annotation.ejb.cache.Cache (org.jboss.ejb3.cache.tree.StatefulTreeCache.class)
+ </annotation>
+ <annotation expr="!class(@org.jboss.annotation.ejb.cache.tree.CacheConfig) AND class(@org.jboss.annotation.ejb.Clustered)">
+ @org.jboss.annotation.ejb.cache.tree.CacheConfig (name="jboss.cache:service=EJB3SFSBClusteredCache", maxSize=100000, idleTimeoutSeconds=300, removalTimeoutSeconds=0)
+ </annotation>
+ </domain>
+
+ <domain name="JACC Stateful Bean">
+ <bind pointcut="execution(public * *->*(..))">
+ <interceptor-ref name="org.jboss.ejb3.asynchronous.AsynchronousInterceptor"/>
+ <interceptor-ref name="org.jboss.ejb3.ENCPropagationInterceptor"/>
+ <interceptor-ref name="org.jboss.ejb3.security.AuthenticationInterceptorFactory"/>
+ </bind>
+ <bind pointcut="execution(public * @org.jboss.annotation.security.SecurityDomain->*(..))">
+ <interceptor-ref name="JACC Authorization"/>
+ </bind>
+ <bind pointcut="execution(public * @javax.annotation.security.RunAs->*(..))">
+ <interceptor-ref name="org.jboss.ejb3.security.RunAsSecurityInterceptorFactory"/>
+ </bind>
+ <bind pointcut="execution(public * @org.jboss.annotation.ejb.Clustered->*(..))">
+ <interceptor-ref name="org.jboss.ejb3.remoting.ReplicantsManagerInterceptorFactory"/>
+ </bind>
+ <bind pointcut="execution(public * *->@javax.ejb.Remove(..))">
+ <interceptor-ref name="org.jboss.ejb3.stateful.StatefulRemoveFactory"/>
+ </bind>
+ <bind pointcut="execution(public * *->*(..))">
+ <interceptor-ref name="org.jboss.ejb3.stateful.StatefulInstanceInterceptor"/>
+ <interceptor-ref name="org.jboss.aspects.tx.TxPropagationInterceptor"/>
+ <interceptor-ref name="org.jboss.ejb3.tx.TxInterceptorFactory"/>
+ <interceptor-ref name="org.jboss.ejb3.AllowedOperationsInterceptor"/>
+ </bind>
+ <bind pointcut="execution(public * $instanceof{javax.ejb.SessionSynchronization}->*(..))">
+ <interceptor-ref name="org.jboss.ejb3.stateful.SessionSynchronizationInterceptor"/>
+ </bind>
+ <bind pointcut="execution(public * *->*(..))">
+ <interceptor-ref name="org.jboss.ejb3.entity.TransactionScopedEntityManagerInterceptor"/>
+ <interceptor-ref name="org.jboss.ejb3.entity.ExtendedPersistenceContextPropagationInterceptor"/>
+ <interceptor-ref name="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory"/>
+ </bind>
+
+ <bind pointcut="execution(public * @org.jboss.annotation.ejb.Clustered->*(..)) AND !execution(public * *->@javax.ejb.Remove(..))">
+ <interceptor-ref name="org.jboss.ejb3.cache.StatefulReplicationInterceptor"/>
+ </bind>
+ <annotation expr="!class(@org.jboss.annotation.ejb.PoolClass)">
+ @org.jboss.annotation.ejb.PoolClass (value=org.jboss.ejb3.ThreadlocalPool.class, maxSize=30, timeout=10000)
+ </annotation>
+
+ <!-- NON Clustered cache configuration -->
+ <annotation expr="!class(@org.jboss.annotation.ejb.cache.Cache) AND !class(@org.jboss.annotation.ejb.Clustered)">
+ @org.jboss.annotation.ejb.cache.Cache (org.jboss.ejb3.cache.simple.SimpleStatefulCache.class)
+ </annotation>
+ <annotation expr="!class(@org.jboss.annotation.ejb.cache.simple.PersistenceManager) AND !class(@org.jboss.annotation.ejb.Clustered)">
+ @org.jboss.annotation.ejb.cache.simple.PersistenceManager (org.jboss.ejb3.cache.simple.StatefulSessionFilePersistenceManager.class)
+ </annotation>
+ <annotation expr="!class(@org.jboss.annotation.ejb.cache.simple.CacheConfig) AND !class(@org.jboss.annotation.ejb.Clustered)">
+ @org.jboss.annotation.ejb.cache.simple.CacheConfig (maxSize=100000, idleTimeoutSeconds=300, removalTimeoutSeconds=0)
+ </annotation>
+
+ <!-- Clustered cache configuration -->
+ <annotation expr="!class(@org.jboss.annotation.ejb.cache.Cache) AND class(@org.jboss.annotation.ejb.Clustered)">
+ @org.jboss.annotation.ejb.cache.Cache (org.jboss.ejb3.cache.tree.StatefulTreeCache.class)
+ </annotation>
+ <annotation expr="!class(@org.jboss.annotation.ejb.cache.tree.CacheConfig) AND class(@org.jboss.annotation.ejb.Clustered)">
+ @org.jboss.annotation.ejb.cache.tree.CacheConfig (name="jboss.cache:service=EJB3SFSBClusteredCache", maxSize=100000, idleTimeoutSeconds=300, removalTimeoutSeconds=0)
+ </annotation>
+ </domain>
+
+ <domain name="Embedded Stateful Bean" extends="Base Stateful Bean" inheritBindings="true">
+ <!-- NON Clustered cache configuration -->
+ <annotation expr="!class(@org.jboss.annotation.ejb.cache.Cache)">
+ @org.jboss.annotation.ejb.cache.Cache (org.jboss.ejb3.cache.NoPassivationCache.class)
+ </annotation>
+
+ </domain>
+
+ <domain name="Message Driven Bean">
+ <bind pointcut="execution(public * @javax.annotation.security.RunAs->*(..))">
+ <interceptor-ref name="org.jboss.ejb3.security.RunAsSecurityInterceptorFactory"/>
+ </bind>
+ <bind pointcut="execution(public * *->*(..))">
+ <interceptor-ref name="org.jboss.ejb3.stateless.StatelessInstanceInterceptor"/>
+ <interceptor-ref name="org.jboss.ejb3.tx.TxInterceptorFactory"/>
+ <interceptor-ref name="org.jboss.ejb3.AllowedOperationsInterceptor"/>
+ <interceptor-ref name="org.jboss.ejb3.entity.TransactionScopedEntityManagerInterceptor"/>
+ <interceptor-ref name="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory"/>
+ </bind>
+ <annotation expr="!class(@org.jboss.annotation.ejb.PoolClass)">
+ @org.jboss.annotation.ejb.PoolClass (value=org.jboss.ejb3.StrictMaxPool.class, maxSize=15, timeout=10000)
+ </annotation>
+ </domain>
+
+ <domain name="Consumer Bean">
+ <bind pointcut="execution(public * @javax.annotation.security.RunAs->*(..))">
+ <interceptor-ref name="org.jboss.ejb3.security.RunAsSecurityInterceptorFactory"/>
+ </bind>
+ <bind pointcut="execution(public * *->*(..))">
+ <interceptor-ref name="org.jboss.ejb3.stateless.StatelessInstanceInterceptor"/>
+ <interceptor-ref name="org.jboss.ejb3.tx.TxInterceptorFactory"/>
+ <interceptor-ref name="org.jboss.ejb3.AllowedOperationsInterceptor"/>
+ <interceptor-ref name="org.jboss.ejb3.entity.TransactionScopedEntityManagerInterceptor"/>
+ </bind>
+ <bind pointcut="execution(public * *->*(..)) AND (has(* *->@org.jboss.annotation.ejb.CurrentMessage(..)) OR hasfield(* *->@org.jboss.annotation.ejb.CurrentMessage))">
+ <interceptor-ref name="org.jboss.ejb3.mdb.CurrentMessageInjectorInterceptorFactory"/>
+ </bind>
+ <bind pointcut="execution(public * *->*(..))">
+ <interceptor-ref name="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory"/>
+ </bind>
+ <annotation expr="!class(@org.jboss.annotation.ejb.PoolClass)">
+ @org.jboss.annotation.ejb.PoolClass (value=org.jboss.ejb3.StrictMaxPool.class, maxSize=15, timeout=10000)
+ </annotation>
+ </domain>
+
+ <domain name="Service Bean">
+ <bind pointcut="execution(public * *->*(..))">
+ <interceptor-ref name="org.jboss.ejb3.asynchronous.AsynchronousInterceptor"/>
+ <interceptor-ref name="org.jboss.ejb3.ENCPropagationInterceptor"/>
+ </bind>
+ <bind pointcut="!execution(* *->create()) AND !execution(* *->start()) AND !execution(*->new(..))">
+ <interceptor-ref name="org.jboss.ejb3.security.AuthenticationInterceptorFactory"/>
+ </bind>
+ <bind pointcut="execution(public * @org.jboss.annotation.security.SecurityDomain->*(..))">
+ <interceptor-ref name="Basic Authorization"/>
+ </bind>
+ <bind pointcut="execution(public * @javax.annotation.security.RunAs->*(..))">
+ <interceptor-ref name="org.jboss.ejb3.security.RunAsSecurityInterceptorFactory"/>
+ </bind>
+ <bind pointcut="execution(public * *->*(..))">
+ <interceptor-ref name="org.jboss.aspects.tx.TxPropagationInterceptor"/>
+ <interceptor-ref name="org.jboss.ejb3.tx.TxInterceptorFactory"/>
+ <interceptor-ref name="org.jboss.ejb3.AllowedOperationsInterceptor"/>
+ <interceptor-ref name="org.jboss.ejb3.entity.TransactionScopedEntityManagerInterceptor"/>
+ </bind>
+ <bind pointcut="execution(public * *->*(..)) AND !execution(* *->create()) AND !execution(* *->start())">
+ <interceptor-ref name="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory"/>
+ </bind>
+ </domain>
+
+ <domain name="JACC Service Bean">
+ <bind pointcut="execution(public * *->*(..))">
+ <interceptor-ref name="org.jboss.ejb3.asynchronous.AsynchronousInterceptor"/>
+ <interceptor-ref name="org.jboss.ejb3.ENCPropagationInterceptor"/>
+ </bind>
+ <bind pointcut="!execution(* *->create()) AND !execution(* *->start()) AND !execution(*->new(..))">
+ <interceptor-ref name="org.jboss.ejb3.security.AuthenticationInterceptorFactory"/>
+ </bind>
+ <bind pointcut="execution(public * @org.jboss.annotation.security.SecurityDomain->*(..))">
+ <interceptor-ref name="Basic Authorization"/>
+ </bind>
+ <bind pointcut="execution(public * @javax.annotation.security.RunAs->*(..))">
+ <interceptor-ref name="org.jboss.ejb3.security.RunAsSecurityInterceptorFactory"/>
+ </bind>
+ <bind pointcut="execution(public * *->*(..))">
+ <interceptor-ref name="org.jboss.aspects.tx.TxPropagationInterceptor"/>
+ <interceptor-ref name="org.jboss.ejb3.tx.TxInterceptorFactory"/>
+ <interceptor-ref name="org.jboss.ejb3.AllowedOperationsInterceptor"/>
+ <interceptor-ref name="org.jboss.ejb3.entity.TransactionScopedEntityManagerInterceptor"/>
+ </bind>
+ <bind pointcut="execution(public * *->*(..)) AND !execution(* *->create()) AND !execution(* *->start())">
+ <interceptor-ref name="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory"/>
+ </bind>
+ </domain>
+
+
+</aop>
Modified: branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredjms/unit/MDBUnitTestCase.java
===================================================================
--- branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredjms/unit/MDBUnitTestCase.java 2007-09-11 18:18:20 UTC (rev 65304)
+++ branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredjms/unit/MDBUnitTestCase.java 2007-09-11 21:15:24 UTC (rev 65305)
@@ -39,11 +39,12 @@
import org.jboss.ejb3.test.clusteredjms.TestStatus;
import org.jboss.logging.Logger;
import org.jboss.test.JBossTestCase;
+import org.jboss.test.JBossClusteredTestCase;
/**
* @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
*/
-public class MDBUnitTestCase extends JBossTestCase
+public class MDBUnitTestCase extends JBossTestCase //JBossClusteredTestCase
{
private static final Logger log = Logger.getLogger(MDBUnitTestCase.class);
@@ -56,19 +57,19 @@
{
TestStatus status = (TestStatus) new InitialContext().lookup(
- "TestStatusBean/remote");
+ "TestStatusBean/remote");
clear(status);
QueueConnection cnn = null;
QueueSender sender = null;
QueueSession session = null;
-
+
Queue queue = (Queue) getHAInitialContext().lookup("queue/mdbtest");
QueueConnectionFactory factory = getQueueConnectionFactory();
cnn = factory.createQueueConnection();
session = cnn.createQueueSession(false, QueueSession.AUTO_ACKNOWLEDGE);
-
+
TextMessage msg = session.createTextMessage("Hello World");
-
+
sender = session.createSender(queue);
sender.send(msg);
sender.send(msg);
@@ -77,7 +78,7 @@
sender.send(msg);
session.close();
cnn.close();
-
+
Thread.sleep(2000);
assertEquals(5, status.queueFired());
Modified: branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/SimpleIsLocalInterceptorUnitTestCase.java
===================================================================
--- branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/SimpleIsLocalInterceptorUnitTestCase.java 2007-09-11 18:18:20 UTC (rev 65304)
+++ branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/SimpleIsLocalInterceptorUnitTestCase.java 2007-09-11 21:15:24 UTC (rev 65305)
@@ -62,10 +62,10 @@
stayLocalTest("ClusteredStatefulRemote" ,true);
}
- public void testClusteredStatelessStaysLocal() throws Exception
+ /*public void testClusteredStatelessStaysLocal() throws Exception
{
stayLocalTest("ClusteredStatelessRemote" ,true);
- }
+ }*/
public void testNonClusteredStatefulGoesRemote() throws Exception
{
Copied: branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree994 (from rev 65304, branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/ejbthree994)
Deleted: branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree994/BusinessInterface.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/ejbthree994/BusinessInterface.java 2007-09-11 18:18:20 UTC (rev 65304)
+++ branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree994/BusinessInterface.java 2007-09-11 21:15:24 UTC (rev 65305)
@@ -1,32 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2007, Red Hat Middleware LLC, and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.ejbthree994;
-
-/**
- *
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision: $
- */
-public interface BusinessInterface
-{
- String echo(String s);
-}
Copied: branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree994/BusinessInterface.java (from rev 65304, branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/ejbthree994/BusinessInterface.java)
===================================================================
--- branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree994/BusinessInterface.java (rev 0)
+++ branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree994/BusinessInterface.java 2007-09-11 21:15:24 UTC (rev 65305)
@@ -0,0 +1,32 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.ejbthree994;
+
+/**
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision: $
+ */
+public interface BusinessInterface
+{
+ String echo(String s);
+}
Deleted: branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree994/StatefulBean.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/ejbthree994/StatefulBean.java 2007-09-11 18:18:20 UTC (rev 65304)
+++ branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree994/StatefulBean.java 2007-09-11 21:15:24 UTC (rev 65305)
@@ -1,46 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2007, Red Hat Middleware LLC, and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.ejbthree994;
-
-import javax.ejb.Remote;
-import javax.ejb.Stateful;
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.annotation.ejb.RemoteBindings;
-
-/**
- *
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision: $
- */
- at Stateful
- at RemoteBindings({
- @RemoteBinding(clientBindUrl="socket://0.0.0.0:3873", jndiBinding="Stateful3873"),
- @RemoteBinding(clientBindUrl="socket://0.0.0.0:3874", jndiBinding="Stateful3874")
-})
- at Remote(BusinessInterface.class)
-public class StatefulBean implements BusinessInterface
-{
- public String echo(String s)
- {
- return "*** " + s + " ***";
- }
-}
Copied: branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree994/StatefulBean.java (from rev 65304, branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/ejbthree994/StatefulBean.java)
===================================================================
--- branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree994/StatefulBean.java (rev 0)
+++ branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree994/StatefulBean.java 2007-09-11 21:15:24 UTC (rev 65305)
@@ -0,0 +1,46 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.ejbthree994;
+
+import javax.ejb.Remote;
+import javax.ejb.Stateful;
+import org.jboss.annotation.ejb.RemoteBinding;
+import org.jboss.annotation.ejb.RemoteBindings;
+
+/**
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision: $
+ */
+ at Stateful
+ at RemoteBindings({
+ @RemoteBinding(clientBindUrl="socket://0.0.0.0:3873", jndiBinding="Stateful3873"),
+ @RemoteBinding(clientBindUrl="socket://0.0.0.0:3874", jndiBinding="Stateful3874")
+})
+ at Remote(BusinessInterface.class)
+public class StatefulBean implements BusinessInterface
+{
+ public String echo(String s)
+ {
+ return "*** " + s + " ***";
+ }
+}
Copied: branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree994/unit (from rev 65304, branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/ejbthree994/unit)
Deleted: branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree994/unit/MultiBindingsTestCase.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/ejbthree994/unit/MultiBindingsTestCase.java 2007-09-11 18:18:20 UTC (rev 65304)
+++ branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree994/unit/MultiBindingsTestCase.java 2007-09-11 21:15:24 UTC (rev 65305)
@@ -1,84 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2007, Red Hat Middleware LLC, and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.ejbthree994.unit;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Proxy;
-
-import junit.framework.Test;
-
-import org.jboss.ejb3.test.ejbthree994.BusinessInterface;
-import org.jboss.remoting.InvokerLocator;
-import org.jboss.test.JBossTestCase;
-
-
-/**
- * Test if multiple remote bindings work correctly.
- *
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision: $
- */
-public class MultiBindingsTestCase extends JBossTestCase
-{
-
- public MultiBindingsTestCase(String name)
- {
- super(name);
- }
-
- private static String getProxyUri(Object proxy) throws SecurityException, NoSuchFieldException, IllegalArgumentException, IllegalAccessException
- {
- InvocationHandler handler = Proxy.getInvocationHandler(proxy);
- Field f = handler.getClass().getDeclaredField("uri");
- f.setAccessible(true);
- InvokerLocator locator = (InvokerLocator) f.get(handler);
- return locator.getOriginalURI();
- }
-
- public void test1() throws Exception
- {
- {
- BusinessInterface bean = (BusinessInterface) getInitialContext().lookup("Stateful3873");
- String actual = bean.echo("123");
- assertEquals(actual, "*** 123 ***");
-
- String proxyUri = getProxyUri(bean);
- assertEquals(proxyUri, "socket://0.0.0.0:3873");
- }
-
- {
- BusinessInterface bean = (BusinessInterface) getInitialContext().lookup("Stateful3874");
- String actual = bean.echo("456");
- assertEquals(actual, "*** 456 ***");
-
- String proxyUri = getProxyUri(bean);
- assertEquals(proxyUri, "socket://0.0.0.0:3874");
- }
- }
-
- public static Test suite() throws Exception
- {
- return getDeploySetup(MultiBindingsTestCase.class, "ejbthree994-connectors-service.xml,ejbthree994.jar");
- }
-
-}
Copied: branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree994/unit/MultiBindingsTestCase.java (from rev 65304, branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/ejbthree994/unit/MultiBindingsTestCase.java)
===================================================================
--- branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree994/unit/MultiBindingsTestCase.java (rev 0)
+++ branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree994/unit/MultiBindingsTestCase.java 2007-09-11 21:15:24 UTC (rev 65305)
@@ -0,0 +1,84 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.ejbthree994.unit;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Proxy;
+
+import junit.framework.Test;
+
+import org.jboss.ejb3.test.ejbthree994.BusinessInterface;
+import org.jboss.remoting.InvokerLocator;
+import org.jboss.test.JBossTestCase;
+
+
+/**
+ * Test if multiple remote bindings work correctly.
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision: $
+ */
+public class MultiBindingsTestCase extends JBossTestCase
+{
+
+ public MultiBindingsTestCase(String name)
+ {
+ super(name);
+ }
+
+ private static String getProxyUri(Object proxy) throws SecurityException, NoSuchFieldException, IllegalArgumentException, IllegalAccessException
+ {
+ InvocationHandler handler = Proxy.getInvocationHandler(proxy);
+ Field f = handler.getClass().getDeclaredField("uri");
+ f.setAccessible(true);
+ InvokerLocator locator = (InvokerLocator) f.get(handler);
+ return locator.getOriginalURI();
+ }
+
+ public void test1() throws Exception
+ {
+ {
+ BusinessInterface bean = (BusinessInterface) getInitialContext().lookup("Stateful3873");
+ String actual = bean.echo("123");
+ assertEquals(actual, "*** 123 ***");
+
+ String proxyUri = getProxyUri(bean);
+ assertEquals(proxyUri, "socket://0.0.0.0:3873");
+ }
+
+ {
+ BusinessInterface bean = (BusinessInterface) getInitialContext().lookup("Stateful3874");
+ String actual = bean.echo("456");
+ assertEquals(actual, "*** 456 ***");
+
+ String proxyUri = getProxyUri(bean);
+ assertEquals(proxyUri, "socket://0.0.0.0:3874");
+ }
+ }
+
+ public static Test suite() throws Exception
+ {
+ return getDeploySetup(MultiBindingsTestCase.class, "ejbthree994-connectors-service.xml,ejbthree994.jar");
+ }
+
+}
Modified: branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/localfromremote/unit/LocalTestCase.java
===================================================================
--- branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/localfromremote/unit/LocalTestCase.java 2007-09-11 18:18:20 UTC (rev 65304)
+++ branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/localfromremote/unit/LocalTestCase.java 2007-09-11 21:15:24 UTC (rev 65305)
@@ -21,6 +21,7 @@
*/
package org.jboss.ejb3.test.localfromremote.unit;
+import javax.naming.InitialContext;
import org.jboss.ejb3.test.localfromremote.StatefulRemote;
import org.jboss.ejb3.test.localfromremote.StatelessRemote;
import org.jboss.logging.Logger;
@@ -76,7 +77,8 @@
public void testStatefulLocalFromRemote() throws Exception
{
- StatelessRemote bean = (StatelessRemote) getInitialContext().lookup("StatelessBean/remote");
+ InitialContext jndiContext = new InitialContext();
+ StatelessRemote bean = (StatelessRemote) jndiContext.lookup("StatelessBean/remote");
assertNotNull(bean);
try
Copied: branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/removedislocal (from rev 65304, branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/removedislocal)
Deleted: branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/removedislocal/StatelessBean.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/removedislocal/StatelessBean.java 2007-09-11 18:18:20 UTC (rev 65304)
+++ branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/removedislocal/StatelessBean.java 2007-09-11 21:15:24 UTC (rev 65305)
@@ -1,51 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.removedislocal;
-
-import javax.ejb.EJB;
-import javax.ejb.Stateless;
-import javax.ejb.Remote;
-import org.jboss.logging.Logger;
-
-/**
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
- at Stateless
- at Remote(StatelessRemote.class)
-public class StatelessBean implements StatelessRemote
-{
- private static final Logger log = Logger.getLogger(StatelessBean.class);
-
- @EJB(beanName="StatelessBean")
- private StatelessRemote stateless;
-
- public void noop()
- {
- log.info("*** noop");
- }
-
- public void test()
- {
- log.info("*** test");
- stateless.noop();
- }
-}
Copied: branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/removedislocal/StatelessBean.java (from rev 65304, branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/removedislocal/StatelessBean.java)
===================================================================
--- branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/removedislocal/StatelessBean.java (rev 0)
+++ branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/removedislocal/StatelessBean.java 2007-09-11 21:15:24 UTC (rev 65305)
@@ -0,0 +1,51 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.removedislocal;
+
+import javax.ejb.EJB;
+import javax.ejb.Stateless;
+import javax.ejb.Remote;
+import org.jboss.logging.Logger;
+
+/**
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+ at Stateless
+ at Remote(StatelessRemote.class)
+public class StatelessBean implements StatelessRemote
+{
+ private static final Logger log = Logger.getLogger(StatelessBean.class);
+
+ @EJB(beanName="StatelessBean")
+ private StatelessRemote stateless;
+
+ public void noop()
+ {
+ log.info("*** noop");
+ }
+
+ public void test()
+ {
+ log.info("*** test");
+ stateless.noop();
+ }
+}
Deleted: branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/removedislocal/StatelessRemote.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/removedislocal/StatelessRemote.java 2007-09-11 18:18:20 UTC (rev 65304)
+++ branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/removedislocal/StatelessRemote.java 2007-09-11 21:15:24 UTC (rev 65305)
@@ -1,32 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.removedislocal;
-
-/**
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
-public interface StatelessRemote
-{
- void test();
-
- void noop();
-}
Copied: branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/removedislocal/StatelessRemote.java (from rev 65304, branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/removedislocal/StatelessRemote.java)
===================================================================
--- branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/removedislocal/StatelessRemote.java (rev 0)
+++ branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/removedislocal/StatelessRemote.java 2007-09-11 21:15:24 UTC (rev 65305)
@@ -0,0 +1,32 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.removedislocal;
+
+/**
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+public interface StatelessRemote
+{
+ void test();
+
+ void noop();
+}
Copied: branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/removedislocal/unit (from rev 65304, branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/removedislocal/unit)
Deleted: branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/removedislocal/unit/RemovedIsLocalUnitTestCase.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/removedislocal/unit/RemovedIsLocalUnitTestCase.java 2007-09-11 18:18:20 UTC (rev 65304)
+++ branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/removedislocal/unit/RemovedIsLocalUnitTestCase.java 2007-09-11 21:15:24 UTC (rev 65305)
@@ -1,56 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.removedislocal.unit;
-
-import org.jboss.ejb3.test.removedislocal.StatelessRemote;
-import org.jboss.logging.Logger;
-import org.jboss.test.JBossTestCase;
-import junit.framework.Test;
-
-
-/**
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
-public class RemovedIsLocalUnitTestCase
-extends JBossTestCase
-{
- private static final Logger log = Logger.getLogger(RemovedIsLocalUnitTestCase.class);
-
- public RemovedIsLocalUnitTestCase(String name)
- {
- super(name);
- }
-
-
- public void testRemoved() throws Exception
- {
- StatelessRemote stateless = (StatelessRemote)getInitialContext().lookup("StatelessBean/remote");
- assertNotNull(stateless);
- stateless.test();
- }
-
- public static Test suite() throws Exception
- {
- return getDeploySetup(RemovedIsLocalUnitTestCase.class, "removedislocal-test.jar");
- }
-
-}
Copied: branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/removedislocal/unit/RemovedIsLocalUnitTestCase.java (from rev 65304, branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/removedislocal/unit/RemovedIsLocalUnitTestCase.java)
===================================================================
--- branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/removedislocal/unit/RemovedIsLocalUnitTestCase.java (rev 0)
+++ branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/removedislocal/unit/RemovedIsLocalUnitTestCase.java 2007-09-11 21:15:24 UTC (rev 65305)
@@ -0,0 +1,56 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.removedislocal.unit;
+
+import org.jboss.ejb3.test.removedislocal.StatelessRemote;
+import org.jboss.logging.Logger;
+import org.jboss.test.JBossTestCase;
+import junit.framework.Test;
+
+
+/**
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+public class RemovedIsLocalUnitTestCase
+extends JBossTestCase
+{
+ private static final Logger log = Logger.getLogger(RemovedIsLocalUnitTestCase.class);
+
+ public RemovedIsLocalUnitTestCase(String name)
+ {
+ super(name);
+ }
+
+
+ public void testRemoved() throws Exception
+ {
+ StatelessRemote stateless = (StatelessRemote)getInitialContext().lookup("StatelessBean/remote");
+ assertNotNull(stateless);
+ stateless.test();
+ }
+
+ public static Test suite() throws Exception
+ {
+ return getDeploySetup(RemovedIsLocalUnitTestCase.class, "removedislocal-test.jar");
+ }
+
+}
Modified: branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/security/CallerBean.java
===================================================================
--- branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/security/CallerBean.java 2007-09-11 18:18:20 UTC (rev 65304)
+++ branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/security/CallerBean.java 2007-09-11 21:15:24 UTC (rev 65305)
@@ -64,7 +64,7 @@
Principal p = sessionContext.getCallerPrincipal();
log.info("echo, callerPrincipal=" + p);
boolean isEchoCaller = sessionContext.isCallerInRole("EchoCaller");
- log.info("echo, isCallerInRole('EchoCaller')=" + isEchoCaller);
+ log.info("******************** echo, isCallerInRole('EchoCaller')=" + isEchoCaller);
boolean isInternalRole = sessionContext.isCallerInRole("InternalRole");
log.info("echo, isCallerInRole('InternalRole')=" + isInternalRole);
Modified: branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/stateless/unit/MetricsUnitTestCase.java
===================================================================
--- branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/stateless/unit/MetricsUnitTestCase.java 2007-09-11 18:18:20 UTC (rev 65304)
+++ branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/stateless/unit/MetricsUnitTestCase.java 2007-09-11 21:15:24 UTC (rev 65305)
@@ -232,5 +232,4 @@
{
return getDeploySetup(MetricsUnitTestCase.class, "stateless-test.jar");
}
-
}
Modified: branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/statelesscreation/unit/MetricsUnitTestCase.java
===================================================================
--- branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/statelesscreation/unit/MetricsUnitTestCase.java 2007-09-11 18:18:20 UTC (rev 65304)
+++ branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/statelesscreation/unit/MetricsUnitTestCase.java 2007-09-11 21:15:24 UTC (rev 65305)
@@ -25,8 +25,8 @@
import javax.management.ObjectName;
import javax.naming.InitialContext;
-import org.jboss.ejb3.test.statelesscreation.DestroyRemote;
import org.jboss.ejb3.test.statelesscreation.StatelessRemote;
+import org.jboss.ejb3.test.statelesscreation.DestroyRemote;
import org.jboss.logging.Logger;
import org.jboss.test.JBossTestCase;
import junit.framework.Test;
@@ -259,5 +259,4 @@
{
return getDeploySetup(MetricsUnitTestCase.class, "statelesscreation-test.jar");
}
-
}
Modified: branches/JBPAPP_4_2/server/src/bin/jboss_init_hpux.sh
===================================================================
--- branches/JBPAPP_4_2/server/src/bin/jboss_init_hpux.sh 2007-09-11 18:18:20 UTC (rev 65304)
+++ branches/JBPAPP_4_2/server/src/bin/jboss_init_hpux.sh 2007-09-11 21:15:24 UTC (rev 65305)
@@ -26,14 +26,14 @@
#############
# JBOSS_HOME[0]=/opt/jboss1
# JBOSS_USER[0]=jboss1
-# SERVER_NAME[0]=default
+# SERVER_NAME[0]=production
# JBOSS_START[0]=1
## default console logging (you can also just omit the next line)
# JBOSS_CONSOLE[0]=""
#############
# JBOSS_HOME[1]=/opt/jboss2
# JBOSS_USER[1]=jboss2
-# SERVER_NAME[1]=default
+# SERVER_NAME[1]=production
# JBOSS_START[1]=1
## No Console logging
# JBOSS_CONSOLE[1]=/dev/null
@@ -55,9 +55,10 @@
# The default for the 1st instance is /opt/jboss: JBOSS_HOME[0]=/opt/jboss.
# No default for any other instance.
#
-# SERVER_NAME[i] - server instance name. Normally "all", "default", or
-# "minimal". Maps to server instance at $JBOSS_HOME/server/$SERVER_NAME
-# The default value is "default".
+# SERVER_NAME[i] - server instance name. Normally "all", "default",
+# "minimal" or "production". Maps to server instance at
+# $JBOSS_HOME/server/$SERVER_NAME
+# The default value is "production".
#
# JBOSS_START[i] - set to "0" to force JBOSS to not start when this script
# is run. Usefull when this script is run automatically at system
@@ -220,7 +221,7 @@
do
# set defaults for any missing values
- SERVER_NAME[$i]=${SERVER_NAME[i]:-"default"}
+ SERVER_NAME[$i]=${SERVER_NAME[i]:-"production"}
JBOSS_USER[$i]=${JBOSS_USER[i]:-"jboss"}
JBOSS_CONSOLE[$i]=${JBOSS_CONSOLE[i]:-/var/opt/jboss/${JBOSS_USER[i]}/jboss_${SERVER_NAME[i]}.log}
JBOSS_START[$i]=${JBOSS_START[i]:-1}
Modified: branches/JBPAPP_4_2/server/src/bin/jboss_init_redhat.sh
===================================================================
--- branches/JBPAPP_4_2/server/src/bin/jboss_init_redhat.sh 2007-09-11 18:18:20 UTC (rev 65304)
+++ branches/JBPAPP_4_2/server/src/bin/jboss_init_redhat.sh 2007-09-11 21:15:24 UTC (rev 65305)
@@ -23,8 +23,8 @@
#make sure java is in your path
JAVAPTH=${JAVAPTH:-"/usr/local/jdk/bin"}
-#configuration to use, usually one of 'minimal', 'default', 'all'
-JBOSS_CONF=${JBOSS_CONF:-"default"}
+#configuration to use, usually one of 'minimal', 'default', 'all', 'production'
+JBOSS_CONF=${JBOSS_CONF:-"production"}
#if JBOSS_HOST specified, use -b to bind jboss services to that address
JBOSS_BIND_ADDR=${JBOSS_HOST:+"-b $JBOSS_HOST"}
Modified: branches/JBPAPP_4_2/server/src/bin/jboss_init_suse.sh
===================================================================
--- branches/JBPAPP_4_2/server/src/bin/jboss_init_suse.sh 2007-09-11 18:18:20 UTC (rev 65304)
+++ branches/JBPAPP_4_2/server/src/bin/jboss_init_suse.sh 2007-09-11 21:15:24 UTC (rev 65305)
@@ -33,7 +33,7 @@
JBOSSCP=${JBOSSCP:-"$JBOSS_HOME/bin/shutdown.jar:$JBOSS_HOME/client/jnet.jar"}
#define the script to use to start jboss
-JBOSSSH=${JBOSSSH:-"$JBOSS_HOME/bin/run.sh -c default"}
+JBOSSSH=${JBOSSSH:-"$JBOSS_HOME/bin/run.sh -c production"}
# Shell functions sourced from /etc/rc.status:
# rc_check check and set local and overall rc status
Modified: branches/JBPAPP_4_2/server/src/etc/conf/default/jboss-log4j.xml
===================================================================
--- branches/JBPAPP_4_2/server/src/etc/conf/default/jboss-log4j.xml 2007-09-11 18:18:20 UTC (rev 65304)
+++ branches/JBPAPP_4_2/server/src/etc/conf/default/jboss-log4j.xml 2007-09-11 21:15:24 UTC (rev 65305)
@@ -191,7 +191,7 @@
</category>
<!-- Enable JBossWS message tracing
- <category name="jbossws.SOAPMessage">
+ <category name="org.jboss.ws.core.MessageTrace">
<priority value="TRACE"/>
</category>
-->
Modified: branches/JBPAPP_4_2/server/src/etc/conf/default/props/jmx-console-users.properties
===================================================================
--- branches/JBPAPP_4_2/server/src/etc/conf/default/props/jmx-console-users.properties 2007-09-11 18:18:20 UTC (rev 65304)
+++ branches/JBPAPP_4_2/server/src/etc/conf/default/props/jmx-console-users.properties 2007-09-11 21:15:24 UTC (rev 65305)
@@ -1,2 +1,2 @@
# A sample users.properties file for use with the UsersRolesLoginModule
-admin=admin
+#admin=admin
Modified: branches/JBPAPP_4_2/server/src/main/org/jboss/web/WebPermissionMapping.java
===================================================================
--- branches/JBPAPP_4_2/server/src/main/org/jboss/web/WebPermissionMapping.java 2007-09-11 18:18:20 UTC (rev 65304)
+++ branches/JBPAPP_4_2/server/src/main/org/jboss/web/WebPermissionMapping.java 2007-09-11 21:15:24 UTC (rev 65305)
@@ -206,24 +206,45 @@
// Create the unchecked permissions WebUserDataPermissions
Iterator transportContraints = info.getTransportMethods();
- while( transportContraints.hasNext() )
+ while( transportContraints.hasNext())
{
Map.Entry transportMethods = (Map.Entry) transportContraints.next();
String transport = (String) transportMethods.getKey();
Set methods = (Set) transportMethods.getValue();
httpMethods = new String[methods.size()];
methods.toArray(httpMethods);
- if(info.getExcludedMethods() == null)
- {
- WebUserDataPermission wudp = new WebUserDataPermission(qurl, httpMethods, transport);
- pc.addToUncheckedPolicy(wudp);
-
- if("NONE".equals(transport))
- {
- WebUserDataPermission wudp1 = new WebUserDataPermission(info.pattern, null);
- pc.addToUncheckedPolicy(wudp1);
- }
- }
+
+ /**
+ * If you have any excluding auth-constraint, then add an unchecked
+ * permission for the non-excluded methods
+ */
+ if(info.getExcludedMethods() != null)
+ {
+ pc.addToUncheckedPolicy(new WebUserDataPermission(qurl, info.getMissingMethods(), null ));
+ continue;
+ }
+
+ // Dealing with non-excluded methods now
+ String[] allMethods = WebSecurityMetaData.ALL_HTTP_METHOD_NAMES;
+ boolean ALL_METHODS_FLAG = Arrays.equals(allMethods, httpMethods);
+ WebUserDataPermission wudp = new WebUserDataPermission(qurl, httpMethods, transport);
+ pc.addToUncheckedPolicy(wudp);
+
+ //Create an unchecked permission for the missing methods
+ String[] missingMethods = info.getMissingMethods();
+ if(!Arrays.equals(allMethods,missingMethods))
+ pc.addToUncheckedPolicy(new WebUserDataPermission(qurl,missingMethods, null ));
+
+ /**
+ * A WebResourcePermission and a WebUserDataPermission must be added to the unchecked
+ * policy statements for each url-pattern in the DD and the default pattern, "/",
+ * that is not combined by the webresource-collection elements of the deployment descriptor
+ * with every HTTP method value. (JACC 1.0: Section 3.1.3.1)
+ */
+ //Add a null permission if not already added
+ boolean unsecureTransport = transport == null || "NONE".equals(transport);
+ if(!ALL_METHODS_FLAG && unsecureTransport )
+ pc.addToUncheckedPolicy(new WebUserDataPermission(qurl, null, null ));
}
}
Modified: branches/JBPAPP_4_2/server/src/resources/jmx-invoker-adaptor/META-INF/jboss-service.xml
===================================================================
--- branches/JBPAPP_4_2/server/src/resources/jmx-invoker-adaptor/META-INF/jboss-service.xml 2007-09-11 18:18:20 UTC (rev 65304)
+++ branches/JBPAPP_4_2/server/src/resources/jmx-invoker-adaptor/META-INF/jboss-service.xml 2007-09-11 21:15:24 UTC (rev 65305)
@@ -111,10 +111,9 @@
<return-type>java.lang.Object</return-type>
<descriptors>
<interceptors>
- <!-- Uncomment to require authenticated users
+ <!-- Uncomment to require authenticated users -->
<interceptor code="org.jboss.jmx.connector.invoker.AuthenticationInterceptor"
securityDomain="java:/jaas/jmx-console"/>
- -->
<!-- Interceptor that deals with non-serializable results -->
<interceptor code="org.jboss.jmx.connector.invoker.SerializableInterceptor"
policyClass="StripModelMBeanInfoPolicy"/>
Modified: branches/JBPAPP_4_2/system/src/bin/run.sh
===================================================================
--- branches/JBPAPP_4_2/system/src/bin/run.sh 2007-09-11 18:18:20 UTC (rev 65304)
+++ branches/JBPAPP_4_2/system/src/bin/run.sh 2007-09-11 21:15:24 UTC (rev 65305)
@@ -11,6 +11,23 @@
PROGNAME=`basename $0`
GREP="grep"
+# Set conf if specified, else set to default
+JBOSSCONF="production"
+
+arg_count=1
+eval SWITCH=\${$arg_count}
+while [ ! -z $SWITCH ]
+do
+
+ if [ "$SWITCH" = "-c" ]; then
+ eval JBOSSCONF=\$`expr $arg_count + 1`
+ break
+ fi
+
+ arg_count=`expr $arg_count + 1`
+ eval SWITCH=\${$arg_count}
+done
+
# Use the maximum available, or set MAX_FD != -1 to use that
MAX_FD="maximum"
@@ -41,7 +58,7 @@
Darwin*)
darwin=true
;;
-
+
Linux)
linux=true
;;
@@ -49,7 +66,12 @@
# Read an optional running configuration file
if [ "x$RUN_CONF" = "x" ]; then
- RUN_CONF="$DIRNAME/run.conf"
+
+ if [ ! -z "$JBOSSCONF" ] && [ -f "$DIRNAME/../server/$JBOSSCONF/run.conf" ]; then
+ RUN_CONF="$DIRNAME/../server/$JBOSSCONF/run.conf"
+ else
+ RUN_CONF="$DIRNAME/run.conf"
+ fi
fi
if [ -r "$RUN_CONF" ]; then
. "$RUN_CONF"
@@ -237,7 +259,7 @@
# If restart doesn't work, check you are running JBossAS 4.0.4+
# http://jira.jboss.com/jira/browse/JBAS-2483
# or the following if you're running Red Hat 7.0
- # http://developer.java.sun.com/developer/bugParade/bugs/4465334.html
+ # http://developer.java.sun.com/developer/bugParade/bugs/4465334.html
if [ $JBOSS_STATUS -eq 10 ]; then
echo "Restarting JBoss..."
else
Modified: branches/JBPAPP_4_2/system/src/main/org/jboss/system/server/ServerConfig.java
===================================================================
--- branches/JBPAPP_4_2/system/src/main/org/jboss/system/server/ServerConfig.java 2007-09-11 18:18:20 UTC (rev 65304)
+++ branches/JBPAPP_4_2/system/src/main/org/jboss/system/server/ServerConfig.java 2007-09-11 21:15:24 UTC (rev 65305)
@@ -295,7 +295,7 @@
/////////////////////////////////////////////////////////////////////////
/** The default value for {@link #SERVER_NAME}. */
- String DEFAULT_SERVER_NAME = "default";
+ String DEFAULT_SERVER_NAME = "production";
/** The default value for {@link #EXIT_ON_SHUTDOWN}. */
boolean DEFAULT_EXIT_ON_SHUTDOWN = true;
Modified: branches/JBPAPP_4_2/testsuite/build.xml
===================================================================
--- branches/JBPAPP_4_2/testsuite/build.xml 2007-09-11 18:18:20 UTC (rev 65304)
+++ branches/JBPAPP_4_2/testsuite/build.xml 2007-09-11 21:15:24 UTC (rev 65305)
@@ -3000,7 +3000,6 @@
<include name="lib/**"/>
</patternset>
</create-config>
-
<!-- test interoperating with clients using the legacy rmi invokers -->
<test-compatibility client-version="3_2_8SP1" client-jdk="${jdk15}" client-serialization-flag="-Dorg.jboss.j2ee.Serialization" serialization-flag="-Dnone" server-config="legacy-invokers"/>
<test-compatibility client-version="3_2_x" client-jdk="${jdk15}" client-serialization-flag="-Dorg.jboss.j2ee.Serialization" serialization-flag="-Dnone" server-config="legacy-invokers"/>
@@ -3013,7 +3012,10 @@
<test-compatibility client-version="4_0_5_GA" client-jdk="${jdk14}" client-serialization-flag="-Dnone" serialization-flag="-Djboss.remoting.pre_2_0_compatible=true" server-config="default"/>
<test-compatibility client-version="4_0_x" client-jdk="${jdk14}" client-serialization-flag="-Dnone" serialization-flag="-Djboss.remoting.pre_2_0_compatible=true" server-config="default"/>
<test-compatibility client-version="4_2_0_GA" client-jdk="${jdk15}" client-serialization-flag="-Dnone" serialization-flag="-Dnone" server-config="default"/>
+ <test-compatibility client-version="4_2_1_GA" client-jdk="${jdk15}" client-serialization-flag="-Dnone" serialization-flag="-Dnone" server-config="default"/>
<test-compatibility client-version="4_2_x" client-jdk="${jdk15}" client-serialization-flag="-Dnone" serialization-flag="-Dnone" server-config="default"/>
+ <test-compatibility client-version="4_2_0_GA_EAP" client-jdk="${jdk15}" client-serialization-flag="-Dnone" serialization-flag="-Dnone" server-config="default"/>
+
<!-- testing interoperating with clients using the pooled invokers -->
<test-compatibility-pooled-invokers client-version="4_0_3" client-jdk="${jdk14}" client-serialization-flag="-Dnone" serialization-flag="-Dorg.jboss.invocation.pooled.Legacy"/>
<test-compatibility-pooled-invokers client-version="4_0_3SP1" client-jdk="${jdk14}" client-serialization-flag="-Dnone" serialization-flag="-Dorg.jboss.invocation.pooled.Legacy"/>
@@ -3021,7 +3023,9 @@
<test-compatibility-pooled-invokers client-version="4_0_5_GA" client-jdk="${jdk14}" client-serialization-flag="-Dnone" serialization-flag="-Dnone"/>
<test-compatibility-pooled-invokers client-version="4_0_x" client-jdk="${jdk14}" client-serialization-flag="-Dnone" serialization-flag="-Dnone"/>
<test-compatibility-pooled-invokers client-version="4_2_0_GA" client-jdk="${jdk15}" client-serialization-flag="-Dnone" serialization-flag="-Dnone"/>
+ <test-compatibility-pooled-invokers client-version="4_2_1_GA" client-jdk="${jdk15}" client-serialization-flag="-Dnone" serialization-flag="-Dnone"/>
<test-compatibility-pooled-invokers client-version="4_2_x" client-jdk="${jdk15}" client-serialization-flag="-Dnone" serialization-flag="-Dnone"/>
+ <test-compatibility-pooled-invokers client-version="4_2_0_GA_EAP" client-jdk="${jdk15}" client-serialization-flag="-Dnone" serialization-flag="-Dnone"/>
</target>
<macrodef name="test-compatibility-pooled-invokers">
Copied: branches/JBPAPP_4_2/testsuite/src/main/org/jboss/test/jacc/test/TestJBossPolicyConfiguration.java (from rev 65304, branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/jacc/test/TestJBossPolicyConfiguration.java)
===================================================================
--- branches/JBPAPP_4_2/testsuite/src/main/org/jboss/test/jacc/test/TestJBossPolicyConfiguration.java (rev 0)
+++ branches/JBPAPP_4_2/testsuite/src/main/org/jboss/test/jacc/test/TestJBossPolicyConfiguration.java 2007-09-11 21:15:24 UTC (rev 65305)
@@ -0,0 +1,154 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.jacc.test;
+
+import java.security.Permission;
+import java.security.PermissionCollection;
+import java.security.Permissions;
+import java.util.Enumeration;
+import java.util.HashMap;
+
+import javax.security.jacc.PolicyConfiguration;
+import javax.security.jacc.PolicyContextException;
+
+//$Id$
+
+/**
+ * Policy Configuration used for permissions validation
+ * @author <a href="mailto:Anil.Saldhana at jboss.org">Anil Saldhana</a>
+ * @since Dec 18, 2006
+ * @version $Revision$
+ */
+public class TestJBossPolicyConfiguration implements PolicyConfiguration
+{
+ private String contextID;
+
+ private Permissions excludedPolicy = new Permissions();
+ private Permissions uncheckedPolicy = new Permissions();
+
+ private HashMap<String,Permissions> rolePerms = new HashMap<String,Permissions>();
+
+
+ public TestJBossPolicyConfiguration(String contextID)
+ {
+ this.contextID = contextID;
+ }
+
+ public void addToExcludedPolicy(Permission permission) throws PolicyContextException
+ {
+ this.excludedPolicy.add(permission);
+ }
+
+ public void addToExcludedPolicy(PermissionCollection permissions) throws PolicyContextException
+ {
+ Enumeration<Permission> en = permissions.elements();
+ while(en.hasMoreElements())
+ addToExcludedPolicy(en.nextElement());
+ }
+
+ public void addToRole(String roleName, Permission permission) throws PolicyContextException
+ {
+ Permissions p = rolePerms.get(roleName);
+ if(p == null)
+ p = new Permissions();
+ p.add(permission);
+ rolePerms.put(roleName, p);
+ }
+
+ public void addToRole(String roleName, PermissionCollection permissions) throws PolicyContextException
+ {
+ Enumeration<Permission> en = permissions.elements();
+ while(en.hasMoreElements())
+ addToRole(roleName,en.nextElement());
+ }
+
+ public void addToUncheckedPolicy(Permission permission) throws PolicyContextException
+ {
+ this.uncheckedPolicy.add(permission);
+ }
+
+ public void addToUncheckedPolicy(PermissionCollection permissions) throws PolicyContextException
+ {
+ Enumeration<Permission> en = permissions.elements();
+ while(en.hasMoreElements())
+ addToUncheckedPolicy(en.nextElement());
+ }
+
+ public void commit() throws PolicyContextException
+ {
+ }
+
+ public void delete() throws PolicyContextException
+ {
+ }
+
+ public String getContextID() throws PolicyContextException
+ {
+ return this.contextID;
+ }
+
+ public boolean inService() throws PolicyContextException
+ {
+ return false;
+ }
+
+ public void linkConfiguration(PolicyConfiguration link) throws PolicyContextException
+ {
+ }
+
+ public void removeExcludedPolicy() throws PolicyContextException
+ {
+ this.excludedPolicy = null;
+ }
+
+ public void removeRole(String roleName) throws PolicyContextException
+ {
+ Permissions p = this.rolePerms.get(roleName);
+ if(p != null)
+ {
+ p = null;
+ rolePerms.remove(roleName);
+ }
+ }
+
+ public void removeUncheckedPolicy() throws PolicyContextException
+ {
+ this.uncheckedPolicy = null;
+ }
+
+ //Value added methods
+
+ public Permissions getExcludedPolicy()
+ {
+ return excludedPolicy;
+ }
+
+ public Permissions getUncheckedPolicy()
+ {
+ return uncheckedPolicy;
+ }
+
+ public Permissions getPermissionsForRole(String roleName)
+ {
+ return this.rolePerms.get(roleName);
+ }
+}
Copied: branches/JBPAPP_4_2/testsuite/src/main/org/jboss/test/jacc/test/WebPermissionsValidationTestCase.java (from rev 65304, branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/jacc/test/WebPermissionsValidationTestCase.java)
===================================================================
--- branches/JBPAPP_4_2/testsuite/src/main/org/jboss/test/jacc/test/WebPermissionsValidationTestCase.java (rev 0)
+++ branches/JBPAPP_4_2/testsuite/src/main/org/jboss/test/jacc/test/WebPermissionsValidationTestCase.java 2007-09-11 21:15:24 UTC (rev 65305)
@@ -0,0 +1,107 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.jacc.test;
+
+import java.io.InputStream;
+import java.net.URL;
+import java.security.Permissions;
+
+import javax.security.jacc.WebResourcePermission;
+import javax.security.jacc.WebUserDataPermission;
+import javax.xml.parsers.DocumentBuilderFactory;
+
+import org.jboss.metadata.WebMetaData;
+import org.jboss.test.JBossTestCase;
+import org.jboss.web.WebPermissionMapping;
+import org.w3c.dom.Document;
+
+//$Id$
+
+/**
+ * Validate the parsing of web.xml and the creation of JACC Permissions
+ * @author <a href="mailto:Anil.Saldhana at jboss.org">Anil Saldhana</a>
+ * @since Dec 18, 2006
+ * @version $Revision$
+ */
+public class WebPermissionsValidationTestCase extends JBossTestCase
+{
+ private boolean DEBUG = true;
+
+ public WebPermissionsValidationTestCase(String name)
+ {
+ super(name);
+ }
+
+ public WebMetaData getWebMetaData(InputStream webxml)
+ throws Exception
+ {
+ WebMetaData wmd = new WebMetaData();
+ DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+ Document doc = factory.newDocumentBuilder().parse(webxml);
+ wmd.importXml(doc.getDocumentElement());
+ return wmd;
+ }
+
+ public void testWebPermissions() throws Exception
+ {
+ ClassLoader cl = Thread.currentThread().getContextClassLoader();
+ URL webxml = cl.getResource("security/jacc/webperm/web.xml");
+ assertNotNull("web.xml exists?", webxml);
+ WebMetaData wmd = getWebMetaData(webxml.openStream());
+ TestJBossPolicyConfiguration tpc = new TestJBossPolicyConfiguration("dummy");
+ WebPermissionMapping.createPermissions(wmd, tpc);
+ checkUncheckedPermissions(tpc.getUncheckedPolicy());
+ checkExcludedPermissions(tpc.getExcludedPolicy());
+ if(DEBUG)
+ {
+ System.out.println("Unchecked=" + tpc.getUncheckedPolicy().toString());
+ System.out.println("Excluded=" + tpc.getExcludedPolicy().toString());
+ }
+ }
+
+
+ private void checkUncheckedPermissions(Permissions p)
+ {
+ //WebResourcePermissions
+ assertTrue(p.implies(new WebResourcePermission("/unchecked.jsp", (String) null)));
+ assertTrue(p.implies(new WebResourcePermission("/sslprotected.jsp", "DELETE,HEAD,OPTIONS,PUT,TRACE")));
+ assertTrue(p.implies(new WebResourcePermission("/:/secured.jsp:/unchecked.jsp:/excluded.jsp:/sslprotected.jsp",
+ (String) null)));
+ assertTrue(p.implies(new WebResourcePermission("/excluded.jsp", "DELETE,HEAD,OPTIONS,PUT,TRACE")));
+ assertTrue(p.implies(new WebResourcePermission("/secured.jsp", "DELETE,HEAD,OPTIONS,PUT,TRACE")));
+
+ //WebUserDataPermissions
+ assertTrue(p.implies(new WebUserDataPermission("/sslprotected.jsp", "GET,POST:CONFIDENTIAL")));
+ assertTrue(p.implies(new WebUserDataPermission("/secured.jsp", (String) null)));
+ assertTrue(p.implies(new WebUserDataPermission("/:/unchecked.jsp:/secured.jsp:/sslprotected.jsp:/excluded.jsp",
+ (String) null)));
+ assertTrue(p.implies(new WebUserDataPermission("/sslprotected.jsp", "DELETE,HEAD,OPTIONS,PUT,TRACE")));
+ assertTrue(p.implies(new WebUserDataPermission("/unchecked.jsp", (String) null)));
+ assertTrue(p.implies(new WebUserDataPermission("/excluded.jsp", "DELETE,HEAD,OPTIONS,PUT,TRACE")));
+ }
+
+ private void checkExcludedPermissions(Permissions p)
+ {
+ assertTrue(p.implies(new WebResourcePermission("/excluded.jsp", "GET,POST")));
+ assertTrue(p.implies(new WebUserDataPermission("/excluded.jsp", "GET,POST")));
+ }
+}
Modified: branches/JBPAPP_4_2/testsuite/src/main/org/jboss/test/util/test/TwiddleUnitTestCase.java
===================================================================
--- branches/JBPAPP_4_2/testsuite/src/main/org/jboss/test/util/test/TwiddleUnitTestCase.java 2007-09-11 18:18:20 UTC (rev 65304)
+++ branches/JBPAPP_4_2/testsuite/src/main/org/jboss/test/util/test/TwiddleUnitTestCase.java 2007-09-11 21:15:24 UTC (rev 65305)
@@ -78,8 +78,7 @@
* bat or sh file using the jboss.dist system property. It will automatically pass
* in the -s parameter for the host of the server being used for testing.
*
- * @param args The arguments passed to twiddle. These should not include the -s
- * argument.
+ * @param args The arguments passed to twiddle.
*/
protected String runTwiddle(String... args) throws IOException, InterruptedException
{
@@ -90,8 +89,8 @@
command.add("cmd");
command.add("/C");
command.add("twiddle");
- //command.add("-s");
- //command.add(getServerHost());
+ command.add("-s");
+ command.add(getServerHost());
command.addAll(Arrays.asList(args));
}
else
@@ -99,8 +98,8 @@
command.add("/bin/sh");
command.add("-c");
String twiddleCmd = "./twiddle.sh ";
- //twiddleCmd += "-s ";
- //twiddleCmd += getServerHost();
+ twiddleCmd += "-s ";
+ twiddleCmd += getServerHost();
twiddleCmd += makeTwiddleArgs(args);
command.add(twiddleCmd);
}
Copied: branches/JBPAPP_4_2/testsuite/src/resources/security/jacc/webperm (from rev 65304, branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/security/jacc/webperm)
Deleted: branches/JBPAPP_4_2/testsuite/src/resources/security/jacc/webperm/web.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/security/jacc/webperm/web.xml 2007-09-11 18:18:20 UTC (rev 65304)
+++ branches/JBPAPP_4_2/testsuite/src/resources/security/jacc/webperm/web.xml 2007-09-11 21:15:24 UTC (rev 65305)
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
- <display-name>jacc_toolsContracts</display-name>
- <servlet>
- <display-name>unchecked</display-name>
- <servlet-name>unchecked</servlet-name>
- <jsp-file>/unchecked.jsp</jsp-file>
- <load-on-startup>0</load-on-startup>
- </servlet>
- <servlet>
- <display-name>excluded</display-name>
- <servlet-name>excluded</servlet-name>
- <jsp-file>/excluded.jsp</jsp-file>
- <load-on-startup>0</load-on-startup>
- </servlet>
- <servlet>
- <display-name>secured</display-name>
- <servlet-name>secured</servlet-name>
- <jsp-file>/secured.jsp</jsp-file>
- <load-on-startup>0</load-on-startup>
- <security-role-ref>
- <role-name>ADM</role-name>
- <role-link>Administrator</role-link>
- </security-role-ref>
- </servlet>
- <servlet>
- <display-name>sslprotected</display-name>
- <servlet-name>sslprotected</servlet-name>
- <jsp-file>/sslprotected.jsp</jsp-file>
- <load-on-startup>0</load-on-startup>
- <security-role-ref>
- <role-name>ADM</role-name>
- <role-link>Administrator</role-link>
- </security-role-ref>
- <security-role-ref>
- <role-name>MGR</role-name>
- <role-link>Manager</role-link>
- </security-role-ref>
- </servlet>
- <servlet-mapping>
- <servlet-name>unchecked</servlet-name>
- <url-pattern>/unchecked.jsp</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>excluded</servlet-name>
- <url-pattern>/excluded.jsp</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>secured</servlet-name>
- <url-pattern>/secured.jsp</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>sslprotected</servlet-name>
- <url-pattern>/sslprotected.jsp</url-pattern>
- </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
- <security-constraint>
- <web-resource-collection>
- <web-resource-name>MySecureBit4</web-resource-name>
- <url-pattern>/unchecked.jsp</url-pattern>
- <http-method>POST</http-method>
- <http-method>GET</http-method>
- </web-resource-collection>
- <user-data-constraint>
- <transport-guarantee>NONE</transport-guarantee>
- </user-data-constraint>
- </security-constraint>
- <security-constraint>
- <web-resource-collection>
- <web-resource-name>MySecureBit5</web-resource-name>
- <url-pattern>/excluded.jsp</url-pattern>
- <http-method>POST</http-method>
- <http-method>GET</http-method>
- </web-resource-collection>
- <auth-constraint/>
- <user-data-constraint>
- <transport-guarantee>NONE</transport-guarantee>
- </user-data-constraint>
- </security-constraint>
- <security-constraint>
- <web-resource-collection>
- <web-resource-name>MySecureBit6</web-resource-name>
- <url-pattern>/sslprotected.jsp</url-pattern>
- <http-method>POST</http-method>
- <http-method>GET</http-method>
- </web-resource-collection>
- <auth-constraint>
- <role-name>Administrator</role-name>
- </auth-constraint>
- <user-data-constraint>
- <transport-guarantee>CONFIDENTIAL</transport-guarantee>
- </user-data-constraint>
- </security-constraint>
- <security-constraint>
- <web-resource-collection>
- <web-resource-name>MySecureBit3</web-resource-name>
- <url-pattern>/secured.jsp</url-pattern>
- <http-method>POST</http-method>
- <http-method>GET</http-method>
- </web-resource-collection>
- <auth-constraint>
- <role-name>Administrator</role-name>
- </auth-constraint>
- <user-data-constraint>
- <transport-guarantee>NONE</transport-guarantee>
- </user-data-constraint>
- </security-constraint>
- <login-config>
- <auth-method>BASIC</auth-method>
- <realm-name>default</realm-name>
- </login-config>
- <security-role>
- <role-name>Administrator</role-name>
- </security-role>
- <security-role>
- <role-name>Manager</role-name>
- </security-role>
- <security-role>
- <role-name>Employee</role-name>
- </security-role>
-</web-app>
Copied: branches/JBPAPP_4_2/testsuite/src/resources/security/jacc/webperm/web.xml (from rev 65304, branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/security/jacc/webperm/web.xml)
===================================================================
--- branches/JBPAPP_4_2/testsuite/src/resources/security/jacc/webperm/web.xml (rev 0)
+++ branches/JBPAPP_4_2/testsuite/src/resources/security/jacc/webperm/web.xml 2007-09-11 21:15:24 UTC (rev 65305)
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+ <display-name>jacc_toolsContracts</display-name>
+ <servlet>
+ <display-name>unchecked</display-name>
+ <servlet-name>unchecked</servlet-name>
+ <jsp-file>/unchecked.jsp</jsp-file>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
+ <servlet>
+ <display-name>excluded</display-name>
+ <servlet-name>excluded</servlet-name>
+ <jsp-file>/excluded.jsp</jsp-file>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
+ <servlet>
+ <display-name>secured</display-name>
+ <servlet-name>secured</servlet-name>
+ <jsp-file>/secured.jsp</jsp-file>
+ <load-on-startup>0</load-on-startup>
+ <security-role-ref>
+ <role-name>ADM</role-name>
+ <role-link>Administrator</role-link>
+ </security-role-ref>
+ </servlet>
+ <servlet>
+ <display-name>sslprotected</display-name>
+ <servlet-name>sslprotected</servlet-name>
+ <jsp-file>/sslprotected.jsp</jsp-file>
+ <load-on-startup>0</load-on-startup>
+ <security-role-ref>
+ <role-name>ADM</role-name>
+ <role-link>Administrator</role-link>
+ </security-role-ref>
+ <security-role-ref>
+ <role-name>MGR</role-name>
+ <role-link>Manager</role-link>
+ </security-role-ref>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>unchecked</servlet-name>
+ <url-pattern>/unchecked.jsp</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>excluded</servlet-name>
+ <url-pattern>/excluded.jsp</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>secured</servlet-name>
+ <url-pattern>/secured.jsp</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>sslprotected</servlet-name>
+ <url-pattern>/sslprotected.jsp</url-pattern>
+ </servlet-mapping>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
+ <security-constraint>
+ <web-resource-collection>
+ <web-resource-name>MySecureBit4</web-resource-name>
+ <url-pattern>/unchecked.jsp</url-pattern>
+ <http-method>POST</http-method>
+ <http-method>GET</http-method>
+ </web-resource-collection>
+ <user-data-constraint>
+ <transport-guarantee>NONE</transport-guarantee>
+ </user-data-constraint>
+ </security-constraint>
+ <security-constraint>
+ <web-resource-collection>
+ <web-resource-name>MySecureBit5</web-resource-name>
+ <url-pattern>/excluded.jsp</url-pattern>
+ <http-method>POST</http-method>
+ <http-method>GET</http-method>
+ </web-resource-collection>
+ <auth-constraint/>
+ <user-data-constraint>
+ <transport-guarantee>NONE</transport-guarantee>
+ </user-data-constraint>
+ </security-constraint>
+ <security-constraint>
+ <web-resource-collection>
+ <web-resource-name>MySecureBit6</web-resource-name>
+ <url-pattern>/sslprotected.jsp</url-pattern>
+ <http-method>POST</http-method>
+ <http-method>GET</http-method>
+ </web-resource-collection>
+ <auth-constraint>
+ <role-name>Administrator</role-name>
+ </auth-constraint>
+ <user-data-constraint>
+ <transport-guarantee>CONFIDENTIAL</transport-guarantee>
+ </user-data-constraint>
+ </security-constraint>
+ <security-constraint>
+ <web-resource-collection>
+ <web-resource-name>MySecureBit3</web-resource-name>
+ <url-pattern>/secured.jsp</url-pattern>
+ <http-method>POST</http-method>
+ <http-method>GET</http-method>
+ </web-resource-collection>
+ <auth-constraint>
+ <role-name>Administrator</role-name>
+ </auth-constraint>
+ <user-data-constraint>
+ <transport-guarantee>NONE</transport-guarantee>
+ </user-data-constraint>
+ </security-constraint>
+ <login-config>
+ <auth-method>BASIC</auth-method>
+ <realm-name>default</realm-name>
+ </login-config>
+ <security-role>
+ <role-name>Administrator</role-name>
+ </security-role>
+ <security-role>
+ <role-name>Manager</role-name>
+ </security-role>
+ <security-role>
+ <role-name>Employee</role-name>
+ </security-role>
+</web-app>
Modified: branches/JBPAPP_4_2/tomcat/src/main/org/jboss/web/tomcat/service/session/JvmRouteValve.java
===================================================================
--- branches/JBPAPP_4_2/tomcat/src/main/org/jboss/web/tomcat/service/session/JvmRouteValve.java 2007-09-11 18:18:20 UTC (rev 65304)
+++ branches/JBPAPP_4_2/tomcat/src/main/org/jboss/web/tomcat/service/session/JvmRouteValve.java 2007-09-11 21:15:24 UTC (rev 65305)
@@ -125,7 +125,7 @@
int index = oldsessionId.lastIndexOf(".");
if (index > 0)
{
- receivedJvmRoute = oldsessionId.substring(index + 1, sessionId.length());
+ receivedJvmRoute = oldsessionId.substring(index + 1, oldsessionId.length());
}
String requestedJvmRoute = null;
Modified: branches/JBPAPP_4_2/tools/etc/buildmagic/buildmagic.ent
===================================================================
--- branches/JBPAPP_4_2/tools/etc/buildmagic/buildmagic.ent 2007-09-11 18:18:20 UTC (rev 65304)
+++ branches/JBPAPP_4_2/tools/etc/buildmagic/buildmagic.ent 2007-09-11 21:15:24 UTC (rev 65305)
@@ -101,7 +101,7 @@
<property name="version.major" value="4"/>
<property name="version.minor" value="3"/>
<property name="version.revision" value="0"/>
- <property name="version.tag" value="GA"/>
+ <property name="version.tag" value="GA_CP01"/>
<property name="version.name" value="Trinity"/>
<!-- This must be set to the CVS tag for any release -->
<property name="version.cvstag" value="JBoss_${version.major}_${version.minor}_${version.revision}_${version.tag}" />
Modified: branches/JBPAPP_4_2/tools/etc/buildmagic/version-info.xml
===================================================================
--- branches/JBPAPP_4_2/tools/etc/buildmagic/version-info.xml 2007-09-11 18:18:20 UTC (rev 65304)
+++ branches/JBPAPP_4_2/tools/etc/buildmagic/version-info.xml 2007-09-11 21:15:24 UTC (rev 65305)
@@ -17,7 +17,7 @@
<property name="version.major" value="4"/>
<property name="version.minor" value="3"/>
<property name="version.revision" value="0"/>
- <property name="version.tag" value="GA"/>
+ <property name="version.tag" value="GA_CP01"/>
<property name="version.name" value="Trinity"/>
<!-- This must be set to the CVS tag for any release -->
<property name="version.cvstag" value="JBoss_${version.major}_${version.minor}_${version.revision}_${version.tag}"/>
Modified: branches/JBPAPP_4_2/varia/src/resources/jmx/jmx-console-web.xml
===================================================================
--- branches/JBPAPP_4_2/varia/src/resources/jmx/jmx-console-web.xml 2007-09-11 18:18:20 UTC (rev 65304)
+++ branches/JBPAPP_4_2/varia/src/resources/jmx/jmx-console-web.xml 2007-09-11 21:15:24 UTC (rev 65305)
@@ -34,7 +34,7 @@
<servlet-class>org.jboss.jmx.adaptor.html.ClusteredConsoleServlet</servlet-class>
<init-param>
<param-name>jgProps</param-name>
- <param-value>UDP(ip_mcast=true;ip_ttl=16;loopback=false;mcast_addr=${jboss.partition.udpGroup:228.1.2.3};mcast_port=${jboss.partition.udpPort:45566}):
+ <param-value>UDP(ip_mcast=true;ip_ttl=16;loopback=false;mcast_addr=${jboss.partition.udpGroup:228.1.2.3};mcast_port=${jboss.hapartition.mcast_port:45566}):
org.jboss.jmx.adaptor.control.FindView
</param-value>
<description>The JGroups protocol stack config</description>
@@ -81,7 +81,7 @@
<!-- A security constraint that restricts access to the HTML JMX console
to users with the role JBossAdmin. Edit the roles to what you want and
uncomment the WEB-INF/jboss-web.xml/security-domain element to enable
- secured access to the HTML JMX console.
+ secured access to the HTML JMX console. -->
<security-constraint>
<web-resource-collection>
<web-resource-name>HtmlAdaptor</web-resource-name>
@@ -96,7 +96,6 @@
<role-name>JBossAdmin</role-name>
</auth-constraint>
</security-constraint>
- -->
<login-config>
<auth-method>BASIC</auth-method>
Modified: branches/JBPAPP_4_2/varia/src/resources/jmx/web-inf/jboss-web.xml
===================================================================
--- branches/JBPAPP_4_2/varia/src/resources/jmx/web-inf/jboss-web.xml 2007-09-11 18:18:20 UTC (rev 65304)
+++ branches/JBPAPP_4_2/varia/src/resources/jmx/web-inf/jboss-web.xml 2007-09-11 21:15:24 UTC (rev 65305)
@@ -1,7 +1,6 @@
<jboss-web>
<!-- Uncomment the security-domain to enable security. You will
need to edit the htmladaptor login configuration to setup the
- login modules used to authentication users.
+ login modules used to authentication users. -->
<security-domain>java:/jaas/jmx-console</security-domain>
- -->
</jboss-web>
Modified: branches/JBPAPP_4_2/varia/src/resources/services/invoker/http/web.xml
===================================================================
--- branches/JBPAPP_4_2/varia/src/resources/services/invoker/http/web.xml 2007-09-11 18:18:20 UTC (rev 65304)
+++ branches/JBPAPP_4_2/varia/src/resources/services/invoker/http/web.xml 2007-09-11 21:15:24 UTC (rev 65305)
@@ -156,6 +156,9 @@
role HttpInvoker to access the HTTP invoker servlets
</description>
<url-pattern>/restricted/*</url-pattern>
+ <url-pattern>/JNDIFactory/*</url-pattern>
+ <url-pattern>/EJBInvokerServlet/*</url-pattern>
+ <url-pattern>/JMXInvokerServlet/*</url-pattern>
<http-method>GET</http-method>
<http-method>POST</http-method>
</web-resource-collection>
Modified: branches/JBPAPP_4_2/varia/src/resources/services/invoker/httpha/web.xml
===================================================================
--- branches/JBPAPP_4_2/varia/src/resources/services/invoker/httpha/web.xml 2007-09-11 18:18:20 UTC (rev 65304)
+++ branches/JBPAPP_4_2/varia/src/resources/services/invoker/httpha/web.xml 2007-09-11 21:15:24 UTC (rev 65305)
@@ -203,6 +203,9 @@
role HttpInvoker to access the HTTP invoker servlets
</description>
<url-pattern>/restricted/*</url-pattern>
+ <url-pattern>/JNDIFactory/*</url-pattern>
+ <url-pattern>/EJBInvokerServlet/*</url-pattern>
+ <url-pattern>/JMXInvokerServlet/*</url-pattern>
<http-method>GET</http-method>
<http-method>POST</http-method>
</web-resource-collection>
More information about the jboss-cvs-commits
mailing list