Author: djencks
Date: Mon Apr 7 12:23:31 2008
New Revision: 645653
URL: http://svn.apache.org/viewvc?rev=645653&view=rev
Log:
fix up web console slightly, a couple minor cleanups
Added:
activemq/branches/activemq-4.1/assembly/src/release/LICENSE (props
changed)
- copied unchanged from r645601,
activemq/branches/activemq-4.1/assembly/src/release/LICENSE.txt
activemq/branches/activemq-4.1/assembly/src/release/NOTICE (props changed)
- copied unchanged from r645601,
activemq/branches/activemq-4.1/assembly/src/release/NOTICE.txt
Removed:
activemq/branches/activemq-4.1/activemq-core/src/test/resources/META-INF/
activemq/branches/activemq-4.1/activemq-web-console/LICENSE.txt
activemq/branches/activemq-4.1/assembly/src/release/LICENSE.txt
activemq/branches/activemq-4.1/assembly/src/release/NOTICE.txt
Modified:
activemq/branches/activemq-4.1/README.txt
activemq/branches/activemq-4.1/activemq-web-console/README.txt
activemq/branches/activemq-4.1/activemq-web-console/pom.xml
activemq/branches/activemq-4.1/activemq-web-console/src/main/webapp/META-INF/NOTICE
activemq/branches/activemq-4.1/activemq-web-console/src/main/webapp/WEB-INF/dispatcher-servlet.xml
activemq/branches/activemq-4.1/activemq-web-console/src/main/webapp/decorators/main.jsp
activemq/branches/activemq-4.1/activemq-web-console/src/main/webapp/queues.jsp
activemq/branches/activemq-4.1/assembly/src/release/README.txt
activemq/branches/activemq-4.1/pom.xml
Modified: activemq/branches/activemq-4.1/README.txt
URL:
http://svn.apache.org/viewvc/activemq/branches/activemq-4.1/README.txt?rev=645653&r1=645652&r2=645653&view=diff
==============================================================================
--- activemq/branches/activemq-4.1/README.txt (original)
+++ activemq/branches/activemq-4.1/README.txt Mon Apr 7 12:23:31 2008
@@ -32,7 +32,7 @@
=======================================================================
This software is licensed under the terms you may find in the file
- named "LICENSE.txt" in this directory.
+ named "LICENSE" in this directory.
This distribution includes cryptographic software. The country in
which you currently reside may have restrictions on the import,
Modified: activemq/branches/activemq-4.1/activemq-web-console/README.txt
URL:
http://svn.apache.org/viewvc/activemq/branches/activemq-4.1/activemq-web-console/README.txt?rev=645653&r1=645652&r2=645653&view=diff
==============================================================================
--- activemq/branches/activemq-4.1/activemq-web-console/README.txt (original)
+++ activemq/branches/activemq-4.1/activemq-web-console/README.txt Mon Apr 7
12:23:31 2008
@@ -8,5 +8,5 @@
You can then run the ActiveMQ Web Console via the following command.
- mvn jetty6:run
+ mvn jetty:run
Modified: activemq/branches/activemq-4.1/activemq-web-console/pom.xml
URL:
http://svn.apache.org/viewvc/activemq/branches/activemq-4.1/activemq-web-console/pom.xml?rev=645653&r1=645652&r2=645653&view=diff
==============================================================================
--- activemq/branches/activemq-4.1/activemq-web-console/pom.xml (original)
+++ activemq/branches/activemq-4.1/activemq-web-console/pom.xml Mon Apr 7
12:23:31 2008
@@ -59,6 +59,7 @@
</plugins>
</build>
+<!--
<pluginRepositories>
<pluginRepository>
<id>mortbay-repo</id>
@@ -66,6 +67,7 @@
<url>http://www.mortbay.org/maven2/snapshot</url>
</pluginRepository>
</pluginRepositories>
+-->
<dependencies>
Modified:
activemq/branches/activemq-4.1/activemq-web-console/src/main/webapp/META-INF/NOTICE
URL:
http://svn.apache.org/viewvc/activemq/branches/activemq-4.1/activemq-web-console/src/main/webapp/META-INF/NOTICE?rev=645653&r1=645652&r2=645653&view=diff
==============================================================================
---
activemq/branches/activemq-4.1/activemq-web-console/src/main/webapp/META-INF/NOTICE
(original)
+++
activemq/branches/activemq-4.1/activemq-web-console/src/main/webapp/META-INF/NOTICE
Mon Apr 7 12:23:31 2008
@@ -1,5 +1,5 @@
Apache ActiveMQ
-Copyright 2005-2006 The Apache Software Foundation
+Copyright 2005-2008 The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
Modified:
activemq/branches/activemq-4.1/activemq-web-console/src/main/webapp/WEB-INF/dispatcher-servlet.xml
URL:
http://svn.apache.org/viewvc/activemq/branches/activemq-4.1/activemq-web-console/src/main/webapp/WEB-INF/dispatcher-servlet.xml?rev=645653&r1=645652&r2=645653&view=diff
==============================================================================
---
activemq/branches/activemq-4.1/activemq-web-console/src/main/webapp/WEB-INF/dispatcher-servlet.xml
(original)
+++
activemq/branches/activemq-4.1/activemq-web-console/src/main/webapp/WEB-INF/dispatcher-servlet.xml
Mon Apr 7 12:23:31 2008
@@ -31,7 +31,7 @@
<bean name="/createSubscriber.action"
class="org.apache.activemq.web.controller.CreateSubscriber"
autowire="constructor" singleton="false"/>
<bean name="/deleteSubscriber.action"
class="org.apache.activemq.web.controller.DeleteSubscriber"
autowire="constructor" singleton="false"/>
<bean name="/sendMessage.action"
class="org.apache.activemq.web.controller.SendMessage" autowire="constructor"
singleton="false"/>
- <bean name="/purgeDestination.action"
class="org.apache.activemq.web.controller.PurgeDestination"
autowire="constructor" singleton="false"/>
+ <!--<bean name="/purgeDestination.action"
class="org.apache.activemq.web.controller.PurgeDestination"
autowire="constructor" singleton="false"/>-->
<!--
- This bean resolves specific types of exception to corresponding error
views.
Modified:
activemq/branches/activemq-4.1/activemq-web-console/src/main/webapp/decorators/main.jsp
URL:
http://svn.apache.org/viewvc/activemq/branches/activemq-4.1/activemq-web-console/src/main/webapp/decorators/main.jsp?rev=645653&r1=645652&r2=645653&view=diff
==============================================================================
---
activemq/branches/activemq-4.1/activemq-web-console/src/main/webapp/decorators/main.jsp
(original)
+++
activemq/branches/activemq-4.1/activemq-web-console/src/main/webapp/decorators/main.jsp
Mon Apr 7 12:23:31 2008
@@ -88,7 +88,7 @@
<div id="wrapper-footer">
<div id="footer">
<p>
- Copyright 2005-2006 The Apache Software Foundation
+ Copyright 2005-2008 The Apache Software Foundation
</p>
<p>
Modified:
activemq/branches/activemq-4.1/activemq-web-console/src/main/webapp/queues.jsp
URL:
http://svn.apache.org/viewvc/activemq/branches/activemq-4.1/activemq-web-console/src/main/webapp/queues.jsp?rev=645653&r1=645652&r2=645653&view=diff
==============================================================================
---
activemq/branches/activemq-4.1/activemq-web-console/src/main/webapp/queues.jsp
(original)
+++
activemq/branches/activemq-4.1/activemq-web-console/src/main/webapp/queues.jsp
Mon Apr 7 12:23:31 2008
@@ -68,7 +68,7 @@
</td>
<td>
<a
href="send.jsp?JMSDestination=${row.name}&JMSDestinationType=queue">Send To</a>
- <a
href="purgeDestination.action?JMSDestination=${row.name}&JMSDestinationType=queue">Purge</a>
+ <%--<a
href="purgeDestination.action?JMSDestination=${row.name}&JMSDestinationType=queue">Purge</a>--%>
<a
href="deleteDestination.action?JMSDestination=${row.name}&JMSDestinationType=queue">Delete</a>
</td>
</tr>
Propchange: activemq/branches/activemq-4.1/assembly/src/release/LICENSE
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: activemq/branches/activemq-4.1/assembly/src/release/LICENSE
------------------------------------------------------------------------------
svn:executable = *
Propchange: activemq/branches/activemq-4.1/assembly/src/release/NOTICE
------------------------------------------------------------------------------
svn:eol-style = native
Modified: activemq/branches/activemq-4.1/assembly/src/release/README.txt
URL:
http://svn.apache.org/viewvc/activemq/branches/activemq-4.1/assembly/src/release/README.txt?rev=645653&r1=645652&r2=645653&view=diff
==============================================================================
--- activemq/branches/activemq-4.1/assembly/src/release/README.txt (original)
+++ activemq/branches/activemq-4.1/assembly/src/release/README.txt Mon Apr 7
12:23:31 2008
@@ -32,7 +32,7 @@
=======================================================================
This software is licensed under the terms you may find in the file
- named "LICENSE.txt" in this directory.
+ named "LICENSE" in this directory.
This distribution includes cryptographic software. The country in
which you currently reside may have restrictions on the import,
Modified: activemq/branches/activemq-4.1/pom.xml
URL:
http://svn.apache.org/viewvc/activemq/branches/activemq-4.1/pom.xml?rev=645653&r1=645652&r2=645653&view=diff
==============================================================================
--- activemq/branches/activemq-4.1/pom.xml (original)
+++ activemq/branches/activemq-4.1/pom.xml Mon Apr 7 12:23:31 2008
@@ -29,6 +29,8 @@
<packaging>pom</packaging>
<name>ActiveMQ</name>
+ <description>ActiveMQ is a fast and powerful Message Broker which supports
many Cross Language Clients and Protocols and many advanced features while
fully supporting JMS 1.1 and J2EE 1.4.</description>
+
<prerequisites>
<maven>2.0.8</maven>
</prerequisites>
@@ -913,16 +915,16 @@
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
</plugin>
-<!--
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
</plugin>
--->
+<!--
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
</plugin>
+-->
<!--
<plugin>
<groupId>org.apache.maven.plugins</groupId>
