activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbono...@apache.org
Subject [activemq] branch master updated: AMQ-7513 - Fix http://activemq.org links
Date Tue, 11 Aug 2020 07:42:52 GMT
This is an automated email from the ASF dual-hosted git repository.

jbonofre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq.git


The following commit(s) were added to refs/heads/master by this push:
     new fca3b61  AMQ-7513 - Fix http://activemq.org links
     new d285188  Merge pull request #551 from coheigea/AMQ-7513
fca3b61 is described below

commit fca3b615eb869330633b71978843a682bfa8ab49
Author: Colm O hEigeartaigh <coheigea@apache.org>
AuthorDate: Fri Jul 10 17:29:01 2020 +0100

    AMQ-7513 - Fix http://activemq.org links
---
 .../org/apache/activemq/broker/region/virtual/MirroredQueue.java   | 2 +-
 .../org/apache/activemq/broker/region/virtual/VirtualTopic.java    | 2 +-
 .../activemq/broker/region/virtual/VirtualTopicInterceptor.java    | 2 +-
 .../java/org/apache/activemq/broker/region/virtual/package.html    | 2 +-
 activemq-http/src/webapp/index.html                                | 2 +-
 .../src/main/java/org/apache/activemq/jms/pool/package.html        | 2 +-
 .../main/java/org/apache/activemq/ra/ActiveMQResourceAdapter.java  | 2 +-
 .../src/test/resources/org/apache/activemq/perf/networkSync.xml    | 7 +++----
 .../org/apache/activemq/usecases/receiver-activecluster.xml        | 1 -
 .../resources/org/apache/activemq/usecases/receiver-zeroconf.xml   | 2 --
 .../org/apache/activemq/usecases/sender-activecluster.xml          | 2 --
 .../resources/org/apache/activemq/usecases/sender-zeroconf.xml     | 2 --
 12 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/region/virtual/MirroredQueue.java
b/activemq-broker/src/main/java/org/apache/activemq/broker/region/virtual/MirroredQueue.java
index e5ee5eb..7849088 100644
--- a/activemq-broker/src/main/java/org/apache/activemq/broker/region/virtual/MirroredQueue.java
+++ b/activemq-broker/src/main/java/org/apache/activemq/broker/region/virtual/MirroredQueue.java
@@ -27,7 +27,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * Creates <a href="http://activemq.org/site/mirrored-queues.html">Mirrored
+ * Creates <a href="https://activemq.apache.org/mirrored-queues">Mirrored
  * Queue</a> using a prefix and postfix to define the topic name on which to mirror
the queue to.
  *
  * 
diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/region/virtual/VirtualTopic.java
b/activemq-broker/src/main/java/org/apache/activemq/broker/region/virtual/VirtualTopic.java
index 2c22c65..c57d80a 100644
--- a/activemq-broker/src/main/java/org/apache/activemq/broker/region/virtual/VirtualTopic.java
+++ b/activemq-broker/src/main/java/org/apache/activemq/broker/region/virtual/VirtualTopic.java
@@ -28,7 +28,7 @@ import org.apache.activemq.command.ActiveMQTopic;
 import org.apache.activemq.filter.DestinationFilter;
 
 /**
- * Creates <a href="http://activemq.org/site/virtual-destinations.html">Virtual
+ * Creates <a href="https://activemq.apache.org/virtual-destinations">Virtual
  * Topics</a> using a prefix and postfix. The virtual destination creates a
  * wildcard that is then used to look up all active queue subscriptions which
  * match.
diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/region/virtual/VirtualTopicInterceptor.java
b/activemq-broker/src/main/java/org/apache/activemq/broker/region/virtual/VirtualTopicInterceptor.java
index c8f058a..9e5c251 100644
--- a/activemq-broker/src/main/java/org/apache/activemq/broker/region/virtual/VirtualTopicInterceptor.java
+++ b/activemq-broker/src/main/java/org/apache/activemq/broker/region/virtual/VirtualTopicInterceptor.java
@@ -37,7 +37,7 @@ import org.apache.activemq.util.LRUCache;
 import javax.jms.ResourceAllocationException;
 
 /**
- * A Destination which implements <a href="http://activemq.org/site/virtual-destinations.html">Virtual
Topic</a>
+ * A Destination which implements <a href="https://activemq.apache.org/virtual-destinations">Virtual
Topic</a>
  */
 public class VirtualTopicInterceptor extends DestinationFilter {
 
diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/region/virtual/package.html
b/activemq-broker/src/main/java/org/apache/activemq/broker/region/virtual/package.html
index 6a66e9f..da90da6 100755
--- a/activemq-broker/src/main/java/org/apache/activemq/broker/region/virtual/package.html
+++ b/activemq-broker/src/main/java/org/apache/activemq/broker/region/virtual/package.html
@@ -19,7 +19,7 @@
 </head>
 <body>
 
-Implementation classes for <a href="http://activemq.org/site/virtual-destinations.html">Virtual
Destinations</a>
+Implementation classes for <a href="https://activemq.apache.org/virtual-destinations">Virtual
Destinations</a>
 
 </body>
 </html>
diff --git a/activemq-http/src/webapp/index.html b/activemq-http/src/webapp/index.html
index 3af3a8e..aae1ada 100755
--- a/activemq-http/src/webapp/index.html
+++ b/activemq-http/src/webapp/index.html
@@ -26,7 +26,7 @@
 
 <p>
 This service allows you to tunnel ActiveMQ traffic through HTTP to work cleanly with firewalls.
-For more information please see the <a href="http://activemq.org/">ActiveMQ home page</a>.
+For more information please see the <a href="https://activemq.apache.org/">ActiveMQ
home page</a>.
 </p>
 
 
diff --git a/activemq-jms-pool/src/main/java/org/apache/activemq/jms/pool/package.html b/activemq-jms-pool/src/main/java/org/apache/activemq/jms/pool/package.html
index 6cfb281..588b65a 100755
--- a/activemq-jms-pool/src/main/java/org/apache/activemq/jms/pool/package.html
+++ b/activemq-jms-pool/src/main/java/org/apache/activemq/jms/pool/package.html
@@ -20,6 +20,6 @@
 <body>
 
 A JMS provider which pools Connection, Session and MessageProducer instances so it can be
used with tools like 
-Spring's <a href="http://activemq.org/Spring+Support">JmsTemplate</a>.
+Spring's <a href="https://activemq.apache.org/spring-support">JmsTemplate</a>.
 </body>
 </html>
diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQResourceAdapter.java
b/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQResourceAdapter.java
index e4edb06..42984cc 100644
--- a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQResourceAdapter.java
+++ b/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQResourceAdapter.java
@@ -398,7 +398,7 @@ public class ActiveMQResourceAdapter extends ActiveMQConnectionSupport
implement
     }
 
     /**
-     * Sets the <a href="http://activemq.org/Xml+Configuration">XML
+     * Sets the <a href="https://activemq.apache.org/xml-configuration">XML
      * configuration file </a> used to configure the ActiveMQ broker via Spring
      * if using embedded mode.
      *
diff --git a/activemq-unit-tests/src/test/resources/org/apache/activemq/perf/networkSync.xml
b/activemq-unit-tests/src/test/resources/org/apache/activemq/perf/networkSync.xml
index 7fb9dce..5c7c14c 100644
--- a/activemq-unit-tests/src/test/resources/org/apache/activemq/perf/networkSync.xml
+++ b/activemq-unit-tests/src/test/resources/org/apache/activemq/perf/networkSync.xml
@@ -17,16 +17,15 @@
 -->
 <beans 
   xmlns="http://www.springframework.org/schema/beans" 
-  xmlns:amq="http://activemq.org/config/1.0"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.org/config/1.0 http://activemq.apache.org/snapshot-schema/activemq-core-5.0-SNAPSHOT.xsd">
+  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd">
  
   <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
   </bean>
  
   <!-- Broker1 -->
-  <broker brokerName="broker1" id="broker1" useJmx="true" persistent="true" deleteAllMessagesOnStartup="true"
start="false" xmlns="http://activemq.org/config/1.0">
+  <broker brokerName="broker1" id="broker1" useJmx="true" persistent="true" deleteAllMessagesOnStartup="true"
start="false" xmlns="http://activemq.apache.org/schema/core">
     <transportConnectors>
       <transportConnector uri="tcp://localhost:61616" />
     </transportConnectors>
@@ -38,7 +37,7 @@
  
  
   <!-- Broker2 -->
-  <broker brokerName="broker2" id="broker2" useJmx="true" persistent="false" deleteAllMessagesOnStartup="true"
start="false" xmlns="http://activemq.org/config/1.0">
+  <broker brokerName="broker2" id="broker2" useJmx="true" persistent="false" deleteAllMessagesOnStartup="true"
start="false" xmlns="http://activemq.apache.org/schema/core">
     <transportConnectors>
       <transportConnector uri="tcp://localhost:62616" />
     </transportConnectors>
diff --git a/activemq-unit-tests/src/test/resources/org/apache/activemq/usecases/receiver-activecluster.xml
b/activemq-unit-tests/src/test/resources/org/apache/activemq/usecases/receiver-activecluster.xml
index 719e6d2..66f564c 100644
--- a/activemq-unit-tests/src/test/resources/org/apache/activemq/usecases/receiver-activecluster.xml
+++ b/activemq-unit-tests/src/test/resources/org/apache/activemq/usecases/receiver-activecluster.xml
@@ -15,7 +15,6 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<!DOCTYPE beans PUBLIC  "-//ACTIVEMQ//DTD//EN" "http://activemq.org/dtd/activemq.dtd">
 <beans>
 
   <broker name="receiver">
diff --git a/activemq-unit-tests/src/test/resources/org/apache/activemq/usecases/receiver-zeroconf.xml
b/activemq-unit-tests/src/test/resources/org/apache/activemq/usecases/receiver-zeroconf.xml
index 470fe35..2013805 100644
--- a/activemq-unit-tests/src/test/resources/org/apache/activemq/usecases/receiver-zeroconf.xml
+++ b/activemq-unit-tests/src/test/resources/org/apache/activemq/usecases/receiver-zeroconf.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC  "-//ACTIVEMQ//DTD//EN" "http://activemq.org/dtd/activemq.dtd">
 <!--
     Licensed to the Apache Software Foundation (ASF) under one or more
     contributor license agreements.  See the NOTICE file distributed with
@@ -18,7 +17,6 @@
 -->
 <beans 
   xmlns="http://www.springframework.org/schema/beans" 
-  xmlns:amq="http://activemq.apache.org/schema/core"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
   http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd">
diff --git a/activemq-unit-tests/src/test/resources/org/apache/activemq/usecases/sender-activecluster.xml
b/activemq-unit-tests/src/test/resources/org/apache/activemq/usecases/sender-activecluster.xml
index 38f7a3c..eee44ee 100644
--- a/activemq-unit-tests/src/test/resources/org/apache/activemq/usecases/sender-activecluster.xml
+++ b/activemq-unit-tests/src/test/resources/org/apache/activemq/usecases/sender-activecluster.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC  "-//ACTIVEMQ//DTD//EN" "http://activemq.org/dtd/activemq.dtd">
 <!--
     Licensed to the Apache Software Foundation (ASF) under one or more
     contributor license agreements.  See the NOTICE file distributed with
@@ -18,7 +17,6 @@
 -->
 <beans 
   xmlns="http://www.springframework.org/schema/beans" 
-  xmlns:amq="http://activemq.apache.org/schema/core"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
   http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd">
diff --git a/activemq-unit-tests/src/test/resources/org/apache/activemq/usecases/sender-zeroconf.xml
b/activemq-unit-tests/src/test/resources/org/apache/activemq/usecases/sender-zeroconf.xml
index aa69556..8996dff 100644
--- a/activemq-unit-tests/src/test/resources/org/apache/activemq/usecases/sender-zeroconf.xml
+++ b/activemq-unit-tests/src/test/resources/org/apache/activemq/usecases/sender-zeroconf.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC  "-//ACTIVEMQ//DTD//EN" "http://activemq.org/dtd/activemq.dtd">
 <!--
     Licensed to the Apache Software Foundation (ASF) under one or more
     contributor license agreements.  See the NOTICE file distributed with
@@ -18,7 +17,6 @@
 -->
 <beans 
   xmlns="http://www.springframework.org/schema/beans" 
-  xmlns:amq="http://activemq.apache.org/schema/core"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
   http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd">


Mime
View raw message