Author: tveronezi
Date: Fri Jun 8 17:04:17 2012
New Revision: 1348152
URL: http://svn.apache.org/viewvc?rev=1348152&view=rev
Log:
https://issues.apache.org/jira/browse/TOMEE-205
show the supported languages only
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/servlet/ConsoleServlet.java
openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/servlet/SystemInfoServlet.java
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/ApplicationController.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/util/I18N.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/ApplicationViewHome.js
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/servlet/ConsoleServlet.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/servlet/ConsoleServlet.java?rev=1348152&r1=1348151&r2=1348152&view=diff
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/servlet/ConsoleServlet.java
(original)
+++
openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/servlet/ConsoleServlet.java
Fri Jun 8 17:04:17 2012
@@ -31,13 +31,18 @@ import java.io.IOException;
import java.util.Map;
public class ConsoleServlet extends HttpServlet {
- private static final OpenEJBScripter SCRIPTER = new OpenEJBScripter();
+ public static final OpenEJBScripter SCRIPTER = new OpenEJBScripter();
@Override
protected void doPost(final HttpServletRequest req, final
HttpServletResponse resp) throws ServletException, IOException {
JsonExecutor.execute(resp, new JsonExecutor.Executor() {
@Override
public void call(Map<String, Object> json) throws Exception {
+ final String scriptCode = req.getParameter("scriptCode");
+ if (scriptCode == null || "".equals(scriptCode.trim())) {
+ return; //nothing to do
+ }
+
final HttpSession session = req.getSession();
String engineName = req.getParameter("engineName");
@@ -62,10 +67,6 @@ public class ConsoleServlet extends Http
}
});
- String scriptCode = req.getParameter("scriptCode");
- if (scriptCode == null || "".equals(scriptCode.trim())) {
- scriptCode = "var a = 0;";
- }
SCRIPTER.evaluate(engineName, scriptCode, bindings);
}
});
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/servlet/SystemInfoServlet.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/servlet/SystemInfoServlet.java?rev=1348152&r1=1348151&r2=1348152&view=diff
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/servlet/SystemInfoServlet.java
(original)
+++
openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/servlet/SystemInfoServlet.java
Fri Jun 8 17:04:17 2012
@@ -62,6 +62,8 @@ public class SystemInfoServlet extends H
if (principal != null) {
json.put("user", principal.getName());
}
+
+ json.put("supportedScriptLanguages",
ConsoleServlet.SCRIPTER.getSupportedLanguages());
}
});
}
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/ApplicationController.js
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/ApplicationController.js?rev=1348152&r1=1348151&r2=1348152&view=diff
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/ApplicationController.js
(original)
+++
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/ApplicationController.js
Fri Jun 8 17:04:17 2012
@@ -141,6 +141,7 @@ TOMEE.ApplicationController = function (
channel.bind('app.system.info', function (params) {
view.setLoggedUser(params.user);
+ homeView.setSupportedScriptLanguages(params.supportedScriptLanguages);
});
channel.bind('trigger.console.exec', function (params) {
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/util/I18N.js
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/util/I18N.js?rev=1348152&r1=1348151&r2=1348152&view=diff
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/util/I18N.js
(original)
+++
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/util/I18N.js
Fri Jun 8 17:04:17 2012
@@ -39,8 +39,6 @@ TOMEE.I18N = (function () {
'application.ws':'Webservices',
'application.console.execute':'Execute',
- 'application.console.Javascript':'Javascript',
- 'application.console.Groovy':'Groovy',
'application.log.load':'Load',
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/ApplicationViewHome.js
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/ApplicationViewHome.js?rev=1348152&r1=1348151&r2=1348152&view=diff
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/ApplicationViewHome.js
(original)
+++
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/ApplicationViewHome.js
Fri Jun 8 17:04:17 2012
@@ -128,40 +128,24 @@ TOMEE.ApplicationViewHome = function (cf
var elBottomBar = TOMEE.el.getElMap({
elName:'main',
tag:'form',
- cls: 'well form-inline',
+ cls:'well form-inline',
attributes:{
style:'height: 27px;margin-bottom: 0px;padding-top:
1px;padding-left: 1px;padding-bottom: 1px;padding-right: 1px;'
},
- children: [
+ children:[
{
tag:'div',
cls:'pull-right',
- children: [
+ children:[
{
elName:'scriptSelector',
- tag:'select',
- children: [
- {
- tag:'option',
- html:
TOMEE.I18N.get('application.console.Javascript'),
- attributes: {
- value: 'JavaScript'
- }
- },
- {
- tag:'option',
- html:
TOMEE.I18N.get('application.console.Groovy'),
- attributes: {
- value: 'Groovy'
- }
- }
- ]
+ tag:'select'
},
{
elName:'executeBtn',
tag:'button',
cls:'btn',
- html: TOMEE.I18N.get('application.console.execute')
+ html:TOMEE.I18N.get('application.console.execute')
}
]
}
@@ -172,19 +156,20 @@ TOMEE.ApplicationViewHome = function (cf
el.append(elText.main);
el.append(elBottomBar.main);
- elBottomBar.main.bind('click', function() {
+ elBottomBar.main.bind('click', function () {
var text = elText.main.val();
var script = elBottomBar.scriptSelector.val();
channel.send('trigger.console.exec', {
- codeType: script,
- codeText: text
+ codeType:script,
+ codeText:text
});
});
return {
getEl:function () {
return console.getEl();
- }
+ },
+ scriptSelector: elBottomBar.scriptSelector
};
})();
@@ -217,6 +202,24 @@ TOMEE.ApplicationViewHome = function (cf
elMapContent['right'].append(mdbsPanel.getEl());
elMapContent['right'].append(wsPanel.getEl());
+ var loadScriptsField = function (languages) {
+ var getOption = function (lang) {
+ var option = $('<option></option>');
+ option.attr('value', lang);
+ option.append(lang);
+ return option;
+ };
+
+ var selector = consolePanel.scriptSelector;
+ selector.empty();
+ if (!languages) {
+ return;
+ }
+ for (var i = 0; i < languages.length; i++) {
+ selector.append(getOption(languages[i]));
+ }
+ };
+
return {
loadJndi:function (data) {
jndiPanel.load(data);
@@ -224,8 +227,9 @@ TOMEE.ApplicationViewHome = function (cf
loadSavedObjects:function (data) {
savedPanel.load(data);
},
- getEl: function() {
+ getEl:function () {
return elMapContent.main;
- }
+ },
+ setSupportedScriptLanguages:loadScriptsField
};
};
\ No newline at end of file
