r9631 - in helma-ng/trunk: modules src/org/helma/javascript

Author: hannes
Date: 2009-04-20 18:31:11 +0200 (Mon, 20 Apr 2009)
New Revision: 9631

Added:
   helma-ng/trunk/modules/helmaglobal.js
Removed:
   helma-ng/trunk/modules/global.js
Modified:
   helma-ng/trunk/src/org/helma/javascript/RhinoEngine.java
Log:
Rename modules/global.js to modules/helmaglobal.js to avoid conflict with narwhal lib

Details at http://dev.helma.org/trac/helma/changeset/9631

Deleted: helma-ng/trunk/modules/global.js

Copied: helma-ng/trunk/modules/helmaglobal.js (from rev 9630, helma-ng/trunk/modules/global.js)

Modified: helma-ng/trunk/src/org/helma/javascript/RhinoEngine.java
===================================================================
--- helma-ng/trunk/src/org/helma/javascript/RhinoEngine.java	2009-04-20 16:31:09 UTC (rev 9630)
+++ helma-ng/trunk/src/org/helma/javascript/RhinoEngine.java	2009-04-20 16:31:11 UTC (rev 9631)
@@ -97,7 +97,7 @@
                             entry.getValue(), ScriptableObject.DONTENUM);
                 }
             }
-            evaluate(cx, getScript("global"), topLevelScope);
+            evaluate(cx, getScript("helmaglobal"), topLevelScope);
             if (config.isSealed()) {
                 topLevelScope.sealObject();
             }