svn commit: r1355063 - in /openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js: ApplicationController.js ApplicationModel.js SampleScript.js

[tv...@apache.org]

Author: tveronezi
Date: Thu Jun 28 16:21:37 2012
New Revision: 1355063

URL: http://svn.apache.org/viewvc?rev=1355063&view=rev
Log:
https://issues.apache.org/jira/browse/TOMEE-256
* RunScript load sample script

Added:
    openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/SampleScript.js
      - copied, changed from r1354916, openejb/trunk/openejb/tomee/tomee-webapp/src/test/resources/Test.js
Modified:
    openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/ApplicationController.js
    openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/ApplicationModel.js

Modified: openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/ApplicationController.js
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/ApplicationController.js?rev=1355063&r1=1355062&r2=1355063&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/ApplicationController.js (original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/ApplicationController.js Thu Jun 28 16:21:37 2012
@@ -69,8 +69,6 @@ TOMEE.ApplicationController = function (
     var consolePanel = TOMEE.Console({
         channel:channel
     });
-    consolePanel.setScript(model.getLastScript());
-
 
     var homeView = TOMEE.ApplicationViewHome({
         center:consolePanel,
@@ -280,6 +278,11 @@ TOMEE.ApplicationController = function (
         }))
     );
 
+    channel.bind('default.script.loaded', function(data) {
+        consolePanel.setScript(data);
+    });
+    consolePanel.setScript(model.getLastScript());
+
     return {
 
     };

Modified: openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/ApplicationModel.js
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/ApplicationModel.js?rev=1355063&r1=1355062&r2=1355063&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/ApplicationModel.js (original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/ApplicationModel.js Thu Jun 28 16:21:37 2012
@@ -31,11 +31,24 @@ TOMEE.ApplicationModel = function (cfg) 
     var executions = [];
 
     var getLastScript = function () {
-        return TOMEE.utils.getSafe(TOMEE.storage.getLocal('lastScript_code'), '');
+        return TOMEE.utils.getSafe(TOMEE.storage.getSession('lastScript_code'), (function () {
+            $.ajax({
+                    url:'application/js/SampleScript.js',
+                    method:'GET',
+                    dataType:'text',
+                    success:function (data) {
+                        channel.send('default.script.loaded', data);
+                    }
+                }
+            );
+
+            //for now just return ''
+            return '';
+        })());
     };
 
     var setLastScript = function (code) {
-        TOMEE.storage.setLocal('lastScript_code', code);
+        TOMEE.storage.setSession('lastScript_code', code);
     };
 
     var request = function (params) {

Copied: openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/SampleScript.js (from r1354916, openejb/trunk/openejb/tomee/tomee-webapp/src/test/resources/Test.js)
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/SampleScript.js?p2=openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/SampleScript.js&p1=openejb/trunk/openejb/tomee/tomee-webapp/src/test/resources/Test.js&r1=1354916&r2=1355063&rev=1355063&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/test/resources/Test.js (original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/SampleScript.js Thu Jun 28 16:21:37 2012
@@ -16,10 +16,16 @@
  */
 
 var myImports = new JavaImporter(
-    org.apache.tomee.webapp.test.MyCls
+    java.util.Properties,
+    javax.naming.InitialContext
 );
 
 with (myImports) {
-    var a = new MyCls('myValue');
-    a.value;
+    var p = new Properties();
+    p.put("java.naming.factory.initial", "org.apache.openejb.client.RemoteInitialContextFactory");
+    p.put("java.naming.provider.url", "ejbd://localhost:4201");
+
+    var ctx = new InitialContext(p);
+    var myBean =  ctx.lookup("openejb/DeployerBusinessRemote");
+    myBean.getUniqueFile();
 }
\ No newline at end of file