You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ha...@apache.org on 2014/02/04 03:04:47 UTC
[3/4] git commit: More updates for removing sitemesh,
remove activemq-all.
More updates for removing sitemesh, remove activemq-all.
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/f222741f
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/f222741f
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/f222741f
Branch: refs/heads/trunk
Commit: f222741fdc5e5b8b5dc401e054abbf5a77ff63dc
Parents: bdf7aa4
Author: Daniel Kulp <dk...@apache.org>
Authored: Mon Feb 3 15:13:44 2014 -0500
Committer: Daniel Kulp <dk...@apache.org>
Committed: Mon Feb 3 15:13:44 2014 -0500
----------------------------------------------------------------------
activemq-web-console/pom.xml | 25 +++++++++++---------
.../main/webapp/WEB-INF/jspf/headertags.jspf | 1 -
.../src/main/webapp/WEB-INF/web.xml | 12 ----------
3 files changed, 14 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq/blob/f222741f/activemq-web-console/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-web-console/pom.xml b/activemq-web-console/pom.xml
index 1f06987..e5f2e94 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>
@@ -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>
http://git-wip-us.apache.org/repos/asf/activemq/blob/f222741f/activemq-web-console/src/main/webapp/WEB-INF/jspf/headertags.jspf
----------------------------------------------------------------------
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 4b69830..9896410 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" %>
http://git-wip-us.apache.org/repos/asf/activemq/blob/f222741f/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 9996c61..c24b521 100755
--- a/activemq-web-console/src/main/webapp/WEB-INF/web.xml
+++ b/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 . -->