More rename updates

RELEASING.md

@@ -10,7 +10,7 @@ Things to do before issuing a new release:
 
 * Update the README to include appropriate release notes.
 
-* Bump the version numbers in example and test poms to the next release version. e.g. 6.0.0
+* Bump the version numbers in example and test poms to the next release version. e.g. 2.0.0
 
 * Build the release locally: mvn clean install -DskipLicenseCheck=false -Prelease
 

artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java

@@ -186,8 +186,8 @@ public static String getDefaultHapolicyBackupStrategy()
    // true means that the management API is available via JMX
    private static boolean DEFAULT_JMX_MANAGEMENT_ENABLED = true;
 
-   // the JMX domain used to registered ActiveMQ MBeans in the MBeanServer
-   private static String DEFAULT_JMX_DOMAIN = "org.apache.activemq";
+   // the JMX domain used to registered ActiveMQ Artemis MBeans in the MBeanServer
+   private static String DEFAULT_JMX_DOMAIN = "org.apache.activemq.artemis";
 
    // true means that message counters are enabled
    private static boolean DEFAULT_MESSAGE_COUNTER_ENABLED = false;

artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/impl/JMSServerManagerImpl.java

@@ -779,7 +779,7 @@ public boolean removeTopicFromBindingRegistry(String name, String bindings) thro
    }
 
    /* (non-Javadoc)
-   * @see org.apache.activemq.jms.server.JMSServerManager#removeTopicFromBindings(java.lang.String, java.lang.String)
+   * @see org.apache.activemq.artemis.jms.server.JMSServerManager#removeTopicFromBindings(java.lang.String, java.lang.String)
    */
    public boolean removeTopicFromBindingRegistry(final String name) throws Exception
    {

artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/Journal.java

@@ -28,7 +28,7 @@
  * <p>
  * Notice also that even on the callback methods it's possible to pass the sync mode. That will only
  * make sense on the NIO operations.
- * @see org.apache.activemq.utils.IDGenerator
+ * @see org.apache.activemq.artemis.utils.IDGenerator
  */
 public interface Journal extends ActiveMQComponent
 {

artemis-native/README

@@ -25,19 +25,19 @@ STEPS TO BUILD
 1. Make sure you have JAVA_HOME defined, and pointing to the root of your JDK:
 
 Example:
- 
+
  $> export JAVA_HOME=/usr/share/jdk1.7
- 
- 
+
+
 2. Call compile-native.sh. Bootstrap will call all the initial scripts you need
  $>  ./compile-native.sh
- 
+
 if you are missing any dependencies, autoconf would tell you what you're missing.
- 
+
 
 COMPILED FILE
 
-The produced file will be under the ./target/nar (example: ./target/nar/artemis-native-6.0.0-amd64-Linux-gpp-jni/lib/amd64-Linux-gpp/jni/libartemis-native-6.0.0.so)
+The produced file will be under the ./target/nar (example: ./target/nar/artemis-native-1.0.0-amd64-Linux-gpp-jni/lib/amd64-Linux-gpp/jni/libartemis-native-1.0.0.so)
 and you will have to rename it manually under ./bin following the appropriate pattern.
 
 

artemis-server/src/test/resources/divertRoutingNameNotRequired.xml

@@ -68,7 +68,7 @@
             <address>jms.topic.priceUpdates</address>
             <forwarding-address>jms.queue.priceForwarding</forwarding-address>
             <filter string="office='New York'"/>
-            <transformer-class-name>org.apache.activemq.jms.example.AddForwardingTimeTransformer</transformer-class-name>
+            <transformer-class-name>org.apache.activemq.artemis.jms.example.AddForwardingTimeTransformer</transformer-class-name>
             <exclusive>true</exclusive>
          </divert>
       </diverts>

artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/xa/recovery/ActiveMQXAResourceRecovery.java

@@ -31,19 +31,19 @@
  * To enable this add the following to the jbossts-properties file
  * <pre>
  * &lt;property name="com.arjuna.ats.jta.recovery.XAResourceRecovery.ACTIVEMQ1"
- *                 value="org.apache.activemq.jms.server.recovery.ActiveMQXAResourceRecovery;org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnectorFactory"/&gt;
+ *                 value="org.apache.activemq.artemis.jms.server.recovery.ActiveMQXAResourceRecovery;org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnectorFactory"/&gt;
  * </pre>
  * <p>
  * you'll need something like this if the ActiveMQ Server is remote
  * <pre>
  *      &lt;property name="com.arjuna.ats.jta.recovery.XAResourceRecovery.ACTIVEMQ2"
- *                  value="org.apache.activemq.jms.server.recovery.ActiveMQXAResourceRecovery;org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnectorFactory,guest,guest,host=localhost,port=61616"/&gt;
+ *                  value="org.apache.activemq.artemis.jms.server.recovery.ActiveMQXAResourceRecovery;org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnectorFactory,guest,guest,host=localhost,port=61616"/&gt;
  * </pre>
  * <p>
  * you'll need something like this if the ActiveMQ Server is remote and has failover configured
  * <pre>
  *             &lt;property name="com.arjuna.ats.jta.recovery.XAResourceRecovery.ACTIVEMQ2"
- *                       value="org.apache.activemq.jms.server.recovery.ActiveMQXAResourceRecovery;org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnectorFactory,guest,guest,host=localhost,port=61616;org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnectorFactory,guest,guest,host=localhost2,port=61617"/&gt;
+ *                       value="org.apache.activemq.artemis.jms.server.recovery.ActiveMQXAResourceRecovery;org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnectorFactory,guest,guest,host=localhost,port=61616;org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnectorFactory,guest,guest,host=localhost2,port=61617"/&gt;
  * </pre>
  */
 public class ActiveMQXAResourceRecovery

artemis_doap.rdf

@@ -25,7 +25,7 @@ under the License.
     <homepage rdf:resource="" />
     <shortdesc></shortdesc>
     <description></description>
-    
+
     <maintainer>
       <foaf:Person>
         <foaf:name>Clebert Suconic</foaf:name>
@@ -62,17 +62,9 @@ under the License.
         <foaf:lastName>Taylor</foaf:lastName>
       </foaf:Person>
     </developer>
-
-    <release>
-      <Version>
-        <name>6.0.0</name>
-        <revision>6.0.0.final</revision>
-        <created>2013-16-12</created>
-      </Version>
-    </release>
     <license rdf:resource="" />
-    
-    
+
+
     <programming-language>Java</programming-language>
     <programming-language>C/C++</programming-language>
     <vendor>Red Hat</vendor>

distribution/artemis/pom.xml

@@ -182,7 +182,7 @@
    <build>
       <resources>
          <resource>
-            <directory>../activemq/src/main/resources</directory>
+            <directory>../artemis/src/main/resources</directory>
             <filtering>true</filtering>
          </resource>
       </resources>

docs/user-manual/en/book.json

@@ -1,7 +1,7 @@
 {
-    "title": "ActiveMQ Documentation",
-    "description": "ActiveMQ User Guide and Reference Documentation",
-    "github": "apache/activemq-6",
+    "title": "ActiveMQ Artemis Documentation",
+    "description": "ActiveMQ Artemis User Guide and Reference Documentation",
+    "github": "apache/activemq-artemis",
     "githubHost": "https://github.com/",
     "links": {
         "home": "http://activemq.apache.org/",

docs/user-manual/en/clusters.md

@@ -807,44 +807,44 @@ The out-of-the-box policies are
     A, B or D, A, B, C, D, A, B, C, D or C, D, A, B, C, D, A, B, C.
 
     Use
-    `org.apache.activemq.api.core.client.loadbalance.RoundRobinConnectionLoadBalancingPolicy`
+    `org.apache.activemq.artemis.api.core.client.loadbalance.RoundRobinConnectionLoadBalancingPolicy`
     as the `<connection-load-balancing-policy-class-name>`.
 
 -   Random. With this policy each node is chosen randomly.
 
     Use
-    `org.apache.activemq.api.core.client.loadbalance.RandomConnectionLoadBalancingPolicy`
+    `org.apache.activemq.artemis.api.core.client.loadbalance.RandomConnectionLoadBalancingPolicy`
     as the `<connection-load-balancing-policy-class-name>`.
 
 -   Random Sticky. With this policy the first node is chosen randomly
     and then re-used for subsequent connections.
 
     Use
-    `org.apache.activemq.api.core.client.loadbalance.RandomStickyConnectionLoadBalancingPolicy`
+    `org.apache.activemq.artemis.api.core.client.loadbalance.RandomStickyConnectionLoadBalancingPolicy`
     as the `<connection-load-balancing-policy-class-name>`.
 
 -   First Element. With this policy the "first" (i.e. 0th) node is
     always returned.
 
     Use
-    `org.apache.activemq.api.core.client.loadbalance.FirstElementConnectionLoadBalancingPolicy`
+    `org.apache.activemq.artemis.api.core.client.loadbalance.FirstElementConnectionLoadBalancingPolicy`
     as the `<connection-load-balancing-policy-class-name>`.
 
 You can also implement your own policy by implementing the interface
-`org.apache.activemq.api.core.client.loadbalance.ConnectionLoadBalancingPolicy`
+`org.apache.activemq.artemis.api.core.client.loadbalance.ConnectionLoadBalancingPolicy`
 
 Specifying which load balancing policy to use differs whether you are
 using JMS or the core API. If you don't specify a policy then the
 default will be used which is
-`org.apache.activemq.api.core.client.loadbalance.RoundRobinConnectionLoadBalancingPolicy`.
+`org.apache.activemq.artemis.api.core.client.loadbalance.RoundRobinConnectionLoadBalancingPolicy`.
 
 If you're using JMS and you're using JNDI on the client to look up your
 JMS connection factory instances then you can specify these parameters
 in the JNDI context environment in, e.g. `jndi.properties`, to specify
 the load balancing policy directly:
 
     java.naming.factory.initial=org.apache.activemq.artemis.jndi.ActiveMQInitialContextFactory
-    connection.myConnectionFactory=tcp://localhost:61616?loadBalancingPolicyClassName=org.apache.activemq.api.core.client.loadbalance.RandomConnectionLoadBalancingPolicy
+    connection.myConnectionFactory=tcp://localhost:61616?loadBalancingPolicyClassName=org.apache.activemq.artemis.api.core.client.loadbalance.RandomConnectionLoadBalancingPolicy
 
 The above example would instantiate a JMS connection factory that uses
 the random connection load balancing policy.

docs/user-manual/en/configuration-index.md

@@ -435,7 +435,7 @@ get a mask for a password, just run the main class at org.apache.activemq.artemi
 An easy way to do it is through activemq-tools-<VERSION>-jar-with-dependencies.jar since it has all the dependencies:
 
 ```sh
-    java -cp activemq-tools-6.0.0-jar-with-dependencies.jar org.apache.activemq.artemis.utils.DefaultSensitiveStringCodec "your plaintext password"
+    java -cp artemis-tools-1.0.0-jar-with-dependencies.jar org.apache.activemq.artemis.utils.DefaultSensitiveStringCodec "your plaintext password"
 ```
 
 If you don't want to use the jar-with-dependencies, make sure the classpath is correct. You'll get something like
@@ -479,7 +479,7 @@ passwords using the new defined decoder.
 
 To use a different decoder than the built-in one, you either pick one
 from existing libraries or you implement it yourself. All decoders must
-implement the `org.apache.activemq.utils.SensitiveDataCodec<T>`
+implement the `org.apache.activemq.artemis.utils.SensitiveDataCodec<T>`
 interface:
 
 ``` java

docs/user-manual/en/core-bridges.md

@@ -46,7 +46,7 @@ with an example (this is actually from the bridge example):
        <forwarding-address>jms.queue.mincing-machine</forwarding-address>
        <filter-string="name='aardvark'"/>
        <transformer-class-name>
-          org.apache.activemq.jms.example.HatColourChangeTransformer
+          org.apache.activemq.artemis.jms.example.HatColourChangeTransformer
        </transformer-class-name>
        <retry-interval>1000</retry-interval>
        <ha>true</ha>

docs/user-manual/en/diverts.md

@@ -56,7 +56,7 @@ taken from the divert example:
        <forwarding-address>jms.queue.priceForwarding</forwarding-address>
        <filter string="office='New York'"/>
        <transformer-class-name>
-          org.apache.activemq.jms.example.AddForwardingTimeTransformer
+          org.apache.activemq.artemis.jms.example.AddForwardingTimeTransformer
        </transformer-class-name>
        <exclusive>true</exclusive>
     </divert>

docs/user-manual/en/duplicate-detection.md

@@ -63,7 +63,7 @@ duplicate message for any message in the transaction, then it will
 ignore the entire transaction.
 
 The name of the property that you set is given by the value of
-`org.apache.activemq.api.core.Message.HDR_DUPLICATE_DETECTION_ID`, which
+`org.apache.activemq.artemis.api.core.Message.HDR_DUPLICATE_DETECTION_ID`, which
 is `_AMQ_DUPL_ID`
 
 The value of the property can be of type `byte[]` or `SimpleString` if

docs/user-manual/en/embedding-activemq.md

@@ -78,7 +78,7 @@ enabled. Let's also assume that a queue and connection factory has been
 defined in the `activemq-jms.xml` config file.
 
 ``` java
-import org.apache.activemq.jms.server.embedded.EmbeddedJMS;
+import org.apache.activemq.artemis.jms.server.embedded.EmbeddedJMS;
 
 ...
 
@@ -129,7 +129,7 @@ config.setAcceptorConfigurations(transports);
 ```
 
 You need to instantiate an instance of
-`org.apache.activemq.api.core.server.embedded.EmbeddedActiveMQ` and add
+`org.apache.activemq.artemis.api.core.server.embedded.EmbeddedActiveMQ` and add
 the configuration object to it.
 
 ``` java

docs/user-manual/en/intercepting-operations.md

@@ -12,7 +12,7 @@ makes interceptors powerful, but also potentially dangerous.
 An interceptor must implement the `Interceptor interface`:
 
 ``` java
-package org.apache.activemq.api.core.interceptor;
+package org.apache.artemis.activemq.api.core.interceptor;
 
 public interface Interceptor
 {
@@ -45,13 +45,13 @@ Both incoming and outgoing interceptors are configured in
 `broker.xml`:
 
     <remoting-incoming-interceptors>
-       <class-name>org.apache.activemq.jms.example.LoginInterceptor</class-name>
-       <class-name>org.apache.activemq.jms.example.AdditionalPropertyInterceptor</class-name>
+       <class-name>org.apache.activemq.artemis.jms.example.LoginInterceptor</class-name>
+       <class-name>org.apache.activemq.artemis.jms.example.AdditionalPropertyInterceptor</class-name>
     </remoting-incoming-interceptors>
 
     <remoting-outgoing-interceptors>
-       <class-name>org.apache.activemq.jms.example.LogoutInterceptor</class-name>
-       <class-name>org.apache.activemq.jms.example.AdditionalPropertyInterceptor</class-name>
+       <class-name>org.apache.activemq.artemis.jms.example.LogoutInterceptor</class-name>
+       <class-name>org.apache.activemq.artemis.jms.example.AdditionalPropertyInterceptor</class-name>
     </remoting-outgoing-interceptors>
 
 The interceptors classes (and their dependencies) must be added to the

docs/user-manual/en/jms-bridge.md

@@ -51,7 +51,7 @@ beans file that bridges 2 destinations which are actually on the same
 server.
 
 The JMS Bridge is a simple POJO so can be deployed with most frameworks,
-simply instantiate the `org.apache.activemq.api.jms.bridge.impl.JMSBridgeImpl`
+simply instantiate the `org.apache.activemq.artemis.api.jms.bridge.impl.JMSBridgeImpl`
 class and set the appropriate parameters.
 
 ## JMS Bridge Parameters
@@ -207,7 +207,7 @@ The configuration example above uses the default implementation provided
 by Apache ActiveMQ Artemis that looks up the connection factory using JNDI. For other
 Application Servers or JMS providers a new implementation may have to be
 provided. This can easily be done by implementing the interface
-`org.apache.activemq.jms.bridge.ConnectionFactoryFactory`.
+`org.apache.activemq.artemis.jms.bridge.ConnectionFactoryFactory`.
 
 ## Source and Target Destination Factories
 
@@ -218,7 +218,7 @@ In the configuration example above, we have used the default provided by
 Apache ActiveMQ Artemis that looks up the destination using JNDI.
 
 A new implementation can be provided by implementing
-`org.apache.activemq.jms.bridge.DestinationFactory` interface.
+`org.apache.activemq.artemis.jms.bridge.DestinationFactory` interface.
 
 ## Quality Of Service
 

docs/user-manual/en/large-messages.md

@@ -182,7 +182,7 @@ which are also available through JMS by the use of object properties.
     </tbody>
 </table>
 
-  : org.apache.activemq.api.core.client.ClientMessage API
+  : org.apache.activemq.artemis.api.core.client.ClientMessage API
 
 To set the output stream when receiving a core message:
 

docs/user-manual/en/libaio.md

@@ -72,7 +72,7 @@ script `compile-native.sh`. This script will invoke the proper maven profile to
     [INFO] Scanning for projects...
     [INFO]
     [INFO] ------------------------------------------------------------------------
-    [INFO] Building ActiveMQ Artemis Native POM 6.0.0
+    [INFO] Building ActiveMQ Artemis Native POM 1.0.0
     [INFO] ------------------------------------------------------------------------
     [INFO]
     [INFO] --- nar-maven-plugin:3.0.0:nar-validate (default-nar-validate) @ artemis-native ---

docs/user-manual/en/logging.md

@@ -62,7 +62,7 @@ add the following dependencies.
     <dependency>
        <groupId>org.apache.activemq</groupId>
        <artifactId>activemq-core-client</artifactId>
-       <version>6.0.0</version>
+       <version>1.0.0.Final</version>
     </dependency>
 
 There are 2 properties you need to set when starting your java program,