[jboss-cvs] JBoss Messaging SVN: r3620 - in trunk: docs/examples/topic and 15 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Jan 23 06:52:10 EST 2008
Author: ataylor
Date: 2008-01-23 06:52:09 -0500 (Wed, 23 Jan 2008)
New Revision: 3620
Added:
trunk/tests/src/org/jboss/messaging/deployers/
trunk/tests/src/org/jboss/messaging/deployers/queue/
trunk/tests/src/org/jboss/messaging/deployers/queue/tests/
trunk/tests/src/org/jboss/messaging/deployers/queue/tests/unit/
trunk/tests/src/org/jboss/messaging/deployers/queue/tests/unit/QueueSettingsDeployerTest.java
Removed:
trunk/tests/src/org/jboss/jms/server/destination/settings/
Modified:
trunk/docs/examples/topic/build.xml
trunk/messaging.iml
trunk/messaging.ipr
trunk/src/etc/server/default/deploy/jbm-beans.xml
trunk/src/etc/server/default/deploy/jbm-jndi.xml
trunk/src/main/org/jboss/jms/jndi/JNDIObjectDeployer.java
trunk/src/main/org/jboss/jms/server/security/SecurityMetadataStore.java
trunk/src/main/org/jboss/messaging/core/impl/server/MessagingServerImpl.java
trunk/src/main/org/jboss/messaging/microcontainer/ServiceLocator.java
trunk/tests/etc/database-clearer.xml
trunk/tests/etc/datasource.xml
trunk/tests/etc/invm-beans.xml
trunk/tests/etc/transaction-manager.xml
trunk/tests/src/org/jboss/test/messaging/JBMServerTestCase.java
trunk/tests/src/org/jboss/test/messaging/jms/XATest.java
trunk/tests/src/org/jboss/test/messaging/jms/message/JMSXDeliveryCountTest.java
Log:
removal of jndi from securitystore and more config fixes
Modified: trunk/docs/examples/topic/build.xml
===================================================================
--- trunk/docs/examples/topic/build.xml 2008-01-23 11:41:34 UTC (rev 3619)
+++ trunk/docs/examples/topic/build.xml 2008-01-23 11:52:09 UTC (rev 3620)
@@ -27,15 +27,15 @@
<path id="example.compilation.classpath">
<path refid="common.compilation.classpath"/>
- <pathelement path="../common/output"/>
+ <pathelement path="../common/output/classes"/>
</path>
<path id="execution.classpath">
<pathelement path="./etc"/>
- <pathelement path="../common/output"/>
- <pathelement path="./output"/>
+ <pathelement path="../common/output/classes"/>
+ <pathelement path="./output/classes"/>
<fileset file="${messaging.client.jar.path}/${messaging.client.jar.name}"/>
- <fileset dir="${jboss.home}/server/${jboss.configuration}/deploy/jboss-messaging.sar">
+ <fileset dir="${jboss.home}/server/${jboss.configuration}/deploy/messaging.sar">
<include name="**/*.jar"/>
</fileset>
<fileset file="${jboss.home}/client/jbossall-client.jar"/>
@@ -62,16 +62,16 @@
</target>
<target name="init" depends="sanity-check">
- <mkdir dir="./output"/>
- <mkdir dir="../common/output"/>
+ <mkdir dir="./output/classes"/>
+ <mkdir dir="../common/output/classes"/>
</target>
<target name="compile" depends="init">
- <javac destdir="../common/output" debug="on" debuglevel="lines,vars,source">
+ <javac destdir="../common/output/classes" debug="on" debuglevel="lines,vars,source">
<src path="../common/src"/>
<classpath refid="common.compilation.classpath"/>
</javac>
- <javac destdir="./output" debug="on" debuglevel="lines,vars,source">
+ <javac destdir="./output/classes" debug="on" debuglevel="lines,vars,source">
<src path="./src"/>
<classpath refid="example.compilation.classpath"/>
</javac>
Modified: trunk/messaging.iml
===================================================================
--- trunk/messaging.iml 2008-01-23 11:41:34 UTC (rev 3619)
+++ trunk/messaging.iml 2008-01-23 11:52:09 UTC (rev 3620)
@@ -159,6 +159,15 @@
<SOURCES />
</library>
</orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="file://$MODULE_DIR$/docs/examples/queue/etc" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
<orderEntryProperties />
</component>
<component name="VcsManagerConfiguration">
Modified: trunk/messaging.ipr
===================================================================
--- trunk/messaging.ipr 2008-01-23 11:41:34 UTC (rev 3619)
+++ trunk/messaging.ipr 2008-01-23 11:52:09 UTC (rev 3620)
@@ -217,59 +217,59 @@
</component>
<component name="IntelliJadProjectConfigComponent">
<config>
+ <i type="boolean">false</i>
+ <pm type="string">_mth</pm>
+ <r type="boolean">false</r>
+ <nocast type="boolean">false</nocast>
<pl type="string">_lcl</pl>
+ <nodos type="boolean">false</nodos>
+ <clear-and-close-console-on-success type="boolean">false</clear-and-close-console-on-success>
+ <noinner type="boolean">false</noinner>
+ <lnc type="boolean">false</lnc>
+ <a type="boolean">false</a>
+ <lradix type="integer">10</lradix>
+ <pf type="string">_fld</pf>
+ <dead type="boolean">false</dead>
+ <indentation type="integer">4</indentation>
+ <pp type="string">_prm</pp>
+ <space type="boolean">false</space>
+ <radix type="integer">10</radix>
<v type="boolean">false</v>
- <nonlb type="boolean">false</nonlb>
- <decompile-to-memory type="boolean">true</decompile-to-memory>
- <clear-and-close-console-on-success type="boolean">false</clear-and-close-console-on-success>
<af type="boolean">false</af>
- <a type="boolean">false</a>
- <d type="string" />
- <noctor type="boolean">false</noctor>
- <sort type="boolean">false</sort>
+ <reformat-according-to-style type="boolean">false</reformat-according-to-style>
+ <nofd type="boolean">false</nofd>
+ <noclass type="boolean">false</noclass>
+ <o type="boolean">false</o>
<ff type="boolean">false</ff>
+ <use-project-specific-settings type="boolean">false</use-project-specific-settings>
+ <noconv type="boolean">false</noconv>
+ <f type="boolean">false</f>
+ <read-only type="boolean">false</read-only>
+ <nolvt type="boolean">false</nolvt>
<pe type="string">_ex</pe>
- <s type="string">java</s>
- <noclass type="boolean">false</noclass>
- <use-project-specific-settings type="boolean">false</use-project-specific-settings>
+ <safe type="boolean">false</safe>
+ <b type="boolean">false</b>
+ <exclusion-table-model type="table-model" model-class="net.stevechaloner.intellijad.config.ExclusionTableModel" content-types="string,boolean,boolean" />
+ <nocode type="boolean">false</nocode>
+ <sort type="boolean">false</sort>
+ <decompile-to-memory type="boolean">true</decompile-to-memory>
+ <dis type="boolean">false</dis>
+ <noctor type="boolean">false</noctor>
+ <jad-path type="string" />
<pc type="string">_cls</pc>
- <stat type="boolean">false</stat>
- <always-exclude-recursively type="boolean">false</always-exclude-recursively>
- <reformat-according-to-style type="boolean">false</reformat-according-to-style>
- <pm type="string">_mth</pm>
- <t type="boolean">false</t>
<decompile-on-navigation type="string">Always</decompile-on-navigation>
+ <d type="string" />
<nl type="boolean">false</nl>
- <clear type="boolean">false</clear>
+ <always-exclude-recursively type="boolean">false</always-exclude-recursively>
+ <s type="string">java</s>
<pv type="integer">3</pv>
- <nocast type="boolean">false</nocast>
- <noconv type="boolean">false</noconv>
- <nodos type="boolean">false</nodos>
- <dis type="boolean">false</dis>
- <space type="boolean">false</space>
- <pf type="string">_fld</pf>
+ <nonlb type="boolean">false</nonlb>
<pa type="string" />
<create-output-directory type="boolean">false</create-output-directory>
- <o type="boolean">false</o>
- <safe type="boolean">false</safe>
- <indentation type="integer">4</indentation>
- <lnc type="boolean">false</lnc>
- <nolvt type="boolean">false</nolvt>
- <lradix type="integer">10</lradix>
- <pp type="string">_prm</pp>
- <nofd type="boolean">false</nofd>
- <f type="boolean">false</f>
- <radix type="integer">10</radix>
- <noinner type="boolean">false</noinner>
- <i type="boolean">false</i>
- <jad-path type="string" />
<l type="integer">64</l>
- <nocode type="boolean">false</nocode>
- <read-only type="boolean">false</read-only>
- <dead type="boolean">false</dead>
- <r type="boolean">false</r>
- <exclusion-table-model type="table-model" model-class="net.stevechaloner.intellijad.config.ExclusionTableModel" content-types="string,boolean,boolean" />
- <b type="boolean">false</b>
+ <stat type="boolean">false</stat>
+ <clear type="boolean">false</clear>
+ <t type="boolean">false</t>
</config>
</component>
<component name="JavacSettings">
Modified: trunk/src/etc/server/default/deploy/jbm-beans.xml
===================================================================
--- trunk/src/etc/server/default/deploy/jbm-beans.xml 2008-01-23 11:41:34 UTC (rev 3619)
+++ trunk/src/etc/server/default/deploy/jbm-beans.xml 2008-01-23 11:52:09 UTC (rev 3620)
@@ -6,7 +6,7 @@
<bean name="ServiceLocator" class="org.jboss.messaging.microcontainer.ServiceLocator">
<demand>jboss.jca:name=DefaultDS,service=DataSourceBinding</demand>
- <depends>jboss:service=TransactionManager</depends>
+ <!--<depends>jboss:service=TransactionManager</depends>-->
<!-- <depends>jboss.jca:service=DataSourceBinding,name=DefaultDS</depends>-->
</bean>
@@ -29,6 +29,9 @@
<property name="configuration">
<inject bean="Configuration"/>
</property>
+ <property name="authenticationManager">
+ <inject bean="ServiceLocator" property="authenticationManager"/>
+ </property>
</bean>
<bean name="PersistenceManager" class="org.jboss.messaging.core.impl.bdbje.BDBJEPersistenceManager">
Modified: trunk/src/etc/server/default/deploy/jbm-jndi.xml
===================================================================
--- trunk/src/etc/server/default/deploy/jbm-jndi.xml 2008-01-23 11:41:34 UTC (rev 3619)
+++ trunk/src/etc/server/default/deploy/jbm-jndi.xml 2008-01-23 11:52:09 UTC (rev 3620)
@@ -61,7 +61,7 @@
<entry name="/queue/ExpiryQueue"/>
</queue>
<topic name="testTopic">
- <entry name="/topic.testTopic"/>
+ <entry name="/topic/testTopic"/>
</topic>
<topic name="securedTopic">
<entry name="/topic/securedTopic"/>
@@ -94,7 +94,7 @@
<entry name="/queue/PrivateExpiryQueue"/>
</queue>
<queue name="QueueWithOwnDLQAndExpiryQueue">
- <entry name="/queue/"/>
+ <entry name="/queue/QueueWithOwnDLQAndExpiryQueue"/>
</queue>
<topic name="TopicWithOwnDLQAndExpiryQueue">
<entry name="/topic/QueueWithOwnDLQAndExpiryQueue"/>
Modified: trunk/src/main/org/jboss/jms/jndi/JNDIObjectDeployer.java
===================================================================
--- trunk/src/main/org/jboss/jms/jndi/JNDIObjectDeployer.java 2008-01-23 11:41:34 UTC (rev 3619)
+++ trunk/src/main/org/jboss/jms/jndi/JNDIObjectDeployer.java 2008-01-23 11:52:09 UTC (rev 3620)
@@ -220,7 +220,7 @@
return new JBossQueue(queueName);
}
- else if (node.equals(TOPIC_NODE_NAME))
+ else if (node.getNodeName().equals(TOPIC_NODE_NAME))
{
String topicName = node.getAttributes().getNamedItem(getKeyAttribute()).getNodeValue();
messagingServer.createTopic(topicName);
Modified: trunk/src/main/org/jboss/jms/server/security/SecurityMetadataStore.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/security/SecurityMetadataStore.java 2008-01-23 11:41:34 UTC (rev 3619)
+++ trunk/src/main/org/jboss/jms/server/security/SecurityMetadataStore.java 2008-01-23 11:52:09 UTC (rev 3620)
@@ -21,15 +21,6 @@
*/
package org.jboss.jms.server.security;
-import java.security.Principal;
-import java.util.HashSet;
-import java.util.Set;
-
-import javax.jms.JMSSecurityException;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-import javax.security.auth.Subject;
-
import org.jboss.jms.server.SecurityStore;
import org.jboss.messaging.core.Destination;
import org.jboss.messaging.core.DestinationType;
@@ -39,8 +30,13 @@
import org.jboss.security.AuthenticationManager;
import org.jboss.security.RealmMapping;
import org.jboss.security.SimplePrincipal;
-import org.jboss.security.SubjectSecurityManager;
+import javax.jms.JMSSecurityException;
+import javax.security.auth.Subject;
+import java.security.Principal;
+import java.util.HashSet;
+import java.util.Set;
+
/**
* A security metadate store for JMS. Stores security information for destinations and delegates
* authentication and authorization to a JaasSecurityManager.
@@ -180,49 +176,6 @@
this.suckerPassword = password;
}
- public void start() throws NamingException
- {
- if (trace) { log.trace("initializing SecurityMetadataStore"); }
-
- // Get the JBoss security manager from JNDI
- InitialContext ic = new InitialContext();
-
- try
- {
- Object mgr = ic.lookup(messagingServer.getConfiguration().getSecurityDomain());
-
- log.debug("JaasSecurityManager is " + mgr);
-
- authenticationManager = (AuthenticationManager)mgr;
- realmMapping = (RealmMapping)mgr;
-
- log.trace("SecurityMetadataStore initialized");
- }
- catch (NamingException e)
- {
- // Apparently there is no security context, try adding java:/jaas
- log.warn("Failed to lookup securityDomain " + messagingServer.getConfiguration().getSecurityDomain(), e);
-
- if (!messagingServer.getConfiguration().getSecurityDomain().startsWith("java:/jaas/"))
- {
- authenticationManager =
- (SubjectSecurityManager)ic.lookup("java:/jaas/" + messagingServer.getConfiguration().getSecurityDomain());
- }
- else
- {
- throw e;
- }
- }
- finally
- {
- ic.close();
- }
- }
-
- public void stop() throws Exception
- {
- }
-
public void setSecurityRepository(HierarchicalRepository<HashSet<Role>> securityRepository)
{
this.securityRepository = securityRepository;
@@ -247,4 +200,9 @@
// Inner class ---------------------------------------------------
+ public void setAuthenticationManager(AuthenticationManager authenticationManager)
+ {
+ this.authenticationManager = authenticationManager;
+ this.realmMapping = (RealmMapping) authenticationManager;
+ }
}
Modified: trunk/src/main/org/jboss/messaging/core/impl/server/MessagingServerImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/impl/server/MessagingServerImpl.java 2008-01-23 11:41:34 UTC (rev 3619)
+++ trunk/src/main/org/jboss/messaging/core/impl/server/MessagingServerImpl.java 2008-01-23 11:52:09 UTC (rev 3620)
@@ -21,14 +21,6 @@
*/
package org.jboss.messaging.core.impl.server;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
import org.jboss.aop.microcontainer.aspects.jmx.JMX;
import org.jboss.jms.server.ConnectionManager;
import org.jboss.jms.server.MessagingTimeoutFactory;
@@ -40,16 +32,7 @@
import org.jboss.jms.server.security.Role;
import org.jboss.jms.server.security.SecurityMetadataStore;
import org.jboss.logging.Logger;
-import org.jboss.messaging.core.Binding;
-import org.jboss.messaging.core.Condition;
-import org.jboss.messaging.core.Configuration;
-import org.jboss.messaging.core.DestinationType;
-import org.jboss.messaging.core.MemoryManager;
-import org.jboss.messaging.core.MessagingServer;
-import org.jboss.messaging.core.PersistenceManager;
-import org.jboss.messaging.core.PostOffice;
-import org.jboss.messaging.core.Queue;
-import org.jboss.messaging.core.QueueSettings;
+import org.jboss.messaging.core.*;
import org.jboss.messaging.core.impl.ConditionImpl;
import org.jboss.messaging.core.impl.QueueFactoryImpl;
import org.jboss.messaging.core.impl.memory.SimpleMemoryManager;
@@ -62,7 +45,16 @@
import org.jboss.messaging.util.HierarchicalObjectRepository;
import org.jboss.messaging.util.HierarchicalRepository;
import org.jboss.messaging.util.Version;
+import org.jboss.security.AuthenticationManager;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
/**
* A Messaging Server
*
@@ -104,6 +96,7 @@
private PostOffice postOffice;
private SecurityDeployer securityDeployer;
private QueueSettingsDeployer queueSettingsDeployer;
+ private AuthenticationManager authenticationManager;
// plugins
@@ -155,6 +148,7 @@
securityStore = new SecurityMetadataStore(this);
securityRepository.setDefault(new HashSet<Role>());
securityStore.setSecurityRepository(securityRepository);
+ securityStore.setAuthenticationManager(authenticationManager);
securityDeployer = new SecurityDeployer();
securityDeployer.setSecurityRepository(securityRepository);
queueSettingsDeployer = new QueueSettingsDeployer();
@@ -180,7 +174,6 @@
queueSettingsDeployer.start();
connectionManager.start();
memoryManager.start();
- securityStore.start();
postOffice.start();
started = true;
@@ -213,7 +206,6 @@
connectionManager = null;
memoryManager.stop();
memoryManager = null;
- securityStore.stop();
messageCounterManager.stop();
messageCounterManager = null;
postOffice.stop();
@@ -468,6 +460,12 @@
return securityRepository;
}
+
+ public void setAuthenticationManager(AuthenticationManager authenticationManager)
+ {
+ this.authenticationManager = authenticationManager;
+ }
+
public String toString()
{
return "MessagingServer[" + configuration.getMessagingServerID() + "]";
Modified: trunk/src/main/org/jboss/messaging/microcontainer/ServiceLocator.java
===================================================================
--- trunk/src/main/org/jboss/messaging/microcontainer/ServiceLocator.java 2008-01-23 11:41:34 UTC (rev 3619)
+++ trunk/src/main/org/jboss/messaging/microcontainer/ServiceLocator.java 2008-01-23 11:52:09 UTC (rev 3620)
@@ -21,16 +21,18 @@
*/
package org.jboss.messaging.microcontainer;
-import javax.management.MalformedObjectNameException;
+import org.jboss.dependency.spi.ControllerContext;
+import org.jboss.kernel.spi.dependency.KernelControllerContext;
+import org.jboss.kernel.spi.dependency.KernelControllerContextAware;
+import org.jboss.security.AuthenticationManager;
+import org.jboss.tm.TransactionManagerLocator;
+
import javax.management.ObjectName;
import javax.naming.InitialContext;
+import javax.naming.NamingException;
import javax.sql.DataSource;
import javax.transaction.TransactionManager;
-import org.jboss.kernel.spi.dependency.KernelControllerContext;
-import org.jboss.kernel.spi.dependency.KernelControllerContextAware;
-import org.jboss.tm.TransactionManagerLocator;
-
/**
* This is a layer that is used for injecting services into other objects. depending on the configuration we are running
* we can get these from more than one place or even inject them.
@@ -41,6 +43,7 @@
{
private ObjectName multiplexer;
private TransactionManager tm;
+ private org.jboss.security.AuthenticationManager authenticationManager;
private DataSource dataSource;
private KernelControllerContext kernelControllerContext;
@@ -54,11 +57,26 @@
kernelControllerContext = null;
}
- public TransactionManager getTransactionManager() throws MalformedObjectNameException
+ public TransactionManager getTransactionManager() throws Exception
{
if(tm == null)
{
- tm = TransactionManagerLocator.locateTransactionManager();
+ ControllerContext controllerContext = kernelControllerContext.getController().getInstalledContext("jbm:TransactionManager");
+ if(controllerContext != null)
+ {
+ tm = (TransactionManager) controllerContext.getTarget();
+ }
+ else
+ {
+ try
+ {
+ tm = TransactionManagerLocator.locateTransactionManager();
+ }
+ catch (Exception e)
+ {
+ throw new Exception("TransactionManager unavailable", e);
+ }
+ }
}
return tm;
}
@@ -72,16 +90,25 @@
{
if(dataSource == null)
{
- InitialContext ic = new InitialContext();
- //try in the initial context, if its not there use the one that has been injected
- try
+ ControllerContext controllerContext = kernelControllerContext.getController().getInstalledContext("jbm:DataSource");
+ if(controllerContext != null)
{
- dataSource = (DataSource)ic.lookup("java:/DefaultDS");
+ dataSource = (DataSource) controllerContext.getTarget();
}
- catch (Exception e)
+ else
{
- dataSource = (DataSource) kernelControllerContext.getController().getInstalledContext("jboss.jca:name=DefaultDS,service=DataSourceBinding").getTarget();
+ InitialContext ic = new InitialContext();
+ //try in the initial context, if its not there use the one that has been injected
+ try
+ {
+ dataSource = (DataSource) ic.lookup("java:/DefaultDS");
+ }
+ catch (Exception e)
+ {
+ throw new Exception("DataSource unavailable", e);
+ }
}
+
}
return dataSource;
}
@@ -92,8 +119,47 @@
}
+ public TransactionManager getTm()
+ {
+ return tm;
+ }
- public ObjectName getMultiplexer()
+ public void setTm(TransactionManager tm)
+ {
+ this.tm = tm;
+ }
+
+ public AuthenticationManager getAuthenticationManager() throws Exception
+ {
+ if(authenticationManager == null)
+ {
+ ControllerContext controllerContext = kernelControllerContext.getController().getInstalledContext("jbm:AuthenticationManager");
+ if(controllerContext != null)
+ {
+ authenticationManager = (AuthenticationManager) controllerContext.getTarget();
+ }
+ else
+ {
+ try
+ {
+ InitialContext ic = new InitialContext();
+ authenticationManager = (AuthenticationManager)ic.lookup("java:/jaas/messaging");
+ }
+ catch (NamingException e)
+ {
+ throw new Exception("AuthenticationManager unavailable", e);
+ }
+ }
+ }
+ return authenticationManager;
+ }
+
+ public void setAuthenticationManager(AuthenticationManager authenticationManager)
+ {
+ this.authenticationManager = authenticationManager;
+ }
+
+ public ObjectName getMultiplexer()
{
return multiplexer;
}
@@ -102,16 +168,4 @@
{
this.multiplexer = multiplexer;
}
- /*if(mBeanServer != null)
- {
- TransactionManagerServiceMBean tms =
- (TransactionManagerServiceMBean) MBeanServerInvocationHandler.
- newProxyInstance(mBeanServer, new ObjectName("jboss:service=TransactionManager"), TransactionManagerServiceMBean.class, false);
-
- tm = tms.getTransactionManager();
- }
- else
- {
- tm = (TransactionManager) kernelControllerContext.getKernel().getRegistry().getEntry("TransactionManager").getTarget();
- }*/
}
Modified: trunk/tests/etc/database-clearer.xml
===================================================================
--- trunk/tests/etc/database-clearer.xml 2008-01-23 11:41:34 UTC (rev 3619)
+++ trunk/tests/etc/database-clearer.xml 2008-01-23 11:52:09 UTC (rev 3620)
@@ -2,7 +2,7 @@
<deployment xmlns="urn:jboss:bean-deployer:2.0">
<bean name="DatabaseClearer" class="org.jboss.test.messaging.tools.container.DatabaseClearer">
- <property name="dataSource"><inject bean="jboss.jca:name=DefaultDS,service=DataSourceBinding"/></property>
- <property name="transactionManager"><inject bean="jboss:service=TransactionManager"/></property>
+ <property name="dataSource"><inject bean="jbm:DataSource"/></property>
+ <property name="transactionManager"><inject bean="jbm:TransactionManager"/></property>
</bean>
</deployment>
\ No newline at end of file
Modified: trunk/tests/etc/datasource.xml
===================================================================
--- trunk/tests/etc/datasource.xml 2008-01-23 11:41:34 UTC (rev 3619)
+++ trunk/tests/etc/datasource.xml 2008-01-23 11:52:09 UTC (rev 3620)
@@ -5,7 +5,7 @@
<property name="database">jdbc:hsqldb:file:myHSQLDBInstance</property>
<property name="user">sa</property>
</bean>-->
- <bean name="jboss.jca:name=DefaultDS,service=DataSourceBinding" class="com.mysql.jdbc.jdbc2.optional.MysqlDataSource">
+ <bean name="jbm:DataSource" class="com.mysql.jdbc.jdbc2.optional.MysqlDataSource">
<property name="url">jdbc:mysql://localhost/messaging</property>
<property name="user">sa</property>
</bean>
Modified: trunk/tests/etc/invm-beans.xml
===================================================================
--- trunk/tests/etc/invm-beans.xml 2008-01-23 11:41:34 UTC (rev 3619)
+++ trunk/tests/etc/invm-beans.xml 2008-01-23 11:52:09 UTC (rev 3620)
@@ -1,43 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
<bean name="ConfigurationHelper" class="org.jboss.test.messaging.tools.ConfigurationHelper">
<property name="configuration"><inject bean="Configuration"/> </property>
</bean>
- <bean name="JaasBinding" class="org.jboss.messaging.microcontainer.JndiBinder">
- <property name="jndiProperties">
- <inject bean="ConfigurationHelper" property="environment"/>
- </property>
- <property name="target">
- <inject bean="Jaas"/>
- </property>
- <property name="bindTo">java:/jaas/messaging</property>
- </bean>
+ <bean name="jbm:AuthenticationManager" class="org.jboss.test.messaging.tools.container.MockJBossSecurityManager"/>
- <bean name="Jaas" class="org.jboss.test.messaging.tools.container.MockJBossSecurityManager"/>
-
- <bean name="DSBinding" class="org.jboss.messaging.microcontainer.JndiBinder">
- <property name="jndiProperties">
- <inject bean="ConfigurationHelper" property="environment"/>
- </property>
- <property name="target">
- <inject bean="jboss.jca:name=DefaultDS,service=DataSourceBinding"/>
- </property>
- <property name="bindTo">java:/DefaultDS</property>
- </bean>
-
- <bean name="TMBinding" class="org.jboss.messaging.microcontainer.JndiBinder">
- <property name="jndiProperties">
- <inject bean="ConfigurationHelper" property="environment"/>
- </property>
- <property name="target">
- <inject bean="jboss:service=TransactionManager"/>
- </property>
- <property name="bindTo">java:/TransactionManager</property>
- </bean>
-
-
+ <!--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">
-->
Modified: trunk/tests/etc/transaction-manager.xml
===================================================================
--- trunk/tests/etc/transaction-manager.xml 2008-01-23 11:41:34 UTC (rev 3619)
+++ trunk/tests/etc/transaction-manager.xml 2008-01-23 11:52:09 UTC (rev 3620)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<deployment xmlns="urn:jboss:bean-deployer:2.0">
- <bean name="jboss:service=TransactionManager"
+ <bean name="jbm:TransactionManager"
class="com.arjuna.ats.internal.jta.transaction.arjunacore.TransactionManagerImple"/>
</deployment>
\ No newline at end of file
Copied: trunk/tests/src/org/jboss/messaging/deployers/queue/tests/unit/QueueSettingsDeployerTest.java (from rev 3612, trunk/tests/src/org/jboss/jms/server/destination/settings/test/unit/QueueSettingsDeployerTest.java)
===================================================================
--- trunk/tests/src/org/jboss/messaging/deployers/queue/tests/unit/QueueSettingsDeployerTest.java (rev 0)
+++ trunk/tests/src/org/jboss/messaging/deployers/queue/tests/unit/QueueSettingsDeployerTest.java 2008-01-23 11:52:09 UTC (rev 3620)
@@ -0,0 +1,79 @@
+/*
+ * 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.messaging.deployers.queue.tests.unit;
+
+import junit.framework.TestCase;
+import org.easymock.EasyMock;
+import org.jboss.messaging.core.QueueSettings;
+import org.jboss.messaging.deployers.queue.QueueSettingsDeployer;
+import org.jboss.messaging.util.HierarchicalRepository;
+import org.jboss.messaging.util.XMLUtil;
+
+/**
+ * @author <a href="ataylor at redhat.com">Andy Taylor</a>
+ */
+public class QueueSettingsDeployerTest extends TestCase
+{
+ private String conf = "<queue-settings match=\"queues.*\">\n" +
+ " <clustered>false</clustered>\n" +
+ " <dlq>DLQtest</dlq>\n" +
+ " <expiry-queue>ExpiryQueueTest</expiry-queue>\n" +
+ " <redelivery-delay>100</redelivery-delay>\n" +
+ " <max-size>-100</max-size>\n" +
+ " <distribution-policy-class>org.jboss.messaging.core.impl.RoundRobinDistributionPolicy</distribution-policy-class>\n" +
+ " <message-counter-history-day-limit>1000</message-counter-history-day-limit>\n" +
+ " </queue-settings>";
+
+ QueueSettingsDeployer queueSettingsDeployer;
+
+
+ protected void setUp() throws Exception
+ {
+ queueSettingsDeployer = new QueueSettingsDeployer();
+ }
+
+ public void testDeploy() throws Exception
+ {
+ HierarchicalRepository<QueueSettings> repository = EasyMock.createStrictMock(HierarchicalRepository.class);
+ queueSettingsDeployer.setQueueSettingsRepository(repository);
+ QueueSettings queueSettings = new QueueSettings();
+ queueSettings.setClustered(false);
+ queueSettings.setDLQ("DLQtest");
+ queueSettings.setExpiryQueue("ExpiryQueueTest");
+ queueSettings.setRedeliveryDelay(100);
+ queueSettings.setMaxSize(-100);
+ queueSettings.setDistributionPolicyClass("org.jboss.messaging.core.impl.RoundRobinDistributionPolicy");
+ queueSettings.setMessageCounterHistoryDayLimit(1000);
+ repository.addMatch("queues.*", queueSettings);
+ EasyMock.replay(repository);
+ queueSettingsDeployer.deploy(XMLUtil.stringToElement(conf));
+ }
+
+ public void testUndeploy()
+ {
+ HierarchicalRepository<QueueSettings> repository = EasyMock.createStrictMock(HierarchicalRepository.class);
+ queueSettingsDeployer.setQueueSettingsRepository(repository);
+ repository.removeMatch(conf);
+ EasyMock.replay(repository);
+
+ }
+}
Modified: trunk/tests/src/org/jboss/test/messaging/JBMServerTestCase.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/JBMServerTestCase.java 2008-01-23 11:41:34 UTC (rev 3619)
+++ trunk/tests/src/org/jboss/test/messaging/JBMServerTestCase.java 2008-01-23 11:52:09 UTC (rev 3620)
@@ -900,6 +900,10 @@
servers.get(0).setDefaultRedeliveryDelay(delay);
}
+ public TransactionManager getTransactionManager()
+ {
+ return databaseClearer.getTransactionManager();
+ }
protected void kill(int i) throws Exception
{
log.info("Attempting to kill server " + i);
Modified: trunk/tests/src/org/jboss/test/messaging/jms/XATest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/XATest.java 2008-01-23 11:41:34 UTC (rev 3619)
+++ trunk/tests/src/org/jboss/test/messaging/jms/XATest.java 2008-01-23 11:52:09 UTC (rev 3620)
@@ -21,29 +21,7 @@
*/
package org.jboss.test.messaging.jms;
-import java.util.ArrayList;
-
-import javax.jms.Connection;
-import javax.jms.DeliveryMode;
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.MessageConsumer;
-import javax.jms.MessageListener;
-import javax.jms.MessageProducer;
-import javax.jms.ServerSession;
-import javax.jms.ServerSessionPool;
-import javax.jms.Session;
-import javax.jms.TextMessage;
-import javax.jms.XAConnection;
-import javax.jms.XAConnectionFactory;
-import javax.jms.XASession;
-import javax.naming.InitialContext;
-import javax.transaction.Transaction;
-import javax.transaction.TransactionManager;
-import javax.transaction.xa.XAException;
-import javax.transaction.xa.XAResource;
-import javax.transaction.xa.Xid;
-
+import com.arjuna.ats.internal.jta.transaction.arjunacore.TransactionManagerImple;
import org.jboss.jms.client.JBossConnection;
import org.jboss.jms.client.JBossConnectionFactory;
import org.jboss.jms.client.JBossSession;
@@ -57,11 +35,16 @@
import org.jboss.messaging.util.Logger;
import org.jboss.test.messaging.JBMServerTestCase;
import org.jboss.test.messaging.tools.ServerManagement;
-import org.jboss.test.messaging.tools.container.ServiceContainer;
-import org.jboss.tm.TransactionManagerLocator;
import org.jboss.tm.TxUtils;
-import com.arjuna.ats.internal.jta.transaction.arjunacore.TransactionManagerImple;
+import javax.jms.*;
+import javax.naming.InitialContext;
+import javax.transaction.Transaction;
+import javax.transaction.TransactionManager;
+import javax.transaction.xa.XAException;
+import javax.transaction.xa.XAResource;
+import javax.transaction.xa.Xid;
+import java.util.ArrayList;
/**
*
@@ -113,7 +96,7 @@
{
InitialContext localIc = getInitialContext();
- tm = (TransactionManager)localIc.lookup(ServiceContainer.TRANSACTION_MANAGER_JNDI_NAME);
+ tm = getTransactionManager();
}
@@ -202,7 +185,7 @@
{
if (suspended != null)
{
- TransactionManagerLocator.getInstance().locate().resume(suspended);
+ tm.resume(suspended);
}
}
}
@@ -308,7 +291,7 @@
}
if (suspended != null)
{
- TransactionManagerLocator.getInstance().locate().resume(suspended);
+ tm.resume(suspended);
}
}
}
@@ -384,7 +367,7 @@
if (suspended != null)
{
- TransactionManagerLocator.getInstance().locate().resume(suspended);
+ tm.resume(suspended);
}
}
}
Modified: trunk/tests/src/org/jboss/test/messaging/jms/message/JMSXDeliveryCountTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/message/JMSXDeliveryCountTest.java 2008-01-23 11:41:34 UTC (rev 3619)
+++ trunk/tests/src/org/jboss/test/messaging/jms/message/JMSXDeliveryCountTest.java 2008-01-23 11:52:09 UTC (rev 3620)
@@ -21,16 +21,11 @@
*/
package org.jboss.test.messaging.jms.message;
-import javax.jms.Connection;
-import javax.jms.DeliveryMode;
-import javax.jms.Message;
-import javax.jms.MessageConsumer;
-import javax.jms.MessageProducer;
-import javax.jms.Session;
-import javax.jms.TextMessage;
-import javax.jms.XAConnection;
-import javax.jms.XAConnectionFactory;
-import javax.jms.XASession;
+import com.arjuna.ats.internal.jta.transaction.arjunacore.TransactionManagerImple;
+import org.jboss.test.messaging.JBMServerTestCase;
+import org.jboss.test.messaging.tools.ServerManagement;
+
+import javax.jms.*;
import javax.naming.InitialContext;
import javax.transaction.Transaction;
import javax.transaction.TransactionManager;
@@ -38,12 +33,6 @@
import javax.transaction.xa.XAResource;
import javax.transaction.xa.Xid;
-import org.jboss.test.messaging.JBMServerTestCase;
-import org.jboss.test.messaging.tools.ServerManagement;
-import org.jboss.test.messaging.tools.container.ServiceContainer;
-
-import com.arjuna.ats.internal.jta.transaction.arjunacore.TransactionManagerImple;
-
/**
*
* A JMSXDeliveryCountTest
@@ -433,7 +422,7 @@
{
InitialContext localIc = getInitialContext();
- mgr = (TransactionManager)localIc.lookup(ServiceContainer.TRANSACTION_MANAGER_JNDI_NAME);
+ mgr = getTransactionManager();
}
Transaction toResume = null;
More information about the jboss-cvs-commits
mailing list