Return-Path: 
 <sling-commits-return-622-apmail-incubator-sling-commits-archive=incubator.apache.org@incubator.apache.org>
Delivered-To: apmail-incubator-sling-commits-archive@locus.apache.org
Received: (qmail 19337 invoked from network); 4 Dec 2007 10:09:37 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 4 Dec 2007 10:09:37 -0000
Received: (qmail 35245 invoked by uid 500); 4 Dec 2007 10:09:25 -0000
Delivered-To: apmail-incubator-sling-commits-archive@incubator.apache.org
Received: (qmail 35209 invoked by uid 500); 4 Dec 2007 10:09:25 -0000
Mailing-List: contact sling-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:sling-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:sling-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:sling-commits@incubator.apache.org>
List-Id: <sling-commits.incubator.apache.org>
Reply-To: sling-dev@incubator.apache.org
Delivered-To: mailing list sling-commits@incubator.apache.org
Received: (qmail 35200 invoked by uid 99); 4 Dec 2007 10:09:25 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 Dec 2007 02:09:25 -0800
X-ASF-Spam-Status: No, hits=-100.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 Dec 2007 10:09:13 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 3DF321A9832; Tue,  4 Dec 2007 02:09:16 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r600865 -
 /incubator/sling/trunk/microsling/microsling-core/src/main/java/org/apache/sling/microsling/experimental/EctScriptEngine.java
Date: Tue, 04 Dec 2007 10:09:15 -0000
To: sling-commits@incubator.apache.org
From: bdelacretaz@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20071204100916.3DF321A9832@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: bdelacretaz
Date: Tue Dec  4 02:09:14 2007
New Revision: 600865

URL: http://svn.apache.org/viewvc?rev=600865&view=rev
Log:
SLING-114: path to microjax.js did not take context and servlet path into account, fixed

Modified:
    incubator/sling/trunk/microsling/microsling-core/src/main/java/org/apache/sling/microsling/experimental/EctScriptEngine.java

Modified: incubator/sling/trunk/microsling/microsling-core/src/main/java/org/apache/sling/microsling/experimental/EctScriptEngine.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/microsling/microsling-core/src/main/java/org/apache/sling/microsling/experimental/EctScriptEngine.java?rev=600865&r1=600864&r2=600865&view=diff
==============================================================================
--- incubator/sling/trunk/microsling/microsling-core/src/main/java/org/apache/sling/microsling/experimental/EctScriptEngine.java (original)
+++ incubator/sling/trunk/microsling/microsling-core/src/main/java/org/apache/sling/microsling/experimental/EctScriptEngine.java Tue Dec  4 02:09:14 2007
@@ -32,9 +32,11 @@
 
 import org.apache.sling.api.HttpStatusCodeException;
 import org.apache.sling.api.SlingException;
+import org.apache.sling.api.SlingHttpServletRequest;
 import org.apache.sling.api.resource.Resource;
 import org.apache.sling.api.scripting.SlingScript;
 import org.apache.sling.api.scripting.SlingScriptEngine;
+import org.apache.sling.api.wrappers.SlingRequestPaths;
 import org.apache.sling.commons.json.JSONException;
 import org.apache.sling.microsling.helpers.json.JsonItemWriter;
 import org.apache.sling.microsling.slingservlets.renderers.DefaultHtmlRenderer;
@@ -81,8 +83,14 @@
             w.println("</title>");
             
             // library scripts
+            final SlingHttpServletRequest request = (SlingHttpServletRequest)props.get(SlingScriptEngine.REQUEST);
             for(String lib : libraryScripts) {
-                w.println("<script src=\"" + lib + "\"></script>");  
+                final String fullScriptPath =             
+                    SlingRequestPaths.getContextPath(request)
+                    + SlingRequestPaths.getServletPath(request)
+                    + lib
+                ;
+                w.println("<script src=\"" + fullScriptPath + "\"></script>");  
             }
             
             // onLoad method