Lps 72500 http session activation listener

bundles/org.eclipse.equinox.app/osgi/org/osgi/service/application/ApplicationDescriptor.java

@@ -205,7 +205,7 @@ public final Map getProperties(String locale) {
 			}
 		}
 		/* replace the container's lock with the application model's lock, that's the correct */
-		props.put(APPLICATION_LOCKED, new Boolean(locked[0]));
+		props.put(APPLICATION_LOCKED, Boolean.valueOf(locked[0]));
 		return props;
 	}
 
@@ -551,4 +551,4 @@ private static void validateValue(Map.Entry entry, Map copy) throws ApplicationE
 		}
 		throw new ApplicationException(ApplicationException.APPLICATION_INVALID_STARTUP_ARGUMENT, "The value for key \"" + entry.getKey() + "\" is an invalid type \"" + clazz.getName() + "\""); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 	}
-}
+}

bundles/org.eclipse.equinox.bidi/src/org/eclipse/equinox/bidi/advanced/StructuredTextEnvironment.java

@@ -185,9 +185,9 @@ public boolean isProcessingNeeded() {
 						"ar".equals(language) || //$NON-NLS-1$
 						"fa".equals(language) || //$NON-NLS-1$
 						"ur".equals(language); //$NON-NLS-1$
-				processingNeeded = new Boolean(isBidi);
+				processingNeeded = Boolean.valueOf(isBidi);
 			} else {
-				processingNeeded = new Boolean(false);
+				processingNeeded = Boolean.FALSE;
 			}
 		}
 		return processingNeeded.booleanValue();

bundles/org.eclipse.equinox.cm.test/src/org/eclipse/equinox/cm/test/ConfigurationDictionaryTest.java

@@ -52,7 +52,7 @@ public void testGoodConfigProperties() throws Exception {
 			dict.put("6", new Byte((byte) 1));
 			dict.put("7", new Short((short) 1));
 			dict.put("8", new Character('a'));
-			dict.put("9", new Boolean(true));
+			dict.put("9", Boolean.TRUE);
 			dict.put("10", new String[] {"x"});
 			dict.put("11", new Integer[] {new Integer(1)});
 			dict.put("12", new Long[] {new Long(1)});
@@ -61,7 +61,7 @@ public void testGoodConfigProperties() throws Exception {
 			dict.put("15", new Byte[] {new Byte((byte) 1)});
 			dict.put("16", new Short[] {new Short((short) 1)});
 			dict.put("17", new Character[] {new Character('a')});
-			dict.put("18", new Boolean[] {new Boolean(true)});
+			dict.put("18", new Boolean[] {Boolean.TRUE});
 			dict.put("19", new int[] {1});
 			dict.put("20", new long[] {1});
 			dict.put("21", new float[] {1});
@@ -80,7 +80,7 @@ public void testGoodConfigProperties() throws Exception {
 			v.add(new Byte((byte) 1));
 			v.add(new Short((short) 1));
 			v.add(new Character('a'));
-			v.add(new Boolean(true));
+			v.add(Boolean.TRUE);
 			dict.put("28", v);
 			Collection c = new ArrayList();
 			c.add(new String("x"));
@@ -91,7 +91,7 @@ public void testGoodConfigProperties() throws Exception {
 			c.add(new Byte((byte) 1));
 			c.add(new Short((short) 1));
 			c.add(new Character('a'));
-			c.add(new Boolean(true));
+			c.add(Boolean.TRUE);
 			dict.put("29", c);
 		} catch (IllegalArgumentException e) {
 			fail(e.getMessage());

bundles/org.eclipse.equinox.http.jetty9/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.1.1.qualifier
+Bundle-Version: 3.1.2.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)",

bundles/org.eclipse.equinox.http.jetty9/pom.xml

@@ -20,6 +20,6 @@
   </parent>
   <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.http.jetty</artifactId>
-  <version>3.1.1-SNAPSHOT</version>
+  <version>3.1.2-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>

bundles/org.eclipse.equinox.http.jetty9/src/org/eclipse/equinox/http/jetty/internal/Activator.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2011 Cognos Incorporated, IBM Corporation and others.
+ * Copyright (c) 2005, 2016 Cognos Incorporated, 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
@@ -8,6 +8,7 @@
  * Contributors:
  *     Cognos Incorporated - initial API and implementation
  *     IBM Corporation - bug fixes and enhancements
+ *     Raymond Augé - bug fixes
  *******************************************************************************/
 
 package org.eclipse.equinox.http.jetty.internal;
@@ -42,6 +43,9 @@ public class Activator implements BundleActivator {
 	// (default threshold is "warn")
 	private static final String LOG_STDERR_THRESHOLD = "org.eclipse.equinox.http.jetty.log.stderr.threshold"; //$NON-NLS-1$
 
+	// Jetty will not have Servlet 3 multipart
+	private static final String SERVLET3_MULTIPART = "org.eclipse.equinox.http.jetty.servlet3.multipart"; //$NON-NLS-1$
+
 	// The staticServerManager is use by the start and stopServer methods and must be accessed in a static synchronized block
 	// to ensure it is correctly handled in terms of the bundle life-cycle.
 	private static HttpServerManager staticServerManager;
@@ -51,11 +55,16 @@ public class Activator implements BundleActivator {
 	private ServiceRegistration registration;
 
 	public void start(BundleContext context) throws Exception {
-		File jettyWorkDir = new File(context.getDataFile(""), JETTY_WORK_DIR); //$NON-NLS-1$ 
+		File jettyWorkDir = new File(context.getDataFile(""), JETTY_WORK_DIR); //$NON-NLS-1$
 		jettyWorkDir.mkdir();
 		EquinoxStdErrLog.setThresholdLogger(context.getProperty(LOG_STDERR_THRESHOLD));
 		httpServerManager = new HttpServerManager(jettyWorkDir);
 
+		String servlet3multipart = context.getProperty(SERVLET3_MULTIPART);
+		if ((servlet3multipart != null) && Boolean.valueOf(servlet3multipart).booleanValue()) {
+			httpServerManager.setServlet3multipart(Boolean.valueOf(servlet3multipart).booleanValue());
+		}
+
 		String autostart = context.getProperty(AUTOSTART);
 		if ((autostart == null || Boolean.valueOf(autostart).booleanValue()) && !isBundleActivationPolicyUsed(context)) {
 			Dictionary<String, Object> defaultSettings = createDefaultSettings(context);
@@ -108,7 +117,7 @@ private Dictionary<String, Object> createDefaultSettings(BundleContext context)
 
 		// HTTP Enabled (default is true)
 		String httpEnabledProperty = context.getProperty(PROPERTY_PREFIX + JettyConstants.HTTP_ENABLED);
-		Boolean httpEnabled = (httpEnabledProperty == null) ? Boolean.TRUE : new Boolean(httpEnabledProperty);
+		Boolean httpEnabled = (httpEnabledProperty == null) ? Boolean.TRUE : Boolean.valueOf(httpEnabledProperty);
 		defaultSettings.put(JettyConstants.HTTP_ENABLED, httpEnabled);
 
 		// HTTP Port
@@ -132,7 +141,7 @@ private Dictionary<String, Object> createDefaultSettings(BundleContext context)
 			defaultSettings.put(JettyConstants.HTTP_HOST, httpHost);
 
 		// HTTPS Enabled (default is false)
-		Boolean httpsEnabled = new Boolean(context.getProperty(PROPERTY_PREFIX + JettyConstants.HTTPS_ENABLED));
+		Boolean httpsEnabled = Boolean.valueOf(context.getProperty(PROPERTY_PREFIX + JettyConstants.HTTPS_ENABLED));
 		defaultSettings.put(JettyConstants.HTTPS_ENABLED, httpsEnabled);
 
 		if (httpsEnabled.booleanValue()) {
@@ -171,11 +180,11 @@ private Dictionary<String, Object> createDefaultSettings(BundleContext context)
 
 			String needclientauth = context.getProperty(PROPERTY_PREFIX + JettyConstants.SSL_NEEDCLIENTAUTH);
 			if (needclientauth != null)
-				defaultSettings.put(JettyConstants.SSL_NEEDCLIENTAUTH, new Boolean(needclientauth));
+				defaultSettings.put(JettyConstants.SSL_NEEDCLIENTAUTH, Boolean.valueOf(needclientauth));
 
 			String wantclientauth = context.getProperty(PROPERTY_PREFIX + JettyConstants.SSL_WANTCLIENTAUTH);
 			if (wantclientauth != null)
-				defaultSettings.put(JettyConstants.SSL_WANTCLIENTAUTH, new Boolean(wantclientauth));
+				defaultSettings.put(JettyConstants.SSL_WANTCLIENTAUTH, Boolean.valueOf(wantclientauth));
 
 			String protocol = context.getProperty(PROPERTY_PREFIX + JettyConstants.SSL_PROTOCOL);
 			if (protocol != null)

bundles/org.eclipse.equinox.http.jetty9/src/org/eclipse/equinox/http/jetty/internal/HttpServerManager.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2013 IBM Corporation and others.
+ * Copyright (c) 2007, 2016 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
@@ -8,6 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *     Red Hat, Inc. - Jetty 9 adoption.
+ *     Raymond Augé - bug fixes
  *******************************************************************************/
 
 package org.eclipse.equinox.http.jetty.internal;
@@ -42,6 +43,7 @@ public class HttpServerManager implements ManagedServiceFactory {
 
 	private Map<String, Server> servers = new HashMap<String, Server>();
 	private File workDir;
+	private boolean servlet3multipart = false;
 
 	public HttpServerManager(File workDir) {
 		this.workDir = workDir;
@@ -148,6 +150,10 @@ public synchronized void updated(String pid, @SuppressWarnings("rawtypes") Dicti
 		servers.put(pid, server);
 	}
 
+	public void setServlet3multipart(boolean servlet3multipart) {
+		this.servlet3multipart = servlet3multipart;
+	}
+
 	private ServerConnector createHttpsConnector(@SuppressWarnings("rawtypes") Dictionary dictionary, Server server, HttpConfiguration http_config) {
 		ServerConnector httpsConnector = null;
 		if (isHttpsEnabled(dictionary)) {
@@ -402,6 +408,10 @@ private static boolean deleteDirectory(File directory) {
 	}
 
 	private void setupMultiPartConfig(@SuppressWarnings("rawtypes") Dictionary dictionary, ServletHolder holder) {
+		if (!servlet3multipart) {
+			return;
+		}
+
 		MultipartConfigElement multipartConfigElement = new MultipartConfigElement(System.getProperty("java.io.tmpdir")); //$NON-NLS-1$
 		holder.getRegistration().setMultipartConfig(multipartConfigElement);
 	}

bundles/org.eclipse.equinox.http.registry/src/org/eclipse/equinox/http/registry/internal/FilterManager.java

@@ -120,7 +120,7 @@ public void added(IExtension extension) {
 				initparams.put(paramName, paramValue);
 			}
 
-			boolean loadOnStartup = new Boolean(filterElement.getAttribute(LOAD_ON_STARTUP)).booleanValue();
+			boolean loadOnStartup = Boolean.valueOf(filterElement.getAttribute(LOAD_ON_STARTUP)).booleanValue();
 			if (loadOnStartup)
 				wrapper.setLoadOnStartup();
 

bundles/org.eclipse.equinox.http.registry/src/org/eclipse/equinox/http/registry/internal/ServletManager.java

@@ -121,7 +121,7 @@ public void added(IExtension extension) {
 				initparams.put(paramName, paramValue);
 			}
 
-			boolean loadOnStartup = new Boolean(servletElement.getAttribute(LOAD_ON_STARTUP)).booleanValue();
+			boolean loadOnStartup = Boolean.valueOf(servletElement.getAttribute(LOAD_ON_STARTUP)).booleanValue();
 			if (loadOnStartup)
 				wrapper.setLoadOnStartup();
 

bundles/org.eclipse.equinox.http.servlet.tests/pom.xml

@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright (c) 2015 Raymond Augé and others.
+  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
+  http://www.eclipse.org/org/documents/edl-v10.php
+
+  Contributors:
+     Raymond Augé - initial implementation
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <artifactId>tests-pom</artifactId>
+    <groupId>org.eclipse.equinox.bundles</groupId>
+    <version>4.5.2-SNAPSHOT</version>
+    <relativePath>../../tests-pom/</relativePath>
+  </parent>
+  <groupId>org.eclipse.equinox</groupId>
+  <artifactId>org.eclipse.equinox.http.servlet.tests</artifactId>
+  <version>1.0.0-SNAPSHOT</version>
+  <packaging>eclipse-test-plugin</packaging>
+
+  <build>
+    <plugins>
+      <plugin>
+       <groupId>org.eclipse.tycho</groupId>
+       <artifactId>target-platform-configuration</artifactId>
+       <configuration>
+          <dependency-resolution>
+             <extraRequirements>
+                <requirement>
+                   <type>eclipse-plugin</type>
+                   <id>org.eclipse.core.jobs</id>
+                   <versionRange>[3.7.0,3.8.0)</versionRange>
+                </requirement>
+                <requirement>
+                   <type>eclipse-plugin</type>
+                   <id>org.eclipse.equinox.ds</id>
+                   <versionRange>1.4.0</versionRange>
+                </requirement>
+                <requirement>
+                   <type>eclipse-plugin</type>
+                   <id>org.eclipse.equinox.http.jetty</id>
+                   <versionRange>[3.1.0,3.2.0)</versionRange>
+                </requirement>
+                <requirement>
+                   <type>eclipse-plugin</type>
+                   <id>org.eclipse.equinox.http.servlet</id>
+                   <versionRange>[1.2.2,1.2.100)</versionRange>
+                </requirement>
+             </extraRequirements>
+          </dependency-resolution>
+       </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>