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 16:55:08 UTC
svn commit: r644731 - in /incubator/sling/trunk:
launchpad/content/src/main/resources/content/sling-test/sling/
scripting/jst/src/main/java/org/apache/sling/scripting/jst/
sling/servlets-post/ sling/servlets-post/src/main/resources/bundles/
sling/servl...
Author: bdelacretaz
Date: Fri Apr 4 07:55:05 2008
New Revision: 644731
URL: http://svn.apache.org/viewvc?rev=644731&view=rev
Log:
SLING-359 - serve sling.js at /system/sling.js
Added:
incubator/sling/trunk/sling/servlets-post/src/main/resources/system/
incubator/sling/trunk/sling/servlets-post/src/main/resources/system/sling.js
- copied unchanged from r644689, incubator/sling/trunk/sling/servlets-post/src/main/resources/bundles/sling/sling.js
Removed:
incubator/sling/trunk/sling/servlets-post/src/main/resources/bundles/
Modified:
incubator/sling/trunk/launchpad/content/src/main/resources/content/sling-test/sling/sling-test.html
incubator/sling/trunk/scripting/jst/src/main/java/org/apache/sling/scripting/jst/JstScriptEngine.java
incubator/sling/trunk/sling/servlets-post/pom.xml
Modified: incubator/sling/trunk/launchpad/content/src/main/resources/content/sling-test/sling/sling-test.html
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/content/src/main/resources/content/sling-test/sling/sling-test.html?rev=644731&r1=644730&r2=644731&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/content/src/main/resources/content/sling-test/sling/sling-test.html (original)
+++ incubator/sling/trunk/launchpad/content/src/main/resources/content/sling-test/sling/sling-test.html Fri Apr 4 07:55:05 2008
@@ -20,7 +20,7 @@
<head>
<title>Sling client library test page</title>
- <script src="/bundles/sling/sling.js"></script>
+ <script src="/system/sling.js"></script>
<script src="assert.js"></script>
<style type="text/css">
@@ -144,4 +144,4 @@
</script>
</body>
-</html>
\ No newline at end of file
+</html>
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=644731&r1=644730&r2=644731&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 07:55:05 2008
@@ -58,7 +58,7 @@
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";
+ public final static String SLING_JS_PATH = "/system/sling.js";
JstScriptEngine(ScriptEngineFactory scriptEngineFactory) {
super(scriptEngineFactory);
Modified: incubator/sling/trunk/sling/servlets-post/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/sling/servlets-post/pom.xml?rev=644731&r1=644730&r2=644731&view=diff
==============================================================================
--- incubator/sling/trunk/sling/servlets-post/pom.xml (original)
+++ incubator/sling/trunk/sling/servlets-post/pom.xml Fri Apr 4 07:55:05 2008
@@ -64,7 +64,7 @@
org.apache.sling.servlets.post.impl
</Private-Package>
<Sling-Bundle-Resources>
- /bundles/sling/sling.js
+ /system/sling.js
</Sling-Bundle-Resources>
</instructions>
</configuration>