You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by jk...@apache.org on 2006/01/31 09:20:27 UTC
svn commit: r373758 - in /jakarta/tapestry/trunk/framework/src:
java/org/apache/tapestry/ajax/ java/org/apache/tapestry/asset/
java/org/apache/tapestry/html/ test/org/apache/tapestry/asset/
Author: jkuhnert
Date: Tue Jan 31 00:20:20 2006
New Revision: 373758
URL: http://svn.apache.org/viewcvs?rev=373758&view=rev
Log:
still trying to get asset's to play nicely with my non standard includes
Modified:
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/ajax/AjaxShellDelegate.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/asset/AssetSourceImpl.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/Shell.jwc
jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/asset/ClasspathAssetFactoryTest.java
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/ajax/AjaxShellDelegate.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/ajax/AjaxShellDelegate.java?rev=373758&r1=373757&r2=373758&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/ajax/AjaxShellDelegate.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/ajax/AjaxShellDelegate.java Tue Jan 31 00:20:20 2006
@@ -43,7 +43,7 @@
//include the js package
str.append("<script type=\"text/javascript\" src=\"")
- .append(_dojoSource.getResourceLocation().getPath()).append("/dojo.js\"></script>");
+ .append(_dojoSource.getResourceLocation().getPath()).append("\"></script>");
writer.printRaw(str.toString());
}
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/asset/AssetSourceImpl.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/asset/AssetSourceImpl.java?rev=373758&r1=373757&r2=373758&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/asset/AssetSourceImpl.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/asset/AssetSourceImpl.java Tue Jan 31 00:20:20 2006
@@ -117,4 +117,4 @@
_defaultAssetFactory = defaultAssetFactory;
}
-}
\ No newline at end of file
+}
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/Shell.jwc
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/Shell.jwc?rev=373758&r1=373757&r2=373758&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/Shell.jwc (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/Shell.jwc Tue Jan 31 00:20:20 2006
@@ -114,6 +114,6 @@
<set name="dojoSource" value="dojoSource" />
</bean>
- <asset name="defaultDojoSource" path="/org/apache/tapestry/ajax/dojo" />
+ <asset name="defaultDojoSource" path="classpath:/org/apache/tapestry/ajax/dojo/dojo.js" />
</component-specification>
Modified: jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/asset/ClasspathAssetFactoryTest.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/asset/ClasspathAssetFactoryTest.java?rev=373758&r1=373757&r2=373758&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/asset/ClasspathAssetFactoryTest.java (original)
+++ jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/asset/ClasspathAssetFactoryTest.java Tue Jan 31 00:20:20 2006
@@ -182,7 +182,7 @@
factory.setAssetService(assetService);
factory.setLocalizer(new DefaultResourceLocalizer());
- String path = "/org/apache/tapestry/ajax/dojo";
+ String path = "/org/apache/tapestry/ajax/dojo/dojo.js";
IAsset asset = factory.createAsset(shell, path,
Locale.getDefault(),
---------------------------------------------------------------------
To unsubscribe, e-mail: tapestry-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tapestry-dev-help@jakarta.apache.org