Author: hlship
Date: Wed Nov 28 13:15:08 2007
New Revision: 599149
URL: http://svn.apache.org/viewvc?rev=599149&view=rev
Log:
TAPESTRY-1896: Paths wrong for context assets in root context
- Changed tsts to prove issue is not valid
Added:
tapestry/tapestry5/trunk/tapestry-core/src/test/app1/nested/
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/nested/
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/nested/AssetDemo.java
- copied, changed from r594255,
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/AssetDemo.java
tapestry/tapestry5/trunk/tapestry-core/src/test/resources/org/apache/tapestry/integration/app1/pages/nested/
tapestry/tapestry5/trunk/tapestry-core/src/test/resources/org/apache/tapestry/integration/app1/pages/nested/AssetDemo.tml
- copied, changed from r594255,
tapestry/tapestry5/trunk/tapestry-core/src/test/resources/org/apache/tapestry/integration/app1/pages/AssetDemo.tml
tapestry/tapestry5/trunk/tapestry-core/src/test/resources/org/apache/tapestry/integration/app1/pages/nested/tapestry-button.png
(props changed)
- copied unchanged from r594255,
tapestry/tapestry5/trunk/tapestry-core/src/test/resources/org/apache/tapestry/integration/app1/pages/tapestry-button.png
Removed:
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/AssetDemo.java
tapestry/tapestry5/trunk/tapestry-core/src/test/resources/org/apache/tapestry/integration/app1/pages/tapestry-button.png
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/test/app1/Start.tml
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/IntegrationTests.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/RunJetty.java
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/app1/Start.tml
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/app1/Start.tml?rev=599149&r1=599148&r2=599149&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/app1/Start.tml (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/app1/Start.tml Wed Nov 28
13:15:08 2007
@@ -60,7 +60,7 @@
-- accessing localized messages from the component
catalog
</li>
<li>
- <a t:type="PageLink" page="AssetDemo">AssetDemo</a>
+ <a t:type="PageLink"
page="nested/AssetDemo">AssetDemo</a>
-- declaring an using Assets
</li>
<li>
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/IntegrationTests.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/IntegrationTests.java?rev=599149&r1=599148&r2=599149&view=diff
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/IntegrationTests.java
(original)
+++
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/IntegrationTests.java
Wed Nov 28 13:15:08 2007
@@ -50,16 +50,16 @@
// allows to be verified. Note that the path below represents some
aliasing
// of the raw classpath resource path.
- assertText("//[EMAIL PROTECTED]'button']/@src",
"/assets/app1/pages/tapestry-button.png");
+ assertText("//[EMAIL PROTECTED]'button']/@src",
"/assets/app1/pages/nested/tapestry-button.png");
// Read the byte stream for the asset and compare to the real copy.
- URL url = new URL("http", "localhost", JETTY_PORT,
"/assets/app1/pages/tapestry-button.png");
+ URL url = new URL("http", "localhost", JETTY_PORT,
"/assets/app1/pages/nested/tapestry-button.png");
byte[] downloaded = readContent(url);
Resource classpathResource = new ClasspathResource(
-
"org/apache/tapestry/integration/app1/pages/tapestry-button.png");
+
"org/apache/tapestry/integration/app1/pages/nested/tapestry-button.png");
byte[] actual = readContent(classpathResource.toURL());
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/RunJetty.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/RunJetty.java?rev=599149&r1=599148&r2=599149&view=diff
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/RunJetty.java
(original)
+++
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/RunJetty.java
Wed Nov 28 13:15:08 2007
@@ -24,6 +24,6 @@
{
public static void main(String[] args) throws InterruptedException
{
- new JettyRunner("/", 8080, "src/test/app1");
+ new JettyRunner("/app1", 8080, "src/test/app1");
}
}
Copied:
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/nested/AssetDemo.java
(from r594255,
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/AssetDemo.java)
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/nested/AssetDemo.java?p2=tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/nested/AssetDemo.java&p1=tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/AssetDemo.java&r1=594255&r2=599149&rev=599149&view=diff
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/AssetDemo.java
(original)
+++
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/nested/AssetDemo.java
Wed Nov 28 13:15:08 2007
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry.integration.app1.pages.nested;
import org.apache.tapestry.Asset;
import org.apache.tapestry.annotations.Path;
Copied:
tapestry/tapestry5/trunk/tapestry-core/src/test/resources/org/apache/tapestry/integration/app1/pages/nested/AssetDemo.tml
(from r594255,
tapestry/tapestry5/trunk/tapestry-core/src/test/resources/org/apache/tapestry/integration/app1/pages/AssetDemo.tml)
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/resources/org/apache/tapestry/integration/app1/pages/nested/AssetDemo.tml?p2=tapestry/tapestry5/trunk/tapestry-core/src/test/resources/org/apache/tapestry/integration/app1/pages/nested/AssetDemo.tml&p1=tapestry/tapestry5/trunk/tapestry-core/src/test/resources/org/apache/tapestry/integration/app1/pages/AssetDemo.tml&r1=594255&r2=599149&rev=599149&view=diff
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/test/resources/org/apache/tapestry/integration/app1/pages/AssetDemo.tml
(original)
+++
tapestry/tapestry5/trunk/tapestry-core/src/test/resources/org/apache/tapestry/integration/app1/pages/nested/AssetDemo.tml
Wed Nov 28 13:15:08 2007
@@ -1,19 +1,26 @@
<html t:type="Border"
xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd";>
-
+
<p>
This page demonstrates the ability to inject assets into components
and pass them around as parameters.
</p>
-
+
<p>
The Tapestry banner:
</p>
-
- <img id="icon" src="${icon}"/>
-
+
+ <img id="icon" src="${icon}"/>
+
<p>
A classpath asset:
</p>
-
+
<img id="button" src="${button}"/>
+
+
+ <p>
+ Relative asset via asset: binding
+ </p>
+
+ <img src="${asset:../smiley.png}"/>
</html>
Propchange:
tapestry/tapestry5/trunk/tapestry-core/src/test/resources/org/apache/tapestry/integration/app1/pages/nested/tapestry-button.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
