# HG changeset patch
# User kcr
# Date 1330978926 28800
# Node ID f7f0f84e7fab5238b9b2e72f1372727bb99c6de0
# Parent  6e63951a5581f533f235b5a70fb7e74bfca06ab7
imported patch TMP-xxx

diff --git a/build-tasks.xml b/build-tasks.xml
--- a/build-tasks.xml
+++ b/build-tasks.xml
@@ -82,7 +82,7 @@
         <replace dir="${jfx.apps.experiments.dist}/${application.title}">
             <include name="build.xml"/>
             <replacetoken><![CDATA[${jfx.sdk.anttask.jar}]]></replacetoken>
-            <replacevalue>../../../tools/ant-javafx.jar</replacevalue>
+            <replacevalue>../../../lib/ant-javafx.jar</replacevalue>
         </replace>
         <!-- Update JFXRT.jar path in NB Project -->
         <replace dir="${jfx.apps.experiments.dist}/${application.title}/nbproject"
@@ -121,7 +121,7 @@
         <replace dir="${jfx.apps.ga-samples.dist}/${application.title}">
             <include name="build.xml"/>
             <replacetoken><![CDATA[${jfx.sdk.anttask.jar}]]></replacetoken>
-            <replacevalue>../../../tools/ant-javafx.jar</replacevalue>
+            <replacevalue>../../../lib/ant-javafx.jar</replacevalue>
         </replace>
         <!-- Update JFXRT.jar path in NB Project -->
         <replace dir="${jfx.apps.ga-samples.dist}/${application.title}/nbproject"
diff --git a/ga-samples/SwingInterop/build.xml b/ga-samples/SwingInterop/build.xml
--- a/ga-samples/SwingInterop/build.xml
+++ b/ga-samples/SwingInterop/build.xml
@@ -41,9 +41,9 @@
     <!-- When not running in netbeans try and locate JavaFX SDK -->
     <target name="-pre-init" depends="find-javafx,check-javafx" unless="netbeans-home">
         <echo message="Using JavaFX SDK: ${javafx.sdk}"/>
-        <property name="javafx.tools.ant.jar"  value="${javafx.sdk}/tools/ant-javafx.jar"/>
+        <property name="javafx.tools.ant.jar"  value="${javafx.sdk}/lib/ant-javafx.jar"/>
         <property name="file.reference.jfxrt.jar"  value="${javafx.sdk}/rt/lib/jfxrt.jar"/>
-        <property name="file.reference.ant-javafx.jar"  value="${javafx.sdk}/tools/ant-javafx.jar"/>
+        <property name="file.reference.ant-javafx.jar"  value="${javafx.sdk}/lib/ant-javafx.jar"/>
     </target>
     
     <target name="-pre-compile" depends="javafx-missing">
diff --git a/ga-samples/SwingInterop/nbproject/project.properties b/ga-samples/SwingInterop/nbproject/project.properties
--- a/ga-samples/SwingInterop/nbproject/project.properties
+++ b/ga-samples/SwingInterop/nbproject/project.properties
@@ -26,7 +26,7 @@
 dist.javadoc.dir=${dist.dir}/javadoc
 endorsed.classpath=
 excludes=
-file.reference.ant-javafx.jar=XXX/tools/ant-javafx.jar
+file.reference.ant-javafx.jar=XXX/lib/ant-javafx.jar
 file.reference.jfxrt.jar=XXX/lib/jfxrt.jar
 file.reference.SwingInterop-src=src
 includes=**
diff --git a/ga-samples/build.xml b/ga-samples/build.xml
--- a/ga-samples/build.xml
+++ b/ga-samples/build.xml
@@ -47,7 +47,7 @@
         <replace dir="${jfx.apps.ga-samples.dist}/DataApp">
             <include name="build.xml"/>
             <replacetoken><![CDATA[${jfx.sdk.anttask.jar}]]></replacetoken>
-            <replacevalue>../../../tools/ant-javafx.jar</replacevalue>
+            <replacevalue>../../../lib/ant-javafx.jar</replacevalue>
         </replace>
         <replace dir="${jfx.apps.ga-samples.dist}/DataApp/DataAppClient/nbproject"
                 value="file.reference.jfxrt.jar=../../../../rt/lib/jfxrt.jar">
diff --git a/internal/FXPackager/nbproject/project.properties b/internal/FXPackager/nbproject/project.properties
--- a/internal/FXPackager/nbproject/project.properties
+++ b/internal/FXPackager/nbproject/project.properties
@@ -26,7 +26,7 @@
 dist.javadoc.dir=${dist.dir}/javadoc
 endorsed.classpath=
 excludes=
-file.reference.ant-javafx.jar=../../../artifacts/sdk/tools/ant-javafx.jar
+file.reference.ant-javafx.jar=../../../artifacts/sdk/lib/ant-javafx.jar
 file.reference.ant.jar=${ant.home}/lib/ant.jar
 file.reference.jfxrt.jar=../../../artifacts/sdk/rt/lib/jfxrt.jar
 includes=**