activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gtu...@apache.org
Subject svn commit: r1412825 - in /activemq/trunk/activemq-web-console: pom.xml src/main/webapp/WEB-INF/jspf/headertags.jspf src/main/webapp/decorators/main.jsp src/main/webapp/decorators/panel.jsp src/main/webapp/decorators/printable.jsp
Date Fri, 23 Nov 2012 11:07:59 GMT
Author: gtully
Date: Fri Nov 23 11:07:57 2012
New Revision: 1412825

URL: http://svn.apache.org/viewvc?rev=1412825&view=rev
Log:
https://issues.apache.org/jira/browse/AMQ-4186 - fix up duplicate contenty type declaration,
fix up pom so main in web-console works ok with current dependencies

Modified:
    activemq/trunk/activemq-web-console/pom.xml
    activemq/trunk/activemq-web-console/src/main/webapp/WEB-INF/jspf/headertags.jspf
    activemq/trunk/activemq-web-console/src/main/webapp/decorators/main.jsp
    activemq/trunk/activemq-web-console/src/main/webapp/decorators/panel.jsp
    activemq/trunk/activemq-web-console/src/main/webapp/decorators/printable.jsp

Modified: activemq/trunk/activemq-web-console/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-web-console/pom.xml?rev=1412825&r1=1412824&r2=1412825&view=diff
==============================================================================
--- activemq/trunk/activemq-web-console/pom.xml (original)
+++ activemq/trunk/activemq-web-console/pom.xml Fri Nov 23 11:07:57 2012
@@ -210,18 +210,22 @@
                 <artifactId>servlet-api-2.5</artifactId>
                 <groupId>org.mortbay.jetty</groupId>
             </exclusion>
+            <exclusion>
+                <artifactId>ecj</artifactId>
+                <groupId>org.eclipse.jdt.core.compiler</groupId>
+            </exclusion>
         </exclusions>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>activeio-core</artifactId>
-    </dependency>
-    <dependency>
       <groupId>org.apache.activemq</groupId>
       <artifactId>activemq-jaas</artifactId>
       <optional>true</optional>
     </dependency>
     <dependency>
+       <groupId>org.apache.activemq</groupId>
+       <artifactId>activemq-client</artifactId>
+    </dependency>
+    <dependency>
       <groupId>org.apache.xbean</groupId>
       <artifactId>xbean-spring</artifactId>
     </dependency>
@@ -233,11 +237,6 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.mortbay.jetty</groupId>
-      <artifactId>jsp-2.1-glassfish</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
       <groupId>org.eclipse.jdt</groupId>
       <artifactId>core</artifactId>
       <version>3.1.1</version>

Modified: activemq/trunk/activemq-web-console/src/main/webapp/WEB-INF/jspf/headertags.jspf
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-web-console/src/main/webapp/WEB-INF/jspf/headertags.jspf?rev=1412825&r1=1412824&r2=1412825&view=diff
==============================================================================
--- activemq/trunk/activemq-web-console/src/main/webapp/WEB-INF/jspf/headertags.jspf (original)
+++ activemq/trunk/activemq-web-console/src/main/webapp/WEB-INF/jspf/headertags.jspf Fri Nov
23 11:07:57 2012
@@ -14,7 +14,6 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 --%>
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
 <%@ 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" %>

Modified: activemq/trunk/activemq-web-console/src/main/webapp/decorators/main.jsp
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-web-console/src/main/webapp/decorators/main.jsp?rev=1412825&r1=1412824&r2=1412825&view=diff
==============================================================================
--- activemq/trunk/activemq-web-console/src/main/webapp/decorators/main.jsp (original)
+++ activemq/trunk/activemq-web-console/src/main/webapp/decorators/main.jsp Fri Nov 23 11:07:57
2012
@@ -1,4 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<%@ 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

Modified: activemq/trunk/activemq-web-console/src/main/webapp/decorators/panel.jsp
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-web-console/src/main/webapp/decorators/panel.jsp?rev=1412825&r1=1412824&r2=1412825&view=diff
==============================================================================
--- activemq/trunk/activemq-web-console/src/main/webapp/decorators/panel.jsp (original)
+++ activemq/trunk/activemq-web-console/src/main/webapp/decorators/panel.jsp Fri Nov 23 11:07:57
2012
@@ -1,3 +1,4 @@
+<%@ 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

Modified: activemq/trunk/activemq-web-console/src/main/webapp/decorators/printable.jsp
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-web-console/src/main/webapp/decorators/printable.jsp?rev=1412825&r1=1412824&r2=1412825&view=diff
==============================================================================
--- activemq/trunk/activemq-web-console/src/main/webapp/decorators/printable.jsp (original)
+++ activemq/trunk/activemq-web-console/src/main/webapp/decorators/printable.jsp Fri Nov 23
11:07:57 2012
@@ -1,3 +1,4 @@
+<%@ 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



Mime
View raw message