tpl/build.xml.erb in salesforce-deploy-tool-3.2.0 vs tpl/build.xml.erb in salesforce-deploy-tool-3.3.1

@@ -1,66 +1,37 @@
 <project name="Sample usage of Salesforce Ant tasks" default="test" basedir="." xmlns:sf="antlib:com.salesforce">
 
     <property environment="env"/>
 
-    <target name="deployCode">
-      <sf:deploy 
-        username="${env.SF_USERNAME}" 
-        password="${env.SF_PASSWORD}" 
-        serverurl="${env.SF_SERVERURL}" 
-        deployRoot="${env.SF_SRC_DIR}" 
+    <target name="<%= target.gsub(' ','') %>">
+      <sf:<%= target.match(/deploy|check/) ? 'deploy' : 'retrieve'%>
         maxPoll="200" 
-        rollbackOnError="true" >
-      </sf:deploy>
-    </target>
-
-    <target name="checkOnlyCode">
-      <sf:deploy 
         username="${env.SF_USERNAME}" 
         password="${env.SF_PASSWORD}" 
         serverurl="${env.SF_SERVERURL}" 
+<% if target.match(/retrieve/) -%>
+        retrieveTarget="${env.SF_SRC_DIR}"
+        unpackaged="${env.SF_SRC_DIR}/package.xml"
+<% end -%>
+<% if target.match(/deploy|check/) -%>
         deployRoot="${env.SF_SRC_DIR}" 
-        maxPoll="200" 
+        rollbackOnError="true" 
+<% end -%>
+<% if @check_only -%>
         checkOnly="true"
-        rollbackOnError="true" >
-      </sf:deploy>
-    </target>
-
-    <target name="deployAndRunSpecifiedTests">
-      <sf:deploy 
-        username="${env.SF_USERNAME}" 
-        password="${env.SF_PASSWORD}" 
-        serverurl="${env.SF_SERVERURL}" 
-        deployRoot="${env.SF_SRC_DIR}" 
-        maxPoll="200" 
-        rollbackOnError="true"
-        testLevel="RunSpecifiedTests">
+<% end -%>
+<% if @run_all_tests -%>
+        runAllTests="true" 
+<% end -%>
+<% if !@run_tests.empty? -%>
+        testLevel="RunSpecifiedTests"
+<% end -%>
+<% if !@check_only -%>
+<% end -%>
+        >
 <% @run_tests.each do |test| -%>
       <runTest><%= test %></runTest>
 <% end -%>
-      </sf:deploy>
-    </target>
-
-    <target name="deployAndTestCode">
-      <sf:deploy 
-        username="${env.SF_USERNAME}" 
-        password="${env.SF_PASSWORD}" 
-        serverurl="${env.SF_SERVERURL}" 
-        deployRoot="${env.SF_SRC_DIR}" 
-        maxPoll="200" 
-        runAllTests="true" 
-        rollbackOnError="true" >
-      </sf:deploy>
-    </target>
-
-    <target name="retrieveCode">
-      <sf:retrieve 
-        username="${env.SF_USERNAME}" 
-        password="${env.SF_PASSWORD}" 
-        serverurl="${env.SF_SERVERURL}" 
-        retrieveTarget="${env.SF_SRC_DIR}" 
-        maxPoll="200" 
-        unpackaged="${env.SF_SRC_DIR}/package.xml"
-      />
+      </sf:<%= target.match(/deploy|check/) ? 'deploy' : 'retrieve'%>>
     </target>
 
 </project>