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" ) %>