[jboss-cvs] JBoss Messaging SVN: r6280 - in trunk: AS and 7 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Apr 2 11:17:42 EDT 2009
Author: ataylor
Date: 2009-04-02 11:17:42 -0400 (Thu, 02 Apr 2009)
New Revision: 6280
Added:
trunk/AS/config/
trunk/AS/config/examples-ant.properties
trunk/AS/config/jbm-jboss-beans.xml
trunk/AS/config/login-config.xml
trunk/AS/config/messaging-roles.properties
trunk/AS/config/messaging-users.properties
trunk/AS/config/ra.xml
Removed:
trunk/AS/examples-ant.properties
trunk/AS/jbm-jboss-beans.xml
trunk/AS/login-config.xml
trunk/AS/messaging-roles.properties
trunk/AS/messaging-users.properties
trunk/AS/ra.xml
trunk/src/config/AS/
Modified:
trunk/build-messaging.xml
trunk/examples/jms/common/config/ant.properties
trunk/src/config/jbm-security.xml
trunk/src/config/jbm-standalone-beans.xml
trunk/src/main/org/jboss/messaging/core/deployers/impl/AddressSettingsDeployer.java
trunk/src/main/org/jboss/messaging/core/deployers/impl/BasicSecurityDeployer.java
trunk/src/main/org/jboss/messaging/core/deployers/impl/QueueDeployer.java
trunk/src/main/org/jboss/messaging/core/deployers/impl/SecurityDeployer.java
trunk/src/main/org/jboss/messaging/core/deployers/impl/XmlDeployer.java
trunk/src/main/org/jboss/messaging/jms/server/impl/JMSServerDeployer.java
trunk/tests/jms-tests/src/org/jboss/test/messaging/JBMServerTestCase.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/deployers/impl/XMLDeployerTest.java
Log:
support for using different config files
Copied: trunk/AS/config/examples-ant.properties (from rev 6275, trunk/AS/examples-ant.properties)
===================================================================
--- trunk/AS/config/examples-ant.properties (rev 0)
+++ trunk/AS/config/examples-ant.properties 2009-04-02 15:17:42 UTC (rev 6280)
@@ -0,0 +1,4 @@
+jbm.example.logserveroutput=false
+logging.properties=${imported.basedir}/../../../config/logging.properties
+jbm.jars.dir=${imported.basedir}/../../../lib
+jars.dir=${imported.basedir}/../../../lib
\ No newline at end of file
Copied: trunk/AS/config/jbm-jboss-beans.xml (from rev 6275, trunk/AS/jbm-jboss-beans.xml)
===================================================================
--- trunk/AS/config/jbm-jboss-beans.xml (rev 0)
+++ trunk/AS/config/jbm-jboss-beans.xml 2009-04-02 15:17:42 UTC (rev 6280)
@@ -0,0 +1,162 @@
+<?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>AddressSettingsDeployer</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.server.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="addressSettingsRepository"/>
+ </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="AddressSettingsDeployer" class="org.jboss.messaging.core.deployers.impl.AddressSettingsDeployer">
+ <constructor>
+ <parameter>
+ <inject bean="JBMDeploymentManager"/>
+ </parameter>
+ <parameter>
+ <inject bean="MessagingServer" property="addressSettingsRepository" state="Configured"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+ <bean name="QueueDeployer" class="org.jboss.messaging.core.deployers.impl.QueueDeployer">
+ <constructor>
+ <parameter>
+ <inject bean="JBMDeploymentManager"/>
+ </parameter>
+ <parameter>
+ <inject bean="Configuration"/>
+ </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
Copied: trunk/AS/config/login-config.xml (from rev 6275, trunk/AS/login-config.xml)
===================================================================
--- trunk/AS/config/login-config.xml (rev 0)
+++ trunk/AS/config/login-config.xml 2009-04-02 15:17:42 UTC (rev 6280)
@@ -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>
Copied: trunk/AS/config/messaging-roles.properties (from rev 6275, trunk/AS/messaging-roles.properties)
===================================================================
--- trunk/AS/config/messaging-roles.properties (rev 0)
+++ trunk/AS/config/messaging-roles.properties 2009-04-02 15:17:42 UTC (rev 6280)
@@ -0,0 +1,4 @@
+#
+# user=role1,role2,...
+#
+guest=guest
Property changes on: trunk/AS/config/messaging-roles.properties
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Copied: trunk/AS/config/messaging-users.properties (from rev 6275, trunk/AS/messaging-users.properties)
===================================================================
--- trunk/AS/config/messaging-users.properties (rev 0)
+++ trunk/AS/config/messaging-users.properties 2009-04-02 15:17:42 UTC (rev 6280)
@@ -0,0 +1,4 @@
+#
+# user=password
+#
+guest=guest
Property changes on: trunk/AS/config/messaging-users.properties
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Copied: trunk/AS/config/ra.xml (from rev 6275, trunk/AS/ra.xml)
===================================================================
--- trunk/AS/config/ra.xml (rev 0)
+++ trunk/AS/config/ra.xml 2009-04-02 15:17:42 UTC (rev 6280)
@@ -0,0 +1,283 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- $Id: ra.xml 76819 2008-08-08 11:04:20Z jesper.pedersen $ -->
+
+<connector 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/connector_1_5.xsd"
+ version="1.5">
+
+ <description>JBoss Messaging 2.0 Resource Adapter</description>
+ <display-name>JBoss Messaging 2.0 Resource Adapter</display-name>
+
+ <vendor-name>Red Hat Middleware LLC</vendor-name>
+ <eis-type>JMS 1.1 Server</eis-type>
+ <resourceadapter-version>1.0</resourceadapter-version>
+
+ <license>
+ <description>
+ JBoss, Home of Professional Open Source.
+ Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ as indicated by the @author tags. See the copyright.txt file in the
+ distribution for a full listing of individual contributors.
+
+ This is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as
+ published by the Free Software Foundation; either version 2.1 of
+ the License, or (at your option) any later version.
+
+ This software is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this software; if not, write to the Free
+ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ </description>
+ <license-required>true</license-required>
+ </license>
+
+ <resourceadapter>
+ <resourceadapter-class>org.jboss.messaging.ra.JBMResourceAdapter</resourceadapter-class>
+ <config-property>
+ <description>The transport type</description>
+ <config-property-name>TransportType</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value>org.jboss.messaging.core.remoting.impl.invm.InVMConnectorFactory</config-property-value>
+ </config-property>
+ <config-property>
+ <description>The transport configuration. These values must be in the form of key:val:type;key:val:type; where type is Integer, String, Long or boolean</description>
+ <config-property-name>TransportConfiguration</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value>jbm.remoting.invm.serverid:0:Integer</config-property-value>
+ </config-property>
+ <config-property>
+ <description>Use XA methods to obtain connections?</description>
+ <config-property-name>UseXA</config-property-name>
+ <config-property-type>java.lang.Boolean</config-property-type>
+ <config-property-value>true</config-property-value>
+ </config-property>
+ <config-property>
+ <description>The user name used to login to the JMS server</description>
+ <config-property-name>UserName</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
+ <config-property>
+ <description>The password used to login to the JMS server</description>
+ <config-property-name>Password</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
+ <!--<config-property>
+ <description>The Backup transport type</description>
+ <config-property-name>BackUpTransportType</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
+ <config-property>
+ <description>The Backup transport configuration. These values must be in the form of key=val;key=val;</description>
+ <config-property-name>TransportConfiguration</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
+ <config-property>
+ <description>The discovery group address</description>
+ <config-property-name>DiscoveryGroupAddress</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
+ <config-property>
+ <description>The discovery group port</description>
+ <config-property-name>DiscoveryGroupPort</config-property-name>
+ <config-property-type>java.lang.Integer</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
+ <config-property>
+ <description>The discovery refresh timeout</description>
+ <config-property-name>DiscoveryRefreshTimeout</config-property-name>
+ <config-property-type>java.lang.Long</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
+ <config-property>
+ <description>The discovery initial wait timeout</description>
+ <config-property-name>DiscoveryInitialWaitTimeout</config-property-name>
+ <config-property-type>java.lang.Long</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
+ <config-property>
+ <description>The load balancing policy class name</description>
+ <config-property-name>LoadBalancingPolicyClassName</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
+ <config-property>
+ <description>The ping period</description>
+ <config-property-name>PingPeriod</config-property-name>
+ <config-property-type>java.lang.Long</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
+ <config-property>
+ <description>The connection TTL</description>
+ <config-property-name>ConnectionTTL</config-property-name>
+ <config-property-type>java.lang.Long</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
+ <config-property>
+ <description>The call timeout</description>
+ <config-property-name>CallTimeout</config-property-name>
+ <config-property-type>java.lang.Long</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
+ <config-property>
+ <description>The dups ok batch size</description>
+ <config-property-name>DupsOKBatchSize</config-property-name>
+ <config-property-type>java.lang.Integer</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
+ <config-property>
+ <description>The transaction batch size</description>
+ <config-property-name>TransactionBatchSize</config-property-name>
+ <config-property-type>java.lang.Integer</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
+ <config-property>
+ <description>The consumer window size</description>
+ <config-property-name>ConsumerWindowSize</config-property-name>
+ <config-property-type>java.lang.Integer</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
+ <config-property>
+ <description>The consumer max rate</description>
+ <config-property-name>ConsumerMaxRate</config-property-name>
+ <config-property-type>java.lang.Integer</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
+ <config-property>
+ <description>The send window size</description>
+ <config-property-name>SendWindowSize</config-property-name>
+ <config-property-type>java.lang.Integer</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
+ <config-property>
+ <description>The producer max rate</description>
+ <config-property-name>ProducerMaxRate</config-property-name>
+ <config-property-type>java.lang.Integer</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
+ <config-property>
+ <description>The min large message size</description>
+ <config-property-name>MinLargeMessageSize</config-property-name>
+ <config-property-type>java.lang.Integer</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
+ <config-property>
+ <description>The block on acknowledge</description>
+ <config-property-name>BlockOnAcknowledge</config-property-name>
+ <config-property-type>java.lang.Boolean</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
+ <config-property>
+ <description>The block on non persistent send</description>
+ <config-property-name>BlockOnNonPersistentSend</config-property-name>
+ <config-property-type>java.lang.Boolean</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
+ <config-property>
+ <description>The block on persistent send</description>
+ <config-property-name>BlockOnPersistentSend</config-property-name>
+ <config-property-type>java.lang.Boolean</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
+ <config-property>
+ <description>The auto group</description>
+ <config-property-name>AutoGroup</config-property-name>
+ <config-property-type>java.lang.Boolean</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
+ <config-property>
+ <description>The max connections</description>
+ <config-property-name>MaxConnections</config-property-name>
+ <config-property-type>java.lang.Integer</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
+ <config-property>
+ <description>The pre acknowledge</description>
+ <config-property-name>PreAcknowledge</config-property-name>
+ <config-property-type>java.lang.Boolean</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
+ <config-property>
+ <description>The retry interval</description>
+ <config-property-name>RetryInterval</config-property-name>
+ <config-property-type>java.lang.Long</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
+ <config-property>
+ <description>The retry interval multiplier</description>
+ <config-property-name>RetryIntervalMultiplier</config-property-name>
+ <config-property-type>java.lang.Double</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
+ <config-property>
+ <description>Should clean server shutdown trigger failover?</description>
+ <config-property-name>FailoverOnServerShutdown</config-property-name>
+ <config-property-type>java.lang.Boolean</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
+ <config-property>
+ <description>The client id</description>
+ <config-property-name>ClientID</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>-->
+
+ <outbound-resourceadapter>
+ <connection-definition>
+ <managedconnectionfactory-class>org.jboss.messaging.ra.JBMManagedConnectionFactory</managedconnectionfactory-class>
+
+ <config-property>
+ <description>The default session type</description>
+ <config-property-name>SessionDefaultType</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value>javax.jms.Queue</config-property-value>
+ </config-property>
+ <config-property>
+ <description>Try to obtain a lock within specified number of seconds; less than or equal to 0 disable this functionality</description>
+ <config-property-name>UseTryLock</config-property-name>
+ <config-property-type>java.lang.Integer</config-property-type>
+ <config-property-value>0</config-property-value>
+ </config-property>
+
+ <connectionfactory-interface>org.jboss.messaging.ra.JBMConnectionFactory</connectionfactory-interface>
+ <connectionfactory-impl-class>org.jboss.messaging.ra.JBMConnectionFactoryImpl</connectionfactory-impl-class>
+ <connection-interface>javax.jms.Session</connection-interface>
+ <connection-impl-class>org.jboss.messaging.ra.JBMSession</connection-impl-class>
+ </connection-definition>
+ <transaction-support>XATransaction</transaction-support>
+ <authentication-mechanism>
+ <authentication-mechanism-type>BasicPassword</authentication-mechanism-type>
+ <credential-interface>javax.resource.spi.security.PasswordCredential</credential-interface>
+ </authentication-mechanism>
+ <reauthentication-support>false</reauthentication-support>
+ </outbound-resourceadapter>
+
+ <inbound-resourceadapter>
+ <messageadapter>
+ <messagelistener>
+ <messagelistener-type>javax.jms.MessageListener</messagelistener-type>
+ <activationspec>
+ <activationspec-class>org.jboss.messaging.ra.inflow.JBMActivationSpec</activationspec-class>
+ <required-config-property>
+ <config-property-name>destination</config-property-name>
+ </required-config-property>
+ </activationspec>
+ </messagelistener>
+ </messageadapter>
+ </inbound-resourceadapter>
+
+ </resourceadapter>
+</connector>
Deleted: trunk/AS/examples-ant.properties
===================================================================
--- trunk/AS/examples-ant.properties 2009-04-02 14:54:17 UTC (rev 6279)
+++ trunk/AS/examples-ant.properties 2009-04-02 15:17:42 UTC (rev 6280)
@@ -1,4 +0,0 @@
-jbm.example.logserveroutput=false
-logging.properties=${imported.basedir}/../../../config/logging.properties
-jbm.jars.dir=${imported.basedir}/../../../lib
-jars.dir=${imported.basedir}/../../../lib
\ No newline at end of file
Deleted: trunk/AS/jbm-jboss-beans.xml
===================================================================
--- trunk/AS/jbm-jboss-beans.xml 2009-04-02 14:54:17 UTC (rev 6279)
+++ trunk/AS/jbm-jboss-beans.xml 2009-04-02 15:17:42 UTC (rev 6280)
@@ -1,162 +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="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>AddressSettingsDeployer</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.server.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="addressSettingsRepository"/>
- </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="AddressSettingsDeployer" class="org.jboss.messaging.core.deployers.impl.AddressSettingsDeployer">
- <constructor>
- <parameter>
- <inject bean="JBMDeploymentManager"/>
- </parameter>
- <parameter>
- <inject bean="MessagingServer" property="addressSettingsRepository" state="Configured"/>
- </parameter>
- </constructor>
- </bean>
-
- <bean name="QueueDeployer" class="org.jboss.messaging.core.deployers.impl.QueueDeployer">
- <constructor>
- <parameter>
- <inject bean="JBMDeploymentManager"/>
- </parameter>
- <parameter>
- <inject bean="Configuration"/>
- </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
Deleted: trunk/AS/login-config.xml
===================================================================
--- trunk/AS/login-config.xml 2009-04-02 14:54:17 UTC (rev 6279)
+++ trunk/AS/login-config.xml 2009-04-02 15:17:42 UTC (rev 6280)
@@ -1,146 +0,0 @@
-<?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>
Deleted: trunk/AS/messaging-roles.properties
===================================================================
--- trunk/AS/messaging-roles.properties 2009-04-02 14:54:17 UTC (rev 6279)
+++ trunk/AS/messaging-roles.properties 2009-04-02 15:17:42 UTC (rev 6280)
@@ -1,4 +0,0 @@
-#
-# user=role1,role2,...
-#
-guest=guest
Deleted: trunk/AS/messaging-users.properties
===================================================================
--- trunk/AS/messaging-users.properties 2009-04-02 14:54:17 UTC (rev 6279)
+++ trunk/AS/messaging-users.properties 2009-04-02 15:17:42 UTC (rev 6280)
@@ -1,4 +0,0 @@
-#
-# user=password
-#
-guest=guest
Deleted: trunk/AS/ra.xml
===================================================================
--- trunk/AS/ra.xml 2009-04-02 14:54:17 UTC (rev 6279)
+++ trunk/AS/ra.xml 2009-04-02 15:17:42 UTC (rev 6280)
@@ -1,283 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- $Id: ra.xml 76819 2008-08-08 11:04:20Z jesper.pedersen $ -->
-
-<connector 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/connector_1_5.xsd"
- version="1.5">
-
- <description>JBoss Messaging 2.0 Resource Adapter</description>
- <display-name>JBoss Messaging 2.0 Resource Adapter</display-name>
-
- <vendor-name>Red Hat Middleware LLC</vendor-name>
- <eis-type>JMS 1.1 Server</eis-type>
- <resourceadapter-version>1.0</resourceadapter-version>
-
- <license>
- <description>
- JBoss, Home of Professional Open Source.
- Copyright 2009, Red Hat Middleware LLC, and individual contributors
- as indicated by the @author tags. See the copyright.txt file in the
- distribution for a full listing of individual contributors.
-
- This is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as
- published by the Free Software Foundation; either version 2.1 of
- the License, or (at your option) any later version.
-
- This software is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this software; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- </description>
- <license-required>true</license-required>
- </license>
-
- <resourceadapter>
- <resourceadapter-class>org.jboss.messaging.ra.JBMResourceAdapter</resourceadapter-class>
- <config-property>
- <description>The transport type</description>
- <config-property-name>TransportType</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value>org.jboss.messaging.core.remoting.impl.invm.InVMConnectorFactory</config-property-value>
- </config-property>
- <config-property>
- <description>The transport configuration. These values must be in the form of key:val:type;key:val:type; where type is Integer, String, Long or boolean</description>
- <config-property-name>TransportConfiguration</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value>jbm.remoting.invm.serverid:0:Integer</config-property-value>
- </config-property>
- <config-property>
- <description>Use XA methods to obtain connections?</description>
- <config-property-name>UseXA</config-property-name>
- <config-property-type>java.lang.Boolean</config-property-type>
- <config-property-value>true</config-property-value>
- </config-property>
- <config-property>
- <description>The user name used to login to the JMS server</description>
- <config-property-name>UserName</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <description>The password used to login to the JMS server</description>
- <config-property-name>Password</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <!--<config-property>
- <description>The Backup transport type</description>
- <config-property-name>BackUpTransportType</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <description>The Backup transport configuration. These values must be in the form of key=val;key=val;</description>
- <config-property-name>TransportConfiguration</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <description>The discovery group address</description>
- <config-property-name>DiscoveryGroupAddress</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <description>The discovery group port</description>
- <config-property-name>DiscoveryGroupPort</config-property-name>
- <config-property-type>java.lang.Integer</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <description>The discovery refresh timeout</description>
- <config-property-name>DiscoveryRefreshTimeout</config-property-name>
- <config-property-type>java.lang.Long</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <description>The discovery initial wait timeout</description>
- <config-property-name>DiscoveryInitialWaitTimeout</config-property-name>
- <config-property-type>java.lang.Long</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <description>The load balancing policy class name</description>
- <config-property-name>LoadBalancingPolicyClassName</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <description>The ping period</description>
- <config-property-name>PingPeriod</config-property-name>
- <config-property-type>java.lang.Long</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <description>The connection TTL</description>
- <config-property-name>ConnectionTTL</config-property-name>
- <config-property-type>java.lang.Long</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <description>The call timeout</description>
- <config-property-name>CallTimeout</config-property-name>
- <config-property-type>java.lang.Long</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <description>The dups ok batch size</description>
- <config-property-name>DupsOKBatchSize</config-property-name>
- <config-property-type>java.lang.Integer</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <description>The transaction batch size</description>
- <config-property-name>TransactionBatchSize</config-property-name>
- <config-property-type>java.lang.Integer</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <description>The consumer window size</description>
- <config-property-name>ConsumerWindowSize</config-property-name>
- <config-property-type>java.lang.Integer</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <description>The consumer max rate</description>
- <config-property-name>ConsumerMaxRate</config-property-name>
- <config-property-type>java.lang.Integer</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <description>The send window size</description>
- <config-property-name>SendWindowSize</config-property-name>
- <config-property-type>java.lang.Integer</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <description>The producer max rate</description>
- <config-property-name>ProducerMaxRate</config-property-name>
- <config-property-type>java.lang.Integer</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <description>The min large message size</description>
- <config-property-name>MinLargeMessageSize</config-property-name>
- <config-property-type>java.lang.Integer</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <description>The block on acknowledge</description>
- <config-property-name>BlockOnAcknowledge</config-property-name>
- <config-property-type>java.lang.Boolean</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <description>The block on non persistent send</description>
- <config-property-name>BlockOnNonPersistentSend</config-property-name>
- <config-property-type>java.lang.Boolean</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <description>The block on persistent send</description>
- <config-property-name>BlockOnPersistentSend</config-property-name>
- <config-property-type>java.lang.Boolean</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <description>The auto group</description>
- <config-property-name>AutoGroup</config-property-name>
- <config-property-type>java.lang.Boolean</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <description>The max connections</description>
- <config-property-name>MaxConnections</config-property-name>
- <config-property-type>java.lang.Integer</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <description>The pre acknowledge</description>
- <config-property-name>PreAcknowledge</config-property-name>
- <config-property-type>java.lang.Boolean</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <description>The retry interval</description>
- <config-property-name>RetryInterval</config-property-name>
- <config-property-type>java.lang.Long</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <description>The retry interval multiplier</description>
- <config-property-name>RetryIntervalMultiplier</config-property-name>
- <config-property-type>java.lang.Double</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <description>Should clean server shutdown trigger failover?</description>
- <config-property-name>FailoverOnServerShutdown</config-property-name>
- <config-property-type>java.lang.Boolean</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <description>The client id</description>
- <config-property-name>ClientID</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>-->
-
- <outbound-resourceadapter>
- <connection-definition>
- <managedconnectionfactory-class>org.jboss.messaging.ra.JBMManagedConnectionFactory</managedconnectionfactory-class>
-
- <config-property>
- <description>The default session type</description>
- <config-property-name>SessionDefaultType</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value>javax.jms.Queue</config-property-value>
- </config-property>
- <config-property>
- <description>Try to obtain a lock within specified number of seconds; less than or equal to 0 disable this functionality</description>
- <config-property-name>UseTryLock</config-property-name>
- <config-property-type>java.lang.Integer</config-property-type>
- <config-property-value>0</config-property-value>
- </config-property>
-
- <connectionfactory-interface>org.jboss.messaging.ra.JBMConnectionFactory</connectionfactory-interface>
- <connectionfactory-impl-class>org.jboss.messaging.ra.JBMConnectionFactoryImpl</connectionfactory-impl-class>
- <connection-interface>javax.jms.Session</connection-interface>
- <connection-impl-class>org.jboss.messaging.ra.JBMSession</connection-impl-class>
- </connection-definition>
- <transaction-support>XATransaction</transaction-support>
- <authentication-mechanism>
- <authentication-mechanism-type>BasicPassword</authentication-mechanism-type>
- <credential-interface>javax.resource.spi.security.PasswordCredential</credential-interface>
- </authentication-mechanism>
- <reauthentication-support>false</reauthentication-support>
- </outbound-resourceadapter>
-
- <inbound-resourceadapter>
- <messageadapter>
- <messagelistener>
- <messagelistener-type>javax.jms.MessageListener</messagelistener-type>
- <activationspec>
- <activationspec-class>org.jboss.messaging.ra.inflow.JBMActivationSpec</activationspec-class>
- <required-config-property>
- <config-property-name>destination</config-property-name>
- </required-config-property>
- </activationspec>
- </messagelistener>
- </messageadapter>
- </inbound-resourceadapter>
-
- </resourceadapter>
-</connector>
Modified: trunk/build-messaging.xml
===================================================================
--- trunk/build-messaging.xml 2009-04-02 14:54:17 UTC (rev 6279)
+++ trunk/build-messaging.xml 2009-04-02 15:17:42 UTC (rev 6280)
@@ -954,7 +954,7 @@
</fileset>
</copy>
- <copy tofile="${build.distro.examples.dir}/jms/common/config/ant.properties" file="AS/examples-ant.properties" overwrite="true">
+ <copy tofile="${build.distro.examples.dir}/jms/common/config/ant.properties" file="AS/config/examples-ant.properties" overwrite="true">
</copy>
<echo message="lib.dir=../../lib${line.separator}client.jar=../../lib/jboss-messaging-client.jar${line.separator}config.dir=../../config${line.separator}server.jar=../../lib/jboss-messaging.jar"
Modified: trunk/examples/jms/common/config/ant.properties
===================================================================
--- trunk/examples/jms/common/config/ant.properties 2009-04-02 14:54:17 UTC (rev 6279)
+++ trunk/examples/jms/common/config/ant.properties 2009-04-02 15:17:42 UTC (rev 6280)
@@ -1,4 +1,4 @@
-jbm.example.logserveroutput=false
+jbm.example.logserveroutput=true
logging.properties=${imported.basedir}/../../../src/config/logging.properties
jbm.jars.dir=${imported.basedir}/../../../build/jars
jars.dir=${imported.basedir}/../../../thirdparty
\ No newline at end of file
Modified: trunk/src/config/jbm-security.xml
===================================================================
--- trunk/src/config/jbm-security.xml 2009-04-02 14:54:17 UTC (rev 6279)
+++ trunk/src/config/jbm-security.xml 2009-04-02 15:17:42 UTC (rev 6280)
@@ -4,8 +4,7 @@
<defaultuser name="guest" password="guest">
<role name="guest"/>
</defaultuser>
- <user name="admin" password="admin">
+ <!--<user name="admin" password="admin">
<role name="admin"/>
- <role name="guest"/>
- </user>
+ </user>-->
</deployment>
\ No newline at end of file
Modified: trunk/src/config/jbm-standalone-beans.xml
===================================================================
--- trunk/src/config/jbm-standalone-beans.xml 2009-04-02 14:54:17 UTC (rev 6279)
+++ trunk/src/config/jbm-standalone-beans.xml 2009-04-02 15:17:42 UTC (rev 6280)
@@ -38,6 +38,11 @@
<property name="jbmSecurityManager">
<inject bean="JBMSecurityManager"/>
</property>
+ <!--<property name="configFileNames">
+ <array elementClass="java.lang.String">
+ <value>jbm-security.xml</value>
+ </array>
+ </property>-->
</bean>
<bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
Modified: trunk/src/main/org/jboss/messaging/core/deployers/impl/AddressSettingsDeployer.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/deployers/impl/AddressSettingsDeployer.java 2009-04-02 14:54:17 UTC (rev 6279)
+++ trunk/src/main/org/jboss/messaging/core/deployers/impl/AddressSettingsDeployer.java 2009-04-02 15:17:42 UTC (rev 6280)
@@ -144,7 +144,7 @@
addressSettingsRepository.addMatch(match, addressSettings);
}
- public String[] getConfigFileNames()
+ public String[] getDefaultConfigFileNames()
{
return new String[] { "jbm-configuration", "jbm-queues.xml" };
}
Modified: trunk/src/main/org/jboss/messaging/core/deployers/impl/BasicSecurityDeployer.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/deployers/impl/BasicSecurityDeployer.java 2009-04-02 14:54:17 UTC (rev 6279)
+++ trunk/src/main/org/jboss/messaging/core/deployers/impl/BasicSecurityDeployer.java 2009-04-02 15:17:42 UTC (rev 6280)
@@ -88,7 +88,7 @@
jbmSecurityManager.removeUser(username);
}
- public String[] getConfigFileNames()
+ public String[] getDefaultConfigFileNames()
{
return new String[] {"jbm-security.xml"};
}
Modified: trunk/src/main/org/jboss/messaging/core/deployers/impl/QueueDeployer.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/deployers/impl/QueueDeployer.java 2009-04-02 14:54:17 UTC (rev 6279)
+++ trunk/src/main/org/jboss/messaging/core/deployers/impl/QueueDeployer.java 2009-04-02 15:17:42 UTC (rev 6280)
@@ -22,13 +22,13 @@
package org.jboss.messaging.core.deployers.impl;
-import java.util.List;
-
import org.jboss.messaging.core.config.Configuration;
import org.jboss.messaging.core.config.cluster.QueueConfiguration;
import org.jboss.messaging.core.deployers.DeploymentManager;
import org.w3c.dom.Node;
+import java.util.List;
+
/**
* A QueueDeployer
*
@@ -90,7 +90,7 @@
*
* @return The name of the config file
*/
- public String[] getConfigFileNames()
+ public String[] getDefaultConfigFileNames()
{
return new String[] { "jbm-configuration.xml", "jbm-queues.xml" };
}
Modified: trunk/src/main/org/jboss/messaging/core/deployers/impl/SecurityDeployer.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/deployers/impl/SecurityDeployer.java 2009-04-02 14:54:17 UTC (rev 6279)
+++ trunk/src/main/org/jboss/messaging/core/deployers/impl/SecurityDeployer.java 2009-04-02 15:17:42 UTC (rev 6280)
@@ -190,7 +190,7 @@
*
* @return The name of the config file
*/
- public String[] getConfigFileNames()
+ public String[] getDefaultConfigFileNames()
{
return new String[] {QUEUES_XML};
}
Modified: trunk/src/main/org/jboss/messaging/core/deployers/impl/XmlDeployer.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/deployers/impl/XmlDeployer.java 2009-04-02 14:54:17 UTC (rev 6279)
+++ trunk/src/main/org/jboss/messaging/core/deployers/impl/XmlDeployer.java 2009-04-02 15:17:42 UTC (rev 6280)
@@ -22,6 +22,14 @@
package org.jboss.messaging.core.deployers.impl;
+import org.jboss.messaging.core.deployers.Deployer;
+import org.jboss.messaging.core.deployers.DeploymentManager;
+import org.jboss.messaging.core.logging.Logger;
+import org.jboss.messaging.core.server.MessagingComponent;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
import java.io.InputStreamReader;
import java.io.Reader;
import java.net.URL;
@@ -32,14 +40,6 @@
import java.util.Map;
import java.util.Set;
-import org.jboss.messaging.core.deployers.Deployer;
-import org.jboss.messaging.core.deployers.DeploymentManager;
-import org.jboss.messaging.core.logging.Logger;
-import org.jboss.messaging.core.server.MessagingComponent;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
/**
* @author <a href="ataylor at redhat.com">Andy Taylor</a>
*/
@@ -55,9 +55,12 @@
private boolean started;
+ private String[] configFileNames;
+
public XmlDeployer(final DeploymentManager deploymentManager)
{
this.deploymentManager = deploymentManager;
+ configFileNames = getDefaultConfigFileNames();
}
/**
@@ -247,12 +250,23 @@
return started;
}
+ public String[] getConfigFileNames()
+ {
+ return configFileNames;
+ }
+
+ public void setConfigFileNames(String[] configFileNames)
+ {
+ this.configFileNames = configFileNames;
+ }
+
/**
* the names of the elements to deploy
* @return the names of the elements todeploy
*/
public abstract String[] getElementTagName();
+ public abstract String[] getDefaultConfigFileNames();
/**
* deploy an element
Modified: trunk/src/main/org/jboss/messaging/jms/server/impl/JMSServerDeployer.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/server/impl/JMSServerDeployer.java 2009-04-02 14:54:17 UTC (rev 6279)
+++ trunk/src/main/org/jboss/messaging/jms/server/impl/JMSServerDeployer.java 2009-04-02 15:17:42 UTC (rev 6280)
@@ -12,9 +12,6 @@
package org.jboss.messaging.jms.server.impl;
-import java.util.ArrayList;
-import java.util.List;
-
import org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl;
import org.jboss.messaging.core.config.Configuration;
import org.jboss.messaging.core.config.TransportConfiguration;
@@ -27,6 +24,9 @@
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
+import java.util.ArrayList;
+import java.util.List;
+
/**
* @author <a href="ataylor at redhat.com">Andy Taylor</a>
* @author <a href="tim.fox at jboss.com">Tim Fox</a>
@@ -452,7 +452,7 @@
}
}
- public String[] getConfigFileNames()
+ public String[] getDefaultConfigFileNames()
{
return new String[] {"jbm-jms.xml"};
}
Modified: trunk/tests/jms-tests/src/org/jboss/test/messaging/JBMServerTestCase.java
===================================================================
--- trunk/tests/jms-tests/src/org/jboss/test/messaging/JBMServerTestCase.java 2009-04-02 14:54:17 UTC (rev 6279)
+++ trunk/tests/jms-tests/src/org/jboss/test/messaging/JBMServerTestCase.java 2009-04-02 15:17:42 UTC (rev 6280)
@@ -258,7 +258,7 @@
public String[] getContainerConfig()
{
- return new String[]{ "invm-beans.xml", "/src/config/AS/jbm-jboss-beans.xml"};
+ return new String[]{ "invm-beans.xml", "AS/config/jbm-jboss-beans.xml"};
}
protected MessagingServer getJmsServer() throws Exception
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/deployers/impl/XMLDeployerTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/deployers/impl/XMLDeployerTest.java 2009-04-02 14:54:17 UTC (rev 6279)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/deployers/impl/XMLDeployerTest.java 2009-04-02 15:17:42 UTC (rev 6280)
@@ -22,16 +22,16 @@
package org.jboss.messaging.tests.unit.core.deployers.impl;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.HashMap;
-
import org.jboss.messaging.core.deployers.impl.XmlDeployer;
import org.jboss.messaging.tests.util.UnitTestCase;
import org.jboss.messaging.utils.XMLUtil;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.HashMap;
+
/**
* tests the abstract xml deployer class
* @author <a href="ataylor at redhat.com">Andy Taylor</a>
@@ -225,6 +225,11 @@
return new String[] {"test"};
}
+ public String[] getDefaultConfigFileNames()
+ {
+ return new String[0];
+ }
+
@Override
public void validate(Node rootNode) throws Exception
{
More information about the jboss-cvs-commits
mailing list