[hornetq-commits] JBoss hornetq SVN: r10476 - in trunk/tests: integration-tests/src and 12 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Mon Apr 11 13:24:32 EDT 2011
Author: ataylor
Date: 2011-04-11 13:24:31 -0400 (Mon, 11 Apr 2011)
New Revision: 10476
Added:
trunk/tests/integration-tests/src/main/
trunk/tests/integration-tests/src/main/java/
trunk/tests/integration-tests/src/main/java/org/
trunk/tests/integration-tests/src/main/java/org/hornetq/
trunk/tests/integration-tests/src/main/java/org/hornetq/tests/
trunk/tests/integration-tests/src/main/java/org/hornetq/tests/util/
trunk/tests/integration-tests/src/main/java/org/hornetq/tests/util/SpawnedVMSupport.java
trunk/tests/joram-tests/pom.xml
trunk/tests/joram-tests/src/test/
trunk/tests/joram-tests/src/test/java/
trunk/tests/joram-tests/src/test/java/org/
Removed:
trunk/tests/integration-tests/src/test/java/org/hornetq/tests/util/SpawnedVMSupport.java
trunk/tests/joram-tests/src/org/
Modified:
trunk/tests/hornetq-tests.iml
trunk/tests/joram-tests/hornetq-joram-tests.iml
trunk/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/framework/JMSTestCase.java
trunk/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/framework/TestConfig.java
trunk/tests/pom.xml
Log:
mavenised joram tests
Modified: trunk/tests/hornetq-tests.iml
===================================================================
--- trunk/tests/hornetq-tests.iml 2011-04-11 12:47:21 UTC (rev 10475)
+++ trunk/tests/hornetq-tests.iml 2011-04-11 17:24:31 UTC (rev 10476)
@@ -7,6 +7,7 @@
<sourceFolder url="file://$MODULE_DIR$/unit-tests/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/integration-tests/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/unit-tests/src/main/java" isTestSource="true" />
+ <sourceFolder url="file://$MODULE_DIR$/integration-tests/src/main/java" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/jms-tests" />
<excludeFolder url="file://$MODULE_DIR$/joram-tests" />
<excludeFolder url="file://$MODULE_DIR$/logs" />
Copied: trunk/tests/integration-tests/src/main/java/org/hornetq/tests/util/SpawnedVMSupport.java (from rev 10475, trunk/tests/integration-tests/src/test/java/org/hornetq/tests/util/SpawnedVMSupport.java)
===================================================================
--- trunk/tests/integration-tests/src/main/java/org/hornetq/tests/util/SpawnedVMSupport.java (rev 0)
+++ trunk/tests/integration-tests/src/main/java/org/hornetq/tests/util/SpawnedVMSupport.java 2011-04-11 17:24:31 UTC (rev 10476)
@@ -0,0 +1,254 @@
+/*
+ * Copyright 2009 Red Hat, Inc.
+ * Red Hat licenses this file to you under the Apache License, version
+ * 2.0 (the "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package org.hornetq.tests.util;
+
+import static java.util.concurrent.TimeUnit.SECONDS;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeoutException;
+
+import junit.framework.Assert;
+
+import org.hornetq.core.logging.Logger;
+
+/**
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
+ * @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
+ * @author <a href="mailto:csuconic at redhat.com">Clebert Suconic</a>
+ *
+ * @version <tt>$Revision$</tt>
+ *
+ */
+public class SpawnedVMSupport
+{
+ // Constants -----------------------------------------------------
+
+ private static final Logger log = Logger.getLogger(SpawnedVMSupport.class);
+
+ // Attributes ----------------------------------------------------
+
+ // Static --------------------------------------------------------
+
+ public static Process spawnVM(final String className, final String... args) throws Exception
+ {
+ return SpawnedVMSupport.spawnVM(className, new String[0], true, args);
+ }
+
+ public static Process spawnVM(final String className, final boolean logOutput, final String... args) throws Exception
+ {
+ return SpawnedVMSupport.spawnVM(className, new String[0], logOutput, args);
+ }
+
+ public static Process spawnVM(final String className, final String[] vmargs, final String... args) throws Exception
+ {
+ return SpawnedVMSupport.spawnVM(className, vmargs, true, args);
+ }
+
+ public static Process spawnVM(final String className,
+ final String[] vmargs,
+ final boolean logOutput,
+ final String... args) throws Exception
+ {
+ return SpawnedVMSupport.spawnVM(className, "-Xms512m -Xmx512m ", vmargs, logOutput, false, args);
+ }
+
+ public static Process spawnVM(final String className,
+ final String memoryArgs,
+ final String[] vmargs,
+ final boolean logOutput,
+ final boolean logErrorOutput,
+ final String... args) throws Exception
+ {
+ StringBuffer sb = new StringBuffer();
+
+ sb.append("java").append(' ');
+
+ sb.append(memoryArgs);
+
+ for (String vmarg : vmargs)
+ {
+ sb.append(vmarg).append(' ');
+ }
+
+ String classPath = System.getProperty("java.class.path");
+
+ String osName = System.getProperty("os.name");
+ osName = (osName != null) ? osName.toLowerCase() : "";
+ boolean isWindows = osName.contains("win");
+ if (isWindows)
+ {
+ sb.append("-cp").append(" \"").append(classPath).append("\" ");
+ }
+ else
+ {
+ sb.append("-cp").append(" ").append(classPath).append(" ");
+ }
+
+ sb.append("-Djava.io.tmpdir=" + System.getProperty("java.io.tmpdir", "./tmp")).append(" ");
+
+ sb.append("-Djava.library.path=").append(System.getProperty("java.library.path", "./native/bin")).append(" ");
+
+ String loggingConfigFile = System.getProperty("java.util.logging.config.file");
+ if (loggingConfigFile != null)
+ {
+ sb.append(" -Djava.util.logging.config.file=" + loggingConfigFile + " ");
+ }
+ String loggingPlugin = System.getProperty("org.jboss.logging.Logger.pluginClass");
+ if (loggingPlugin != null)
+ {
+ sb.append(" -Dorg.jboss.logging.Logger.pluginClass=" + loggingPlugin + " ");
+ }
+
+ // sb.append("-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 ");
+ sb.append(className).append(' ');
+
+ for (String arg : args)
+ {
+ sb.append(arg).append(' ');
+ }
+
+ String commandLine = sb.toString();
+
+ SpawnedVMSupport.log.trace("command line: " + commandLine);
+
+ Process process = Runtime.getRuntime().exec(commandLine);
+
+ SpawnedVMSupport.log.trace("process: " + process);
+
+ if (logOutput)
+ {
+ SpawnedVMSupport.startLogger(className, process);
+
+ }
+
+ // Adding a reader to System.err, so the VM won't hang on a System.err.println as identified on this forum thread:
+ // http://www.jboss.org/index.html?module=bb&op=viewtopic&t=151815
+ ProcessLogger errorLogger = new ProcessLogger(logErrorOutput, process.getErrorStream(), className);
+ errorLogger.start();
+
+ return process;
+ }
+
+ /**
+ * @param className
+ * @param process
+ * @throws ClassNotFoundException
+ */
+ public static void startLogger(final String className, final Process process) throws ClassNotFoundException
+ {
+ ProcessLogger outputLogger = new ProcessLogger(true, process.getInputStream(), className);
+ outputLogger.start();
+ }
+
+ /**
+ * Assert that a process exits with the expected value (or not depending if
+ * the <code>sameValue</code> is expected or not). The method waits 5
+ * seconds for the process to exit, then an Exception is thrown. In any case,
+ * the process is destroyed before the method returns.
+ */
+ public static void assertProcessExits(final boolean sameValue, final int value, final Process p) throws InterruptedException,
+ ExecutionException,
+ TimeoutException
+ {
+ ScheduledExecutorService executor = Executors.newSingleThreadScheduledExecutor();
+ Future<Integer> future = executor.submit(new Callable<Integer>()
+ {
+
+ public Integer call() throws Exception
+ {
+ p.waitFor();
+ return p.exitValue();
+ }
+ });
+ try
+ {
+ int exitValue = future.get(10, SECONDS);
+ if (sameValue)
+ {
+ Assert.assertSame(value, exitValue);
+ }
+ else
+ {
+ Assert.assertNotSame(value, exitValue);
+ }
+ }
+ finally
+ {
+ p.destroy();
+ }
+ }
+
+ /**
+ * Redirect the input stream to a logger (as debug logs)
+ */
+ static class ProcessLogger extends Thread
+ {
+ private final InputStream is;
+
+ private final String className;
+
+ private final boolean print;
+
+ ProcessLogger(final boolean print, final InputStream is, final String className) throws ClassNotFoundException
+ {
+ this.is = is;
+ this.print = print;
+ this.className = className;
+ setDaemon(true);
+ }
+
+ @Override
+ public void run()
+ {
+ try
+ {
+ InputStreamReader isr = new InputStreamReader(is);
+ BufferedReader br = new BufferedReader(isr);
+ String line = null;
+ while ((line = br.readLine()) != null)
+ {
+ if (print)
+ {
+ System.out.println(className + ":" + line);
+ }
+ }
+ }
+ catch (IOException ioe)
+ {
+ ioe.printStackTrace();
+ }
+ }
+ }
+
+ // Constructors --------------------------------------------------
+
+ // Public --------------------------------------------------------
+
+ // Package protected ---------------------------------------------
+
+ // Protected -----------------------------------------------------
+
+ // Private -------------------------------------------------------
+
+ // Inner classes -------------------------------------------------
+
+}
Deleted: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/util/SpawnedVMSupport.java
===================================================================
--- trunk/tests/integration-tests/src/test/java/org/hornetq/tests/util/SpawnedVMSupport.java 2011-04-11 12:47:21 UTC (rev 10475)
+++ trunk/tests/integration-tests/src/test/java/org/hornetq/tests/util/SpawnedVMSupport.java 2011-04-11 17:24:31 UTC (rev 10476)
@@ -1,254 +0,0 @@
-/*
- * Copyright 2009 Red Hat, Inc.
- * Red Hat licenses this file to you under the Apache License, version
- * 2.0 (the "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-package org.hornetq.tests.util;
-
-import static java.util.concurrent.TimeUnit.SECONDS;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeoutException;
-
-import junit.framework.Assert;
-
-import org.hornetq.core.logging.Logger;
-
-/**
- * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
- * @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
- * @author <a href="mailto:csuconic at redhat.com">Clebert Suconic</a>
- *
- * @version <tt>$Revision$</tt>
- *
- */
-public class SpawnedVMSupport
-{
- // Constants -----------------------------------------------------
-
- private static final Logger log = Logger.getLogger(SpawnedVMSupport.class);
-
- // Attributes ----------------------------------------------------
-
- // Static --------------------------------------------------------
-
- public static Process spawnVM(final String className, final String... args) throws Exception
- {
- return SpawnedVMSupport.spawnVM(className, new String[0], true, args);
- }
-
- public static Process spawnVM(final String className, final boolean logOutput, final String... args) throws Exception
- {
- return SpawnedVMSupport.spawnVM(className, new String[0], logOutput, args);
- }
-
- public static Process spawnVM(final String className, final String[] vmargs, final String... args) throws Exception
- {
- return SpawnedVMSupport.spawnVM(className, vmargs, true, args);
- }
-
- public static Process spawnVM(final String className,
- final String[] vmargs,
- final boolean logOutput,
- final String... args) throws Exception
- {
- return SpawnedVMSupport.spawnVM(className, "-Xms512m -Xmx512m ", vmargs, logOutput, false, args);
- }
-
- public static Process spawnVM(final String className,
- final String memoryArgs,
- final String[] vmargs,
- final boolean logOutput,
- final boolean logErrorOutput,
- final String... args) throws Exception
- {
- StringBuffer sb = new StringBuffer();
-
- sb.append("java").append(' ');
-
- sb.append(memoryArgs);
-
- for (String vmarg : vmargs)
- {
- sb.append(vmarg).append(' ');
- }
-
- String classPath = System.getProperty("java.class.path");
-
- String osName = System.getProperty("os.name");
- osName = (osName != null) ? osName.toLowerCase() : "";
- boolean isWindows = osName.contains("win");
- if (isWindows)
- {
- sb.append("-cp").append(" \"").append(classPath).append("\" ");
- }
- else
- {
- sb.append("-cp").append(" ").append(classPath).append(" ");
- }
-
- sb.append("-Djava.io.tmpdir=" + System.getProperty("java.io.tmpdir", "./tmp")).append(" ");
-
- sb.append("-Djava.library.path=").append(System.getProperty("java.library.path", "./native/bin")).append(" ");
-
- String loggingConfigFile = System.getProperty("java.util.logging.config.file");
- if (loggingConfigFile != null)
- {
- sb.append(" -Djava.util.logging.config.file=" + loggingConfigFile + " ");
- }
- String loggingPlugin = System.getProperty("org.jboss.logging.Logger.pluginClass");
- if (loggingPlugin != null)
- {
- sb.append(" -Dorg.jboss.logging.Logger.pluginClass=" + loggingPlugin + " ");
- }
-
- // sb.append("-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 ");
- sb.append(className).append(' ');
-
- for (String arg : args)
- {
- sb.append(arg).append(' ');
- }
-
- String commandLine = sb.toString();
-
- SpawnedVMSupport.log.trace("command line: " + commandLine);
-
- Process process = Runtime.getRuntime().exec(commandLine);
-
- SpawnedVMSupport.log.trace("process: " + process);
-
- if (logOutput)
- {
- SpawnedVMSupport.startLogger(className, process);
-
- }
-
- // Adding a reader to System.err, so the VM won't hang on a System.err.println as identified on this forum thread:
- // http://www.jboss.org/index.html?module=bb&op=viewtopic&t=151815
- ProcessLogger errorLogger = new ProcessLogger(logErrorOutput, process.getErrorStream(), className);
- errorLogger.start();
-
- return process;
- }
-
- /**
- * @param className
- * @param process
- * @throws ClassNotFoundException
- */
- public static void startLogger(final String className, final Process process) throws ClassNotFoundException
- {
- ProcessLogger outputLogger = new ProcessLogger(true, process.getInputStream(), className);
- outputLogger.start();
- }
-
- /**
- * Assert that a process exits with the expected value (or not depending if
- * the <code>sameValue</code> is expected or not). The method waits 5
- * seconds for the process to exit, then an Exception is thrown. In any case,
- * the process is destroyed before the method returns.
- */
- public static void assertProcessExits(final boolean sameValue, final int value, final Process p) throws InterruptedException,
- ExecutionException,
- TimeoutException
- {
- ScheduledExecutorService executor = Executors.newSingleThreadScheduledExecutor();
- Future<Integer> future = executor.submit(new Callable<Integer>()
- {
-
- public Integer call() throws Exception
- {
- p.waitFor();
- return p.exitValue();
- }
- });
- try
- {
- int exitValue = future.get(10, SECONDS);
- if (sameValue)
- {
- Assert.assertSame(value, exitValue);
- }
- else
- {
- Assert.assertNotSame(value, exitValue);
- }
- }
- finally
- {
- p.destroy();
- }
- }
-
- /**
- * Redirect the input stream to a logger (as debug logs)
- */
- static class ProcessLogger extends Thread
- {
- private final InputStream is;
-
- private final String className;
-
- private final boolean print;
-
- ProcessLogger(final boolean print, final InputStream is, final String className) throws ClassNotFoundException
- {
- this.is = is;
- this.print = print;
- this.className = className;
- setDaemon(true);
- }
-
- @Override
- public void run()
- {
- try
- {
- InputStreamReader isr = new InputStreamReader(is);
- BufferedReader br = new BufferedReader(isr);
- String line = null;
- while ((line = br.readLine()) != null)
- {
- if (print)
- {
- System.out.println(className + ":" + line);
- }
- }
- }
- catch (IOException ioe)
- {
- ioe.printStackTrace();
- }
- }
- }
-
- // Constructors --------------------------------------------------
-
- // Public --------------------------------------------------------
-
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
-
-}
Modified: trunk/tests/joram-tests/hornetq-joram-tests.iml
===================================================================
--- trunk/tests/joram-tests/hornetq-joram-tests.iml 2011-04-11 12:47:21 UTC (rev 10475)
+++ trunk/tests/joram-tests/hornetq-joram-tests.iml 2011-04-11 17:24:31 UTC (rev 10476)
@@ -3,7 +3,6 @@
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/output" />
</content>
<orderEntry type="inheritedJdk" />
Copied: trunk/tests/joram-tests/pom.xml (from rev 10474, trunk/tests/jms-tests/pom.xml)
===================================================================
--- trunk/tests/joram-tests/pom.xml (rev 0)
+++ trunk/tests/joram-tests/pom.xml 2011-04-11 17:24:31 UTC (rev 10476)
@@ -0,0 +1,134 @@
+<!--
+ ~ Copyright 2009 Red Hat, Inc.
+ ~ Red Hat licenses this file to you under the Apache License, version
+ ~ 2.0 (the "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ ~ implied. See the License for the specific language governing
+ ~ permissions and limitations under the License.
+ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.hornetq.tests</groupId>
+ <artifactId>hornetq-tests-pom</artifactId>
+ <version>2.2.3-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.hornetq.tests</groupId>
+ <artifactId>joram-tests</artifactId>
+ <packaging>jar</packaging>
+ <name>HornetQ Unit Tests</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.hornetq.tests</groupId>
+ <artifactId>unit-tests</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.hornetq.tests</groupId>
+ <artifactId>integration-tests</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-jms</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-ra</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-bootstrap</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-jca-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.security</groupId>
+ <artifactId>jboss-security-spi</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.security</groupId>
+ <artifactId>jbosssx</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.naming</groupId>
+ <artifactId>jnpserver</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jboss.jbossts</groupId>
+ <artifactId>jbossts-common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>apache-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-transaction-api</artifactId>
+ </dependency>
+ <!--this specifically for the JMS Bridge-->
+ <dependency>
+ <groupId>org.jboss.integration</groupId>
+ <artifactId>jboss-transaction-spi</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-jaspi-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-jms-api</artifactId>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <testResources>
+ <testResource>
+ <directory>config</directory>
+ </testResource>
+ </testResources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <includes>
+ <include>**/*Test.java</include>
+ </includes>
+ </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>
+
+</project>
Modified: trunk/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/framework/JMSTestCase.java
===================================================================
--- trunk/tests/joram-tests/src/org/objectweb/jtests/jms/framework/JMSTestCase.java 2011-04-08 20:22:53 UTC (rev 10473)
+++ trunk/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/framework/JMSTestCase.java 2011-04-11 17:24:31 UTC (rev 10476)
@@ -35,7 +35,7 @@
*/
public abstract class JMSTestCase extends TestCase
{
- private static final String PROP_FILE_NAME = "provider.properties";
+ private static final String PROP_FILE_NAME = "config/provider.properties";
protected Admin admin;
Modified: trunk/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/framework/TestConfig.java
===================================================================
--- trunk/tests/joram-tests/src/org/objectweb/jtests/jms/framework/TestConfig.java 2011-04-08 20:22:53 UTC (rev 10473)
+++ trunk/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/framework/TestConfig.java 2011-04-11 17:24:31 UTC (rev 10476)
@@ -24,7 +24,7 @@
public class TestConfig
{
// name of the configuration file
- private static final String PROP_FILE_NAME = "test.properties";
+ private static final String PROP_FILE_NAME = "config/test.properties";
// name of the timeout property
private static final String PROP_NAME = "timeout";
Modified: trunk/tests/pom.xml
===================================================================
--- trunk/tests/pom.xml 2011-04-11 12:47:21 UTC (rev 10475)
+++ trunk/tests/pom.xml 2011-04-11 17:24:31 UTC (rev 10476)
@@ -27,5 +27,6 @@
<module>unit-tests</module>
<module>integration-tests</module>
<module>jms-tests</module>
+ <module>joram-tests</module>
</modules>
</project>
More information about the hornetq-commits
mailing list