From f1a084efeb76563f5950783efc69b9e507e7069b Mon Sep 17 00:00:00 2001 From: "Hiram R. Chirino" Date: Wed, 28 Dec 2005 18:47:30 +0000 Subject: [PATCH] refactoring to org.apache.activemq package names. git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@359590 13f79535-47bb-0310-9956-ffa450edef68 --- activemq-web/maven.xml | 2 +- activemq-web/project.xml | 4 ++-- .../{ => apache}/activemq/web/ConnectionManager.java | 2 +- .../org/{ => apache}/activemq/web/MessageServlet.java | 2 +- .../activemq/web/MessageServletSupport.java | 2 +- .../activemq/web/NoDestinationSuppliedException.java | 2 +- .../activemq/web/PortfolioPublishServlet.java | 2 +- .../activemq/web/SpringBrokerContextListener.java | 2 +- .../java/org/{ => apache}/activemq/web/WebClient.java | 10 +++++----- .../java/org/{ => apache}/activemq/web/package.html | 0 activemq-web/src/main/webapp/WEB-INF/web.xml | 10 +++++----- .../org/{ => apache}/activemq/web/JettyServer.java | 2 +- activemq-web/src/test/resources/log4j.properties | 2 +- 13 files changed, 21 insertions(+), 21 deletions(-) rename activemq-web/src/main/java/org/{ => apache}/activemq/web/ConnectionManager.java (97%) rename activemq-web/src/main/java/org/{ => apache}/activemq/web/MessageServlet.java (99%) rename activemq-web/src/main/java/org/{ => apache}/activemq/web/MessageServletSupport.java (99%) rename activemq-web/src/main/java/org/{ => apache}/activemq/web/NoDestinationSuppliedException.java (96%) rename activemq-web/src/main/java/org/{ => apache}/activemq/web/PortfolioPublishServlet.java (99%) rename activemq-web/src/main/java/org/{ => apache}/activemq/web/SpringBrokerContextListener.java (99%) rename activemq-web/src/main/java/org/{ => apache}/activemq/web/WebClient.java (96%) rename activemq-web/src/main/java/org/{ => apache}/activemq/web/package.html (100%) rename activemq-web/src/test/java/org/{ => apache}/activemq/web/JettyServer.java (98%) diff --git a/activemq-web/maven.xml b/activemq-web/maven.xml index 4fdf7cf737..15c4e60e6d 100755 --- a/activemq-web/maven.xml +++ b/activemq-web/maven.xml @@ -8,7 +8,7 @@ Running the Web Application - + diff --git a/activemq-web/project.xml b/activemq-web/project.xml index dfda1129a3..49c4b2db8b 100755 --- a/activemq-web/project.xml +++ b/activemq-web/project.xml @@ -13,11 +13,11 @@ Web Connector for REST API and Streamlets support - org.activemq.web + org.apache.activemq.web Web Connector for REST API and Streamlets support - org.activemq.web + org.apache.activemq.web diff --git a/activemq-web/src/main/java/org/activemq/web/ConnectionManager.java b/activemq-web/src/main/java/org/apache/activemq/web/ConnectionManager.java similarity index 97% rename from activemq-web/src/main/java/org/activemq/web/ConnectionManager.java rename to activemq-web/src/main/java/org/apache/activemq/web/ConnectionManager.java index 050095e597..a53b4d9b91 100644 --- a/activemq-web/src/main/java/org/activemq/web/ConnectionManager.java +++ b/activemq-web/src/main/java/org/apache/activemq/web/ConnectionManager.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.activemq.web; +package org.apache.activemq.web; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/activemq-web/src/main/java/org/activemq/web/MessageServlet.java b/activemq-web/src/main/java/org/apache/activemq/web/MessageServlet.java similarity index 99% rename from activemq-web/src/main/java/org/activemq/web/MessageServlet.java rename to activemq-web/src/main/java/org/apache/activemq/web/MessageServlet.java index d0e687cff2..09f24756ab 100644 --- a/activemq-web/src/main/java/org/activemq/web/MessageServlet.java +++ b/activemq-web/src/main/java/org/apache/activemq/web/MessageServlet.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.activemq.web; +package org.apache.activemq.web; import java.io.IOException; import java.io.PrintWriter; diff --git a/activemq-web/src/main/java/org/activemq/web/MessageServletSupport.java b/activemq-web/src/main/java/org/apache/activemq/web/MessageServletSupport.java similarity index 99% rename from activemq-web/src/main/java/org/activemq/web/MessageServletSupport.java rename to activemq-web/src/main/java/org/apache/activemq/web/MessageServletSupport.java index 441fc6580d..65b5625b1b 100644 --- a/activemq-web/src/main/java/org/activemq/web/MessageServletSupport.java +++ b/activemq-web/src/main/java/org/apache/activemq/web/MessageServletSupport.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.activemq.web; +package org.apache.activemq.web; import org.activemq.command.ActiveMQQueue; import org.activemq.command.ActiveMQTopic; diff --git a/activemq-web/src/main/java/org/activemq/web/NoDestinationSuppliedException.java b/activemq-web/src/main/java/org/apache/activemq/web/NoDestinationSuppliedException.java similarity index 96% rename from activemq-web/src/main/java/org/activemq/web/NoDestinationSuppliedException.java rename to activemq-web/src/main/java/org/apache/activemq/web/NoDestinationSuppliedException.java index 577a399e92..7ac5e86a5a 100644 --- a/activemq-web/src/main/java/org/activemq/web/NoDestinationSuppliedException.java +++ b/activemq-web/src/main/java/org/apache/activemq/web/NoDestinationSuppliedException.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.web; +package org.apache.activemq.web; import javax.servlet.ServletException; diff --git a/activemq-web/src/main/java/org/activemq/web/PortfolioPublishServlet.java b/activemq-web/src/main/java/org/apache/activemq/web/PortfolioPublishServlet.java similarity index 99% rename from activemq-web/src/main/java/org/activemq/web/PortfolioPublishServlet.java rename to activemq-web/src/main/java/org/apache/activemq/web/PortfolioPublishServlet.java index 2352f10cd7..6f666e8dec 100644 --- a/activemq-web/src/main/java/org/activemq/web/PortfolioPublishServlet.java +++ b/activemq-web/src/main/java/org/apache/activemq/web/PortfolioPublishServlet.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.web; +package org.apache.activemq.web; import javax.jms.Destination; import javax.jms.JMSException; diff --git a/activemq-web/src/main/java/org/activemq/web/SpringBrokerContextListener.java b/activemq-web/src/main/java/org/apache/activemq/web/SpringBrokerContextListener.java similarity index 99% rename from activemq-web/src/main/java/org/activemq/web/SpringBrokerContextListener.java rename to activemq-web/src/main/java/org/apache/activemq/web/SpringBrokerContextListener.java index fb9fd3a5bd..8a2779ebc5 100644 --- a/activemq-web/src/main/java/org/activemq/web/SpringBrokerContextListener.java +++ b/activemq-web/src/main/java/org/apache/activemq/web/SpringBrokerContextListener.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.web; +package org.apache.activemq.web; import org.activemq.broker.BrokerService; import org.activemq.xbean.BrokerFactoryBean; diff --git a/activemq-web/src/main/java/org/activemq/web/WebClient.java b/activemq-web/src/main/java/org/apache/activemq/web/WebClient.java similarity index 96% rename from activemq-web/src/main/java/org/activemq/web/WebClient.java rename to activemq-web/src/main/java/org/apache/activemq/web/WebClient.java index 84957bb0d0..690d4460f7 100644 --- a/activemq-web/src/main/java/org/activemq/web/WebClient.java +++ b/activemq-web/src/main/java/org/apache/activemq/web/WebClient.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.activemq.web; +package org.apache.activemq.web; import java.io.Externalizable; import java.io.IOException; @@ -54,10 +54,10 @@ import edu.emory.mathcs.backport.java.util.concurrent.Semaphore; * @version $Revision: 1.1.1.1 $ */ public class WebClient implements HttpSessionActivationListener, Externalizable { - public static final String webClientAttribute = "org.activemq.webclient"; - public static final String connectionFactoryAttribute = "org.activemq.connectionFactory"; - public static final String queueConsumersAttribute = "org.activemq.queueConsumers"; - public static final String brokerUrlInitParam = "org.activemq.brokerURL"; + public static final String webClientAttribute = "org.apache.activemq.webclient"; + public static final String connectionFactoryAttribute = "org.apache.activemq.connectionFactory"; + public static final String queueConsumersAttribute = "org.apache.activemq.queueConsumers"; + public static final String brokerUrlInitParam = "org.apache.activemq.brokerURL"; private static final Log log = LogFactory.getLog(WebClient.class); diff --git a/activemq-web/src/main/java/org/activemq/web/package.html b/activemq-web/src/main/java/org/apache/activemq/web/package.html similarity index 100% rename from activemq-web/src/main/java/org/activemq/web/package.html rename to activemq-web/src/main/java/org/apache/activemq/web/package.html diff --git a/activemq-web/src/main/webapp/WEB-INF/web.xml b/activemq-web/src/main/webapp/WEB-INF/web.xml index 638ec8b934..3822568941 100755 --- a/activemq-web/src/main/webapp/WEB-INF/web.xml +++ b/activemq-web/src/main/webapp/WEB-INF/web.xml @@ -13,20 +13,20 @@ - org.activemq.brokerURL + org.apache.activemq.brokerURL vm://localhost The URL of the Message Broker to connect to - org.activemq.embeddedBroker + org.apache.activemq.embeddedBroker true Whether we should include an embedded broker or not - org.activemq.web.ConnectionManager + org.apache.activemq.web.ConnectionManager @@ -35,14 +35,14 @@ MessageServlet - org.activemq.web.MessageServlet + org.apache.activemq.web.MessageServlet 1 PortfolioPublishServlet - org.activemq.web.PortfolioPublishServlet + org.apache.activemq.web.PortfolioPublishServlet 1 diff --git a/activemq-web/src/test/java/org/activemq/web/JettyServer.java b/activemq-web/src/test/java/org/apache/activemq/web/JettyServer.java similarity index 98% rename from activemq-web/src/test/java/org/activemq/web/JettyServer.java rename to activemq-web/src/test/java/org/apache/activemq/web/JettyServer.java index 8b7a359fc2..0a19a2cdc5 100644 --- a/activemq-web/src/test/java/org/activemq/web/JettyServer.java +++ b/activemq-web/src/test/java/org/apache/activemq/web/JettyServer.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.activemq.web; +package org.apache.activemq.web; import org.mortbay.jetty.Connector; import org.mortbay.jetty.Handler; diff --git a/activemq-web/src/test/resources/log4j.properties b/activemq-web/src/test/resources/log4j.properties index 9bd5d778b4..d9d69702d8 100755 --- a/activemq-web/src/test/resources/log4j.properties +++ b/activemq-web/src/test/resources/log4j.properties @@ -3,7 +3,7 @@ # log4j.rootLogger=INFO, out -log4j.logger.org.activemq.spring=WARN +log4j.logger.org.apache.activemq.spring=WARN # CONSOLE appender not used by default log4j.appender.stdout=org.apache.log4j.ConsoleAppender