You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2008/03/31 19:20:30 UTC
svn commit: r643068 - in /incubator/sling/trunk:
launchpad/content/src/main/resources/content/
launchpad/content/src/main/resources/content/sling-test/ujax/
launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/helpers/
launc...
Author: cziegeler
Date: Mon Mar 31 10:20:26 2008
New Revision: 643068
URL: http://svn.apache.org/viewvc?rev=643068&view=rev
Log:
SLING-326: Rename all references from ujax to sling.
Added:
incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/
incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/
- copied from r643049, incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ujax/
incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletCreateTest.java
- copied, changed from r643065, incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ujax/PostServletCreateTest.java
incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletDeleteTest.java
- copied, changed from r643065, incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ujax/PostServletDeleteTest.java
incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletMoveTest.java
- copied, changed from r643065, incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ujax/PostServletMoveTest.java
incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletOrderTest.java
- copied, changed from r643065, incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ujax/PostServletOrderTest.java
incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletUpdateTest.java
- copied, changed from r643065, incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ujax/PostServletUpdateTest.java
incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/UjaxAutoPropertiesTest.java
- copied, changed from r643065, incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ujax/UjaxAutoPropertiesTest.java
incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/UjaxDateValuesTest.java
- copied, changed from r643065, incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ujax/UjaxDateValuesTest.java
incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/UjaxDefaultValuesTest.java
- copied, changed from r643065, incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ujax/UjaxDefaultValuesTest.java
incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/UjaxSessionInfoTest.java
- copied, changed from r643065, incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ujax/UjaxSessionInfoTest.java
Removed:
incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ujax/
Modified:
incubator/sling/trunk/launchpad/content/src/main/resources/content/index.html
incubator/sling/trunk/launchpad/content/src/main/resources/content/sling-test/ujax/assert.js
incubator/sling/trunk/launchpad/content/src/main/resources/content/sling-test/ujax/ujax-test.html
incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/helpers/UslingIntegrationTestClient.java
incubator/sling/trunk/sling/servlets-post/src/main/java/org/apache/sling/servlets/post/impl/SlingPostProcessor.java
incubator/sling/trunk/sling/servlets-post/src/main/java/org/apache/sling/servlets/post/impl/SlingPostServlet.java
incubator/sling/trunk/sling/servlets-post/src/main/java/org/apache/sling/servlets/post/impl/info/SlingInfoServlet.java
incubator/sling/trunk/sling/servlets-post/src/main/resources/sling/sling.js
Modified: incubator/sling/trunk/launchpad/content/src/main/resources/content/index.html
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/content/src/main/resources/content/index.html?rev=643068&r1=643067&r2=643068&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/content/src/main/resources/content/index.html (original)
+++ incubator/sling/trunk/launchpad/content/src/main/resources/content/index.html Mon Mar 31 10:20:26 2008
@@ -6,7 +6,7 @@
We'll have more content for you here, hopefully soon...
</p>
<p>
- The µjax tests are available at <a href="sling-test/ujax/ujax-test.html">sling-test/ujax/ujax-test.html</a>.
+ The Sling client library tests are available at <a href="sling-test/sling/sling-test.html">sling-test/sling/sling-test.html</a>.
</p>
</body>
</html>
Modified: incubator/sling/trunk/launchpad/content/src/main/resources/content/sling-test/ujax/assert.js
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/content/src/main/resources/content/sling-test/ujax/assert.js?rev=643068&r1=643067&r2=643068&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/content/src/main/resources/content/sling-test/ujax/assert.js (original)
+++ incubator/sling/trunk/launchpad/content/src/main/resources/content/sling-test/ujax/assert.js Mon Mar 31 10:20:26 2008
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-// Minimal javascript assertion framework, used for ujax automated testing.
+// Minimal javascript assertion framework, used for sling client library automated testing.
function assert(message,condition) {
if(condition != true) {
Modified: incubator/sling/trunk/launchpad/content/src/main/resources/content/sling-test/ujax/ujax-test.html
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/content/src/main/resources/content/sling-test/ujax/ujax-test.html?rev=643068&r1=643067&r2=643068&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/content/src/main/resources/content/sling-test/ujax/ujax-test.html (original)
+++ incubator/sling/trunk/launchpad/content/src/main/resources/content/sling-test/ujax/ujax-test.html Mon Mar 31 10:20:26 2008
@@ -60,14 +60,14 @@
<h2>More info</h2>
<p>After running the tests at least once, <a
- href="/test-data/ujax-test/testhtml-nodes.infinity.json">/ujax-test/testhtml-nodes.json</a>
+ href="/test-data/sling-test/testhtml-nodes.infinity.json">/sling-test/testhtml-nodes.json</a>
should show the JSON data of the nodes created by the test cases.</p>
<p>See the source code of this page for details.</p>
<script language="javascript">
- function ujaxPost(url,params) {
- var httpcon = ujax.getXHR();
+ function slingPost(url,params) {
+ var httpcon = sling.getXHR();
httpcon.open("POST", url, false);
httpcon.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
httpcon.setRequestHeader("Content-length", params.length);
@@ -78,16 +78,16 @@
var passes = 0;
var now = new Date().getTime();
- var baseTestPath = "/test-data/ujax-test/testhtml-nodes";
+ var baseTestPath = "/test-data/sling-test/testhtml-nodes";
var testPath = baseTestPath + "/test-" + now;
function testPost() {
- var c = ujaxPost(testPath,"title=hello&created=&dummy=&time=" + now);
+ var c = slingPost(testPath,"title=hello&created=&dummy=&time=" + now);
assert("Expected 200 status for POST",c.status == 200);
}
function verifyPostedElement() {
- var data = ujax.getContent(testPath,1);
+ var data = sling.getContent(testPath,1);
assertNotNull("data",data);
assertEquals("title matches","hello",data.title);
assertEquals("time matches",now,data.time);
@@ -99,7 +99,7 @@
}
function testGetSessionInfo() {
- var session = ujax.getSessionInfo();
+ var session = sling.getSessionInfo();
assertEquals("session.userID is a string","string",typeof(session.userID));
assertEquals("session.userID == 'admin'","admin",session.userID);
assertEquals("session.workspace is a string","string",typeof(session.workspace));
@@ -107,23 +107,23 @@
}
function testRemoveContent() {
- var deletePath = baseTestPath + "/ujax-test/testhtml-nodes/delete-" + now;
- var c = ujaxPost(deletePath,"title=hello&created=&dummy=&time=" + now);
+ var deletePath = baseTestPath + "/sling-test/testhtml-nodes/delete-" + now;
+ var c = slingPost(deletePath,"title=hello&created=&dummy=&time=" + now);
assert("Expected 200 status for POST",c.status == 200);
- var data = ujax.getContent(deletePath,1);
+ var data = sling.getContent(deletePath,1);
assertNotNull("data must be found before removeContent",data);
- var d = ujax.removeContent(deletePath);
+ var d = sling.removeContent(deletePath);
assert("Expected 200 status for removeContent, got " + d.status,d.status == 200);
- data = ujax.getContent(deletePath,1);
+ data = sling.getContent(deletePath,1);
assertNull("data should be gone after deletePath (" + deletePath + ")",data);
}
function testJsonLevels() {
- var c = ujaxPost(baseTestPath + "/json-levels", "title=JsonLevelsTest");
- var data0 = ujax.getContent(baseTestPath,0);
- var data1 = ujax.getContent(baseTestPath,1);
+ var c = slingPost(baseTestPath + "/json-levels", "title=JsonLevelsTest");
+ var data0 = sling.getContent(baseTestPath,0);
+ var data1 = sling.getContent(baseTestPath,1);
assert("Level 0 must not provide child", typeof data0['json-levels'] == "undefined");
assert("Level 1 must provide child", typeof data1['json-levels'] == "object");
assert("Level 1 must provide child title", data1['json-levels'].title == "JsonLevelsTest");
Modified: incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/helpers/UslingIntegrationTestClient.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/helpers/UslingIntegrationTestClient.java?rev=643068&r1=643067&r2=643068&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/helpers/UslingIntegrationTestClient.java (original)
+++ incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/helpers/UslingIntegrationTestClient.java Mon Mar 31 10:20:26 2008
@@ -115,9 +115,9 @@
// the properties of the client
Map<String, String> nodeProperties = new HashMap<String, String>();
- // add ujax specific properties
- nodeProperties.put("ujax:redirect", url);
- nodeProperties.put("ujax:displayExtension", "");
+ // add sling specific properties
+ nodeProperties.put("sling:post:redirect", url);
+ nodeProperties.put("sling:post:displayExtension", "");
// take over any client provided properties
if (clientNodeProperties != null) {
@@ -186,7 +186,7 @@
post.setRequestEntity(new MultipartRequestEntity(parts, post.getParams()));
final int status = httpClient.executeMethod(post);
- if(status!=200) { // fmeschbe: The default ujax status is 200, not 302
+ if(status!=200) { // fmeschbe: The default sling status is 200, not 302
throw new IOException("Expected status code 200 for POST, got " + status + ", URL=" + url);
}
}
Copied: incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletCreateTest.java (from r643065, incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ujax/PostServletCreateTest.java)
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletCreateTest.java?p2=incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletCreateTest.java&p1=incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ujax/PostServletCreateTest.java&r1=643065&r2=643068&rev=643068&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ujax/PostServletCreateTest.java (original)
+++ incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletCreateTest.java Mon Mar 31 10:20:26 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.launchpad.webapp.integrationtest.ujax;
+package org.apache.sling.launchpad.webapp.integrationtest.servlets.post;
import java.io.IOException;
import java.util.HashMap;
@@ -27,15 +27,15 @@
/** Test node creation via the MicrojaxPostServlet */
public class PostServletCreateTest extends HttpTestBase {
- public static final String TEST_BASE_PATH = "/ujax-tests";
+ public static final String TEST_BASE_PATH = "/sling-tests";
private String postUrl;
-
+
@Override
protected void setUp() throws Exception {
super.setUp();
postUrl = HTTP_BASE_URL + TEST_BASE_PATH + "/" + System.currentTimeMillis();
}
-
+
public void testPostPathIsUnique() throws IOException {
assertHttpStatus(postUrl, HttpServletResponse.SC_NOT_FOUND,
"Path must not exist before test: " + postUrl);
@@ -50,7 +50,7 @@
assertTrue("Node (" + location + ") must created be under POST URL (" + postUrl + ")",
location.contains(postUrl + "/"));
}
-
+
public void testCreateNodeWithExtension() throws IOException {
final String location = testClient.createNode(postUrl + SlingPostServlet.DEFAULT_CREATE_SUFFIX + ".html", null);
assertHttpStatus(location, HttpServletResponse.SC_OK,
@@ -60,7 +60,7 @@
assertTrue("Node (" + location + ") must created be under POST URL (" + postUrl + ")",
location.contains(postUrl + "/"));
}
-
+
public void testCreateNodeAtSpecificUrl() throws IOException {
final String specifiedLocation = postUrl + "/specified-location";
final String location = testClient.createNode(specifiedLocation, null);
@@ -69,7 +69,7 @@
assertTrue("Node (" + location + ") must be created at given URL (" + specifiedLocation + ")",
location.equals(specifiedLocation));
}
-
+
public void testCreateNodeAtDeepUrl() throws IOException {
final long id = System.currentTimeMillis();
final String specifiedLocation = postUrl + "/specified-location" + id + "/deepA/deepB/" + id;
@@ -79,7 +79,7 @@
assertTrue("Node (" + location + ") must be created (deep) at given URL (" + specifiedLocation + ")",
location.equals(specifiedLocation));
}
-
+
/** Create a node with some data, and check that data */
public void testCreateWithData() throws IOException {
final Map <String, String> props = new HashMap <String, String> ();
@@ -91,7 +91,7 @@
assertJavascript("123456", content, "out.println(data.a + data.b)");
assertJavascript("some words", content, "out.println(data.c)");
}
-
+
/** Create a node with a propery in a subnode, and check (SLING-223) */
public void testCreateSubnodeProperty() throws IOException {
final Map <String, String> props = new HashMap <String, String> ();
@@ -104,7 +104,7 @@
assertJavascript("456", content, "out.println(data.subnode.b)");
assertJavascript("some words", content, "out.println(data.c)");
}
-
+
/** Use the default "save prefix" on some parameters, and check that only those
* who have the prefix are saved.
*/
@@ -118,7 +118,7 @@
assertJavascript("123456", content, "out.println(data.a + data.b)");
assertJavascript("undefined", content, "out.println(typeof data.c)");
}
-
+
/** Use a custom "save prefix" on some parameters, and check that only those
* who have the prefix are saved.
*/
@@ -133,7 +133,7 @@
assertJavascript("123456", content, "out.println(data.a + data.b)");
assertJavascript("undefined", content, "out.println(typeof data.c)");
}
-
+
public void TODO_FAILS_testCustomSavePrefixPlusPlus() throws IOException {
// for some reason, ++ as a custom save prefix fails
// might indicate a weirdness in parameters processing
Copied: incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletDeleteTest.java (from r643065, incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ujax/PostServletDeleteTest.java)
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletDeleteTest.java?p2=incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletDeleteTest.java&p1=incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ujax/PostServletDeleteTest.java&r1=643065&r2=643068&rev=643068&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ujax/PostServletDeleteTest.java (original)
+++ incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletDeleteTest.java Mon Mar 31 10:20:26 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.launchpad.webapp.integrationtest.ujax;
+package org.apache.sling.launchpad.webapp.integrationtest.servlets.post;
import java.io.IOException;
import java.util.LinkedList;
Copied: incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletMoveTest.java (from r643065, incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ujax/PostServletMoveTest.java)
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletMoveTest.java?p2=incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletMoveTest.java&p1=incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ujax/PostServletMoveTest.java&r1=643065&r2=643068&rev=643068&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ujax/PostServletMoveTest.java (original)
+++ incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletMoveTest.java Mon Mar 31 10:20:26 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.launchpad.webapp.integrationtest.ujax;
+package org.apache.sling.launchpad.webapp.integrationtest.servlets.post;
import java.io.IOException;
import java.util.HashMap;
Copied: incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletOrderTest.java (from r643065, incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ujax/PostServletOrderTest.java)
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletOrderTest.java?p2=incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletOrderTest.java&p1=incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ujax/PostServletOrderTest.java&r1=643065&r2=643068&rev=643068&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ujax/PostServletOrderTest.java (original)
+++ incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletOrderTest.java Mon Mar 31 10:20:26 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.launchpad.webapp.integrationtest.ujax;
+package org.apache.sling.launchpad.webapp.integrationtest.servlets.post;
import java.io.IOException;
import java.util.HashMap;
Copied: incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletUpdateTest.java (from r643065, incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ujax/PostServletUpdateTest.java)
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletUpdateTest.java?p2=incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletUpdateTest.java&p1=incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ujax/PostServletUpdateTest.java&r1=643065&r2=643068&rev=643068&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ujax/PostServletUpdateTest.java (original)
+++ incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletUpdateTest.java Mon Mar 31 10:20:26 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.launchpad.webapp.integrationtest.ujax;
+package org.apache.sling.launchpad.webapp.integrationtest.servlets.post;
import java.io.IOException;
import java.util.HashMap;
Copied: incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/UjaxAutoPropertiesTest.java (from r643065, incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ujax/UjaxAutoPropertiesTest.java)
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/UjaxAutoPropertiesTest.java?p2=incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/UjaxAutoPropertiesTest.java&p1=incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ujax/UjaxAutoPropertiesTest.java&r1=643065&r2=643068&rev=643068&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ujax/UjaxAutoPropertiesTest.java (original)
+++ incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/UjaxAutoPropertiesTest.java Mon Mar 31 10:20:26 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.launchpad.webapp.integrationtest.ujax;
+package org.apache.sling.launchpad.webapp.integrationtest.servlets.post;
import java.io.IOException;
import java.util.HashMap;
Copied: incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/UjaxDateValuesTest.java (from r643065, incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ujax/UjaxDateValuesTest.java)
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/UjaxDateValuesTest.java?p2=incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/UjaxDateValuesTest.java&p1=incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ujax/UjaxDateValuesTest.java&r1=643065&r2=643068&rev=643068&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ujax/UjaxDateValuesTest.java (original)
+++ incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/UjaxDateValuesTest.java Mon Mar 31 10:20:26 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.launchpad.webapp.integrationtest.ujax;
+package org.apache.sling.launchpad.webapp.integrationtest.servlets.post;
import java.io.IOException;
import java.text.SimpleDateFormat;
Copied: incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/UjaxDefaultValuesTest.java (from r643065, incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ujax/UjaxDefaultValuesTest.java)
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/UjaxDefaultValuesTest.java?p2=incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/UjaxDefaultValuesTest.java&p1=incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ujax/UjaxDefaultValuesTest.java&r1=643065&r2=643068&rev=643068&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ujax/UjaxDefaultValuesTest.java (original)
+++ incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/UjaxDefaultValuesTest.java Mon Mar 31 10:20:26 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.launchpad.webapp.integrationtest.ujax;
+package org.apache.sling.launchpad.webapp.integrationtest.servlets.post;
import java.io.IOException;
import java.util.HashMap;
Copied: incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/UjaxSessionInfoTest.java (from r643065, incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ujax/UjaxSessionInfoTest.java)
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/UjaxSessionInfoTest.java?p2=incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/UjaxSessionInfoTest.java&p1=incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ujax/UjaxSessionInfoTest.java&r1=643065&r2=643068&rev=643068&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ujax/UjaxSessionInfoTest.java (original)
+++ incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/UjaxSessionInfoTest.java Mon Mar 31 10:20:26 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.launchpad.webapp.integrationtest.ujax;
+package org.apache.sling.launchpad.webapp.integrationtest.servlets.post;
import java.io.IOException;
Modified: incubator/sling/trunk/sling/servlets-post/src/main/java/org/apache/sling/servlets/post/impl/SlingPostProcessor.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/sling/servlets-post/src/main/java/org/apache/sling/servlets/post/impl/SlingPostProcessor.java?rev=643068&r1=643067&r2=643068&view=diff
==============================================================================
--- incubator/sling/trunk/sling/servlets-post/src/main/java/org/apache/sling/servlets/post/impl/SlingPostProcessor.java (original)
+++ incubator/sling/trunk/sling/servlets-post/src/main/java/org/apache/sling/servlets/post/impl/SlingPostProcessor.java Mon Mar 31 10:20:26 2008
@@ -38,7 +38,7 @@
/**
* Holds various states and encapsulates methods that are needed to handle a
- * ujax post request.
+ * post request.
*/
public class SlingPostProcessor {
@@ -463,7 +463,7 @@
for (Map.Entry<String, RequestParameter[]> e: request.getRequestParameterMap().entrySet()) {
final String paramName = e.getKey();
- // do not store parameters with names starting with ujax:
+ // do not store parameters with names starting with sling:post
if(paramName.startsWith(SlingPostServlet.RP_PREFIX)) {
continue;
}
Modified: incubator/sling/trunk/sling/servlets-post/src/main/java/org/apache/sling/servlets/post/impl/SlingPostServlet.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/sling/servlets-post/src/main/java/org/apache/sling/servlets/post/impl/SlingPostServlet.java?rev=643068&r1=643067&r2=643068&view=diff
==============================================================================
--- incubator/sling/trunk/sling/servlets-post/src/main/java/org/apache/sling/servlets/post/impl/SlingPostServlet.java (original)
+++ incubator/sling/trunk/sling/servlets-post/src/main/java/org/apache/sling/servlets/post/impl/SlingPostServlet.java Mon Mar 31 10:20:26 2008
@@ -31,7 +31,7 @@
import org.slf4j.LoggerFactory;
/**
- * POST servlet that implements the ujax "protocol"
+ * POST servlet that implements the sling client library "protocol"
*
* @scr.service
* interface="javax.servlet.Servlet"
@@ -42,7 +42,7 @@
*
* @scr.property
* name="service.description"
- * value="ujax Post Servlet"
+ * value="Sling Post Servlet"
*
* @scr.property
* name="service.vendor"
@@ -67,9 +67,9 @@
/**
* Prefix for parameter names which control this POST
- * (ujax stands for "microjax", RP_ stands for "request param")
+ * (RP_ stands for "request param")
*/
- public static final String RP_PREFIX = "ujax:";
+ public static final String RP_PREFIX = "sling:post:";
/**
* suffix that indicates node creation
@@ -169,7 +169,7 @@
protected void doPost(SlingHttpServletRequest request,
SlingHttpServletResponse response)
throws ServletException, IOException {
-
+
// create a post processor and process changes
SlingPostProcessor p = createPostProcessor(request);
p.run();
Modified: incubator/sling/trunk/sling/servlets-post/src/main/java/org/apache/sling/servlets/post/impl/info/SlingInfoServlet.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/sling/servlets-post/src/main/java/org/apache/sling/servlets/post/impl/info/SlingInfoServlet.java?rev=643068&r1=643067&r2=643068&view=diff
==============================================================================
--- incubator/sling/trunk/sling/servlets-post/src/main/java/org/apache/sling/servlets/post/impl/info/SlingInfoServlet.java (original)
+++ incubator/sling/trunk/sling/servlets-post/src/main/java/org/apache/sling/servlets/post/impl/info/SlingInfoServlet.java Mon Mar 31 10:20:26 2008
@@ -34,11 +34,11 @@
import org.osgi.service.component.ComponentContext;
/**
- * The <code>UjaxInfoServlet</code> TODO
+ * The <code>SlingInfoServlet</code> TODO
*
* @scr.service interface="javax.servlet.Servlet"
* @scr.component immediate="true" metatype="false"
- * @scr.property name="service.description" value="ujax Info Servlet"
+ * @scr.property name="service.description" value="Sling Info Servlet"
* @scr.property name="service.vendor" value="The Apache Software Foundation"
* @scr.property name="sling.servlet.paths" value="/ujax"
*/
@@ -90,13 +90,13 @@
final PrintWriter out = response.getWriter();
out.println("<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01//EN\" \"http://www.w3.org/TR/html4/strict.dtd\">");
- out.println("<html><head><title>Ujax Info Providers</title></head>");
+ out.println("<html><head><title>Sling Info Providers</title></head>");
out.println("<body><h1>Select from the following Providers</h1>");
out.println("<table>");
for (String label : infoProviders.keySet()) {
out.print("<tr><td>");
- out.print("<a href='ujax.");
+ out.print("<a href='sling.");
out.print(label);
out.print(".html'>");
out.print(label);
@@ -144,8 +144,8 @@
final PrintWriter out = response.getWriter();
out.println("<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01//EN\" \"http://www.w3.org/TR/html4/strict.dtd\">");
- out.println("<html><head><title>Ujax Info</title></head>");
- out.println("<body><h1>Ujax Info</h1>");
+ out.println("<html><head><title>Sling Info</title></head>");
+ out.println("<body><h1>Sling Info</h1>");
out.println("<table>");
for (Map.Entry<String, String> e : data.entrySet()) {
Modified: incubator/sling/trunk/sling/servlets-post/src/main/resources/sling/sling.js
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/sling/servlets-post/src/main/resources/sling/sling.js?rev=643068&r1=643067&r2=643068&view=diff
==============================================================================
--- incubator/sling/trunk/sling/servlets-post/src/main/resources/sling/sling.js (original)
+++ incubator/sling/trunk/sling/servlets-post/src/main/resources/sling/sling.js Mon Mar 31 10:20:26 2008
@@ -17,43 +17,43 @@
/**
* The sling javascript client gives access to a JCR repository
- * from client-side java code, using ujax as a back-end.
+ * from client-side java code, using the sling post servlet as a back-end.
*
* @version $Rev: $, $Date: 2007-03-27 16:30:52 +0200 (Tue, 27 Mar 2007) $
*/
-var ujax = null;
+var sling = null;
-// start ujax code scope
+// start sling code scope
(function() {
- ujax = new Object();
- ujax.NAME_OF_THIS_FILE = "sling.js";
+ sling = new Object();
+ sling.NAME_OF_THIS_FILE = "sling.js";
/** This method tries to figure out what to do with a page */
- ujax.wizard = function() {
+ sling.wizard = function() {
//TODO add lots of magic here
- var form=document.getElementById("ujaxform");
+ var form=document.getElementById("slingform");
if (!form) form=document.forms[0];
if (form) {
var sp=new Object();
sp.formElement=form;
- ujax.setupPage(sp);
+ sling.setupPage(sp);
}
}
- /** Call this to merge ujax data in an HTML page
+ /** Call this to merge sling data in an HTML page
TODO deprecate other functions
*/
- ujax.setupPage = function(options) {
- var tree = ujax.getContent(ujax._getJsonUrl(),1);
+ sling.setupPage = function(options) {
+ var tree = sling.getContent(sling._getJsonUrl(),1);
if(options.formElement) {
- ujax._setFormValues(options.formElement,ujax._getJsonUrl(),tree);
+ sling._setFormValues(options.formElement,sling._getJsonUrl(),tree);
}
if(options.displayElement) {
- ujax.displayValues(options.displayElement,tree);
+ sling.displayValues(options.displayElement,tree);
}
}
@@ -63,8 +63,8 @@
* @return the XHR object, use .responseText for the data
* @type String
*/
- ujax.httpGet = function(url) {
- var httpcon = ujax.getXHR();
+ sling.httpGet = function(url) {
+ var httpcon = sling.getXHR();
if (httpcon) {
httpcon.open('GET', url, false);
httpcon.send(null);
@@ -81,14 +81,14 @@
* @return The result
* @type String
*/
- ujax.dumpObj = function(obj, level) {
+ sling.dumpObj = function(obj, level) {
var res="";
for (var a in obj) {
if (typeof(obj[a])!="object") {
res+=a+":"+obj[a]+" ";
} else {
res+=a+": { ";
- res+=ujax.dumpObj(obj[a])+"} ";
+ res+=sling.dumpObj(obj[a])+"} ";
}
}
return (res);
@@ -102,7 +102,7 @@
* @return An Array of names of properties that exist in a tree
* @type Array
*/
- ujax.getAllPropNames = function(obj, names) {
+ sling.getAllPropNames = function(obj, names) {
var root=false;
if (!names) {
names=new Object();
@@ -134,10 +134,10 @@
* @return An Object tree of content nodes and properties, null if not found
* @type Object
*/
- ujax.getContent = function(path, maxlevels, filter) {
+ sling.getContent = function(path, maxlevels, filter) {
var obj=new Object();
if (!path) {
- path=ujax.currentPath;
+ path=sling.currentPath;
}
if (path.indexOf("/")==0) {
/*
@@ -151,7 +151,7 @@
} else {
maxlevels = "";
}
- path=ujax.baseurl + path + maxlevels + ".json";
+ path=sling.baseurl + path + maxlevels + ".json";
}
//checking for a trailing "/*"
if (path.indexOf("/*")>=0) return obj;
@@ -159,10 +159,10 @@
// TODO for now we explicitely defeat caching on this...there must be a better way
// but in tests IE6 tends to cache too much
var passThroughCacheParam = "?clock=" + new Date().getTime();
- var res=ujax.httpGet(path + passThroughCacheParam + (maxlevels?"&maxlevels="+maxlevels:""));
+ var res=sling.httpGet(path + passThroughCacheParam + (maxlevels?"&maxlevels="+maxlevels:""));
if(res.status == 200) {
- var obj=ujax.evalString(res.responseText);
+ var obj=sling.evalString(res.responseText);
if (!filter) {
for (var a in obj) {
if (a.indexOf("jcr:")==0) delete(obj[a]);
@@ -174,11 +174,11 @@
}
/** Remove content by path */
- ujax.removeContent = function(path) {
- var httpcon = ujax.getXHR();
+ sling.removeContent = function(path) {
+ var httpcon = sling.getXHR();
if (httpcon) {
- var params = "ujax:delete="+path;
- httpcon.open('POST', ujax.baseurl + path, false);
+ var params = "sling:post:delete="+path;
+ httpcon.open('POST', sling.baseurl + path, false);
// Send the proper header information along with the request
httpcon.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
@@ -192,7 +192,7 @@
}
/** eval str, accepting various object delimiters */
- ujax.evalString = function(str) {
+ sling.evalString = function(str) {
var obj = null;
if(str.indexOf('[')==0) {
eval("obj="+str);
@@ -209,16 +209,16 @@
* @return An Object tree containing the session information, null if server status <> 200
* @type Object
*/
- ujax.getSessionInfo = function() {
- var res=ujax.httpGet(ujax.baseurl+"/ujax.sessionInfo.json");
+ sling.getSessionInfo = function() {
+ var res=sling.httpGet(sling.baseurl+"/sling.sessionInfo.json");
if(res.status == 200) {
- return ujax.evalString(res.responseText);
+ return sling.evalString(res.responseText);
}
return null;
}
/** Replace extension in a path */
- ujax._replaceExtension = function(path,newExtension) {
+ sling._replaceExtension = function(path,newExtension) {
var i = path.lastIndexOf(".");
if(i >= 0) path = path.substring(0,i);
i = path.lastIndexOf(".");
@@ -229,17 +229,17 @@
/** Get the JSON data URL that for the current page
* (assuming a .extension for the current page, .html or something else)
*/
- ujax._getJsonUrl = function() {
- return ujax._replaceExtension(window.location.href,".json");
+ sling._getJsonUrl = function() {
+ return sling._replaceExtension(window.location.href,".json");
}
/** Get the content repository path from the URL
* (assuming a .extension for the current page, .html or something else)
*/
- ujax._getPath = function() {
+ sling._getPath = function() {
- var noextensions=ujax._replaceExtension(window.location.href,"");
- var path=noextensions.substring(ujax.baseurl.length);
+ var noextensions=sling._replaceExtension(window.location.href,"");
+ var path=noextensions.substring(sling.baseurl.length);
return (path);
}
@@ -247,15 +247,15 @@
* with an id like ./stuff, has its innerHTML set to the value of stuff
* in the tree, if it exists.
*/
- ujax.displayValues = function(container,tree) {
+ sling.displayValues = function(container,tree) {
if(!tree) {
- tree = ujax.getContent(ujax._getJsonUrl(),1);
+ tree = sling.getContent(sling._getJsonUrl(),1);
}
var elements = container.getElementsByTagName("*");
var toSet = new Array();
for (var i = 0; i < elements.length; i++) {
- var value = ujax._getElementValue(elements[i],tree);
+ var value = sling._getElementValue(elements[i],tree);
if(value) {
toSet[toSet.length] = { e:elements[i], v:value };
}
@@ -267,7 +267,7 @@
}
/** If e has an ID that matches a property of tree, set e's innerHTML accordingly */
- ujax._getElementValue = function(e,tree) {
+ sling._getElementValue = function(e,tree) {
var id = e.getAttribute("id");
if(id) {
return tree[id.substring(2)];
@@ -284,7 +284,7 @@
* Returns an object indicating whether data was found on the server.
*
*/
- ujax._setFormValues = function(form, path, tree) {
+ sling._setFormValues = function(form, path, tree) {
var result = new Object();
/** TODO: deal with abolute paths?
@@ -295,7 +295,7 @@
form.setAttribute("action", path);
if (!tree) {
- tree=ujax.getContent(path,1);
+ tree=sling.getContent(path,1);
}
var elems=form.elements;
@@ -320,7 +320,7 @@
if (a.indexOf("/")==0) {
var nodepath=a.substring(0,a.lastIndexOf("/"));
var propname=a.substring(a.lastIndexOf("/")+1);
- var node=ujax.getContent(nodepath);
+ var node=sling.getContent(nodepath);
var propval=node[propname];
} else if (a.indexOf(formfieldprefix)==0) {
var propname=a.substring(formfieldprefix.length);
@@ -356,7 +356,7 @@
* @return The Path parameter isolated from the URL
* @type String
*/
- ujax.TODO_NOT_USED_isolatePathFromUrl = function(url) {
+ sling.TODO_NOT_USED_isolatePathFromUrl = function(url) {
var pattern = "[\\?&]Path=([^&#]*)";
var regex = new RegExp( pattern );
var results = regex.exec( url );
@@ -372,7 +372,7 @@
* Get an XMLHttpRequest in a portable way
*
*/
- ujax.getXHR = function () {
+ sling.getXHR = function () {
var xhr=null;
if(!xhr) {
@@ -403,18 +403,18 @@
}
if(!xhr) {
- alert("Unable to access XMLHttpRequest object, ujax will not work!");
+ alert("Unable to access XMLHttpRequest object, sling will not work!");
}
return xhr;
}
- // obtain the base_url to communicate with ujax on the server
+ // obtain the base_url to communicate with sling on the server
var scripts = document.getElementsByTagName("SCRIPT")
var script = scripts[scripts.length-1].src
- ujax.baseurl = script.substring(0,script.length - ("/" + ujax.NAME_OF_THIS_FILE.length));
- ujax.currentPath = ujax._getPath();
- ujax.isNew = (ujax.currentPath.indexOf("/*")>=0)?true:false;
+ sling.baseurl = script.substring(0,script.length - ("/" + sling.NAME_OF_THIS_FILE.length));
+ sling.currentPath = sling._getPath();
+ sling.isNew = (sling.currentPath.indexOf("/*")>=0)?true:false;
-// end ujax code scope
+// end sling code scope
})();