Return-Path: Delivered-To: apmail-incubator-sling-commits-archive@locus.apache.org Received: (qmail 50937 invoked from network); 15 Oct 2008 14:02:05 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 15 Oct 2008 14:02:05 -0000 Received: (qmail 2769 invoked by uid 500); 15 Oct 2008 14:02:01 -0000 Delivered-To: apmail-incubator-sling-commits-archive@incubator.apache.org Received: (qmail 2737 invoked by uid 500); 15 Oct 2008 14:02:01 -0000 Mailing-List: contact sling-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: sling-dev@incubator.apache.org Delivered-To: mailing list sling-commits@incubator.apache.org Received: (qmail 2724 invoked by uid 99); 15 Oct 2008 14:02:01 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 15 Oct 2008 07:02:01 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 15 Oct 2008 14:01:02 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 8799223888A0; Wed, 15 Oct 2008 07:01:09 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r704919 - in /incubator/sling/trunk/launchpad/testing/src/test/resources/integration-test: request-attribute-test-sel1.esp request-attribute-test-sel2.esp request-attribute-test-sel3.esp Date: Wed, 15 Oct 2008 14:01:09 -0000 To: sling-commits@incubator.apache.org From: bdelacretaz@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20081015140109.8799223888A0@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: bdelacretaz Date: Wed Oct 15 07:01:09 2008 New Revision: 704919 URL: http://svn.apache.org/viewvc?rev=704919&view=rev Log: SLING-693 - tests only worked when Sling servlet was mounted on / Modified: incubator/sling/trunk/launchpad/testing/src/test/resources/integration-test/request-attribute-test-sel1.esp incubator/sling/trunk/launchpad/testing/src/test/resources/integration-test/request-attribute-test-sel2.esp incubator/sling/trunk/launchpad/testing/src/test/resources/integration-test/request-attribute-test-sel3.esp Modified: incubator/sling/trunk/launchpad/testing/src/test/resources/integration-test/request-attribute-test-sel1.esp URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/testing/src/test/resources/integration-test/request-attribute-test-sel1.esp?rev=704919&r1=704918&r2=704919&view=diff ============================================================================== --- incubator/sling/trunk/launchpad/testing/src/test/resources/integration-test/request-attribute-test-sel1.esp (original) +++ incubator/sling/trunk/launchpad/testing/src/test/resources/integration-test/request-attribute-test-sel1.esp Wed Oct 15 07:01:09 2008 @@ -28,7 +28,7 @@ } %> servlet10=<%= getServlet() %> -resource10=<%= request.getAttribute( "org.apache.sling.api.include.resource" ) %> +resource10=<%= request.getContextPath() + request.getAttribute( "org.apache.sling.api.include.resource" ) %> <% sling.include(resource.path, "replaceSelectors=sel3"); %> servlet11=<%= getServlet() %> -resource11=<%= request.getAttribute( "org.apache.sling.api.include.resource" ) %> +resource11=<%= request.getContextPath() + request.getAttribute( "org.apache.sling.api.include.resource" ) %> Modified: incubator/sling/trunk/launchpad/testing/src/test/resources/integration-test/request-attribute-test-sel2.esp URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/testing/src/test/resources/integration-test/request-attribute-test-sel2.esp?rev=704919&r1=704918&r2=704919&view=diff ============================================================================== --- incubator/sling/trunk/launchpad/testing/src/test/resources/integration-test/request-attribute-test-sel2.esp (original) +++ incubator/sling/trunk/launchpad/testing/src/test/resources/integration-test/request-attribute-test-sel2.esp Wed Oct 15 07:01:09 2008 @@ -28,4 +28,4 @@ } %> servlet20=<%= getServlet() %> -resource20=<%= request.getAttribute( "org.apache.sling.api.include.resource" ) %> +resource20=<%= request.getContextPath() + request.getAttribute( "org.apache.sling.api.include.resource" ) %> Modified: incubator/sling/trunk/launchpad/testing/src/test/resources/integration-test/request-attribute-test-sel3.esp URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/testing/src/test/resources/integration-test/request-attribute-test-sel3.esp?rev=704919&r1=704918&r2=704919&view=diff ============================================================================== --- incubator/sling/trunk/launchpad/testing/src/test/resources/integration-test/request-attribute-test-sel3.esp (original) +++ incubator/sling/trunk/launchpad/testing/src/test/resources/integration-test/request-attribute-test-sel3.esp Wed Oct 15 07:01:09 2008 @@ -28,4 +28,4 @@ } %> servlet30=<%= getServlet() %> -resource30=<%= request.getAttribute( "org.apache.sling.api.include.resource" ) %> +resource30=<%= request.getContextPath() + request.getAttribute( "org.apache.sling.api.include.resource" ) %>