Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSilenio Quarti2013-07-15 20:38:36 +0000
committerSilenio Quarti2013-07-15 20:41:57 +0000
commiteb4a566fe3bbefedab594865c6cfba14ed29c7d7 (patch)
tree4ae09fef34c375efe12481c0aecf46b3250b5c08 /bundles/org.eclipse.swt
parent22b8405f3e0cc3da801d39c55f8487f33ed54d32 (diff)
downloadeclipse.platform.swt-eb4a566fe3bbefedab594865c6cfba14ed29c7d7.tar.gz
eclipse.platform.swt-eb4a566fe3bbefedab594865c6cfba14ed29c7d7.tar.xz
eclipse.platform.swt-eb4a566fe3bbefedab594865c6cfba14ed29c7d7.zip
Bug 411356 - Move requirement for SWT to Java 1.5. Bug 412067 - isLoadable(); returns False due URL parse error
Diffstat (limited to 'bundles/org.eclipse.swt')
-rw-r--r--bundles/org.eclipse.swt/.classpath_carbon3
-rw-r--r--bundles/org.eclipse.swt/.classpath_cocoa3
-rw-r--r--bundles/org.eclipse.swt/.classpath_dojo1
-rw-r--r--bundles/org.eclipse.swt/.classpath_gtk3
-rw-r--r--bundles/org.eclipse.swt/.classpath_motif3
-rw-r--r--bundles/org.eclipse.swt/.classpath_photon3
-rw-r--r--bundles/org.eclipse.swt/.classpath_win323
-rw-r--r--bundles/org.eclipse.swt/.classpath_wpf3
-rw-r--r--bundles/org.eclipse.swt/.classpath_wpf_e43
-rw-r--r--bundles/org.eclipse.swt/META-INF/MANIFEST.MF3
-rw-r--r--bundles/org.eclipse.swt/buildFragment.xml12
11 files changed, 12 insertions, 28 deletions
diff --git a/bundles/org.eclipse.swt/.classpath_carbon b/bundles/org.eclipse.swt/.classpath_carbon
index 3a1e47883d..6b105fc372 100644
--- a/bundles/org.eclipse.swt/.classpath_carbon
+++ b/bundles/org.eclipse.swt/.classpath_carbon
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/CDC-1.0%Foundation-1.0"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="src" path="Eclipse SWT/carbon"/>
<classpathentry kind="src" path="Eclipse SWT/common"/>
<classpathentry kind="src" path="Eclipse SWT/common_j2se"/>
@@ -34,6 +34,5 @@
<classpathentry kind="src" path="Eclipse SWT OpenGL/carbon"/>
<classpathentry kind="src" path="Eclipse SWT OpenGL/common"/>
<classpathentry kind="src" path="Eclipse SWT Theme/carbon"/>
- <classpathentry kind="lib" path="extra_jars/exceptions.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/bundles/org.eclipse.swt/.classpath_cocoa b/bundles/org.eclipse.swt/.classpath_cocoa
index 8ed1d226a6..a959a32cd6 100644
--- a/bundles/org.eclipse.swt/.classpath_cocoa
+++ b/bundles/org.eclipse.swt/.classpath_cocoa
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/CDC-1.0%Foundation-1.0"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="src" path="Eclipse SWT/cocoa"/>
<classpathentry kind="src" path="Eclipse SWT/common"/>
<classpathentry kind="src" path="Eclipse SWT/common_j2se"/>
@@ -34,6 +34,5 @@
<classpathentry kind="src" path="Eclipse SWT OpenGL/cocoa"/>
<classpathentry kind="src" path="Eclipse SWT OpenGL/common"/>
<classpathentry kind="src" path="Eclipse SWT Theme/emulated"/>
- <classpathentry kind="lib" path="extra_jars/exceptions.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/bundles/org.eclipse.swt/.classpath_dojo b/bundles/org.eclipse.swt/.classpath_dojo
index dcf6d5e451..0a1cc61a4c 100644
--- a/bundles/org.eclipse.swt/.classpath_dojo
+++ b/bundles/org.eclipse.swt/.classpath_dojo
@@ -28,6 +28,5 @@
<classpathentry kind="src" path="Eclipse SWT Animation/common"/>
<classpathentry kind="src" path="Eclipse SWT Animation/dojo"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.swt.e4.jcl"/>
- <classpathentry kind="lib" path="extra_jars/exceptions.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/bundles/org.eclipse.swt/.classpath_gtk b/bundles/org.eclipse.swt/.classpath_gtk
index babfb2899d..2f04c32e4f 100644
--- a/bundles/org.eclipse.swt/.classpath_gtk
+++ b/bundles/org.eclipse.swt/.classpath_gtk
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/CDC-1.0%Foundation-1.0"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="src" path="Eclipse SWT/gtk"/>
<classpathentry kind="src" path="Eclipse SWT/cairo"/>
<classpathentry kind="src" path="Eclipse SWT/emulated/bidi"/>
@@ -38,6 +38,5 @@
<classpathentry kind="src" path="Eclipse SWT OpenGL/common"/>
<classpathentry kind="src" path="Eclipse SWT Theme/gtk"/>
<classpathentry kind="src" path="Eclipse SWT WebKit/gtk"/>
- <classpathentry kind="lib" path="extra_jars/exceptions.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/bundles/org.eclipse.swt/.classpath_motif b/bundles/org.eclipse.swt/.classpath_motif
index 7c18c5c6d0..69459c707b 100644
--- a/bundles/org.eclipse.swt/.classpath_motif
+++ b/bundles/org.eclipse.swt/.classpath_motif
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/CDC-1.0%Foundation-1.0"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="src" path="Eclipse SWT/motif"/>
<classpathentry kind="src" path="Eclipse SWT/cairo"/>
<classpathentry kind="src" path="Eclipse SWT/emulated/bidi"/>
@@ -45,6 +45,5 @@
<classpathentry kind="src" path="Eclipse SWT OpenGL/glx"/>
<classpathentry kind="src" path="Eclipse SWT OpenGL/common"/>
<classpathentry kind="src" path="Eclipse SWT Theme/emulated"/>
- <classpathentry kind="lib" path="extra_jars/exceptions.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/bundles/org.eclipse.swt/.classpath_photon b/bundles/org.eclipse.swt/.classpath_photon
index 3c7f8847ab..9d8a6124bf 100644
--- a/bundles/org.eclipse.swt/.classpath_photon
+++ b/bundles/org.eclipse.swt/.classpath_photon
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/CDC-1.0%Foundation-1.0"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="src" path="Eclipse SWT/photon"/>
<classpathentry kind="src" path="Eclipse SWT/emulated/graphics"/>
<classpathentry kind="src" path="Eclipse SWT/emulated/bidi"/>
@@ -38,6 +38,5 @@
<classpathentry kind="src" path="Eclipse SWT OpenGL/emulated"/>
<classpathentry kind="src" path="Eclipse SWT OpenGL/common"/>
<classpathentry kind="src" path="Eclipse SWT Theme/emulated"/>
- <classpathentry kind="lib" path="extra_jars/exceptions.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/bundles/org.eclipse.swt/.classpath_win32 b/bundles/org.eclipse.swt/.classpath_win32
index c981b48520..68a2d44fbb 100644
--- a/bundles/org.eclipse.swt/.classpath_win32
+++ b/bundles/org.eclipse.swt/.classpath_win32
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/CDC-1.0%Foundation-1.0"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="src" path="Eclipse SWT/win32"/>
<classpathentry kind="src" path="Eclipse SWT/common"/>
<classpathentry kind="src" path="Eclipse SWT/common_j2se"/>
@@ -31,6 +31,5 @@
<classpathentry kind="src" path="Eclipse SWT OpenGL/win32"/>
<classpathentry kind="src" path="Eclipse SWT OpenGL/common"/>
<classpathentry kind="src" path="Eclipse SWT Theme/win32"/>
- <classpathentry kind="lib" path="extra_jars/exceptions.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/bundles/org.eclipse.swt/.classpath_wpf b/bundles/org.eclipse.swt/.classpath_wpf
index 9d2426f0ec..8d34cbf331 100644
--- a/bundles/org.eclipse.swt/.classpath_wpf
+++ b/bundles/org.eclipse.swt/.classpath_wpf
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/CDC-1.0%Foundation-1.0"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="src" path="Eclipse SWT/wpf"/>
<classpathentry kind="src" path="Eclipse SWT/common"/>
<classpathentry kind="src" path="Eclipse SWT/common_j2se"/>
@@ -34,6 +34,5 @@
<classpathentry kind="src" path="Eclipse SWT OpenGL/common"/>
<classpathentry kind="src" path="Eclipse SWT Theme/emulated"/>
<classpathentry kind="src" path="Eclipse SWT Effects/emulated"/>
- <classpathentry kind="lib" path="extra_jars/exceptions.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/bundles/org.eclipse.swt/.classpath_wpf_e4 b/bundles/org.eclipse.swt/.classpath_wpf_e4
index 9f35602dca..295916de48 100644
--- a/bundles/org.eclipse.swt/.classpath_wpf_e4
+++ b/bundles/org.eclipse.swt/.classpath_wpf_e4
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/CDC-1.0%Foundation-1.0"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="src" path="Eclipse SWT/wpf"/>
<classpathentry kind="src" path="Eclipse SWT/common"/>
<classpathentry kind="src" path="Eclipse SWT/common_j2se"/>
@@ -36,6 +36,5 @@
<classpathentry kind="src" path="Eclipse SWT Animation/wpf"/>
<classpathentry kind="src" path="Eclipse SWT Effects/wpf"/>
<classpathentry kind="src" path="Eclipse SWT Net/desktop"/>
- <classpathentry kind="lib" path="extra_jars/exceptions.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/bundles/org.eclipse.swt/META-INF/MANIFEST.MF b/bundles/org.eclipse.swt/META-INF/MANIFEST.MF
index f19ba8b55e..66f6577b80 100644
--- a/bundles/org.eclipse.swt/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.swt/META-INF/MANIFEST.MF
@@ -7,5 +7,4 @@ Bundle-ManifestVersion: 2
Bundle-Localization: plugin
DynamicImport-Package: org.eclipse.swt.accessibility2, org.mozilla.xpcom
Eclipse-ExtensibleAPI: true
-Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,
- J2SE-1.3
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/bundles/org.eclipse.swt/buildFragment.xml b/bundles/org.eclipse.swt/buildFragment.xml
index 5f74594df0..48d4fd3bc6 100644
--- a/bundles/org.eclipse.swt/buildFragment.xml
+++ b/bundles/org.eclipse.swt/buildFragment.xml
@@ -25,8 +25,8 @@
<property name="destination" value="${fragmentdir}" />
<property name="javacVerbose" value="false" />
<property name="logExtension" value=".xml" />
- <property name="javacSource" value="1.3" />
- <property name="javacTarget" value="1.2" />
+ <property name="javacSource" value="1.5" />
+ <property name="javacTarget" value="1.5" />
<condition property="bootclasspath" value="">
<equals arg1="${swt.os}" arg2="macosx"/>
</condition>
@@ -36,12 +36,6 @@
</fileset>
</path>
<property name="bootclasspath" refid="path_bootclasspath" />
- <condition property="bundleBootClasspath" value="${CDC-1.0/Foundation-1.0}">
- <isset property="CDC-1.0/Foundation-1.0" />
- </condition>
- <condition property="bundleBootClasspath" value="${J2SE-1.3}">
- <isset property="J2SE-1.3" />
- </condition>
<property name="bundleJavacSource" value="${javacSource}" />
<property name="bundleJavacTarget" value="${javacTarget}" />
<property name="bundleBootClasspath" value="${bootclasspath}" />
@@ -72,7 +66,7 @@
<delete dir="${temp.folder}/@dot.bin" />
<mkdir dir="${temp.folder}/@dot.bin" />
<antcall target="copy.${swt.ws}.src"/>
- <javac destdir="${temp.folder}/@dot.bin" verbose="${javacVerbose}" debug="${debug}" failonerror="no" classpath="${plugindir}/extra_jars/exceptions.jar" bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}" target="${bundleJavacTarget}">
+ <javac destdir="${temp.folder}/@dot.bin" verbose="${javacVerbose}" debug="${debug}" failonerror="no" bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}" target="${bundleJavacTarget}">
<src path="${temp.folder}/@dot.src/"/>
<compilerarg line="-log '${temp.folder}'/@dot.bin${logExtension}" compiler="org.eclipse.jdt.core.JDTCompilerAdapter" />
<compilerarg line="${compilerArg}" compiler="org.eclipse.jdt.core.JDTCompilerAdapter" />

Back to the top