changeset 3756:609746f32d1b

[eclipse only] fix .classpath
author Felipe Heidrich <felipe.heidrich@oracle.com>
date Wed, 29 May 2013 09:53:14 -0700
parents 44c4d06279d4
children 7d97d6e4f096
files .classpath
diffstat 1 files changed, 134 insertions(+), 124 deletions(-) [+]
line wrap: on
line diff
--- a/.classpath	Wed May 29 12:27:23 2013 -0400
+++ b/.classpath	Wed May 29 09:53:14 2013 -0700
@@ -1,107 +1,111 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-    <classpathentry kind="src" path="apps/experiments/3DViewer/src/main/java"/>
-    <classpathentry kind="src" path="apps/experiments/3DViewer/src/test/java"/>
-    <classpathentry kind="src" path="apps/experiments/3DViewer/src/test/resources"/>
-    <!--
-    <classpathentry kind="src" path="apps/experiments/ConferenceScheduleApp/src"/>
-    <classpathentry kind="src" path="apps/experiments/ModenaTest/test"/>
-    <classpathentry kind="src" path="apps/experiments/Modena/src"/>
-    -->
-    <classpathentry kind="src" path="apps/samples/Ensemble8/src/app"/>
-    <classpathentry kind="src" path="apps/samples/Ensemble8/src/compiletime"/>
-    <classpathentry kind="src" path="apps/samples/Ensemble8/src/generated"/>
-    <classpathentry kind="src" path="apps/samples/Ensemble8/src/samples"/>
-    <classpathentry kind="lib" path="apps/samples/Ensemble8/lib/lucene-core-3.2.0.jar"/>
-    <classpathentry kind="lib" path="apps/samples/Ensemble8/lib/lucene-grouping-3.2.0.jar"/>
+	<classpathentry kind="src" path="apps/experiments/3DViewer/src/main/java"/>
+	<classpathentry kind="src" path="apps/experiments/3DViewer/src/test/java"/>
+	<classpathentry kind="src" path="apps/experiments/3DViewer/src/test/resources"/>
+	<!--
+	<classpathentry kind="src" path="apps/experiments/ConferenceScheduleApp/src"/>
+	<classpathentry kind="src" path="apps/experiments/ModenaTest/test"/>
+	<classpathentry kind="src" path="apps/experiments/Modena/src"/>
+	-->
+	<classpathentry kind="src" path="apps/samples/Ensemble8/src/app"/>
+	<classpathentry kind="src" path="apps/samples/Ensemble8/src/compiletime"/>
+	<classpathentry kind="src" path="apps/samples/Ensemble8/src/generated"/>
+	<classpathentry kind="src" path="apps/samples/Ensemble8/src/samples"/>
+	<classpathentry kind="lib" path="apps/samples/Ensemble8/lib/lucene-core-3.2.0.jar"/>
+	<classpathentry kind="lib" path="apps/samples/Ensemble8/lib/lucene-grouping-3.2.0.jar"/>
 
-    <classpathentry kind="src" path="decora-compiler/build/gensrc"/>
-    <classpathentry kind="src" path="decora-compiler/src"/>
-    <classpathentry kind="src" path="decora-d3d/src"/>
-    <classpathentry kind="src" path="decora-d3d/build/gensrc"/>
-    <classpathentry kind="src" path="decora-es2/src"/>
-    <classpathentry kind="src" path="decora-es2/build/gensrc"/>
-    <classpathentry kind="src" path="decora-jsw/build/gensrc"/>
-    <classpathentry kind="src" path="decora-jsw/src"/>
-    <classpathentry kind="src" path="decora-prism-ps/build/gensrc"/>
-    <classpathentry kind="src" path="decora-prism-ps/src"/>
-    <classpathentry kind="src" path="decora-prism-sw/src"/>
-    <classpathentry kind="src" path="decora-prism/src"/>
-    <classpathentry kind="src" path="decora-runtime/src"/>
-    <classpathentry kind="src" path="decora-runtime/generator"/>
-    <classpathentry kind="src" path="decora-runtime/test"/>
-    <classpathentry kind="src" path="decora-sse/src"/>
-    <classpathentry kind="src" path="decora-sse/build/gensrc"/>
+	<classpathentry kind="src" path="decora-compiler/build/gensrc"/>
+	<classpathentry kind="src" path="decora-compiler/src"/>
+	<classpathentry kind="src" path="decora-d3d/src"/>
+	<classpathentry kind="src" path="decora-d3d/build/gensrc"/>
+	<classpathentry kind="src" path="decora-es2/src"/>
+	<classpathentry kind="src" path="decora-es2/build/gensrc"/>
+	<classpathentry kind="src" path="decora-jsw/build/gensrc"/>
+	<classpathentry kind="src" path="decora-jsw/src"/>
+	<classpathentry kind="src" path="decora-prism-ps/build/gensrc"/>
+	<classpathentry kind="src" path="decora-prism-ps/src"/>
+	<classpathentry kind="src" path="decora-prism-sw/src"/>
+	<classpathentry kind="src" path="decora-prism/src"/>
+	<classpathentry kind="src" path="decora-runtime/src"/>
+	<classpathentry kind="src" path="decora-runtime/generator"/>
+	<classpathentry kind="src" path="decora-runtime/test"/>
+	<classpathentry kind="src" path="decora-sse/src"/>
+	<classpathentry kind="src" path="decora-sse/build/gensrc"/>
 
-    <classpathentry kind="src" path="deploy/javafx-deploy/src"/>
-    <classpathentry kind="src" path="deploy/javafx-launcher/src"/>
-    <classpathentry kind="src" path="deploy/packager/src"/>
-    <classpathentry kind="src" path="deploy/packager/test"/>
+	<classpathentry kind="src" path="deploy/javafx-deploy/src"/>
+	<classpathentry kind="src" path="deploy/javafx-launcher/src"/>
+	<classpathentry kind="src" path="deploy/packager/src"/>
+	<classpathentry kind="src" path="deploy/packager/test"/>
 
-    <classpathentry kind="src" path="glass/glass/src"/>
+	<classpathentry kind="src" path="glass/glass/src"/>
 
-    <classpathentry kind="src" path="javafx-anim/src"/>
-    <classpathentry kind="src" path="javafx-anim/test/unit"/>
-    <!--
-    <classpathentry kind="src" path="javafx-annotation-processor/src"/>
-    -->
-    <classpathentry kind="src" path="javafx-beans/src"/>
-    <classpathentry kind="src" path="javafx-beans/test"/>
-    <classpathentry kind="src" path="javafx-beans-dt/src"/>
-    <classpathentry kind="src" path="javafx-beans-dt/test"/>
+	<classpathentry kind="src" path="javafx-anim/src"/>
+	<classpathentry kind="src" path="javafx-anim/test/unit"/>
+	<!--
+	<classpathentry kind="src" path="javafx-annotation-processor/src"/>
+	-->
+	<classpathentry kind="src" path="javafx-beans/src"/>
+	<classpathentry kind="src" path="javafx-beans/test"/>
+	<classpathentry kind="src" path="javafx-beans-dt/src"/>
+	<classpathentry kind="src" path="javafx-beans-dt/test"/>
 
-    <!--
-    <classpathentry kind="src" path="javafx-builders/test/unit"/>
-    <classpathentry kind="src" path="javafx-builders/src"/>
-    -->
-    <classpathentry kind="lib" exported="true" path="javafx-builders/dist/javafx-builders.jar" sourcepath="javafx-builders/src">
-        <attributes>
-            <attribute name="optional" value="true"/>
-        </attributes>
-    </classpathentry>
-    
-    <classpathentry kind="src" path="javafx-concurrent/src"/>
-    <classpathentry kind="src" path="javafx-concurrent/test"/>
-    <classpathentry kind="src" path="javafx-common/test/unit"/>
-    <classpathentry kind="src" path="javafx-common/build/gensrc/classes"/>
-    <classpathentry kind="src" path="javafx-common/src"/>
-    <classpathentry kind="src" path="javafx-designtime/src"/>
-    <!--
-    <classpathentry kind="src" path="javafx-designtime/test"/>
-    -->
-    <!-- Temporarily excluding SwingNode as it requires Java 8 -->
-    <!--
-    <classpathentry kind="src" excluding="javafx/embed/swing/SwingNode.java" path="javafx-embed-swing/src"/>
-    -->
-    <classpathentry kind="src" path="javafx-embed-swing/src"/>
-    <classpathentry kind="src" path="javafx-embed-swt/src"/>
-    <classpathentry kind="src" path="javafx-fxml/src"/>
-    <classpathentry kind="src" path="javafx-fxml/test"/>
-    <classpathentry kind="src" path="javafx-geom/src"/>
-    <classpathentry kind="src" path="javafx-geom/test"/>	
-    <classpathentry kind="src" path="javafx-iio/src"/>
-    <classpathentry kind="src" path="javafx-iio/test"/>
-    <classpathentry kind="src" path="javafx-logging/src"/>
-    <classpathentry kind="src" path="javafx-sg-common/src"/>
-    <classpathentry kind="src" path="javafx-sg-common/test"/>
-    <classpathentry kind="src" path="javafx-sg-prism/src"/>
-    <classpathentry kind="src" path="javafx-sg-prism/test"/>
-    <classpathentry kind="src" path="javafx-ui-charts/src"/>
-    <classpathentry kind="src" path="javafx-ui-charts/test"/>
-    <classpathentry kind="src" path="javafx-ui-common/src"/>
-    <!--
-    <classpathentry kind="src" path="javafx-ui-common/test/unit"/>
-    -->
-    <classpathentry kind="src" path="javafx-ui-controls/src"/>
-    <classpathentry kind="src" path="javafx-ui-controls/test"/>
-    <classpathentry kind="src" path="javafx-ui-quantum/src"/>
-    <classpathentry kind="src" path="javafx-util-converter/src"/>
-    <classpathentry kind="src" path="javafx-util-converter/test"/>
+	<!-- 
+	Builders are deprecated and do notbuild clean on new versions of JDK.
+	Using the library instead of the source. 
+	-->
+	<!--
+	<classpathentry kind="src" path="javafx-builders/test/unit"/>
+	<classpathentry kind="src" path="javafx-builders/src"/>
+	-->
+	<classpathentry kind="lib" exported="true" path="javafx-builders/dist/javafx-builders.jar" sourcepath="javafx-builders/src">
+		<attributes>
+			<attribute name="optional" value="true"/>
+		</attributes>
+	</classpathentry>
 
-    <classpathentry kind="src" path="pisces/src"/>
+	<classpathentry kind="src" path="javafx-concurrent/src"/>
+	<classpathentry kind="src" path="javafx-concurrent/test"/>
+	<classpathentry kind="src" path="javafx-common/test/unit"/>
+	<classpathentry kind="src" path="javafx-common/build/gensrc/classes"/>
+	<classpathentry kind="src" path="javafx-common/src"/>
+	<classpathentry kind="src" path="javafx-designtime/src"/>
+	<!--
+	<classpathentry kind="src" path="javafx-designtime/test"/>
+	-->
+	<!-- Temporarily excluding SwingNode as it requires Java 8 -->
+	<!--
+	<classpathentry kind="src" excluding="javafx/embed/swing/SwingNode.java" path="javafx-embed-swing/src"/>
+	-->
+	<classpathentry kind="src" path="javafx-embed-swing/src"/>
+	<classpathentry kind="src" path="javafx-embed-swt/src"/>
+	<classpathentry kind="src" path="javafx-fxml/src"/>
+	<classpathentry kind="src" path="javafx-fxml/test"/>
+	<classpathentry kind="src" path="javafx-geom/src"/>
+	<classpathentry kind="src" path="javafx-geom/test"/>	
+	<classpathentry kind="src" path="javafx-iio/src"/>
+	<classpathentry kind="src" path="javafx-iio/test"/>
+	<classpathentry kind="src" path="javafx-logging/src"/>
+	<classpathentry kind="src" path="javafx-sg-common/src"/>
+	<classpathentry kind="src" path="javafx-sg-common/test"/>
+	<classpathentry kind="src" path="javafx-sg-prism/src"/>
+	<classpathentry kind="src" path="javafx-sg-prism/test"/>
+	<classpathentry kind="src" path="javafx-ui-charts/src"/>
+	<classpathentry kind="src" path="javafx-ui-charts/test"/>
+	<classpathentry kind="src" path="javafx-ui-common/src"/>
+	<!--
+	<classpathentry kind="src" path="javafx-ui-common/test/unit"/>
+	-->
+	<classpathentry kind="src" path="javafx-ui-controls/src"/>
+	<classpathentry kind="src" path="javafx-ui-controls/test"/>
+	<classpathentry kind="src" path="javafx-ui-quantum/src"/>
+	<classpathentry kind="src" path="javafx-util-converter/src"/>
+	<classpathentry kind="src" path="javafx-util-converter/test"/>
 
-    <classpathentry kind="src" path="prism-common/src"/>
-    <classpathentry kind="src" path="prism-common/test"/>
+	<classpathentry kind="src" path="pisces/src"/>
+
+	<classpathentry kind="src" path="prism-common/src"/>
+	<classpathentry kind="src" path="prism-common/test"/>
 	<classpathentry kind="src" path="prism-d3d/src"/>
 	<classpathentry kind="src" path="prism-d3d/build/gensrc">
 		<attributes>
@@ -122,18 +126,18 @@
 			<attribute name="optional" value="true"/>
 		</attributes>
 	</classpathentry>
-    <classpathentry kind="src" path="prism-j2d/src"/>
-    <classpathentry kind="src" path="prism-sw/src"/>
-    <classpathentry kind="src" path="prism-null/src"/>
-    <classpathentry kind="src" path="prism-ps/src"/>
-    <classpathentry kind="src" path="prism-ps/build/gensrc"/>
+	<classpathentry kind="src" path="prism-j2d/src"/>
+	<classpathentry kind="src" path="prism-sw/src"/>
+	<classpathentry kind="src" path="prism-null/src"/>
+	<classpathentry kind="src" path="prism-ps/src"/>
+	<classpathentry kind="src" path="prism-ps/build/gensrc"/>
 	<classpathentry kind="src" path="prism-ps/test"/>
 	<!--
 	<classpathentry kind="src" path="prism-ps/shadergen"/>
 	-->
-    <classpathentry kind="src" path="prism-util/src"/>
+	<classpathentry kind="src" path="prism-util/src"/>
 
-    <classpathentry kind="src" path="test-stub-toolkit/src"/>
+	<classpathentry kind="src" path="test-stub-toolkit/src"/>
 	<classpathentry kind="src" path="tests/app-lifecycle/ClassLoaderApp/src"/>
 	<classpathentry kind="src" path="tests/app-lifecycle/ClassLoaderTest/test"/>
 	<classpathentry kind="src" path="tests/app-lifecycle/LauncherTests/test"/>
@@ -146,22 +150,28 @@
 	<classpathentry kind="src" path="tests/quantum/CloseWindow/test"/>
 	<classpathentry kind="src" path="tests/quantum/WindowSceneInitDispose/test"/>
 
+	<!-- Use webview/src (instead of ../caches/sdk/build/lib/desktop/jfxwebview.jar) -->
 	<classpathentry kind="src" path="webview/src"/>
 	<!--
 	<classpathentry kind="src" path="webview/test"/>
 	-->
+	<!-- 
+	The "webview/native/WebKitBuild/Release/WebCore/generated/java" folder is only
+	available when webkit is built. Instead of forcing webkit to be build we 
+	include "../caches/sdk/build/lib/desktop/jfxwebkit.jar" as fallback.
+	-->
 	<classpathentry combineaccessrules="false" kind="src" path="webview/native/WebKitBuild/Release/WebCore/generated/java">
-        <attributes>
-            <attribute name="optional" value="true"/>
-        </attributes>
-    </classpathentry>
-    <classpathentry kind="lib" path="../caches/sdk/build/lib/desktop/jfxwebkit.jar">
-        <attributes>
-            <attribute name="optional" value="true"/>
-        </attributes>
-    </classpathentry>
+		<attributes>
+			<attribute name="optional" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="lib" path="../caches/sdk/build/lib/desktop/jfxwebkit.jar">
+		<attributes>
+			<attribute name="optional" value="true"/>
+		</attributes>
+	</classpathentry>
 
-    <classpathentry kind="src" path="/rt-closed"/>
+	<classpathentry kind="src" path="/rt-closed"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/media">
 		<attributes>
 			<attribute name="optional" value="true"/>
@@ -173,16 +183,16 @@
 		</attributes>
 	</classpathentry>
 
-    <classpathentry kind="src" path="/org.eclipse.swt">
-        <attributes>
-            <attribute name="optional" value="true"/>
-        </attributes>
-    </classpathentry>
-    <classpathentry kind="lib" path="../import/swt-3.7.1/swt-debug.jar"/>
-    <classpathentry kind="output" path="bin"/>
-    
-    <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-    <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
-    <classpathentry kind="lib" path="../import/antlr-3.1.3/antlr-3.1.3/lib/antlr-3.1.3.jar"/>
-    <classpathentry kind="lib" path="../import/findbugs-2.0.1/findbugs-2.0.1/lib/ant.jar"/>
+	<classpathentry kind="src" path="/org.eclipse.swt">
+		<attributes>
+			<attribute name="optional" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="lib" path="../import/swt-3.7.1/swt-debug.jar"/>
+	<classpathentry kind="output" path="bin"/>
+
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
+	<classpathentry kind="lib" path="../import/antlr-3.1.3/antlr-3.1.3/lib/antlr-3.1.3.jar"/>
+	<classpathentry kind="lib" path="../import/findbugs-2.0.1/findbugs-2.0.1/lib/ant.jar"/>
 </classpath>