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 2013/09/26 01:09:43 UTC
svn commit: r1526328 - in /tomee/tomee/trunk/tomee/tomee-webaccess: ./
src/main/groovy/org/apache/tomee/webaccess/service/ src/main/webapp/app/
src/main/webapp/app/js/ src/main/webapp/app/js/templates/
src/main/webapp/app/js/view/
Author: tveronezi
Date: Wed Sep 25 23:09:42 2013
New Revision: 1526328
URL: http://svn.apache.org/r1526328
Log:
https://issues.apache.org/jira/browse/TOMEE-1036
* change the code samples (import example)
* navbar-brand http://tomee.apache.org/documentation.html
* switch "source code" and "output" position
* "source code" width fixed to ~80 chars
* use TransactionAttributeType.SUPPORTS
Modified:
tomee/tomee/trunk/tomee/tomee-webaccess/pom.xml
tomee/tomee/trunk/tomee/tomee-webaccess/src/main/groovy/org/apache/tomee/webaccess/service/LogServiceImpl.groovy
tomee/tomee/trunk/tomee/tomee-webaccess/src/main/groovy/org/apache/tomee/webaccess/service/ScriptingServiceImpl.groovy
tomee/tomee/trunk/tomee/tomee-webaccess/src/main/groovy/org/apache/tomee/webaccess/service/WsServiceImpl.groovy
tomee/tomee/trunk/tomee/tomee-webaccess/src/main/webapp/app/app.less
tomee/tomee/trunk/tomee/tomee-webaccess/src/main/webapp/app/js/application.js
tomee/tomee/trunk/tomee/tomee-webaccess/src/main/webapp/app/js/i18n.js
tomee/tomee/trunk/tomee/tomee-webaccess/src/main/webapp/app/js/templates/container.handlebars
tomee/tomee/trunk/tomee/tomee-webaccess/src/main/webapp/app/js/templates/script-sample-groovy.handlebars
tomee/tomee/trunk/tomee/tomee-webaccess/src/main/webapp/app/js/templates/script-sample-javascript.handlebars
tomee/tomee/trunk/tomee/tomee-webaccess/src/main/webapp/app/js/templates/scripting.handlebars
tomee/tomee/trunk/tomee/tomee-webaccess/src/main/webapp/app/js/view/container.js
tomee/tomee/trunk/tomee/tomee-webaccess/src/main/webapp/app/js/view/scripting.js
Modified: tomee/tomee/trunk/tomee/tomee-webaccess/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-webaccess/pom.xml?rev=1526328&r1=1526327&r2=1526328&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-webaccess/pom.xml (original)
+++ tomee/tomee/trunk/tomee/tomee-webaccess/pom.xml Wed Sep 25 23:09:42 2013
@@ -36,46 +36,55 @@
<groupId>org.apache.openejb.staticweb</groupId>
<artifactId>backbone</artifactId>
<version>${project.version}</version>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.openejb.staticweb</groupId>
<artifactId>bootstrap</artifactId>
<version>${project.version}</version>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.openejb.staticweb</groupId>
<artifactId>jquery</artifactId>
<version>${project.version}</version>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.openejb.staticweb</groupId>
<artifactId>handlebars</artifactId>
<version>${project.version}</version>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.openejb.staticweb</groupId>
<artifactId>json2</artifactId>
<version>${project.version}</version>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.openejb.staticweb</groupId>
<artifactId>lessjs</artifactId>
<version>${project.version}</version>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.openejb.staticweb</groupId>
<artifactId>requirejs</artifactId>
<version>${project.version}</version>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.openejb.staticweb</groupId>
<artifactId>underscorejs</artifactId>
<version>${project.version}</version>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.openejb.staticweb</groupId>
<artifactId>codemirror</artifactId>
<version>${project.version}</version>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
Modified: tomee/tomee/trunk/tomee/tomee-webaccess/src/main/groovy/org/apache/tomee/webaccess/service/LogServiceImpl.groovy
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-webaccess/src/main/groovy/org/apache/tomee/webaccess/service/LogServiceImpl.groovy?rev=1526328&r1=1526327&r2=1526328&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-webaccess/src/main/groovy/org/apache/tomee/webaccess/service/LogServiceImpl.groovy (original)
+++ tomee/tomee/trunk/tomee/tomee-webaccess/src/main/groovy/org/apache/tomee/webaccess/service/LogServiceImpl.groovy Wed Sep 25 23:09:42 2013
@@ -23,7 +23,10 @@ import org.apache.tomee.webaccess.data.d
import javax.annotation.security.RolesAllowed
import javax.ejb.Stateless
+import javax.ejb.TransactionAttribute
+import javax.ejb.TransactionAttributeType
+@TransactionAttribute(TransactionAttributeType.SUPPORTS)
@Stateless
@RolesAllowed('tomee-admin')
class LogServiceImpl {
Modified: tomee/tomee/trunk/tomee/tomee-webaccess/src/main/groovy/org/apache/tomee/webaccess/service/ScriptingServiceImpl.groovy
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-webaccess/src/main/groovy/org/apache/tomee/webaccess/service/ScriptingServiceImpl.groovy?rev=1526328&r1=1526327&r2=1526328&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-webaccess/src/main/groovy/org/apache/tomee/webaccess/service/ScriptingServiceImpl.groovy (original)
+++ tomee/tomee/trunk/tomee/tomee-webaccess/src/main/groovy/org/apache/tomee/webaccess/service/ScriptingServiceImpl.groovy Wed Sep 25 23:09:42 2013
@@ -22,9 +22,12 @@ import org.apache.tomee.webaccess.data.d
import javax.annotation.security.RolesAllowed
import javax.ejb.Stateless
+import javax.ejb.TransactionAttribute
+import javax.ejb.TransactionAttributeType
import javax.script.ScriptEngineManager
import javax.script.SimpleScriptContext
+@TransactionAttribute(TransactionAttributeType.SUPPORTS)
@Stateless
@RolesAllowed('tomee-admin')
class ScriptingServiceImpl {
Modified: tomee/tomee/trunk/tomee/tomee-webaccess/src/main/groovy/org/apache/tomee/webaccess/service/WsServiceImpl.groovy
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-webaccess/src/main/groovy/org/apache/tomee/webaccess/service/WsServiceImpl.groovy?rev=1526328&r1=1526327&r2=1526328&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-webaccess/src/main/groovy/org/apache/tomee/webaccess/service/WsServiceImpl.groovy (original)
+++ tomee/tomee/trunk/tomee/tomee-webaccess/src/main/groovy/org/apache/tomee/webaccess/service/WsServiceImpl.groovy Wed Sep 25 23:09:42 2013
@@ -29,7 +29,10 @@ import org.apache.tomee.webaccess.data.d
import javax.annotation.security.RolesAllowed
import javax.ejb.Stateless
+import javax.ejb.TransactionAttribute
+import javax.ejb.TransactionAttributeType
+@TransactionAttribute(TransactionAttributeType.SUPPORTS)
@Stateless
@RolesAllowed('tomee-admin')
class WsServiceImpl {
Modified: tomee/tomee/trunk/tomee/tomee-webaccess/src/main/webapp/app/app.less
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-webaccess/src/main/webapp/app/app.less?rev=1526328&r1=1526327&r2=1526328&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-webaccess/src/main/webapp/app/app.less (original)
+++ tomee/tomee/trunk/tomee/tomee-webaccess/src/main/webapp/app/app.less Wed Sep 25 23:09:42 2013
@@ -67,13 +67,7 @@ body {
}
.ux-scripting {
- @outputWidth: 500px;
-
- .ux-commands {
- position: absolute;
- bottom: ((@offset * 2) + 8);
- right: ((@offset * 2) + 8);
- }
+ @sourceWidth: 650px;
.ux-script {
position: absolute;
@@ -83,8 +77,8 @@ body {
}
.ux-script-output {
- left: @offset;
- width: @outputWidth;
+ right: @offset;
+ left: @sourceWidth + (2 * @offset);
pre {
padding: 0;
@@ -107,21 +101,28 @@ body {
position: absolute;
top: @topOffset;
bottom: @offset;
- left: @offset;
- width: (@outputWidth - (@offset * 2));
+ left: (@offset * 2);
+ right: (@offset * 2);
overflow: auto;
}
}
.ux-script-source {
- right: @offset;
- left: (@outputWidth + (@offset * 2));
+ left: @offset;
+ width: @sourceWidth;
- > div.panel-body {
+ .ux-commands {
position: absolute;
- top: (@topOffset + @offset);
- left: (@offset * 2);
+ bottom: (@offset * 2);
right: (@offset * 2);
+ }
+
+ > div.panel-body {
+ position: absolute;
+ top: @topOffset;
+ bottom: @offset;
+ left: @offset;
+ width: (@sourceWidth - (@offset * 2));
overflow: auto;
}
}
Modified: tomee/tomee/trunk/tomee/tomee-webaccess/src/main/webapp/app/js/application.js
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-webaccess/src/main/webapp/app/js/application.js?rev=1526328&r1=1526327&r2=1526328&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-webaccess/src/main/webapp/app/js/application.js (original)
+++ tomee/tomee/trunk/tomee/tomee-webaccess/src/main/webapp/app/js/application.js Wed Sep 25 23:09:42 2013
@@ -38,8 +38,10 @@
routes: {
'': 'showScripting',
'scripting': 'showScripting',
+ 'scripting/': 'showScripting',
'scripting/:scriptType': 'showScripting',
- 'log-files': 'showLogFiles',
+ 'log-files': 'showLogFile',
+ 'log-files/': 'showLogFile',
'log-files/:fileName': 'showLogFile'
},
@@ -50,13 +52,11 @@
}
},
- showLogFiles: function () {
- containerView.showView(logfilesView);
- },
-
showLogFile: function (fileName) {
containerView.showView(logfilesView);
- logfilesView.triggerFileLoad(fileName);
+ if (fileName) {
+ logfilesView.triggerFileLoad(fileName);
+ }
}
});
var router = new Router();
@@ -123,12 +123,6 @@
pushState: true,
root: window.ux.ROOT_URL // This value is set by <c:url>
});
-
- return {
- getRouter: function () {
- return router;
- }
- };
}
return {
Modified: tomee/tomee/trunk/tomee/tomee-webaccess/src/main/webapp/app/js/i18n.js
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-webaccess/src/main/webapp/app/js/i18n.js?rev=1526328&r1=1526327&r2=1526328&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-webaccess/src/main/webapp/app/js/i18n.js (original)
+++ tomee/tomee/trunk/tomee/tomee-webaccess/src/main/webapp/app/js/i18n.js Wed Sep 25 23:09:42 2013
@@ -25,7 +25,7 @@ define(['lib/underscore', 'lib/handlebar
'application.name': 'Apache TomEE',
'visitor': 'visitor',
'scripting': 'Scripting',
- 'source': 'Source',
+ 'source': 'Source Code',
'output': 'Output',
'execute': 'Execute',
'groovy': 'Groovy',
Modified: tomee/tomee/trunk/tomee/tomee-webaccess/src/main/webapp/app/js/templates/container.handlebars
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-webaccess/src/main/webapp/app/js/templates/container.handlebars?rev=1526328&r1=1526327&r2=1526328&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-webaccess/src/main/webapp/app/js/templates/container.handlebars (original)
+++ tomee/tomee/trunk/tomee/tomee-webaccess/src/main/webapp/app/js/templates/container.handlebars Wed Sep 25 23:09:42 2013
@@ -6,7 +6,7 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
- <a class="navbar-brand" href="#">{{i18n "application.name"}}</a>
+ <a class="navbar-brand" href="http://tomee.apache.org/documentation.html">{{i18n "application.name"}}</a>
</div>
<div class="collapse navbar-collapse navbar-ex8-collapse">
<ul class="nav navbar-nav">
Modified: tomee/tomee/trunk/tomee/tomee-webaccess/src/main/webapp/app/js/templates/script-sample-groovy.handlebars
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-webaccess/src/main/webapp/app/js/templates/script-sample-groovy.handlebars?rev=1526328&r1=1526327&r2=1526328&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-webaccess/src/main/webapp/app/js/templates/script-sample-groovy.handlebars (original)
+++ tomee/tomee/trunk/tomee/tomee-webaccess/src/main/webapp/app/js/templates/script-sample-groovy.handlebars Wed Sep 25 23:09:42 2013
@@ -1,13 +1,15 @@
-def ctx = new javax.naming.InitialContext([
- 'java.naming.factory.initial': 'org.apache.openejb.client.RemoteInitialContextFactory',
- 'java.naming.provider.url': 'http://localhost:8080/tomee/ejb',
- 'java.naming.security.principal': 'tomee',
- 'java.naming.security.credentials': 'tomee'
-] as java.util.Properties)
+import java.util.Properties
+import javax.naming.Context
+import javax.naming.InitialContext
-def result = ctx.list('')?.collect({ pair ->
- pair.name
-}).join(', ')
+def ctx = new InitialContext([
+ (Context.INITIAL_CONTEXT_FACTORY): 'org.apache.openejb.client.RemoteInitialContextFactory',
+ (Context.PROVIDER_URL): 'http://localhost:8080/tomee/ejb',
+ (Context.SECURITY_PRINCIPAL): 'tomee',
+ (Context.SECURITY_CREDENTIALS): 'tomee'
+] as Properties)
+
+def result = ctx.list('')?.collect({ pair -> pair.name }).join(', ')
// print restult
println("groovy -> $result")
\ No newline at end of file
Modified: tomee/tomee/trunk/tomee/tomee-webaccess/src/main/webapp/app/js/templates/script-sample-javascript.handlebars
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-webaccess/src/main/webapp/app/js/templates/script-sample-javascript.handlebars?rev=1526328&r1=1526327&r2=1526328&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-webaccess/src/main/webapp/app/js/templates/script-sample-javascript.handlebars (original)
+++ tomee/tomee/trunk/tomee/tomee-webaccess/src/main/webapp/app/js/templates/script-sample-javascript.handlebars Wed Sep 25 23:09:42 2013
@@ -1,16 +1,19 @@
-var p = new java.util.Properties();
-p.put("java.naming.factory.initial", "org.apache.openejb.client.RemoteInitialContextFactory");
-p.put("java.naming.provider.url", "http://localhost:8080/tomee/ejb");
-p.put("java.naming.security.principal", "tomee");
-p.put("java.naming.security.credentials", "tomee");
-var ctx = new javax.naming.InitialContext(p);
+importClass(java.util.Properties);
+importClass(javax.naming.Context);
+importClass(javax.naming.InitialContext);
-var varList = [];
-var values = ctx.list("");
-while(values.hasMore()) {
- var pair = values.next();
- varList.push(pair.getName());
+var p = new Properties();
+p.put(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.client.RemoteInitialContextFactory");
+p.put(Context.PROVIDER_URL, "http://localhost:8080/tomee/ejb");
+p.put(Context.SECURITY_PRINCIPAL, "tomee");
+p.put(Context.SECURITY_CREDENTIALS, "tomee");
+var ctx = new InitialContext(p);
+
+var result = [];
+var pairs = ctx.list("");
+while(pairs.hasMore()) {
+ result.push(pairs.next().getName());
}
// print restult
-println('javascript -> ' + varList.join(", "));
\ No newline at end of file
+println('javascript -> ' + result.join(", "));
\ No newline at end of file
Modified: tomee/tomee/trunk/tomee/tomee-webaccess/src/main/webapp/app/js/templates/scripting.handlebars
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-webaccess/src/main/webapp/app/js/templates/scripting.handlebars?rev=1526328&r1=1526327&r2=1526328&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-webaccess/src/main/webapp/app/js/templates/scripting.handlebars (original)
+++ tomee/tomee/trunk/tomee/tomee-webaccess/src/main/webapp/app/js/templates/scripting.handlebars Wed Sep 25 23:09:42 2013
@@ -14,16 +14,16 @@
<div class="panel-body">
<textarea></textarea>
</div>
-</div>
-<div class="ux-commands">
- <div class="btn-group dropup">
- <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
- <span class="ux-source-choice">{{i18n "javascript"}}</span> <span class="caret"></span>
- </button>
- <ul class="dropdown-menu" role="menu">
- <li><a class="ux-source-option" name="javascript" href="#">{{i18n "javascript"}}</a></li>
- <li><a class="ux-source-option" name="groovy" href="#">{{i18n "groovy"}}</a></li>
- </ul>
+ <div class="ux-commands">
+ <div class="btn-group dropup">
+ <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
+ <span class="ux-source-choice">{{i18n "javascript"}}</span> <span class="caret"></span>
+ </button>
+ <ul class="dropdown-menu" role="menu">
+ <li><a class="ux-source-option" name="javascript" href="#">{{i18n "javascript"}}</a></li>
+ <li><a class="ux-source-option" name="groovy" href="#">{{i18n "groovy"}}</a></li>
+ </ul>
+ </div>
+ <a class="btn btn-primary ux-execute-script">{{i18n "execute"}}</a>
</div>
- <a class="btn btn-primary ux-execute-script">{{i18n "execute"}}</a>
</div>
Modified: tomee/tomee/trunk/tomee/tomee-webaccess/src/main/webapp/app/js/view/container.js
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-webaccess/src/main/webapp/app/js/view/container.js?rev=1526328&r1=1526327&r2=1526328&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-webaccess/src/main/webapp/app/js/view/container.js (original)
+++ tomee/tomee/trunk/tomee/tomee-webaccess/src/main/webapp/app/js/view/container.js Wed Sep 25 23:09:42 2013
@@ -58,12 +58,10 @@
if (this.options.isRendered) {
return this;
}
-
var html = templates.getValue('container', {
userName: ''
});
this.$el.html(html);
-
// render it only once
this.options.isRendered = true;
return this;
Modified: tomee/tomee/trunk/tomee/tomee-webaccess/src/main/webapp/app/js/view/scripting.js
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-webaccess/src/main/webapp/app/js/view/scripting.js?rev=1526328&r1=1526327&r2=1526328&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-webaccess/src/main/webapp/app/js/view/scripting.js (original)
+++ tomee/tomee/trunk/tomee/tomee-webaccess/src/main/webapp/app/js/view/scripting.js Wed Sep 25 23:09:42 2013
@@ -77,7 +77,7 @@
fitCodeField: function () {
var me = this;
var panelBody = $(me.$el.find('.ux-script-source').get(0));
- me.editor.setSize(panelBody.width() - 22, panelBody.height() - 120);
+ me.editor.setSize(panelBody.width() - 15, panelBody.height() - 110);
},
renderCallback: function () {