Author: rgardler
Date: Fri Aug 10 09:45:21 2012
New Revision: 1371627
URL: http://svn.apache.org/viewvc?rev=1371627&view=rev
Log:
Since the scanning template is 'lower' in the template hierarchy it needs to be
loaded after the twoColumn template, otherwise some settings get overwritten in
subsequent template processing steps
Modified:
incubator/wookie/trunk/widgets/templates/assetPlayer/template_build.xml
Modified:
incubator/wookie/trunk/widgets/templates/assetPlayer/template_build.xml
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/widgets/templates/assetPlayer/template_build.xml?rev=1371627&r1=1371626&r2=1371627&view=diff
==============================================================================
--- incubator/wookie/trunk/widgets/templates/assetPlayer/template_build.xml
(original)
+++ incubator/wookie/trunk/widgets/templates/assetPlayer/template_build.xml Fri
Aug 10 09:45:21 2012
@@ -140,6 +140,7 @@
<property file="${widget.build.dir}/${widget.shortname}.properties"/>
<!-- write the full property set for this template -->
<echoproperties
destfile="${widget.build.dir}/${widget.shortname}.properties" prefix=""/>
+
</target>
<target name="_prepare_template_files"
@@ -154,13 +155,13 @@
<ant antfile="${wookie.template.dir}/build.xml"
target="_generate_widget">
- <property name="template.name" value="scanning"/>
+ <property name="template.name" value="twoColumn"/>
<property name="copyWidgetFiles" value="false"/>
</ant>
<ant antfile="${wookie.template.dir}/build.xml"
target="_generate_widget">
- <property name="template.name" value="twoColumn"/>
+ <property name="template.name" value="scanning"/>
<property name="copyWidgetFiles" value="false"/>
</ant>
