[jboss-cvs] JBoss Messaging SVN: r5585 - in trunk: src and 4 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Jan 6 16:22:23 EST 2009
Author: ataylor
Date: 2009-01-06 16:22:23 -0500 (Tue, 06 Jan 2009)
New Revision: 5585
Added:
trunk/src/WEB-INF/
trunk/src/WEB-INF/jboss-web.xml
trunk/src/WEB-INF/web.xml
trunk/src/config/jbm-jboss-beans.xml
trunk/src/config/login-config.xml
Removed:
trunk/src/config/jbm-beans.xml
Modified:
trunk/build-messaging.xml
trunk/build.xml
trunk/tests/jms-tests/config/invm-beans.xml
trunk/tests/jms-tests/src/org/jboss/test/messaging/JBMServerTestCase.java
Log:
added new targets to build sar and war and added framework for servlet transport
Modified: trunk/build-messaging.xml
===================================================================
--- trunk/build-messaging.xml 2009-01-06 21:21:58 UTC (rev 5584)
+++ trunk/build-messaging.xml 2009-01-06 21:22:23 UTC (rev 5585)
@@ -69,6 +69,10 @@
<!--source and build dirs-->
<property name="build.dir" value="build"/>
+ <property name="sar.name" value="messaging.sar"/>
+ <property name="war.name" value="messaging.war"/>
+ <property name="build.sar.dir" value="${build.dir}/${sar.name}"/>
+ <property name="build.war.dir" value="${build.sar.dir}/${war.name}"/>
<property name="build.classes.dir" value="${build.dir}/classes"/>
<property name="build.core.classes.dir" value="${build.dir}/classes/core"/>
<property name="build.jms.classes.dir" value="${build.dir}/classes/jms"/>
@@ -188,8 +192,14 @@
<path refid="jboss.integration.classpath"/>
</path>
+ <path id="servlet.compilation.classpath">
+ <path location="${build.core.classes.dir}"/>
+ <path refid="jboss.jboss.javaee.classpath"/>
+ </path>
+
<path id="transports.compilation.classpath">
<path location="${build.core.classes.dir}"/>
+ <path refid="jboss.jboss.javaee.classpath"/>
<path refid="apache.mina.classpath"/>
<path refid="netty.netty.classpath"/>
</path>
@@ -623,7 +633,91 @@
<!-- Distro Tasks -->
<!-- ======================================================================================== -->
+ <target name="deploy-jboss" depends="isJbossHomeSet, build.sar">
+ <mkdir dir="${JBOSS_HOME}/server/messaging" />
+ <copy todir="${JBOSS_HOME}/server/messaging">
+ <fileset dir="${JBOSS_HOME}/server/default">
+ <exclude name="**/messaging/**"/>
+ <exclude name="**/jboss-messaging.jar"/>
+ <exclude name="**/jboss-messaging-client.jar"/>
+ </fileset>
+ </copy>
+ <delete file="${JBOSS_HOME}/common/lib/jboss-messaging.jar"/>
+ <delete file="${JBOSS_HOME}/client/lib/jboss-messaging-client.jar"/>
+ <copy todir="${JBOSS_HOME}/server/messaging/deploy">
+ <fileset dir="${build.dir}">
+ <include name="${sar.name}/**/*"/>
+ </fileset>
+ </copy>
+ <copy todir="${JBOSS_HOME}/server/messaging/conf" overwrite="yes">
+ <fileset dir="${src.config.dir}">
+ <include name="**/*login-config.xml"/>
+ </fileset>
+ </copy>
+ </target>
+ <target name="deploy" depends="isJbossHomeSet, build.sar">
+ <copy todir="${JBOSS_HOME}/server/messaging/deploy">
+ <fileset dir="${build.dir}">
+ <include name="${sar.name}/**/*"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <target name="isJbossHomeSet" unless="JBOSS_HOME">
+ <fail message="please set JBOSS_HOME"/>
+ </target>
+
+ <target name="build.sar" depends="jar">
+ <mkdir dir="${build.sar.dir}"/>
+ <mkdir dir="${build.war.dir}"/>
+
+ <copy todir="${build.sar.dir}">
+ <fileset dir="${src.config.dir}">
+ <include name="jbm-*"/>
+ <include name="queues.xml"/>
+ <exclude name="jbm-standalone*"/>
+ <exclude name="jbm-cluster*"/>
+ </fileset>
+ </copy>
+ <copy todir="${build.sar.dir}">
+ <fileset dir="${build.jars.dir}">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="${apache.mina.lib}">
+ <include name="*.jar"/>
+ <exclude name="*sources.jar"/>
+ </fileset>
+ <fileset dir="${netty.netty.lib}">
+ <include name="*.jar"/>
+ <exclude name="*sources.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="${build.war.dir}">
+ <fileset dir="${src.dir}">
+ <include name="WEB-INF/*"/>
+ </fileset>
+ </copy>
+ <mkdir dir="${build.war.dir}/WEB-INF/classes"/>
+ <javac destdir="${build.war.dir}/WEB-INF/classes"
+ target="${javac.target}"
+ source="${javac.source}"
+ optimize="${javac.optimize}"
+ debug="${javac.debug}"
+ depend="${javac.depend}"
+ verbose="${javac.verbose}"
+ deprecation="${javac.deprecation}"
+ includeAntRuntime="${javac.include.ant.runtime}"
+ includeJavaRuntime="${javac.include.java.runtime}"
+ failonerror="${javac.fail.onerror}">
+ <src>
+ <pathelement path="${src.main.dir}"/>
+ </src>
+ <include name="**/messaging/servlet/*.java"/>
+ <classpath refid="servlet.compilation.classpath"/>
+ </javac>
+ </target>
+
<target name="distro" depends="jar, jar-client">
<mkdir dir="${build.distro.dir}"/>
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2009-01-06 21:21:58 UTC (rev 5584)
+++ trunk/build.xml 2009-01-06 21:22:23 UTC (rev 5585)
@@ -143,8 +143,18 @@
<!-- ======================================================================================== -->
<!-- Distro Tasks -->
<!-- ======================================================================================== -->
+ <target name="deploy-jboss" depends="createthirdparty">
+ <ant antfile="build-messaging.xml" target="deploy-jboss"/>
+ </target>
+ <target name="deploy" depends="createthirdparty">
+ <ant antfile="build-messaging.xml" target="deploy"/>
+ </target>
+ <target name="build.sar" depends="createthirdparty">
+ <ant antfile="build-messaging.xml" target="build.sar"/>
+ </target>
+
<target name="distro" depends="createthirdparty">
<ant antfile="build-messaging.xml" target="distro"/>
</target>
Added: trunk/src/WEB-INF/jboss-web.xml
===================================================================
--- trunk/src/WEB-INF/jboss-web.xml (rev 0)
+++ trunk/src/WEB-INF/jboss-web.xml 2009-01-06 21:22:23 UTC (rev 5585)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!DOCTYPE jboss-web
+ PUBLIC "-//JBoss//DTD Web Application 2.3V2//EN"
+ "http://www.jboss.org/j2ee/dtd/jboss-web_3_2.dtd">
+
+<jboss-web>
+
+ <context-root>messaging</context-root>
+
+</jboss-web>
\ No newline at end of file
Added: trunk/src/WEB-INF/web.xml
===================================================================
--- trunk/src/WEB-INF/web.xml (rev 0)
+++ trunk/src/WEB-INF/web.xml 2009-01-06 21:22:23 UTC (rev 5585)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app 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" version="2.4">
+
+ <listener>
+ <listener-class>org.jboss.messaging.servlet.JBMSessionListener</listener-class>
+ </listener>
+
+ <servlet>
+ <servlet-name>JBMServlet</servlet-name>
+ <servlet-class>org.jboss.messaging.servlet.JBMServlet</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>JBMServlet</servlet-name>
+ <url-pattern>/JBMServlet</url-pattern>
+ </servlet-mapping>
+</web-app>
\ No newline at end of file
Deleted: trunk/src/config/jbm-beans.xml
===================================================================
--- trunk/src/config/jbm-beans.xml 2009-01-06 21:21:58 UTC (rev 5584)
+++ trunk/src/config/jbm-beans.xml 2009-01-06 21:22:23 UTC (rev 5585)
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
-
- <bean name="DeploymentManager" class="org.jboss.messaging.core.deployers.impl.FileDeploymentManager">
- <constructor>
- <!-- The scan time in milliseconds -->
- <parameter>5000</parameter>
- </constructor>
- </bean>
-
- <bean name="JBMSecurityManager" class="org.jboss.messaging.integration.security.JBossASSecurityManager"/>
-
- <!-- <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
- <constructor>
- <parameter>false</parameter>
- </constructor>
- </bean>
-
- <bean name="BasicSecurityDeployer" class="org.jboss.messaging.core.deployers.impl.BasicSecurityDeployer">
- <property name="jbmSecurityManager">
- <inject bean="JBMSecurityManager"/>
- </property>
- <property name="messagingServer">
- <inject bean="MessagingServer"/>
- </property>
- </bean>-->
-
- <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
- <property name="storageManager">
- <inject bean="StorageManager"/>
- </property>
- <property name="remotingService">
- <inject bean="RemotingService"/>
- </property>
- <property name="configuration">
- <inject bean="Configuration"/>
- </property>
- <property name="securityManager">
- <inject bean="JBMSecurityManager"/>
- </property>
- <property name="managementService">
- <inject bean="ManagementService"/>
- </property>
- </bean>
-
- <bean name="StorageManager" class="org.jboss.messaging.core.persistence.impl.journal.JournalStorageManager">
- <constructor>
- <parameter>
- <inject bean="Configuration"/>
- </parameter>
- </constructor>
- </bean>
-
- <bean name="RemotingService" class="org.jboss.messaging.core.remoting.impl.RemotingServiceImpl">
- <constructor>
- <parameter>
- <inject bean="Configuration"/>
- </parameter>
- </constructor>
- <property name="managementService">
- <inject bean="ManagementService"/>
- </property>
- </bean>
-
- <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
- <constructor>
- <parameter>
- <inject bean="MessagingServer" property="serverManagement"/>
- </parameter>
- <parameter>
- <inject bean="MessagingServer" property="postOffice"/>
- </parameter>
- <parameter>
- <inject bean="MessagingServer" property="storageManager"/>
- </parameter>
- <parameter>
- <inject bean="MessagingServer" property="queueSettingsRepository"/>
- </parameter>
- <parameter>
- <inject bean="JMSManagementService"/>
- </parameter>
- </constructor>
- </bean>
-
- <bean name="JMSServerDeployer" class="org.jboss.messaging.jms.server.impl.JMSServerDeployer">
- <constructor>
- <parameter>
- <inject bean="DeploymentManager"/>
- </parameter>
- <parameter>
- <inject bean="MessagingServer" property="configuration"/>
- </parameter>
- </constructor>
- <property name="jmsServerManager">
- <inject bean="JMSServerManager"/>
- </property>
- </bean>
-
- <bean name="QueueSettingsDeployer" class="org.jboss.messaging.core.deployers.impl.QueueSettingsDeployer">
- <constructor>
- <parameter>
- <inject bean="DeploymentManager"/>
- </parameter>
- <parameter>
- <inject bean="MessagingServer" property="queueSettingsRepository" state="Configured"/>
- </parameter>
- </constructor>
- </bean>
-
- <bean name="SecurityDeployer" class="org.jboss.messaging.core.deployers.impl.SecurityDeployer">
- <constructor>
- <parameter>
- <inject bean="DeploymentManager"/>
- </parameter>
- <parameter>
- <inject bean="MessagingServer" property="securityRepository"/>
- </parameter>
- </constructor>
- </bean>
-
- <bean name="ManagementService" class="org.jboss.messaging.core.management.impl.ManagementServiceImpl">
- <constructor>
- <parameter>
- <inject bean="MBeanServer"/>
- </parameter>
- <parameter>
- <inject bean="Configuration" property="JMXManagementEnabled" />
- </parameter>
- </constructor>
- </bean>
-
- <bean name="JMSManagementService" class="org.jboss.messaging.jms.server.management.impl.JMSManagementServiceImpl">
- <constructor>
- <parameter>
- <inject bean="ManagementService"/>
- </parameter>
- </constructor>
- </bean>
-
- <bean name="MBeanServer" class="javax.management.MBeanServer">
- <constructor factoryClass="java.lang.management.ManagementFactory"
- factoryMethod="getPlatformMBeanServer"/>
- </bean>
-
-</deployment>
\ No newline at end of file
Copied: trunk/src/config/jbm-jboss-beans.xml (from rev 5536, trunk/src/config/jbm-beans.xml)
===================================================================
--- trunk/src/config/jbm-jboss-beans.xml (rev 0)
+++ trunk/src/config/jbm-jboss-beans.xml 2009-01-06 21:22:23 UTC (rev 5585)
@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
+
+ <bean name="JBMDeploymentManager" class="org.jboss.messaging.core.deployers.impl.FileDeploymentManager">
+ <constructor>
+ <!-- The scan time in milliseconds -->
+ <parameter>5000</parameter>
+ </constructor>
+ </bean>
+
+ <bean name="JBMSecurityManager" class="org.jboss.messaging.integration.security.JBossASSecurityManager">
+ <depends>JBossSecurityJNDIContextEstablishment</depends>
+ </bean>
+
+ <!-- <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
+ <constructor>
+ <parameter>false</parameter>
+ </constructor>
+ </bean>
+
+ <bean name="BasicSecurityDeployer" class="org.jboss.messaging.core.deployers.impl.BasicSecurityDeployer">
+ <property name="jbmSecurityManager">
+ <inject bean="JBMSecurityManager"/>
+ </property>
+ <property name="messagingServer">
+ <inject bean="MessagingServer"/>
+ </property>
+ </bean>-->
+
+ <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
+ <depends>QueueSettingsDeployer</depends>
+ <property name="storageManager">
+ <inject bean="StorageManager"/>
+ </property>
+ <property name="remotingService">
+ <inject bean="RemotingService"/>
+ </property>
+ <property name="configuration">
+ <inject bean="Configuration"/>
+ </property>
+ <property name="securityManager">
+ <inject bean="JBMSecurityManager"/>
+ </property>
+ <property name="managementService">
+ <inject bean="ManagementService"/>
+ </property>
+ </bean>
+
+ <bean name="StorageManager" class="org.jboss.messaging.core.persistence.impl.journal.JournalStorageManager">
+ <constructor>
+ <parameter>
+ <inject bean="Configuration"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+ <bean name="RemotingService" class="org.jboss.messaging.core.remoting.impl.RemotingServiceImpl">
+ <constructor>
+ <parameter>
+ <inject bean="Configuration"/>
+ </parameter>
+ </constructor>
+ <property name="managementService">
+ <inject bean="ManagementService"/>
+ </property>
+ </bean>
+
+ <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
+ <constructor>
+ <parameter>
+ <inject bean="MessagingServer" property="serverManagement"/>
+ </parameter>
+ <parameter>
+ <inject bean="MessagingServer" property="postOffice"/>
+ </parameter>
+ <parameter>
+ <inject bean="MessagingServer" property="storageManager"/>
+ </parameter>
+ <parameter>
+ <inject bean="MessagingServer" property="queueSettingsRepository"/>
+ </parameter>
+ <parameter>
+ <inject bean="JMSManagementService"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+ <bean name="JMSServerDeployer" class="org.jboss.messaging.jms.server.impl.JMSServerDeployer">
+ <constructor>
+ <parameter>
+ <inject bean="JBMDeploymentManager"/>
+ </parameter>
+ <parameter>
+ <inject bean="Configuration"/>
+ </parameter>
+ </constructor>
+ <property name="jmsServerManager">
+ <inject bean="JMSServerManager"/>
+ </property>
+ </bean>
+
+ <bean name="QueueSettingsDeployer" class="org.jboss.messaging.core.deployers.impl.QueueSettingsDeployer">
+ <constructor>
+ <parameter>
+ <inject bean="JBMDeploymentManager"/>
+ </parameter>
+ <parameter>
+ <inject bean="MessagingServer" property="queueSettingsRepository" state="Configured"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+ <bean name="SecurityDeployer" class="org.jboss.messaging.core.deployers.impl.SecurityDeployer">
+ <constructor>
+ <parameter>
+ <inject bean="JBMDeploymentManager"/>
+ </parameter>
+ <parameter>
+ <inject bean="MessagingServer" property="securityRepository"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+ <bean name="ManagementService" class="org.jboss.messaging.core.management.impl.ManagementServiceImpl">
+ <constructor>
+ <parameter>
+ <inject bean="MBeanServer"/>
+ </parameter>
+ <parameter>
+ <inject bean="Configuration" property="JMXManagementEnabled" />
+ </parameter>
+ </constructor>
+ </bean>
+
+ <bean name="JMSManagementService" class="org.jboss.messaging.jms.server.management.impl.JMSManagementServiceImpl">
+ <constructor>
+ <parameter>
+ <inject bean="ManagementService"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+ <bean name="MBeanServer" class="javax.management.MBeanServer">
+ <constructor factoryClass="java.lang.management.ManagementFactory"
+ factoryMethod="getPlatformMBeanServer"/>
+ </bean>
+
+</deployment>
\ No newline at end of file
Added: trunk/src/config/login-config.xml
===================================================================
--- trunk/src/config/login-config.xml (rev 0)
+++ trunk/src/config/login-config.xml 2009-01-06 21:22:23 UTC (rev 5585)
@@ -0,0 +1,146 @@
+<?xml version='1.0'?>
+
+<!-- The XML based JAAS login configuration read by the
+org.jboss.security.auth.login.XMLLoginConfig mbean. Add
+an application-policy element for each security domain.
+
+The outline of the application-policy is:
+<application-policy name="security-domain-name">
+ <authentication>
+ <login-module code="login.module1.class.name" flag="control_flag">
+ <module-option name = "option1-name">option1-value</module-option>
+ <module-option name = "option2-name">option2-value</module-option>
+ ...
+ </login-module>
+
+ <login-module code="login.module2.class.name" flag="control_flag">
+ ...
+ </login-module>
+ ...
+ </authentication>
+</application-policy>
+
+$Id: login-config.xml 76444 2008-07-29 23:50:53Z sguilhen at redhat.com $
+$Revision: 76444 $
+-->
+
+<policy>
+ <!-- Used by clients within the application server VM such as
+ mbeans and servlets that access EJBs.
+ -->
+ <application-policy name="client-login">
+ <authentication>
+ <login-module code="org.jboss.security.ClientLoginModule"
+ flag="required">
+ <!-- Any existing security context will be restored on logout -->
+ <module-option name="restore-login-identity">true</module-option>
+ </login-module>
+ </authentication>
+ </application-policy>
+
+ <!-- Security domains for testing new jca framework -->
+ <application-policy name="HsqlDbRealm">
+ <authentication>
+ <login-module code="org.jboss.resource.security.ConfiguredIdentityLoginModule"
+ flag="required">
+ <module-option name="principal">sa</module-option>
+ <module-option name="userName">sa</module-option>
+ <module-option name="password"></module-option>
+ <module-option name="managedConnectionFactoryName">jboss.jca:service=LocalTxCM,name=DefaultDS</module-option>
+ </login-module>
+ </authentication>
+ </application-policy>
+
+ <application-policy name="JmsXARealm">
+ <authentication>
+ <login-module code="org.jboss.resource.security.ConfiguredIdentityLoginModule"
+ flag="required">
+ <module-option name="principal">guest</module-option>
+ <module-option name="userName">guest</module-option>
+ <module-option name="password">guest</module-option>
+ <module-option name="managedConnectionFactoryName">jboss.jca:service=TxCM,name=JmsXA</module-option>
+ </login-module>
+ </authentication>
+ </application-policy>
+
+ <!-- A template configuration for messaging. This
+ defaults to the UsersRolesLoginModule the same as other and should be
+ changed to a stronger authentication mechanism as required.
+ -->
+<application-policy name="messaging">
+ <authentication>
+ <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule"
+ flag="required">
+ <module-option name = "unauthenticatedIdentity">guest</module-option>
+ <module-option name="usersProperties">props/messaging-users.properties</module-option>
+ <module-option name="rolesProperties">props/messaging-roles.properties</module-option>
+ </login-module>
+ </authentication>
+ </application-policy>
+
+ <!-- A template configuration for the jmx-console web application. This
+ defaults to the UsersRolesLoginModule the same as other and should be
+ changed to a stronger authentication mechanism as required.
+ -->
+ <application-policy name="jmx-console">
+ <authentication>
+ <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule"
+ flag="required">
+ <module-option name="usersProperties">props/jmx-console-users.properties</module-option>
+ <module-option name="rolesProperties">props/jmx-console-roles.properties</module-option>
+ </login-module>
+ </authentication>
+ </application-policy>
+
+ <!-- A template configuration for the web-console web application. This
+ defaults to the UsersRolesLoginModule the same as other and should be
+ changed to a stronger authentication mechanism as required.
+ -->
+ <application-policy name="web-console">
+ <authentication>
+ <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule"
+ flag="required">
+ <module-option name="usersProperties">web-console-users.properties</module-option>
+ <module-option name="rolesProperties">web-console-roles.properties</module-option>
+ </login-module>
+ </authentication>
+ </application-policy>
+
+ <!--
+ A template configuration for the JBossWS security domain.
+ This defaults to the UsersRolesLoginModule the same as other and should be
+ changed to a stronger authentication mechanism as required.
+ -->
+ <application-policy name="JBossWS">
+ <authentication>
+ <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule"
+ flag="required">
+ <module-option name="usersProperties">props/jbossws-users.properties</module-option>
+ <module-option name="rolesProperties">props/jbossws-roles.properties</module-option>
+ <module-option name="unauthenticatedIdentity">anonymous</module-option>
+ </login-module>
+ </authentication>
+ </application-policy>
+
+ <!-- The default login configuration used by any security domain that
+ does not have a application-policy entry with a matching name
+ -->
+ <application-policy name="other">
+ <!-- A simple server login module, which can be used when the number
+ of users is relatively small. It uses two properties files:
+ users.properties, which holds users (key) and their password (value).
+ roles.properties, which holds users (key) and a comma-separated list of
+ their roles (value).
+ The unauthenticatedIdentity property defines the name of the principal
+ that will be used when a null username and password are presented as is
+ the case for an unuathenticated web client or MDB. If you want to
+ allow such users to be authenticated add the property, e.g.,
+ unauthenticatedIdentity="nobody"
+ -->
+ <authentication>
+ <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule"
+ flag="required"/>
+ </authentication>
+ </application-policy>
+
+</policy>
Modified: trunk/tests/jms-tests/config/invm-beans.xml
===================================================================
--- trunk/tests/jms-tests/config/invm-beans.xml 2009-01-06 21:21:58 UTC (rev 5584)
+++ trunk/tests/jms-tests/config/invm-beans.xml 2009-01-06 21:22:23 UTC (rev 5585)
@@ -10,19 +10,7 @@
<!--this is just here to satisfy a demand in the main beans file-->
<bean name="jboss.jca:name=DefaultDS,service=DataSourceBinding" class="java.beans.Beans"/>
- <!--
- <bean class="org.jgroups.JChannelFactory" name="JChannelFactory">
- -->
- <!--mbean code="org.jgroups.JChannelFactory" name="jgroups.mux:name=Multiplexer" xmbean-dd="resource:META-INF/multiplexer-xmbean.xml" -->
- <!-- <property name="domain">jgroups.mux</property>
- <property name="multiplexerConfig">multiplexer-stacks.xml</property>
- <property name="exposeChannels">false</property>
- <property name="exposeProtocols">false</property>
- -->
- <!-- The address used to determine the node name -->
- <!-- <attribute name="NodeAddress">${jboss.bind.address}</attribute> -->
- <!--
- </bean> -->
+ <bean name="JBossSecurityJNDIContextEstablishment" class="java.beans.Beans"/>
</deployment>
\ No newline at end of file
Modified: trunk/tests/jms-tests/src/org/jboss/test/messaging/JBMServerTestCase.java
===================================================================
--- trunk/tests/jms-tests/src/org/jboss/test/messaging/JBMServerTestCase.java 2009-01-06 21:21:58 UTC (rev 5584)
+++ trunk/tests/jms-tests/src/org/jboss/test/messaging/JBMServerTestCase.java 2009-01-06 21:22:23 UTC (rev 5585)
@@ -314,7 +314,7 @@
public String[] getContainerConfig()
{
- return new String[]{ "invm-beans.xml", "jbm-beans.xml"};
+ return new String[]{ "invm-beans.xml", "jbm-jboss-beans.xml"};
}
protected MessagingServer getJmsServer() throws Exception
More information about the jboss-cvs-commits
mailing list