Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrsuen2007-09-11 15:07:30 +0000
committerrsuen2007-09-11 15:07:30 +0000
commit6d2370b408f40add23dcf8758d59a46806e8caf7 (patch)
tree15ffeb070e8085559a707701c1cd24c42a7e50ea
parente37d301c3222f44d100cab29d769ec137fd111f8 (diff)
downloadorg.eclipse.ecf-6d2370b408f40add23dcf8758d59a46806e8caf7.tar.gz
org.eclipse.ecf-6d2370b408f40add23dcf8758d59a46806e8caf7.tar.xz
org.eclipse.ecf-6d2370b408f40add23dcf8758d59a46806e8caf7.zip
Set a J2SE-1.4 EE.
-rw-r--r--server-side/bundles/org.eclipse.ecf.server.generic/.classpath2
-rw-r--r--server-side/bundles/org.eclipse.ecf.server.generic/.settings/org.eclipse.jdt.core.prefs8
-rw-r--r--server-side/bundles/org.eclipse.ecf.server.generic/META-INF/MANIFEST.MF1
-rw-r--r--server-side/bundles/org.eclipse.ecf.server.generic/src/org/eclipse/ecf/server/generic/ServerManager.java2
4 files changed, 7 insertions, 6 deletions
diff --git a/server-side/bundles/org.eclipse.ecf.server.generic/.classpath b/server-side/bundles/org.eclipse.ecf.server.generic/.classpath
index 304e86186..ce7393340 100644
--- a/server-side/bundles/org.eclipse.ecf.server.generic/.classpath
+++ b/server-side/bundles/org.eclipse.ecf.server.generic/.classpath
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/server-side/bundles/org.eclipse.ecf.server.generic/.settings/org.eclipse.jdt.core.prefs b/server-side/bundles/org.eclipse.ecf.server.generic/.settings/org.eclipse.jdt.core.prefs
index 53ca3de1c..4f62f002d 100644
--- a/server-side/bundles/org.eclipse.ecf.server.generic/.settings/org.eclipse.jdt.core.prefs
+++ b/server-side/bundles/org.eclipse.ecf.server.generic/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
-#Fri Apr 20 20:17:09 GMT-08:00 2007
+#Tue Sep 11 10:58:44 EDT 2007
eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
+org.eclipse.jdt.core.compiler.compliance=1.4
org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
@@ -55,4 +55,4 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=di
org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.3
diff --git a/server-side/bundles/org.eclipse.ecf.server.generic/META-INF/MANIFEST.MF b/server-side/bundles/org.eclipse.ecf.server.generic/META-INF/MANIFEST.MF
index c2863a1f7..51645b616 100644
--- a/server-side/bundles/org.eclipse.ecf.server.generic/META-INF/MANIFEST.MF
+++ b/server-side/bundles/org.eclipse.ecf.server.generic/META-INF/MANIFEST.MF
@@ -21,3 +21,4 @@ Import-Package: org.eclipse.equinox.app;version="1.0.0",
org.osgi.framework,
org.osgi.service.log,
org.osgi.util.tracker
+Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/server-side/bundles/org.eclipse.ecf.server.generic/src/org/eclipse/ecf/server/generic/ServerManager.java b/server-side/bundles/org.eclipse.ecf.server.generic/src/org/eclipse/ecf/server/generic/ServerManager.java
index 9d0676bd1..07934cdd9 100644
--- a/server-side/bundles/org.eclipse.ecf.server.generic/src/org/eclipse/ecf/server/generic/ServerManager.java
+++ b/server-side/bundles/org.eclipse.ecf.server.generic/src/org/eclipse/ecf/server/generic/ServerManager.java
@@ -117,7 +117,7 @@ public class ServerManager {
boolean discovery = false;
final String discoveryString = element.getAttribute(DISCOVERY_ATTR);
if (discoveryString != null)
- discovery = Boolean.parseBoolean(discoveryString);
+ discovery = Boolean.valueOf(discoveryString).booleanValue();
final Connector connector = new Connector(null, element.getAttribute(HOSTNAME_ATTR), port, keepAlive, discovery);
final IConfigurationElement[] groupElements = element.getChildren(GROUP_ELEMENT);
for (int j = 0; j < groupElements.length; j++) {

Back to the top