Author: tveronezi
Date: Sat Oct 6 16:47:28 2012
New Revision: 1395114
URL: http://svn.apache.org/viewvc?rev=1395114&view=rev
Log:
https://issues.apache.org/jira/browse/TOMEE-447
Added:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/lib/codemirror/
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/lib/codemirror/codemirror-2.34/
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/lib/codemirror/codemirror-2.34/LICENSE
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/lib/codemirror/codemirror-2.34/lib/
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/lib/codemirror/codemirror-2.34/lib/codemirror.css
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/lib/codemirror/codemirror-2.34/lib/codemirror.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/lib/codemirror/codemirror-2.34/lib/util/
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/lib/codemirror/codemirror-2.34/lib/util/closetag.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/lib/codemirror/codemirror-2.34/lib/util/dialog.css
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/lib/codemirror/codemirror-2.34/lib/util/dialog.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/lib/codemirror/codemirror-2.34/lib/util/foldcode.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/lib/codemirror/codemirror-2.34/lib/util/formatting.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/lib/codemirror/codemirror-2.34/lib/util/javascript-hint.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/lib/codemirror/codemirror-2.34/lib/util/loadmode.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/lib/codemirror/codemirror-2.34/lib/util/match-highlighter.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/lib/codemirror/codemirror-2.34/lib/util/multiplex.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/lib/codemirror/codemirror-2.34/lib/util/overlay.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/lib/codemirror/codemirror-2.34/lib/util/pig-hint.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/lib/codemirror/codemirror-2.34/lib/util/runmode-standalone.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/lib/codemirror/codemirror-2.34/lib/util/runmode.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/lib/codemirror/codemirror-2.34/lib/util/search.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/lib/codemirror/codemirror-2.34/lib/util/searchcursor.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/lib/codemirror/codemirror-2.34/lib/util/simple-hint.css
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/lib/codemirror/codemirror-2.34/lib/util/simple-hint.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/lib/codemirror/codemirror-2.34/lib/util/xml-hint.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/lib/codemirror/codemirror-2.34/mode/
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/lib/codemirror/codemirror-2.34/mode/groovy/
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/lib/codemirror/codemirror-2.34/mode/groovy/groovy.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/lib/codemirror/codemirror-2.34/mode/groovy/index.html
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/lib/codemirror/codemirror-2.34/mode/javascript/
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/lib/codemirror/codemirror-2.34/mode/javascript/index.html
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/lib/codemirror/codemirror-2.34/mode/javascript/javascript.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/lib/codemirror/codemirror-2.34/package.json
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/lib/codemirror/codemirror-2.34/theme/
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/lib/codemirror/codemirror-2.34/theme/ambiance.css
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/lib/codemirror/codemirror-2.34/theme/blackboard.css
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/lib/codemirror/codemirror-2.34/theme/cobalt.css
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/lib/codemirror/codemirror-2.34/theme/eclipse.css
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/lib/codemirror/codemirror-2.34/theme/elegant.css
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/lib/codemirror/codemirror-2.34/theme/erlang-dark.css
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/lib/codemirror/codemirror-2.34/theme/lesser-dark.css
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/lib/codemirror/codemirror-2.34/theme/monokai.css
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/lib/codemirror/codemirror-2.34/theme/neat.css
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/lib/codemirror/codemirror-2.34/theme/night.css
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/lib/codemirror/codemirror-2.34/theme/rubyblue.css
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/lib/codemirror/codemirror-2.34/theme/vibrant-ink.css
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/lib/codemirror/codemirror-2.34/theme/xq-dark.css
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/lib/handlebars/
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/lib/handlebars/handlebars-1.0.rc.1.js
openejb/trunk/openejb/tomee/tomee-webapp/src/test/java/org/apache/tomee/webapp/test/TestCommandExecution.java
openejb/trunk/openejb/tomee/tomee-webapp/src/test/java/org/apache/tomee/webapp/test/Util.java
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/pom.xml
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/WEB-INF/web.xml
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/index.html
openejb/trunk/openejb/tomee/tomee-webapp/src/test/java/org/apache/tomee/webapp/test/RunScriptTest.java
Modified: openejb/trunk/openejb/tomee/tomee-webapp/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/pom.xml?rev=1395114&r1=1395113&r2=1395114&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/pom.xml (original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/pom.xml Sat Oct 6 16:47:28 2012
@@ -60,6 +60,12 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-coyote</artifactId>
+ <version>${tomcat.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.1</version>
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/WEB-INF/web.xml?rev=1395114&r1=1395113&r2=1395114&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/WEB-INF/web.xml
(original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/WEB-INF/web.xml
Sat Oct 6 16:47:28 2012
@@ -36,14 +36,6 @@
</location>
</error-page>
- <!--
**************************************************************************************
-->
-
- <listener>
-
<listener-class>org.apache.tomee.webapp.listener.UserSessionListener</listener-class>
- </listener>
-
- <!--
**************************************************************************************
-->
-
<servlet>
<servlet-name>LoaderServlet</servlet-name>
<servlet-class>org.apache.tomee.loader.LoaderServlet</servlet-class>
@@ -53,6 +45,17 @@
<!--
**************************************************************************************
-->
<servlet>
+ <servlet-name>applicationSocketServlet</servlet-name>
+
<servlet-class>org.apache.tomee.webapp.servlet.ApplicationSocketServlet</servlet-class>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>applicationSocketServlet</servlet-name>
+ <url-pattern>/socket</url-pattern>
+ </servlet-mapping>
+
+ <!--
**************************************************************************************
-->
+
+ <servlet>
<servlet-name>ServerServlet</servlet-name>
<servlet-class>org.apache.openejb.server.httpd.ServerServlet</servlet-class>
</servlet>
@@ -106,19 +109,6 @@
<!--
**************************************************************************************
-->
- <servlet>
- <servlet-name>CommandExecutor</servlet-name>
-
<servlet-class>org.apache.tomee.webapp.command.CommandExecutor</servlet-class>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>CommandExecutor</servlet-name>
- <url-pattern>/command/*</url-pattern>
- </servlet-mapping>
-
-
- <!--
**************************************************************************************
-->
-
<!-- basic security to replace context.xml and allow remote accesses -->
<security-constraint>
<web-resource-collection>
@@ -138,6 +128,14 @@
</web-resource-collection>
</security-constraint>
+ <!-- /socket has no auth-constraint. It is has public access. -->
+ <security-constraint>
+ <web-resource-collection>
+ <web-resource-name>Socket</web-resource-name>
+ <url-pattern>/socket</url-pattern>
+ </web-resource-collection>
+ </security-constraint>
+
<login-config>
<auth-method>BASIC</auth-method>
<realm-name>TomEE Webapp</realm-name>
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=1395114&r1=1395113&r2=1395114&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 Oct
6 16:47:28 2012
@@ -19,49 +19,38 @@
<head>
<meta charset="utf-8">
<title>Apache Tomee</title>
- <link href="lib/bootstrap/2.0.4/css/bootstrap.min.css" rel="stylesheet">
- <link href="application/tomee.css" rel="stylesheet">
+ <link href="lib/bootstrap/2.0.4/css/bootstrap.css" rel="stylesheet">
+ <link rel="stylesheet"
href="lib/codemirror/codemirror-2.34/lib/codemirror.css">
+ <link rel="stylesheet" href="lib/meow/jquery.meow.css">
+ <link href="app/tomee.css" rel="stylesheet">
<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="lib/handlebars/handlebars-1.0.rc.1.js"></script>
+ <script src="lib/codemirror/codemirror-2.34/lib/codemirror.js"></script>
+ <script
src="lib/codemirror/codemirror-2.34/mode/javascript/javascript.js"></script>
+ <script src="lib/meow/jquery.meow.js"></script>
+
+ <script src="app/js/Application.js"></script>
+
+ <script src="app/js/util/DelayedTask.js"></script>
+ <script src="app/js/util/I18N.js"></script>
+ <script src="app/js/util/Log.js"></script>
+ <script src="app/js/util/Obj.js"></script>
+ <script src="app/js/util/Sequence.js"></script>
+ <script src="app/js/util/Storage.js"></script>
+
+ <script src="app/js/ApplicationTemplates.js"></script>
+
+ <script src="app/js/ApplicationChannel.js"></script>
+ <script src="app/js/ApplicationController.js"></script>
+ <script src="app/js/ApplicationModel.js"></script>
- <script src="application/js/Application.js"></script>
- <script src="application/js/util/DelayedTask.js"></script>
- <script src="application/js/util/El.js"></script>
- <script src="application/js/util/I18N.js"></script>
- <script src="application/js/util/Log.js"></script>
- <script src="application/js/util/Obj.js"></script>
- <script src="application/js/util/Sequence.js"></script>
- <script src="application/js/util/Storage.js"></script>
-
- <script src="application/js/ApplicationChannel.js"></script>
- <script src="application/js/ApplicationController.js"></script>
- <script src="application/js/ApplicationModel.js"></script>
-
- <script src="application/js/view/components/Base.js"></script>
- <script src="application/js/view/components/Menu.js"></script>
- <script src="application/js/view/components/Panel.js"></script>
- <script src="application/js/view/components/CollapsiblePanel.js"></script>
- <script src="application/js/view/components/Tree.js"></script>
- <script src="application/js/view/components/Table.js"></script>
-
- <script src="application/js/view/ApplicationToolbar.js"></script>
- <script src="application/js/view/ApplicationView.js"></script>
-
- <script src="application/js/view/tabs/ApplicationViewHome.js"></script>
- <script src="application/js/view/tabs/ApplicationViewApps.js"></script>
- <script src="application/js/view/tabs/ApplicationViewLog.js"></script>
-
- <script src="application/js/view/panels/ErrorPanel.js"></script>
- <script src="application/js/view/panels/Jndi.js"></script>
- <script src="application/js/view/panels/JndiClass.js"></script>
- <script src="application/js/view/panels/Saved.js"></script>
- <script src="application/js/view/panels/Console.js"></script>
- <script src="application/js/view/panels/Applications.js"></script>
- <script src="application/js/view/panels/ApplicationsLog.js"></script>
- <script src="application/js/view/panels/Mdbs.js"></script>
- <script src="application/js/view/panels/WebServices.js"></script>
+ <script src="app/js/view/ApplicationView.js"></script>
+ <script src="app/js/view/ApplicationToolbarView.js"></script>
+ <script src="app/js/view/panels/console.js"></script>
+ <script src="app/js/view/panels/log.js"></script>
</head>
<body></body>
Added:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/lib/codemirror/codemirror-2.34/LICENSE
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/lib/codemirror/codemirror-2.34/LICENSE?rev=1395114&view=auto
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/lib/codemirror/codemirror-2.34/LICENSE
(added)
+++
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/lib/codemirror/codemirror-2.34/LICENSE
Sat Oct 6 16:47:28 2012
@@ -0,0 +1,23 @@
+Copyright (C) 2012 by Marijn Haverbeke <[email protected]>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+Please note that some subdirectories of the CodeMirror distribution
+include their own LICENSE files, and are released under different
+licences.
Added:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/lib/codemirror/codemirror-2.34/lib/codemirror.css
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/lib/codemirror/codemirror-2.34/lib/codemirror.css?rev=1395114&view=auto
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/lib/codemirror/codemirror-2.34/lib/codemirror.css
(added)
+++
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/lib/codemirror/codemirror-2.34/lib/codemirror.css
Sat Oct 6 16:47:28 2012
@@ -0,0 +1,173 @@
+.CodeMirror {
+ line-height: 1em;
+ font-family: monospace;
+
+ /* Necessary so the scrollbar can be absolutely positioned within the
wrapper on Lion. */
+ position: relative;
+ /* This prevents unwanted scrollbars from showing up on the body and wrapper
in IE. */
+ overflow: hidden;
+}
+
+.CodeMirror-scroll {
+ overflow: auto;
+ height: 300px;
+ /* This is needed to prevent an IE[67] bug where the scrolled content
+ is visible outside of the scrolling box. */
+ position: relative;
+ outline: none;
+}
+
+/* Vertical scrollbar */
+.CodeMirror-scrollbar {
+ position: absolute;
+ right: 0; top: 0;
+ overflow-x: hidden;
+ overflow-y: scroll;
+ z-index: 5;
+}
+.CodeMirror-scrollbar-inner {
+ /* This needs to have a nonzero width in order for the scrollbar to appear
+ in Firefox and IE9. */
+ width: 1px;
+}
+.CodeMirror-scrollbar.cm-sb-overlap {
+ /* Ensure that the scrollbar appears in Lion, and that it overlaps the
content
+ rather than sitting to the right of it. */
+ position: absolute;
+ z-index: 1;
+ float: none;
+ right: 0;
+ min-width: 12px;
+}
+.CodeMirror-scrollbar.cm-sb-nonoverlap {
+ min-width: 12px;
+}
+.CodeMirror-scrollbar.cm-sb-ie7 {
+ min-width: 18px;
+}
+
+.CodeMirror-gutter {
+ position: absolute; left: 0; top: 0;
+ z-index: 10;
+ background-color: #f7f7f7;
+ border-right: 1px solid #eee;
+ min-width: 2em;
+ height: 100%;
+}
+.CodeMirror-gutter-text {
+ color: #aaa;
+ text-align: right;
+ padding: .4em .2em .4em .4em;
+ white-space: pre !important;
+ cursor: default;
+}
+.CodeMirror-lines {
+ padding: .4em;
+ white-space: pre;
+ cursor: text;
+}
+
+.CodeMirror pre {
+ -moz-border-radius: 0;
+ -webkit-border-radius: 0;
+ -o-border-radius: 0;
+ border-radius: 0;
+ border-width: 0; margin: 0; padding: 0; background: transparent;
+ font-family: inherit;
+ font-size: inherit;
+ padding: 0; margin: 0;
+ white-space: pre;
+ word-wrap: normal;
+ line-height: inherit;
+ color: inherit;
+}
+
+.CodeMirror-wrap pre {
+ word-wrap: break-word;
+ white-space: pre-wrap;
+ word-break: normal;
+}
+.CodeMirror-wrap .CodeMirror-scroll {
+ overflow-x: hidden;
+}
+
+.CodeMirror textarea {
+ outline: none !important;
+}
+
+.CodeMirror pre.CodeMirror-cursor {
+ z-index: 10;
+ position: absolute;
+ visibility: hidden;
+ border-left: 1px solid black;
+ border-right: none;
+ width: 0;
+}
+.cm-keymap-fat-cursor pre.CodeMirror-cursor {
+ width: auto;
+ border: 0;
+ background: transparent;
+ background: rgba(0, 200, 0, .4);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#6600c800,
endColorstr=#4c00c800);
+}
+/* Kludge to turn off filter in ie9+, which also accepts rgba */
+.cm-keymap-fat-cursor pre.CodeMirror-cursor:not(#nonsense_id) {
+ filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
+}
+.CodeMirror pre.CodeMirror-cursor.CodeMirror-overwrite {}
+.CodeMirror-focused pre.CodeMirror-cursor {
+ visibility: visible;
+}
+
+div.CodeMirror-selected { background: #d9d9d9; }
+.CodeMirror-focused div.CodeMirror-selected { background: #d7d4f0; }
+
+.CodeMirror-searching {
+ background: #ffa;
+ background: rgba(255, 255, 0, .4);
+}
+
+/* Default theme */
+
+.cm-s-default span.cm-keyword {color: #708;}
+.cm-s-default span.cm-atom {color: #219;}
+.cm-s-default span.cm-number {color: #164;}
+.cm-s-default span.cm-def {color: #00f;}
+.cm-s-default span.cm-variable {color: black;}
+.cm-s-default span.cm-variable-2 {color: #05a;}
+.cm-s-default span.cm-variable-3 {color: #085;}
+.cm-s-default span.cm-property {color: black;}
+.cm-s-default span.cm-operator {color: black;}
+.cm-s-default span.cm-comment {color: #a50;}
+.cm-s-default span.cm-string {color: #a11;}
+.cm-s-default span.cm-string-2 {color: #f50;}
+.cm-s-default span.cm-meta {color: #555;}
+.cm-s-default span.cm-error {color: #f00;}
+.cm-s-default span.cm-qualifier {color: #555;}
+.cm-s-default span.cm-builtin {color: #30a;}
+.cm-s-default span.cm-bracket {color: #997;}
+.cm-s-default span.cm-tag {color: #170;}
+.cm-s-default span.cm-attribute {color: #00c;}
+.cm-s-default span.cm-header {color: blue;}
+.cm-s-default span.cm-quote {color: #090;}
+.cm-s-default span.cm-hr {color: #999;}
+.cm-s-default span.cm-link {color: #00c;}
+
+span.cm-header, span.cm-strong {font-weight: bold;}
+span.cm-em {font-style: italic;}
+span.cm-emstrong {font-style: italic; font-weight: bold;}
+span.cm-link {text-decoration: underline;}
+
+span.cm-invalidchar {color: #f00;}
+
+div.CodeMirror span.CodeMirror-matchingbracket {color: #0f0;}
+div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
+
+@media print {
+
+ /* Hide the cursor when printing */
+ .CodeMirror pre.CodeMirror-cursor {
+ visibility: hidden;
+ }
+
+}
