SF.net SVN: moduleforge:[2292] controltier/branches/controltier-3-6-support /aws/modules/AwsEc2Util

[ashor...@users.sourceforge.net]

Revision: 2292
http://moduleforge.svn.sourceforge.net/moduleforge/?rev=2292&view=rev
Author: ashortland
Date: 2011-07-10 17:56:59 +0000 (Sun, 10 Jul 2011)

Log Message:
-----------
Added an option to allow specifying the property prefix to use.

Tracker#: https://sourceforge.net/tracker/?func=detail&aid=3362030&group_id=151079&atid=779850

Modified Paths:
--------------
controltier/branches/controltier-3-6-support/aws/modules/AwsEc2Util/commands/getUserData.xml
controltier/branches/controltier-3-6-support/aws/modules/AwsEc2Util/type.xml

Modified: controltier/branches/controltier-3-6-support/aws/modules/AwsEc2Util/commands/getUserData.xml
===================================================================
--- controltier/branches/controltier-3-6-support/aws/modules/AwsEc2Util/commands/getUserData.xml 2011-07-10 17:14:25 UTC (rev 2291)
+++ controltier/branches/controltier-3-6-support/aws/modules/AwsEc2Util/commands/getUserData.xml 2011-07-10 17:56:59 UTC (rev 2292)
@@ -20,8 +20,8 @@
<!--NOTE: -execute target content is auto-generated by the handler generation process. -->
<tempfile property="userDataPropertyFile" destdir="${opts.destdir}" prefix="userdata." suffix=".properties" deleteonexit="true"/>
<get src="${opts.userdataurl}" dest="${userDataPropertyFile}"/>
- <property file="${userDataPropertyFile}" prefix="ec2InstanceUserData"/>
- <echoproperties prefix="ec2InstanceUserData"/>
+ <property file="${userDataPropertyFile}" prefix="${opts.prefix}"/>
+ <echoproperties prefix="${opts.prefix}"/>
</target>
<target name="-getopts" depends="-pre-opts">
<!--NOTE: -getopts target and content is auto-generated by the handler generation process. -->
@@ -29,6 +29,7 @@
<opts>
<opt parameter="userdataurl" description="URL to access user data" required="false" property="opts.userdataurl" type="string" default="http://169.254.169.254/latest/user-data"/>
<opt parameter="destdir" description="destination directory for the user data" required="false" property="opts.destdir" type="string" default="${framework.var.dir}/tmp"/>
+ <opt parameter="prefix" description="property prefix to use for the user data" required="false" property="opts.prefix" type="string" default="ec2InstanceUserData"/>
</opts>
</get-opts>
</target>

Modified: controltier/branches/controltier-3-6-support/aws/modules/AwsEc2Util/type.xml
===================================================================
--- controltier/branches/controltier-3-6-support/aws/modules/AwsEc2Util/type.xml 2011-07-10 17:14:25 UTC (rev 2291)
+++ controltier/branches/controltier-3-6-support/aws/modules/AwsEc2Util/type.xml 2011-07-10 17:56:59 UTC (rev 2292)
@@ -57,12 +57,13 @@
<implementation>
<tempfile property="userDataPropertyFile" destdir="${opts.destdir}" prefix="userdata." suffix=".properties" deleteonexit="true"/>
<get src="${opts.userdataurl}" dest="${userDataPropertyFile}"/>
- <property file="${userDataPropertyFile}" prefix="ec2InstanceUserData"/>
- <echoproperties prefix="ec2InstanceUserData"/>
+ <property file="${userDataPropertyFile}" prefix="${opts.prefix}"/>
+ <echoproperties prefix="${opts.prefix}"/>
</implementation>
<opts>
<opt parameter="userdataurl" description="URL to access user data" required="false" property="opts.userdataurl" type="string" default="http://169.254.169.254/latest/user-data"/>
<opt parameter="destdir" description="destination directory for the user data" required="false" property="opts.destdir" type="string" default="${framework.var.dir}/tmp"/>
+ <opt parameter="prefix" description="property prefix to use for the user data" required="false" property="opts.prefix" type="string" default="ec2InstanceUserData"/>
</opts>
</command>
</commands>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.