Modified: struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/head.ftl URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/head.ftl?view=diff&rev=524433&r1=524432&r2=524433 ============================================================================== --- struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/head.ftl (original) +++ struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/head.ftl Sat Mar 31 07:20:00 2007 @@ -3,6 +3,13 @@ djConfig = { isDebug: ${parameters.debug?default(false)?string}, bindEncoding: "${parameters.encoding}", + <#if parameters.baseRelativePath?if_exists != ""> + baseRelativePath: "<@s.url value='${parameters.baseRelativePath}' includeParams='none' encode='false' />", + baseScriptUri: "<@s.url value='${parameters.baseRelativePath}' includeParams='none' encode='false' />", + <#else> + baseRelativePath: "<@s.url value='/struts/dojo/' includeParams='none' encode='false' />", + baseScriptUri: "<@s.url value='/struts/dojo/' includeParams='none' encode='false' />", + </#if> <#if parameters.locale?if_exists != ""> locale: "${parameters.locale}", </#if> @@ -20,14 +27,20 @@ <#assign dojoFile="dojo.js"> <#else> <#assign dojoFile="dojo.js.uncompressed.js"> -</#if> +</#if> + +<#if parameters.cache?default(false)> + <#assign profile="struts_"> +<#else> + <#assign profile=""> +</#if> <#if parameters.baseRelativePath?if_exists != ""> <script language="JavaScript" type="text/javascript" - src="<@s.url value='${parameters.baseRelativePath}/${dojoFile}' includeParams='none' encode='false' />"></script> + src="<@s.url value='${parameters.baseRelativePath}/${profile}${dojoFile}' includeParams='none' encode='false' />"></script> <#else> <script language="JavaScript" type="text/javascript" - src="<@s.url value='/struts/dojo/${dojoFile}' includeParams='none' encode='false' />"></script> + src="<@s.url value='/struts/dojo/${profile}${dojoFile}' includeParams='none' encode='false' />"></script> </#if> <script language="JavaScript" type="text/javascript"
Modified: struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/HeadTagTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/HeadTagTest.java?view=diff&rev=524433&r1=524432&r2=524433 ============================================================================== --- struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/HeadTagTest.java (original) +++ struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/HeadTagTest.java Sat Mar 31 07:20:00 2007 @@ -39,9 +39,25 @@ tag.setExtraLocales("a,b,c"); tag.setBaseRelativePath("/path"); tag.setLocale("es"); + tag.setCache("true"); tag.doStartTag(); tag.doEndTag(); verify(HeadTagTest.class.getResource("HeadTagTest-1.txt")); + } + + public void testHead2() throws Exception { + HeadTag tag = new HeadTag(); + tag.setPageContext(pageContext); + + tag.setDebug("false"); + tag.setCompressed("true"); + tag.setExtraLocales("a,b,c"); + tag.setLocale("es"); + tag.setCache("false"); + tag.doStartTag(); + tag.doEndTag(); + + verify(HeadTagTest.class.getResource("HeadTagTest-2.txt")); } } Modified: struts/struts2/trunk/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/HeadTagTest-1.txt URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/HeadTagTest-1.txt?view=diff&rev=524433&r1=524432&r2=524433 ============================================================================== --- struts/struts2/trunk/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/HeadTagTest-1.txt (original) +++ struts/struts2/trunk/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/HeadTagTest-1.txt Sat Mar 31 07:20:00 2007 @@ -3,6 +3,8 @@ djConfig={ isDebug: true, bindEncoding: "ISO-8859-1", + baseRelativePath: "/path", + baseScriptUri: "/path", locale: "es", extraLocale: [ "a", @@ -12,7 +14,7 @@ }; </script> -<script language="JavaScript" type="text/javascript" src="/path/dojo.js.uncompressed.js"> +<script language="JavaScript" type="text/javascript" src="/path/struts_dojo.js.uncompressed.js"> </script> <script language="JavaScript" type="text/javascript" src="/struts/ajax/dojoRequire.js"> Added: struts/struts2/trunk/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/HeadTagTest-2.txt URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/HeadTagTest-2.txt?view=auto&rev=524433 ============================================================================== --- struts/struts2/trunk/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/HeadTagTest-2.txt (added) +++ struts/struts2/trunk/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/HeadTagTest-2.txt Sat Mar 31 07:20:00 2007 @@ -0,0 +1,24 @@ +<script language="JavaScript" type="text/javascript"> + // Dojo configuration + djConfig={ + isDebug: false, + bindEncoding: "ISO-8859-1", + baseRelativePath: "/struts/dojo/", + baseScriptUri: "/struts/dojo/", + locale: "es", + extraLocale: [ + "a", + "b", + "c", + ] + }; +</script> + +<script language="JavaScript" type="text/javascript" src="/struts/dojo/dojo.js"> +</script> + +<script language="JavaScript" type="text/javascript" src="/struts/ajax/dojoRequire.js"> +</script> + +<script language="JavaScript" type="text/javascript" src="/struts/CommonFunctions.js"> +</script> \ No newline at end of file
