changeset 2551:d448980b1a24

Fix of build scripts for the open source builds. People should now be able to build successfully using ant on OpenJFX (see updated wiki for latest).
author rbair
date Fri, 08 Feb 2013 17:37:38 -0800
parents afe9c4479408
children 03cc45b0c481
files build-decora.xml build-defs.xml build.xml common.properties decora-compiler/build-closed.xml decora-compiler/build-common.xml decora-compiler/build.xml decora-compiler/project.properties decora-d3d/build-closed.xml decora-d3d/build-common.xml decora-d3d/build.xml decora-es2/build-closed.xml decora-es2/build-common.xml decora-es2/build.xml decora-jsw/build-closed.xml decora-jsw/build-common.xml decora-jsw/build.xml decora-prism-ps/build-closed.xml decora-prism-ps/build-common.xml decora-prism-ps/build.xml decora-prism-ps/project.properties decora-prism-sw/build-closed.xml decora-prism-sw/build-common.xml decora-prism-sw/build.xml decora-prism-sw/project.properties decora-prism/build-closed.xml decora-prism/build-common.xml decora-prism/build.xml decora-prism/project.properties decora-runtime/build-closed.xml decora-runtime/build-common.xml decora-runtime/build.xml decora-runtime/project.properties decora-sse/build-closed.xml decora-sse/build-common.xml decora-sse/build.xml decora-sse/project.properties javafx-anim/project.properties javafx-annotation-processor/build-common.xml javafx-annotation-processor/project.properties javafx-beans-dt/build-common.xml javafx-beans-dt/build.xml javafx-beans-dt/project.properties javafx-beans/project.properties javafx-concurrent/build-closed.xml javafx-concurrent/build-common.xml javafx-concurrent/build.xml javafx-concurrent/project.properties javafx-designtime/project.properties javafx-embed-swing/project.properties javafx-fxml/project.properties javafx-geom/build-closed.xml javafx-sg-common/build-closed.xml javafx-sg-common/project.properties javafx-sg-prism/build-closed.xml javafx-sg-prism/build-common.xml javafx-sg-prism/build.xml javafx-sg-prism/project.properties javafx-ui-charts/project.properties javafx-ui-common/build.xml javafx-ui-common/project.properties javafx-ui-controls/project.properties javafx-util-converter/project.properties pisces/build-closed.xml pisces/build-common.xml pisces/build.xml pisces/project.properties test-stub-toolkit/project.properties
diffstat 68 files changed, 963 insertions(+), 477 deletions(-) [+]
line wrap: on
line diff
--- a/build-decora.xml	Fri Feb 08 16:44:48 2013 -0800
+++ b/build-decora.xml	Fri Feb 08 17:37:38 2013 -0800
@@ -49,19 +49,19 @@
       -->
 
     <target name="build-compiler">
-      <ant antfile="decora-compiler/build.xml" target="jar" inheritAll="false"/>
+      <ant antfile="decora-compiler/build-closed.xml" target="jar" inheritAll="false"/>
     </target>
 
     <target name="build-runtime">
-      <ant antfile="decora-runtime/build.xml" target="jar" inheritAll="false"/>
+      <ant antfile="decora-runtime/build-closed.xml" target="jar" inheritAll="false"/>
     </target>
 
     <target name="build-jsw">
-      <ant antfile="decora-jsw/build.xml" target="jar" inheritAll="false"/>
+      <ant antfile="decora-jsw/build-closed.xml" target="jar" inheritAll="false"/>
     </target>
 
     <target name="build-sse" if="include.sse">
-      <ant antfile="decora-sse/build.xml" target="jar" inheritAll="false"/>
+      <ant antfile="decora-sse/build-closed.xml" target="jar" inheritAll="false"/>
     </target>
 
     <target name="dist" depends="init">
@@ -96,19 +96,19 @@
       -->
 
     <target name="clean-compiler">
-      <ant antfile="decora-compiler/build.xml" target="clean" inheritAll="false"/>
+      <ant antfile="decora-compiler/build-closed.xml" target="clean" inheritAll="false"/>
     </target>
 
     <target name="clean-runtime">
-      <ant antfile="decora-runtime/build.xml" target="clean" inheritAll="false"/>
+      <ant antfile="decora-runtime/build-closed.xml" target="clean" inheritAll="false"/>
     </target>
 
     <target name="clean-jsw">
-      <ant antfile="decora-jsw/build.xml" target="clean" inheritAll="false"/>
+      <ant antfile="decora-jsw/build-closed.xml" target="clean" inheritAll="false"/>
     </target>
 
     <target name="clean-sse" if="include.sse">
-      <ant antfile="decora-sse/build.xml" target="clean" inheritAll="false"/>
+      <ant antfile="decora-sse/build-closed.xml" target="clean" inheritAll="false"/>
     </target>
 
     <target name="clean" depends="init">
--- a/build-defs.xml	Fri Feb 08 16:44:48 2013 -0800
+++ b/build-defs.xml	Fri Feb 08 17:37:38 2013 -0800
@@ -39,9 +39,6 @@
     <property file="project.properties"/>
     <property file="../common.properties"/>
 
-    <!-- Create a class path for the lombok annotation processor. Note that
-         this HAS to exist or the path won't get translated correctly to the
-         OS specific form (read: Windows) and the windows build will break. -->
     <path id="id.processor.path" path="${javac.processorpath}"/>
 
     <!-- create a class path for cobertura for code test coverage analysis -->
@@ -109,24 +106,6 @@
         <test-single/>
     </target>
 
-    <property name="delomboked.src.dir" value="${build.dir}/src-delomboked"/>
-    <property name="delomboked.src.zip" value="${dist.dir}/${ant.project.name}-src.zip"/>
-    <condition property="is.delombok.needed">
-        <or>
-            <not>
-                <available file="${delomboked.src.zip}"/>
-            </not>
-            <not>
-                <uptodate srcfile="${dist.dir}/${ant.project.name}.jar"
-                          targetfile="${delomboked.src.zip}"/>
-            </not>
-        </or>
-    </condition>
-
-    <target name="delombok" if="is.delombok.needed">
-        <do-delombok/>
-    </target>
-
     <!--
 
         Main project level macros for doing all of the common tasks. These
@@ -154,7 +133,7 @@
             <mkdir dir="${build.classes.dir}"/>
 
             <condition property="processor.flag" value="" else="-processorpath ${toString:id.processor.path}">
-                <isset property="disable-lombok"/>
+                <isset property="disable.builders"/>
             </condition>
 
             <!-- compile .java source files -->
@@ -233,7 +212,7 @@
             <mkdir dir="${build.test.classes.dir}"/>
 
             <condition property="processor.flag" value="" else="-processorpath ${toString:id.processor.path}">
-                <isset property="disable-lombok"/>
+                <isset property="disable.builders"/>
             </condition>
 
             <!-- compile .java test sources -->
@@ -340,39 +319,6 @@
         </sequential>
     </macrodef>
 
-    <!-- generate delombok-ed sources with annotations expanded for easier debugging -->
-    <macrodef name="do-delombok">
-        <attribute name="name" default="${ant.project.name}"/>
-        <element name="addedsrcfiles" optional="true"/>
-        <sequential>
-            <property name="src.dir.location" location="${src.dir}"/>
-            <echo>Running delombok on sources in ${src.dir.location}</echo>
-
-            <delete dir="${build.dir}/${jfx.delomboked.src.dir.name}"/>
-            <java classname="lombok.core.Main" fork="true" failonerror="true">
-                <classpath>
-                    <!-- lombok-0.9.3 generates a NPE when processing certain javafx bean annotations,
-                         so use a more recent version for delombok-ing -->
-                    <pathelement location="${jfx.root.dir}/rt-closed/build/deps/lombok-trunk.jar"/>
-                    <pathelement path="${javac.classpath}"/>
-                    <pathelement path="${dist.dir}/@{name}.jar"/>
-                    <pathelement location="${jfx.root.dir}/rt-closed/build/deps/javafx-beans.jar"/>
-                    <pathelement location="${jfx.root.dir}/rt/build/deps/javafx-annotation-processor.jar"/>
-                </classpath>
-                <arg value="delombok"/>
-                <arg value="-d"/>
-                <arg value="${delomboked.src.dir}"/>
-                <arg value="${src.dir}"/>
-            </java>
-
-            <!-- create a zip of delombok-ed sources -->
-            <jar destfile="${delomboked.src.zip}">
-                <fileset dir="${delomboked.src.dir}"/>
-                <addedsrcfiles/>
-            </jar>
-        </sequential>
-    </macrodef>
-
     <!-- Stuff dealing with adding coverage to JUnit execution -->
 
     <target name="cobertura-taskdefs">
--- a/build.xml	Fri Feb 08 16:44:48 2013 -0800
+++ b/build.xml	Fri Feb 08 17:37:38 2013 -0800
@@ -25,7 +25,7 @@
  * questions.
  */
 --> 
-<project name="JavaFX Runtime" default="dist" basedir=".">
+<project name="JavaFX" default="dist" basedir=".">
     <description>Builds, tests, and runs the project JavaFX Runtime</description>
 
     <import file="../build-defs.xml"/>
@@ -38,43 +38,65 @@
         <fail message="Ant version 1.7.1 or later is required to build JavaFX.">
             <condition><not><antversion atleast="1.7.1"/></not></condition>
         </fail>
+        <condition property="isLinuxOrSolaris">
+            <or>
+              <istrue value="${isLinux}"/>
+              <istrue value="${isSolaris}"/>
+            </or>
+        </condition>
+
+        <property name="try.sse" value="true"/>
+        <!-- only build decora-sse on Windows and Mac OS X -->
+        <condition property="include.sse">
+            <or>
+                <istrue value="${isWindows}"/>
+                <istrue value="${isMacOSX}"/>
+            </or>
+        </condition>
+        
+        <!-- only build decora-d3d if on Windows -->
+        <condition property="include.d3d">
+            <istrue value="${isWindows}"/>
+        </condition>
+
+        <condition property="sse.native.lib.file"
+                   value="libdecora-sse.dylib"
+                   else="decora-sse.dll">
+            <istrue value="${isMacOSX}"/>
+        </condition>
     </target>
 
     <!--
         Build targets...
       -->
 
-    <!--
-    <fileset dir="${rt.root.dir}" id="rt.binaries.to.be.copied">
-        <include name="javafx-beans-dt/dist/javafx-beans-dt.jar"/>
-        <include name="javafx-concurrent/dist/javafx-concurrent.jar"/>
-        <include name="javafx-designtime/dist/javafx-designtime.jar"/>
-        <include name="javafx-ui-controls/dist/javafx-ui-controls.jar"/>
-        <include name="javafx-ui-charts/dist/javafx-ui-charts.jar"/>
-        <include name="javafx-ui-common/dist/javafx-ui-common.jar"/> 
-        <include name="javafx-util-converter/dist/javafx-util-converter.jar"/>
-    </fileset>
-    -->
-
     <target name="jar" depends="init">
-        <ant antfile="${rt.root.dir}/javafx-beans-dt/build.xml" target="jar" inheritAll="false"/>
+        <ant antfile="${rt.root.dir}/javafx-common/build.xml" target="jar" inheritAll="false"/>
+        <ant antfile="${rt.root.dir}/javafx-logging/build.xml" target="jar" inheritAll="false"/>
+        <ant antfile="${rt.root.dir}/javafx-beans/build.xml" target="jar" inheritAll="false"/>
+        <ant antfile="${rt.root.dir}/javafx-annotation-processor/build.xml" target="jar" inheritAll="false"/>
         <ant antfile="${rt.root.dir}/javafx-util-converter/build.xml" target="jar" inheritAll="false"/>
+        <ant antfile="${rt.root.dir}/javafx-anim/build.xml" target="jar" inheritAll="false"/>
+        <ant antfile="${rt.root.dir}/javafx-geom/build.xml" target="jar" inheritAll="false"/>
+        <ant antfile="${rt.root.dir}/pisces/build.xml" target="jar" inheritAll="false"/>
+        <ant antfile="${rt.root.dir}/decora-compiler/build.xml" target="jar" inheritAll="false"/>
+        <ant antfile="${rt.root.dir}/decora-runtime/build.xml" target="jar" inheritAll="false"/>
+        <ant antfile="${rt.root.dir}/javafx-sg-common/build.xml" target="jar" inheritAll="false"/>
+        <ant antfile="${rt.root.dir}/javafx-ui-common/build.xml" target="jar" inheritAll="false"/>
         <ant antfile="${rt.root.dir}/javafx-concurrent/build.xml" target="jar" inheritAll="false"/>
-        <ant antfile="${rt.root.dir}/javafx-logging/build.xml" target="jar" inheritAll="false"/>
-        <ant antfile="${rt.root.dir}/javafx-anim/build.xml" target="jar" inheritAll="false"/>
-        <ant antfile="${rt.root.dir}/javafx-beans/build.xml" target="jar" inheritAll="false"/>
-        <ant antfile="${rt.root.dir}/javafx-common/build.xml" target="jar" inheritAll="false"/>
-        <ant antfile="${rt.root.dir}/javafx-annotation-processor/build.xml" target="jar" inheritAll="false"/>
-        <ant antfile="${rt.root.dir}/javafx-sg-common/build.xml" target="jar" inheritAll="false"/>
-        <ant antfile="${rt.root.dir}/javafx-geom/build.xml" target="jar" inheritAll="false"/>
+        <ant antfile="${rt.root.dir}/decora-prism/build.xml" target="jar" inheritAll="false"/>
         <ant antfile="${rt.root.dir}/javafx-sg-prism/build.xml" target="jar" inheritAll="false"/>
-        <ant antfile="${rt.root.dir}/javafx-ui-common/build.xml" target="jar" inheritAll="false"/>
-        <ant antfile="${rt.root.dir}/pisces/build.xml" target="jar" inheritAll="false"/>
-        <!--<ant antfile="${rt.root.dir}/javafx-designtime/build.xml" target="jar" inheritAll="false"/>-->
+        <ant antfile="${rt.root.dir}/javafx-embed-swing/build.xml" target="jar" inheritAll="false"/>
         <ant antfile="${rt.root.dir}/javafx-ui-controls/build.xml" target="jar" inheritAll="false"/>
         <ant antfile="${rt.root.dir}/javafx-ui-charts/build.xml" target="jar" inheritAll="false"/>
+        <ant antfile="${rt.root.dir}/decora-d3d/build.xml" target="jar" inheritAll="false"/>
+        <ant antfile="${rt.root.dir}/decora-es2/build.xml" target="jar" inheritAll="false"/>
+        <ant antfile="${rt.root.dir}/decora-jsw/build.xml" target="jar" inheritAll="false"/>
+        <ant antfile="${rt.root.dir}/decora-prism-sw/build.xml" target="jar" inheritAll="false"/>
+        <ant antfile="${rt.root.dir}/decora-prism-ps/build.xml" target="jar" inheritAll="false"/>
+        <ant antfile="${rt.root.dir}/decora-sse/build.xml" target="jar" inheritAll="false"/>
+        <ant antfile="${rt.root.dir}/javafx-beans-dt/build.xml" target="jar" inheritAll="false"/>
         <ant antfile="${rt.root.dir}/javafx-fxml/build.xml" target="jar" inheritAll="false"/>
-        <ant antfile="${rt.root.dir}/javafx-embed-swing/build.xml" target="jar" inheritAll="false"/>
         <antcall target="jar-javafx-embed-swt"/>
     </target>
 
@@ -151,6 +173,7 @@
     <target name="dist" depends="jar">
         <echo>Creating merged openjfxrt.jar file</echo>
         <mkdir dir="dist" />
+        <delete file="dist/openjfxrt.jar" />
         <jar destfile="dist/openjfxrt.jar">
             <zipgroupfileset dir="." includes="**/dist/*.jar" /> 
         </jar>
--- a/common.properties	Fri Feb 08 16:44:48 2013 -0800
+++ b/common.properties	Fri Feb 08 17:37:38 2013 -0800
@@ -17,8 +17,7 @@
 javac.compilerargs=-XDignore.symbol.file
 javac.processorpath=\
     ${rt.dist.root.dir}/javafx-beans/dist/javafx-beans.jar:\
-    ${rt.dist.root.dir}/javafx-annotation-processor/dist/javafx-annotation-processor.jar:\
-    ${javac.classpath}
+    ${rt.dist.root.dir}/javafx-annotation-processor/dist/javafx-annotation-processor.jar
 javac.deprecation=false
 javac.source=1.7
 javac.target=1.7
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/decora-compiler/build-closed.xml	Fri Feb 08 17:37:38 2013 -0800
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (c) 2008, 2012 Oracle and/or its affiliates. All rights reserved.
+  ~ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+  ~
+  ~ This code is free software; you can redistribute it and/or modify it
+  ~ under the terms of the GNU General Public License version 2 only, as
+  ~ published by the Free Software Foundation.  Oracle designates this
+  ~ particular file as subject to the "Classpath" exception as provided
+  ~ by Oracle in the LICENSE file that accompanied this code.
+  ~
+  ~ This code is distributed in the hope that it will be useful, but WITHOUT
+  ~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+  ~ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+  ~ version 2 for more details (a copy is included in the LICENSE file that
+  ~ accompanied this code).
+  ~
+  ~ You should have received a copy of the GNU General Public License version
+  ~ 2 along with this work; if not, write to the Free Software Foundation,
+  ~ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+  ~
+  ~ Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+  ~ or visit www.oracle.com if you need additional information or have any
+  ~ questions.
+  -->
+<project name="decora-compiler" default="jar" basedir=".">
+    <description>Builds, tests, and jars the closed version of the decora-compiler project.</description>
+
+    <property name="base.dir" value="."/>
+    <property file="../base.properties" />
+    <property name="runtime.dist.root.dir" value="../../rt-closed" />
+    <property name="rt.dist.root.dir" value="../../rt" />
+    <path id="javac.closed.classpath.path" path="
+        ${runtime.deps.dir}/antlr277.jar:
+        ${runtime.deps.dir}/antlr-runtime.jar:
+        ${runtime.deps.dir}/stringtemplate.jar" />
+    <property name="javac.classpath" refid="javac.closed.classpath.path"/>
+
+    <import file="../build-defs.xml"/>
+    <import file="build-common.xml"/>
+
+  <target name="jar" depends="init,compile-parser">
+    <build-project>
+      <addedsrcdirs>
+        <pathelement location="build/gensrc"/>
+      </addedsrcdirs>
+      <addedsrcfiles>
+        <fileset dir="build/gensrc" excludes="${build.classes.excludes}"/>
+      </addedsrcfiles>
+    </build-project>
+  </target>
+</project>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/decora-compiler/build-common.xml	Fri Feb 08 17:37:38 2013 -0800
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (c) 2008, 2012 Oracle and/or its affiliates. All rights reserved.
+  ~ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+  ~
+  ~ This code is free software; you can redistribute it and/or modify it
+  ~ under the terms of the GNU General Public License version 2 only, as
+  ~ published by the Free Software Foundation.  Oracle designates this
+  ~ particular file as subject to the "Classpath" exception as provided
+  ~ by Oracle in the LICENSE file that accompanied this code.
+  ~
+  ~ This code is distributed in the hope that it will be useful, but WITHOUT
+  ~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+  ~ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+  ~ version 2 for more details (a copy is included in the LICENSE file that
+  ~ accompanied this code).
+  ~
+  ~ You should have received a copy of the GNU General Public License version
+  ~ 2 along with this work; if not, write to the Free Software Foundation,
+  ~ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+  ~
+  ~ Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+  ~ or visit www.oracle.com if you need additional information or have any
+  ~ questions.
+  -->
+
+<project name="decora-compiler-common" default="jar" basedir=".">
+  <description>Builds, tests, and runs the project decora-compiler.</description>
+
+  <property name="antlr.grammar.pkg" value="com/sun/scenario/effect/compiler"/>
+  <property name="antlr.grammar.file" value="${base.dir}/src/${antlr.grammar.pkg}/JSL.g"/>
+  <property name="antlr.generated.dir" value="${base.dir}/build/gensrc/${antlr.grammar.pkg}"/>
+
+  <target name="check-parser">
+    <uptodate property="parser.uptodate"
+              srcfile="${antlr.grammar.file}"
+              targetfile="${antlr.generated.dir}/JSLParser.java" />
+  </target>
+
+  <target name="compile-parser" depends="check-parser" unless="parser.uptodate">
+    <mkdir dir="${antlr.generated.dir}"/>
+    <java fork="yes" classname="org.antlr.Tool" classpath="${import.antlr.classpath}">
+      <arg value="-Xconversiontimeout"/>
+      <arg value="20000"/>
+      <arg value="-fo"/>
+      <arg value="${antlr.generated.dir}"/>
+      <arg value="-lib"/>
+      <arg value="${antlr.generated.dir}"/>
+      <arg value="${antlr.grammar.file}"/>
+    </java>
+  </target>
+
+  <target name="jar" depends="init,compile-parser">
+    <build-project>
+      <addedsrcdirs>
+        <pathelement location="build/gensrc"/>
+      </addedsrcdirs>
+      <addedsrcfiles>
+        <fileset dir="build/gensrc" excludes="${build.classes.excludes}"/>
+      </addedsrcfiles>
+    </build-project>
+  </target>
+
+  <import file="../build-defs.xml"/>
+</project>
--- a/decora-compiler/build.xml	Fri Feb 08 16:44:48 2013 -0800
+++ b/decora-compiler/build.xml	Fri Feb 08 17:37:38 2013 -0800
@@ -27,42 +27,12 @@
 <project name="decora-compiler" default="jar" basedir=".">
   <description>Builds, tests, and runs the project decora-compiler.</description>
 
-  <import file="../build-defs.xml"/>
+  <property name="base.dir" value="."/>
+  <property file="../base.properties"/>
+  <property name="import.antlr.classpath" value="
+    ${rt.dist.root.dir}/../lib/antlr-3.1.3.jar:
+    ${rt.dist.root.dir}/../lib/antlr-runtime-3.1.3.jar:
+    ${rt.dist.root.dir}/../lib/stringtemplate-3.2.jar"/>
 
-  <property name="base.dir" value="${basedir}"/>
-
-  <property name="antlr.grammar.pkg" value="com/sun/scenario/effect/compiler"/>
-  <property name="antlr.grammar.file" value="${base.dir}/src/${antlr.grammar.pkg}/JSL.g"/>
-  <property name="antlr.generated.dir" value="${base.dir}/build/gensrc/${antlr.grammar.pkg}"/>
-
-  <target name="check-parser">
-    <uptodate property="parser.uptodate"
-              srcfile="${antlr.grammar.file}"
-              targetfile="${antlr.generated.dir}/JSLParser.java" />
-  </target>
-
-  <target name="compile-parser" depends="check-parser" unless="parser.uptodate">
-    <mkdir dir="${antlr.generated.dir}"/>
-    <java fork="yes" classname="org.antlr.Tool" classpath="${import.antlr.classpath}">
-      <arg value="-Xconversiontimeout"/>
-      <arg value="20000"/>
-      <arg value="-fo"/>
-      <arg value="${antlr.generated.dir}"/>
-      <arg value="-lib"/>
-      <arg value="${antlr.generated.dir}"/>
-      <arg value="${antlr.grammar.file}"/>
-    </java>
-  </target>
-
-  <target name="jar" depends="init,compile-parser">
-    <build-project>
-      <addedsrcdirs>
-        <pathelement location="build/gensrc"/>
-      </addedsrcdirs>
-      <addedsrcfiles>
-        <fileset dir="build/gensrc" excludes="${build.classes.excludes}"/>
-      </addedsrcfiles>
-    </build-project>
-  </target>
-
+  <import file="build-common.xml"/>
 </project>
--- a/decora-compiler/project.properties	Fri Feb 08 16:44:48 2013 -0800
+++ b/decora-compiler/project.properties	Fri Feb 08 17:37:38 2013 -0800
@@ -1,4 +1,7 @@
+JFXRT_HOME=\
+    ${runtime.dist.root.dir}/../artifacts/sdk/rt
 javac.classpath=\
-    ${runtime.deps.dir}/antlr277.jar:\
-    ${runtime.deps.dir}/antlr-runtime.jar:\
-    ${runtime.deps.dir}/stringtemplate.jar
+    ${rt.dist.root.dir}/../lib/antlr-3.1.3.jar:\
+    ${rt.dist.root.dir}/../lib/antlr-runtime-3.1.3.jar:\
+    ${rt.dist.root.dir}/../lib/stringtemplate-3.2.jar:\
+    ${JFXRT_HOME}/lib/ext/jfxrt.jar
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/decora-d3d/build-closed.xml	Fri Feb 08 17:37:38 2013 -0800
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (c) 2008, 2012 Oracle and/or its affiliates. All rights reserved.
+  ~ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+  ~
+  ~ This code is free software; you can redistribute it and/or modify it
+  ~ under the terms of the GNU General Public License version 2 only, as
+  ~ published by the Free Software Foundation.  Oracle designates this
+  ~ particular file as subject to the "Classpath" exception as provided
+  ~ by Oracle in the LICENSE file that accompanied this code.
+  ~
+  ~ This code is distributed in the hope that it will be useful, but WITHOUT
+  ~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+  ~ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+  ~ version 2 for more details (a copy is included in the LICENSE file that
+  ~ accompanied this code).
+  ~
+  ~ You should have received a copy of the GNU General Public License version
+  ~ 2 along with this work; if not, write to the Free Software Foundation,
+  ~ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+  ~
+  ~ Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+  ~ or visit www.oracle.com if you need additional information or have any
+  ~ questions.
+  -->
+<project name="decora-d3d" default="jar" basedir=".">
+    <description>Builds, tests, and jars the closed version of the decora-d3d project.</description>
+
+    <property name="runtime.dist.root.dir" value="../../rt-closed" />
+    <property name="rt.dist.root.dir" value="../../rt" />
+    <path id="javac.closed.classpath.path" path="
+        ${rt.dist.root.dir}/javafx-common/dist/javafx-common.jar:
+        ${rt.dist.root.dir}/javafx-geom/dist/javafx-geom.jar:
+        ${rt.dist.root.dir}/decora-runtime/dist/decora-runtime.jar:
+        ${runtime.dist.root.dir}/glass/glass-mat/dist/glass.jar" />
+
+    <property name="build.classes.excludes" value="**/*.java,**/*.form,**/*.hlsl" />
+    <property name="javac.classpath" refid="javac.closed.classpath.path"/>
+
+    <import file="build-common.xml"/>
+</project>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/decora-d3d/build-common.xml	Fri Feb 08 17:37:38 2013 -0800
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="decora-d3d-common" default="jar" basedir=".">
+  <description>Builds, tests, and runs the project decora-d3d.</description>
+
+  <property name="jfx.build.needs.visual.studio" value="true"/>
+  <property name="jfx.build.needs.make.utility" value="true"/>
+
+  <property name="hlsl.dir" value="build/gensrc/com/sun/scenario/effect/impl/hw/d3d/hlsl"/>
+  <target name="hlsl-to-obj">
+    <apply executable="${dxsdk.path}/utilities/bin/x86/fxc"
+           dest="${hlsl.dir}" dir="${hlsl.dir}"
+           parallel="false" failonerror="true">
+      <arg value="/nologo"/>
+      <arg value="/T"/>
+      <arg value="ps_3_0"/>
+      <arg value="/Fo"/>
+      <targetfile/>
+      <srcfile/>
+      <fileset dir="${hlsl.dir}" includes="*.hlsl"/>
+      <mapper type="glob" from="*.hlsl" to="*.obj"/>
+    </apply>
+  </target>
+
+  <target name="check-native">
+    <condition property="native.uptodate">
+      <and>
+        <uptodate srcfile="${cpp.dir}/D3DShader.h"
+                  targetfile="${dll.file}" />
+        <uptodate srcfile="${cpp.dir}/D3DShader.cc"
+                  targetfile="${dll.file}" />
+        <uptodate srcfile="${cpp.dir}/D3DRenderer.h"
+                  targetfile="${dll.file}" />
+        <uptodate srcfile="${cpp.dir}/D3DRenderer.cc"
+                  targetfile="${dll.file}" />
+        <uptodate srcfile="${cpp.dir}/D3DVB.cc"
+                  targetfile="${dll.file}" />
+        <uptodate srcfile="${cpp.dir}/D3DVB.h"
+                  targetfile="${dll.file}" />
+        <uptodate srcfile="${cpp.dir}/D3DDecora.h"
+                  targetfile="${dll.file}" />
+        <uptodate srcfile="${cpp.dir}/Trace.h"
+                  targetfile="${dll.file}" />
+        <uptodate srcfile="${cpp.dir}/Trace.cc"
+                  targetfile="${dll.file}" />
+        <uptodate srcfile="${cpp.dir}/PassThroughVS.hlsl"
+                  targetfile="${dll.file}" />
+      </and>
+    </condition>
+  </target>
+
+  <target name="jar" depends="init" if="include.d3d">
+    <antcall target="hlsl-to-obj"/>
+    <build-project>
+      <addedsrcdirs>
+        <pathelement location="build/gensrc"/>
+      </addedsrcdirs>
+      <addedsrcfiles>
+        <fileset dir="build/gensrc" excludes="${build.classes.excludes}"/>
+      </addedsrcfiles>
+    </build-project>
+  </target>
+
+  <target name="clean">
+    <get-cygwin-path/>
+    <clean-project/>
+  </target>
+
+    <target name="test" depends="-init-test,jar" if="include.d3d">
+        <test-project excludes="${test.excludes}"/>
+    </target>
+
+    <target name="test-single" depends="jar" if="include.d3d">
+        <test-single/>
+    </target>
+
+  <import file="../build-defs.xml"/>
+</project>
--- a/decora-d3d/build.xml	Fri Feb 08 16:44:48 2013 -0800
+++ b/decora-d3d/build.xml	Fri Feb 08 17:37:38 2013 -0800
@@ -2,69 +2,5 @@
 <project name="decora-d3d" default="jar" basedir=".">
   <description>Builds, tests, and runs the project decora-d3d.</description>
 
-  <import file="../build-defs.xml"/>
-
-  <property name="jfx.build.needs.visual.studio" value="true"/>
-  <property name="jfx.build.needs.make.utility" value="true"/>
-
-  <property name="hlsl.dir" value="build/gensrc/com/sun/scenario/effect/impl/hw/d3d/hlsl"/>
-  <target name="hlsl-to-obj">
-    <apply executable="${dxsdk.path}/utilities/bin/x86/fxc"
-           dest="${hlsl.dir}" dir="${hlsl.dir}"
-           parallel="false" failonerror="true">
-      <arg value="/nologo"/>
-      <arg value="/T"/>
-      <arg value="ps_3_0"/>
-      <arg value="/Fo"/>
-      <targetfile/>
-      <srcfile/>
-      <fileset dir="${hlsl.dir}" includes="*.hlsl"/>
-      <mapper type="glob" from="*.hlsl" to="*.obj"/>
-    </apply>
-  </target>
-  
-  <target name="check-native">
-    <condition property="native.uptodate">
-      <and>
-        <uptodate srcfile="${cpp.dir}/D3DShader.h"
-                  targetfile="${dll.file}" />
-        <uptodate srcfile="${cpp.dir}/D3DShader.cc"
-                  targetfile="${dll.file}" />
-        <uptodate srcfile="${cpp.dir}/D3DRenderer.h"
-                  targetfile="${dll.file}" />
-        <uptodate srcfile="${cpp.dir}/D3DRenderer.cc"
-                  targetfile="${dll.file}" />
-        <uptodate srcfile="${cpp.dir}/D3DVB.cc"
-                  targetfile="${dll.file}" />
-        <uptodate srcfile="${cpp.dir}/D3DVB.h"
-                  targetfile="${dll.file}" />
-        <uptodate srcfile="${cpp.dir}/D3DDecora.h"
-                  targetfile="${dll.file}" />
-        <uptodate srcfile="${cpp.dir}/Trace.h"
-                  targetfile="${dll.file}" />
-        <uptodate srcfile="${cpp.dir}/Trace.cc"
-                  targetfile="${dll.file}" />
-        <uptodate srcfile="${cpp.dir}/PassThroughVS.hlsl"
-                  targetfile="${dll.file}" />
-      </and>
-    </condition>
-  </target>
-
-  <target name="jar" depends="init">
-    <antcall target="hlsl-to-obj"/>
-    <build-project>
-      <addedsrcdirs>
-        <pathelement location="build/gensrc"/>
-      </addedsrcdirs>
-      <addedsrcfiles>
-        <fileset dir="build/gensrc" excludes="${build.classes.excludes}"/>
-      </addedsrcfiles>
-    </build-project>
-  </target>
-  
-  <target name="clean">
-    <get-cygwin-path/>
-    <clean-project/>
-  </target>
-  
+  <import file="build-common.xml"/>
 </project>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/decora-es2/build-closed.xml	Fri Feb 08 17:37:38 2013 -0800
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (c) 2008, 2012 Oracle and/or its affiliates. All rights reserved.
+  ~ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+  ~
+  ~ This code is free software; you can redistribute it and/or modify it
+  ~ under the terms of the GNU General Public License version 2 only, as
+  ~ published by the Free Software Foundation.  Oracle designates this
+  ~ particular file as subject to the "Classpath" exception as provided
+  ~ by Oracle in the LICENSE file that accompanied this code.
+  ~
+  ~ This code is distributed in the hope that it will be useful, but WITHOUT
+  ~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+  ~ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+  ~ version 2 for more details (a copy is included in the LICENSE file that
+  ~ accompanied this code).
+  ~
+  ~ You should have received a copy of the GNU General Public License version
+  ~ 2 along with this work; if not, write to the Free Software Foundation,
+  ~ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+  ~
+  ~ Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+  ~ or visit www.oracle.com if you need additional information or have any
+  ~ questions.
+  -->
+<project name="decora-es2" default="jar" basedir=".">
+    <description>Builds, tests, and jars the closed version of the decora-es2 project.</description>
+
+    <property name="runtime.dist.root.dir" value="../../rt-closed" />
+    <property name="rt.dist.root.dir" value="../../rt" />
+    <property name="base.dir" value="${basedir}"/>
+    <property name="jsl.dir" value="jsl"/>
+    <path id="javac.closed.classpath.path" path="
+        ${rt.dist.root.dir}/javafx-geom/dist/javafx-geom.jar:
+        ${rt.dist.root.dir}/decora-runtime/dist/decora-runtime.jar" />
+    <property name="javac.classpath" refid="javac.closed.classpath.path"/>
+
+    <import file="build-common.xml"/>
+</project>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/decora-es2/build-common.xml	Fri Feb 08 17:37:38 2013 -0800
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="decora-es2-common" default="jar" basedir=".">
+  <description>Builds, tests, and runs the project decora-es2.</description>
+
+  <target name="jar" depends="init">
+    <echo message="RUNNING DECORA ES2 COMMON" /> 
+    <build-project>
+      <addedsrcdirs>
+        <pathelement location="build/gensrc"/>
+      </addedsrcdirs>
+      <addedsrcfiles>
+        <fileset dir="build/gensrc" excludes="${build.classes.excludes}"/>
+      </addedsrcfiles>
+    </build-project>
+  </target>
+  <import file="../build-defs.xml"/>
+</project>
--- a/decora-es2/build.xml	Fri Feb 08 16:44:48 2013 -0800
+++ b/decora-es2/build.xml	Fri Feb 08 17:37:38 2013 -0800
@@ -2,17 +2,6 @@
 <project name="decora-es2" default="jar" basedir=".">
   <description>Builds, tests, and runs the project decora-es2.</description>
 
-  <import file="../build-defs.xml"/>
-
-  <target name="jar" depends="init">
-    <build-project>
-      <addedsrcdirs>
-        <pathelement location="build/gensrc"/>
-      </addedsrcdirs>
-      <addedsrcfiles>
-        <fileset dir="build/gensrc" excludes="${build.classes.excludes}"/>
-      </addedsrcfiles>
-    </build-project>
-  </target>
+  <import file="build-common.xml"/>
 
 </project>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/decora-jsw/build-closed.xml	Fri Feb 08 17:37:38 2013 -0800
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (c) 2008, 2012 Oracle and/or its affiliates. All rights reserved.
+  ~ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+  ~
+  ~ This code is free software; you can redistribute it and/or modify it
+  ~ under the terms of the GNU General Public License version 2 only, as
+  ~ published by the Free Software Foundation.  Oracle designates this
+  ~ particular file as subject to the "Classpath" exception as provided
+  ~ by Oracle in the LICENSE file that accompanied this code.
+  ~
+  ~ This code is distributed in the hope that it will be useful, but WITHOUT
+  ~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+  ~ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+  ~ version 2 for more details (a copy is included in the LICENSE file that
+  ~ accompanied this code).
+  ~
+  ~ You should have received a copy of the GNU General Public License version
+  ~ 2 along with this work; if not, write to the Free Software Foundation,
+  ~ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+  ~
+  ~ Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+  ~ or visit www.oracle.com if you need additional information or have any
+  ~ questions.
+  -->
+<project name="decora-jsw" default="jar" basedir=".">
+    <description>Builds, tests, and jars the closed version of the decora-jsw project.</description>
+
+    <property name="runtime.dist.root.dir" value="../../rt-closed" />
+    <property name="rt.dist.root.dir" value="../../rt" />
+    <property name="base.dir" value="${basedir}"/>
+    <property name="jsl.dir" value="jsl"/>
+    <path id="javac.closed.classpath.path" path="
+        ${rt.dist.root.dir}/javafx-geom/dist/javafx-geom.jar:
+        ${rt.dist.root.dir}/decora-runtime/dist/decora-runtime.jar" />
+    <property name="javac.classpath" refid="javac.closed.classpath.path"/>
+
+    <import file="build-common.xml"/>
+</project>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/decora-jsw/build-common.xml	Fri Feb 08 17:37:38 2013 -0800
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="decora-jsw-common" default="jar" basedir=".">
+  <description>Builds, tests, and runs the project decora-jsw</description>
+
+  <target name="jar" depends="init">
+    <build-project>
+      <addedsrcdirs>
+        <pathelement location="build/gensrc"/>
+      </addedsrcdirs>
+      <addedsrcfiles>
+        <fileset dir="build/gensrc" excludes="${build.classes.excludes}"/>
+      </addedsrcfiles>
+    </build-project>
+  </target>
+  <import file="../build-defs.xml"/>
+</project>
--- a/decora-jsw/build.xml	Fri Feb 08 16:44:48 2013 -0800
+++ b/decora-jsw/build.xml	Fri Feb 08 17:37:38 2013 -0800
@@ -2,17 +2,6 @@
 <project name="decora-jsw" default="jar" basedir=".">
   <description>Builds, tests, and runs the project decora-jsw.</description>
 
-  <import file="../build-defs.xml"/>
-
-  <target name="jar" depends="init">
-    <build-project>
-      <addedsrcdirs>
-        <pathelement location="build/gensrc"/>
-      </addedsrcdirs>
-      <addedsrcfiles>
-        <fileset dir="build/gensrc" excludes="${build.classes.excludes}"/>
-      </addedsrcfiles>
-    </build-project>
-  </target>
+  <import file="build-common.xml"/>
 
 </project>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/decora-prism-ps/build-closed.xml	Fri Feb 08 17:37:38 2013 -0800
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (c) 2008, 2012 Oracle and/or its affiliates. All rights reserved.
+  ~ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+  ~
+  ~ This code is free software; you can redistribute it and/or modify it
+  ~ under the terms of the GNU General Public License version 2 only, as
+  ~ published by the Free Software Foundation.  Oracle designates this
+  ~ particular file as subject to the "Classpath" exception as provided
+  ~ by Oracle in the LICENSE file that accompanied this code.
+  ~
+  ~ This code is distributed in the hope that it will be useful, but WITHOUT
+  ~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+  ~ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+  ~ version 2 for more details (a copy is included in the LICENSE file that
+  ~ accompanied this code).
+  ~
+  ~ You should have received a copy of the GNU General Public License version
+  ~ 2 along with this work; if not, write to the Free Software Foundation,
+  ~ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+  ~
+  ~ Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+  ~ or visit www.oracle.com if you need additional information or have any
+  ~ questions.
+  -->
+<project name="decora-prism-ps" default="jar" basedir=".">
+    <description>Builds, tests, and jars the closed version of the decora-prism-ps project.</description>
+
+    <property name="runtime.dist.root.dir" value="../../rt-closed" />
+    <property name="rt.dist.root.dir" value="../../rt" />
+    <property name="base.dir" value="${basedir}"/>
+    <property name="jsl.dir" value="jsl"/>
+    <path id="javac.closed.classpath.path" path="
+        ${rt.dist.root.dir}/javafx-geom/dist/javafx-geom.jar:
+        ${rt.dist.root.dir}/decora-runtime/dist/decora-runtime.jar:
+        ${rt.dist.root.dir}/decora-prism/dist/decora-prism.jar:
+        ${runtime.dist.root.dir}/prism-common/dist/prism-common.jar:
+        ${runtime.dist.root.dir}/prism-ps/dist/prism-ps.jar:
+        ${rt.dist.root.dir}/javafx-ui-common/dist/javafx-ui-common.jar:
+        ${runtime.dist.root.dir}/glass/glass-mat/dist/glass.jar" />
+    <property name="javac.classpath" refid="javac.closed.classpath.path"/>
+
+    <import file="build-common.xml"/>
+</project>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/decora-prism-ps/build-common.xml	Fri Feb 08 17:37:38 2013 -0800
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="decora-prism-ps-common" default="jar" basedir=".">
+  <description>Builds, tests, and runs the project decora-prism-ps.</description>
+
+  <target name="jar" depends="init">
+    <build-project>
+      <addedsrcdirs>
+        <pathelement location="build/gensrc"/>
+      </addedsrcdirs>
+      <addedsrcfiles>
+        <fileset dir="build/gensrc" excludes="${build.classes.excludes}"/>
+      </addedsrcfiles>
+    </build-project>
+  </target>
+
+  <import file="../build-defs.xml"/>
+</project>
--- a/decora-prism-ps/build.xml	Fri Feb 08 16:44:48 2013 -0800
+++ b/decora-prism-ps/build.xml	Fri Feb 08 17:37:38 2013 -0800
@@ -2,17 +2,5 @@
 <project name="decora-prism-ps" default="jar" basedir=".">
   <description>Builds, tests, and runs the project decora-prism-ps.</description>
 
-  <import file="../build-defs.xml"/>
-
-  <target name="jar" depends="init">
-    <build-project>
-      <addedsrcdirs>
-        <pathelement location="build/gensrc"/>
-      </addedsrcdirs>
-      <addedsrcfiles>
-        <fileset dir="build/gensrc" excludes="${build.classes.excludes}"/>
-      </addedsrcfiles>
-    </build-project>
-  </target>
-
+  <import file="build-common.xml"/>
 </project>
--- a/decora-prism-ps/project.properties	Fri Feb 08 16:44:48 2013 -0800
+++ b/decora-prism-ps/project.properties	Fri Feb 08 17:37:38 2013 -0800
@@ -1,8 +1,8 @@
+JFXRT_HOME=\
+    ${runtime.dist.root.dir}/../artifacts/sdk/rt
 javac.classpath=\
     ${rt.dist.root.dir}/javafx-geom/dist/javafx-geom.jar:\
     ${rt.dist.root.dir}/decora-runtime/dist/decora-runtime.jar:\
     ${rt.dist.root.dir}/decora-prism/dist/decora-prism.jar:\
-    ${runtime.dist.root.dir}/prism-common/dist/prism-common.jar:\
-    ${runtime.dist.root.dir}/prism-ps/dist/prism-ps.jar:\
     ${rt.dist.root.dir}/javafx-ui-common/dist/javafx-ui-common.jar:\
-    ${runtime.dist.root.dir}/glass/glass-mat/dist/glass.jar
+    ${JFXRT_HOME}/lib/ext/jfxrt.jar
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/decora-prism-sw/build-closed.xml	Fri Feb 08 17:37:38 2013 -0800
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (c) 2008, 2012 Oracle and/or its affiliates. All rights reserved.
+  ~ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+  ~
+  ~ This code is free software; you can redistribute it and/or modify it
+  ~ under the terms of the GNU General Public License version 2 only, as
+  ~ published by the Free Software Foundation.  Oracle designates this
+  ~ particular file as subject to the "Classpath" exception as provided
+  ~ by Oracle in the LICENSE file that accompanied this code.
+  ~
+  ~ This code is distributed in the hope that it will be useful, but WITHOUT
+  ~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+  ~ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+  ~ version 2 for more details (a copy is included in the LICENSE file that
+  ~ accompanied this code).
+  ~
+  ~ You should have received a copy of the GNU General Public License version
+  ~ 2 along with this work; if not, write to the Free Software Foundation,
+  ~ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+  ~
+  ~ Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+  ~ or visit www.oracle.com if you need additional information or have any
+  ~ questions.
+  -->
+<project name="decora-prism-sw" default="jar" basedir=".">
+    <description>Builds, tests, and jars the closed version of the decora-prism-sw project.</description>
+
+    <property name="runtime.dist.root.dir" value="../../rt-closed" />
+    <property name="rt.dist.root.dir" value="../../rt" />
+    <property name="base.dir" value="${basedir}"/>
+    <property name="jsl.dir" value="jsl"/>
+    <path id="javac.closed.classpath.path" path="
+        ${rt.dist.root.dir}/javafx-geom/dist/javafx-geom.jar:
+        ${rt.dist.root.dir}/decora-runtime/dist/decora-runtime.jar:
+        ${rt.dist.root.dir}/decora-prism/dist/decora-prism.jar:
+        ${runtime.dist.root.dir}/prism-common/dist/prism-common.jar:
+        ${rt.dist.root.dir}/javafx-ui-common/dist/javafx-ui-common.jar:
+        ${runtime.dist.root.dir}/glass/glass-mat/dist/glass.jar" />
+    <property name="javac.classpath" refid="javac.closed.classpath.path"/>
+
+    <import file="build-common.xml"/>
+</project>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/decora-prism-sw/build-common.xml	Fri Feb 08 17:37:38 2013 -0800
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="decora-prism-sw-common" default="jar" basedir=".">
+  <description>Builds, tests, and runs the project decora-prism-sw.</description>
+
+  <import file="../build-defs.xml"/>
+</project>
--- a/decora-prism-sw/build.xml	Fri Feb 08 16:44:48 2013 -0800
+++ b/decora-prism-sw/build.xml	Fri Feb 08 17:37:38 2013 -0800
@@ -2,6 +2,6 @@
 <project name="decora-prism-sw" default="jar" basedir=".">
   <description>Builds, tests, and runs the project decora-prism-sw.</description>
 
-  <import file="../build-defs.xml"/>
+  <import file="build-common.xml"/>
 
 </project>
--- a/decora-prism-sw/project.properties	Fri Feb 08 16:44:48 2013 -0800
+++ b/decora-prism-sw/project.properties	Fri Feb 08 17:37:38 2013 -0800
@@ -1,7 +1,9 @@
+JFXRT_HOME=\
+    ${runtime.dist.root.dir}/../artifacts/sdk/rt
 javac.classpath=\
     ${rt.dist.root.dir}/javafx-geom/dist/javafx-geom.jar:\
     ${rt.dist.root.dir}/decora-runtime/dist/decora-runtime.jar:\
     ${rt.dist.root.dir}/decora-prism/dist/decora-prism.jar:\
-    ${runtime.dist.root.dir}/prism-common/dist/prism-common.jar:\
     ${rt.dist.root.dir}/javafx-ui-common/dist/javafx-ui-common.jar:\
-    ${runtime.dist.root.dir}/glass/glass-mat/dist/glass.jar
+    ${JFXRT_HOME}/lib/ext/jfxrt.jar
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/decora-prism/build-closed.xml	Fri Feb 08 17:37:38 2013 -0800
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="decora-prism" default="jar" basedir=".">
+    <description>Builds, tests, and jars the closed version of the decora-prism project.</description>
+    
+    <property name="runtime.dist.root.dir" value="../../rt-closed" />    
+    <property name="rt.dist.root.dir" value="../../rt" />
+    <path id="javac.closed.classpath.path" path="
+        ${rt.dist.root.dir}/javafx-geom/dist/javafx-geom.jar:
+        ${rt.dist.root.dir}/decora-runtime/dist/decora-runtime.jar:
+        ${runtime.dist.root.dir}/prism-common/dist/prism-common.jar:
+        ${runtime.dist.root.dir}/glass/glass-mat/dist/glass.jar" />
+    <property name="javac.classpath" refid="javac.closed.classpath.path"/>
+    
+    <import file="build-common.xml"/>
+</project>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/decora-prism/build-common.xml	Fri Feb 08 17:37:38 2013 -0800
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="decora-prism-common" default="jar" basedir=".">
+    <target name="debug-test-file" depends="jar">
+        <echo message="${run.test.classpath}" />
+        <debug-selected-file-in-test/>
+    </target>
+    <import file="../build-defs.xml" />
+</project>
--- a/decora-prism/build.xml	Fri Feb 08 16:44:48 2013 -0800
+++ b/decora-prism/build.xml	Fri Feb 08 17:37:38 2013 -0800
@@ -2,6 +2,6 @@
 <project name="decora-prism" default="default" basedir=".">
   <description>Builds, tests, and runs the project decora-prism.</description>
 
-  <import file="../build-defs.xml"/>
+  <import file="build-common.xml"/>
 
 </project>
--- a/decora-prism/project.properties	Fri Feb 08 16:44:48 2013 -0800
+++ b/decora-prism/project.properties	Fri Feb 08 17:37:38 2013 -0800
@@ -1,5 +1,6 @@
+JFXRT_HOME=\
+    ${runtime.dist.root.dir}/../artifacts/sdk/rt
 javac.classpath=\
     ${rt.dist.root.dir}/javafx-geom/dist/javafx-geom.jar:\
     ${rt.dist.root.dir}/decora-runtime/dist/decora-runtime.jar:\
-    ${runtime.dist.root.dir}/prism-common/dist/prism-common.jar:\
-    ${runtime.dist.root.dir}/glass/glass-mat/dist/glass.jar
+    ${JFXRT_HOME}/lib/ext/jfxrt.jar
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/decora-runtime/build-closed.xml	Fri Feb 08 17:37:38 2013 -0800
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (c) 2008, 2012 Oracle and/or its affiliates. All rights reserved.
+  ~ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+  ~
+  ~ This code is free software; you can redistribute it and/or modify it
+  ~ under the terms of the GNU General Public License version 2 only, as
+  ~ published by the Free Software Foundation.  Oracle designates this
+  ~ particular file as subject to the "Classpath" exception as provided
+  ~ by Oracle in the LICENSE file that accompanied this code.
+  ~
+  ~ This code is distributed in the hope that it will be useful, but WITHOUT
+  ~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+  ~ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+  ~ version 2 for more details (a copy is included in the LICENSE file that
+  ~ accompanied this code).
+  ~
+  ~ You should have received a copy of the GNU General Public License version
+  ~ 2 along with this work; if not, write to the Free Software Foundation,
+  ~ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+  ~
+  ~ Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+  ~ or visit www.oracle.com if you need additional information or have any
+  ~ questions.
+  -->
+<project name="decora-runtime" default="jar" basedir=".">
+    <description>Builds, tests, and jars the closed version of the decora-runtime project.</description>
+
+    <property name="runtime.dist.root.dir" value="../../rt-closed" />
+    <property name="rt.dist.root.dir" value="../../rt" />
+    <property name="base.dir" value="${basedir}"/>
+    <property name="jsl.dir" value="jsl"/>
+    <path id="javac.closed.classpath.path" path="
+        ${rt.dist.root.dir}/javafx-geom/dist/javafx-geom.jar:
+        ${rt.dist.root.dir}/javafx-common/dist/javafx-common.jar"/>
+    <property name="javac.classpath" refid="javac.closed.classpath.path"/>
+
+    <import file="build-common.xml"/>
+</project>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/decora-runtime/build-common.xml	Fri Feb 08 17:37:38 2013 -0800
@@ -0,0 +1,145 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="decora-runtime-common" default="jar" basedir=".">
+  <description>Builds, tests, and runs the project decora-runtime.</description>
+
+  <import file="../build-defs.xml"/>
+
+  <property name="jsl.dir" value="jsl"/>
+  <property name="base.dir" value="${basedir}"/>
+
+  <path id="jsl.compiler.class.path">
+    <fileset dir="${rt.dist.root.dir}/decora-compiler/dist">
+      <include name="**/*.jar"/>
+    </fileset>
+    <fileset dir="${import.antlr.lib}">
+      <include name="**/*.jar"/>
+    </fileset>
+    <pathelement location="${build.classes.dir}"/>
+  </path>
+
+  <target name="compile-jsl-compiler">
+    <available property="jsl.compiler.exists" file="${rt.dist.root.dir}/decora-compiler/dist/decora-compiler.jar"/>
+    <fail unless="jsl.compiler.exists">Must build decora-compiler first!</fail>
+    <javac srcdir="generator" destdir="build/generator" classpathref="jsl.compiler.class.path"
+           includeantruntime="no"/>
+  </target>
+
+  <target name="do-compile-jsl">
+    <echo message="Compiling ${jsl.filename}.jsl using ${jsl.classname} (outputs=${jsl.outputs})"/>
+    <java fork="false" classname="${jsl.classname}" failonerror="true">
+      <classpath>
+        <path refid="jsl.compiler.class.path"/>
+        <pathelement path="build/generator"/>
+      </classpath>
+      <arg value="-i"/>
+      <arg value="${basedir}/jsl"/>
+      <arg value="-o"/>
+      <arg value="${basedir}/.."/>
+      <arg value="-pkg"/>
+      <arg value="com/sun/scenario/effect"/>
+      <arg value="${jsl.outputs}"/>
+      <arg value="${jsl.filename}"/>
+    </java>
+  </target>
+
+  <target name="do-compile-external-jsl">
+    <java fork="true" classname="CompileExternal" failonerror="true">
+      <classpath>
+        <path refid="jsl.compiler.class.path"/>
+        <pathelement path="build/generator"/>
+      </classpath>
+      <arg value="-i"/>
+      <arg value="${jsl.inputdir}"/>
+      <arg value="-o"/>
+      <arg value="${jsl.outputdir}"/>
+      <arg value="${jsl.outputs}"/>
+      <arg value="${jsl.filename}"/>
+    </java>
+  </target>
+
+  <target name="-pre-init">
+    <mkdir dir="build/gensrc"/>
+    <mkdir dir="build/generator"/>
+
+    <!-- Calls CompileJSL (or variant) if generated files are not uptodate -->
+    <macrodef name="compile-jsl">
+      <!-- name of the generator class (by default uses generic CompileJSL -->
+      <attribute default="CompileJSL" name="classname"/>
+      <!-- name of the JSL file to be compiled -->
+      <attribute default="" name="filename"/>
+      <!-- suffix of the generated Java file used for up-to-date check -->
+      <attribute default="" name="suffix"/>
+      <!-- which output file types to generate -->
+      <attribute default="-all" name="outputs"/>
+      <sequential>
+        <!-- RT-27393
+             TODO: Fix the dependencies.  For now we always call the
+             compile program, but it has been modified to only generate
+             outputs that are out of date.  This saves a lot of work but
+             is not quite as fast as if we could measure the dependencies
+             here and avoid running the program at all. -->
+        <uptodate property="@{classname}.@{filename}.uptodate"
+                  targetfile="NONEXISTANTFILE">
+          <srcfiles dir="${jsl.dir}" includes="@{filename}*.jsl" />
+        </uptodate>
+        <antcall target="do-compile-jsl">
+          <param name="jsl.classname" value="@{classname}"/>
+          <param name="jsl.filename" value="@{filename}"/>
+          <param name="jsl.outputs" value="@{outputs}"/>
+        </antcall>
+      </sequential>
+    </macrodef>
+
+    <macrodef name="compile-test-jsl">
+      <attribute default="" name="filename"/>
+      <sequential>
+        <antcall target="do-compile-external-jsl">
+          <param name="jsl.filename" value="@{filename}"/>
+          <param name="jsl.inputdir" value="./testjsl"/>
+          <param name="jsl.outputdir" value="../decora-jsw/build/test/gensrc"/>
+          <param name="jsl.outputs" value="-sw"/>
+        </antcall>
+      </sequential>
+    </macrodef>
+  </target>
+
+  <!-- RT-27383 TODO: force running of CompileJSL if compiler sources were modified -->
+  <target name="jar" depends="init">
+    <build-project/>
+    <antcall target="compile-jsl-compiler"/>
+    <compile-jsl filename="ColorAdjust"/>
+    <compile-jsl filename="Brightpass"/>
+    <compile-jsl filename="SepiaTone"/>
+    <compile-jsl filename="PerspectiveTransform"/>
+    <compile-jsl filename="DisplacementMap"/>
+    <compile-jsl filename="InvertMask"/>
+    <compile-jsl classname="CompileBlend" filename="Blend" suffix="_ADD"/>
+    <compile-jsl classname="CompilePhong" filename="PhongLighting" suffix="_POINT"/>
+    <compile-jsl classname="CompileLinearConvolve" filename="LinearConvolve" outputs="-hw"/>
+    <compile-jsl classname="CompileLinearConvolve" filename="LinearConvolveShadow" outputs="-hw"/>
+    <!--<compile-jsl classname="CompileZoomRadialBlur" filename="ZoomRadialBlur"/>-->
+
+    <!-- force compilation of generated effect peer sources -->
+    <build-project/>
+  </target>
+
+  <!-- We're currently relying on the generated sources under
+       decora-j2d-rsl/build/gensrc to determine whether the JSL files need to
+       be recompiled, so for now always clean the decora-j2d-rsl/build
+       directory after cleaning decora-runtime... -->
+  <target name="clean">
+    <clean-project/>
+    <delete dir="../decora-j2d-rsl/build"/>
+  </target>
+
+  <target name="test" depends="jar">
+    <mkdir dir="build/test/gensrc"/>
+    <!-- for now we'll output the jsw peers into decora-jsw since we're not
+         concerned with building the generated peers (all we care about is
+         compiling the JSL files) -->
+    <mkdir dir="../decora-jsw/build/test/gensrc"/>
+    <compile-test-jsl filename="Test1"/>
+    <compile-test-jsl filename="Test2"/>
+    <test-project/>
+  </target>
+</project>
--- a/decora-runtime/build.xml	Fri Feb 08 16:44:48 2013 -0800
+++ b/decora-runtime/build.xml	Fri Feb 08 17:37:38 2013 -0800
@@ -1,146 +1,37 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (c) 2008, 2012 Oracle and/or its affiliates. All rights reserved.
+  ~ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+  ~
+  ~ This code is free software; you can redistribute it and/or modify it
+  ~ under the terms of the GNU General Public License version 2 only, as
+  ~ published by the Free Software Foundation.  Oracle designates this
+  ~ particular file as subject to the "Classpath" exception as provided
+  ~ by Oracle in the LICENSE file that accompanied this code.
+  ~
+  ~ This code is distributed in the hope that it will be useful, but WITHOUT
+  ~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+  ~ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+  ~ version 2 for more details (a copy is included in the LICENSE file that
+  ~ accompanied this code).
+  ~
+  ~ You should have received a copy of the GNU General Public License version
+  ~ 2 along with this work; if not, write to the Free Software Foundation,
+  ~ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+  ~
+  ~ Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+  ~ or visit www.oracle.com if you need additional information or have any
+  ~ questions.
+  -->
+
 <project name="decora-runtime" default="jar" basedir=".">
-  <description>Builds, tests, and runs the project decora-runtime.</description>
+  <description>Builds, tests, and runs the project decora-compiler.</description>
 
-  <import file="../build-defs.xml"/>
+  <property name="base.dir" value="${basedir}"/>
+  <property name="jsl.dir" value="jsl"/>
+  <property file="../base.properties"/>
+  <property name="import.antlr.lib" value="${rt.dist.root.dir}/../lib" />
 
-  <property name="jsl.dir" value="jsl"/>
-  <property name="base.dir" value="${basedir}"/>
-
-  <path id="jsl.compiler.class.path">
-    <fileset dir="${rt.dist.root.dir}/decora-compiler/dist">
-      <include name="**/*.jar"/>
-    </fileset>
-    <fileset dir="${import.antlr.lib}">
-      <include name="**/*.jar"/>
-    </fileset>
-    <pathelement location="${build.classes.dir}"/>
-  </path>
-
-  <target name="compile-jsl-compiler">
-    <available property="jsl.compiler.exists" file="${rt.dist.root.dir}/decora-compiler/dist/decora-compiler.jar"/>
-    <fail unless="jsl.compiler.exists">Must build decora-compiler first!</fail>
-    <javac srcdir="generator" destdir="build/generator" classpathref="jsl.compiler.class.path"
-           includeantruntime="no"/>
-  </target>
-
-  <target name="do-compile-jsl">
-    <echo message="Compiling ${jsl.filename}.jsl using ${jsl.classname} (outputs=${jsl.outputs})"/>
-    <java fork="false" classname="${jsl.classname}" failonerror="true">
-      <classpath>
-        <path refid="jsl.compiler.class.path"/>
-        <pathelement path="build/generator"/>
-      </classpath>
-      <arg value="-i"/>
-      <arg value="${basedir}/jsl"/>
-      <arg value="-o"/>
-      <arg value="${basedir}/.."/>
-      <arg value="-pkg"/>
-      <arg value="com/sun/scenario/effect"/>
-      <arg value="${jsl.outputs}"/>
-      <arg value="${jsl.filename}"/>
-    </java>
-  </target>
-
-  <target name="do-compile-external-jsl">
-    <java fork="true" classname="CompileExternal" failonerror="true">
-      <classpath>
-        <path refid="jsl.compiler.class.path"/>
-        <pathelement path="build/generator"/>
-      </classpath>
-      <arg value="-i"/>
-      <arg value="${jsl.inputdir}"/>
-      <arg value="-o"/>
-      <arg value="${jsl.outputdir}"/>
-      <arg value="${jsl.outputs}"/>
-      <arg value="${jsl.filename}"/>
-    </java>
-  </target>
-
-  <target name="-pre-init">
-    <mkdir dir="build/gensrc"/>
-    <mkdir dir="build/generator"/>
-
-    <!-- Calls CompileJSL (or variant) if generated files are not uptodate -->
-    <macrodef name="compile-jsl">
-      <!-- name of the generator class (by default uses generic CompileJSL -->
-      <attribute default="CompileJSL" name="classname"/>
-      <!-- name of the JSL file to be compiled -->
-      <attribute default="" name="filename"/>
-      <!-- suffix of the generated Java file used for up-to-date check -->
-      <attribute default="" name="suffix"/>
-      <!-- which output file types to generate -->
-      <attribute default="-all" name="outputs"/>
-      <sequential>
-        <!-- RT-27393
-             TODO: Fix the dependencies.  For now we always call the
-             compile program, but it has been modified to only generate
-             outputs that are out of date.  This saves a lot of work but
-             is not quite as fast as if we could measure the dependencies
-             here and avoid running the program at all. -->
-        <uptodate property="@{classname}.@{filename}.uptodate"
-                  targetfile="NONEXISTANTFILE">
-          <srcfiles dir="${jsl.dir}" includes="@{filename}*.jsl" />
-        </uptodate>
-        <antcall target="do-compile-jsl">
-          <param name="jsl.classname" value="@{classname}"/>
-          <param name="jsl.filename" value="@{filename}"/>
-          <param name="jsl.outputs" value="@{outputs}"/>
-        </antcall>
-      </sequential>
-    </macrodef>
-
-    <macrodef name="compile-test-jsl">
-      <attribute default="" name="filename"/>
-      <sequential>
-        <antcall target="do-compile-external-jsl">
-          <param name="jsl.filename" value="@{filename}"/>
-          <param name="jsl.inputdir" value="./testjsl"/>
-          <param name="jsl.outputdir" value="../decora-jsw/build/test/gensrc"/>
-          <param name="jsl.outputs" value="-sw"/>
-        </antcall>
-      </sequential>
-    </macrodef>
-  </target>
-
-  <!-- RT-27383 TODO: force running of CompileJSL if compiler sources were modified -->
-  <target name="jar" depends="init">
-    <build-project/>
-    <antcall target="compile-jsl-compiler"/>
-    <compile-jsl filename="ColorAdjust"/>
-    <compile-jsl filename="Brightpass"/>
-    <compile-jsl filename="SepiaTone"/>
-    <compile-jsl filename="PerspectiveTransform"/>
-    <compile-jsl filename="DisplacementMap"/>
-    <compile-jsl filename="InvertMask"/>
-    <compile-jsl classname="CompileBlend" filename="Blend" suffix="_ADD"/>
-    <compile-jsl classname="CompilePhong" filename="PhongLighting" suffix="_POINT"/>
-    <compile-jsl classname="CompileLinearConvolve" filename="LinearConvolve" outputs="-hw"/>
-    <compile-jsl classname="CompileLinearConvolve" filename="LinearConvolveShadow" outputs="-hw"/>
-    <!--<compile-jsl classname="CompileZoomRadialBlur" filename="ZoomRadialBlur"/>-->
-
-    <!-- force compilation of generated effect peer sources -->
-    <build-project/>
-  </target>
-
-  <!-- We're currently relying on the generated sources under
-       decora-j2d-rsl/build/gensrc to determine whether the JSL files need to
-       be recompiled, so for now always clean the decora-j2d-rsl/build
-       directory after cleaning decora-runtime... -->
-  <target name="clean">
-    <clean-project/>
-    <delete dir="../decora-j2d-rsl/build"/>
-  </target>
-
-  <target name="test" depends="jar">
-    <mkdir dir="build/test/gensrc"/>
-    <!-- for now we'll output the jsw peers into decora-jsw since we're not
-         concerned with building the generated peers (all we care about is
-         compiling the JSL files) -->
-    <mkdir dir="../decora-jsw/build/test/gensrc"/>
-    <compile-test-jsl filename="Test1"/>
-    <compile-test-jsl filename="Test2"/>
-    <test-project/>
-  </target>
+  <import file="build-common.xml"/>
 
 </project>
--- a/decora-runtime/project.properties	Fri Feb 08 16:44:48 2013 -0800
+++ b/decora-runtime/project.properties	Fri Feb 08 17:37:38 2013 -0800
@@ -1,5 +1,8 @@
+JFXRT_HOME=\
+    ${runtime.dist.root.dir}/../artifacts/sdk/rt
 javac.classpath=\
     ${rt.dist.root.dir}/javafx-geom/dist/javafx-geom.jar:\
-    ${rt.dist.root.dir}/javafx-common/dist/javafx-common.jar
+    ${rt.dist.root.dir}/javafx-common/dist/javafx-common.jar:\
+    ${JFXRT_HOME}/lib/ext/jfxrt.jar
 
 test-sys-prop.apple.awt.UIElement=true
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/decora-sse/build-closed.xml	Fri Feb 08 17:37:38 2013 -0800
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (c) 2008, 2012 Oracle and/or its affiliates. All rights reserved.
+  ~ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+  ~
+  ~ This code is free software; you can redistribute it and/or modify it
+  ~ under the terms of the GNU General Public License version 2 only, as
+  ~ published by the Free Software Foundation.  Oracle designates this
+  ~ particular file as subject to the "Classpath" exception as provided
+  ~ by Oracle in the LICENSE file that accompanied this code.
+  ~
+  ~ This code is distributed in the hope that it will be useful, but WITHOUT
+  ~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+  ~ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+  ~ version 2 for more details (a copy is included in the LICENSE file that
+  ~ accompanied this code).
+  ~
+  ~ You should have received a copy of the GNU General Public License version
+  ~ 2 along with this work; if not, write to the Free Software Foundation,
+  ~ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+  ~
+  ~ Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+  ~ or visit www.oracle.com if you need additional information or have any
+  ~ questions.
+  -->
+<project name="decora-sse" default="jar" basedir=".">
+    <description>Builds, tests, and jars the closed version of the decora-sse project.</description>
+
+    <property name="runtime.dist.root.dir" value="../../rt-closed" />
+    <property name="rt.dist.root.dir" value="../../rt" />
+    <property name="base.dir" value="${basedir}"/>
+    <property name="jsl.dir" value="jsl"/>
+    <path id="javac.closed.classpath.path" path="
+        ${rt.dist.root.dir}/javafx-common/dist/javafx-common.jar:
+        ${rt.dist.root.dir}/javafx-geom/dist/javafx-geom.jar:
+        ${rt.dist.root.dir}/decora-runtime/dist/decora-runtime.jar:
+        ${runtime.dist.root.dir}/glass/glass-mat/dist/glass.jar" />
+    <property name="javac.classpath" refid="javac.closed.classpath.path"/>
+
+    <import file="build-common.xml"/>
+</project>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/decora-sse/build-common.xml	Fri Feb 08 17:37:38 2013 -0800
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="decora-sse-common" default="jar" basedir=".">
+  <description>Builds, tests, and runs the project decora-sse.</description>
+
+  <property name="cpp.dir" value="../decora-sse-native"/>
+  <property name="gen.cpp.dir" value="../decora-sse-native/build/gensrc"/>
+  <property name="native.lib.dir" value="../decora-sse-native/dist"/>
+
+  <target name="-pre-init">
+    <!-- NOTE: generalize these tests once we add support for Linux/Solaris -->
+    <condition property="native.lib.file"
+               value="libdecora-sse.dylib"
+               else="decora-sse.dll">
+      <istrue value="${isMacOSX}"/>
+    </condition>
+  </target>
+
+  <target name="check-native">
+    <uptodate property="native.uptodate" targetfile="${native.lib.dir}/${native.lib.file}" >
+      <srcfiles dir="${cpp.dir}" includes="*.cc"/>
+      <srcfiles dir="${cpp.dir}" includes="*.h"/>
+      <srcfiles dir="${gen.cpp.dir}" includes="*.cc"/>
+    </uptodate>
+  </target>
+
+  <target name="compile-native" depends="check-native" unless="native.uptodate">
+    <ant antfile="build-${os_name}.xml" target="compile-native" inheritAll="true"/>
+  </target>
+
+  <target name="jar" depends="init">
+    <build-project>
+      <addedsrcdirs>
+        <pathelement location="build/gensrc"/>
+      </addedsrcdirs>
+      <addedsrcfiles>
+        <fileset dir="build/gensrc" excludes="${build.classes.excludes}"/>
+      </addedsrcfiles>
+    </build-project>
+    <antcall target="compile-native"/>
+    <jar destfile="${dist.dir}/decora-sse-native.jar"
+         basedir="${native.lib.dir}"
+         includes="${native.lib.file}"/>
+  </target>
+
+  <target name="clean">
+    <clean-project/>
+    <ant antfile="build-${os_name}.xml" target="clean-native" inheritAll="true"/>
+  </target>
+  <import file="../build-defs.xml"/>
+
+</project>
--- a/decora-sse/build.xml	Fri Feb 08 16:44:48 2013 -0800
+++ b/decora-sse/build.xml	Fri Feb 08 17:37:38 2013 -0800
@@ -2,51 +2,6 @@
 <project name="decora-sse" default="jar" basedir=".">
   <description>Builds, tests, and runs the project decora-sse.</description>
 
-  <import file="../build-defs.xml"/>
-
-  <property name="cpp.dir" value="../decora-sse-native"/>
-  <property name="gen.cpp.dir" value="../decora-sse-native/build/gensrc"/>
-  <property name="native.lib.dir" value="../decora-sse-native/dist"/>
-
-  <target name="-pre-init">
-    <!-- NOTE: generalize these tests once we add support for Linux/Solaris -->
-    <condition property="native.lib.file"
-               value="libdecora-sse.dylib"
-               else="decora-sse.dll">
-      <istrue value="${isMacOSX}"/>
-    </condition>
-  </target>
-
-  <target name="check-native">
-    <uptodate property="native.uptodate" targetfile="${native.lib.dir}/${native.lib.file}" >
-      <srcfiles dir="${cpp.dir}" includes="*.cc"/>
-      <srcfiles dir="${cpp.dir}" includes="*.h"/>
-      <srcfiles dir="${gen.cpp.dir}" includes="*.cc"/>
-    </uptodate>
-  </target>
-
-  <target name="compile-native" depends="check-native" unless="native.uptodate">
-    <ant antfile="build-${os_name}.xml" target="compile-native" inheritAll="true"/>
-  </target>
-
-  <target name="jar" depends="init">
-    <build-project>
-      <addedsrcdirs>
-        <pathelement location="build/gensrc"/>
-      </addedsrcdirs>
-      <addedsrcfiles>
-        <fileset dir="build/gensrc" excludes="${build.classes.excludes}"/>
-      </addedsrcfiles>
-    </build-project>
-    <antcall target="compile-native"/>
-    <jar destfile="${dist.dir}/decora-sse-native.jar"
-         basedir="${native.lib.dir}"
-         includes="${native.lib.file}"/>
-  </target>
-
-  <target name="clean">
-    <clean-project/>
-    <ant antfile="build-${os_name}.xml" target="clean-native" inheritAll="true"/>
-  </target>
+  <import file="build-common.xml"/>
 
 </project>
--- a/decora-sse/project.properties	Fri Feb 08 16:44:48 2013 -0800
+++ b/decora-sse/project.properties	Fri Feb 08 17:37:38 2013 -0800
@@ -1,5 +1,7 @@
+JFXRT_HOME=\
+    ${runtime.dist.root.dir}/../artifacts/sdk/rt
 javac.classpath=\
     ${rt.dist.root.dir}/javafx-common/dist/javafx-common.jar:\
     ${rt.dist.root.dir}/javafx-geom/dist/javafx-geom.jar:\
     ${rt.dist.root.dir}/decora-runtime/dist/decora-runtime.jar:\
-    ${runtime.dist.root.dir}/glass/glass-mat/dist/glass.jar
+    ${JFXRT_HOME}/lib/ext/jfxrt.jar
--- a/javafx-anim/project.properties	Fri Feb 08 16:44:48 2013 -0800
+++ b/javafx-anim/project.properties	Fri Feb 08 17:37:38 2013 -0800
@@ -1,6 +1,8 @@
 JFXRT_HOME=\
     ${runtime.dist.root.dir}/../artifacts/sdk/rt
 javac.classpath=\
+    ${rt.dist.root.dir}/javafx-beans/dist/javafx-beans.jar:\
+    ${rt.dist.root.dir}/javafx-common/dist/javafx-common.jar:\
     ${JFXRT_HOME}/lib/ext/jfxrt.jar
 build.dir=${basedir}/build
 build.classes.dir=${build.dir}/classes
--- a/javafx-annotation-processor/build-common.xml	Fri Feb 08 16:44:48 2013 -0800
+++ b/javafx-annotation-processor/build-common.xml	Fri Feb 08 17:37:38 2013 -0800
@@ -8,7 +8,6 @@
     <!-- copy over the manifest stuff -->
     <mkdir dir="${build.classes.dir}/META-INF" />
     <mkdir dir="${build.classes.dir}/META-INF/services" />
-    <!--<echo file="${build.classes.dir}/META-INF/services/javax.annotation.processing.Processor">lombok.javac.apt.Processor</echo>-->
     <build-project />
   </target>
 
--- a/javafx-annotation-processor/project.properties	Fri Feb 08 16:44:48 2013 -0800
+++ b/javafx-annotation-processor/project.properties	Fri Feb 08 17:37:38 2013 -0800
@@ -1,6 +1,9 @@
 JFXRT_HOME=\
     ${runtime.dist.root.dir}/../artifacts/sdk/rt
 javac.classpath=\
+    ${import.javac.jar}:\
+    ${rt.dist.root.dir}/javafx-beans/dist/javafx-beans.jar:\
+    ${rt.dist.root.dir}/javafx-common/dist/javafx-common.jar\
     ${JFXRT_HOME}/lib/ext/jfxrt.jar
 
 test.dir=test/unit
--- a/javafx-beans-dt/build-common.xml	Fri Feb 08 16:44:48 2013 -0800
+++ b/javafx-beans-dt/build-common.xml	Fri Feb 08 17:37:38 2013 -0800
@@ -8,15 +8,16 @@
     </target> 
 
     <target name="-pre-init" depends="check-binary-css" unless="binaryCssUpToDate">
+        <echo message="rt.root.dir=${rt.root.dir}"/>
         <mkdir dir="${build.dir}/classes/com/sun/javafx/scene/control/skin/caspian"/>
         <java classname="com.sun.javafx.css.parser.Css2Bin" fork="true" failonerror="true">
           <jvmarg value="-Djavafx.toolkit=com.sun.javafx.tk.DummyToolkit"/>
           <classpath> 
-            <pathelement location="${rt.dist.root.dir}/javafx-ui-common/dist/javafx-ui-common.jar"/>
-            <pathelement location="${runtime.dist.root.dir}/javafx-beans/dist/javafx-beans.jar"/>
-            <pathelement location="${runtime.dist.root.dir}/javafx-anim/dist/javafx-anim.jar"/>
-            <pathelement location="${runtime.dist.root.dir}/javafx-common/dist/javafx-common.jar"/>
-            <pathelement location="${runtime.dist.root.dir}/javafx-logging/dist/javafx-logging.jar"/>
+            <pathelement location="${rt.root.dir}/javafx-ui-common/dist/javafx-ui-common.jar"/>
+            <pathelement location="${rt.root.dir}/javafx-beans/dist/javafx-beans.jar"/>
+            <pathelement location="${rt.root.dir}/javafx-anim/dist/javafx-anim.jar"/>
+            <pathelement location="${rt.root.dir}/javafx-common/dist/javafx-common.jar"/>
+            <pathelement location="${rt.root.dir}/javafx-logging/dist/javafx-logging.jar"/>
           </classpath> 
           <arg value="${src.dir}/com/sun/javafx/scene/control/skin/caspian/caspian.css"/>
           <arg value="${build.dir}/classes/com/sun/javafx/scene/control/skin/caspian/caspian.bss"/>
--- a/javafx-beans-dt/build.xml	Fri Feb 08 16:44:48 2013 -0800
+++ b/javafx-beans-dt/build.xml	Fri Feb 08 17:37:38 2013 -0800
@@ -3,7 +3,6 @@
   <description>Builds, tests, and runs the project javafx-beans-dt.</description>
 
   <import file="../build-defs.xml"/>
-  <echo message="rt.dist.root.dir=${rt.dist.root.dir}"/>
   <target name="debug-test-file" depends="jar">
       <debug-selected-file-in-test/>
   </target>
--- a/javafx-beans-dt/project.properties	Fri Feb 08 16:44:48 2013 -0800
+++ b/javafx-beans-dt/project.properties	Fri Feb 08 17:37:38 2013 -0800
@@ -1,8 +1,8 @@
 JFXRT_HOME=\
     ${runtime.dist.root.dir}/../artifacts/sdk/rt
-disable-lombok=true
 javac.classpath=\
     ${rt.dist.root.dir}/javafx-beans/dist/javafx-beans.jar:\
-    ${runtime.dist.root.dir}/javafx-common/dist/javafx-common.jar:\
+    ${rt.dist.root.dir}/javafx-common/dist/javafx-common.jar:\
     ${rt.dist.root.dir}/javafx-ui-common/dist/javafx-ui-common.jar:\
     ${JFXRT_HOME}/lib/ext/jfxrt.jar
+disable.builders=true
--- a/javafx-beans/project.properties	Fri Feb 08 16:44:48 2013 -0800
+++ b/javafx-beans/project.properties	Fri Feb 08 17:37:38 2013 -0800
@@ -1,3 +1,6 @@
-javac.classpath=${JFXRT_HOME}/lib/ext/jfxrt.jar
-disable-lombok=true
+javac.classpath=\
+    ${rt.dist.root.dir}/javafx-logging/dist/javafx-logging.jar:\
+    ${rt.dist.root.dir}/javafx-common/dist/javafx-common.jar:\
+    ${JFXRT_HOME}/lib/ext/jfxrt.jar
 
+disable.builders=true
--- a/javafx-concurrent/build-closed.xml	Fri Feb 08 16:44:48 2013 -0800
+++ b/javafx-concurrent/build-closed.xml	Fri Feb 08 17:37:38 2013 -0800
@@ -11,6 +11,5 @@
         ${rt.dist.root.dir}/javafx-ui-common/dist/javafx-ui-common.jar" />
     <property name="javac.classpath" refid="javac.closed.classpath.path"/>
     
-    <import file="../build-defs.xml"/>
     <import file="build-common.xml"/>
 </project>
--- a/javafx-concurrent/build-common.xml	Fri Feb 08 16:44:48 2013 -0800
+++ b/javafx-concurrent/build-common.xml	Fri Feb 08 17:37:38 2013 -0800
@@ -4,4 +4,5 @@
         <echo message="${run.test.classpath}" />
         <debug-selected-file-in-test/>
     </target>
+    <import file="../build-defs.xml" />
 </project>
--- a/javafx-concurrent/build.xml	Fri Feb 08 16:44:48 2013 -0800
+++ b/javafx-concurrent/build.xml	Fri Feb 08 17:37:38 2013 -0800
@@ -2,9 +2,5 @@
 <project name="javafx-concurrent" default="jar" basedir=".">
   <description>Builds, tests, and runs the project javafx-beans-dt.</description>
 
-  <import file="../build-defs.xml"/>
-
-  <target name="debug-test-file" depends="jar">
-      <debug-selected-file-in-test/>
-  </target>
+  <import file="build-common.xml"/>
 </project>
--- a/javafx-concurrent/project.properties	Fri Feb 08 16:44:48 2013 -0800
+++ b/javafx-concurrent/project.properties	Fri Feb 08 17:37:38 2013 -0800
@@ -1,17 +1,16 @@
 JFXRT_HOME=\
     ${runtime.dist.root.dir}/../artifacts/sdk/rt
-disable-lombok=true
 javac.classpath=\
     ${rt.dist.root.dir}/javafx-beans/dist/javafx-beans.jar:\
-    ${runtime.dist.root.dir}/javafx-common/dist/javafx-common.jar:\
-    ${runtime.dist.root.dir}/javafx-logging/dist/javafx-logging.jar:\
+    ${rt.dist.root.dir}/javafx-common/dist/javafx-common.jar:\
+    ${rt.dist.root.dir}/javafx-logging/dist/javafx-logging.jar:\
     ${rt.dist.root.dir}/javafx-ui-common/dist/javafx-ui-common.jar:\
     ${JFXRT_HOME}/lib/ext/jfxrt.jar
 javac.test.classpath=\
     ${javac.classpath}:\
     ${build.classes.dir}:\
-    ${runtime.dist.root.dir}/javafx-ui-common/build/test/classes:\
-    ../test-stub-toolkit/dist/test-stub-toolkit.jar:\
+    ${rt.dist.root.dir}/javafx-ui-common/build/test/classes:\
+    ${rt.dist.root.dir}/test-stub-toolkit/dist/test-stub-toolkit.jar:\
     ${runtime.deps.dir}/junit.jar
 run.test.classpath=\
     ${javac.test.classpath}:\
@@ -21,3 +20,4 @@
 smoke.test.excludes=\
     javafx/concurrent/ServiceLifecycleTest.class \
     javafx/concurrent/ServiceWithSecurityManagerTest.class
+disable.builders=true
--- a/javafx-designtime/project.properties	Fri Feb 08 16:44:48 2013 -0800
+++ b/javafx-designtime/project.properties	Fri Feb 08 17:37:38 2013 -0800
@@ -1,6 +1,5 @@
 JFXRT_HOME=\
     ${runtime.dist.root.dir}/../artifacts/sdk/rt
-disable-lombok=true
 javac.classpath=\
     ${runtime.dist.root.dir}/javafx-beans/dist/javafx-beans.jar:\
     ../javafx-beans-dt/dist/javafx-beans-dt.jar:\
@@ -8,4 +7,4 @@
     ${runtime.dist.root.dir}/../rt/javafx-ui-controls/dist/javafx-ui-controls.jar:\
     ${rt.dist.root.dir}/javafx-ui-common/dist/javafx-ui-common.jar:\
     ${JFXRT_HOME}/lib/ext/jfxrt.jar
-
+disable.builders=true
--- a/javafx-embed-swing/project.properties	Fri Feb 08 16:44:48 2013 -0800
+++ b/javafx-embed-swing/project.properties	Fri Feb 08 17:37:38 2013 -0800
@@ -1,9 +1,9 @@
 JFXRT_HOME=\
     ${runtime.dist.root.dir}/../artifacts/sdk/rt
 javac.classpath=\
-    ${JFXRT_HOME}/lib/ext/jfxrt.jar:\
     ${rt.dist.root.dir}/javafx-common/dist/javafx-common.jar:\
-    ${rt.dist.root.dir}/javafx-ui-common/dist/javafx-ui-common.jar
+    ${rt.dist.root.dir}/javafx-ui-common/dist/javafx-ui-common.jar:\
+    ${JFXRT_HOME}/lib/ext/jfxrt.jar
 javac.test.classpath=\
     ${javac.classpath}:\
     ${build.classes.dir}:\
--- a/javafx-fxml/project.properties	Fri Feb 08 16:44:48 2013 -0800
+++ b/javafx-fxml/project.properties	Fri Feb 08 17:37:38 2013 -0800
@@ -1,6 +1,11 @@
 JFXRT_HOME=\
     ${runtime.dist.root.dir}/../artifacts/sdk/rt
 javac.classpath=\
+    ${rt.dist.root.dir}/javafx-beans/dist/javafx-beans.jar:\
+    ${rt.dist.root.dir}/javafx-common/dist/javafx-common.jar:\
+    ${rt.dist.root.dir}/javafx-ui-common/dist/javafx-ui-common.jar:\
+    ${rt.dist.root.dir}/javafx-ui-controls/dist/javafx-ui-controls.jar:\
+    ${rt.dist.root.dir}/javafx-ui-charts/dist/javafx-ui-charts.jar:\
     ${JFXRT_HOME}/lib/ext/jfxrt.jar
 javac.test.classpath=\
     ${javac.classpath}:\
@@ -15,4 +20,4 @@
 
 #test-sys-prop.javafx.toolkit=com.sun.javafx.pgstub.StubToolkit
 build.generated.dir=${build.dir}/gensrc
-disable-lombok=true
+disable.builders=true
--- a/javafx-geom/build-closed.xml	Fri Feb 08 16:44:48 2013 -0800
+++ b/javafx-geom/build-closed.xml	Fri Feb 08 17:37:38 2013 -0800
@@ -4,10 +4,7 @@
     
     <property name="runtime.dist.root.dir" value="../../rt-closed" />    
     <property name="rt.dist.root.dir" value="../../rt" />    
-    <path id="javac.closed.classpath.path" path="
-        ${rt.dist.root.dir}/javafx-geom/dist/javafx-geom.jar:
-        ${runtime.dist.root.dir}/javafx-font/dist/javafx-font.jar:
-        ${rt.dist.root.dir}/pisces/dist/pisces.jar" />
+    <path id="javac.closed.classpath.path" path="" />
     <property name="javac.classpath" refid="javac.closed.classpath.path"/>
     
     <import file="../build-defs.xml"/>
--- a/javafx-sg-common/build-closed.xml	Fri Feb 08 16:44:48 2013 -0800
+++ b/javafx-sg-common/build-closed.xml	Fri Feb 08 17:37:38 2013 -0800
@@ -7,8 +7,7 @@
     <path id="javac.closed.classpath.path" path="
         ${rt.dist.root.dir}/javafx-geom/dist/javafx-geom.jar:
         ${rt.dist.root.dir}/javafx-logging/dist/javafx-logging.jar:
-        ${rt.dist.root.dir}/decora-runtime/dist/decora-runtime.jar:
-        ${runtime.dist.root.dir}/webkit/dist/webkit.jar" />
+        ${rt.dist.root.dir}/decora-runtime/dist/decora-runtime.jar" />
     <property name="javac.classpath" refid="javac.closed.classpath.path"/>
     
     <import file="../build-defs.xml"/>
--- a/javafx-sg-common/project.properties	Fri Feb 08 16:44:48 2013 -0800
+++ b/javafx-sg-common/project.properties	Fri Feb 08 17:37:38 2013 -0800
@@ -1,6 +1,9 @@
 JFXRT_HOME=\
     ${runtime.dist.root.dir}/../artifacts/sdk/rt
 javac.classpath=\
+    ${rt.dist.root.dir}/javafx-geom/dist/javafx-geom.jar:\
+    ${rt.dist.root.dir}/javafx-logging/dist/javafx-logging.jar:\
+    ${rt.dist.root.dir}/decora-runtime/dist/decora-runtime.jar:\
     ${JFXRT_HOME}/lib/ext/jfxrt.jar
 javac.test.additional.classpath=\
     ${rt.dist.root.dir}/javafx-ui-common/dist/javafx-ui-common.jar:\
--- a/javafx-sg-prism/build-closed.xml	Fri Feb 08 16:44:48 2013 -0800
+++ b/javafx-sg-prism/build-closed.xml	Fri Feb 08 17:37:38 2013 -0800
@@ -20,6 +20,5 @@
         ${runtime.dist.root.dir}/glass/glass-mat/dist/glass.jar" />
     <property name="javac.classpath" refid="javac.closed.classpath.path"/>
     
-    <import file="../build-defs.xml"/>
     <import file="build-common.xml"/>
 </project>
--- a/javafx-sg-prism/build-common.xml	Fri Feb 08 16:44:48 2013 -0800
+++ b/javafx-sg-prism/build-common.xml	Fri Feb 08 17:37:38 2013 -0800
@@ -5,4 +5,5 @@
       <debug-selected-file-in-test/>
   </target>
     
+  <import file="../build-defs.xml"/>
 </project>
--- a/javafx-sg-prism/build.xml	Fri Feb 08 16:44:48 2013 -0800
+++ b/javafx-sg-prism/build.xml	Fri Feb 08 17:37:38 2013 -0800
@@ -2,6 +2,5 @@
 <project name="javafx-sg-prism" default="jar" basedir=".">
     <description>Builds, tests, and runs the OpenJFX javafx-sg-prism project.</description>
 
-    <import file="../build-defs.xml"/>
     <import file="build-common.xml"/>
 </project>
--- a/javafx-sg-prism/project.properties	Fri Feb 08 16:44:48 2013 -0800
+++ b/javafx-sg-prism/project.properties	Fri Feb 08 17:37:38 2013 -0800
@@ -1,4 +1,11 @@
 JFXRT_HOME=\
     ${runtime.dist.root.dir}/../artifacts/sdk/rt
 javac.classpath=\
+    ${rt.dist.root.dir}/javafx-geom/dist/javafx-geom.jar:\
+    ${rt.dist.root.dir}/javafx-logging/dist/javafx-logging.jar:\
+    ${rt.dist.root.dir}/javafx-common/dist/javafx-common.jar:\
+    ${rt.dist.root.dir}/javafx-ui-common/dist/javafx-ui-common.jar:\
+    ${rt.dist.root.dir}/javafx-sg-common/dist/javafx-sg-common.jar:\
+    ${rt.dist.root.dir}/decora-runtime/dist/decora-runtime.jar:\
+    ${rt.dist.root.dir}/decora-prism/dist/decora-prism.jar:\
     ${JFXRT_HOME}/lib/ext/jfxrt.jar
--- a/javafx-ui-charts/project.properties	Fri Feb 08 16:44:48 2013 -0800
+++ b/javafx-ui-charts/project.properties	Fri Feb 08 17:37:38 2013 -0800
@@ -1,6 +1,14 @@
 JFXRT_HOME=\
     ${runtime.dist.root.dir}/../artifacts/sdk/rt
 javac.classpath=\
+    ${rt.dist.root.dir}/javafx-anim/dist/javafx-anim.jar:\
+    ${rt.dist.root.dir}/pisces/dist/pisces.jar:\
+    ${rt.dist.root.dir}/javafx-geom/dist/javafx-geom.jar:\
+    ${rt.dist.root.dir}/javafx-logging/dist/javafx-logging.jar:\
+    ${rt.dist.root.dir}/javafx-ui-common/dist/javafx-ui-common.jar:\
+    ${rt.dist.root.dir}/javafx-ui-controls/dist/javafx-ui-controls.jar:\
+    ${rt.dist.root.dir}/javafx-beans/dist/javafx-beans.jar:\
+    ${rt.dist.root.dir}/javafx-common/dist/javafx-common.jar:\
     ${JFXRT_HOME}/lib/ext/jfxrt.jar
 javac.test.classpath=\
     ${javac.classpath}:\
--- a/javafx-ui-common/build.xml	Fri Feb 08 16:44:48 2013 -0800
+++ b/javafx-ui-common/build.xml	Fri Feb 08 17:37:38 2013 -0800
@@ -2,9 +2,5 @@
 <project name="javafx-ui-common" default="jar" basedir=".">
     <description>Builds, tests, and runs the OpenJFX javafx-ui-common project.</description>
 
-    <import file="../build-defs.xml"/>
     <import file="build-common.xml"/>
-
-    <target name="test" depends="javafx-ui-common-common.test"/>
-    <target name="-pre-coverage" depends="javafx-ui-common-common.-pre-coverage"/>
 </project>
--- a/javafx-ui-common/project.properties	Fri Feb 08 16:44:48 2013 -0800
+++ b/javafx-ui-common/project.properties	Fri Feb 08 17:37:38 2013 -0800
@@ -1,8 +1,15 @@
+JFXRT_HOME=\
+    ${runtime.dist.root.dir}/../artifacts/sdk/rt
 javac.classpath=\
-    ${JFXRT_HOME}/lib/ext/jfxrt.jar:\
-    ${runtime.dist.root.dir}/javafx-mx-common/dist/javafx-mx-common.jar:\
-    ${runtime.dist.root.dir}/glass/glass-mat/dist/glass.jar:\
-    ${runtime.deps.dir}/plugin_exports.jar
+    ${rt.dist.root.dir}/javafx-beans/dist/javafx-beans.jar:\
+    ${rt.dist.root.dir}/javafx-geom/dist/javafx-geom.jar:\
+    ${rt.dist.root.dir}/javafx-logging/dist/javafx-logging.jar:\
+    ${rt.dist.root.dir}/javafx-anim/dist/javafx-anim.jar:\
+    ${rt.dist.root.dir}/javafx-common/dist/javafx-common.jar:\
+    ${rt.dist.root.dir}/javafx-sg-common/dist/javafx-sg-common.jar:\
+    ${rt.dist.root.dir}/decora-runtime/dist/decora-runtime.jar:\
+    ${jfx.checkstyle.jar}:\
+    ${JFXRT_HOME}/lib/ext/jfxrt.jar
    
 javac.test.additional.classpath=\
     ${rt.dist.root.dir}/test-stub-toolkit/dist/test-stub-toolkit.jar:\
--- a/javafx-ui-controls/project.properties	Fri Feb 08 16:44:48 2013 -0800
+++ b/javafx-ui-controls/project.properties	Fri Feb 08 17:37:38 2013 -0800
@@ -1,13 +1,20 @@
 JFXRT_HOME=\
     ${runtime.dist.root.dir}/../artifacts/sdk/rt
 javac.classpath=\
+    ${rt.dist.root.dir}/javafx-beans/dist/javafx-beans.jar:\
+    ${rt.dist.root.dir}/javafx-geom/dist/javafx-geom.jar:\
+    ${rt.dist.root.dir}/javafx-logging/dist/javafx-logging.jar:\
+    ${rt.dist.root.dir}/javafx-anim/dist/javafx-anim.jar:\
+    ${rt.dist.root.dir}/javafx-common/dist/javafx-common.jar:\
+    ${rt.dist.root.dir}/javafx-util-converter/dist/javafx-util-converter.jar:\
+    ${rt.dist.root.dir}/javafx-ui-common/dist/javafx-ui-common.jar:\
     ${JFXRT_HOME}/lib/ext/jfxrt.jar
 javac.test.classpath=\
     ${javac.classpath}:\
     ${build.classes.dir}:\
     ${rt.dist.root.dir}/javafx-ui-common/build/test/classes:\
     ${rt.dist.root.dir}/pisces/dist/pisces.jar:\
-    ../test-stub-toolkit/dist/test-stub-toolkit.jar:\
+    ${rt.dist.root.dir}/test-stub-toolkit/dist/test-stub-toolkit.jar:\
     ${runtime.deps.dir}/junit.jar
 run.test.classpath=\
     ${javac.test.classpath}:\
--- a/javafx-util-converter/project.properties	Fri Feb 08 16:44:48 2013 -0800
+++ b/javafx-util-converter/project.properties	Fri Feb 08 17:37:38 2013 -0800
@@ -1,6 +1,8 @@
 JFXRT_HOME=\
     ${runtime.dist.root.dir}/../artifacts/sdk/rt
 javac.classpath=\
+    ${rt.dist.root.dir}/javafx-beans/dist/javafx-beans.jar:\
+    ${rt.dist.root.dir}/javafx-common/dist/javafx-common.jar:\
     ${JFXRT_HOME}/lib/ext/jfxrt.jar
 javac.test.classpath=\
     ${javac.classpath}:\
--- a/pisces/build-closed.xml	Fri Feb 08 16:44:48 2013 -0800
+++ b/pisces/build-closed.xml	Fri Feb 08 17:37:38 2013 -0800
@@ -9,6 +9,5 @@
         ${rt.dist.root.dir}/javafx-geom/dist/javafx-geom.jar" />
     <property name="javac.classpath" refid="javac.closed.classpath.path"/>
     
-    <import file="../build-defs.xml"/>
     <import file="build-common.xml"/>
 </project>
--- a/pisces/build-common.xml	Fri Feb 08 16:44:48 2013 -0800
+++ b/pisces/build-common.xml	Fri Feb 08 17:37:38 2013 -0800
@@ -9,4 +9,6 @@
     <clean-project/>
   </target>
 
+  <import file="../build-defs.xml"/>
+
 </project>
--- a/pisces/build.xml	Fri Feb 08 16:44:48 2013 -0800
+++ b/pisces/build.xml	Fri Feb 08 17:37:38 2013 -0800
@@ -2,6 +2,5 @@
 <project name="pisces" default="jar" basedir=".">
     <description>Builds, tests, and runs the OpenJFX pisces project.</description>
 
-    <import file="../build-defs.xml"/>
     <import file="build-common.xml"/>
 </project>
--- a/pisces/project.properties	Fri Feb 08 16:44:48 2013 -0800
+++ b/pisces/project.properties	Fri Feb 08 17:37:38 2013 -0800
@@ -1,4 +1,6 @@
 JFXRT_HOME=\
     ${runtime.dist.root.dir}/../artifacts/sdk/rt
 javac.classpath=\
+    ${rt.dist.root.dir}/javafx-common/dist/javafx-common.jar:\
+    ${rt.dist.root.dir}/javafx-geom/dist/javafx-geom.jar:\
     ${JFXRT_HOME}/lib/ext/jfxrt.jar
--- a/test-stub-toolkit/project.properties	Fri Feb 08 16:44:48 2013 -0800
+++ b/test-stub-toolkit/project.properties	Fri Feb 08 17:37:38 2013 -0800
@@ -1,6 +1,5 @@
 JFXRT_HOME=\
     ${runtime.dist.root.dir}/../artifacts/sdk/rt
-disable-lombok=true
 javac.classpath=\
     ${JFXRT_HOME}/lib/ext/jfxrt.jar:\
     ${runtime.dist.root.dir}/javafx-common/dist/javafx-common.jar:\
@@ -11,3 +10,4 @@
     ${runtime.dist.root.dir}/javafx-sg-common/dist/javafx-sg-common.jar:\
     ${rt.dist.root.dir}/javafx-ui-common/dist/javafx-ui-common.jar:\
     ${runtime.dist.root.dir}/javafx-accessible/dist/javafx-accessible.jar
+disable.builders=true