You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by bd...@apache.org on 2008/04/04 14:51:51 UTC
svn commit: r644699 -
/incubator/sling/trunk/scripting/jst/src/main/java/org/apache/sling/scripting/jst/JstScriptEngine.java
Author: bdelacretaz
Date: Fri Apr 4 05:51:41 2008
New Revision: 644699
URL: http://svn.apache.org/viewvc?rev=644699&view=rev
Log:
sling.js path adapted to path change of rev 643830
Modified:
incubator/sling/trunk/scripting/jst/src/main/java/org/apache/sling/scripting/jst/JstScriptEngine.java
Modified: incubator/sling/trunk/scripting/jst/src/main/java/org/apache/sling/scripting/jst/JstScriptEngine.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/scripting/jst/src/main/java/org/apache/sling/scripting/jst/JstScriptEngine.java?rev=644699&r1=644698&r2=644699&view=diff
==============================================================================
--- incubator/sling/trunk/scripting/jst/src/main/java/org/apache/sling/scripting/jst/JstScriptEngine.java (original)
+++ incubator/sling/trunk/scripting/jst/src/main/java/org/apache/sling/scripting/jst/JstScriptEngine.java Fri Apr 4 05:51:41 2008
@@ -56,12 +56,14 @@
private final List<String> libraryScripts = new LinkedList<String>();
private final DefaultHtmlRenderer htmlRenderer;
private final ScriptFilteredCopy copier = new ScriptFilteredCopy();
+
+ // TODO should be configurable or synced with the actual location
+ public final static String SLING_JS_PATH = "/bundles/sling/sling.js";
JstScriptEngine(ScriptEngineFactory scriptEngineFactory) {
super(scriptEngineFactory);
- // TODO hardcoded for now...
- libraryScripts.add("/sling/sling.js");
+ libraryScripts.add(SLING_JS_PATH);
htmlRenderer = new DefaultHtmlRenderer();
}
Re: svn commit: r644699 -
/incubator/sling/trunk/scripting/jst/src/main/java/org/apache/sling/scripting/jst/JstScriptEngine.java
Posted by Felix Meschberger <fm...@gmail.com>.
Hi Bertrand,
Am Freitag, den 04.04.2008, 16:36 +0200 schrieb Bertrand Delacretaz:
> On Fri, Apr 4, 2008 at 3:03 PM, Felix Meschberger
> <Fe...@day.com> wrote:
> > Am Freitag, den 04.04.2008, 12:51 +0000 schrieb bdelacretaz@apache.org:
> > > + public final static String SLING_JS_PATH = "/bundles/sling/sling.js";
> > Didn't we say /system/sling.js or something like that instead
> > of /bundles/... ?...
>
> Right - I wasn't sure if that was decided, but from the thread at [1]
> it looks like a reasonable choice.
>
> I have created SLING-359 for this change.
Great. Thanks.
Regards
Felix
Re: svn commit: r644699 - /incubator/sling/trunk/scripting/jst/src/main/java/org/apache/sling/scripting/jst/JstScriptEngine.java
Posted by Bertrand Delacretaz <bd...@apache.org>.
On Fri, Apr 4, 2008 at 3:03 PM, Felix Meschberger
<Fe...@day.com> wrote:
> Am Freitag, den 04.04.2008, 12:51 +0000 schrieb bdelacretaz@apache.org:
> > + public final static String SLING_JS_PATH = "/bundles/sling/sling.js";
> Didn't we say /system/sling.js or something like that instead
> of /bundles/... ?...
Right - I wasn't sure if that was decided, but from the thread at [1]
it looks like a reasonable choice.
I have created SLING-359 for this change.
-Bertrand
[1] http://markmail.org/message/osjab4dn2yis4uhd,
Re: svn commit: r644699 -
/incubator/sling/trunk/scripting/jst/src/main/java/org/apache/sling/scripting/jst/JstScriptEngine.java
Posted by Felix Meschberger <Fe...@day.com>.
Hi,
Am Freitag, den 04.04.2008, 12:51 +0000 schrieb bdelacretaz@apache.org:
> + public final static String SLING_JS_PATH = "/bundles/sling/sling.js";
Didn't we say /system/sling.js or something like that instead
of /bundles/... ?
Regards
Felix