From cbc227cd1c626cf0ba74ff7d8eafe4d0deb1ab40 Mon Sep 17 00:00:00 2001 From: Daniel Kulp Date: Wed, 29 Jan 2014 20:35:16 -0500 Subject: [PATCH 1/2] [AMQ-4994] Remove site-mesh --- activemq-web-console/pom.xml | 6 - .../src/main/webapp/WEB-INF/decorators.xml | 31 ---- .../main/webapp/WEB-INF/jspf/headertags.jspf | 1 - .../src/main/webapp/WEB-INF/web.xml | 13 -- .../src/main/webapp/decorators/main.jsp | 173 ------------------ .../src/main/webapp/decorators/panel.jsp | 32 ---- .../src/main/webapp/decorators/printable.jsp | 32 ---- 7 files changed, 288 deletions(-) delete mode 100644 activemq-web-console/src/main/webapp/WEB-INF/decorators.xml delete mode 100644 activemq-web-console/src/main/webapp/decorators/main.jsp delete mode 100644 activemq-web-console/src/main/webapp/decorators/panel.jsp delete mode 100644 activemq-web-console/src/main/webapp/decorators/printable.jsp diff --git a/activemq-web-console/pom.xml b/activemq-web-console/pom.xml index 1f06987c72..790e2ab86e 100755 --- a/activemq-web-console/pom.xml +++ b/activemq-web-console/pom.xml @@ -240,12 +240,6 @@ log4j - - - opensymphony - sitemesh - - javax.servlet diff --git a/activemq-web-console/src/main/webapp/WEB-INF/decorators.xml b/activemq-web-console/src/main/webapp/WEB-INF/decorators.xml deleted file mode 100644 index 0168e1b2ac..0000000000 --- a/activemq-web-console/src/main/webapp/WEB-INF/decorators.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - /xml/* - /slave.jsp - - - - /* - - - - - diff --git a/activemq-web-console/src/main/webapp/WEB-INF/jspf/headertags.jspf b/activemq-web-console/src/main/webapp/WEB-INF/jspf/headertags.jspf index 4b698304c4..9896410ee6 100644 --- a/activemq-web-console/src/main/webapp/WEB-INF/jspf/headertags.jspf +++ b/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" %> 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 9996c61325..9f8e922791 100755 --- a/activemq-web-console/src/main/webapp/WEB-INF/web.xml +++ b/activemq-web-console/src/main/webapp/WEB-INF/web.xml @@ -27,19 +27,6 @@ ActiveMQ Console - - - - - diff --git a/activemq-web-console/src/main/webapp/decorators/main.jsp b/activemq-web-console/src/main/webapp/decorators/main.jsp deleted file mode 100644 index 028fec2da5..0000000000 --- a/activemq-web-console/src/main/webapp/decorators/main.jsp +++ /dev/null @@ -1,173 +0,0 @@ - -<%@ page contentType="text/html;charset=UTF-8" language="java" %> -<%-- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---%> - - - - - ${requestContext.brokerQuery.brokerAdmin.brokerName} : <decorator:title default="ActiveMQ Console" /> - - - - - - - - - - - - - - -
-
-
-
-
-
-
-
-
-
- -
- - - - - -
- - -
- - - - - - - - -
-
- -
- 		- -
-
-
-

Queue Views

- - -

Topic Views

- -
    - - - -
  • XML
    • -
-

Subscribers Views

- -
    - - - -
  • XML
    • -
-

Useful Links

- - -
-
-
-
- - -
-
-
-
-
-
-
-
-
-
- Copyright 2005-2013 The Apache Software Foundation. - - (printable version) -
-
-
-
-
-
-
Graphic Design By Hiram
- - - - diff --git a/activemq-web-console/src/main/webapp/decorators/panel.jsp b/activemq-web-console/src/main/webapp/decorators/panel.jsp deleted file mode 100644 index 3470e1b332..0000000000 --- a/activemq-web-console/src/main/webapp/decorators/panel.jsp +++ /dev/null @@ -1,32 +0,0 @@ -<%@ page contentType="text/html;charset=UTF-8" language="java" %> -<%@ taglib uri="http://www.opensymphony.com/sitemesh/decorator" prefix="decorator" %> -<%-- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---%> -

- - - - - - - -
- -
- -
-

diff --git a/activemq-web-console/src/main/webapp/decorators/printable.jsp b/activemq-web-console/src/main/webapp/decorators/printable.jsp deleted file mode 100644 index 84659a00a1..0000000000 --- a/activemq-web-console/src/main/webapp/decorators/printable.jsp +++ /dev/null @@ -1,32 +0,0 @@ -<%@ page contentType="text/html;charset=UTF-8" language="java" %> -<%@ taglib uri="http://www.opensymphony.com/sitemesh/decorator" prefix="decorator" %> -<%-- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---%> - - - - <decorator:title default="Welcome!" /> - - - - - Printed on <%=new java.util.Date()%>.
-
-
- - - From 127f82a4392caeec2913144a72a61f53c79d5625 Mon Sep 17 00:00:00 2001 From: Daniel Kulp Date: Mon, 3 Feb 2014 14:37:46 -0500 Subject: [PATCH 2/2] Remove sitemesh jar from assembly, not needed anymore --- assembly/pom.xml | 4 ---- assembly/src/main/descriptors/common-bin.xml | 3 --- pom.xml | 6 ------ 3 files changed, 13 deletions(-) diff --git a/assembly/pom.xml b/assembly/pom.xml index 96593b8865..a25c0851ea 100755 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -353,10 +353,6 @@ org.slf4j jcl-over-slf4j - - opensymphony - sitemesh - javax.servlet jstl diff --git a/assembly/src/main/descriptors/common-bin.xml b/assembly/src/main/descriptors/common-bin.xml index 4eb73813be..e08078e884 100644 --- a/assembly/src/main/descriptors/common-bin.xml +++ b/assembly/src/main/descriptors/common-bin.xml @@ -252,9 +252,6 @@ org.mortbay.jetty:jsp-api-2.1-glassfish org.eclipse.jdt:core - - opensymphony:sitemesh - rome:rome jdom:jdom diff --git a/pom.xml b/pom.xml index 474d00c140..ec6b93690c 100755 --- a/pom.xml +++ b/pom.xml @@ -92,7 +92,6 @@ 1.2.17 1.7 1.2.0 - 2.4.2 10.10.1.1 4.3.1 1.1.2 @@ -1039,11 +1038,6 @@ jcl-over-slf4j ${slf4j-version} - - opensymphony - sitemesh - ${opensymphony-version} - javax.servlet jstl