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:01:58 UTC
svn commit: r643062 - in /incubator/sling/trunk:
launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/
launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ujax/
sling/servlets-post/src/main/java/...
Author: cziegeler
Date: Mon Mar 31 10:01:44 2008
New Revision: 643062
URL: http://svn.apache.org/viewvc?rev=643062&view=rev
Log:
SLING-326: Renaming Ujax* classes to Sling*.
Added:
incubator/sling/trunk/sling/servlets-post/src/main/java/org/apache/sling/servlets/post/impl/SlingFileUploadHandler.java
- copied, changed from r643061, incubator/sling/trunk/sling/servlets-post/src/main/java/org/apache/sling/servlets/post/impl/UjaxFileUploadHandler.java
incubator/sling/trunk/sling/servlets-post/src/main/java/org/apache/sling/servlets/post/impl/SlingPostProcessor.java
- copied, changed from r643061, incubator/sling/trunk/sling/servlets-post/src/main/java/org/apache/sling/servlets/post/impl/UjaxPostProcessor.java
incubator/sling/trunk/sling/servlets-post/src/main/java/org/apache/sling/servlets/post/impl/SlingPostServlet.java
- copied, changed from r643061, incubator/sling/trunk/sling/servlets-post/src/main/java/org/apache/sling/servlets/post/impl/UjaxPostServlet.java
incubator/sling/trunk/sling/servlets-post/src/main/java/org/apache/sling/servlets/post/impl/SlingPropertyValueHandler.java
- copied, changed from r643061, incubator/sling/trunk/sling/servlets-post/src/main/java/org/apache/sling/servlets/post/impl/UjaxPropertyValueHandler.java
incubator/sling/trunk/sling/servlets-post/src/main/java/org/apache/sling/servlets/post/impl/info/SlingInfoProvider.java
- copied, changed from r643061, incubator/sling/trunk/sling/servlets-post/src/main/java/org/apache/sling/servlets/post/impl/info/UjaxInfoProvider.java
incubator/sling/trunk/sling/servlets-post/src/main/java/org/apache/sling/servlets/post/impl/info/SlingInfoServlet.java
- copied, changed from r643061, incubator/sling/trunk/sling/servlets-post/src/main/java/org/apache/sling/servlets/post/impl/info/UjaxInfoServlet.java
Removed:
incubator/sling/trunk/sling/servlets-post/src/main/java/org/apache/sling/servlets/post/impl/UjaxFileUploadHandler.java
incubator/sling/trunk/sling/servlets-post/src/main/java/org/apache/sling/servlets/post/impl/UjaxPostProcessor.java
incubator/sling/trunk/sling/servlets-post/src/main/java/org/apache/sling/servlets/post/impl/UjaxPostServlet.java
incubator/sling/trunk/sling/servlets-post/src/main/java/org/apache/sling/servlets/post/impl/UjaxPropertyValueHandler.java
incubator/sling/trunk/sling/servlets-post/src/main/java/org/apache/sling/servlets/post/impl/info/UjaxInfoProvider.java
incubator/sling/trunk/sling/servlets-post/src/main/java/org/apache/sling/servlets/post/impl/info/UjaxInfoServlet.java
Modified:
incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/GeneratedNodeNameTest.java
incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/HttpTestBase.java
incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/IncludeTest.java
incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/JsonRenderingTest.java
incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/JspScriptingTest.java
incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/NodetypeRenderingTest.java
incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/PostRedirectTest.java
incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/PropertyRenderingTest.java
incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/RedirectTest.java
incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ScriptBuiltinObjectsTest.java
incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/SlingResourceTypeRenderingTest.java
incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ValueFromTest.java
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/ujax/PostServletDeleteTest.java
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/ujax/UjaxAutoPropertiesTest.java
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/ujax/UjaxDefaultValuesTest.java
incubator/sling/trunk/sling/servlets-post/src/main/java/org/apache/sling/servlets/post/impl/RequestProperty.java
incubator/sling/trunk/sling/servlets-post/src/main/java/org/apache/sling/servlets/post/impl/info/SessionInfoProvider.java
Modified: incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/GeneratedNodeNameTest.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/GeneratedNodeNameTest.java?rev=643062&r1=643061&r2=643062&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/GeneratedNodeNameTest.java (original)
+++ incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/GeneratedNodeNameTest.java Mon Mar 31 10:01:44 2008
@@ -20,14 +20,14 @@
import java.util.HashMap;
import java.util.Map;
-import org.apache.sling.servlets.post.impl.UjaxPostServlet;
+import org.apache.sling.servlets.post.impl.SlingPostServlet;
/** Test the generation of node names for POST requests to URLS
* ending in / *
*/
public class GeneratedNodeNameTest extends HttpTestBase {
- private final String postUrl = HTTP_BASE_URL + "/" + getClass().getSimpleName() + "/" + System.currentTimeMillis() + UjaxPostServlet.DEFAULT_CREATE_SUFFIX;
+ private final String postUrl = HTTP_BASE_URL + "/" + getClass().getSimpleName() + "/" + System.currentTimeMillis() + SlingPostServlet.DEFAULT_CREATE_SUFFIX;
public void testTitle() throws IOException {
final Map<String,String> props = new HashMap<String,String>();
Modified: incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/HttpTestBase.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/HttpTestBase.java?rev=643062&r1=643061&r2=643062&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/HttpTestBase.java (original)
+++ incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/HttpTestBase.java Mon Mar 31 10:01:44 2008
@@ -39,7 +39,7 @@
import org.apache.commons.httpclient.methods.PostMethod;
import org.apache.sling.launchpad.webapp.integrationtest.helpers.HttpAnyMethod;
import org.apache.sling.launchpad.webapp.integrationtest.helpers.UslingIntegrationTestClient;
-import org.apache.sling.servlets.post.impl.UjaxPostServlet;
+import org.apache.sling.servlets.post.impl.SlingPostServlet;
import org.mozilla.javascript.Context;
import org.mozilla.javascript.ScriptableObject;
@@ -84,7 +84,7 @@
}
testText = "This is a test node " + System.currentTimeMillis();
properties.put("text", testText);
- nodeUrl = testClient.createNode(parentPath + UjaxPostServlet.DEFAULT_CREATE_SUFFIX, properties);
+ nodeUrl = testClient.createNode(parentPath + SlingPostServlet.DEFAULT_CREATE_SUFFIX, properties);
resourceType = properties.get(SLING_RESOURCE_TYPE);
scriptPath = "/apps/" + (resourceType == null ? "nt/unstructured" : resourceType);
testClient.mkdirs(WEBDAV_BASE_URL, scriptPath);
Modified: incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/IncludeTest.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/IncludeTest.java?rev=643062&r1=643061&r2=643062&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/IncludeTest.java (original)
+++ incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/IncludeTest.java Mon Mar 31 10:01:44 2008
@@ -26,7 +26,7 @@
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.httpclient.methods.GetMethod;
-import org.apache.sling.servlets.post.impl.UjaxPostServlet;
+import org.apache.sling.servlets.post.impl.SlingPostServlet;
/** Test the {link ScriptHelper#include) functionality */
public class IncludeTest extends HttpTestBase {
@@ -47,7 +47,7 @@
// Create the test nodes under a path that's specific to this class to
// allow collisions
- final String url = HTTP_BASE_URL + "/" + getClass().getSimpleName() + "/" + System.currentTimeMillis() + UjaxPostServlet.DEFAULT_CREATE_SUFFIX;
+ final String url = HTTP_BASE_URL + "/" + getClass().getSimpleName() + "/" + System.currentTimeMillis() + SlingPostServlet.DEFAULT_CREATE_SUFFIX;
final Map<String,String> props = new HashMap<String,String>();
// Create two test nodes and store their paths
Modified: incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/JsonRenderingTest.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/JsonRenderingTest.java?rev=643062&r1=643061&r2=643062&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/JsonRenderingTest.java (original)
+++ incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/JsonRenderingTest.java Mon Mar 31 10:01:44 2008
@@ -22,7 +22,7 @@
import javax.servlet.http.HttpServletResponse;
-import org.apache.sling.servlets.post.impl.UjaxPostServlet;
+import org.apache.sling.servlets.post.impl.SlingPostServlet;
/** Test creating Nodes and rendering them in JSON */
public class JsonRenderingTest extends HttpTestBase {
@@ -46,7 +46,7 @@
// allow collisions
postUrl = HTTP_BASE_URL + "/" + getClass().getSimpleName() + "_"
+ System.currentTimeMillis()
- + UjaxPostServlet.DEFAULT_CREATE_SUFFIX;
+ + SlingPostServlet.DEFAULT_CREATE_SUFFIX;
final Map<String, String> props = new HashMap<String, String>();
props.put("text", testText);
createdNodeUrl = testClient.createNode(postUrl, props);
Modified: incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/JspScriptingTest.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/JspScriptingTest.java?rev=643062&r1=643061&r2=643062&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/JspScriptingTest.java (original)
+++ incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/JspScriptingTest.java Mon Mar 31 10:01:44 2008
@@ -16,7 +16,7 @@
*/
package org.apache.sling.launchpad.webapp.integrationtest;
-import org.apache.sling.servlets.post.impl.UjaxPostServlet;
+import org.apache.sling.servlets.post.impl.SlingPostServlet;
/** Test JSP scripting
* TODO this class can be generalized to be used for any scripting language,
@@ -33,7 +33,7 @@
super.setUp();
final String testRootPath = HTTP_BASE_URL + "/" + getClass().getSimpleName() + "/" + System.currentTimeMillis();
- testRootUrl = testClient.createNode(testRootPath + UjaxPostServlet.DEFAULT_CREATE_SUFFIX, null);
+ testRootUrl = testClient.createNode(testRootPath + SlingPostServlet.DEFAULT_CREATE_SUFFIX, null);
rtNode = new TestNode(testRootPath + "/rt", null);
unstructuredNode = new TestNode(testRootPath + "/unstructured", null);
}
Modified: incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/NodetypeRenderingTest.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/NodetypeRenderingTest.java?rev=643062&r1=643061&r2=643062&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/NodetypeRenderingTest.java (original)
+++ incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/NodetypeRenderingTest.java Mon Mar 31 10:01:44 2008
@@ -20,7 +20,7 @@
import java.util.HashMap;
import java.util.Map;
-import org.apache.sling.servlets.post.impl.UjaxPostServlet;
+import org.apache.sling.servlets.post.impl.SlingPostServlet;
/** Test creating a Node and rendering it using scripts in
* various supported languages, using nodetype-based
@@ -39,7 +39,7 @@
// create the test node, under a path that's specific to this class to allow collisions
secondFolderOfContentPath = "" + System.currentTimeMillis();
- final String url = HTTP_BASE_URL + "/" + getClass().getSimpleName() + "/" + secondFolderOfContentPath + UjaxPostServlet.DEFAULT_CREATE_SUFFIX;
+ final String url = HTTP_BASE_URL + "/" + getClass().getSimpleName() + "/" + secondFolderOfContentPath + SlingPostServlet.DEFAULT_CREATE_SUFFIX;
final Map<String,String> props = new HashMap<String,String>();
props.put("text", testText);
displayUrl = testClient.createNode(url, props);
Modified: incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/PostRedirectTest.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/PostRedirectTest.java?rev=643062&r1=643061&r2=643062&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/PostRedirectTest.java (original)
+++ incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/PostRedirectTest.java Mon Mar 31 10:01:44 2008
@@ -20,7 +20,7 @@
import java.util.HashMap;
import java.util.Map;
-import org.apache.sling.servlets.post.impl.UjaxPostServlet;
+import org.apache.sling.servlets.post.impl.SlingPostServlet;
/** Test the various redirect options for POST, SLING-126 */
public class PostRedirectTest extends HttpTestBase {
@@ -28,7 +28,7 @@
private String postPath = "CreateNodeTest/" + System.currentTimeMillis();
private String postUrl = HTTP_BASE_URL + "/" + postPath
- + UjaxPostServlet.DEFAULT_CREATE_SUFFIX;
+ + SlingPostServlet.DEFAULT_CREATE_SUFFIX;
public void testForcedRedirect() throws IOException {
final Map<String, String> params = new HashMap<String, String>();
Modified: incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/PropertyRenderingTest.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/PropertyRenderingTest.java?rev=643062&r1=643061&r2=643062&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/PropertyRenderingTest.java (original)
+++ incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/PropertyRenderingTest.java Mon Mar 31 10:01:44 2008
@@ -20,7 +20,7 @@
import java.util.HashMap;
import java.util.Map;
-import org.apache.sling.servlets.post.impl.UjaxPostServlet;
+import org.apache.sling.servlets.post.impl.SlingPostServlet;
/** Test the rendering of JCR Properties, directly addressed by URLs.
* See SLING-133
@@ -38,7 +38,7 @@
slingResourceType = getClass().getName();
// create the test node, under a path that's specific to this class to allow collisions
- final String url = HTTP_BASE_URL + "/" + getClass().getSimpleName() + "/" + System.currentTimeMillis() + UjaxPostServlet.DEFAULT_CREATE_SUFFIX;
+ final String url = HTTP_BASE_URL + "/" + getClass().getSimpleName() + "/" + System.currentTimeMillis() + SlingPostServlet.DEFAULT_CREATE_SUFFIX;
final Map<String,String> props = new HashMap<String,String>();
props.put("sling:resourceType", slingResourceType);
props.put("text", testText);
Modified: incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/RedirectTest.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/RedirectTest.java?rev=643062&r1=643061&r2=643062&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/RedirectTest.java (original)
+++ incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/RedirectTest.java Mon Mar 31 10:01:44 2008
@@ -23,7 +23,7 @@
import org.apache.commons.httpclient.methods.GetMethod;
import org.apache.sling.commons.json.JSONException;
import org.apache.sling.commons.json.JSONObject;
-import org.apache.sling.servlets.post.impl.UjaxPostServlet;
+import org.apache.sling.servlets.post.impl.SlingPostServlet;
/** Test creating Nodes and rendering them in JSON */
public class RedirectTest extends HttpTestBase {
@@ -38,7 +38,7 @@
// allow collisions
postUrl = HTTP_BASE_URL + "/" + getClass().getSimpleName() + "_"
+ System.currentTimeMillis()
- + UjaxPostServlet.DEFAULT_CREATE_SUFFIX;
+ + SlingPostServlet.DEFAULT_CREATE_SUFFIX;
}
/** test 302 response with existing sling:target */
Modified: incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ScriptBuiltinObjectsTest.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ScriptBuiltinObjectsTest.java?rev=643062&r1=643061&r2=643062&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ScriptBuiltinObjectsTest.java (original)
+++ incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ScriptBuiltinObjectsTest.java Mon Mar 31 10:01:44 2008
@@ -4,7 +4,7 @@
import java.util.HashMap;
import java.util.Map;
-import org.apache.sling.servlets.post.impl.UjaxPostServlet;
+import org.apache.sling.servlets.post.impl.SlingPostServlet;
public class ScriptBuiltinObjectsTest extends RenderingTestBase {
@@ -19,7 +19,7 @@
testText = "This is a test " + System.currentTimeMillis();
// create the test node, under a path that's specific to this class to allow collisions
- final String url = HTTP_BASE_URL + "/" + getClass().getSimpleName() + "/" + System.currentTimeMillis() + UjaxPostServlet.DEFAULT_CREATE_SUFFIX;
+ final String url = HTTP_BASE_URL + "/" + getClass().getSimpleName() + "/" + System.currentTimeMillis() + SlingPostServlet.DEFAULT_CREATE_SUFFIX;
final Map<String,String> props = new HashMap<String,String>();
props.put("sling:resourceType", slingResourceType);
props.put("text", testText);
Modified: incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/SlingResourceTypeRenderingTest.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/SlingResourceTypeRenderingTest.java?rev=643062&r1=643061&r2=643062&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/SlingResourceTypeRenderingTest.java (original)
+++ incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/SlingResourceTypeRenderingTest.java Mon Mar 31 10:01:44 2008
@@ -20,7 +20,7 @@
import java.util.HashMap;
import java.util.Map;
-import org.apache.sling.servlets.post.impl.UjaxPostServlet;
+import org.apache.sling.servlets.post.impl.SlingPostServlet;
/** Test creating a Node and rendering it using scripts in
* various supported languages, using slingResourceType-based
@@ -41,7 +41,7 @@
// create the test node, under a path that's specific to this class to allow collisions
secondFolderOfContentPath = "" + System.currentTimeMillis();
- final String url = HTTP_BASE_URL + "/" + getClass().getSimpleName() + "/" + secondFolderOfContentPath + UjaxPostServlet.DEFAULT_CREATE_SUFFIX;
+ final String url = HTTP_BASE_URL + "/" + getClass().getSimpleName() + "/" + secondFolderOfContentPath + SlingPostServlet.DEFAULT_CREATE_SUFFIX;
final Map<String,String> props = new HashMap<String,String>();
props.put("sling:resourceType", slingResourceType);
props.put("text", testText);
Modified: incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ValueFromTest.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ValueFromTest.java?rev=643062&r1=643061&r2=643062&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ValueFromTest.java (original)
+++ incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ValueFromTest.java Mon Mar 31 10:01:44 2008
@@ -20,7 +20,7 @@
import java.util.HashMap;
import java.util.Map;
-import org.apache.sling.servlets.post.impl.UjaxPostServlet;
+import org.apache.sling.servlets.post.impl.SlingPostServlet;
/** Test the @ValueFrom field name suffix, SLING-130 */
public class ValueFromTest extends HttpTestBase {
@@ -36,7 +36,7 @@
testText = "This is a test " + System.currentTimeMillis();
// create the test node, under a path that's specific to this class to allow collisions
- postUrl = HTTP_BASE_URL + "/" + getClass().getSimpleName() + "/" + System.currentTimeMillis() + UjaxPostServlet.DEFAULT_CREATE_SUFFIX;
+ postUrl = HTTP_BASE_URL + "/" + getClass().getSimpleName() + "/" + System.currentTimeMillis() + SlingPostServlet.DEFAULT_CREATE_SUFFIX;
final Map<String,String> props = new HashMap<String,String>();
props.put("text", testText);
}
Modified: 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/ujax/PostServletCreateTest.java?rev=643062&r1=643061&r2=643062&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/ujax/PostServletCreateTest.java Mon Mar 31 10:01:44 2008
@@ -23,7 +23,7 @@
import javax.servlet.http.HttpServletResponse;
import org.apache.sling.launchpad.webapp.integrationtest.HttpTestBase;
-import org.apache.sling.servlets.post.impl.UjaxPostServlet;
+import org.apache.sling.servlets.post.impl.SlingPostServlet;
/** Test node creation via the MicrojaxPostServlet */
public class PostServletCreateTest extends HttpTestBase {
@@ -42,7 +42,7 @@
}
public void testCreateNode() throws IOException {
- final String location = testClient.createNode(postUrl + UjaxPostServlet.DEFAULT_CREATE_SUFFIX, null);
+ final String location = testClient.createNode(postUrl + SlingPostServlet.DEFAULT_CREATE_SUFFIX, null);
assertHttpStatus(location, HttpServletResponse.SC_OK,
"POST must redirect to created resource (" + location + ")");
assertTrue("Node (" + location + ") must have generated name",
@@ -52,7 +52,7 @@
}
public void testCreateNodeWithExtension() throws IOException {
- final String location = testClient.createNode(postUrl + UjaxPostServlet.DEFAULT_CREATE_SUFFIX + ".html", null);
+ final String location = testClient.createNode(postUrl + SlingPostServlet.DEFAULT_CREATE_SUFFIX + ".html", null);
assertHttpStatus(location, HttpServletResponse.SC_OK,
"POST must redirect to created resource (" + location + ")");
assertTrue("Node (" + location + ") must have generated name",
@@ -86,7 +86,7 @@
props.put("a","123");
props.put("b","456");
props.put("c","some words");
- final String createdNodeUrl = testClient.createNode(postUrl + UjaxPostServlet.DEFAULT_CREATE_SUFFIX, props);
+ final String createdNodeUrl = testClient.createNode(postUrl + SlingPostServlet.DEFAULT_CREATE_SUFFIX, props);
final String content = getContent(createdNodeUrl + ".json", CONTENT_TYPE_JSON);
assertJavascript("123456", content, "out.println(data.a + data.b)");
assertJavascript("some words", content, "out.println(data.c)");
@@ -98,7 +98,7 @@
props.put("a","123");
props.put("subnode/b","456");
props.put("c","some words");
- final String createdNodeUrl = testClient.createNode(postUrl + UjaxPostServlet.DEFAULT_CREATE_SUFFIX, props);
+ final String createdNodeUrl = testClient.createNode(postUrl + SlingPostServlet.DEFAULT_CREATE_SUFFIX, props);
final String content = getContent(createdNodeUrl + ".2.json", CONTENT_TYPE_JSON);
assertJavascript("123", content, "out.println(data.a)");
assertJavascript("456", content, "out.println(data.subnode.b)");
@@ -113,7 +113,7 @@
props.put("./a","123");
props.put("./b","456");
props.put("c","not saved");
- final String createdNodeUrl = testClient.createNode(postUrl + UjaxPostServlet.DEFAULT_CREATE_SUFFIX, props);
+ final String createdNodeUrl = testClient.createNode(postUrl + SlingPostServlet.DEFAULT_CREATE_SUFFIX, props);
final String content = getContent(createdNodeUrl + ".json", CONTENT_TYPE_JSON);
assertJavascript("123456", content, "out.println(data.a + data.b)");
assertJavascript("undefined", content, "out.println(typeof data.c)");
@@ -128,7 +128,7 @@
props.put("STUFF_b","456");
props.put("c","not saved");
props.put("ujax:saveParamPrefix","STUFF_");
- final String createdNodeUrl = testClient.createNode(postUrl + UjaxPostServlet.DEFAULT_CREATE_SUFFIX, props,null,false);
+ final String createdNodeUrl = testClient.createNode(postUrl + SlingPostServlet.DEFAULT_CREATE_SUFFIX, props,null,false);
final String content = getContent(createdNodeUrl + ".json", CONTENT_TYPE_JSON);
assertJavascript("123456", content, "out.println(data.a + data.b)");
assertJavascript("undefined", content, "out.println(typeof data.c)");
@@ -142,7 +142,7 @@
props.put("++b","456");
props.put("c","not saved");
props.put("ujax:saveParamPrefix","++");
- final String createdNodeUrl = testClient.createNode(postUrl + UjaxPostServlet.DEFAULT_CREATE_SUFFIX, props,null,false);
+ final String createdNodeUrl = testClient.createNode(postUrl + SlingPostServlet.DEFAULT_CREATE_SUFFIX, props,null,false);
final String content = getContent(createdNodeUrl + ".json", CONTENT_TYPE_JSON);
assertJavascript("123456", content, "out.println(data.a + data.b)");
assertJavascript("undefined", content, "out.println(typeof data.c)");
Modified: 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/ujax/PostServletDeleteTest.java?rev=643062&r1=643061&r2=643062&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/ujax/PostServletDeleteTest.java Mon Mar 31 10:01:44 2008
@@ -24,7 +24,7 @@
import org.apache.commons.httpclient.NameValuePair;
import org.apache.sling.launchpad.webapp.integrationtest.HttpTestBase;
-import org.apache.sling.servlets.post.impl.UjaxPostServlet;
+import org.apache.sling.servlets.post.impl.SlingPostServlet;
/** Test node deletion via the MicrojaxPostServlet */
public class PostServletDeleteTest extends HttpTestBase {
@@ -41,9 +41,9 @@
}
public void testDelete() throws IOException {
- final String urlA = testClient.createNode(postUrl + UjaxPostServlet.DEFAULT_CREATE_SUFFIX, null);
- final String urlB = testClient.createNode(postUrl + UjaxPostServlet.DEFAULT_CREATE_SUFFIX, null);
- final String urlC = testClient.createNode(postUrl + UjaxPostServlet.DEFAULT_CREATE_SUFFIX, null);
+ final String urlA = testClient.createNode(postUrl + SlingPostServlet.DEFAULT_CREATE_SUFFIX, null);
+ final String urlB = testClient.createNode(postUrl + SlingPostServlet.DEFAULT_CREATE_SUFFIX, null);
+ final String urlC = testClient.createNode(postUrl + SlingPostServlet.DEFAULT_CREATE_SUFFIX, null);
final String urlD = testClient.createNode(postUrl + "/specific-location/for-delete", null);
// initially all nodes must be found
Modified: 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/ujax/PostServletUpdateTest.java?rev=643062&r1=643061&r2=643062&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/ujax/PostServletUpdateTest.java Mon Mar 31 10:01:44 2008
@@ -23,7 +23,7 @@
import javax.servlet.http.HttpServletResponse;
import org.apache.sling.launchpad.webapp.integrationtest.HttpTestBase;
-import org.apache.sling.servlets.post.impl.UjaxPostServlet;
+import org.apache.sling.servlets.post.impl.SlingPostServlet;
/** Test node updates via the MicrojaxPostServlet */
public class PostServletUpdateTest extends HttpTestBase {
@@ -46,7 +46,7 @@
props.put("./a","123");
props.put("./b","456");
- final String location = testClient.createNode(postUrl + UjaxPostServlet.DEFAULT_CREATE_SUFFIX, props);
+ final String location = testClient.createNode(postUrl + SlingPostServlet.DEFAULT_CREATE_SUFFIX, props);
String content = getContent(location + ".json", CONTENT_TYPE_JSON);
assertJavascript("123456", content, "out.println(data.a + data.b)");
@@ -64,7 +64,7 @@
props.put("./a","123");
props.put("./b","456");
- final String location = testClient.createNode(postUrl + UjaxPostServlet.DEFAULT_CREATE_SUFFIX, props);
+ final String location = testClient.createNode(postUrl + SlingPostServlet.DEFAULT_CREATE_SUFFIX, props);
String content = getContent(location + ".json", CONTENT_TYPE_JSON);
assertJavascript("123456", content, "out.println(data.a + data.b)");
@@ -83,7 +83,7 @@
props.put("./b","456");
props.put("C","not stored");
- final String location = testClient.createNode(postUrl + UjaxPostServlet.DEFAULT_CREATE_SUFFIX, props);
+ final String location = testClient.createNode(postUrl + SlingPostServlet.DEFAULT_CREATE_SUFFIX, props);
String content = getContent(location + ".json", CONTENT_TYPE_JSON);
assertJavascript("123456", content, "out.println(data.a + data.b)");
Modified: 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/ujax/UjaxAutoPropertiesTest.java?rev=643062&r1=643061&r2=643062&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/ujax/UjaxAutoPropertiesTest.java Mon Mar 31 10:01:44 2008
@@ -23,7 +23,7 @@
import javax.servlet.http.HttpServletResponse;
import org.apache.sling.launchpad.webapp.integrationtest.HttpTestBase;
-import org.apache.sling.servlets.post.impl.UjaxPostServlet;
+import org.apache.sling.servlets.post.impl.SlingPostServlet;
/** {#link MicrojaxPropertyValueSetter} sets the value of some properties
* automatically if they are empty. This is tested here with various cases.
@@ -54,7 +54,7 @@
props.put("lastModified","");
props.put("lastModifiedBy","");
- final String createdNodeUrl = testClient.createNode(postUrl + UjaxPostServlet.DEFAULT_CREATE_SUFFIX, props);
+ final String createdNodeUrl = testClient.createNode(postUrl + SlingPostServlet.DEFAULT_CREATE_SUFFIX, props);
String content = getContent(createdNodeUrl + ".json", CONTENT_TYPE_JSON);
assertJavascript("123", content, "out.println(data.a)");
@@ -91,7 +91,7 @@
props.put("lastModified","c");
props.put("lastModifiedBy","d");
- final String createdNodeUrl = testClient.createNode(postUrl + UjaxPostServlet.DEFAULT_CREATE_SUFFIX, props);
+ final String createdNodeUrl = testClient.createNode(postUrl + SlingPostServlet.DEFAULT_CREATE_SUFFIX, props);
final String content = getContent(createdNodeUrl + ".json", CONTENT_TYPE_JSON);
assertJavascript("123", content, "out.println(data.a)");
Modified: 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/ujax/UjaxDateValuesTest.java?rev=643062&r1=643061&r2=643062&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/ujax/UjaxDateValuesTest.java Mon Mar 31 10:01:44 2008
@@ -24,7 +24,7 @@
import java.util.Map;
import org.apache.sling.launchpad.webapp.integrationtest.HttpTestBase;
-import org.apache.sling.servlets.post.impl.UjaxPostServlet;
+import org.apache.sling.servlets.post.impl.SlingPostServlet;
/**
* checks if the date parsing for non jcr-dates works.
@@ -58,7 +58,7 @@
props.put("someDate", input);
props.put("someDate@TypeHint", "Date");
- final String createdNodeUrl = testClient.createNode(postUrl + UjaxPostServlet.DEFAULT_CREATE_SUFFIX, props);
+ final String createdNodeUrl = testClient.createNode(postUrl + SlingPostServlet.DEFAULT_CREATE_SUFFIX, props);
String content = getContent(createdNodeUrl + ".json", CONTENT_TYPE_JSON);
// default behaviour writes empty string
Modified: 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/ujax/UjaxDefaultValuesTest.java?rev=643062&r1=643061&r2=643062&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/ujax/UjaxDefaultValuesTest.java Mon Mar 31 10:01:44 2008
@@ -21,7 +21,7 @@
import java.util.Map;
import org.apache.sling.launchpad.webapp.integrationtest.HttpTestBase;
-import org.apache.sling.servlets.post.impl.UjaxPostServlet;
+import org.apache.sling.servlets.post.impl.SlingPostServlet;
/** {#link UjaxPropertyValueSetter} sets the value of some properties
* with default values if they are empty. This is tested here with various cases.
@@ -42,7 +42,7 @@
final Map<String, String> props = new HashMap<String, String>();
props.put("a","");
- final String createdNodeUrl = testClient.createNode(postUrl + UjaxPostServlet.DEFAULT_CREATE_SUFFIX, props);
+ final String createdNodeUrl = testClient.createNode(postUrl + SlingPostServlet.DEFAULT_CREATE_SUFFIX, props);
String content = getContent(createdNodeUrl + ".json", CONTENT_TYPE_JSON);
// default behaviour writes empty string
@@ -68,7 +68,7 @@
props.put("a","");
props.put("a@DefaultValue","123");
- final String createdNodeUrl = testClient.createNode(postUrl + UjaxPostServlet.DEFAULT_CREATE_SUFFIX, props);
+ final String createdNodeUrl = testClient.createNode(postUrl + SlingPostServlet.DEFAULT_CREATE_SUFFIX, props);
final String content = getContent(createdNodeUrl + ".json", CONTENT_TYPE_JSON);
assertJavascript("123", content, "out.println(data.a)");
@@ -79,7 +79,7 @@
props.put("a","");
props.put("a@DefaultValue","ujax:ignore");
- final String createdNodeUrl = testClient.createNode(postUrl + UjaxPostServlet.DEFAULT_CREATE_SUFFIX, props);
+ final String createdNodeUrl = testClient.createNode(postUrl + SlingPostServlet.DEFAULT_CREATE_SUFFIX, props);
final String content = getContent(createdNodeUrl + ".json", CONTENT_TYPE_JSON);
assertJavascript("undefined", content, "out.println(typeof(data.a))");
@@ -89,7 +89,7 @@
final Map <String, String> props = new HashMap <String, String> ();
props.put("a","123");
- final String createdNodeUrl = testClient.createNode(postUrl + UjaxPostServlet.DEFAULT_CREATE_SUFFIX, props);
+ final String createdNodeUrl = testClient.createNode(postUrl + SlingPostServlet.DEFAULT_CREATE_SUFFIX, props);
String content = getContent(createdNodeUrl + ".json", CONTENT_TYPE_JSON);
assertJavascript("123", content, "out.println(data.a)");
Modified: incubator/sling/trunk/sling/servlets-post/src/main/java/org/apache/sling/servlets/post/impl/RequestProperty.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/sling/servlets-post/src/main/java/org/apache/sling/servlets/post/impl/RequestProperty.java?rev=643062&r1=643061&r2=643062&view=diff
==============================================================================
--- incubator/sling/trunk/sling/servlets-post/src/main/java/org/apache/sling/servlets/post/impl/RequestProperty.java (original)
+++ incubator/sling/trunk/sling/servlets-post/src/main/java/org/apache/sling/servlets/post/impl/RequestProperty.java Mon Mar 31 10:01:44 2008
@@ -26,9 +26,9 @@
private static final RequestParameter[] EMPTY_PARAM_ARRAY = new RequestParameter[0];
- public static final String DEFAULT_IGNORE = UjaxPostServlet.RP_PREFIX + "ignore";
+ public static final String DEFAULT_IGNORE = SlingPostServlet.RP_PREFIX + "ignore";
- public static final String DEFAULT_NULL = UjaxPostServlet.RP_PREFIX + "null";
+ public static final String DEFAULT_NULL = SlingPostServlet.RP_PREFIX + "null";
private final String path;
Copied: incubator/sling/trunk/sling/servlets-post/src/main/java/org/apache/sling/servlets/post/impl/SlingFileUploadHandler.java (from r643061, incubator/sling/trunk/sling/servlets-post/src/main/java/org/apache/sling/servlets/post/impl/UjaxFileUploadHandler.java)
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/sling/servlets-post/src/main/java/org/apache/sling/servlets/post/impl/SlingFileUploadHandler.java?p2=incubator/sling/trunk/sling/servlets-post/src/main/java/org/apache/sling/servlets/post/impl/SlingFileUploadHandler.java&p1=incubator/sling/trunk/sling/servlets-post/src/main/java/org/apache/sling/servlets/post/impl/UjaxFileUploadHandler.java&r1=643061&r2=643062&rev=643062&view=diff
==============================================================================
--- incubator/sling/trunk/sling/servlets-post/src/main/java/org/apache/sling/servlets/post/impl/UjaxFileUploadHandler.java (original)
+++ incubator/sling/trunk/sling/servlets-post/src/main/java/org/apache/sling/servlets/post/impl/SlingFileUploadHandler.java Mon Mar 31 10:01:44 2008
@@ -68,7 +68,7 @@
*
* @version $Rev$, $Date$
*/
-public class UjaxFileUploadHandler {
+public class SlingFileUploadHandler {
/**
* The CVS/SVN id
@@ -91,7 +91,7 @@
/**
* the post processor
*/
- private final UjaxPostProcessor ctx;
+ private final SlingPostProcessor ctx;
/**
* The servlet context.
@@ -102,7 +102,7 @@
* Constructs file upload handler
* @param ctx the post processor
*/
- public UjaxFileUploadHandler(UjaxPostProcessor ctx, ServletContext servletCtx) {
+ public SlingFileUploadHandler(SlingPostProcessor ctx, ServletContext servletCtx) {
this.ctx = ctx;
this.servletContext = servletCtx;
}
Copied: incubator/sling/trunk/sling/servlets-post/src/main/java/org/apache/sling/servlets/post/impl/SlingPostProcessor.java (from r643061, incubator/sling/trunk/sling/servlets-post/src/main/java/org/apache/sling/servlets/post/impl/UjaxPostProcessor.java)
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/sling/servlets-post/src/main/java/org/apache/sling/servlets/post/impl/SlingPostProcessor.java?p2=incubator/sling/trunk/sling/servlets-post/src/main/java/org/apache/sling/servlets/post/impl/SlingPostProcessor.java&p1=incubator/sling/trunk/sling/servlets-post/src/main/java/org/apache/sling/servlets/post/impl/UjaxPostProcessor.java&r1=643061&r2=643062&rev=643062&view=diff
==============================================================================
--- incubator/sling/trunk/sling/servlets-post/src/main/java/org/apache/sling/servlets/post/impl/UjaxPostProcessor.java (original)
+++ incubator/sling/trunk/sling/servlets-post/src/main/java/org/apache/sling/servlets/post/impl/SlingPostProcessor.java Mon Mar 31 10:01:44 2008
@@ -40,12 +40,12 @@
* Holds various states and encapsulates methods that are needed to handle a
* ujax post request.
*/
-public class UjaxPostProcessor {
+public class SlingPostProcessor {
/**
* default log
*/
- private static final Logger log = LoggerFactory.getLogger(UjaxPostProcessor.class);
+ private static final Logger log = LoggerFactory.getLogger(SlingPostProcessor.class);
public static final String ORDER_FIRST = "first";
public static final String ORDER_BEFORE = "before ";
@@ -55,12 +55,12 @@
/**
* handler that deals with properties
*/
- private final UjaxPropertyValueHandler propHandler;
+ private final SlingPropertyValueHandler propHandler;
/**
* handler that deals with file upload
*/
- private final UjaxFileUploadHandler uploadHandler;
+ private final SlingFileUploadHandler uploadHandler;
/**
* utility class for generating node names
@@ -108,7 +108,7 @@
* @param dateParser helper for parsing date strings
* @param servletContext The ServletContext to use for file upload
*/
- public UjaxPostProcessor(SlingHttpServletRequest request, Session session,
+ public SlingPostProcessor(SlingHttpServletRequest request, Session session,
NodeNameGenerator nodeNameGenerator,
DateParser dateParser,
ServletContext servletContext) {
@@ -150,9 +150,9 @@
}
// and check whether it is a create request (trailing /*)
- if (suffix.endsWith(UjaxPostServlet.DEFAULT_CREATE_SUFFIX)) {
+ if (suffix.endsWith(SlingPostServlet.DEFAULT_CREATE_SUFFIX)) {
suffix = suffix.substring(0, suffix.length()
- - UjaxPostServlet.DEFAULT_CREATE_SUFFIX.length());
+ - SlingPostServlet.DEFAULT_CREATE_SUFFIX.length());
htmlResponse.setCreateRequest(true);
}
@@ -164,8 +164,8 @@
this.rootPath = rootPathBuf.toString();
this.nodeNameGenerator = nodeNameGenerator;
this.dateParser = dateParser;
- propHandler = new UjaxPropertyValueHandler(this);
- uploadHandler = new UjaxFileUploadHandler(this, servletContext);
+ propHandler = new SlingPropertyValueHandler(this);
+ uploadHandler = new SlingFileUploadHandler(this, servletContext);
}
/**
@@ -196,7 +196,7 @@
ret.append(request.getResourceResolver().map(path));
// append optional extension
- String ext = request.getParameter(UjaxPostServlet.RP_DISPLAY_EXTENSION);
+ String ext = request.getParameter(SlingPostServlet.RP_DISPLAY_EXTENSION);
if (ext != null && ext.length() > 0) {
if (ext.charAt(0) != '.') {
ret.append('.');
@@ -295,7 +295,7 @@
* @throws RepositoryException if a repository error occurs
*/
private void processDeletes() throws RepositoryException {
- final String [] paths = request.getParameterValues(UjaxPostServlet.RP_DELETE_PATH);
+ final String [] paths = request.getParameterValues(SlingPostServlet.RP_DELETE_PATH);
if (paths != null) {
for (String path : paths) {
if (!path.equals("")) {
@@ -327,10 +327,10 @@
*/
private void processMoves() throws RepositoryException,
IllegalArgumentException {
- final String [] moveSrc = request.getParameterValues(UjaxPostServlet.RP_MOVE_SRC);
- final String [] moveDest = request.getParameterValues(UjaxPostServlet.RP_MOVE_DEST);
- final String flags = request.getParameter(UjaxPostServlet.RP_MOVE_FLAGS);
- final boolean isReplace = flags != null && flags.contains(UjaxPostServlet.MOVE_FLAG_REPLACE);
+ final String [] moveSrc = request.getParameterValues(SlingPostServlet.RP_MOVE_SRC);
+ final String [] moveDest = request.getParameterValues(SlingPostServlet.RP_MOVE_DEST);
+ final String flags = request.getParameter(SlingPostServlet.RP_MOVE_FLAGS);
+ final boolean isReplace = flags != null && flags.contains(SlingPostServlet.MOVE_FLAG_REPLACE);
if (moveSrc == null || moveDest == null) {
return;
@@ -464,15 +464,15 @@
final String paramName = e.getKey();
// do not store parameters with names starting with ujax:
- if(paramName.startsWith(UjaxPostServlet.RP_PREFIX)) {
+ if(paramName.startsWith(SlingPostServlet.RP_PREFIX)) {
continue;
}
// ignore field with a '@TypeHint' suffix. this is dealt with later
- if (paramName.endsWith(UjaxPostServlet.TYPE_HINT_SUFFIX)) {
+ if (paramName.endsWith(SlingPostServlet.TYPE_HINT_SUFFIX)) {
continue;
}
// ignore field with a '@DefaultValue' suffix. this is dealt with later
- if (paramName.endsWith(UjaxPostServlet.DEFAULT_VALUE_SUFFIX)) {
+ if (paramName.endsWith(SlingPostServlet.DEFAULT_VALUE_SUFFIX)) {
continue;
}
// SLING-298: skip FormEncoding parameter
@@ -490,7 +490,7 @@
// SLING-130: VALUE_FROM_SUFFIX means take the value of this
// property from a different field
RequestParameter[] values = e.getValue();
- final int vfIndex = propertyName.indexOf(UjaxPostServlet.VALUE_FROM_SUFFIX);
+ final int vfIndex = propertyName.indexOf(SlingPostServlet.VALUE_FROM_SUFFIX);
if (vfIndex >= 0) {
// @ValueFrom example:
// <input name="./Text@ValueFrom" type="hidden" value="fulltext" />
@@ -519,14 +519,14 @@
// <input type="text" name="./age" />
// <input type="hidden" name="./age@TypeHint" value="long" />
// causes the setProperty using the 'long' property type
- final String thName = getSavePrefix() + propertyName + UjaxPostServlet.TYPE_HINT_SUFFIX;
+ final String thName = getSavePrefix() + propertyName + SlingPostServlet.TYPE_HINT_SUFFIX;
final RequestParameter rp = request.getRequestParameter(thName);
if (rp != null) {
prop.setTypeHint(rp.getString());
}
// @DefaultValue
- final String dvName = getSavePrefix() + propertyName + UjaxPostServlet.DEFAULT_VALUE_SUFFIX;
+ final String dvName = getSavePrefix() + propertyName + SlingPostServlet.DEFAULT_VALUE_SUFFIX;
prop.setDefaultValues(request.getRequestParameters(dvName));
reqProperties.put(propPath, prop);
@@ -613,9 +613,9 @@
*/
public String getSavePrefix() {
if (savePrefix == null) {
- savePrefix = request.getParameter(UjaxPostServlet.RP_SAVE_PARAM_PREFIX);
+ savePrefix = request.getParameter(SlingPostServlet.RP_SAVE_PARAM_PREFIX);
if (savePrefix == null) {
- savePrefix = UjaxPostServlet.DEFAULT_SAVE_PARAM_PREFIX;
+ savePrefix = SlingPostServlet.DEFAULT_SAVE_PARAM_PREFIX;
}
if (savePrefix.length() > 0) {
String prefix = "";
@@ -633,7 +633,7 @@
}
private void processOrder() throws RepositoryException {
- final String orderCode = request.getParameter(UjaxPostServlet.RP_ORDER);
+ final String orderCode = request.getParameter(SlingPostServlet.RP_ORDER);
if (orderCode!=null) {
final Node n = deepGetOrCreateNode(htmlResponse.getPath());
orderNode(n, orderCode);
Copied: incubator/sling/trunk/sling/servlets-post/src/main/java/org/apache/sling/servlets/post/impl/SlingPostServlet.java (from r643061, incubator/sling/trunk/sling/servlets-post/src/main/java/org/apache/sling/servlets/post/impl/UjaxPostServlet.java)
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/sling/servlets-post/src/main/java/org/apache/sling/servlets/post/impl/SlingPostServlet.java?p2=incubator/sling/trunk/sling/servlets-post/src/main/java/org/apache/sling/servlets/post/impl/SlingPostServlet.java&p1=incubator/sling/trunk/sling/servlets-post/src/main/java/org/apache/sling/servlets/post/impl/UjaxPostServlet.java&r1=643061&r2=643062&rev=643062&view=diff
==============================================================================
--- incubator/sling/trunk/sling/servlets-post/src/main/java/org/apache/sling/servlets/post/impl/UjaxPostServlet.java (original)
+++ incubator/sling/trunk/sling/servlets-post/src/main/java/org/apache/sling/servlets/post/impl/SlingPostServlet.java Mon Mar 31 10:01:44 2008
@@ -56,14 +56,14 @@
* name="sling.servlet.methods"
* value="POST"
*/
-public class UjaxPostServlet extends SlingAllMethodsServlet {
+public class SlingPostServlet extends SlingAllMethodsServlet {
private static final long serialVersionUID = 1837674988291697074L;
/**
* default log
*/
- private static final Logger log = LoggerFactory.getLogger(UjaxPostServlet.class);
+ private static final Logger log = LoggerFactory.getLogger(SlingPostServlet.class);
/**
* Prefix for parameter names which control this POST
@@ -171,7 +171,7 @@
throws ServletException, IOException {
// create a post processor and process changes
- UjaxPostProcessor p = createPostProcessor(request);
+ SlingPostProcessor p = createPostProcessor(request);
p.run();
HtmlResponse resp = p.getHtmlResponse();
@@ -192,7 +192,7 @@
* @throws ServletException if no session can be aquired or if there is a
* repository error.
*/
- private UjaxPostProcessor createPostProcessor(SlingHttpServletRequest request)
+ private SlingPostProcessor createPostProcessor(SlingHttpServletRequest request)
throws ServletException {
Session s = request.getResourceResolver().adaptTo(Session.class);
if (s == null) {
@@ -200,7 +200,7 @@
}
// create the post context
- return new UjaxPostProcessor(request, s, nodeNameGenerator, dateParser, this.getServletContext());
+ return new SlingPostProcessor(request, s, nodeNameGenerator, dateParser, this.getServletContext());
}
/**
Copied: incubator/sling/trunk/sling/servlets-post/src/main/java/org/apache/sling/servlets/post/impl/SlingPropertyValueHandler.java (from r643061, incubator/sling/trunk/sling/servlets-post/src/main/java/org/apache/sling/servlets/post/impl/UjaxPropertyValueHandler.java)
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/sling/servlets-post/src/main/java/org/apache/sling/servlets/post/impl/SlingPropertyValueHandler.java?p2=incubator/sling/trunk/sling/servlets-post/src/main/java/org/apache/sling/servlets/post/impl/SlingPropertyValueHandler.java&p1=incubator/sling/trunk/sling/servlets-post/src/main/java/org/apache/sling/servlets/post/impl/UjaxPropertyValueHandler.java&r1=643061&r2=643062&rev=643062&view=diff
==============================================================================
--- incubator/sling/trunk/sling/servlets-post/src/main/java/org/apache/sling/servlets/post/impl/UjaxPropertyValueHandler.java (original)
+++ incubator/sling/trunk/sling/servlets-post/src/main/java/org/apache/sling/servlets/post/impl/SlingPropertyValueHandler.java Mon Mar 31 10:01:44 2008
@@ -34,7 +34,7 @@
* value. For example, "lastModified" with an empty value is stored as the
* current Date.
*/
-class UjaxPropertyValueHandler {
+class SlingPropertyValueHandler {
/**
* Defins a map of auto properties
@@ -54,7 +54,7 @@
/**
* the post processor
*/
- private final UjaxPostProcessor ctx;
+ private final SlingPostProcessor ctx;
/**
* current date for all properties in this request
@@ -65,7 +65,7 @@
* Constructs a propert value handler
* @param ctx the post processor
*/
- public UjaxPropertyValueHandler(UjaxPostProcessor ctx) {
+ public SlingPropertyValueHandler(SlingPostProcessor ctx) {
this.ctx = ctx;
}
Modified: incubator/sling/trunk/sling/servlets-post/src/main/java/org/apache/sling/servlets/post/impl/info/SessionInfoProvider.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/sling/servlets-post/src/main/java/org/apache/sling/servlets/post/impl/info/SessionInfoProvider.java?rev=643062&r1=643061&r2=643062&view=diff
==============================================================================
--- incubator/sling/trunk/sling/servlets-post/src/main/java/org/apache/sling/servlets/post/impl/info/SessionInfoProvider.java (original)
+++ incubator/sling/trunk/sling/servlets-post/src/main/java/org/apache/sling/servlets/post/impl/info/SessionInfoProvider.java Mon Mar 31 10:01:44 2008
@@ -25,7 +25,7 @@
import org.apache.sling.api.SlingHttpServletRequest;
-public class SessionInfoProvider implements UjaxInfoProvider {
+public class SessionInfoProvider implements SlingInfoProvider {
static final String PROVIDER_LABEL = "sessionInfo";
Copied: incubator/sling/trunk/sling/servlets-post/src/main/java/org/apache/sling/servlets/post/impl/info/SlingInfoProvider.java (from r643061, incubator/sling/trunk/sling/servlets-post/src/main/java/org/apache/sling/servlets/post/impl/info/UjaxInfoProvider.java)
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/sling/servlets-post/src/main/java/org/apache/sling/servlets/post/impl/info/SlingInfoProvider.java?p2=incubator/sling/trunk/sling/servlets-post/src/main/java/org/apache/sling/servlets/post/impl/info/SlingInfoProvider.java&p1=incubator/sling/trunk/sling/servlets-post/src/main/java/org/apache/sling/servlets/post/impl/info/UjaxInfoProvider.java&r1=643061&r2=643062&rev=643062&view=diff
==============================================================================
--- incubator/sling/trunk/sling/servlets-post/src/main/java/org/apache/sling/servlets/post/impl/info/UjaxInfoProvider.java (original)
+++ incubator/sling/trunk/sling/servlets-post/src/main/java/org/apache/sling/servlets/post/impl/info/SlingInfoProvider.java Mon Mar 31 10:01:44 2008
@@ -22,7 +22,7 @@
import org.apache.sling.api.SlingHttpServletRequest;
-public interface UjaxInfoProvider {
+public interface SlingInfoProvider {
Map<String, String> getInfo(SlingHttpServletRequest request);
Copied: incubator/sling/trunk/sling/servlets-post/src/main/java/org/apache/sling/servlets/post/impl/info/SlingInfoServlet.java (from r643061, incubator/sling/trunk/sling/servlets-post/src/main/java/org/apache/sling/servlets/post/impl/info/UjaxInfoServlet.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?p2=incubator/sling/trunk/sling/servlets-post/src/main/java/org/apache/sling/servlets/post/impl/info/SlingInfoServlet.java&p1=incubator/sling/trunk/sling/servlets-post/src/main/java/org/apache/sling/servlets/post/impl/info/UjaxInfoServlet.java&r1=643061&r2=643062&rev=643062&view=diff
==============================================================================
--- incubator/sling/trunk/sling/servlets-post/src/main/java/org/apache/sling/servlets/post/impl/info/UjaxInfoServlet.java (original)
+++ incubator/sling/trunk/sling/servlets-post/src/main/java/org/apache/sling/servlets/post/impl/info/SlingInfoServlet.java Mon Mar 31 10:01:44 2008
@@ -42,9 +42,9 @@
* @scr.property name="service.vendor" value="The Apache Software Foundation"
* @scr.property name="sling.servlet.paths" value="/ujax"
*/
-public class UjaxInfoServlet extends SlingSafeMethodsServlet {
+public class SlingInfoServlet extends SlingSafeMethodsServlet {
- private Map<String, UjaxInfoProvider> infoProviders = new HashMap<String, UjaxInfoProvider>();
+ private Map<String, SlingInfoProvider> infoProviders = new HashMap<String, SlingInfoProvider>();
@Override
protected void doGet(SlingHttpServletRequest request,
@@ -54,7 +54,7 @@
if (request.getRequestPathInfo().getSelectors().length > 0) {
String label = request.getRequestPathInfo().getSelectors()[0];
- UjaxInfoProvider uip = infoProviders.get(label);
+ SlingInfoProvider uip = infoProviders.get(label);
if (uip != null) {
data = uip.getInfo(request);
}