You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by tv...@apache.org on 2012/06/09 14:42:43 UTC
svn commit: r1348380 - in /openejb/trunk/openejb/tomee/tomee-webapp/src/main:
java/org/apache/tomee/webapp/servlet/JndiServlet.java webapp/application/
webapp/application/tomee.css webapp/css/tomee.css webapp/index.html
Author: tveronezi
Date: Sat Jun 9 12:42:43 2012
New Revision: 1348380
URL: http://svn.apache.org/viewvc?rev=1348380&view=rev
Log:
https://issues.apache.org/jira/browse/TOMEE-224
* upgrade jquery version to 1.7.2
* create the JndiServlet skeleton
Added:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/servlet/JndiServlet.java
- copied, changed from r1348196, openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/servlet/LogServlet.java
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/tomee.css
Removed:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/css/tomee.css
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/index.html
Copied: openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/servlet/JndiServlet.java (from r1348196, openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/servlet/LogServlet.java)
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/servlet/JndiServlet.java?p2=openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/servlet/JndiServlet.java&p1=openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/servlet/LogServlet.java&r1=1348196&r2=1348380&rev=1348380&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/servlet/LogServlet.java (original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/servlet/JndiServlet.java Sat Jun 9 12:42:43 2012
@@ -17,21 +17,16 @@
package org.apache.tomee.webapp.servlet;
-import org.apache.commons.lang3.StringEscapeUtils;
import org.apache.tomee.webapp.JsonExecutor;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileReader;
import java.io.IOException;
-import java.util.*;
+import java.util.Map;
-
-public class LogServlet extends HttpServlet {
+public class JndiServlet extends HttpServlet {
@Override
protected void doGet(final HttpServletRequest req, final HttpServletResponse resp) throws ServletException, IOException {
@@ -39,117 +34,9 @@ public class LogServlet extends HttpServ
@Override
public void call(Map<String, Object> json) throws Exception {
- final File logFolder = new File(System.getProperty("catalina.base"), "logs");
-
- final File[] files = logFolder.listFiles();
- final Set<String> names = new TreeSet<String>();
- if (files != null) {
- for (File file : files) {
- if (file.length() > 0) {
- names.add(file.getName());
- }
- }
- }
-
- json.put("files", names);
-
- final String loadFileName = req.getParameter("file");
- if (loadFileName != null) {
- Map<String, Object> log = new HashMap<String, Object>();
- log.put("name", loadFileName);
-
- Integer tail;
- try {
- tail = Integer.valueOf(req.getParameter("tail"));
- } catch (Exception e) {
- tail = null;
- }
-
- log.put("lines", read(
- Boolean.valueOf(req.getParameter("escapeHtml")),
- new File(logFolder, loadFileName),
- tail
- ));
- json.put("log", log);
- }
}
});
}
-
- private Collection<String> read(final boolean escapeHtml, final File file, final Integer tail) throws IOException {
- final Queue<String> lines = new LinkedList<String>();
- final AddLine addLine = new AddLine(lines, tail);
-
- String line;
- final BufferedReader br = new BufferedReader(new FileReader(file));
-
- if (escapeHtml) {
- while ((line = br.readLine()) != null) {
- addLine.add(StringEscapeUtils.escapeHtml4(line));
- }
- } else {
- while ((line = br.readLine()) != null) {
- addLine.add(line);
- }
- }
-
-
- return lines;
- }
-
- private interface AddItemStrategy {
- void add(String newLine);
- }
-
- private class AddLine {
- final Queue<String> lines;
- AddItemStrategy strategy;
- final int tail;
-
- private AddLine(Queue<String> lines, Integer tail) {
- this.lines = lines;
-
- if (tail == null) {
- this.tail = -1;
- this.strategy = justAddIt;
- } else {
- this.tail = tail;
- this.strategy = addToEmptyList;
- }
- }
-
- final AddItemStrategy justAddIt = new AddItemStrategy() {
-
- @Override
- public void add(String newLine) {
- lines.add(newLine);
- }
- };
-
- final AddItemStrategy addToEmptyList = new AddItemStrategy() {
-
- @Override
- public void add(String newLine) {
- lines.add(newLine);
- if (lines.size() > tail) {
- strategy = addToFullList;
- }
- }
- };
-
- final AddItemStrategy addToFullList = new AddItemStrategy() {
-
- @Override
- public void add(String newLine) {
- lines.add(newLine);
- lines.remove();
- }
- };
-
- public void add(String newLine) {
- strategy.add(newLine);
- }
- }
}
Added: openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/tomee.css
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/tomee.css?rev=1348380&view=auto
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/tomee.css (added)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/tomee.css Sat Jun 9 12:42:43 2012
@@ -0,0 +1,91 @@
+/*!
+ * 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.
+ */
+
+body {
+ padding: 0px;
+}
+
+.sidebar-nav {
+ padding: 9px 0;
+}
+
+.t-tree-link {
+
+}
+
+.t-navbar {
+ background-color: #eeeeee; /* Old browsers */
+ background-image: none;
+ box-shadow: 0 1px -1px rgba(0, 0, 0, .25), inset 0 -1px 0 rgba(0, 0, 0, .1);
+}
+
+ul.tree, ul.tree ul {
+ list-style-type: none;
+ margin: 0;
+ padding: 0;
+}
+
+ul.tree ul {
+ margin-left: 10px;
+}
+
+ul.tree li {
+ margin: 0;
+ padding: 0 20px;
+ line-height: 20px;
+}
+
+ul.tree li.leaf {
+ background: url("../img/page.png") no-repeat;
+}
+
+ul.tree li.opened {
+ background: url("../img/folder_delete.png") no-repeat;
+}
+
+ul.tree li.closed {
+ background: url("../img/folder_add.png") no-repeat;
+}
+
+ul.tree li.empty {
+ background: url("../img/folder.png") no-repeat;
+}
+
+div.t-panel {
+ padding: 0px;
+ background-color: #ffffff;
+ padding-left: 0px;
+ padding-right: 0px;
+ border: 2px solid #d3d3d3;
+ margin-bottom: 5px;
+}
+
+h3.t-panel-title {
+ position: relative;
+ background-color: #d3d3d3;
+ padding-left: 5px;
+}
+
+div.t-action-btn {
+ border-left: 1px solid whiteSmoke;
+ border-right: 1px solid #E5E5E5;
+ background-color: #e6e6e6;
+ float: right;
+ position: relative;
+ width: 30px;
+ height: 30px;
+}
Modified: openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/index.html
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/index.html?rev=1348380&r1=1348379&r2=1348380&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/index.html (original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/index.html Sat Jun 9 12:42:43 2012
@@ -4,11 +4,11 @@
<head>
<meta charset="utf-8">
<title>Apache Tomee</title>
- <link href="css/bootstrap.css" rel="stylesheet">
- <link href="css/tomee.css" rel="stylesheet">
+ <link href="lib/bootstrap/2.0.4/css/bootstrap.min.css" rel="stylesheet">
+ <link href="application/tomee.css" rel="stylesheet">
- <script src="js/jquery/jquery-1.7.1.js"></script>
- <script src="js/bootstrap/bootstrap.js"></script>
+ <script src="lib/jquery/jquery-1.7.2.min.js"></script>
+ <script src="lib/bootstrap/2.0.4/js/bootstrap.min.js"></script>
<script src="js/tomee/Application.js"></script>
<script src="js/tomee/util/DelayedTask.js"></script>