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/04/01 09:41:06 UTC
svn commit: r643313 - in /incubator/sling/trunk:
launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/
sling/servlets-post/src/main/java/org/apache/sling/servlets/post/impl/info/
Author: cziegeler
Date: Tue Apr 1 00:41:01 2008
New Revision: 643313
URL: http://svn.apache.org/viewvc?rev=643313&view=rev
Log:
SLING-326: Mount info servlet at /system/sling/info
Modified:
incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/SlingSessionInfoTest.java
incubator/sling/trunk/sling/servlets-post/src/main/java/org/apache/sling/servlets/post/impl/info/SlingInfoServlet.java
Modified: incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/SlingSessionInfoTest.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/SlingSessionInfoTest.java?rev=643313&r1=643312&r2=643313&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/SlingSessionInfoTest.java (original)
+++ incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/SlingSessionInfoTest.java Tue Apr 1 00:41:01 2008
@@ -27,7 +27,7 @@
public class SlingSessionInfoTest extends HttpTestBase {
public void testSessionInfo() throws IOException {
- final String content = getContent(HTTP_BASE_URL + "/sling.sessionInfo.json", CONTENT_TYPE_JSON);
+ final String content = getContent(HTTP_BASE_URL + "/system/sling/info.sessionInfo.json", CONTENT_TYPE_JSON);
// assume workspace name contains "default", might not
// always be the case as the default workspace is selected
Modified: incubator/sling/trunk/sling/servlets-post/src/main/java/org/apache/sling/servlets/post/impl/info/SlingInfoServlet.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/sling/servlets-post/src/main/java/org/apache/sling/servlets/post/impl/info/SlingInfoServlet.java?rev=643313&r1=643312&r2=643313&view=diff
==============================================================================
--- incubator/sling/trunk/sling/servlets-post/src/main/java/org/apache/sling/servlets/post/impl/info/SlingInfoServlet.java (original)
+++ incubator/sling/trunk/sling/servlets-post/src/main/java/org/apache/sling/servlets/post/impl/info/SlingInfoServlet.java Tue Apr 1 00:41:01 2008
@@ -40,7 +40,7 @@
* @scr.component immediate="true" metatype="false"
* @scr.property name="service.description" value="Sling Info Servlet"
* @scr.property name="service.vendor" value="The Apache Software Foundation"
- * @scr.property name="sling.servlet.paths" value="/ujax"
+ * @scr.property name="sling.servlet.paths" value="/system/sling/info"
*/
public class SlingInfoServlet extends SlingSafeMethodsServlet {