You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by bd...@apache.org on 2008/01/21 14:46:23 UTC
svn commit: r613888 - in /incubator/sling/trunk/launchpad:
launchpad-servlets/
launchpad-servlets/src/main/java/org/apache/sling/launchpad/
launchpad-servlets/src/main/java/org/apache/sling/launchpad/renderers/
launchpad-servlets/src/main/java/org/apac...
Author: bdelacretaz
Date: Mon Jan 21 05:46:20 2008
New Revision: 613888
URL: http://svn.apache.org/viewvc?rev=613888&view=rev
Log:
SLING-149 - renaming microsling to Sling Launchpad
Added:
incubator/sling/trunk/launchpad/launchpad-servlets/src/main/java/org/apache/sling/launchpad/
incubator/sling/trunk/launchpad/launchpad-servlets/src/main/java/org/apache/sling/launchpad/renderers/
incubator/sling/trunk/launchpad/launchpad-servlets/src/main/java/org/apache/sling/launchpad/renderers/DefaultHtmlRenderer.java
- copied, changed from r613869, incubator/sling/trunk/launchpad/launchpad-servlets/src/main/java/org/apache/sling/usling/renderers/DefaultHtmlRenderer.java
incubator/sling/trunk/launchpad/launchpad-servlets/src/main/java/org/apache/sling/launchpad/renderers/DefaultHtmlRendererServlet.java
- copied, changed from r613869, incubator/sling/trunk/launchpad/launchpad-servlets/src/main/java/org/apache/sling/usling/renderers/DefaultHtmlRendererServlet.java
incubator/sling/trunk/launchpad/launchpad-servlets/src/main/java/org/apache/sling/launchpad/renderers/JsonItemWriter.java
- copied, changed from r613869, incubator/sling/trunk/launchpad/launchpad-servlets/src/main/java/org/apache/sling/usling/renderers/JsonItemWriter.java
incubator/sling/trunk/launchpad/launchpad-servlets/src/main/java/org/apache/sling/launchpad/renderers/JsonRendererServlet.java
- copied, changed from r613869, incubator/sling/trunk/launchpad/launchpad-servlets/src/main/java/org/apache/sling/usling/renderers/JsonRendererServlet.java
incubator/sling/trunk/launchpad/launchpad-servlets/src/main/java/org/apache/sling/launchpad/renderers/PlainTextRendererServlet.java
- copied, changed from r613869, incubator/sling/trunk/launchpad/launchpad-servlets/src/main/java/org/apache/sling/usling/renderers/PlainTextRendererServlet.java
incubator/sling/trunk/launchpad/launchpad-servlets/src/main/java/org/apache/sling/launchpad/servlets/
incubator/sling/trunk/launchpad/launchpad-servlets/src/main/java/org/apache/sling/launchpad/servlets/LaunchpadDefaultServlet.java (with props)
incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/
- copied from r613869, incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/usling/
Removed:
incubator/sling/trunk/launchpad/launchpad-servlets/src/main/java/org/apache/sling/usling/renderers/DefaultHtmlRenderer.java
incubator/sling/trunk/launchpad/launchpad-servlets/src/main/java/org/apache/sling/usling/renderers/DefaultHtmlRendererServlet.java
incubator/sling/trunk/launchpad/launchpad-servlets/src/main/java/org/apache/sling/usling/renderers/JsonItemWriter.java
incubator/sling/trunk/launchpad/launchpad-servlets/src/main/java/org/apache/sling/usling/renderers/JsonRendererServlet.java
incubator/sling/trunk/launchpad/launchpad-servlets/src/main/java/org/apache/sling/usling/renderers/PlainTextRendererServlet.java
incubator/sling/trunk/launchpad/launchpad-servlets/src/main/java/org/apache/sling/usling/servlets/UslingDefaultServlet.java
incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/usling/
Modified:
incubator/sling/trunk/launchpad/launchpad-servlets/pom.xml
incubator/sling/trunk/launchpad/launchpad-webapp/README.txt
incubator/sling/trunk/launchpad/launchpad-webapp/pom.xml
incubator/sling/trunk/launchpad/launchpad-webapp/src/main/webapp/WEB-INF/sling_install.properties
incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/CreateNodeTest.java
incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/FileUploadTest.java
incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/GeneratedNodeNameTest.java
incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/GetWithSuffixTest.java
incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/HttpPingTest.java
incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/IncludeTest.java
incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/JsonRenderingTest.java
incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/MkdirTest.java
incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/NodetypeRenderingTest.java
incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/PostParameterTest.java
incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/PostRedirectTest.java
incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/PropertyRenderingTest.java
incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/RenderingTestBase.java
incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ScriptBuiltinObjectsTest.java
incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/SlingResourceTypeRenderingTest.java
incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/StaticContentTest.java
incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/StreamServletTest.java
incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/SyntheticResourceTest.java
incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/UploadFileTest.java
incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/UslingHttpTestBase.java
incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ValueFromTest.java
incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/helpers/HttpAnyMethod.java
incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/helpers/UslingIntegrationTestClient.java
incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ujax/PostServletCreateTest.java
incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ujax/PostServletDeleteTest.java
incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ujax/PostServletOrderTest.java
incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ujax/PostServletUpdateTest.java
incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ujax/UjaxAutoPropertiesTest.java
incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ujax/UjaxSessionInfoTest.java
Modified: incubator/sling/trunk/launchpad/launchpad-servlets/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/launchpad-servlets/pom.xml?rev=613888&r1=613887&r2=613888&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/launchpad-servlets/pom.xml (original)
+++ incubator/sling/trunk/launchpad/launchpad-servlets/pom.xml Mon Jan 21 05:46:20 2008
@@ -54,8 +54,8 @@
<configuration>
<instructions>
<Private-Package>
- org.apache.sling.usling.servlets.*,
- org.apache.sling.usling.renderers.*,
+ org.apache.sling.launchpad.servlets.*,
+ org.apache.sling.launchpad.renderers.*,
org.apache.sling.ujax.*
</Private-Package>
</instructions>
Copied: incubator/sling/trunk/launchpad/launchpad-servlets/src/main/java/org/apache/sling/launchpad/renderers/DefaultHtmlRenderer.java (from r613869, incubator/sling/trunk/launchpad/launchpad-servlets/src/main/java/org/apache/sling/usling/renderers/DefaultHtmlRenderer.java)
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/launchpad-servlets/src/main/java/org/apache/sling/launchpad/renderers/DefaultHtmlRenderer.java?p2=incubator/sling/trunk/launchpad/launchpad-servlets/src/main/java/org/apache/sling/launchpad/renderers/DefaultHtmlRenderer.java&p1=incubator/sling/trunk/launchpad/launchpad-servlets/src/main/java/org/apache/sling/usling/renderers/DefaultHtmlRenderer.java&r1=613869&r2=613888&rev=613888&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/launchpad-servlets/src/main/java/org/apache/sling/usling/renderers/DefaultHtmlRenderer.java (original)
+++ incubator/sling/trunk/launchpad/launchpad-servlets/src/main/java/org/apache/sling/launchpad/renderers/DefaultHtmlRenderer.java Mon Jan 21 05:46:20 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.usling.renderers;
+package org.apache.sling.launchpad.renderers;
import java.io.PrintWriter;
Copied: incubator/sling/trunk/launchpad/launchpad-servlets/src/main/java/org/apache/sling/launchpad/renderers/DefaultHtmlRendererServlet.java (from r613869, incubator/sling/trunk/launchpad/launchpad-servlets/src/main/java/org/apache/sling/usling/renderers/DefaultHtmlRendererServlet.java)
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/launchpad-servlets/src/main/java/org/apache/sling/launchpad/renderers/DefaultHtmlRendererServlet.java?p2=incubator/sling/trunk/launchpad/launchpad-servlets/src/main/java/org/apache/sling/launchpad/renderers/DefaultHtmlRendererServlet.java&p1=incubator/sling/trunk/launchpad/launchpad-servlets/src/main/java/org/apache/sling/usling/renderers/DefaultHtmlRendererServlet.java&r1=613869&r2=613888&rev=613888&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/launchpad-servlets/src/main/java/org/apache/sling/usling/renderers/DefaultHtmlRendererServlet.java (original)
+++ incubator/sling/trunk/launchpad/launchpad-servlets/src/main/java/org/apache/sling/launchpad/renderers/DefaultHtmlRendererServlet.java Mon Jan 21 05:46:20 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.usling.renderers;
+package org.apache.sling.launchpad.renderers;
import java.io.IOException;
import java.io.PrintWriter;
Copied: incubator/sling/trunk/launchpad/launchpad-servlets/src/main/java/org/apache/sling/launchpad/renderers/JsonItemWriter.java (from r613869, incubator/sling/trunk/launchpad/launchpad-servlets/src/main/java/org/apache/sling/usling/renderers/JsonItemWriter.java)
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/launchpad-servlets/src/main/java/org/apache/sling/launchpad/renderers/JsonItemWriter.java?p2=incubator/sling/trunk/launchpad/launchpad-servlets/src/main/java/org/apache/sling/launchpad/renderers/JsonItemWriter.java&p1=incubator/sling/trunk/launchpad/launchpad-servlets/src/main/java/org/apache/sling/usling/renderers/JsonItemWriter.java&r1=613869&r2=613888&rev=613888&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/launchpad-servlets/src/main/java/org/apache/sling/usling/renderers/JsonItemWriter.java (original)
+++ incubator/sling/trunk/launchpad/launchpad-servlets/src/main/java/org/apache/sling/launchpad/renderers/JsonItemWriter.java Mon Jan 21 05:46:20 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.usling.renderers;
+package org.apache.sling.launchpad.renderers;
import java.io.Writer;
import java.text.DateFormat;
Copied: incubator/sling/trunk/launchpad/launchpad-servlets/src/main/java/org/apache/sling/launchpad/renderers/JsonRendererServlet.java (from r613869, incubator/sling/trunk/launchpad/launchpad-servlets/src/main/java/org/apache/sling/usling/renderers/JsonRendererServlet.java)
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/launchpad-servlets/src/main/java/org/apache/sling/launchpad/renderers/JsonRendererServlet.java?p2=incubator/sling/trunk/launchpad/launchpad-servlets/src/main/java/org/apache/sling/launchpad/renderers/JsonRendererServlet.java&p1=incubator/sling/trunk/launchpad/launchpad-servlets/src/main/java/org/apache/sling/usling/renderers/JsonRendererServlet.java&r1=613869&r2=613888&rev=613888&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/launchpad-servlets/src/main/java/org/apache/sling/usling/renderers/JsonRendererServlet.java (original)
+++ incubator/sling/trunk/launchpad/launchpad-servlets/src/main/java/org/apache/sling/launchpad/renderers/JsonRendererServlet.java Mon Jan 21 05:46:20 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.usling.renderers;
+package org.apache.sling.launchpad.renderers;
import java.io.IOException;
Copied: incubator/sling/trunk/launchpad/launchpad-servlets/src/main/java/org/apache/sling/launchpad/renderers/PlainTextRendererServlet.java (from r613869, incubator/sling/trunk/launchpad/launchpad-servlets/src/main/java/org/apache/sling/usling/renderers/PlainTextRendererServlet.java)
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/launchpad-servlets/src/main/java/org/apache/sling/launchpad/renderers/PlainTextRendererServlet.java?p2=incubator/sling/trunk/launchpad/launchpad-servlets/src/main/java/org/apache/sling/launchpad/renderers/PlainTextRendererServlet.java&p1=incubator/sling/trunk/launchpad/launchpad-servlets/src/main/java/org/apache/sling/usling/renderers/PlainTextRendererServlet.java&r1=613869&r2=613888&rev=613888&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/launchpad-servlets/src/main/java/org/apache/sling/usling/renderers/PlainTextRendererServlet.java (original)
+++ incubator/sling/trunk/launchpad/launchpad-servlets/src/main/java/org/apache/sling/launchpad/renderers/PlainTextRendererServlet.java Mon Jan 21 05:46:20 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.usling.renderers;
+package org.apache.sling.launchpad.renderers;
import java.io.IOException;
import java.io.PrintWriter;
Added: incubator/sling/trunk/launchpad/launchpad-servlets/src/main/java/org/apache/sling/launchpad/servlets/LaunchpadDefaultServlet.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/launchpad-servlets/src/main/java/org/apache/sling/launchpad/servlets/LaunchpadDefaultServlet.java?rev=613888&view=auto
==============================================================================
--- incubator/sling/trunk/launchpad/launchpad-servlets/src/main/java/org/apache/sling/launchpad/servlets/LaunchpadDefaultServlet.java (added)
+++ incubator/sling/trunk/launchpad/launchpad-servlets/src/main/java/org/apache/sling/launchpad/servlets/LaunchpadDefaultServlet.java Mon Jan 21 05:46:20 2008
@@ -0,0 +1,122 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.sling.launchpad.servlets;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.servlet.Servlet;
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.sling.api.SlingHttpServletRequest;
+import org.apache.sling.api.SlingHttpServletResponse;
+import org.apache.sling.api.resource.NonExistingResource;
+import org.apache.sling.api.resource.Resource;
+import org.apache.sling.api.servlets.SlingAllMethodsServlet;
+import org.apache.sling.launchpad.renderers.DefaultHtmlRendererServlet;
+import org.apache.sling.launchpad.renderers.JsonRendererServlet;
+import org.apache.sling.launchpad.renderers.PlainTextRendererServlet;
+import org.apache.sling.ujax.UjaxPostServlet;
+
+/**
+ * Replaces the Sling default servlet (that bundle must NOT be
+ * active) for the Launchpad, by delegating to our default
+ * renderers for GET requests, and to the ujax POST servlet
+ * for POST requests.
+ *
+ * @scr.service
+ * interface="javax.servlet.Servlet"
+ *
+ * @scr.component
+ * immediate="true"
+ * metatype="false"
+ *
+ * @scr.property
+ * name="service.description"
+ * value="Launchpad Default Servlet"
+ *
+ * @scr.property
+ * name="service.vendor"
+ * value="The Apache Software Foundation"
+ *
+ * Use this as the default servlet for Sling
+ * @scr.property
+ * name="sling.core.resourceTypes"
+ * value="sling.core.servlet.default"
+ *
+ */
+public class LaunchpadDefaultServlet extends SlingAllMethodsServlet {
+
+ private Servlet postServlet;
+ private Servlet defaultGetServlet;
+ private Map<String, Servlet> getServlets;
+
+ @Override
+ public void init(ServletConfig config) throws ServletException {
+
+ super.init(config);
+
+ // setup our "internal" servlets
+ postServlet = new UjaxPostServlet();
+ postServlet.init(config);
+
+ defaultGetServlet = new PlainTextRendererServlet("text/plain");
+
+ getServlets = new HashMap<String, Servlet>();
+ getServlets.put("html", new DefaultHtmlRendererServlet("text/html"));
+ getServlets.put("json", new JsonRendererServlet("application/json"));
+ getServlets.put("txt", defaultGetServlet);
+ }
+
+ protected void doGet(SlingHttpServletRequest request, SlingHttpServletResponse response) throws IOException, ServletException {
+ final Resource resource = request.getResource();
+
+ // cannot handle the request for missing resources
+ if (resource instanceof NonExistingResource) {
+ response.sendError(HttpServletResponse.SC_NOT_FOUND,"Resource not found at path " + resource.getPath());
+ return;
+ }
+
+ // use default renderer servlet if no extension, else lookup our getServlets
+ Servlet s = defaultGetServlet;
+ final String ext = request.getRequestPathInfo().getExtension();
+ if(ext!=null && ext.length() > 0) {
+ s = getServlets.get(ext);
+ }
+
+ // render using s, or fail
+ if(s==null) {
+ response.sendError(
+ HttpServletResponse.SC_INTERNAL_SERVER_ERROR,
+ "No default renderer found for extension='" + ext + "'"
+ );
+ } else {
+ s.service(request, response);
+ }
+ }
+
+
+ protected void doPost(SlingHttpServletRequest request, SlingHttpServletResponse response)
+ throws ServletException,IOException {
+ postServlet.service(request, response);
+ }
+}
Propchange: incubator/sling/trunk/launchpad/launchpad-servlets/src/main/java/org/apache/sling/launchpad/servlets/LaunchpadDefaultServlet.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/sling/trunk/launchpad/launchpad-servlets/src/main/java/org/apache/sling/launchpad/servlets/LaunchpadDefaultServlet.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Modified: incubator/sling/trunk/launchpad/launchpad-webapp/README.txt
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/launchpad-webapp/README.txt?rev=613888&r1=613887&r2=613888&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/launchpad-webapp/README.txt (original)
+++ incubator/sling/trunk/launchpad/launchpad-webapp/README.txt Mon Jan 21 05:46:20 2008
@@ -1,4 +1,4 @@
-This webapp contains the necessary bundles to run usling.
+This webapp contains the necessary bundles to run launchpad.
How to run this
---------------
@@ -8,38 +8,31 @@
cd <top of the Sling source code tree>
mvn clean install
-2) Build the usling servlets
+2) Build the launchpad servlets
- cd usling/usling-servlets
+ cd launchpad/launchpad-servlets
mvn clean install
cd -
3) Build and run this
- cd usling
+ cd launchpad/launchpad-webapp
mvn clean package jetty:run
Once the webapp starts, http://localhost:8080/sling should display the Sling
web console.
-KNOWN PROBLEM: The org.apache.sling.jcr.jackrabbit.server bundle currently does not
-create the Jackrabbit repository at startup. If you get an error message saying
-
- "No Repository available to SlingAuthenticator, cannot authenticate".
-
-Try stopping and restarting the "Sling - Jackrabbit Embedded Repository" bundle
-from the http://localhost:8080/sling/list page. When restarting, the log at
- sling/logs/error.log should indicate that the repository is being created.
-
4) Test node creation and display
To create a node with curl:
curl -D - -Ftitle=something http://admin:admin@localhost:8080/testing/this
-
Then, http://admin:admin@localhost:8080/testing/this should display a default HTML
representation, including the value of the "title" property.
Add a txt or json extension to see other output formats.
+
+We hope to have a "Getting started with the Launchpad" document on the Sling website
+(http://incubator.apache.org/sling/) soon - but it's not there yet.
Modified: incubator/sling/trunk/launchpad/launchpad-webapp/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/launchpad-webapp/pom.xml?rev=613888&r1=613887&r2=613888&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/launchpad-webapp/pom.xml (original)
+++ incubator/sling/trunk/launchpad/launchpad-webapp/pom.xml Mon Jan 21 05:46:20 2008
@@ -58,7 +58,7 @@
<!--
Defines which tests are for the "integration-testing" phase
-->
- <integration.test.code.path>**/usling/webapp/integrationtest</integration.test.code.path>
+ <integration.test.code.path>**/launchpad/webapp/integrationtest</integration.test.code.path>
<!--
Set this to true to stop mvn once the integration test Jetty instance is
Modified: incubator/sling/trunk/launchpad/launchpad-webapp/src/main/webapp/WEB-INF/sling_install.properties
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/launchpad-webapp/src/main/webapp/WEB-INF/sling_install.properties?rev=613888&r1=613887&r2=613888&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/launchpad-webapp/src/main/webapp/WEB-INF/sling_install.properties (original)
+++ incubator/sling/trunk/launchpad/launchpad-webapp/src/main/webapp/WEB-INF/sling_install.properties Mon Jan 21 05:46:20 2008
@@ -18,7 +18,7 @@
#
# This file overrides the (empty) one provided by sling-app, and lists
-# the bundles to install by default for usling
+# the bundles to install by default for this application
#
# Property values may contain references to other properties using the standard
# ${<prop-name>} syntax.
Modified: incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/CreateNodeTest.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/CreateNodeTest.java?rev=613888&r1=613869&r2=613888&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/CreateNodeTest.java (original)
+++ incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/CreateNodeTest.java Mon Jan 21 05:46:20 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.usling.webapp.integrationtest;
+package org.apache.sling.launchpad.webapp.integrationtest;
import java.io.IOException;
import java.util.HashMap;
Modified: incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/FileUploadTest.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/FileUploadTest.java?rev=613888&r1=613869&r2=613888&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/FileUploadTest.java (original)
+++ incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/FileUploadTest.java Mon Jan 21 05:46:20 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.usling.webapp.integrationtest;
+package org.apache.sling.launchpad.webapp.integrationtest;
import java.io.IOException;
import java.io.InputStream;
Modified: incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/GeneratedNodeNameTest.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/GeneratedNodeNameTest.java?rev=613888&r1=613869&r2=613888&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/GeneratedNodeNameTest.java (original)
+++ incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/GeneratedNodeNameTest.java Mon Jan 21 05:46:20 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.usling.webapp.integrationtest;
+package org.apache.sling.launchpad.webapp.integrationtest;
import java.io.IOException;
import java.util.HashMap;
Modified: incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/GetWithSuffixTest.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/GetWithSuffixTest.java?rev=613888&r1=613869&r2=613888&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/GetWithSuffixTest.java (original)
+++ incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/GetWithSuffixTest.java Mon Jan 21 05:46:20 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.usling.webapp.integrationtest;
+package org.apache.sling.launchpad.webapp.integrationtest;
import java.io.IOException;
import java.util.HashMap;
Modified: incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/HttpPingTest.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/HttpPingTest.java?rev=613888&r1=613869&r2=613888&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/HttpPingTest.java (original)
+++ incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/HttpPingTest.java Mon Jan 21 05:46:20 2008
@@ -14,10 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.usling.webapp.integrationtest;
+package org.apache.sling.launchpad.webapp.integrationtest;
-/** Ping the usling server to verify that our integration test
+/** Ping the Sling server to verify that our integration test
* setup is ok.
*/
public class HttpPingTest extends UslingHttpTestBase {
Modified: incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/IncludeTest.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/IncludeTest.java?rev=613888&r1=613869&r2=613888&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/IncludeTest.java (original)
+++ incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/IncludeTest.java Mon Jan 21 05:46:20 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.usling.webapp.integrationtest;
+package org.apache.sling.launchpad.webapp.integrationtest;
import java.io.IOException;
import java.net.URL;
Modified: incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/JsonRenderingTest.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/JsonRenderingTest.java?rev=613888&r1=613869&r2=613888&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/JsonRenderingTest.java (original)
+++ incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/JsonRenderingTest.java Mon Jan 21 05:46:20 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.usling.webapp.integrationtest;
+package org.apache.sling.launchpad.webapp.integrationtest;
import java.io.IOException;
import java.util.HashMap;
Modified: incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/MkdirTest.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/MkdirTest.java?rev=613888&r1=613869&r2=613888&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/MkdirTest.java (original)
+++ incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/MkdirTest.java Mon Jan 21 05:46:20 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.usling.webapp.integrationtest;
+package org.apache.sling.launchpad.webapp.integrationtest;
import java.io.IOException;
Modified: incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/NodetypeRenderingTest.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/NodetypeRenderingTest.java?rev=613888&r1=613869&r2=613888&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/NodetypeRenderingTest.java (original)
+++ incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/NodetypeRenderingTest.java Mon Jan 21 05:46:20 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.usling.webapp.integrationtest;
+package org.apache.sling.launchpad.webapp.integrationtest;
import java.io.IOException;
import java.util.HashMap;
Modified: incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/PostParameterTest.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/PostParameterTest.java?rev=613888&r1=613869&r2=613888&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/PostParameterTest.java (original)
+++ incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/PostParameterTest.java Mon Jan 21 05:46:20 2008
@@ -1,17 +1,13 @@
-package org.apache.sling.usling.webapp.integrationtest;
+package org.apache.sling.launchpad.webapp.integrationtest;
-import org.apache.commons.httpclient.methods.PostMethod;
-import org.apache.commons.httpclient.methods.MultipartPostMethod;
-import org.apache.commons.httpclient.NameValuePair;
-
-import javax.servlet.http.HttpServletResponse;
-import java.util.Map;
-import java.util.HashMap;
-import java.io.IOException;
-import java.io.File;
-import java.io.FileInputStream;
import java.io.BufferedWriter;
+import java.io.File;
import java.io.FileWriter;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.commons.httpclient.methods.MultipartPostMethod;
/**
* Check if multipart post request are handled well
Modified: incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/PostRedirectTest.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/PostRedirectTest.java?rev=613888&r1=613869&r2=613888&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/PostRedirectTest.java (original)
+++ incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/PostRedirectTest.java Mon Jan 21 05:46:20 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.usling.webapp.integrationtest;
+package org.apache.sling.launchpad.webapp.integrationtest;
import java.io.IOException;
import java.util.HashMap;
Modified: incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/PropertyRenderingTest.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/PropertyRenderingTest.java?rev=613888&r1=613869&r2=613888&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/PropertyRenderingTest.java (original)
+++ incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/PropertyRenderingTest.java Mon Jan 21 05:46:20 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.usling.webapp.integrationtest;
+package org.apache.sling.launchpad.webapp.integrationtest;
import java.io.IOException;
import java.util.HashMap;
Modified: incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/RenderingTestBase.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/RenderingTestBase.java?rev=613888&r1=613869&r2=613888&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/RenderingTestBase.java (original)
+++ incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/RenderingTestBase.java Mon Jan 21 05:46:20 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.usling.webapp.integrationtest;
+package org.apache.sling.launchpad.webapp.integrationtest;
import java.io.IOException;
Modified: incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ScriptBuiltinObjectsTest.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ScriptBuiltinObjectsTest.java?rev=613888&r1=613869&r2=613888&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ScriptBuiltinObjectsTest.java (original)
+++ incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ScriptBuiltinObjectsTest.java Mon Jan 21 05:46:20 2008
@@ -1,4 +1,4 @@
-package org.apache.sling.usling.webapp.integrationtest;
+package org.apache.sling.launchpad.webapp.integrationtest;
import java.io.IOException;
import java.util.HashMap;
Modified: incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/SlingResourceTypeRenderingTest.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/SlingResourceTypeRenderingTest.java?rev=613888&r1=613869&r2=613888&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/SlingResourceTypeRenderingTest.java (original)
+++ incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/SlingResourceTypeRenderingTest.java Mon Jan 21 05:46:20 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.usling.webapp.integrationtest;
+package org.apache.sling.launchpad.webapp.integrationtest;
import java.io.IOException;
import java.util.HashMap;
Modified: incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/StaticContentTest.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/StaticContentTest.java?rev=613888&r1=613869&r2=613888&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/StaticContentTest.java (original)
+++ incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/StaticContentTest.java Mon Jan 21 05:46:20 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.usling.webapp.integrationtest;
+package org.apache.sling.launchpad.webapp.integrationtest;
import java.io.IOException;
@@ -27,7 +27,7 @@
}
public void TODO_FAILS_testContentTypeCss() throws IOException {
- getContent(HTTP_BASE_URL + "/usling.css", CONTENT_TYPE_CSS);
+ getContent(HTTP_BASE_URL + "/launchpad.css", CONTENT_TYPE_CSS);
}
public void TODO_FAILS_testContentTypeJs() throws IOException {
Modified: incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/StreamServletTest.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/StreamServletTest.java?rev=613888&r1=613869&r2=613888&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/StreamServletTest.java (original)
+++ incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/StreamServletTest.java Mon Jan 21 05:46:20 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.usling.webapp.integrationtest;
+package org.apache.sling.launchpad.webapp.integrationtest;
/** Test the StreamServlet by reading an uploaded file with a GET
Modified: incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/SyntheticResourceTest.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/SyntheticResourceTest.java?rev=613888&r1=613869&r2=613888&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/SyntheticResourceTest.java (original)
+++ incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/SyntheticResourceTest.java Mon Jan 21 05:46:20 2008
@@ -16,11 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.usling.webapp.integrationtest;
+package org.apache.sling.launchpad.webapp.integrationtest;
import java.io.IOException;
-
-import org.apache.sling.jcr.resource.SyntheticResource;
/** Test the SLING-129 {@link SyntheticResources}, by requesting
* non-existent Nodes that match the "configured" path
Modified: incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/UploadFileTest.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/UploadFileTest.java?rev=613888&r1=613869&r2=613888&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/UploadFileTest.java (original)
+++ incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/UploadFileTest.java Mon Jan 21 05:46:20 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.usling.webapp.integrationtest;
+package org.apache.sling.launchpad.webapp.integrationtest;
import java.io.File;
import java.io.IOException;
Modified: incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/UslingHttpTestBase.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/UslingHttpTestBase.java?rev=613888&r1=613869&r2=613888&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/UslingHttpTestBase.java (original)
+++ incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/UslingHttpTestBase.java Mon Jan 21 05:46:20 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.usling.webapp.integrationtest;
+package org.apache.sling.launchpad.webapp.integrationtest;
import java.io.IOException;
import java.io.InputStream;
@@ -39,18 +39,18 @@
import org.apache.commons.httpclient.auth.AuthScope;
import org.apache.commons.httpclient.methods.GetMethod;
import org.apache.commons.httpclient.methods.PostMethod;
-import org.apache.sling.usling.webapp.integrationtest.helpers.HttpAnyMethod;
-import org.apache.sling.usling.webapp.integrationtest.helpers.UslingIntegrationTestClient;
+import org.apache.sling.launchpad.webapp.integrationtest.helpers.HttpAnyMethod;
+import org.apache.sling.launchpad.webapp.integrationtest.helpers.UslingIntegrationTestClient;
import org.mozilla.javascript.Context;
import org.mozilla.javascript.ScriptableObject;
-/** Base class for HTTP-based usling integration tests */
+/** Base class for HTTP-based Sling Launchpad integration tests */
public class UslingHttpTestBase extends TestCase {
public static final String HTTP_BASE_URL = System.getProperty("launchpad.http.server.url");
public static final String WEBDAV_BASE_URL = System.getProperty("launchpad.webdav.server.url");
/** base path for test files */
- public static final String TEST_PATH = "/usling-integration-tests";
+ public static final String TEST_PATH = "/launchpad-integration-tests";
public static final String CONTENT_TYPE_HTML = "text/html";
public static final String CONTENT_TYPE_XML = "text/xml";
Modified: incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ValueFromTest.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ValueFromTest.java?rev=613888&r1=613869&r2=613888&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ValueFromTest.java (original)
+++ incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ValueFromTest.java Mon Jan 21 05:46:20 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.usling.webapp.integrationtest;
+package org.apache.sling.launchpad.webapp.integrationtest;
import java.io.IOException;
import java.util.HashMap;
Modified: incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/helpers/HttpAnyMethod.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/helpers/HttpAnyMethod.java?rev=613888&r1=613869&r2=613888&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/helpers/HttpAnyMethod.java (original)
+++ incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/helpers/HttpAnyMethod.java Mon Jan 21 05:46:20 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.usling.webapp.integrationtest.helpers;
+package org.apache.sling.launchpad.webapp.integrationtest.helpers;
import org.apache.commons.httpclient.HttpMethodBase;
Modified: incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/helpers/UslingIntegrationTestClient.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/helpers/UslingIntegrationTestClient.java?rev=613888&r1=613869&r2=613888&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/helpers/UslingIntegrationTestClient.java (original)
+++ incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/helpers/UslingIntegrationTestClient.java Mon Jan 21 05:46:20 2008
@@ -14,11 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.usling.webapp.integrationtest.helpers;
+package org.apache.sling.launchpad.webapp.integrationtest.helpers;
+import java.io.File;
import java.io.IOException;
import java.io.InputStream;
-import java.io.File;
import java.util.Map;
import org.apache.commons.httpclient.HttpClient;
@@ -27,11 +27,11 @@
import org.apache.commons.httpclient.methods.InputStreamRequestEntity;
import org.apache.commons.httpclient.methods.PostMethod;
import org.apache.commons.httpclient.methods.PutMethod;
+import org.apache.commons.httpclient.methods.multipart.FilePart;
import org.apache.commons.httpclient.methods.multipart.MultipartRequestEntity;
import org.apache.commons.httpclient.methods.multipart.Part;
import org.apache.commons.httpclient.methods.multipart.StringPart;
-import org.apache.commons.httpclient.methods.multipart.FilePart;
-import org.apache.sling.usling.webapp.integrationtest.UslingHttpTestBase;
+import org.apache.sling.launchpad.webapp.integrationtest.UslingHttpTestBase;
/** Client functions to interact with microsling in integration tests */
public class UslingIntegrationTestClient {
Modified: incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ujax/PostServletCreateTest.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ujax/PostServletCreateTest.java?rev=613888&r1=613869&r2=613888&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ujax/PostServletCreateTest.java (original)
+++ incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ujax/PostServletCreateTest.java Mon Jan 21 05:46:20 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.usling.webapp.integrationtest.ujax;
+package org.apache.sling.launchpad.webapp.integrationtest.ujax;
import java.io.IOException;
import java.util.HashMap;
@@ -22,7 +22,7 @@
import javax.servlet.http.HttpServletResponse;
-import org.apache.sling.usling.webapp.integrationtest.UslingHttpTestBase;
+import org.apache.sling.launchpad.webapp.integrationtest.UslingHttpTestBase;
/** Test node creation via the MicrojaxPostServlet */
public class PostServletCreateTest extends UslingHttpTestBase {
Modified: incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ujax/PostServletDeleteTest.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ujax/PostServletDeleteTest.java?rev=613888&r1=613869&r2=613888&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ujax/PostServletDeleteTest.java (original)
+++ incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ujax/PostServletDeleteTest.java Mon Jan 21 05:46:20 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.usling.webapp.integrationtest.ujax;
+package org.apache.sling.launchpad.webapp.integrationtest.ujax;
import java.io.IOException;
import java.util.LinkedList;
@@ -23,7 +23,7 @@
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.httpclient.NameValuePair;
-import org.apache.sling.usling.webapp.integrationtest.UslingHttpTestBase;
+import org.apache.sling.launchpad.webapp.integrationtest.UslingHttpTestBase;
/** Test node deletion via the MicrojaxPostServlet */
public class PostServletDeleteTest extends UslingHttpTestBase {
Modified: incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ujax/PostServletOrderTest.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ujax/PostServletOrderTest.java?rev=613888&r1=613869&r2=613888&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ujax/PostServletOrderTest.java (original)
+++ incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ujax/PostServletOrderTest.java Mon Jan 21 05:46:20 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.usling.webapp.integrationtest.ujax;
+package org.apache.sling.launchpad.webapp.integrationtest.ujax;
import java.io.IOException;
import java.util.HashMap;
@@ -22,7 +22,7 @@
import javax.servlet.http.HttpServletResponse;
-import org.apache.sling.usling.webapp.integrationtest.UslingHttpTestBase;
+import org.apache.sling.launchpad.webapp.integrationtest.UslingHttpTestBase;
/** Test the order option for node creation via the MicrojaxPostServlet */
public class PostServletOrderTest extends UslingHttpTestBase {
Modified: incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ujax/PostServletUpdateTest.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ujax/PostServletUpdateTest.java?rev=613888&r1=613869&r2=613888&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ujax/PostServletUpdateTest.java (original)
+++ incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ujax/PostServletUpdateTest.java Mon Jan 21 05:46:20 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.usling.webapp.integrationtest.ujax;
+package org.apache.sling.launchpad.webapp.integrationtest.ujax;
import java.io.IOException;
import java.util.HashMap;
@@ -22,7 +22,7 @@
import javax.servlet.http.HttpServletResponse;
-import org.apache.sling.usling.webapp.integrationtest.UslingHttpTestBase;
+import org.apache.sling.launchpad.webapp.integrationtest.UslingHttpTestBase;
/** Test node updates via the MicrojaxPostServlet */
public class PostServletUpdateTest extends UslingHttpTestBase {
Modified: incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ujax/UjaxAutoPropertiesTest.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ujax/UjaxAutoPropertiesTest.java?rev=613888&r1=613869&r2=613888&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ujax/UjaxAutoPropertiesTest.java (original)
+++ incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ujax/UjaxAutoPropertiesTest.java Mon Jan 21 05:46:20 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.usling.webapp.integrationtest.ujax;
+package org.apache.sling.launchpad.webapp.integrationtest.ujax;
import java.io.IOException;
import java.util.HashMap;
@@ -22,7 +22,7 @@
import javax.servlet.http.HttpServletResponse;
-import org.apache.sling.usling.webapp.integrationtest.UslingHttpTestBase;
+import org.apache.sling.launchpad.webapp.integrationtest.UslingHttpTestBase;
/** {#link MicrojaxPropertyValueSetter} sets the value of some properties
* automatically if they are empty. This is tested here with various cases.
Modified: incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ujax/UjaxSessionInfoTest.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ujax/UjaxSessionInfoTest.java?rev=613888&r1=613869&r2=613888&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ujax/UjaxSessionInfoTest.java (original)
+++ incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ujax/UjaxSessionInfoTest.java Mon Jan 21 05:46:20 2008
@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.usling.webapp.integrationtest.ujax;
+package org.apache.sling.launchpad.webapp.integrationtest.ujax;
import java.io.IOException;
import javax.servlet.http.HttpServletResponse;
-import org.apache.sling.usling.webapp.integrationtest.UslingHttpTestBase;
+import org.apache.sling.launchpad.webapp.integrationtest.UslingHttpTestBase;
/** Test the ujax:sessionInfo resource */