[hornetq-commits] JBoss hornetq SVN: r10646 - in trunk/tests/jms-tests: config and 2 other directories.

Author: borges Date: 2011-05-12 11:52:05 -0400 (Thu, 12 May 2011) New Revision: 10646 Added: trunk/tests/jms-tests/src/test/resources/ trunk/tests/jms-tests/src/test/resources/hornetq-beans.xml trunk/tests/jms-tests/src/test/resources/hornetq-configuration.xml trunk/tests/jms-tests/src/test/resources/hornetq-jms.xml trunk/tests/jms-tests/src/test/resources/hornetq-queues.xml trunk/tests/jms-tests/src/test/resources/hornetq-users.xml trunk/tests/jms-tests/src/test/resources/jbossjta-properties.xml trunk/tests/jms-tests/src/test/resources/jndi.properties trunk/tests/jms-tests/src/test/resources/test-beans.xml Removed: trunk/tests/jms-tests/config/hornetq-beans.xml trunk/tests/jms-tests/config/hornetq-configuration.xml trunk/tests/jms-tests/config/hornetq-jms.xml trunk/tests/jms-tests/config/hornetq-queues.xml trunk/tests/jms-tests/config/hornetq-users.xml trunk/tests/jms-tests/config/jbossjta-properties.xml trunk/tests/jms-tests/config/jndi.properties trunk/tests/jms-tests/config/test-beans.xml Modified: trunk/tests/jms-tests/pom.xml Log: Move jms-tests resources into standard Maven folder Deleted: trunk/tests/jms-tests/config/hornetq-beans.xml =================================================================== --- trunk/tests/jms-tests/config/hornetq-beans.xml 2011-05-12 13:43:37 UTC (rev 10645) +++ trunk/tests/jms-tests/config/hornetq-beans.xml 2011-05-12 15:52:05 UTC (rev 10646) @@ -1,60 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<deployment xmlns="urn:jboss:bean-deployer:2.0"> - - <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/> - - <!-- JNDI server. Disable this if you don't want JNDI --> - <bean name="JNDIServer" class="org.jnp.server.Main"> - <property name="namingInfo"> - <inject bean="Naming"/> - </property> - <property name="port">1099</property> - <property name="bindAddress">localhost</property> - <property name="rmiPort">1098</property> - <property name="rmiBindAddress">localhost</property> - </bean> - - <!-- MBean server --> - <bean name="MBeanServer" class="javax.management.MBeanServer"> - <constructor factoryClass="java.lang.management.ManagementFactory" - factoryMethod="getPlatformMBeanServer"/> - </bean> - - <!-- The core configuration --> - <bean name="Configuration" class="org.hornetq.core.config.impl.FileConfiguration"> - </bean> - - <!-- The security manager --> - <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl"> - <start ignored="true"/> - <stop ignored="true"/> - </bean> - - <!-- The core server --> - <bean name="HornetQServer" class="org.hornetq.core.server.impl.HornetQServerImpl"> - <constructor> - <parameter> - <inject bean="Configuration"/> - </parameter> - <parameter> - <inject bean="MBeanServer"/> - </parameter> - <parameter> - <inject bean="HornetQSecurityManager"/> - </parameter> - </constructor> - <start ignored="true"/> - <stop ignored="true"/> - </bean> - - <!-- The JMS server --> - <bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl"> - <constructor> - <parameter> - <inject bean="HornetQServer"/> - </parameter> - </constructor> - </bean> - -</deployment> \ No newline at end of file Deleted: trunk/tests/jms-tests/config/hornetq-configuration.xml =================================================================== --- trunk/tests/jms-tests/config/hornetq-configuration.xml 2011-05-12 13:43:37 UTC (rev 10645) +++ trunk/tests/jms-tests/config/hornetq-configuration.xml 2011-05-12 15:52:05 UTC (rev 10646) @@ -1,37 +0,0 @@ -<configuration xmlns="urn:hornetq" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:hornetq ../../../src/schema/hornetq-configuration.xsd"> - - <!-- Connectors --> - <connectors> - - <connector name="netty"> - <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> - </connector> - - - <connector name="in-vm"> - <factory-class>org.hornetq.core.remoting.impl.invm.InVMConnectorFactory</factory-class> - </connector> - - </connectors> - - <!-- Acceptors --> - <acceptors> - <!-- In VM acceptor --> - <acceptor name="in-vm"> - <factory-class>org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory</factory-class> - <param key="server-id" value="0"/> - </acceptor> - - <!-- Netty TCP Acceptor --> - <acceptor name="netty"> - <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> - </acceptor> - - </acceptors> - - - <journal-min-files>2</journal-min-files> - -</configuration> \ No newline at end of file Deleted: trunk/tests/jms-tests/config/hornetq-jms.xml =================================================================== --- trunk/tests/jms-tests/config/hornetq-jms.xml 2011-05-12 13:43:37 UTC (rev 10645) +++ trunk/tests/jms-tests/config/hornetq-jms.xml 2011-05-12 15:52:05 UTC (rev 10646) @@ -1,126 +0,0 @@ -<configuration xmlns="urn:hornetq" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd"> - - <connection-factory name="ConnectionFactory"> - <connectors> - <connector-ref connector-name="netty"/> - </connectors> - <entries> - <entry name="ConnectionFactory"/> - <entry name="/ConnectionFactory"/> - <entry name="/XAConnectionFactory"/> - <entry name="java:/ConnectionFactory"/> - <entry name="java:/XAConnectionFactory"/> - </entries> - </connection-factory> - - <connection-factory name="JMSConnectionFactory1"> - <xa>true</xa> - <connectors> - <connector-ref connector-name="netty"/> - </connectors> - <entries> - <entry name="/CF_XA_TRUE"/> - </entries> - </connection-factory> - - <connection-factory name="JMSConnectionFactory2"> - <xa>false</xa> - <connectors> - <connector-ref connector-name="netty"/> - </connectors> - <entries> - <entry name="/CF_XA_FALSE"/> - </entries> - </connection-factory> - - <connection-factory name="JMSConnectionFactory3" signature="generic"> - <connectors> - <connector-ref connector-name="netty"/> - </connectors> - <entries> - <entry name="/CF_GENERIC"/> - </entries> - </connection-factory> - - <connection-factory name="JMSConnectionFactory4" signature="generic"> - <xa>true</xa> - <connectors> - <connector-ref connector-name="netty"/> - </connectors> - <entries> - <entry name="/CF_GENERIC_XA_TRUE"/> - </entries> - </connection-factory> - - <connection-factory name="JMSConnectionFactory5" signature="generic"> - <xa>false</xa> - <connectors> - <connector-ref connector-name="netty"/> - </connectors> - <entries> - <entry name="/CF_GENERIC_XA_FALSE"/> - </entries> - </connection-factory> - - <connection-factory name="JMSConnectionFactory6" signature="queue"> - <connectors> - <connector-ref connector-name="netty"/> - </connectors> - <entries> - <entry name="/CF_QUEUE"/> - </entries> - </connection-factory> - - <connection-factory name="JMSConnectionFactory7" signature="queue"> - <xa>true</xa> - <connectors> - <connector-ref connector-name="netty"/> - </connectors> - <entries> - <entry name="/CF_QUEUE_XA_TRUE"/> - </entries> - </connection-factory> - - <connection-factory name="JMSConnectionFactory8" signature="queue"> - <xa>false</xa> - <connectors> - <connector-ref connector-name="netty"/> - </connectors> - <entries> - <entry name="/CF_QUEUE_XA_FALSE"/> - </entries> - </connection-factory> - - <connection-factory name="JMSConnectionFactory9" signature="topic"> - <connectors> - <connector-ref connector-name="netty"/> - </connectors> - <entries> - <entry name="/CF_TOPIC"/> - </entries> - </connection-factory> - - <connection-factory name="JMSConnectionFactory10" signature="topic"> - <xa>true</xa> - <connectors> - <connector-ref connector-name="netty"/> - </connectors> - <entries> - <entry name="/CF_TOPIC_XA_TRUE"/> - </entries> - </connection-factory> - - <connection-factory name="JMSConnectionFactory11" signature="topic"> - <xa>false</xa> - <connectors> - <connector-ref connector-name="netty"/> - </connectors> - <entries> - <entry name="/CF_TOPIC_XA_FALSE"/> - </entries> - </connection-factory> - -</configuration> - Deleted: trunk/tests/jms-tests/config/hornetq-queues.xml =================================================================== --- trunk/tests/jms-tests/config/hornetq-queues.xml 2011-05-12 13:43:37 UTC (rev 10645) +++ trunk/tests/jms-tests/config/hornetq-queues.xml 2011-05-12 15:52:05 UTC (rev 10646) @@ -1,16 +0,0 @@ -<configuration xmlns="urn:hornetq" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:hornetq ../../../src/schemas/hornetq-configuration.xsd "> - - <security-settings> - <security-setting match="#"> - <permission type="createDurableQueue" roles="guest,def"/> - <permission type="deleteDurableQueue" roles="guest,def"/> - <permission type="createNonDurableQueue" roles="guest,def"/> - <permission type="deleteNonDurableQueue" roles="guest,def"/> - <permission type="consume" roles="guest,def"/> - <permission type="send" roles="guest,def"/> - </security-setting> - </security-settings> - -</configuration> Deleted: trunk/tests/jms-tests/config/hornetq-users.xml =================================================================== --- trunk/tests/jms-tests/config/hornetq-users.xml 2011-05-12 13:43:37 UTC (rev 10645) +++ trunk/tests/jms-tests/config/hornetq-users.xml 2011-05-12 15:52:05 UTC (rev 10646) @@ -1,10 +0,0 @@ -<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:hornetq /schema/hornetq-users.xsd"> - <!-- the default user. this is used where username is null--> - <defaultuser name="guest" password="guest"> - <role name="guest"/> - </defaultuser> - <!--<user name="admin" password="admin"> - <role name="admin"/> - </user>--> -</configuration> \ No newline at end of file Deleted: trunk/tests/jms-tests/config/jbossjta-properties.xml =================================================================== --- trunk/tests/jms-tests/config/jbossjta-properties.xml 2011-05-12 13:43:37 UTC (rev 10645) +++ trunk/tests/jms-tests/config/jbossjta-properties.xml 2011-05-12 15:52:05 UTC (rev 10646) @@ -1,233 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<transaction-service> - <properties depends="common" name="arjuna"> - <!-- - Transaction Reaper Timeout (default is 120000 microseconds). - --> - <property - name="com.arjuna.ats.arjuna.coordinator.txReaperTimeout" value="120000"/> - <!-- - Transaction Reaper Mode, can be: NORMAL or DYNAMIC (default is NORMAL). - --> - <property name="com.arjuna.ats.arjuna.coordinator.txReaperMode" value="NORMAL"/> - <!-- - (default is NO) - --> - <property name="com.arjuna.ats.arjuna.coordinator.asyncCommit" value="NO"/> - <!-- - (default is NO) - --> - <property name="com.arjuna.ats.arjuna.coordinator.asyncPrepare" value="NO"/> - <!-- - (default is YES) - --> - <property - name="com.arjuna.ats.arjuna.coordinator.commitOnePhase" value="YES"/> - <!-- - (default is defaultStore) - --> - <property name="com.arjuna.ats.arjuna.objectstore.localOSRoot" value="defaultStore"/> - <!-- - default is under user.home - must be writeable!) - --> - <property - name="com.arjuna.ats.arjuna.objectstore.objectStoreDir" value="ObjectStore"/> - <!-- - (default is ON) - --> - <property - name="com.arjuna.ats.arjuna.objectstore.objectStoreSync" value="ON"/> - <!-- - (default is ShadowNoFileLockStore) - --> - <property - name="com.arjuna.ats.arjuna.objectstore.objectStoreType" value="ShadowNoFileLockStore"/> - <!-- - (default is 255) - --> - <property - name="com.arjuna.ats.arjuna.objectstore.hashedDirectories" value="255"/> - <!-- - (default is ON) - --> - <property - name="com.arjuna.ats.arjuna.objectstore.transactionSync" value="ON"/> - <!-- - (Must be unique across all Arjuna instances.) - --> - <!-- property - name="com.arjuna.ats.arjuna.coordinator.actionStore" - value="HashedActionStore" - value="JDBCActionStore" - --> - <!-- property - name="com.arjuna.ats.arjuna.objectstore.jdbcTxDbAccess" - value="JDBCAccess" - --> - <!-- property - name="com.arjuna.ats.arjuna.objectstore.objectStoreType" - value="ShadowNoFileLockStore" - value="JDBCStore" - --> - <!-- property - name="com.arjuna.ats.arjuna.objectstore.jdbcUserDbAccess" - value="JDBCAccess" - --> - <!-- property - name="com.arjuna.ats.arjuna.objectstore.jdbcPoolSizeInitial" - value="1" - --> - <!-- property - name="com.arjuna.ats.arjuna.objectstore.jdbcPoolSizeMaximum" - value="1" - --> - <!-- property - name="com.arjuna.ats.arjuna.objectstore.jdbcPoolPutConnections" - value="false" - --> - <!-- property - name="com.arjuna.ats.arjuna.internal.arjuna.objectstore.cacheStore.size" - value="" - --> - <!-- property - name="com.arjuna.ats.arjuna.internal.arjuna.objectstore.cacheStore.period" - value="" - --> - <!-- - The location for creating temporary files, e.g., Uids. - Default is under user.home. - IMPORTANT: make sure the directory is lockable, e.g., /tmp on Unix - may not be! - --> - <!-- - <property - name="com.arjuna.ats.arjuna.common.varDir" - value="var"/> - --> - </properties> - <properties name="common"> - <!-- CLF 2.0 properties --> - <property name="com.arjuna.common.util.logging.DebugLevel" - type="System" value="0x00000000"/> - <property name="com.arjuna.common.util.logging.FacilityLevel" - type="System" value="0xffffffff"/> - <property name="com.arjuna.common.util.logging.VisibilityLevel" - type="System" value="0xffffffff"/> - <property name="com.arjuna.common.util.logger" type="System" value="log4j"/> - </properties> - <properties depends="arjuna" name="txoj"> - <!-- - (default is LockStore of installation - must be writeable!) - --> - <!-- - <property - name="com.arjuna.ats.txoj.lockstore.lockStoreDir" - value="LockStore"/> - --> - <!-- - (default is BasicLockStore) - --> - <property name="com.arjuna.ats.txoj.lockstore.lockStoreType" value="BasicLockStore"/> - <!-- - (default is NO) - --> - <property name="com.arjuna.ats.txoj.lockstore.multipleLockStore" value="NO"/> - <!-- - (default is YES) - --> - <property name="com.arjuna.ats.txoj.lockstore.singleLockStore" value="YES"/> - <!-- - (default is YES) - --> - <property - name="com.arjuna.ats.txoj.lockstore.allowNestedLocking" value="YES"/> - </properties> - <properties depends="arjuna" name="jta"> - <!-- - Support subtransactions in the JTA layer? - Default is NO. - --> - <property name="com.arjuna.ats.jta.supportSubtransactions" value="NO"/> - <property name="com.arjuna.ats.jta.jtaTMImplementation" value="com.arjuna.ats.internal.jta.transaction.arjunacore.TransactionManagerImple"/> - <!-- - com.arjuna.ats.internal.jta.transaction.jts.TransactionManagerImple - --> - <property name="com.arjuna.ats.jta.jtaUTImplementation" value="com.arjuna.ats.internal.jta.transaction.arjunacore.UserTransactionImple"/> - <!-- - com.arjuna.ats.internal.jta.transaction.jts.UserTransactionImple - --> -<property name="com.arjuna.ats.jta.recovery.XAResourceRecovery.HORNETQ" value="org.hornetq.api.jms.server.recovery.HornetQXAResourceRecovery;adaptor1"/> - - - - </properties> - <properties depends="arjuna,txoj,jta" name="recoverymanager"> - <!-- - Properties used only by the RecoveryManager. - --> - <!-- - Periodic recovery settings. - Time values in this section are in seconds. - --> - <!-- - Interval in seconds between initiating the periodic recovery modules. - Default is 120 seconds. - --> - <property - name="com.arjuna.ats.arjuna.recovery.periodicRecoveryPeriod" value="20"/> - <!-- - Interval in seconds between first and second pass of periodic recovery. - Default is 10 seconds. - --> - <property - name="com.arjuna.ats.arjuna.recovery.recoveryBackoffPeriod" value="10"/> - <!-- - Periodic recovery modules to use. Invoked in sort-order of names. - --> - - <property name="com.arjuna.ats.arjuna.recovery.recoveryExtension0" value="com.arjuna.ats.internal.jta.recovery.arjunacore.XARecoveryModule"/> - - <property name="com.arjuna.ats.arjuna.recovery.recoveryExtension1" value="com.arjuna.ats.internal.arjuna.recovery.AtomicActionRecoveryModule"/> - - <property name="com.arjuna.ats.arjuna.recovery.recoveryExtension2" value="com.arjuna.ats.internal.txoj.recovery.TORecoveryModule"/> - - - <!-- - Expired entry removal - --> - <!-- - Expiry scanners to use (order of invocation is random). - Names must begin with "com.arjuna.ats.arjuna.recovery.expiryScanner" - --> - <property - name="com.arjuna.ats.arjuna.recovery.expiryScannerTransactionStatusManager" value="com.arjuna.ats.internal.arjuna.recovery.ExpiredTransactionStatusManagerScanner"/> - <!-- - Interval, in hours, between running the expiry scanners. - This can be quite long. The absolute value determines the interval - - if the value is negative, the scan will NOT be run until after one - interval has elapsed. If positive the first scan will be immediately - after startup. Zero will prevent any scanning. - Default = 12 = run immediately, then every 12 hours. - --> - <property - name="com.arjuna.ats.arjuna.recovery.expiryScanInterval" value="12"/> - <!-- - Age, in hours, for removal of transaction status manager item. - This should be longer than any ts-using process will remain running. - Zero = Never removed. Default is 12. - --> - <property - name="com.arjuna.ats.arjuna.recovery.transactionStatusManagerExpiryTime" value="12"/> - <!-- - Use this to fix the port on which the TransactionStatusManager listens, - The default behaviour is to use any free port. - --> - <property - name="com.arjuna.ats.arjuna.recovery.transactionStatusManagerPort" value="0"/> - </properties> - <properties depends="jta" name="jdbc"> - <!-- - property name="com.arjuna.ats.jdbc.isolationLevel" value="TRANSACTION_SERIALIZABLE"/> - --> - </properties> -</transaction-service> Deleted: trunk/tests/jms-tests/config/jndi.properties =================================================================== --- trunk/tests/jms-tests/config/jndi.properties 2011-05-12 13:43:37 UTC (rev 10645) +++ trunk/tests/jms-tests/config/jndi.properties 2011-05-12 15:52:05 UTC (rev 10646) @@ -1,2 +0,0 @@ -java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory -java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces \ No newline at end of file Deleted: trunk/tests/jms-tests/config/test-beans.xml =================================================================== --- trunk/tests/jms-tests/config/test-beans.xml 2011-05-12 13:43:37 UTC (rev 10645) +++ trunk/tests/jms-tests/config/test-beans.xml 2011-05-12 15:52:05 UTC (rev 10646) @@ -1,60 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<deployment xmlns="urn:jboss:bean-deployer:2.0"> - - <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/> - - <!-- JNDI server. Disable this if you don't want JNDI --> - <bean name="JNDIServer" class="org.hornetq.jms.tests.tools.WrappedJNDIServer"> - <property name="namingInfo"> - <inject bean="Naming"/> - </property> - <property name="port">1099</property> - <property name="bindAddress">localhost</property> - <property name="rmiPort">1098</property> - <property name="rmiBindAddress">localhost</property> - </bean> - - <!-- MBean server --> - <bean name="MBeanServer" class="javax.management.MBeanServer"> - <constructor factoryClass="java.lang.management.ManagementFactory" - factoryMethod="getPlatformMBeanServer"/> - </bean> - - <!-- The core configuration --> - <bean name="Configuration" class="org.hornetq.core.config.impl.FileConfiguration"> - </bean> - - <!-- The security manager --> - <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl"> - <start ignored="true"/> - <stop ignored="true"/> - </bean> - - <!-- The core server --> - <bean name="HornetQServer" class="org.hornetq.core.server.impl.HornetQServerImpl"> - <constructor> - <parameter> - <inject bean="Configuration"/> - </parameter> - <parameter> - <inject bean="MBeanServer"/> - </parameter> - <parameter> - <inject bean="HornetQSecurityManager"/> - </parameter> - </constructor> - <start ignored="true"/> - <stop ignored="true"/> - </bean> - - <!-- The JMS server --> - <bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl"> - <constructor> - <parameter> - <inject bean="HornetQServer"/> - </parameter> - </constructor> - </bean> - -</deployment> \ No newline at end of file Modified: trunk/tests/jms-tests/pom.xml =================================================================== --- trunk/tests/jms-tests/pom.xml 2011-05-12 13:43:37 UTC (rev 10645) +++ trunk/tests/jms-tests/pom.xml 2011-05-12 15:52:05 UTC (rev 10646) @@ -7,7 +7,6 @@ <version>2.2.3-SNAPSHOT</version> </parent> - <groupId>org.hornetq.tests</groupId> <artifactId>jms-tests</artifactId> <packaging>jar</packaging> <name>HornetQ JMS Tests</name> @@ -86,20 +85,12 @@ </dependencies> <build> - <testResources> - <testResource> - <directory>config</directory> - </testResource> - </testResources> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <configuration> <skipTests>${skipJmsTests}</skipTests> - <includes> - <include>**/*Test.java</include> - </includes> <excludes> <exclude>org/hornetq/jms/tests/JMSTestCase.java</exclude> <exclude>org/hornetq/jms/tests/HornetqServerTestCase.java</exclude> @@ -112,14 +103,6 @@ </excludes> </configuration> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.6</source> - <target>1.6</target> - </configuration> - </plugin> </plugins> </build> Copied: trunk/tests/jms-tests/src/test/resources/hornetq-beans.xml (from rev 10645, trunk/tests/jms-tests/config/hornetq-beans.xml) =================================================================== --- trunk/tests/jms-tests/src/test/resources/hornetq-beans.xml (rev 0) +++ trunk/tests/jms-tests/src/test/resources/hornetq-beans.xml 2011-05-12 15:52:05 UTC (rev 10646) @@ -0,0 +1,60 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<deployment xmlns="urn:jboss:bean-deployer:2.0"> + + <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/> + + <!-- JNDI server. Disable this if you don't want JNDI --> + <bean name="JNDIServer" class="org.jnp.server.Main"> + <property name="namingInfo"> + <inject bean="Naming"/> + </property> + <property name="port">1099</property> + <property name="bindAddress">localhost</property> + <property name="rmiPort">1098</property> + <property name="rmiBindAddress">localhost</property> + </bean> + + <!-- MBean server --> + <bean name="MBeanServer" class="javax.management.MBeanServer"> + <constructor factoryClass="java.lang.management.ManagementFactory" + factoryMethod="getPlatformMBeanServer"/> + </bean> + + <!-- The core configuration --> + <bean name="Configuration" class="org.hornetq.core.config.impl.FileConfiguration"> + </bean> + + <!-- The security manager --> + <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl"> + <start ignored="true"/> + <stop ignored="true"/> + </bean> + + <!-- The core server --> + <bean name="HornetQServer" class="org.hornetq.core.server.impl.HornetQServerImpl"> + <constructor> + <parameter> + <inject bean="Configuration"/> + </parameter> + <parameter> + <inject bean="MBeanServer"/> + </parameter> + <parameter> + <inject bean="HornetQSecurityManager"/> + </parameter> + </constructor> + <start ignored="true"/> + <stop ignored="true"/> + </bean> + + <!-- The JMS server --> + <bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl"> + <constructor> + <parameter> + <inject bean="HornetQServer"/> + </parameter> + </constructor> + </bean> + +</deployment> \ No newline at end of file Copied: trunk/tests/jms-tests/src/test/resources/hornetq-configuration.xml (from rev 10645, trunk/tests/jms-tests/config/hornetq-configuration.xml) =================================================================== --- trunk/tests/jms-tests/src/test/resources/hornetq-configuration.xml (rev 0) +++ trunk/tests/jms-tests/src/test/resources/hornetq-configuration.xml 2011-05-12 15:52:05 UTC (rev 10646) @@ -0,0 +1,37 @@ +<configuration xmlns="urn:hornetq" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="urn:hornetq ../../../src/schema/hornetq-configuration.xsd"> + + <!-- Connectors --> + <connectors> + + <connector name="netty"> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> + </connector> + + + <connector name="in-vm"> + <factory-class>org.hornetq.core.remoting.impl.invm.InVMConnectorFactory</factory-class> + </connector> + + </connectors> + + <!-- Acceptors --> + <acceptors> + <!-- In VM acceptor --> + <acceptor name="in-vm"> + <factory-class>org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory</factory-class> + <param key="server-id" value="0"/> + </acceptor> + + <!-- Netty TCP Acceptor --> + <acceptor name="netty"> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> + </acceptor> + + </acceptors> + + + <journal-min-files>2</journal-min-files> + +</configuration> \ No newline at end of file Copied: trunk/tests/jms-tests/src/test/resources/hornetq-jms.xml (from rev 10645, trunk/tests/jms-tests/config/hornetq-jms.xml) =================================================================== --- trunk/tests/jms-tests/src/test/resources/hornetq-jms.xml (rev 0) +++ trunk/tests/jms-tests/src/test/resources/hornetq-jms.xml 2011-05-12 15:52:05 UTC (rev 10646) @@ -0,0 +1,126 @@ +<configuration xmlns="urn:hornetq" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd"> + + <connection-factory name="ConnectionFactory"> + <connectors> + <connector-ref connector-name="netty"/> + </connectors> + <entries> + <entry name="ConnectionFactory"/> + <entry name="/ConnectionFactory"/> + <entry name="/XAConnectionFactory"/> + <entry name="java:/ConnectionFactory"/> + <entry name="java:/XAConnectionFactory"/> + </entries> + </connection-factory> + + <connection-factory name="JMSConnectionFactory1"> + <xa>true</xa> + <connectors> + <connector-ref connector-name="netty"/> + </connectors> + <entries> + <entry name="/CF_XA_TRUE"/> + </entries> + </connection-factory> + + <connection-factory name="JMSConnectionFactory2"> + <xa>false</xa> + <connectors> + <connector-ref connector-name="netty"/> + </connectors> + <entries> + <entry name="/CF_XA_FALSE"/> + </entries> + </connection-factory> + + <connection-factory name="JMSConnectionFactory3" signature="generic"> + <connectors> + <connector-ref connector-name="netty"/> + </connectors> + <entries> + <entry name="/CF_GENERIC"/> + </entries> + </connection-factory> + + <connection-factory name="JMSConnectionFactory4" signature="generic"> + <xa>true</xa> + <connectors> + <connector-ref connector-name="netty"/> + </connectors> + <entries> + <entry name="/CF_GENERIC_XA_TRUE"/> + </entries> + </connection-factory> + + <connection-factory name="JMSConnectionFactory5" signature="generic"> + <xa>false</xa> + <connectors> + <connector-ref connector-name="netty"/> + </connectors> + <entries> + <entry name="/CF_GENERIC_XA_FALSE"/> + </entries> + </connection-factory> + + <connection-factory name="JMSConnectionFactory6" signature="queue"> + <connectors> + <connector-ref connector-name="netty"/> + </connectors> + <entries> + <entry name="/CF_QUEUE"/> + </entries> + </connection-factory> + + <connection-factory name="JMSConnectionFactory7" signature="queue"> + <xa>true</xa> + <connectors> + <connector-ref connector-name="netty"/> + </connectors> + <entries> + <entry name="/CF_QUEUE_XA_TRUE"/> + </entries> + </connection-factory> + + <connection-factory name="JMSConnectionFactory8" signature="queue"> + <xa>false</xa> + <connectors> + <connector-ref connector-name="netty"/> + </connectors> + <entries> + <entry name="/CF_QUEUE_XA_FALSE"/> + </entries> + </connection-factory> + + <connection-factory name="JMSConnectionFactory9" signature="topic"> + <connectors> + <connector-ref connector-name="netty"/> + </connectors> + <entries> + <entry name="/CF_TOPIC"/> + </entries> + </connection-factory> + + <connection-factory name="JMSConnectionFactory10" signature="topic"> + <xa>true</xa> + <connectors> + <connector-ref connector-name="netty"/> + </connectors> + <entries> + <entry name="/CF_TOPIC_XA_TRUE"/> + </entries> + </connection-factory> + + <connection-factory name="JMSConnectionFactory11" signature="topic"> + <xa>false</xa> + <connectors> + <connector-ref connector-name="netty"/> + </connectors> + <entries> + <entry name="/CF_TOPIC_XA_FALSE"/> + </entries> + </connection-factory> + +</configuration> + Copied: trunk/tests/jms-tests/src/test/resources/hornetq-queues.xml (from rev 10645, trunk/tests/jms-tests/config/hornetq-queues.xml) =================================================================== --- trunk/tests/jms-tests/src/test/resources/hornetq-queues.xml (rev 0) +++ trunk/tests/jms-tests/src/test/resources/hornetq-queues.xml 2011-05-12 15:52:05 UTC (rev 10646) @@ -0,0 +1,16 @@ +<configuration xmlns="urn:hornetq" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="urn:hornetq ../../../src/schemas/hornetq-configuration.xsd "> + + <security-settings> + <security-setting match="#"> + <permission type="createDurableQueue" roles="guest,def"/> + <permission type="deleteDurableQueue" roles="guest,def"/> + <permission type="createNonDurableQueue" roles="guest,def"/> + <permission type="deleteNonDurableQueue" roles="guest,def"/> + <permission type="consume" roles="guest,def"/> + <permission type="send" roles="guest,def"/> + </security-setting> + </security-settings> + +</configuration> Copied: trunk/tests/jms-tests/src/test/resources/hornetq-users.xml (from rev 10645, trunk/tests/jms-tests/config/hornetq-users.xml) =================================================================== --- trunk/tests/jms-tests/src/test/resources/hornetq-users.xml (rev 0) +++ trunk/tests/jms-tests/src/test/resources/hornetq-users.xml 2011-05-12 15:52:05 UTC (rev 10646) @@ -0,0 +1,10 @@ +<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="urn:hornetq /schema/hornetq-users.xsd"> + <!-- the default user. this is used where username is null--> + <defaultuser name="guest" password="guest"> + <role name="guest"/> + </defaultuser> + <!--<user name="admin" password="admin"> + <role name="admin"/> + </user>--> +</configuration> \ No newline at end of file Copied: trunk/tests/jms-tests/src/test/resources/jbossjta-properties.xml (from rev 10645, trunk/tests/jms-tests/config/jbossjta-properties.xml) =================================================================== --- trunk/tests/jms-tests/src/test/resources/jbossjta-properties.xml (rev 0) +++ trunk/tests/jms-tests/src/test/resources/jbossjta-properties.xml 2011-05-12 15:52:05 UTC (rev 10646) @@ -0,0 +1,233 @@ +<?xml version="1.0" encoding="UTF-8"?> +<transaction-service> + <properties depends="common" name="arjuna"> + <!-- + Transaction Reaper Timeout (default is 120000 microseconds). + --> + <property + name="com.arjuna.ats.arjuna.coordinator.txReaperTimeout" value="120000"/> + <!-- + Transaction Reaper Mode, can be: NORMAL or DYNAMIC (default is NORMAL). + --> + <property name="com.arjuna.ats.arjuna.coordinator.txReaperMode" value="NORMAL"/> + <!-- + (default is NO) + --> + <property name="com.arjuna.ats.arjuna.coordinator.asyncCommit" value="NO"/> + <!-- + (default is NO) + --> + <property name="com.arjuna.ats.arjuna.coordinator.asyncPrepare" value="NO"/> + <!-- + (default is YES) + --> + <property + name="com.arjuna.ats.arjuna.coordinator.commitOnePhase" value="YES"/> + <!-- + (default is defaultStore) + --> + <property name="com.arjuna.ats.arjuna.objectstore.localOSRoot" value="defaultStore"/> + <!-- + default is under user.home - must be writeable!) + --> + <property + name="com.arjuna.ats.arjuna.objectstore.objectStoreDir" value="ObjectStore"/> + <!-- + (default is ON) + --> + <property + name="com.arjuna.ats.arjuna.objectstore.objectStoreSync" value="ON"/> + <!-- + (default is ShadowNoFileLockStore) + --> + <property + name="com.arjuna.ats.arjuna.objectstore.objectStoreType" value="ShadowNoFileLockStore"/> + <!-- + (default is 255) + --> + <property + name="com.arjuna.ats.arjuna.objectstore.hashedDirectories" value="255"/> + <!-- + (default is ON) + --> + <property + name="com.arjuna.ats.arjuna.objectstore.transactionSync" value="ON"/> + <!-- + (Must be unique across all Arjuna instances.) + --> + <!-- property + name="com.arjuna.ats.arjuna.coordinator.actionStore" + value="HashedActionStore" + value="JDBCActionStore" + --> + <!-- property + name="com.arjuna.ats.arjuna.objectstore.jdbcTxDbAccess" + value="JDBCAccess" + --> + <!-- property + name="com.arjuna.ats.arjuna.objectstore.objectStoreType" + value="ShadowNoFileLockStore" + value="JDBCStore" + --> + <!-- property + name="com.arjuna.ats.arjuna.objectstore.jdbcUserDbAccess" + value="JDBCAccess" + --> + <!-- property + name="com.arjuna.ats.arjuna.objectstore.jdbcPoolSizeInitial" + value="1" + --> + <!-- property + name="com.arjuna.ats.arjuna.objectstore.jdbcPoolSizeMaximum" + value="1" + --> + <!-- property + name="com.arjuna.ats.arjuna.objectstore.jdbcPoolPutConnections" + value="false" + --> + <!-- property + name="com.arjuna.ats.arjuna.internal.arjuna.objectstore.cacheStore.size" + value="" + --> + <!-- property + name="com.arjuna.ats.arjuna.internal.arjuna.objectstore.cacheStore.period" + value="" + --> + <!-- + The location for creating temporary files, e.g., Uids. + Default is under user.home. + IMPORTANT: make sure the directory is lockable, e.g., /tmp on Unix + may not be! + --> + <!-- + <property + name="com.arjuna.ats.arjuna.common.varDir" + value="var"/> + --> + </properties> + <properties name="common"> + <!-- CLF 2.0 properties --> + <property name="com.arjuna.common.util.logging.DebugLevel" + type="System" value="0x00000000"/> + <property name="com.arjuna.common.util.logging.FacilityLevel" + type="System" value="0xffffffff"/> + <property name="com.arjuna.common.util.logging.VisibilityLevel" + type="System" value="0xffffffff"/> + <property name="com.arjuna.common.util.logger" type="System" value="log4j"/> + </properties> + <properties depends="arjuna" name="txoj"> + <!-- + (default is LockStore of installation - must be writeable!) + --> + <!-- + <property + name="com.arjuna.ats.txoj.lockstore.lockStoreDir" + value="LockStore"/> + --> + <!-- + (default is BasicLockStore) + --> + <property name="com.arjuna.ats.txoj.lockstore.lockStoreType" value="BasicLockStore"/> + <!-- + (default is NO) + --> + <property name="com.arjuna.ats.txoj.lockstore.multipleLockStore" value="NO"/> + <!-- + (default is YES) + --> + <property name="com.arjuna.ats.txoj.lockstore.singleLockStore" value="YES"/> + <!-- + (default is YES) + --> + <property + name="com.arjuna.ats.txoj.lockstore.allowNestedLocking" value="YES"/> + </properties> + <properties depends="arjuna" name="jta"> + <!-- + Support subtransactions in the JTA layer? + Default is NO. + --> + <property name="com.arjuna.ats.jta.supportSubtransactions" value="NO"/> + <property name="com.arjuna.ats.jta.jtaTMImplementation" value="com.arjuna.ats.internal.jta.transaction.arjunacore.TransactionManagerImple"/> + <!-- + com.arjuna.ats.internal.jta.transaction.jts.TransactionManagerImple + --> + <property name="com.arjuna.ats.jta.jtaUTImplementation" value="com.arjuna.ats.internal.jta.transaction.arjunacore.UserTransactionImple"/> + <!-- + com.arjuna.ats.internal.jta.transaction.jts.UserTransactionImple + --> +<property name="com.arjuna.ats.jta.recovery.XAResourceRecovery.HORNETQ" value="org.hornetq.api.jms.server.recovery.HornetQXAResourceRecovery;adaptor1"/> + + + + </properties> + <properties depends="arjuna,txoj,jta" name="recoverymanager"> + <!-- + Properties used only by the RecoveryManager. + --> + <!-- + Periodic recovery settings. + Time values in this section are in seconds. + --> + <!-- + Interval in seconds between initiating the periodic recovery modules. + Default is 120 seconds. + --> + <property + name="com.arjuna.ats.arjuna.recovery.periodicRecoveryPeriod" value="20"/> + <!-- + Interval in seconds between first and second pass of periodic recovery. + Default is 10 seconds. + --> + <property + name="com.arjuna.ats.arjuna.recovery.recoveryBackoffPeriod" value="10"/> + <!-- + Periodic recovery modules to use. Invoked in sort-order of names. + --> + + <property name="com.arjuna.ats.arjuna.recovery.recoveryExtension0" value="com.arjuna.ats.internal.jta.recovery.arjunacore.XARecoveryModule"/> + + <property name="com.arjuna.ats.arjuna.recovery.recoveryExtension1" value="com.arjuna.ats.internal.arjuna.recovery.AtomicActionRecoveryModule"/> + + <property name="com.arjuna.ats.arjuna.recovery.recoveryExtension2" value="com.arjuna.ats.internal.txoj.recovery.TORecoveryModule"/> + + + <!-- + Expired entry removal + --> + <!-- + Expiry scanners to use (order of invocation is random). + Names must begin with "com.arjuna.ats.arjuna.recovery.expiryScanner" + --> + <property + name="com.arjuna.ats.arjuna.recovery.expiryScannerTransactionStatusManager" value="com.arjuna.ats.internal.arjuna.recovery.ExpiredTransactionStatusManagerScanner"/> + <!-- + Interval, in hours, between running the expiry scanners. + This can be quite long. The absolute value determines the interval - + if the value is negative, the scan will NOT be run until after one + interval has elapsed. If positive the first scan will be immediately + after startup. Zero will prevent any scanning. + Default = 12 = run immediately, then every 12 hours. + --> + <property + name="com.arjuna.ats.arjuna.recovery.expiryScanInterval" value="12"/> + <!-- + Age, in hours, for removal of transaction status manager item. + This should be longer than any ts-using process will remain running. + Zero = Never removed. Default is 12. + --> + <property + name="com.arjuna.ats.arjuna.recovery.transactionStatusManagerExpiryTime" value="12"/> + <!-- + Use this to fix the port on which the TransactionStatusManager listens, + The default behaviour is to use any free port. + --> + <property + name="com.arjuna.ats.arjuna.recovery.transactionStatusManagerPort" value="0"/> + </properties> + <properties depends="jta" name="jdbc"> + <!-- + property name="com.arjuna.ats.jdbc.isolationLevel" value="TRANSACTION_SERIALIZABLE"/> + --> + </properties> +</transaction-service> Copied: trunk/tests/jms-tests/src/test/resources/jndi.properties (from rev 10645, trunk/tests/jms-tests/config/jndi.properties) =================================================================== --- trunk/tests/jms-tests/src/test/resources/jndi.properties (rev 0) +++ trunk/tests/jms-tests/src/test/resources/jndi.properties 2011-05-12 15:52:05 UTC (rev 10646) @@ -0,0 +1,2 @@ +java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory +java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces \ No newline at end of file Copied: trunk/tests/jms-tests/src/test/resources/test-beans.xml (from rev 10645, trunk/tests/jms-tests/config/test-beans.xml) =================================================================== --- trunk/tests/jms-tests/src/test/resources/test-beans.xml (rev 0) +++ trunk/tests/jms-tests/src/test/resources/test-beans.xml 2011-05-12 15:52:05 UTC (rev 10646) @@ -0,0 +1,60 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<deployment xmlns="urn:jboss:bean-deployer:2.0"> + + <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/> + + <!-- JNDI server. Disable this if you don't want JNDI --> + <bean name="JNDIServer" class="org.hornetq.jms.tests.tools.WrappedJNDIServer"> + <property name="namingInfo"> + <inject bean="Naming"/> + </property> + <property name="port">1099</property> + <property name="bindAddress">localhost</property> + <property name="rmiPort">1098</property> + <property name="rmiBindAddress">localhost</property> + </bean> + + <!-- MBean server --> + <bean name="MBeanServer" class="javax.management.MBeanServer"> + <constructor factoryClass="java.lang.management.ManagementFactory" + factoryMethod="getPlatformMBeanServer"/> + </bean> + + <!-- The core configuration --> + <bean name="Configuration" class="org.hornetq.core.config.impl.FileConfiguration"> + </bean> + + <!-- The security manager --> + <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl"> + <start ignored="true"/> + <stop ignored="true"/> + </bean> + + <!-- The core server --> + <bean name="HornetQServer" class="org.hornetq.core.server.impl.HornetQServerImpl"> + <constructor> + <parameter> + <inject bean="Configuration"/> + </parameter> + <parameter> + <inject bean="MBeanServer"/> + </parameter> + <parameter> + <inject bean="HornetQSecurityManager"/> + </parameter> + </constructor> + <start ignored="true"/> + <stop ignored="true"/> + </bean> + + <!-- The JMS server --> + <bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl"> + <constructor> + <parameter> + <inject bean="HornetQServer"/> + </parameter> + </constructor> + </bean> + +</deployment> \ No newline at end of file