activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clebertsuco...@apache.org
Subject [01/20] activemq-6 git commit: ACTIVEMQ6-4 - rename all config files
Date Tue, 18 Nov 2014 16:12:14 GMT
Repository: activemq-6
Updated Branches:
  refs/heads/master 571fb7a23 -> b5d695f03


http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/examples/soak/normal/server0/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/soak/normal/server0/hornetq-jms.xml b/examples/soak/normal/server0/hornetq-jms.xml
deleted file mode 100644
index 050829c..0000000
--- a/examples/soak/normal/server0/hornetq-jms.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<configuration xmlns="urn:activemq"
-            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>
-	  <retry-interval>1000</retry-interval> 
-      <retry-interval-multiplier>1.0</retry-interval-multiplier> 
-      <reconnect-attempts>-1</reconnect-attempts> 
-      <failover-on-server-shutdown>true</failover-on-server-shutdown> 
-      <call-timeout>5000</call-timeout> 
-   </connection-factory>
-   
-   <queue name="soakQueue">
-      <entry name="soakQueue"/>
-   </queue>
-
-</configuration>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/tests/config/server-start-stop-backup-config1.xml
----------------------------------------------------------------------
diff --git a/tests/config/server-start-stop-backup-config1.xml b/tests/config/server-start-stop-backup-config1.xml
index a4619a3..5dcca84 100644
--- a/tests/config/server-start-stop-backup-config1.xml
+++ b/tests/config/server-start-stop-backup-config1.xml
@@ -1,6 +1,6 @@
 <configuration xmlns="urn:activemq"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
+         xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd">
    
    
    <backup>true</backup>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/tests/config/server-start-stop-backup-jms-config1.xml
----------------------------------------------------------------------
diff --git a/tests/config/server-start-stop-backup-jms-config1.xml b/tests/config/server-start-stop-backup-jms-config1.xml
index b81e688..f4bbed1 100644
--- a/tests/config/server-start-stop-backup-jms-config1.xml
+++ b/tests/config/server-start-stop-backup-jms-config1.xml
@@ -1,6 +1,6 @@
 <configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
+            xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd">
    <!--the connection factory used by the example-->
    <connection-factory name="ConnectionFactory">
       <connector-ref connector-name="netty-connector"/>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/tests/config/server-start-stop-live-config1.xml
----------------------------------------------------------------------
diff --git a/tests/config/server-start-stop-live-config1.xml b/tests/config/server-start-stop-live-config1.xml
index 096a2fa..c68ebb9 100644
--- a/tests/config/server-start-stop-live-config1.xml
+++ b/tests/config/server-start-stop-live-config1.xml
@@ -1,6 +1,6 @@
 <configuration xmlns="urn:activemq"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="urn:hornetq ../../../src/schema/hornetq-configuration.xsd">
+         xsi:schemaLocation="urn:hornetq ../../../src/schema/activemq-configuration.xsd">
    
    
    <backup-connector-ref connector-name="backup-connector"/>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/tests/config/server-start-stop-live-jms-config1.xml
----------------------------------------------------------------------
diff --git a/tests/config/server-start-stop-live-jms-config1.xml b/tests/config/server-start-stop-live-jms-config1.xml
index b9281a2..34148a3 100644
--- a/tests/config/server-start-stop-live-jms-config1.xml
+++ b/tests/config/server-start-stop-live-jms-config1.xml
@@ -1,6 +1,6 @@
 <configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
+            xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd">
    <!--the connection factory used by the example-->
    <connection-factory name="ConnectionFactory">
       <connectors>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/tests/integration-tests/src/test/resources/colocated-server-start-stop-config1.xml
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/resources/colocated-server-start-stop-config1.xml
b/tests/integration-tests/src/test/resources/colocated-server-start-stop-config1.xml
index ada8eab..ebc4bc1 100644
--- a/tests/integration-tests/src/test/resources/colocated-server-start-stop-config1.xml
+++ b/tests/integration-tests/src/test/resources/colocated-server-start-stop-config1.xml
@@ -1,6 +1,6 @@
 <configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
+            xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd">
 
    <connectors>
       <connector name="netty-connector">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/tests/integration-tests/src/test/resources/colocated-server-start-stop-config2.xml
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/resources/colocated-server-start-stop-config2.xml
b/tests/integration-tests/src/test/resources/colocated-server-start-stop-config2.xml
index 6b1e936..cde31e7 100644
--- a/tests/integration-tests/src/test/resources/colocated-server-start-stop-config2.xml
+++ b/tests/integration-tests/src/test/resources/colocated-server-start-stop-config2.xml
@@ -1,6 +1,6 @@
 <configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="urn:hornetq schema/hornetq-configuration.xsd">
+            xsi:schemaLocation="urn:hornetq schema/activemq-configuration.xsd">
 
    <connectors>
       <connector name="netty-connector">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/tests/integration-tests/src/test/resources/colocated-server-start-stop-jms-config1.xml
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/resources/colocated-server-start-stop-jms-config1.xml
b/tests/integration-tests/src/test/resources/colocated-server-start-stop-jms-config1.xml
index 9633928..e673504 100644
--- a/tests/integration-tests/src/test/resources/colocated-server-start-stop-jms-config1.xml
+++ b/tests/integration-tests/src/test/resources/colocated-server-start-stop-jms-config1.xml
@@ -1,6 +1,6 @@
 <configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
+            xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd">
    <!--the connection factory used by the example-->
    <connection-factory name="ConnectionFactory">
       <connectors>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/tests/integration-tests/src/test/resources/colocated-server-start-stop-jms-config2.xml
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/resources/colocated-server-start-stop-jms-config2.xml
b/tests/integration-tests/src/test/resources/colocated-server-start-stop-jms-config2.xml
index 9633928..e673504 100644
--- a/tests/integration-tests/src/test/resources/colocated-server-start-stop-jms-config2.xml
+++ b/tests/integration-tests/src/test/resources/colocated-server-start-stop-jms-config2.xml
@@ -1,6 +1,6 @@
 <configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
+            xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd">
    <!--the connection factory used by the example-->
    <connection-factory name="ConnectionFactory">
       <connectors>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/tests/integration-tests/src/test/resources/hornetq-jms-for-JMSServerDeployerTest.xml
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/resources/hornetq-jms-for-JMSServerDeployerTest.xml
b/tests/integration-tests/src/test/resources/hornetq-jms-for-JMSServerDeployerTest.xml
index 3854c08..493cfbe 100644
--- a/tests/integration-tests/src/test/resources/hornetq-jms-for-JMSServerDeployerTest.xml
+++ b/tests/integration-tests/src/test/resources/hornetq-jms-for-JMSServerDeployerTest.xml
@@ -1,6 +1,6 @@
 <configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="urn:hornetq ../../src/schemas/hornetq-jms.xsd ">
+            xsi:schemaLocation="urn:hornetq ../../src/schemas/activemq-jms.xsd ">
 
    <connection-factory name="fullConfigurationConnectionFactory">
       <entries>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/tests/integration-tests/src/test/resources/hornetq-jms-for-JMSServerDeployerTest2.xml
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/resources/hornetq-jms-for-JMSServerDeployerTest2.xml
b/tests/integration-tests/src/test/resources/hornetq-jms-for-JMSServerDeployerTest2.xml
index e449dbc..e8ff393 100644
--- a/tests/integration-tests/src/test/resources/hornetq-jms-for-JMSServerDeployerTest2.xml
+++ b/tests/integration-tests/src/test/resources/hornetq-jms-for-JMSServerDeployerTest2.xml
@@ -1,6 +1,6 @@
 <configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="urn:hornetq ../../src/schemas/hornetq-jms.xsd ">
+            xsi:schemaLocation="urn:hornetq ../../src/schemas/activemq-jms.xsd ">
 
    <connection-factory name="fullConfigurationConnectionFactory">
       <entries>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/tests/integration-tests/src/test/resources/server-start-stop-config1.xml
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/resources/server-start-stop-config1.xml b/tests/integration-tests/src/test/resources/server-start-stop-config1.xml
index 5922f99..d7d384d 100644
--- a/tests/integration-tests/src/test/resources/server-start-stop-config1.xml
+++ b/tests/integration-tests/src/test/resources/server-start-stop-config1.xml
@@ -1,6 +1,6 @@
 <configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
+            xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd">
 
    <connectors>
       <connector name="netty-connector">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/tests/integration-tests/src/test/resources/server-start-stop-jms-config1.xml
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/resources/server-start-stop-jms-config1.xml
b/tests/integration-tests/src/test/resources/server-start-stop-jms-config1.xml
index b9281a2..34148a3 100644
--- a/tests/integration-tests/src/test/resources/server-start-stop-jms-config1.xml
+++ b/tests/integration-tests/src/test/resources/server-start-stop-jms-config1.xml
@@ -1,6 +1,6 @@
 <configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
+            xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd">
    <!--the connection factory used by the example-->
    <connection-factory name="ConnectionFactory">
       <connectors>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/tests/integration-tests/src/test/resources/spring-hornetq-config.xml
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/resources/spring-hornetq-config.xml b/tests/integration-tests/src/test/resources/spring-hornetq-config.xml
index 5412a93..f704dc7 100644
--- a/tests/integration-tests/src/test/resources/spring-hornetq-config.xml
+++ b/tests/integration-tests/src/test/resources/spring-hornetq-config.xml
@@ -1,6 +1,6 @@
 <configuration xmlns="urn:activemq"
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-               xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
+               xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd">
 
     <persistence-enabled>false</persistence-enabled>
     <security-enabled>false</security-enabled>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/tests/integration-tests/src/test/resources/spring-hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/resources/spring-hornetq-jms.xml b/tests/integration-tests/src/test/resources/spring-hornetq-jms.xml
index 3461588..cc3fde7 100644
--- a/tests/integration-tests/src/test/resources/spring-hornetq-jms.xml
+++ b/tests/integration-tests/src/test/resources/spring-hornetq-jms.xml
@@ -1,6 +1,6 @@
 <configuration xmlns="urn:activemq"
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-               xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
+               xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd">
     <!--the connection factory used by the example-->
     <connection-factory name="ConnectionFactory">
         <connectors>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/tests/jms-tests/src/test/resources/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/tests/jms-tests/src/test/resources/activemq-configuration.xml b/tests/jms-tests/src/test/resources/activemq-configuration.xml
new file mode 100644
index 0000000..5083399
--- /dev/null
+++ b/tests/jms-tests/src/test/resources/activemq-configuration.xml
@@ -0,0 +1,38 @@
+<configuration xmlns="urn:activemq"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:schemaLocation="urn:hornetq ../../../src/schema/activemq-configuration.xsd">
+
+      <!-- Connectors -->
+      <connectors>
+
+         <connector name="netty">
+            <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
+         </connector>
+
+
+         <connector name="in-vm">
+            <factory-class>org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory</factory-class>
+         </connector>
+      </connectors>
+
+      <!-- Acceptors -->
+      <acceptors>
+         <!-- In VM acceptor -->
+         <acceptor name="in-vm">
+            <factory-class>org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory</factory-class>
+            <param key="server-id" value="0"/>
+         </acceptor>
+
+         <!-- Netty TCP Acceptor -->
+         <acceptor name="netty">
+            <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
+         </acceptor>
+
+      </acceptors>
+
+     <journal-min-files>2</journal-min-files>
+     <paging-directory>target/data/paging</paging-directory>
+     <bindings-directory>target/data/binding</bindings-directory>
+     <journal-directory>target/data/journal</journal-directory>
+     <large-messages-directory>target/data/largemessages</large-messages-directory>
+</configuration>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/tests/jms-tests/src/test/resources/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/tests/jms-tests/src/test/resources/activemq-jms.xml b/tests/jms-tests/src/test/resources/activemq-jms.xml
new file mode 100644
index 0000000..d7f5b18
--- /dev/null
+++ b/tests/jms-tests/src/test/resources/activemq-jms.xml
@@ -0,0 +1,126 @@
+<configuration xmlns="urn:activemq"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd">
+
+   <connection-factory name="ConnectionFactory">
+      <connectors>
+         <connector-ref connector-name="netty"/>
+      </connectors>
+      <entries>
+         <entry name="ConnectionFactory"/>
+         <entry name="/ConnectionFactory"/>
+         <entry name="/XAConnectionFactory"/>
+         <entry name="java:/ConnectionFactory"/>
+         <entry name="java:/XAConnectionFactory"/>
+      </entries>
+   </connection-factory>
+
+   <connection-factory name="JMSConnectionFactory1">
+      <xa>true</xa>
+      <connectors>
+         <connector-ref connector-name="netty"/>
+      </connectors>
+      <entries>
+         <entry name="/CF_XA_TRUE"/>
+      </entries>
+   </connection-factory>
+
+   <connection-factory name="JMSConnectionFactory2">
+      <xa>false</xa>
+      <connectors>
+         <connector-ref connector-name="netty"/>
+      </connectors>
+      <entries>
+         <entry name="/CF_XA_FALSE"/>
+      </entries>
+   </connection-factory>
+
+   <connection-factory name="JMSConnectionFactory3" signature="generic">
+      <connectors>
+         <connector-ref connector-name="netty"/>
+      </connectors>
+      <entries>
+         <entry name="/CF_GENERIC"/>
+      </entries>
+   </connection-factory>
+
+   <connection-factory name="JMSConnectionFactory4" signature="generic">
+      <xa>true</xa>
+      <connectors>
+         <connector-ref connector-name="netty"/>
+      </connectors>
+      <entries>
+         <entry name="/CF_GENERIC_XA_TRUE"/>
+      </entries>
+   </connection-factory>
+
+   <connection-factory name="JMSConnectionFactory5" signature="generic">
+      <xa>false</xa>
+      <connectors>
+         <connector-ref connector-name="netty"/>
+      </connectors>
+      <entries>
+         <entry name="/CF_GENERIC_XA_FALSE"/>
+      </entries>
+   </connection-factory>
+
+   <connection-factory name="JMSConnectionFactory6" signature="queue">
+      <connectors>
+         <connector-ref connector-name="netty"/>
+      </connectors>
+      <entries>
+         <entry name="/CF_QUEUE"/>
+      </entries>
+   </connection-factory>
+
+   <connection-factory name="JMSConnectionFactory7" signature="queue">
+      <xa>true</xa>
+      <connectors>
+         <connector-ref connector-name="netty"/>
+      </connectors>
+      <entries>
+         <entry name="/CF_QUEUE_XA_TRUE"/>
+      </entries>
+   </connection-factory>
+
+   <connection-factory name="JMSConnectionFactory8" signature="queue">
+      <xa>false</xa>
+      <connectors>
+         <connector-ref connector-name="netty"/>
+      </connectors>
+      <entries>
+         <entry name="/CF_QUEUE_XA_FALSE"/>
+      </entries>
+   </connection-factory>
+
+   <connection-factory name="JMSConnectionFactory9" signature="topic">
+      <connectors>
+         <connector-ref connector-name="netty"/>
+      </connectors>
+      <entries>
+         <entry name="/CF_TOPIC"/>
+      </entries>
+   </connection-factory>
+
+   <connection-factory name="JMSConnectionFactory10" signature="topic">
+      <xa>true</xa>
+      <connectors>
+         <connector-ref connector-name="netty"/>
+      </connectors>
+      <entries>
+         <entry name="/CF_TOPIC_XA_TRUE"/>
+      </entries>
+   </connection-factory>
+
+   <connection-factory name="JMSConnectionFactory11" signature="topic">
+      <xa>false</xa>
+      <connectors>
+         <connector-ref connector-name="netty"/>
+      </connectors>
+      <entries>
+         <entry name="/CF_TOPIC_XA_FALSE"/>
+      </entries>
+   </connection-factory>
+
+</configuration>
+

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/tests/jms-tests/src/test/resources/activemq-users.xml
----------------------------------------------------------------------
diff --git a/tests/jms-tests/src/test/resources/activemq-users.xml b/tests/jms-tests/src/test/resources/activemq-users.xml
new file mode 100644
index 0000000..a58d65c
--- /dev/null
+++ b/tests/jms-tests/src/test/resources/activemq-users.xml
@@ -0,0 +1,10 @@
+<configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:schemaLocation="urn:hornetq /schema/activemq-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>-->
+</configuration>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/tests/jms-tests/src/test/resources/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/tests/jms-tests/src/test/resources/hornetq-configuration.xml b/tests/jms-tests/src/test/resources/hornetq-configuration.xml
deleted file mode 100644
index af58701..0000000
--- a/tests/jms-tests/src/test/resources/hornetq-configuration.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<configuration xmlns="urn:activemq"
-            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="urn:hornetq ../../../src/schema/hornetq-configuration.xsd">
-
-      <!-- Connectors -->
-      <connectors>
-
-         <connector name="netty">
-            <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
-         </connector>
-
-
-         <connector name="in-vm">
-            <factory-class>org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory</factory-class>
-         </connector>
-      </connectors>
-
-      <!-- Acceptors -->
-      <acceptors>
-         <!-- In VM acceptor -->
-         <acceptor name="in-vm">
-            <factory-class>org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory</factory-class>
-            <param key="server-id" value="0"/>
-         </acceptor>
-
-         <!-- Netty TCP Acceptor -->
-         <acceptor name="netty">
-            <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
-         </acceptor>
-
-      </acceptors>
-
-     <journal-min-files>2</journal-min-files>
-     <paging-directory>target/data/paging</paging-directory>
-     <bindings-directory>target/data/binding</bindings-directory>
-     <journal-directory>target/data/journal</journal-directory>
-     <large-messages-directory>target/data/largemessages</large-messages-directory>
-</configuration>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/tests/jms-tests/src/test/resources/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/tests/jms-tests/src/test/resources/hornetq-jms.xml b/tests/jms-tests/src/test/resources/hornetq-jms.xml
deleted file mode 100644
index 244df19..0000000
--- a/tests/jms-tests/src/test/resources/hornetq-jms.xml
+++ /dev/null
@@ -1,126 +0,0 @@
-<configuration xmlns="urn:activemq"
-            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
-
-   <connection-factory name="ConnectionFactory">
-      <connectors>
-         <connector-ref connector-name="netty"/>
-      </connectors>
-      <entries>
-         <entry name="ConnectionFactory"/>
-         <entry name="/ConnectionFactory"/>
-         <entry name="/XAConnectionFactory"/>
-         <entry name="java:/ConnectionFactory"/>
-         <entry name="java:/XAConnectionFactory"/>
-      </entries>
-   </connection-factory>
-
-   <connection-factory name="JMSConnectionFactory1">
-      <xa>true</xa>
-      <connectors>
-         <connector-ref connector-name="netty"/>
-      </connectors>
-      <entries>
-         <entry name="/CF_XA_TRUE"/>
-      </entries>
-   </connection-factory>
-
-   <connection-factory name="JMSConnectionFactory2">
-      <xa>false</xa>
-      <connectors>
-         <connector-ref connector-name="netty"/>
-      </connectors>
-      <entries>
-         <entry name="/CF_XA_FALSE"/>
-      </entries>
-   </connection-factory>
-
-   <connection-factory name="JMSConnectionFactory3" signature="generic">
-      <connectors>
-         <connector-ref connector-name="netty"/>
-      </connectors>
-      <entries>
-         <entry name="/CF_GENERIC"/>
-      </entries>
-   </connection-factory>
-
-   <connection-factory name="JMSConnectionFactory4" signature="generic">
-      <xa>true</xa>
-      <connectors>
-         <connector-ref connector-name="netty"/>
-      </connectors>
-      <entries>
-         <entry name="/CF_GENERIC_XA_TRUE"/>
-      </entries>
-   </connection-factory>
-
-   <connection-factory name="JMSConnectionFactory5" signature="generic">
-      <xa>false</xa>
-      <connectors>
-         <connector-ref connector-name="netty"/>
-      </connectors>
-      <entries>
-         <entry name="/CF_GENERIC_XA_FALSE"/>
-      </entries>
-   </connection-factory>
-
-   <connection-factory name="JMSConnectionFactory6" signature="queue">
-      <connectors>
-         <connector-ref connector-name="netty"/>
-      </connectors>
-      <entries>
-         <entry name="/CF_QUEUE"/>
-      </entries>
-   </connection-factory>
-
-   <connection-factory name="JMSConnectionFactory7" signature="queue">
-      <xa>true</xa>
-      <connectors>
-         <connector-ref connector-name="netty"/>
-      </connectors>
-      <entries>
-         <entry name="/CF_QUEUE_XA_TRUE"/>
-      </entries>
-   </connection-factory>
-
-   <connection-factory name="JMSConnectionFactory8" signature="queue">
-      <xa>false</xa>
-      <connectors>
-         <connector-ref connector-name="netty"/>
-      </connectors>
-      <entries>
-         <entry name="/CF_QUEUE_XA_FALSE"/>
-      </entries>
-   </connection-factory>
-
-   <connection-factory name="JMSConnectionFactory9" signature="topic">
-      <connectors>
-         <connector-ref connector-name="netty"/>
-      </connectors>
-      <entries>
-         <entry name="/CF_TOPIC"/>
-      </entries>
-   </connection-factory>
-
-   <connection-factory name="JMSConnectionFactory10" signature="topic">
-      <xa>true</xa>
-      <connectors>
-         <connector-ref connector-name="netty"/>
-      </connectors>
-      <entries>
-         <entry name="/CF_TOPIC_XA_TRUE"/>
-      </entries>
-   </connection-factory>
-
-   <connection-factory name="JMSConnectionFactory11" signature="topic">
-      <xa>false</xa>
-      <connectors>
-         <connector-ref connector-name="netty"/>
-      </connectors>
-      <entries>
-         <entry name="/CF_TOPIC_XA_FALSE"/>
-      </entries>
-   </connection-factory>
-
-</configuration>
-

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/tests/jms-tests/src/test/resources/hornetq-queues.xml
----------------------------------------------------------------------
diff --git a/tests/jms-tests/src/test/resources/hornetq-queues.xml b/tests/jms-tests/src/test/resources/hornetq-queues.xml
index e858db3..7cdda22 100644
--- a/tests/jms-tests/src/test/resources/hornetq-queues.xml
+++ b/tests/jms-tests/src/test/resources/hornetq-queues.xml
@@ -1,6 +1,6 @@
 <configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-            xsi:schemaLocation="urn:hornetq ../../../src/schemas/hornetq-configuration.xsd
">
+            xsi:schemaLocation="urn:hornetq ../../../src/schemas/activemq-configuration.xsd
">
 
    <security-settings>
       <security-setting match="#">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/tests/jms-tests/src/test/resources/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/tests/jms-tests/src/test/resources/hornetq-users.xml b/tests/jms-tests/src/test/resources/hornetq-users.xml
deleted file mode 100644
index 775c104..0000000
--- a/tests/jms-tests/src/test/resources/hornetq-users.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="urn:hornetq /schema/hornetq-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>-->
-</configuration>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/config/impl/ConfigurationValidationTest.java
----------------------------------------------------------------------
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/config/impl/ConfigurationValidationTest.java
b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/config/impl/ConfigurationValidationTest.java
index 28a5a46..c91c472 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/config/impl/ConfigurationValidationTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/config/impl/ConfigurationValidationTest.java
@@ -44,7 +44,7 @@ public class ConfigurationValidationTest extends UnitTestCase
    // Public --------------------------------------------------------
 
    /**
-    * test does not pass in eclipse (because it can not find hornetq-configuration.xsd).
+    * test does not pass in eclipse (because it can not find activemq-configuration.xsd).
     * It runs fine on the CLI with the proper env setting.
     */
    @Test
@@ -53,7 +53,7 @@ public class ConfigurationValidationTest extends UnitTestCase
       String xml = "<configuration xmlns='urn:hornetq'>" + "</configuration>";
       Element element = XMLUtil.stringToElement(xml);
       Assert.assertNotNull(element);
-      XMLUtil.validate(element, "schema/hornetq-configuration.xsd");
+      XMLUtil.validate(element, "schema/activemq-configuration.xsd");
    }
 
    @Test


Mime
View raw message