You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by fm...@apache.org on 2007/11/02 17:21:28 UTC
svn commit: r591387 - in
/incubator/sling/trunk/microsling/microsling-core/src/main/webapp:
content-creation-forms.html freemarker-scripts.html
server-side-javascript.html velocity-scripts.html
Author: fmeschbe
Date: Fri Nov 2 09:21:27 2007
New Revision: 591387
URL: http://svn.apache.org/viewvc?rev=591387&view=rev
Log:
Fix the descriptions and paths after all these modifications
Modified:
incubator/sling/trunk/microsling/microsling-core/src/main/webapp/content-creation-forms.html
incubator/sling/trunk/microsling/microsling-core/src/main/webapp/freemarker-scripts.html
incubator/sling/trunk/microsling/microsling-core/src/main/webapp/server-side-javascript.html
incubator/sling/trunk/microsling/microsling-core/src/main/webapp/velocity-scripts.html
Modified: incubator/sling/trunk/microsling/microsling-core/src/main/webapp/content-creation-forms.html
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/microsling/microsling-core/src/main/webapp/content-creation-forms.html?rev=591387&r1=591386&r2=591387&view=diff
==============================================================================
--- incubator/sling/trunk/microsling/microsling-core/src/main/webapp/content-creation-forms.html (original)
+++ incubator/sling/trunk/microsling/microsling-core/src/main/webapp/content-creation-forms.html Fri Nov 2 09:21:27 2007
@@ -7,7 +7,7 @@
<h1>microsling content creation forms</h1>
<div class="note">
- <a href="../">back to homepage</a>
+ <a href="index.html">back to homepage</a>
</div>
<p>
@@ -15,7 +15,7 @@
</p>
<div>
- <form class="testbox" action="microsling/content/testing.sling" method="POST">
+ <form class="testbox" action="content/testing" method="POST">
<input type="hidden" name="slingDisplayExtension" value="html"/>
<h1>SlingPostServlet content creation form</h1>
@@ -45,16 +45,6 @@
</p>
</form>
</div>
-
- <div>
- <form class="testbox" action="microsling/whatever" method="POST">
- <h1>Non-Sling POST method form</h1>
- <p>
- Submitting this form should cause an error 501: <em>POST method is not supported by DefaultSlingServlet</em>.
- </p>
- <input type="submit"/>
- </form>
- </div>
-
+
</body>
</html>
Modified: incubator/sling/trunk/microsling/microsling-core/src/main/webapp/freemarker-scripts.html
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/microsling/microsling-core/src/main/webapp/freemarker-scripts.html?rev=591387&r1=591386&r2=591387&view=diff
==============================================================================
--- incubator/sling/trunk/microsling/microsling-core/src/main/webapp/freemarker-scripts.html (original)
+++ incubator/sling/trunk/microsling/microsling-core/src/main/webapp/freemarker-scripts.html Fri Nov 2 09:21:27 2007
@@ -7,7 +7,7 @@
<h1>microsling FreeMarker templates</h1>
<div class="note">
- <a href="../">back to homepage</a>
+ <a href="index.html">back to homepage</a>
</div>
<p>
Scripts found by the <code>SlingScriptResolver</code> using the <code>.ftl</code> extension are executed by
Modified: incubator/sling/trunk/microsling/microsling-core/src/main/webapp/server-side-javascript.html
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/microsling/microsling-core/src/main/webapp/server-side-javascript.html?rev=591387&r1=591386&r2=591387&view=diff
==============================================================================
--- incubator/sling/trunk/microsling/microsling-core/src/main/webapp/server-side-javascript.html (original)
+++ incubator/sling/trunk/microsling/microsling-core/src/main/webapp/server-side-javascript.html Fri Nov 2 09:21:27 2007
@@ -7,13 +7,13 @@
<h1>microsling server-side javascript and ESP templates</h1>
<div class="note">
- <a href="../">back to homepage</a>
+ <a href="index.html">back to homepage</a>
</div>
<p>
Server-side javascript code and javascript-based ESP templates can be used by microsling to process requests.
The scripts are located by the
- <a href="http://svn.apache.org/viewvc/incubator/sling/whiteboard/microsling/src/main/java/org/apache/sling/microsling/scripting/SlingScriptResolver.java?view=markup">SlingScriptResolver</a>
+ <a href="http://svn.apache.org/viewvc/incubator/sling/trunk/microsling/microsling-core/src/main/java/org/apache/sling/microsling/scripting/MicroslingScriptResolver.java?view=markup">MicroslingScriptResolver</a>
, as for the <a href="velocity-scripts.html">Velocity templates</a> (see that
page for more details about how this resolution works).
</p>
@@ -31,7 +31,7 @@
</p>
<p>
Server-side javascript support is implemented by the
- <a href="http://svn.apache.org/viewvc/incubator/sling/whiteboard/microsling/src/main/java/org/apache/sling/microsling/slingservlets/RhinoJavascriptServlet.java?revision=585096&view=markup">RhinoJavascriptServlet</a>.
+ <a href="http://svn.apache.org/viewvc/incubator/sling/trunk/microsling/microsling-core/src/main/java/org/apache/sling/microsling/scripting/engines/rhino/RhinoJavascriptEngine.java?view=markup">RhinoJavascriptEngine</a>.
</p>
<p>
To test this, remove or rename <a href="velocity-scripts.html">Velocity templates</a>
@@ -130,7 +130,7 @@
</html></pre>
<p>
If you have created some content with the test form, and activated the above template,
- <a href="microsling/content/testing.sling.html">microsling/content/testing.sling.html</a> should
+ <a href="content/testing.html">content/testing.html</a> should
display an HTML directory listing.
</p>
</body>
Modified: incubator/sling/trunk/microsling/microsling-core/src/main/webapp/velocity-scripts.html
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/microsling/microsling-core/src/main/webapp/velocity-scripts.html?rev=591387&r1=591386&r2=591387&view=diff
==============================================================================
--- incubator/sling/trunk/microsling/microsling-core/src/main/webapp/velocity-scripts.html (original)
+++ incubator/sling/trunk/microsling/microsling-core/src/main/webapp/velocity-scripts.html Fri Nov 2 09:21:27 2007
@@ -7,7 +7,7 @@
<h1>microsling Velocity templates</h1>
<div class="note">
- <a href="../">back to homepage</a>
+ <a href="index.html">back to homepage</a>
</div>
<p>
When processing requests, the <em>VelocityTemplatesServlet</em> ask the <em>SlingScriptResolver</em>