Skip to content

Commit

Permalink
Trying unsuccessfully to fix the compile-error in monitor/status-gui/…
Browse files Browse the repository at this point in the history
…src/main/webapp/Monitor-JMXsummary.jsp
  • Loading branch information
svcarlsen committed Nov 3, 2015
1 parent 9d6470a commit c1cadfd
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 5 deletions.
31 changes: 28 additions & 3 deletions common/common-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -74,12 +74,15 @@
<version>2.3</version>
</dependency>

<!-- jetty -->

<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId>
<version>6.1.26</version>
<scope>compile</scope>
</dependency>

<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-util</artifactId>
Expand All @@ -98,13 +101,35 @@
<version>6.1.26</version>
<scope>compile</scope>
</dependency>

<dependency>
<groupId>javax.servlet</groupId>
<groupId>org.mortbay.jetty</groupId>
<artifactId>servlet-api</artifactId>
<version>2.5-20081211</version>
</dependency>

<dependency>
<groupId>javax.servlet</groupId>
<artifactId>jsp-api</artifactId>
<version>2.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jsp-2.1-glassfish</artifactId>
<version>2.1.v20091210</version>
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jsp-2.1-jetty</artifactId>
<version>6.1.26</version>
</dependency>


<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jsp-api-2.1-glassfish</artifactId>
<version>2.1.v20091210</version>
</dependency>
<!--
<dependency>
Expand Down Expand Up @@ -138,7 +163,7 @@
<dependency>
<groupId>org.eclipse.jdt.core.compiler</groupId>
<artifactId>ecj</artifactId>
<version>4.4</version>
<version>4.4.2</version>
</dependency>

<dependency>
Expand Down
6 changes: 4 additions & 2 deletions monitor/status-gui/src/main/webapp/Monitor-JMXsummary.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,9 @@ will not appear here.
dk.netarkivet.monitor.webinterface.JMXSummaryUtils,
dk.netarkivet.monitor.webinterface.StatusEntry,
java.net.URLEncoder,
java.net.URLDecoder"
java.net.URLDecoder,
org.slf4j.LoggerFactory,
org.slf4j.Logger"
pageEncoding="UTF-8"
%>
<%@taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"
Expand Down Expand Up @@ -319,4 +321,4 @@ will not appear here.
</table>
<%
HTMLUtils.generateFooter(out);
%>
%>

0 comments on commit c1cadfd

Please sign in to comment.