Issue 3 - version bump, some test issues fixed, surefire version bump (…

…#4) * See #3 (comment) * See #3 (comment) * See #3 (comment)
cquoss · Jan 2, 2022 · a92e754 · a92e754
1 parent 63b1820
commit a92e754
Show file tree

Hide file tree

Showing 28 changed files with 128 additions and 135 deletions.
diff --git a/.gitignore b/.gitignore
@@ -13,3 +13,10 @@ buildNumber.properties
 # IntelliJ IdeaIU
 .idea/
 *.iml
+# Apache ActiveMQ
+ActiveMQConnections.dot
+activemq-data/
+/data/
+/activemq-core/derbydb/
+/activemq-core/testJdbcConfig/
+/activemq-core/derby.log
diff --git a/activemq-console/pom.xml b/activemq-console/pom.xml
@@ -27,7 +27,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>4.1.1</version>
+    <version>4.1.1-j8</version>
   </parent>
 
   <artifactId>activemq-console</artifactId>
@@ -37,16 +37,16 @@
   <dependencies>
     <!-- activemq related dependencies -->
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>activemq-core</artifactId>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>activemq-core</artifactId>
       <type>test-jar</type>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>activeio-core</artifactId>
     </dependency>
 

diff --git a/activemq-core/pom.xml b/activemq-core/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>4.1.1</version>
+    <version>4.1.1-j8</version>
   </parent>
 
   <artifactId>activemq-core</artifactId>
@@ -50,7 +50,7 @@
     </dependency>
 
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>activeio-core</artifactId>
       <optional>false</optional>
     </dependency>
@@ -172,9 +172,7 @@
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
-          <forkMode>pertest</forkMode>
-          <childDelegation>false</childDelegation>
-          <useFile>true</useFile>
+          <reuseForks>false</reuseForks>
           <argLine>-Xmx512M</argLine>
           <includes>
             <include>**/*Test.*</include>

diff --git a/activemq-core/src/test/java/org/apache/activemq/config/BrokerXmlConfigFromJNDITest.java b/activemq-core/src/test/java/org/apache/activemq/config/BrokerXmlConfigFromJNDITest.java
@@ -30,28 +30,21 @@
  * @version $Revision: 467693 $
  */
 public class BrokerXmlConfigFromJNDITest extends JmsTopicSendReceiveWithTwoConnectionsTest {
+
     protected ActiveMQConnectionFactory createConnectionFactory() throws Exception {
-        // START SNIPPET: example
 
-
-//        System.err.print(System.getProperties());
-
-        // we could put these properties into a jndi.properties
-        // on the classpath instead
-        Hashtable properties = new Hashtable();
+        final Hashtable<String, String> properties = new Hashtable<>();
         properties.put("java.naming.factory.initial", "org.apache.activemq.jndi.ActiveMQInitialContextFactory");
 
         // configure the embedded broker using an XML config file
         // which is either a URL or a resource on the classpath
 
-        File f = new File(System.getProperty("basedir", "."));
-        properties.put(Context.PROVIDER_URL, "vm://localhost?brokerConfig=xbean:file:"+f+"/src/test/resources/activemq.xml");
+        final String providerUrl = "vm://localhost?brokerConfig=xbean:classpath:activemq.xml";
+        properties.put(Context.PROVIDER_URL, providerUrl);
 
-        InitialContext context = new InitialContext(properties);
-        ActiveMQConnectionFactory connectionFactory = (ActiveMQConnectionFactory) context.lookup("ConnectionFactory");
+        final InitialContext context = new InitialContext(properties);
+        return (ActiveMQConnectionFactory) context.lookup("ConnectionFactory");
 
-        // END SNIPPET: example
-        return connectionFactory;
     }
 
 }
diff --git a/activemq-core/src/test/java/org/apache/activemq/config/ConfigTest.java b/activemq-core/src/test/java/org/apache/activemq/config/ConfigTest.java
@@ -75,10 +75,12 @@ public class ConfigTest extends TestCase {
      */
 
     /*
-     * This tests creating a journal persistence adapter using the persistence adapter factory bean
+     * This test creates a journal persistence adapter using the persistence adapter factory bean.
      */
     public void testJournaledJDBCConfig() throws Exception {
-//        System.out.print("Checking journaled JDBC persistence adapter configuration... ");
+
+        if (log.isDebugEnabled())
+            log.debug("testJournaledJDBCConfig() start");
 
         File journalFile = new File(JOURNAL_ROOT + "testJournaledJDBCConfig/journal");
         recursiveDelete(journalFile);
@@ -98,16 +100,17 @@ public void testJournaledJDBCConfig() throws Exception {
             assertTrue("Should have created a journal directory at " + journalFile.getAbsolutePath(), journalFile.exists());
 
 
-            // Check persistence factory configurations
-//            System.out.print("Checking persistence adapter factory settings... ");
+            // TODO Check persistence factory configurations
             JournalPersistenceAdapter pa = (JournalPersistenceAdapter) broker.getPersistenceAdapter();
-            
+
             log.info("Success");
         } finally {
             if (broker != null) {
                 broker.stop();
             }
         }
+        if (log.isDebugEnabled())
+            log.debug("testJournaledJDBCConfig() end");
     }
 
     /*

diff --git a/activemq-core/src/test/resources/log4j.properties b/activemq-core/src/test/resources/log4j.properties
@@ -16,11 +16,12 @@
 ## ---------------------------------------------------------------------------
 
 #
-# The logging properties used during tests..
+# The logging properties used during tests ...
 #
 log4j.rootLogger=INFO, out
 
 log4j.logger.org.apache.activemq.spring=WARN
+log4j.logger.org.apache.activemq.test.JmsTopicSendReceiveWithTwoConnectionsTest=DEBUG
 
 # CONSOLE appender not used by default
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender

diff --git a/activemq-core/src/test/resources/org/apache/activemq/config/sample-conf/jdbc-example.xml b/activemq-core/src/test/resources/org/apache/activemq/config/sample-conf/jdbc-example.xml
@@ -1,4 +1,4 @@
-???<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
     Licensed to the Apache Software Foundation (ASF) under one or more
     contributor license agreements.  See the NOTICE file distributed with

diff --git a/activemq-jaas/pom.xml b/activemq-jaas/pom.xml
@@ -27,7 +27,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>4.1.1</version>
+    <version>4.1.1-j8</version>
   </parent>
 
   <artifactId>activemq-jaas</artifactId>

diff --git a/activemq-openwire-generator/pom.xml b/activemq-openwire-generator/pom.xml
@@ -27,7 +27,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>4.1.1</version>
+    <version>4.1.1-j8</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/activemq-optional/pom.xml b/activemq-optional/pom.xml
@@ -27,7 +27,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>4.1.1</version>
+    <version>4.1.1-j8</version>
   </parent>
 
   <artifactId>activemq-optional</artifactId>
@@ -37,17 +37,17 @@
   <dependencies>
     <!-- activemq -->
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>activemq-core</artifactId>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>activemq-core</artifactId>
       <scope>test</scope>
       <type>test-jar</type>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>activeio-core</artifactId>
     </dependency>    
 
@@ -95,8 +95,9 @@
     </dependency>
 
     <dependency>
-      <groupId>commons-httpclient</groupId>
-      <artifactId>commons-httpclient</artifactId>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <scope>compile</scope>
     </dependency>
 
     <dependency>

diff --git a/activemq-ra/pom.xml b/activemq-ra/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>4.1.1</version>
+    <version>4.1.1-j8</version>
   </parent>
 
   <artifactId>activemq-ra</artifactId>

diff --git a/activemq-rar/pom.xml b/activemq-rar/pom.xml
@@ -27,7 +27,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>4.1.1</version>
+    <version>4.1.1-j8</version>
   </parent>
 
   <artifactId>activemq-rar</artifactId>
@@ -39,7 +39,7 @@
 
     <!-- activemq -->
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>activemq-ra</artifactId>
       <exclusions>
         <exclusion>
@@ -83,7 +83,7 @@
            <artifactId>axion</artifactId>
         </exclusion>
         <exclusion>
-           <groupId>${pom.groupId}</groupId>
+           <groupId>${project.groupId}</groupId>
            <artifactId>activemq-jaas</artifactId>
         </exclusion>
         <exclusion>

diff --git a/activemq-repository-builder/pom.xml b/activemq-repository-builder/pom.xml
@@ -35,7 +35,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>org.apache.activemq</artifactId>
     </dependency>
   </dependencies>

diff --git a/activemq-soaktest/project.xml b/activemq-soaktest/project.xml
@@ -30,7 +30,7 @@
   <dependencies>
 
       <dependency>
-        <groupId>${pom.groupId}</groupId>
+        <groupId>${project.groupId}</groupId>
         <artifactId>activemq-core</artifactId>
         <version>${pom.currentVersion}</version>
         <properties>
@@ -40,7 +40,7 @@
       </dependency>
 
       <dependency>
-        <groupId>${pom.groupId}</groupId>
+        <groupId>${project.groupId}</groupId>
         <artifactId>activeio-core</artifactId>
         <version>${activeio_version}</version>
         <properties>
@@ -50,7 +50,7 @@
       </dependency>
 
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>activemq-core-test</artifactId>
       <version>${pom.currentVersion}</version>
     </dependency>

diff --git a/activemq-systest/project.xml b/activemq-systest/project.xml
@@ -56,7 +56,7 @@
     </dependency>
 
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>activemq-core</artifactId>
       <version>${pom.currentVersion}</version>
       <properties>
@@ -91,7 +91,7 @@
     </dependency>
 
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>activeio-core</artifactId>
       <version>${activeio_version}</version>
       <properties>

diff --git a/activemq-test-atomikos/pom.xml b/activemq-test-atomikos/pom.xml
@@ -27,13 +27,17 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>4.1.1</version>
+    <version>4.1.1-j8</version>
   </parent>
 
   <artifactId>activemq-test-atomikos</artifactId>
   <packaging>jar</packaging>
   <name>ActiveMQ :: Atomikos System Test</name>
 
+  <properties>
+    <atomikos.version>3.2.3</atomikos.version>
+  </properties>
+
   <repositories>
     <!-- for the Atomikos jars -->
     <repository>
@@ -51,17 +55,17 @@
   <dependencies>
     <!-- activemq -->
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>activemq-core</artifactId>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>activemq-core</artifactId>
       <scope>compile</scope>
       <type>test-jar</type>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>activeio-core</artifactId>
     </dependency>
     <dependency>
@@ -73,22 +77,22 @@
     <dependency>
       <groupId>com.atomikos</groupId>
       <artifactId>transactions</artifactId>
-      <version>3.1.0</version>
+      <version>${atomikos.version}</version>
     </dependency>
     <dependency>
       <groupId>com.atomikos</groupId>
       <artifactId>transactions-api</artifactId>
-      <version>3.1.0</version>
+      <version>${atomikos.version}</version>
     </dependency>
     <dependency>
       <groupId>com.atomikos</groupId>
       <artifactId>transactions-jta</artifactId>
-      <version>3.1.0</version>
+      <version>${atomikos.version}</version>
     </dependency>
     <dependency>
       <groupId>com.atomikos</groupId>
       <artifactId>atomikos-util</artifactId>
-      <version>3.1.0</version>
+      <version>${atomikos.version}</version>
     </dependency>
 
     <dependency>

diff --git a/activemq-tooling/maven-activemq-memtest-plugin/pom.xml b/activemq-tooling/maven-activemq-memtest-plugin/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.activemq.tooling</groupId>
         <artifactId>activemq-tooling</artifactId>
-        <version>4.1.1</version>
+        <version>4.1.1-j8</version>
 	</parent>
 
 	<artifactId>maven-activemq-memtest-plugin</artifactId>

diff --git a/activemq-tooling/maven-activemq-perf-plugin/pom.xml b/activemq-tooling/maven-activemq-perf-plugin/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.activemq.tooling</groupId>
         <artifactId>activemq-tooling</artifactId>
-        <version>4.1.1</version>
+        <version>4.1.1-j8</version>
 	</parent>
 
     <artifactId>maven-activemq-perf-plugin</artifactId>