svn commit: r1074310 - in /incubator/wookie/trunk/widgets: ./ widget-template/ widget-template/basic/ widget-template/basic/images/ widget-template/basic/legal/ widget-template/basic/lib/ widget-template/basic/scripts/ widget-template/basic/style/ widg...

[rg...@apache.org]

Author: rgardler
Date: Thu Feb 24 21:48:20 2011
New Revision: 1074310

URL: http://svn.apache.org/viewvc?rev=1074310&view=rev
Log:
move widget template into a subdirectory and allow user to request a type of widget template to use (another template coming in a subsequent commit)

Added:
    incubator/wookie/trunk/widgets/widget-template/basic/
    incubator/wookie/trunk/widgets/widget-template/basic/build.xml
      - copied unchanged from r1074309, incubator/wookie/trunk/widgets/widget-template/build.xml
    incubator/wookie/trunk/widgets/widget-template/basic/config.xml
      - copied unchanged from r1074309, incubator/wookie/trunk/widgets/widget-template/config.xml
    incubator/wookie/trunk/widgets/widget-template/basic/images/
      - copied from r1074309, incubator/wookie/trunk/widgets/widget-template/images/
    incubator/wookie/trunk/widgets/widget-template/basic/index.html
      - copied unchanged from r1074309, incubator/wookie/trunk/widgets/widget-template/index.html
    incubator/wookie/trunk/widgets/widget-template/basic/legal/
      - copied from r1074309, incubator/wookie/trunk/widgets/widget-template/legal/
    incubator/wookie/trunk/widgets/widget-template/basic/lib/
      - copied from r1074309, incubator/wookie/trunk/widgets/widget-template/lib/
    incubator/wookie/trunk/widgets/widget-template/basic/scripts/
      - copied from r1074309, incubator/wookie/trunk/widgets/widget-template/scripts/
    incubator/wookie/trunk/widgets/widget-template/basic/style/
      - copied from r1074309, incubator/wookie/trunk/widgets/widget-template/style/
Removed:
    incubator/wookie/trunk/widgets/widget-template/build.xml
    incubator/wookie/trunk/widgets/widget-template/config.xml
    incubator/wookie/trunk/widgets/widget-template/images/
    incubator/wookie/trunk/widgets/widget-template/index.html
    incubator/wookie/trunk/widgets/widget-template/legal/
    incubator/wookie/trunk/widgets/widget-template/lib/
    incubator/wookie/trunk/widgets/widget-template/scripts/
    incubator/wookie/trunk/widgets/widget-template/style/
Modified:
    incubator/wookie/trunk/widgets/build.xml

Modified: incubator/wookie/trunk/widgets/build.xml
URL: http://svn.apache.org/viewvc/incubator/wookie/trunk/widgets/build.xml?rev=1074310&r1=1074309&r2=1074310&view=diff
==============================================================================
--- incubator/wookie/trunk/widgets/build.xml (original)
+++ incubator/wookie/trunk/widgets/build.xml Thu Feb 24 21:48:20 2011
@@ -41,6 +41,7 @@
 	
 
     <target name="seed-widget" description="Seed a new widget">
+    	<input message="What type of widget template do you want to use?" validargs="basic, wave" addproperty="widget.type"/>
     	<input message="What is the short name of the widget you wish to create?" addproperty="widget.shortname"/>
     	<input message="Provide a brief description of the purpose of the ${widget.shortname} widget" addproperty="widget.description"/>
     	<input message="What is the default height of the ${widget.shortname} widget?" addproperty="widget.height" defaultvalue="320"/>
@@ -50,6 +51,7 @@
 	
 	<target name="build-test-widget" description="Build a test widget that uses sensible settings. This is used when developing the widget template scripts.">
 		<property name="deployToDev" value="true"/>
+		<property name="widget.type" value="basic"/>
 		<property name="widget.shortname" value="TemplateTest"/>
 		<property name="widget.description" value="A widget built from the standard widget template and using sensible default options for all configuration settings. This is used during development of the widget template"/>
 		<property name="widget.height" value="320"/>
@@ -61,7 +63,7 @@
     <target name="_create-widget-from-template" description="Copies the widget template and configures it accordingly.">
     	<mkdir dir="${wookie.widgets.dir}/${widget.shortname}"/>
     	<copy todir="${wookie.widgets.dir}/${widget.shortname}" filtering="true">
-    		<fileset dir="${widget.template.dir}">
+    		<fileset dir="${widget.template.dir}/${widget.type}">
     			<exclude name="**/*.png"/>
     			<exclude name="**/*.zip"/>
     		</fileset>
@@ -73,7 +75,7 @@
     		</filterset>
     	</copy>
     	<copy todir="${wookie.widgets.dir}/${widget.shortname}">
-    		<fileset dir="${widget.template.dir}">
+    		<fileset dir="${widget.template.dir}/${widget.type}">
     			<include name="**/*.png"/>
     			<include name="**/*.zip"/>
     		</fileset>