Author: borges Date: 2011-05-12 11:52:54 -0400 (Thu, 12 May 2011) New Revision: 10647 Added: trunk/tests/integration-tests/src/test/resources/ trunk/tests/integration-tests/src/test/resources/hornetq-jms-for-JMSServerDeployerTest.xml trunk/tests/integration-tests/src/test/resources/hornetq-jms-for-JMSServerDeployerTest2.xml trunk/tests/integration-tests/src/test/resources/restricted-security-client.policy trunk/tests/integration-tests/src/test/resources/server-start-stop-config1.xml trunk/tests/integration-tests/src/test/resources/server-start-stop-jms-config1.xml trunk/tests/integration-tests/src/test/resources/spring-jms-beans.xml Removed: trunk/tests/config/hornetq-jms-for-JMSServerDeployerTest.xml trunk/tests/config/hornetq-jms-for-JMSServerDeployerTest2.xml trunk/tests/config/restricted-security-client.policy trunk/tests/config/server-start-stop-config1.xml trunk/tests/config/server-start-stop-jms-config1.xml trunk/tests/config/spring-jms-beans.xml Modified: trunk/tests/integration-tests/pom.xml Log: Move integration resources into standard Maven folder Deleted: trunk/tests/config/hornetq-jms-for-JMSServerDeployerTest.xml =================================================================== --- trunk/tests/config/hornetq-jms-for-JMSServerDeployerTest.xml 2011-05-12 15:52:05 UTC (rev 10646) +++ trunk/tests/config/hornetq-jms-for-JMSServerDeployerTest.xml 2011-05-12 15:52:54 UTC (rev 10647) @@ -1,53 +0,0 @@ -<configuration xmlns="urn:hornetq" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:hornetq ../../src/schemas/hornetq-jms.xsd "> - - <connection-factory name="fullConfigurationConnectionFactory"> - <entries> - <entry name="/fullConfigurationConnectionFactory"/> - <entry name="/acme/fullConfigurationConnectionFactory"/> - <entry name="java:/xyz/tfullConfigurationConnectionFactory"/> - <entry name="java:/connectionfactories/acme/fullConfigurationConnectionFactory"/> - </entries> - <connectors> - <connector-ref connector-name="netty"/> - </connectors> - <client-failure-check-period>1234</client-failure-check-period> - <call-timeout>5678</call-timeout> - <consumer-window-size>12345</consumer-window-size> - <consumer-max-rate>6789</consumer-max-rate> - <confirmation-window-size>123456</confirmation-window-size> - <producer-window-size>7712652</producer-window-size> - <producer-max-rate>789</producer-max-rate> - <min-large-message-size>12</min-large-message-size> - <compress-large-messages>true</compress-large-messages> - <client-id>TestClientID</client-id> - <dups-ok-batch-size>3456</dups-ok-batch-size> - <transaction-batch-size>4567</transaction-batch-size> - <block-on-acknowledge>true</block-on-acknowledge> - <block-on-non-durable-send>false</block-on-non-durable-send> - <block-on-durable-send>true</block-on-durable-send> - <auto-group>false</auto-group> - <pre-acknowledge>true</pre-acknowledge> - <connection-ttl>2345</connection-ttl> - <failover-on-initial-connection>true</failover-on-initial-connection> - <failover-on-server-shutdown>false</failover-on-server-shutdown> - <connection-load-balancing-policy-class-name>FooClass</connection-load-balancing-policy-class-name> - <reconnect-attempts>34</reconnect-attempts> - <retry-interval>5</retry-interval> - <retry-interval-multiplier>6.0</retry-interval-multiplier> - <max-retry-interval>300</max-retry-interval> - <cache-large-message-client>true</cache-large-message-client> - </connection-factory> - - <queue name="fullConfigurationQueue"> - <entry name="/fullConfigurationQueue"/> - <entry name="/queue/fullConfigurationQueue"/> - </queue> - - <topic name="fullConfigurationTopic"> - <entry name="/fullConfigurationTopic"/> - <entry name="/topic/fullConfigurationTopic"/> - </topic> - -</configuration> \ No newline at end of file Deleted: trunk/tests/config/hornetq-jms-for-JMSServerDeployerTest2.xml =================================================================== --- trunk/tests/config/hornetq-jms-for-JMSServerDeployerTest2.xml 2011-05-12 15:52:05 UTC (rev 10646) +++ trunk/tests/config/hornetq-jms-for-JMSServerDeployerTest2.xml 2011-05-12 15:52:54 UTC (rev 10647) @@ -1,53 +0,0 @@ -<configuration xmlns="urn:hornetq" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:hornetq ../../src/schemas/hornetq-jms.xsd "> - - <connection-factory name="fullConfigurationConnectionFactory"> - <entries> - <entry name="/fullConfigurationConnectionFactory"/> - <entry name="/acme/fullConfigurationConnectionFactory"/> - <entry name="java:/xyz/tfullConfigurationConnectionFactory"/> - <entry name="java:/connectionfactories/acme/fullConfigurationConnectionFactory"/> - </entries> - <connectors> - <connector-ref connector-name="netty"/> - </connectors> - <discovery-group-ref discovery-group-name="mygroup"/> - <client-failure-check-period>1234</client-failure-check-period> - <call-timeout>5678</call-timeout> - <consumer-window-size>12345</consumer-window-size> - <consumer-max-rate>6789</consumer-max-rate> - <confirmation-window-size>123456</confirmation-window-size> - <producer-window-size>7712652</producer-window-size> - <producer-max-rate>789</producer-max-rate> - <min-large-message-size>12</min-large-message-size> - <client-id>TestClientID</client-id> - <dups-ok-batch-size>3456</dups-ok-batch-size> - <transaction-batch-size>4567</transaction-batch-size> - <block-on-acknowledge>true</block-on-acknowledge> - <block-on-non-durable-send>false</block-on-non-durable-send> - <block-on-durable-send>true</block-on-durable-send> - <auto-group>false</auto-group> - <pre-acknowledge>true</pre-acknowledge> - <connection-ttl>2345</connection-ttl> - <failover-on-initial-connection>true</failover-on-initial-connection> - <failover-on-server-shutdown>false</failover-on-server-shutdown> - <connection-load-balancing-policy-class-name>FooClass</connection-load-balancing-policy-class-name> - <reconnect-attempts>34</reconnect-attempts> - <retry-interval>5</retry-interval> - <retry-interval-multiplier>6.0</retry-interval-multiplier> - <max-retry-interval>300</max-retry-interval> - <cache-large-message-client>true</cache-large-message-client> - </connection-factory> - - <queue name="fullConfigurationQueue"> - <entry name="/fullConfigurationQueue"/> - <entry name="/queue/fullConfigurationQueue"/> - </queue> - - <topic name="fullConfigurationTopic"> - <entry name="/fullConfigurationTopic"/> - <entry name="/topic/fullConfigurationTopic"/> - </topic> - -</configuration> \ No newline at end of file Deleted: trunk/tests/config/restricted-security-client.policy =================================================================== --- trunk/tests/config/restricted-security-client.policy 2011-05-12 15:52:05 UTC (rev 10646) +++ trunk/tests/config/restricted-security-client.policy 2011-05-12 15:52:54 UTC (rev 10647) @@ -1,8 +0,0 @@ -grant { - //permission java.security.AllPermission; - - // allow to connect to localhost - permission java.net.SocketPermission "*:1024-", "connect"; - // normally, we don't need this permission since the applet allows to read jars loaded by the applet - permission java.io.FilePermission "${user.dir}/build/jars/hornetq-core-client.jar", "read"; -}; \ No newline at end of file Deleted: trunk/tests/config/server-start-stop-config1.xml =================================================================== --- trunk/tests/config/server-start-stop-config1.xml 2011-05-12 15:52:05 UTC (rev 10646) +++ trunk/tests/config/server-start-stop-config1.xml 2011-05-12 15:52:54 UTC (rev 10647) @@ -1,33 +0,0 @@ -<configuration xmlns="urn:hornetq" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd"> - - <connectors> - <connector name="netty-connector"> - <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> - </connector> - </connectors> - - <journal-directory>/tmp/hornetq-unit-test/start-stop-data</journal-directory> - - <acceptors> - <acceptor name="netty-acceptor"> - <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> - </acceptor> - </acceptors> - - <security-enabled>false</security-enabled> - - <queues> - <queue name="myQueue"> - <address>myAddress</address> - </queue> - - <!-- temporary fix until I investigate the cause of a failure - <queue name="jms.queue.myJMSQueue"> - <address>jms.queue.myJMSAddress</address> - </queue> - --> - </queues> - -</configuration> Deleted: trunk/tests/config/server-start-stop-jms-config1.xml =================================================================== --- trunk/tests/config/server-start-stop-jms-config1.xml 2011-05-12 15:52:05 UTC (rev 10646) +++ trunk/tests/config/server-start-stop-jms-config1.xml 2011-05-12 15:52:54 UTC (rev 10647) @@ -1,18 +0,0 @@ -<configuration xmlns="urn:hornetq" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd"> - <!--the connection factory used by the example--> - <connection-factory name="ConnectionFactory"> - <connectors> - <connector-ref connector-name="netty-connector"/> - </connectors> - <entries> - <entry name="ConnectionFactory"/> - </entries> - </connection-factory> - - <queue name="myJMSQueue"> - <entry name="myJMSQueue"/> - </queue> - -</configuration> \ No newline at end of file Deleted: trunk/tests/config/spring-jms-beans.xml =================================================================== --- trunk/tests/config/spring-jms-beans.xml 2011-05-12 15:52:05 UTC (rev 10646) +++ trunk/tests/config/spring-jms-beans.xml 2011-05-12 15:52:54 UTC (rev 10647) @@ -1,27 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<beans xmlns="http://www.springframework.org/schema/beans" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans-3.0.xsd"> - - <bean id="EmbeddedJms" class="org.hornetq.integration.spring.SpringJmsBootstrap" init-method="start"> - <property name="configResourcePath" value="spring-hornetq-config.xml"/> - <property name="jmsConfigResourcePath" value="spring-hornetq-jms.xml"/> - </bean> - - <bean id="listener" class="org.hornetq.tests.integration.spring.ExampleListener"/> - - <bean id="MessageSender" class="org.hornetq.tests.integration.spring.MessageSender"> - <property name="connectionFactory" ref="ConnectionFactory"/> - <property name="destination" ref="/queue/exampleQueue"/> - </bean> - - <bean id="listenerContainer" class="org.springframework.jms.listener.DefaultMessageListenerContainer"> - <property name="connectionFactory" ref="ConnectionFactory"/> - <property name="destination" ref="/queue/exampleQueue"/> - <property name="messageListener" ref="listener"/> - </bean> - - -</beans> - \ No newline at end of file Modified: trunk/tests/integration-tests/pom.xml =================================================================== --- trunk/tests/integration-tests/pom.xml 2011-05-12 15:52:05 UTC (rev 10646) +++ trunk/tests/integration-tests/pom.xml 2011-05-12 15:52:54 UTC (rev 10647) @@ -7,7 +7,6 @@ <version>2.2.3-SNAPSHOT</version> </parent> - <groupId>org.hornetq.tests</groupId> <artifactId>integration-tests</artifactId> <packaging>jar</packaging> <name>HornetQ Integration Tests</name> @@ -83,11 +82,6 @@ </dependencies> <build> - <testResources> - <testResource> - <directory>../config</directory> - </testResource> - </testResources> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -122,10 +116,6 @@ </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> @@ -135,14 +125,6 @@ </execution> </executions> </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/integration-tests/src/test/resources/hornetq-jms-for-JMSServerDeployerTest.xml (from rev 10646, trunk/tests/config/hornetq-jms-for-JMSServerDeployerTest.xml) =================================================================== --- trunk/tests/integration-tests/src/test/resources/hornetq-jms-for-JMSServerDeployerTest.xml (rev 0) +++ trunk/tests/integration-tests/src/test/resources/hornetq-jms-for-JMSServerDeployerTest.xml 2011-05-12 15:52:54 UTC (rev 10647) @@ -0,0 +1,53 @@ +<configuration xmlns="urn:hornetq" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="urn:hornetq ../../src/schemas/hornetq-jms.xsd "> + + <connection-factory name="fullConfigurationConnectionFactory"> + <entries> + <entry name="/fullConfigurationConnectionFactory"/> + <entry name="/acme/fullConfigurationConnectionFactory"/> + <entry name="java:/xyz/tfullConfigurationConnectionFactory"/> + <entry name="java:/connectionfactories/acme/fullConfigurationConnectionFactory"/> + </entries> + <connectors> + <connector-ref connector-name="netty"/> + </connectors> + <client-failure-check-period>1234</client-failure-check-period> + <call-timeout>5678</call-timeout> + <consumer-window-size>12345</consumer-window-size> + <consumer-max-rate>6789</consumer-max-rate> + <confirmation-window-size>123456</confirmation-window-size> + <producer-window-size>7712652</producer-window-size> + <producer-max-rate>789</producer-max-rate> + <min-large-message-size>12</min-large-message-size> + <compress-large-messages>true</compress-large-messages> + <client-id>TestClientID</client-id> + <dups-ok-batch-size>3456</dups-ok-batch-size> + <transaction-batch-size>4567</transaction-batch-size> + <block-on-acknowledge>true</block-on-acknowledge> + <block-on-non-durable-send>false</block-on-non-durable-send> + <block-on-durable-send>true</block-on-durable-send> + <auto-group>false</auto-group> + <pre-acknowledge>true</pre-acknowledge> + <connection-ttl>2345</connection-ttl> + <failover-on-initial-connection>true</failover-on-initial-connection> + <failover-on-server-shutdown>false</failover-on-server-shutdown> + <connection-load-balancing-policy-class-name>FooClass</connection-load-balancing-policy-class-name> + <reconnect-attempts>34</reconnect-attempts> + <retry-interval>5</retry-interval> + <retry-interval-multiplier>6.0</retry-interval-multiplier> + <max-retry-interval>300</max-retry-interval> + <cache-large-message-client>true</cache-large-message-client> + </connection-factory> + + <queue name="fullConfigurationQueue"> + <entry name="/fullConfigurationQueue"/> + <entry name="/queue/fullConfigurationQueue"/> + </queue> + + <topic name="fullConfigurationTopic"> + <entry name="/fullConfigurationTopic"/> + <entry name="/topic/fullConfigurationTopic"/> + </topic> + +</configuration> \ No newline at end of file Copied: trunk/tests/integration-tests/src/test/resources/hornetq-jms-for-JMSServerDeployerTest2.xml (from rev 10646, trunk/tests/config/hornetq-jms-for-JMSServerDeployerTest2.xml) =================================================================== --- trunk/tests/integration-tests/src/test/resources/hornetq-jms-for-JMSServerDeployerTest2.xml (rev 0) +++ trunk/tests/integration-tests/src/test/resources/hornetq-jms-for-JMSServerDeployerTest2.xml 2011-05-12 15:52:54 UTC (rev 10647) @@ -0,0 +1,53 @@ +<configuration xmlns="urn:hornetq" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="urn:hornetq ../../src/schemas/hornetq-jms.xsd "> + + <connection-factory name="fullConfigurationConnectionFactory"> + <entries> + <entry name="/fullConfigurationConnectionFactory"/> + <entry name="/acme/fullConfigurationConnectionFactory"/> + <entry name="java:/xyz/tfullConfigurationConnectionFactory"/> + <entry name="java:/connectionfactories/acme/fullConfigurationConnectionFactory"/> + </entries> + <connectors> + <connector-ref connector-name="netty"/> + </connectors> + <discovery-group-ref discovery-group-name="mygroup"/> + <client-failure-check-period>1234</client-failure-check-period> + <call-timeout>5678</call-timeout> + <consumer-window-size>12345</consumer-window-size> + <consumer-max-rate>6789</consumer-max-rate> + <confirmation-window-size>123456</confirmation-window-size> + <producer-window-size>7712652</producer-window-size> + <producer-max-rate>789</producer-max-rate> + <min-large-message-size>12</min-large-message-size> + <client-id>TestClientID</client-id> + <dups-ok-batch-size>3456</dups-ok-batch-size> + <transaction-batch-size>4567</transaction-batch-size> + <block-on-acknowledge>true</block-on-acknowledge> + <block-on-non-durable-send>false</block-on-non-durable-send> + <block-on-durable-send>true</block-on-durable-send> + <auto-group>false</auto-group> + <pre-acknowledge>true</pre-acknowledge> + <connection-ttl>2345</connection-ttl> + <failover-on-initial-connection>true</failover-on-initial-connection> + <failover-on-server-shutdown>false</failover-on-server-shutdown> + <connection-load-balancing-policy-class-name>FooClass</connection-load-balancing-policy-class-name> + <reconnect-attempts>34</reconnect-attempts> + <retry-interval>5</retry-interval> + <retry-interval-multiplier>6.0</retry-interval-multiplier> + <max-retry-interval>300</max-retry-interval> + <cache-large-message-client>true</cache-large-message-client> + </connection-factory> + + <queue name="fullConfigurationQueue"> + <entry name="/fullConfigurationQueue"/> + <entry name="/queue/fullConfigurationQueue"/> + </queue> + + <topic name="fullConfigurationTopic"> + <entry name="/fullConfigurationTopic"/> + <entry name="/topic/fullConfigurationTopic"/> + </topic> + +</configuration> \ No newline at end of file Copied: trunk/tests/integration-tests/src/test/resources/restricted-security-client.policy (from rev 10646, trunk/tests/config/restricted-security-client.policy) =================================================================== --- trunk/tests/integration-tests/src/test/resources/restricted-security-client.policy (rev 0) +++ trunk/tests/integration-tests/src/test/resources/restricted-security-client.policy 2011-05-12 15:52:54 UTC (rev 10647) @@ -0,0 +1,8 @@ +grant { + //permission java.security.AllPermission; + + // allow to connect to localhost + permission java.net.SocketPermission "*:1024-", "connect"; + // normally, we don't need this permission since the applet allows to read jars loaded by the applet + permission java.io.FilePermission "${user.dir}/build/jars/hornetq-core-client.jar", "read"; +}; \ No newline at end of file Copied: trunk/tests/integration-tests/src/test/resources/server-start-stop-config1.xml (from rev 10646, trunk/tests/config/server-start-stop-config1.xml) =================================================================== --- trunk/tests/integration-tests/src/test/resources/server-start-stop-config1.xml (rev 0) +++ trunk/tests/integration-tests/src/test/resources/server-start-stop-config1.xml 2011-05-12 15:52:54 UTC (rev 10647) @@ -0,0 +1,33 @@ +<configuration xmlns="urn:hornetq" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd"> + + <connectors> + <connector name="netty-connector"> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> + </connector> + </connectors> + + <journal-directory>/tmp/hornetq-unit-test/start-stop-data</journal-directory> + + <acceptors> + <acceptor name="netty-acceptor"> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> + </acceptor> + </acceptors> + + <security-enabled>false</security-enabled> + + <queues> + <queue name="myQueue"> + <address>myAddress</address> + </queue> + + <!-- temporary fix until I investigate the cause of a failure + <queue name="jms.queue.myJMSQueue"> + <address>jms.queue.myJMSAddress</address> + </queue> + --> + </queues> + +</configuration> Copied: trunk/tests/integration-tests/src/test/resources/server-start-stop-jms-config1.xml (from rev 10646, trunk/tests/config/server-start-stop-jms-config1.xml) =================================================================== --- trunk/tests/integration-tests/src/test/resources/server-start-stop-jms-config1.xml (rev 0) +++ trunk/tests/integration-tests/src/test/resources/server-start-stop-jms-config1.xml 2011-05-12 15:52:54 UTC (rev 10647) @@ -0,0 +1,18 @@ +<configuration xmlns="urn:hornetq" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd"> + <!--the connection factory used by the example--> + <connection-factory name="ConnectionFactory"> + <connectors> + <connector-ref connector-name="netty-connector"/> + </connectors> + <entries> + <entry name="ConnectionFactory"/> + </entries> + </connection-factory> + + <queue name="myJMSQueue"> + <entry name="myJMSQueue"/> + </queue> + +</configuration> \ No newline at end of file Copied: trunk/tests/integration-tests/src/test/resources/spring-jms-beans.xml (from rev 10646, trunk/tests/config/spring-jms-beans.xml) =================================================================== --- trunk/tests/integration-tests/src/test/resources/spring-jms-beans.xml (rev 0) +++ trunk/tests/integration-tests/src/test/resources/spring-jms-beans.xml 2011-05-12 15:52:54 UTC (rev 10647) @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="UTF-8"?> +<beans xmlns="http://www.springframework.org/schema/beans" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.springframework.org/schema/beans + http://www.springframework.org/schema/beans/spring-beans-3.0.xsd"> + + <bean id="EmbeddedJms" class="org.hornetq.integration.spring.SpringJmsBootstrap" init-method="start"> + <property name="configResourcePath" value="spring-hornetq-config.xml"/> + <property name="jmsConfigResourcePath" value="spring-hornetq-jms.xml"/> + </bean> + + <bean id="listener" class="org.hornetq.tests.integration.spring.ExampleListener"/> + + <bean id="MessageSender" class="org.hornetq.tests.integration.spring.MessageSender"> + <property name="connectionFactory" ref="ConnectionFactory"/> + <property name="destination" ref="/queue/exampleQueue"/> + </bean> + + <bean id="listenerContainer" class="org.springframework.jms.listener.DefaultMessageListenerContainer"> + <property name="connectionFactory" ref="ConnectionFactory"/> + <property name="destination" ref="/queue/exampleQueue"/> + <property name="messageListener" ref="listener"/> + </bean> + + +</beans> + \ No newline at end of file