Author: chirino
Date: Wed Dec 28 10:47:30 2005
New Revision: 359590
URL: http://svn.apache.org/viewcvs?rev=359590&view=rev
Log:
refactoring to org.apache.activemq package names.
Added:
incubator/activemq/trunk/activemq-web/src/main/java/org/apache/
incubator/activemq/trunk/activemq-web/src/main/java/org/apache/activemq/
incubator/activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/
- copied from r359554,
incubator/activemq/trunk/activemq-web/src/main/java/org/activemq/web/
incubator/activemq/trunk/activemq-web/src/test/java/org/apache/
incubator/activemq/trunk/activemq-web/src/test/java/org/apache/activemq/
incubator/activemq/trunk/activemq-web/src/test/java/org/apache/activemq/web/
incubator/activemq/trunk/activemq-web/src/test/java/org/apache/activemq/web/JettyServer.java
- copied, changed from r359554,
incubator/activemq/trunk/activemq-web/src/test/java/org/activemq/web/JettyServer.java
incubator/activemq/trunk/activemq-web/src/test/java/org/apache/activemq/web/jmx/
- copied from r359554,
incubator/activemq/trunk/activemq-web/src/test/java/org/activemq/web/jmx/
Removed:
incubator/activemq/trunk/activemq-web/src/main/java/org/activemq/web/
incubator/activemq/trunk/activemq-web/src/test/java/org/activemq/
Modified:
incubator/activemq/trunk/activemq-web/ (props changed)
incubator/activemq/trunk/activemq-web/maven.xml
incubator/activemq/trunk/activemq-web/project.xml
incubator/activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/ConnectionManager.java
incubator/activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/MessageServlet.java
incubator/activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/MessageServletSupport.java
incubator/activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/NoDestinationSuppliedException.java
incubator/activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/PortfolioPublishServlet.java
incubator/activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/SpringBrokerContextListener.java
incubator/activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/WebClient.java
incubator/activemq/trunk/activemq-web/src/main/webapp/WEB-INF/web.xml
incubator/activemq/trunk/activemq-web/src/test/resources/log4j.properties
Propchange: incubator/activemq/trunk/activemq-web/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Dec 28 10:47:30 2005
@@ -3,3 +3,6 @@
.classpath
target
activemq-data
+.settings
+bin
+.wtpmodules
Modified: incubator/activemq/trunk/activemq-web/maven.xml
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-web/maven.xml?rev=359590&r1=359589&r2=359590&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-web/maven.xml (original)
+++ incubator/activemq/trunk/activemq-web/maven.xml Wed Dec 28 10:47:30 2005
@@ -8,7 +8,7 @@
<echo>Running the Web Application</echo>
- <java classname="org.activemq.web.JettyServer" fork="yes" maxmemory="100M">
+ <java classname="org.apache.activemq.web.JettyServer" fork="yes"
maxmemory="100M">
<classpath refid="test.classpath"/>
</java>
</goal>
Modified: incubator/activemq/trunk/activemq-web/project.xml
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-web/project.xml?rev=359590&r1=359589&r2=359590&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-web/project.xml (original)
+++ incubator/activemq/trunk/activemq-web/project.xml Wed Dec 28 10:47:30 2005
@@ -13,11 +13,11 @@
Web Connector for REST API and Streamlets support
</shortDescription>
- <package>org.activemq.web</package>
+ <package>org.apache.activemq.web</package>
<packageGroups>
<packageGroup>
<title>Web Connector for REST API and Streamlets support</title>
- <packages>org.activemq.web</packages>
+ <packages>org.apache.activemq.web</packages>
</packageGroup>
</packageGroups>
Modified:
incubator/activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/ConnectionManager.java
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/ConnectionManager.java?rev=359590&r1=359554&r2=359590&view=diff
==============================================================================
---
incubator/activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/ConnectionManager.java
(original)
+++
incubator/activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/ConnectionManager.java
Wed Dec 28 10:47:30 2005
@@ -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;
Modified:
incubator/activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/MessageServlet.java
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/MessageServlet.java?rev=359590&r1=359554&r2=359590&view=diff
==============================================================================
---
incubator/activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/MessageServlet.java
(original)
+++
incubator/activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/MessageServlet.java
Wed Dec 28 10:47:30 2005
@@ -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;
Modified:
incubator/activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/MessageServletSupport.java
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/MessageServletSupport.java?rev=359590&r1=359554&r2=359590&view=diff
==============================================================================
---
incubator/activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/MessageServletSupport.java
(original)
+++
incubator/activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/MessageServletSupport.java
Wed Dec 28 10:47:30 2005
@@ -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;
Modified:
incubator/activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/NoDestinationSuppliedException.java
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/NoDestinationSuppliedException.java?rev=359590&r1=359554&r2=359590&view=diff
==============================================================================
---
incubator/activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/NoDestinationSuppliedException.java
(original)
+++
incubator/activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/NoDestinationSuppliedException.java
Wed Dec 28 10:47:30 2005
@@ -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;
Modified:
incubator/activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/PortfolioPublishServlet.java
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/PortfolioPublishServlet.java?rev=359590&r1=359554&r2=359590&view=diff
==============================================================================
---
incubator/activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/PortfolioPublishServlet.java
(original)
+++
incubator/activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/PortfolioPublishServlet.java
Wed Dec 28 10:47:30 2005
@@ -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;
Modified:
incubator/activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/SpringBrokerContextListener.java
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/SpringBrokerContextListener.java?rev=359590&r1=359554&r2=359590&view=diff
==============================================================================
---
incubator/activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/SpringBrokerContextListener.java
(original)
+++
incubator/activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/SpringBrokerContextListener.java
Wed Dec 28 10:47:30 2005
@@ -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;
Modified:
incubator/activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/WebClient.java
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/WebClient.java?rev=359590&r1=359554&r2=359590&view=diff
==============================================================================
---
incubator/activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/WebClient.java
(original)
+++
incubator/activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/WebClient.java
Wed Dec 28 10:47:30 2005
@@ -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 @@
* @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);
Modified: incubator/activemq/trunk/activemq-web/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-web/src/main/webapp/WEB-INF/web.xml?rev=359590&r1=359589&r2=359590&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-web/src/main/webapp/WEB-INF/web.xml
(original)
+++ incubator/activemq/trunk/activemq-web/src/main/webapp/WEB-INF/web.xml Wed
Dec 28 10:47:30 2005
@@ -13,20 +13,20 @@
<!-- context config -->
<context-param>
- <param-name>org.activemq.brokerURL</param-name>
+ <param-name>org.apache.activemq.brokerURL</param-name>
<param-value>vm://localhost</param-value>
<description>The URL of the Message Broker to connect to</description>
</context-param>
<context-param>
- <param-name>org.activemq.embeddedBroker</param-name>
+ <param-name>org.apache.activemq.embeddedBroker</param-name>
<param-value>true</param-value>
<description>Whether we should include an embedded broker or
not</description>
</context-param>
<!-- connection manager -->
<listener>
- <listener-class>org.activemq.web.ConnectionManager</listener-class>
+
<listener-class>org.apache.activemq.web.ConnectionManager</listener-class>
</listener>
@@ -35,14 +35,14 @@
<!-- the main REST servlet -->
<servlet>
<servlet-name>MessageServlet</servlet-name>
- <servlet-class>org.activemq.web.MessageServlet</servlet-class>
+ <servlet-class>org.apache.activemq.web.MessageServlet</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
<!-- servlets for the portfolio demo -->
<servlet>
<servlet-name>PortfolioPublishServlet</servlet-name>
- <servlet-class>org.activemq.web.PortfolioPublishServlet</servlet-class>
+
<servlet-class>org.apache.activemq.web.PortfolioPublishServlet</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
Copied:
incubator/activemq/trunk/activemq-web/src/test/java/org/apache/activemq/web/JettyServer.java
(from r359554,
incubator/activemq/trunk/activemq-web/src/test/java/org/activemq/web/JettyServer.java)
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-web/src/test/java/org/apache/activemq/web/JettyServer.java?p2=incubator/activemq/trunk/activemq-web/src/test/java/org/apache/activemq/web/JettyServer.java&p1=incubator/activemq/trunk/activemq-web/src/test/java/org/activemq/web/JettyServer.java&r1=359554&r2=359590&rev=359590&view=diff
==============================================================================
---
incubator/activemq/trunk/activemq-web/src/test/java/org/activemq/web/JettyServer.java
(original)
+++
incubator/activemq/trunk/activemq-web/src/test/java/org/apache/activemq/web/JettyServer.java
Wed Dec 28 10:47:30 2005
@@ -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;
Modified:
incubator/activemq/trunk/activemq-web/src/test/resources/log4j.properties
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-web/src/test/resources/log4j.properties?rev=359590&r1=359589&r2=359590&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-web/src/test/resources/log4j.properties
(original)
+++ incubator/activemq/trunk/activemq-web/src/test/resources/log4j.properties
Wed Dec 28 10:47:30 2005
@@ -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
