activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hadr...@apache.org
Subject [21/29] git commit: Updates for web-console
Date Thu, 20 Mar 2014 17:44:32 GMT
Updates for web-console


Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/19d0909e
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/19d0909e
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/19d0909e

Branch: refs/heads/activemq-5.9
Commit: 19d0909ed7367487d6bba8534ddf38dad4fd1c3b
Parents: 91a262d
Author: Hadrian Zbarcea <hadrian@apache.org>
Authored: Thu Mar 20 13:14:10 2014 -0400
Committer: Hadrian Zbarcea <hadrian@apache.org>
Committed: Thu Mar 20 13:14:10 2014 -0400

----------------------------------------------------------------------
 activemq-web-console/pom.xml                     | 19 ++++++++++++++-----
 .../src/main/webapp/WEB-INF/web.xml              |  4 +---
 2 files changed, 15 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq/blob/19d0909e/activemq-web-console/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-web-console/pom.xml b/activemq-web-console/pom.xml
index 1843bb2..e853824 100755
--- a/activemq-web-console/pom.xml
+++ b/activemq-web-console/pom.xml
@@ -185,6 +185,20 @@
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>activemq-web</artifactId>
+      <exclusions>
+          <exclusion>
+              <groupId>${project.groupId}</groupId>
+              <artifactId>activemq-all</artifactId>
+          </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>activemq-stomp</artifactId>
+    </dependency>
+    <dependency>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>activemq-spring</artifactId>
     </dependency>
 
     <!-- XMPP support -->
@@ -207,11 +221,6 @@
     </dependency>
 
     <dependency>
-      <groupId>org.apache.activemq</groupId>
-      <artifactId>activemq-all</artifactId>
-    </dependency>
-
-    <dependency>
       <groupId>org.apache.xbean</groupId>
       <artifactId>xbean-spring</artifactId>
     </dependency>

http://git-wip-us.apache.org/repos/asf/activemq/blob/19d0909e/activemq-web-console/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/activemq-web-console/src/main/webapp/WEB-INF/web.xml b/activemq-web-console/src/main/webapp/WEB-INF/web.xml
index 9f8e922..f35e93e 100755
--- a/activemq-web-console/src/main/webapp/WEB-INF/web.xml
+++ b/activemq-web-console/src/main/webapp/WEB-INF/web.xml
@@ -22,9 +22,7 @@
          http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
          version="2.4">
 
-  <description>
-    Apache ActiveMQ Web Console
-  </description>
+  <description>Apache ActiveMQ Web Console</description>
   <display-name>ActiveMQ Console</display-name>
 
   <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->


Mime
View raw message