[jboss-cvs] JBoss Messaging SVN: r6643 - in trunk: tests/jms-tests/config and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri May 1 06:44:24 EDT 2009
Author: ataylor
Date: 2009-05-01 06:44:24 -0400 (Fri, 01 May 2009)
New Revision: 6643
Added:
trunk/tests/jms-tests/config/jbm-configuration.xml
trunk/tests/jms-tests/config/jbm-jms.xml
trunk/tests/jms-tests/config/jbm-queues.xml
trunk/tests/jms-tests/config/jbm-standalone-beans.xml
trunk/tests/jms-tests/config/jbm-users.xml
trunk/tests/jms-tests/config/jndi.properties
trunk/tests/jms-tests/config/log4j.xml
trunk/tests/jms-tests/config/logging.properties
trunk/tests/jms-tests/config/test-beans.xml
Removed:
trunk/tests/jms-tests/config/invm-beans.xml
Modified:
trunk/build-messaging.xml
trunk/tests/jms-tests/src/org/jboss/test/messaging/JBMServerTestCase.java
Log:
updated jms tests to use own config
Modified: trunk/build-messaging.xml
===================================================================
--- trunk/build-messaging.xml 2009-05-01 03:05:47 UTC (rev 6642)
+++ trunk/build-messaging.xml 2009-05-01 10:44:24 UTC (rev 6643)
@@ -296,7 +296,6 @@
<path id="jms.test.execution.classpath">
<pathelement location="${test.dir}/config"/>
- <pathelement location="${src.config.standalone.non-clustered.dir}"/>
<pathelement location="${src.config.dir}/common"/>
<pathelement location="${src.schemas.dir}"/>
<pathelement location="${test.jms.dir}/config"/>
Deleted: trunk/tests/jms-tests/config/invm-beans.xml
===================================================================
--- trunk/tests/jms-tests/config/invm-beans.xml 2009-05-01 03:05:47 UTC (rev 6642)
+++ trunk/tests/jms-tests/config/invm-beans.xml 2009-05-01 10:44:24 UTC (rev 6643)
@@ -1,8 +0,0 @@
-<?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>
-</deployment>
\ No newline at end of file
Copied: trunk/tests/jms-tests/config/jbm-configuration.xml (from rev 6642, trunk/src/config/stand-alone/non-clustered/jbm-configuration.xml)
===================================================================
--- trunk/tests/jms-tests/config/jbm-configuration.xml (rev 0)
+++ trunk/tests/jms-tests/config/jbm-configuration.xml 2009-05-01 10:44:24 UTC (rev 6643)
@@ -0,0 +1,43 @@
+<deployment xmlns="urn:jboss:messaging"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
+ <configuration>
+
+ <!-- Connectors -->
+ <connectors>
+
+ <connector name="netty">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+ </connector>
+
+
+ <connector name="in-vm">
+ <factory-class>org.jboss.messaging.core.remoting.impl.invm.InVMConnectorFactory</factory-class>
+ </connector>
+
+ </connectors>
+
+ <!-- Acceptors -->
+ <acceptors>
+ <!-- In VM acceptor -->
+ <acceptor name="in-vm">
+ <factory-class>org.jboss.messaging.core.remoting.impl.invm.InVMAcceptorFactory</factory-class>
+ <param key="jbm.remoting.invm.serverid" value="0" type="Integer"/>
+ </acceptor>
+
+ <!-- Netty TCP Acceptor -->
+ <acceptor name="netty">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
+ </acceptor>
+
+ </acceptors>
+
+
+ <journal-min-files>2</journal-min-files>
+
+ <paging-max-global-size-bytes>20485760</paging-max-global-size-bytes>
+ <paging-global-watermark-size>1048576</paging-global-watermark-size>
+
+ </configuration>
+
+</deployment>
Property changes on: trunk/tests/jms-tests/config/jbm-configuration.xml
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: trunk/tests/jms-tests/config/jbm-jms.xml (from rev 6642, trunk/src/config/stand-alone/non-clustered/jbm-jms.xml)
===================================================================
--- trunk/tests/jms-tests/config/jbm-jms.xml (rev 0)
+++ trunk/tests/jms-tests/config/jbm-jms.xml 2009-05-01 10:44:24 UTC (rev 6643)
@@ -0,0 +1,16 @@
+<deployment xmlns="urn:jboss:messaging"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
+
+ <connection-factory name="ConnectionFactory">
+ <connector-ref connector-name="netty"/>
+ <entries>
+ <entry name="ConnectionFactory"/>
+ <entry name="/ConnectionFactory"/>
+ <entry name="/XAConnectionFactory"/>
+ <entry name="java:/ConnectionFactory"/>
+ <entry name="java:/XAConnectionFactory"/>
+ </entries>
+ </connection-factory>
+
+</deployment>
\ No newline at end of file
Property changes on: trunk/tests/jms-tests/config/jbm-jms.xml
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: trunk/tests/jms-tests/config/jbm-queues.xml (from rev 6642, trunk/src/config/stand-alone/non-clustered/jbm-queues.xml)
===================================================================
--- trunk/tests/jms-tests/config/jbm-queues.xml (rev 0)
+++ trunk/tests/jms-tests/config/jbm-queues.xml 2009-05-01 10:44:24 UTC (rev 6643)
@@ -0,0 +1,14 @@
+<settings xmlns="urn:jboss:messaging"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-queues.xsd ">
+
+ <security match="#">
+ <permission type="createDurableQueue" roles="guest,def"/>
+ <permission type="deleteDurableQueue" roles="guest,def"/>
+ <permission type="createTempQueue" roles="guest,def"/>
+ <permission type="deleteTempQueue" roles="guest,def"/>
+ <permission type="consume" roles="guest,def"/>
+ <permission type="send" roles="guest,def"/>
+ </security>
+
+</settings>
Property changes on: trunk/tests/jms-tests/config/jbm-queues.xml
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: trunk/tests/jms-tests/config/jbm-standalone-beans.xml (from rev 6642, trunk/src/config/stand-alone/non-clustered/jbm-standalone-beans.xml)
===================================================================
--- trunk/tests/jms-tests/config/jbm-standalone-beans.xml (rev 0)
+++ trunk/tests/jms-tests/config/jbm-standalone-beans.xml 2009-05-01 10:44:24 UTC (rev 6643)
@@ -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.jboss.messaging.core.config.impl.FileConfiguration">
+ </bean>
+
+ <!-- The security manager -->
+ <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ </bean>
+
+ <!-- The core server -->
+ <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ <constructor>
+ <parameter>
+ <inject bean="Configuration"/>
+ </parameter>
+ <parameter>
+ <inject bean="MBeanServer"/>
+ </parameter>
+ <parameter>
+ <inject bean="JBMSecurityManager"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+ <!-- The JMS server -->
+ <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
+ <constructor>
+ <parameter>
+ <inject bean="MessagingServer"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+</deployment>
\ No newline at end of file
Property changes on: trunk/tests/jms-tests/config/jbm-standalone-beans.xml
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: trunk/tests/jms-tests/config/jbm-users.xml (from rev 6642, trunk/src/config/stand-alone/non-clustered/jbm-users.xml)
===================================================================
--- trunk/tests/jms-tests/config/jbm-users.xml (rev 0)
+++ trunk/tests/jms-tests/config/jbm-users.xml 2009-05-01 10:44:24 UTC (rev 6643)
@@ -0,0 +1,10 @@
+<deployment xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-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>-->
+</deployment>
\ No newline at end of file
Property changes on: trunk/tests/jms-tests/config/jbm-users.xml
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: trunk/tests/jms-tests/config/jndi.properties (from rev 6642, trunk/src/config/stand-alone/non-clustered/jndi.properties)
===================================================================
--- trunk/tests/jms-tests/config/jndi.properties (rev 0)
+++ trunk/tests/jms-tests/config/jndi.properties 2009-05-01 10:44:24 UTC (rev 6643)
@@ -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
Property changes on: trunk/tests/jms-tests/config/jndi.properties
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: trunk/tests/jms-tests/config/log4j.xml (from rev 6642, trunk/src/config/stand-alone/non-clustered/log4j.xml)
===================================================================
--- trunk/tests/jms-tests/config/log4j.xml (rev 0)
+++ trunk/tests/jms-tests/config/log4j.xml 2009-05-01 10:44:24 UTC (rev 6643)
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<!-- $Id: log4j.xml 536 2005-12-22 06:28:39Z ovidiu $ -->
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+
+ <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+ <param name="Target" value="System.out"/>
+ <param name="Threshold" value="INFO"/>
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p @%t [%c{1}] %m%n"/>
+ </layout>
+ </appender>
+
+ <appender name="FILE" class="org.apache.log4j.DailyRollingFileAppender">
+ <errorHandler class="org.apache.log4j.helpers.OnlyOnceErrorHandler"/>
+
+ <param name="File" value="./logs/messaging.log"/>
+
+ <!-- since majority of the tests are ran in fork mode by ant, the log file is overwritten
+ for each test. We need to append if we want to preserve a full testsuite run log.
+ Make sure the build script clears this log at the beginning of each run.
+ -->
+ <param name="Append" value="false"/>
+ <param name="DatePattern" value="'.'yyyy-MM-dd"/>
+
+ <param name="Threshold" value="INFO"/>
+
+ <layout class="org.apache.log4j.PatternLayout">
+ <!-- The default pattern: Date Priority [Category] Message\n -->
+ <!-- <param name="ConversionPattern" value="%d %-5p @%t [%c] %m%n"/> -->
+ <!-- The full pattern: Date MS Priority [Category] (Thread:NDC) Message\n -->
+ <param name="ConversionPattern" value="%d %-5r %-5p [%c] (%t:%x) %m%n"/>
+
+ </layout>
+ </appender>
+
+ <category name="org.jboss">
+ <priority value="INFO"/>
+ </category>
+
+ <root>
+ <appender-ref ref="CONSOLE"/>
+ <appender-ref ref="FILE"/>
+ </root>
+
+
+
+</log4j:configuration>
Property changes on: trunk/tests/jms-tests/config/log4j.xml
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: trunk/tests/jms-tests/config/logging.properties (from rev 6642, trunk/src/config/stand-alone/non-clustered/logging.properties)
===================================================================
--- trunk/tests/jms-tests/config/logging.properties (rev 0)
+++ trunk/tests/jms-tests/config/logging.properties 2009-05-01 10:44:24 UTC (rev 6643)
@@ -0,0 +1,31 @@
+############################################################
+# Default Logging Configuration File
+#
+# You can use a different file by specifying a filename
+# with the java.util.logging.config.file system property.
+# For example java -Djava.util.logging.config.file=myfile
+############################################################
+
+############################################################
+# Global properties
+############################################################
+
+# "handlers" specifies a comma separated list of log Handler
+# classes. These handlers will be installed during VM startup.
+# Note that these classes must be on the system classpath.
+# By default we only configure a ConsoleHandler, which will only
+# show messages at the INFO and above levels.
+handlers=org.jboss.messaging.integration.logging.JBossLoggerHandler
+
+# Default global logging level.
+# This specifies which kinds of events are logged across
+# all loggers. For any given facility this global level
+# can be overriden by a facility specific level
+# Note that the ConsoleHandler also has a separate level
+# setting to limit messages printed to the console.
+.level= INFO
+
+############################################################
+# Handler specific properties.
+# Describes specific configuration info for Handlers.
+############################################################
Property changes on: trunk/tests/jms-tests/config/logging.properties
___________________________________________________________________
Name: svn:mergeinfo
+
Added: trunk/tests/jms-tests/config/test-beans.xml
===================================================================
--- trunk/tests/jms-tests/config/test-beans.xml (rev 0)
+++ trunk/tests/jms-tests/config/test-beans.xml 2009-05-01 10:44:24 UTC (rev 6643)
@@ -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.jboss.messaging.core.config.impl.FileConfiguration">
+ </bean>
+
+ <!-- The security manager -->
+ <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ </bean>
+
+ <!-- The core server -->
+ <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ <constructor>
+ <parameter>
+ <inject bean="Configuration"/>
+ </parameter>
+ <parameter>
+ <inject bean="MBeanServer"/>
+ </parameter>
+ <parameter>
+ <inject bean="JBMSecurityManager"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+ <!-- The JMS server -->
+ <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
+ <constructor>
+ <parameter>
+ <inject bean="MessagingServer"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+</deployment>
\ No newline at end of file
Modified: trunk/tests/jms-tests/src/org/jboss/test/messaging/JBMServerTestCase.java
===================================================================
--- trunk/tests/jms-tests/src/org/jboss/test/messaging/JBMServerTestCase.java 2009-05-01 03:05:47 UTC (rev 6642)
+++ trunk/tests/jms-tests/src/org/jboss/test/messaging/JBMServerTestCase.java 2009-05-01 10:44:24 UTC (rev 6643)
@@ -256,7 +256,7 @@
// FIXME https://jira.jboss.org/jira/browse/JBMESSAGING-1606
public String[] getContainerConfig()
{
- return new String[]{ "invm-beans.xml", "src/config/stand-alone/non-clustered/jbm-standalone-beans.xml"};
+ return new String[]{"test-beans.xml"};
}
protected MessagingServer getJmsServer() throws Exception
More information about the jboss-cvs-commits
mailing list