More updates for removing sitemesh, remove activemq-all.

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 -->
@@ -206,11 +220,6 @@
       <optional>true</optional>
     </dependency>
 
-    <dependency>
-      <groupId>org.apache.activemq</groupId>
-      <artifactId>activemq-all</artifactId>
-    </dependency>
-
     <dependency>
       <groupId>org.apache.xbean</groupId>
       <artifactId>xbean-spring</artifactId>
@@ -240,12 +249,6 @@
       <artifactId>log4j</artifactId>
     </dependency>
 
-    <!-- SiteMesh for layout -->
-    <dependency>
-      <groupId>opensymphony</groupId>
-      <artifactId>sitemesh</artifactId>
-    </dependency>
-
     <!-- JSTL support -->
     <dependency>
       <groupId>javax.servlet</groupId>

activemq-web-console/src/main/webapp/WEB-INF/jspf/headertags.jspf

@@ -14,7 +14,6 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 --%>
-<%@ taglib prefix="decorator" uri="http://www.opensymphony.com/sitemesh/decorator" %>
 <%@ taglib prefix="form" tagdir="/WEB-INF/tags/form" %>
 <%@ taglib prefix="jms" tagdir="/WEB-INF/tags/jms" %>
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>

activemq-web-console/src/main/webapp/WEB-INF/web.xml

@@ -27,18 +27,6 @@
   </description>
   <display-name>ActiveMQ Console</display-name>
 
-  <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
-  <!--              Configuration of the SiteMesh Filter.                                                                 -->
-  <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
-  <!--filter>
-    <filter-name>sitemesh</filter-name>
-    <filter-class>com.opensymphony.module.sitemesh.filter.PageFilter</filter-class>
-  </filter>
-
-  <filter-mapping>
-    <filter-name>sitemesh</filter-name>
-    <url-pattern>/*</url-pattern>
-  </filter-mapping-->
 
   <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
   <!--              Expose Spring POJOs to JSP                   .                                                             -->