diff options
4 files changed, 69 insertions, 52 deletions
diff --git a/bundles/org.eclipse.equinox.http.jetty8/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.equinox.http.jetty8/.settings/org.eclipse.jdt.core.prefs index 449cf187f..a0668fa4a 100644 --- a/bundles/org.eclipse.equinox.http.jetty8/.settings/org.eclipse.jdt.core.prefs +++ b/bundles/org.eclipse.equinox.http.jetty8/.settings/org.eclipse.jdt.core.prefs @@ -6,6 +6,12 @@ org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch org.eclipse.jdt.core.circularClasspath=error org.eclipse.jdt.core.classpath.exclusionPatterns=enabled org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled +org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled +org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore +org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull +org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault +org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable +org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve @@ -18,17 +24,23 @@ org.eclipse.jdt.core.compiler.maxProblemPerUnit=1000 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.autoboxing=ignore +org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning +org.eclipse.jdt.core.compiler.problem.deadCode=warning org.eclipse.jdt.core.compiler.problem.deprecation=warning org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled org.eclipse.jdt.core.compiler.problem.discouragedReference=error org.eclipse.jdt.core.compiler.problem.emptyStatement=warning org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore +org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore +org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled org.eclipse.jdt.core.compiler.problem.fieldHiding=warning org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning org.eclipse.jdt.core.compiler.problem.forbiddenReference=error org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning +org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning @@ -36,7 +48,10 @@ org.eclipse.jdt.core.compiler.problem.invalidJavadoc=error org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning +org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore +org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled +org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public @@ -44,31 +59,59 @@ org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore +org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning +org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning +org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning +org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error +org.eclipse.jdt.core.compiler.problem.nullReference=warning +org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error +org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning +org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning +org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore +org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore +org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning +org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning +org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore +org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore +org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore +org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore +org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning +org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled +org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning +org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=disabled org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning +org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=enabled org.eclipse.jdt.core.compiler.problem.unusedImport=error +org.eclipse.jdt.core.compiler.problem.unusedLabel=warning org.eclipse.jdt.core.compiler.problem.unusedLocal=warning +org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore +org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=enabled org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=enabled org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error +org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore +org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.source=1.5 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false diff --git a/bundles/org.eclipse.equinox.http.jetty8/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.http.jetty8/META-INF/MANIFEST.MF index deb06c33e..55285b3b1 100755 --- a/bundles/org.eclipse.equinox.http.jetty8/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.http.jetty8/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: %bundleName Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-SymbolicName: org.eclipse.equinox.http.jetty -Bundle-Version: 3.0.100.qualifier +Bundle-Version: 3.0.200.qualifier Bundle-Activator: org.eclipse.equinox.http.jetty.internal.Activator Import-Package: javax.servlet;version="[2.6.0,4.0.0)", javax.servlet.http;version="[2.6.0,4.0.0)", diff --git a/bundles/org.eclipse.equinox.http.jetty8/pom.xml b/bundles/org.eclipse.equinox.http.jetty8/pom.xml index 79bde4d1e..97210b19b 100644 --- a/bundles/org.eclipse.equinox.http.jetty8/pom.xml +++ b/bundles/org.eclipse.equinox.http.jetty8/pom.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (c) 2012 Eclipse Foundation. + Copyright (c) 2012, 2013 Eclipse Foundation. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Distribution License v1.0 which accompanies this distribution, and is available at @@ -19,6 +19,6 @@ </parent> <groupId>org.eclipse.equinox</groupId> <artifactId>org.eclipse.equinox.http.jetty</artifactId> - <version>3.0.100-SNAPSHOT</version> + <version>3.0.200-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/bundles/org.eclipse.equinox.http.jetty8/src/org/eclipse/equinox/http/jetty/internal/HttpServerManager.java b/bundles/org.eclipse.equinox.http.jetty8/src/org/eclipse/equinox/http/jetty/internal/HttpServerManager.java index c9224bde8..11c32092d 100755 --- a/bundles/org.eclipse.equinox.http.jetty8/src/org/eclipse/equinox/http/jetty/internal/HttpServerManager.java +++ b/bundles/org.eclipse.equinox.http.jetty8/src/org/eclipse/equinox/http/jetty/internal/HttpServerManager.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2012 IBM Corporation and others. + * Copyright (c) 2007, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -62,8 +62,7 @@ public class HttpServerManager implements ManagedServiceFactory { return this.getClass().getName(); } - @SuppressWarnings("unchecked") - public synchronized void updated(String pid, @SuppressWarnings("rawtypes") Dictionary dictionary) throws ConfigurationException { + public synchronized void updated(String pid, Dictionary<String, ?> dictionary) throws ConfigurationException { deleted(pid); Server server = new Server(); @@ -128,44 +127,31 @@ public class HttpServerManager implements ManagedServiceFactory { private Connector createHttpConnector(@SuppressWarnings("rawtypes") Dictionary dictionary) { Boolean httpEnabled = null; Object httpEnabledObj = dictionary.get(JettyConstants.HTTP_ENABLED); - if (httpEnabledObj instanceof Boolean) - { - httpEnabled = (Boolean) httpEnabledObj; + if (httpEnabledObj instanceof Boolean) { + httpEnabled = (Boolean) httpEnabledObj; + } else if (httpEnabledObj instanceof String) { + httpEnabled = Boolean.parseBoolean(httpEnabledObj.toString()); } - else - if (httpEnabledObj instanceof String) - { - httpEnabled = Boolean.parseBoolean(httpEnabledObj.toString()); - } if (httpEnabled != null && !httpEnabled.booleanValue()) return null; - Integer httpPort = null; Object httpPortObj = dictionary.get(JettyConstants.HTTP_PORT); - if (httpPortObj instanceof Integer) - { + if (httpPortObj instanceof Integer) { httpPort = (Integer) httpPortObj; + } else if (httpPortObj instanceof String) { + httpPort = Integer.valueOf(httpPortObj.toString()); } - else - if (httpPortObj instanceof String) - { - httpPort = Integer.valueOf(httpPortObj.toString()); - } if (httpPort == null) return null; Boolean nioEnabled = null; Object nioEnabledObj = dictionary.get(JettyConstants.HTTP_NIO); - if (nioEnabledObj instanceof Boolean) - { - nioEnabled = (Boolean) nioEnabledObj; + if (nioEnabledObj instanceof Boolean) { + nioEnabled = (Boolean) nioEnabledObj; + } else if (nioEnabledObj instanceof String) { + nioEnabled = Boolean.parseBoolean(nioEnabledObj.toString()); } - else - if (nioEnabledObj instanceof String) - { - nioEnabled = Boolean.parseBoolean(nioEnabledObj.toString()); - } if (nioEnabled == null) nioEnabled = getDefaultNIOEnablement(); @@ -216,29 +202,21 @@ public class HttpServerManager implements ManagedServiceFactory { private Connector createHttpsConnector(@SuppressWarnings("rawtypes") Dictionary dictionary) { Boolean httpsEnabled = null; Object httpsEnabledObj = dictionary.get(JettyConstants.HTTPS_ENABLED); - if (httpsEnabledObj instanceof Boolean) - { - httpsEnabled = (Boolean) httpsEnabledObj; + if (httpsEnabledObj instanceof Boolean) { + httpsEnabled = (Boolean) httpsEnabledObj; + } else if (httpsEnabledObj instanceof String) { + httpsEnabled = Boolean.parseBoolean(httpsEnabledObj.toString()); } - else - if (httpsEnabledObj instanceof String) - { - httpsEnabled = Boolean.parseBoolean(httpsEnabledObj.toString()); - } if (httpsEnabled == null || !httpsEnabled.booleanValue()) return null; Integer httpsPort = null; Object httpsPortObj = dictionary.get(JettyConstants.HTTPS_PORT); - if (httpsPortObj instanceof Integer) - { + if (httpsPortObj instanceof Integer) { httpsPort = (Integer) httpsPortObj; + } else if (httpsPortObj instanceof String) { + httpsPort = Integer.valueOf(httpsPortObj.toString()); } - else - if (httpsPortObj instanceof String) - { - httpsPort = Integer.valueOf(httpsPortObj.toString()); - } if (httpsPort == null) return null; @@ -316,15 +294,11 @@ public class HttpServerManager implements ManagedServiceFactory { HashSessionManager sessionManager = new HashSessionManager(); Integer sessionInactiveInterval = null; Object sessionInactiveIntervalObj = dictionary.get(JettyConstants.CONTEXT_SESSIONINACTIVEINTERVAL); - if (sessionInactiveIntervalObj instanceof Integer) - { + if (sessionInactiveIntervalObj instanceof Integer) { sessionInactiveInterval = (Integer) sessionInactiveIntervalObj; + } else if (sessionInactiveIntervalObj instanceof String) { + sessionInactiveInterval = Integer.valueOf(sessionInactiveIntervalObj.toString()); } - else - if (sessionInactiveIntervalObj instanceof String) - { - sessionInactiveInterval = Integer.valueOf(sessionInactiveIntervalObj.toString()); - } if (sessionInactiveInterval != null) sessionManager.setMaxInactiveInterval(sessionInactiveInterval.intValue()); |