[hornetq-commits] JBoss hornetq SVN: r10645 - in trunk/tests: unit-tests and 2 other directories.

Author: borges Date: 2011-05-12 09:43:37 -0400 (Thu, 12 May 2011) New Revision: 10645 Added: trunk/tests/unit-tests/src/test/resources/ trunk/tests/unit-tests/src/test/resources/ConfigurationTest-defaults.xml trunk/tests/unit-tests/src/test/resources/ConfigurationTest-full-config.xml trunk/tests/unit-tests/src/test/resources/beans1.xml trunk/tests/unit-tests/src/test/resources/hornetq.keystore trunk/tests/unit-tests/src/test/resources/hornetq.truststore Removed: trunk/tests/config/ConfigurationTest-defaults.xml trunk/tests/config/ConfigurationTest-full-config.xml trunk/tests/config/beans1.xml trunk/tests/config/hornetq.keystore trunk/tests/config/hornetq.truststore Modified: trunk/tests/unit-tests/pom.xml Log: Enable "unit-tests" group of tests, move resources to correct folder Deleted: trunk/tests/config/ConfigurationTest-defaults.xml =================================================================== --- trunk/tests/config/ConfigurationTest-defaults.xml 2011-05-12 13:11:41 UTC (rev 10644) +++ trunk/tests/config/ConfigurationTest-defaults.xml 2011-05-12 13:43:37 UTC (rev 10645) @@ -1,6 +0,0 @@ -<configuration - xmlns="urn:hornetq" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:hornetq ../../src/schemas/hornetq-configuration.xsd "> - <!-- just use the defaults --> -</configuration> Deleted: trunk/tests/config/ConfigurationTest-full-config.xml =================================================================== --- trunk/tests/config/ConfigurationTest-full-config.xml 2011-05-12 13:11:41 UTC (rev 10644) +++ trunk/tests/config/ConfigurationTest-full-config.xml 2011-05-12 13:43:37 UTC (rev 10645) @@ -1,219 +0,0 @@ -<configuration - xmlns="urn:hornetq" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:hornetq ../../src/config/common/schema/hornetq-configuration.xsd"> - <name>SomeNameForUseOnTheApplicationServer</name> - <clustered>true</clustered> - <scheduled-thread-pool-max-size>12345</scheduled-thread-pool-max-size> - <thread-pool-max-size>54321</thread-pool-max-size> - <persistence-enabled>false</persistence-enabled> - <file-deployment-enabled>true</file-deployment-enabled> - <security-enabled>false</security-enabled> - <security-invalidation-interval>5423</security-invalidation-interval> - <wild-card-routing-enabled>true</wild-card-routing-enabled> - <management-address>Giraffe</management-address> - <management-notification-address>Whatever</management-notification-address> - <cluster-user>Frog</cluster-user> - <cluster-password>Wombat</cluster-password> - <jmx-management-enabled>false</jmx-management-enabled> - <jmx-domain>gro.qtenroh</jmx-domain> - <log-delegate-factory-class-name>ocelot</log-delegate-factory-class-name> - <message-counter-enabled>true</message-counter-enabled> - <message-counter-max-day-history>5</message-counter-max-day-history> - <message-counter-sample-period>123456</message-counter-sample-period> - <connection-ttl-override>12345</connection-ttl-override> - <transaction-timeout>98765</transaction-timeout> - <transaction-timeout-scan-period>56789</transaction-timeout-scan-period> - <message-expiry-scan-period>10111213</message-expiry-scan-period> - <message-expiry-thread-priority>8</message-expiry-thread-priority> - <id-cache-size>127</id-cache-size> - <persist-id-cache>true</persist-id-cache> - <backup>true</backup> - <shared-store>true</shared-store> - <persist-delivery-count-before-delivery>true</persist-delivery-count-before-delivery> - <paging-directory>pagingdir</paging-directory> - <bindings-directory>somedir</bindings-directory> - <create-bindings-dir>false</create-bindings-dir> - <journal-directory>somedir2</journal-directory> - <create-journal-dir>false</create-journal-dir> - <journal-type>NIO</journal-type> - <journal-compact-min-files>123</journal-compact-min-files> - <journal-compact-percentage>33</journal-compact-percentage> - <journal-buffer-timeout>1000</journal-buffer-timeout> - <journal-buffer-size>10000</journal-buffer-size> - <journal-sync-transactional>false</journal-sync-transactional> - <journal-sync-non-transactional>true</journal-sync-non-transactional> - <journal-file-size>12345678</journal-file-size> - <journal-min-files>100</journal-min-files> - <journal-max-io>56546</journal-max-io> - <large-messages-directory>largemessagesdir</large-messages-directory> - <memory-warning-threshold>95</memory-warning-threshold> - <memory-measure-interval>54321</memory-measure-interval> - - <remoting-interceptors> - <class-name>org.hornetq.tests.unit.core.config.impl.TestInterceptor1</class-name> - <class-name>org.hornetq.tests.unit.core.config.impl.TestInterceptor2</class-name> - </remoting-interceptors> - - <connectors> - <connector name="connector1"> - <factory-class>org.hornetq.tests.unit.core.config.impl.TestConnectorFactory1</factory-class> - <param key="a1" value="v1"/> - <param key="a2" value="123"/> - <param key="a3" value="345"/> - <param key="a4" value="v4"/> - </connector> - <connector name="connector2"> - <factory-class>org.hornetq.tests.unit.core.config.impl.TestConnectorFactory2</factory-class> - <param key="b1" value="w1"/> - <param key="b2" value="234"/> - </connector> - </connectors> - <acceptors> - <acceptor name="acceptor1"> - <factory-class>org.hornetq.tests.unit.core.config.impl.TestAcceptorFactory1</factory-class> - <param key="d1" value="y1"/> - <param key="d2" value="456"/> - </acceptor> - <acceptor name="acceptor2"> - <factory-class>org.hornetq.tests.unit.core.config.impl.TestAcceptorFactory2</factory-class> - <param key="e1" value="z1"/> - <param key="e2" value="567"/> - </acceptor> - </acceptors> - <broadcast-groups> - <broadcast-group name="bg1"> - <local-bind-port>10999</local-bind-port> - <group-address>192.168.0.120</group-address> - <group-port>11999</group-port> - <broadcast-period>12345</broadcast-period> - <connector-ref>connector1</connector-ref> - </broadcast-group> - <broadcast-group name="bg2"> - <local-bind-port>12999</local-bind-port> - <group-address>192.168.0.121</group-address> - <group-port>13999</group-port> - <broadcast-period>23456</broadcast-period> - <connector-ref>connector2</connector-ref> - </broadcast-group> - </broadcast-groups> - <discovery-groups> - <discovery-group name="dg1"> - <local-bind-address>172.16.8.10</local-bind-address> - <group-address>192.168.0.120</group-address> - <group-port>11999</group-port> - <refresh-timeout>12345</refresh-timeout> - </discovery-group> - <discovery-group name="dg2"> - <local-bind-address>172.16.8.11</local-bind-address> - <group-address>192.168.0.121</group-address> - <group-port>12999</group-port> - <refresh-timeout>23456</refresh-timeout> - </discovery-group> - </discovery-groups> - <diverts> - <divert name="divert1"> - <routing-name>routing-name1</routing-name> - <address>address1</address> - <forwarding-address>forwarding-address1</forwarding-address> - <filter string="speed > 88"/> - <transformer-class-name>org.foo.Transformer</transformer-class-name> - <exclusive>true</exclusive> - </divert> - <divert name="divert2"> - <routing-name>routing-name2</routing-name> - <address>address2</address> - <forwarding-address>forwarding-address2</forwarding-address> - <filter string="speed &lt; 88"/> - <transformer-class-name>org.foo.Transformer2</transformer-class-name> - <exclusive>false</exclusive> - </divert> - </diverts> - <queues> - <queue name="queue1"> - <address>address1</address> - <filter string="color='red'" /> - <durable>false</durable> - </queue> - <queue name="queue2"> - <address>address2</address> - <filter string="color='blue'" /> - <durable>false</durable> - </queue> - </queues> - <bridges> - <bridge name="bridge1"> - <queue-name>queue1</queue-name> - <forwarding-address>bridge-forwarding-address1</forwarding-address> - <filter string="sku > 1"/> - <transformer-class-name>org.foo.BridgeTransformer</transformer-class-name> - <retry-interval>3</retry-interval> - <retry-interval-multiplier>0.2</retry-interval-multiplier> - <reconnect-attempts>2</reconnect-attempts> - <failover-on-server-shutdown>false</failover-on-server-shutdown> - <use-duplicate-detection>true</use-duplicate-detection> - <static-connectors> - <connector-ref>connector1</connector-ref> - </static-connectors> - </bridge> - <bridge name="bridge2"> - <queue-name>queue2</queue-name> - <forwarding-address>bridge-forwarding-address2</forwarding-address> - <discovery-group-ref discovery-group-name="dg1"/> - </bridge> - </bridges> - <cluster-connections> - <cluster-connection name="cluster-connection1"> - <address>queues1</address> - <connector-ref>connector1</connector-ref> - <retry-interval>3</retry-interval> - <use-duplicate-detection>true</use-duplicate-detection> - <forward-when-no-consumers>false</forward-when-no-consumers> - <max-hops>1</max-hops> - <static-connectors> - <connector-ref>connector1</connector-ref> - <connector-ref>connector2</connector-ref> - </static-connectors> - </cluster-connection> - <cluster-connection name="cluster-connection2"> - <address>queues2</address> - <connector-ref>connector2</connector-ref> - <retry-interval>4</retry-interval> - <use-duplicate-detection>false</use-duplicate-detection> - <forward-when-no-consumers>true</forward-when-no-consumers> - <max-hops>2</max-hops> - <discovery-group-ref discovery-group-name="dg1"/> - </cluster-connection> - </cluster-connections> - - <security-settings> - <security-setting match="a1"> - <permission type="createNonDurableQueue" roles="a1.1"/> - </security-setting> - <security-setting match="a2"> - <permission type="deleteNonDurableQueue" roles="a2.1"/> - </security-setting> - </security-settings> - - <address-settings> - <address-setting match="a1"> - <dead-letter-address>a1.1</dead-letter-address> - <expiry-address>a1.2</expiry-address> - <redelivery-delay>1</redelivery-delay> - <max-size-bytes>81781728121878</max-size-bytes> - <page-size-bytes>81738173872337</page-size-bytes> - <page-max-cache-size>10</page-max-cache-size> - <message-counter-history-day-limit>4</message-counter-history-day-limit> - </address-setting> - <address-setting match="a2"> - <dead-letter-address>a2.1</dead-letter-address> - <expiry-address>a2.2</expiry-address> - <redelivery-delay>5</redelivery-delay> - <max-size-bytes>932489234928324</max-size-bytes> - <page-size-bytes>7126716262626</page-size-bytes> - <page-max-cache-size>20</page-max-cache-size> - <message-counter-history-day-limit>8</message-counter-history-day-limit> - </address-setting> - </address-settings> - -</configuration> Deleted: trunk/tests/config/beans1.xml =================================================================== --- trunk/tests/config/beans1.xml 2011-05-12 13:11:41 UTC (rev 10644) +++ trunk/tests/config/beans1.xml 2011-05-12 13:43:37 UTC (rev 10645) @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<deployment xmlns="urn:jboss:bean-deployer:2.0"> - <bean name="bean" class="org.hornetq.tests.unit.microcontainer.DummyBean"/> -</deployment> \ No newline at end of file Deleted: trunk/tests/config/hornetq.keystore =================================================================== (Binary files differ) Deleted: trunk/tests/config/hornetq.truststore =================================================================== (Binary files differ) Modified: trunk/tests/unit-tests/pom.xml =================================================================== --- trunk/tests/unit-tests/pom.xml 2011-05-12 13:11:41 UTC (rev 10644) +++ trunk/tests/unit-tests/pom.xml 2011-05-12 13:43:37 UTC (rev 10645) @@ -7,7 +7,6 @@ <version>2.2.3-SNAPSHOT</version> </parent> - <groupId>org.hornetq.tests</groupId> <artifactId>unit-tests</artifactId> <packaging>jar</packaging> <name>HornetQ Unit Tests</name> @@ -52,27 +51,9 @@ </dependencies> <build> - <testResources> - <testResource> - <directory>../config</directory> - </testResource> - </testResources> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <excludes> - <exclude>org/hornetq/tests/util/*.java</exclude> - </excludes> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-report-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> <executions> <execution> Copied: trunk/tests/unit-tests/src/test/resources/ConfigurationTest-defaults.xml (from rev 10644, trunk/tests/config/ConfigurationTest-defaults.xml) =================================================================== --- trunk/tests/unit-tests/src/test/resources/ConfigurationTest-defaults.xml (rev 0) +++ trunk/tests/unit-tests/src/test/resources/ConfigurationTest-defaults.xml 2011-05-12 13:43:37 UTC (rev 10645) @@ -0,0 +1,6 @@ +<configuration + xmlns="urn:hornetq" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="urn:hornetq ../../src/schemas/hornetq-configuration.xsd "> + <!-- just use the defaults --> +</configuration> Copied: trunk/tests/unit-tests/src/test/resources/ConfigurationTest-full-config.xml (from rev 10644, trunk/tests/config/ConfigurationTest-full-config.xml) =================================================================== --- trunk/tests/unit-tests/src/test/resources/ConfigurationTest-full-config.xml (rev 0) +++ trunk/tests/unit-tests/src/test/resources/ConfigurationTest-full-config.xml 2011-05-12 13:43:37 UTC (rev 10645) @@ -0,0 +1,219 @@ +<configuration + xmlns="urn:hornetq" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="urn:hornetq ../../src/config/common/schema/hornetq-configuration.xsd"> + <name>SomeNameForUseOnTheApplicationServer</name> + <clustered>true</clustered> + <scheduled-thread-pool-max-size>12345</scheduled-thread-pool-max-size> + <thread-pool-max-size>54321</thread-pool-max-size> + <persistence-enabled>false</persistence-enabled> + <file-deployment-enabled>true</file-deployment-enabled> + <security-enabled>false</security-enabled> + <security-invalidation-interval>5423</security-invalidation-interval> + <wild-card-routing-enabled>true</wild-card-routing-enabled> + <management-address>Giraffe</management-address> + <management-notification-address>Whatever</management-notification-address> + <cluster-user>Frog</cluster-user> + <cluster-password>Wombat</cluster-password> + <jmx-management-enabled>false</jmx-management-enabled> + <jmx-domain>gro.qtenroh</jmx-domain> + <log-delegate-factory-class-name>ocelot</log-delegate-factory-class-name> + <message-counter-enabled>true</message-counter-enabled> + <message-counter-max-day-history>5</message-counter-max-day-history> + <message-counter-sample-period>123456</message-counter-sample-period> + <connection-ttl-override>12345</connection-ttl-override> + <transaction-timeout>98765</transaction-timeout> + <transaction-timeout-scan-period>56789</transaction-timeout-scan-period> + <message-expiry-scan-period>10111213</message-expiry-scan-period> + <message-expiry-thread-priority>8</message-expiry-thread-priority> + <id-cache-size>127</id-cache-size> + <persist-id-cache>true</persist-id-cache> + <backup>true</backup> + <shared-store>true</shared-store> + <persist-delivery-count-before-delivery>true</persist-delivery-count-before-delivery> + <paging-directory>pagingdir</paging-directory> + <bindings-directory>somedir</bindings-directory> + <create-bindings-dir>false</create-bindings-dir> + <journal-directory>somedir2</journal-directory> + <create-journal-dir>false</create-journal-dir> + <journal-type>NIO</journal-type> + <journal-compact-min-files>123</journal-compact-min-files> + <journal-compact-percentage>33</journal-compact-percentage> + <journal-buffer-timeout>1000</journal-buffer-timeout> + <journal-buffer-size>10000</journal-buffer-size> + <journal-sync-transactional>false</journal-sync-transactional> + <journal-sync-non-transactional>true</journal-sync-non-transactional> + <journal-file-size>12345678</journal-file-size> + <journal-min-files>100</journal-min-files> + <journal-max-io>56546</journal-max-io> + <large-messages-directory>largemessagesdir</large-messages-directory> + <memory-warning-threshold>95</memory-warning-threshold> + <memory-measure-interval>54321</memory-measure-interval> + + <remoting-interceptors> + <class-name>org.hornetq.tests.unit.core.config.impl.TestInterceptor1</class-name> + <class-name>org.hornetq.tests.unit.core.config.impl.TestInterceptor2</class-name> + </remoting-interceptors> + + <connectors> + <connector name="connector1"> + <factory-class>org.hornetq.tests.unit.core.config.impl.TestConnectorFactory1</factory-class> + <param key="a1" value="v1"/> + <param key="a2" value="123"/> + <param key="a3" value="345"/> + <param key="a4" value="v4"/> + </connector> + <connector name="connector2"> + <factory-class>org.hornetq.tests.unit.core.config.impl.TestConnectorFactory2</factory-class> + <param key="b1" value="w1"/> + <param key="b2" value="234"/> + </connector> + </connectors> + <acceptors> + <acceptor name="acceptor1"> + <factory-class>org.hornetq.tests.unit.core.config.impl.TestAcceptorFactory1</factory-class> + <param key="d1" value="y1"/> + <param key="d2" value="456"/> + </acceptor> + <acceptor name="acceptor2"> + <factory-class>org.hornetq.tests.unit.core.config.impl.TestAcceptorFactory2</factory-class> + <param key="e1" value="z1"/> + <param key="e2" value="567"/> + </acceptor> + </acceptors> + <broadcast-groups> + <broadcast-group name="bg1"> + <local-bind-port>10999</local-bind-port> + <group-address>192.168.0.120</group-address> + <group-port>11999</group-port> + <broadcast-period>12345</broadcast-period> + <connector-ref>connector1</connector-ref> + </broadcast-group> + <broadcast-group name="bg2"> + <local-bind-port>12999</local-bind-port> + <group-address>192.168.0.121</group-address> + <group-port>13999</group-port> + <broadcast-period>23456</broadcast-period> + <connector-ref>connector2</connector-ref> + </broadcast-group> + </broadcast-groups> + <discovery-groups> + <discovery-group name="dg1"> + <local-bind-address>172.16.8.10</local-bind-address> + <group-address>192.168.0.120</group-address> + <group-port>11999</group-port> + <refresh-timeout>12345</refresh-timeout> + </discovery-group> + <discovery-group name="dg2"> + <local-bind-address>172.16.8.11</local-bind-address> + <group-address>192.168.0.121</group-address> + <group-port>12999</group-port> + <refresh-timeout>23456</refresh-timeout> + </discovery-group> + </discovery-groups> + <diverts> + <divert name="divert1"> + <routing-name>routing-name1</routing-name> + <address>address1</address> + <forwarding-address>forwarding-address1</forwarding-address> + <filter string="speed > 88"/> + <transformer-class-name>org.foo.Transformer</transformer-class-name> + <exclusive>true</exclusive> + </divert> + <divert name="divert2"> + <routing-name>routing-name2</routing-name> + <address>address2</address> + <forwarding-address>forwarding-address2</forwarding-address> + <filter string="speed &lt; 88"/> + <transformer-class-name>org.foo.Transformer2</transformer-class-name> + <exclusive>false</exclusive> + </divert> + </diverts> + <queues> + <queue name="queue1"> + <address>address1</address> + <filter string="color='red'" /> + <durable>false</durable> + </queue> + <queue name="queue2"> + <address>address2</address> + <filter string="color='blue'" /> + <durable>false</durable> + </queue> + </queues> + <bridges> + <bridge name="bridge1"> + <queue-name>queue1</queue-name> + <forwarding-address>bridge-forwarding-address1</forwarding-address> + <filter string="sku > 1"/> + <transformer-class-name>org.foo.BridgeTransformer</transformer-class-name> + <retry-interval>3</retry-interval> + <retry-interval-multiplier>0.2</retry-interval-multiplier> + <reconnect-attempts>2</reconnect-attempts> + <failover-on-server-shutdown>false</failover-on-server-shutdown> + <use-duplicate-detection>true</use-duplicate-detection> + <static-connectors> + <connector-ref>connector1</connector-ref> + </static-connectors> + </bridge> + <bridge name="bridge2"> + <queue-name>queue2</queue-name> + <forwarding-address>bridge-forwarding-address2</forwarding-address> + <discovery-group-ref discovery-group-name="dg1"/> + </bridge> + </bridges> + <cluster-connections> + <cluster-connection name="cluster-connection1"> + <address>queues1</address> + <connector-ref>connector1</connector-ref> + <retry-interval>3</retry-interval> + <use-duplicate-detection>true</use-duplicate-detection> + <forward-when-no-consumers>false</forward-when-no-consumers> + <max-hops>1</max-hops> + <static-connectors> + <connector-ref>connector1</connector-ref> + <connector-ref>connector2</connector-ref> + </static-connectors> + </cluster-connection> + <cluster-connection name="cluster-connection2"> + <address>queues2</address> + <connector-ref>connector2</connector-ref> + <retry-interval>4</retry-interval> + <use-duplicate-detection>false</use-duplicate-detection> + <forward-when-no-consumers>true</forward-when-no-consumers> + <max-hops>2</max-hops> + <discovery-group-ref discovery-group-name="dg1"/> + </cluster-connection> + </cluster-connections> + + <security-settings> + <security-setting match="a1"> + <permission type="createNonDurableQueue" roles="a1.1"/> + </security-setting> + <security-setting match="a2"> + <permission type="deleteNonDurableQueue" roles="a2.1"/> + </security-setting> + </security-settings> + + <address-settings> + <address-setting match="a1"> + <dead-letter-address>a1.1</dead-letter-address> + <expiry-address>a1.2</expiry-address> + <redelivery-delay>1</redelivery-delay> + <max-size-bytes>81781728121878</max-size-bytes> + <page-size-bytes>81738173872337</page-size-bytes> + <page-max-cache-size>10</page-max-cache-size> + <message-counter-history-day-limit>4</message-counter-history-day-limit> + </address-setting> + <address-setting match="a2"> + <dead-letter-address>a2.1</dead-letter-address> + <expiry-address>a2.2</expiry-address> + <redelivery-delay>5</redelivery-delay> + <max-size-bytes>932489234928324</max-size-bytes> + <page-size-bytes>7126716262626</page-size-bytes> + <page-max-cache-size>20</page-max-cache-size> + <message-counter-history-day-limit>8</message-counter-history-day-limit> + </address-setting> + </address-settings> + +</configuration> Copied: trunk/tests/unit-tests/src/test/resources/beans1.xml (from rev 10644, trunk/tests/config/beans1.xml) =================================================================== --- trunk/tests/unit-tests/src/test/resources/beans1.xml (rev 0) +++ trunk/tests/unit-tests/src/test/resources/beans1.xml 2011-05-12 13:43:37 UTC (rev 10645) @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<deployment xmlns="urn:jboss:bean-deployer:2.0"> + <bean name="bean" class="org.hornetq.tests.unit.microcontainer.DummyBean"/> +</deployment> \ No newline at end of file Copied: trunk/tests/unit-tests/src/test/resources/hornetq.keystore (from rev 10644, trunk/tests/config/hornetq.keystore) =================================================================== (Binary files differ) Copied: trunk/tests/unit-tests/src/test/resources/hornetq.truststore (from rev 10644, trunk/tests/config/hornetq.truststore) =================================================================== (Binary files differ)