From 1f7c84a3f4adbe91ba8efc60cdca757aa691e5d8 Mon Sep 17 00:00:00 2001
From: Antoine Sabot-Durand <antoine@sabot-durand.net>
Date: Tue, 5 Jul 2016 17:26:01 +0200
Subject: [PATCH 1/2] WELD-2189 prepare Jigsaw modularisation Moving classes
 from org.jboss.weld.environment to servlet subpackage to avoid package
 spliting across artefacts

---
 .../weld/environment/gwtdev/GwtDevHostedModeContainer.java  | 4 ++--
 .../weld/environment/jetty/AbstractJettyContainer.java      | 4 ++--
 .../org/jboss/weld/environment/jetty/JettyContainer.java    | 4 ++--
 .../weld/environment/{ => servlet}/AbstractContainer.java   | 2 +-
 .../org/jboss/weld/environment/{ => servlet}/Container.java | 2 +-
 .../weld/environment/{ => servlet}/ContainerContext.java    | 3 +--
 .../weld/environment/servlet/WeldServletLifecycle.java      | 2 --
 .../org/jboss/weld/environment/tomcat/TomcatContainer.java  | 6 +++---
 .../jboss/weld/environment/undertow/UndertowContainer.java  | 4 ++--
 .../environment/servlet/undertow/UndertowSmokeTest.java     | 2 +-
 10 files changed, 15 insertions(+), 18 deletions(-)
 rename environments/servlet/core/src/main/java/org/jboss/weld/environment/{ => servlet}/AbstractContainer.java (97%)
 rename environments/servlet/core/src/main/java/org/jboss/weld/environment/{ => servlet}/Container.java (97%)
 rename environments/servlet/core/src/main/java/org/jboss/weld/environment/{ => servlet}/ContainerContext.java (94%)

diff --git a/environments/servlet/core/src/main/java/org/jboss/weld/environment/gwtdev/GwtDevHostedModeContainer.java b/environments/servlet/core/src/main/java/org/jboss/weld/environment/gwtdev/GwtDevHostedModeContainer.java
index 4cf0dcb7879..761002f79ea 100644
--- a/environments/servlet/core/src/main/java/org/jboss/weld/environment/gwtdev/GwtDevHostedModeContainer.java
+++ b/environments/servlet/core/src/main/java/org/jboss/weld/environment/gwtdev/GwtDevHostedModeContainer.java
@@ -21,8 +21,8 @@
 
 import javax.servlet.ServletContext;
 
-import org.jboss.weld.environment.Container;
-import org.jboss.weld.environment.ContainerContext;
+import org.jboss.weld.environment.servlet.Container;
+import org.jboss.weld.environment.servlet.ContainerContext;
 import org.jboss.weld.environment.jetty.AbstractJettyContainer;
 import org.jboss.weld.environment.jetty.JettyWeldInjector;
 import org.jboss.weld.environment.servlet.logging.JettyLogger;
diff --git a/environments/servlet/core/src/main/java/org/jboss/weld/environment/jetty/AbstractJettyContainer.java b/environments/servlet/core/src/main/java/org/jboss/weld/environment/jetty/AbstractJettyContainer.java
index 17b677775bd..1a665f808e5 100644
--- a/environments/servlet/core/src/main/java/org/jboss/weld/environment/jetty/AbstractJettyContainer.java
+++ b/environments/servlet/core/src/main/java/org/jboss/weld/environment/jetty/AbstractJettyContainer.java
@@ -17,8 +17,8 @@
 
 package org.jboss.weld.environment.jetty;
 
-import org.jboss.weld.environment.AbstractContainer;
-import org.jboss.weld.environment.ContainerContext;
+import org.jboss.weld.environment.servlet.AbstractContainer;
+import org.jboss.weld.environment.servlet.ContainerContext;
 
 /**
  * Abstract Jetty container.
diff --git a/environments/servlet/core/src/main/java/org/jboss/weld/environment/jetty/JettyContainer.java b/environments/servlet/core/src/main/java/org/jboss/weld/environment/jetty/JettyContainer.java
index 5f7f863847b..f12def6ca68 100644
--- a/environments/servlet/core/src/main/java/org/jboss/weld/environment/jetty/JettyContainer.java
+++ b/environments/servlet/core/src/main/java/org/jboss/weld/environment/jetty/JettyContainer.java
@@ -19,8 +19,8 @@
 
 import javax.servlet.ServletContext;
 
-import org.jboss.weld.environment.Container;
-import org.jboss.weld.environment.ContainerContext;
+import org.jboss.weld.environment.servlet.Container;
+import org.jboss.weld.environment.servlet.ContainerContext;
 import org.jboss.weld.environment.servlet.EnhancedListener;
 import org.jboss.weld.environment.servlet.logging.JettyLogger;
 import org.jboss.weld.resources.spi.ResourceLoader;
diff --git a/environments/servlet/core/src/main/java/org/jboss/weld/environment/AbstractContainer.java b/environments/servlet/core/src/main/java/org/jboss/weld/environment/servlet/AbstractContainer.java
similarity index 97%
rename from environments/servlet/core/src/main/java/org/jboss/weld/environment/AbstractContainer.java
rename to environments/servlet/core/src/main/java/org/jboss/weld/environment/servlet/AbstractContainer.java
index 474ca9a3d6d..77dd568d597 100644
--- a/environments/servlet/core/src/main/java/org/jboss/weld/environment/AbstractContainer.java
+++ b/environments/servlet/core/src/main/java/org/jboss/weld/environment/servlet/AbstractContainer.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.jboss.weld.environment;
+package org.jboss.weld.environment.servlet;
 
 import org.jboss.weld.environment.util.Reflections;
 import org.jboss.weld.resources.spi.ResourceLoader;
diff --git a/environments/servlet/core/src/main/java/org/jboss/weld/environment/Container.java b/environments/servlet/core/src/main/java/org/jboss/weld/environment/servlet/Container.java
similarity index 97%
rename from environments/servlet/core/src/main/java/org/jboss/weld/environment/Container.java
rename to environments/servlet/core/src/main/java/org/jboss/weld/environment/servlet/Container.java
index 4c5b700babf..99c56c65e40 100644
--- a/environments/servlet/core/src/main/java/org/jboss/weld/environment/Container.java
+++ b/environments/servlet/core/src/main/java/org/jboss/weld/environment/servlet/Container.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.jboss.weld.environment;
+package org.jboss.weld.environment.servlet;
 
 import org.jboss.weld.resources.spi.ResourceLoader;
 
diff --git a/environments/servlet/core/src/main/java/org/jboss/weld/environment/ContainerContext.java b/environments/servlet/core/src/main/java/org/jboss/weld/environment/servlet/ContainerContext.java
similarity index 94%
rename from environments/servlet/core/src/main/java/org/jboss/weld/environment/ContainerContext.java
rename to environments/servlet/core/src/main/java/org/jboss/weld/environment/servlet/ContainerContext.java
index c77b1078c64..77bcebaf11b 100644
--- a/environments/servlet/core/src/main/java/org/jboss/weld/environment/ContainerContext.java
+++ b/environments/servlet/core/src/main/java/org/jboss/weld/environment/servlet/ContainerContext.java
@@ -15,11 +15,10 @@
  * limitations under the License.
  */
 
-package org.jboss.weld.environment;
+package org.jboss.weld.environment.servlet;
 
 import javax.servlet.ServletContext;
 
-import org.jboss.weld.environment.servlet.WeldServletLifecycle;
 import org.jboss.weld.manager.api.WeldManager;
 import org.jboss.weld.util.Preconditions;
 
diff --git a/environments/servlet/core/src/main/java/org/jboss/weld/environment/servlet/WeldServletLifecycle.java b/environments/servlet/core/src/main/java/org/jboss/weld/environment/servlet/WeldServletLifecycle.java
index 0d5ee7dc3e4..1b8bb2799dc 100644
--- a/environments/servlet/core/src/main/java/org/jboss/weld/environment/servlet/WeldServletLifecycle.java
+++ b/environments/servlet/core/src/main/java/org/jboss/weld/environment/servlet/WeldServletLifecycle.java
@@ -47,8 +47,6 @@
 import org.jboss.weld.configuration.spi.ExternalConfiguration;
 import org.jboss.weld.configuration.spi.helpers.ExternalConfigurationBuilder;
 import org.jboss.weld.el.WeldELContextListener;
-import org.jboss.weld.environment.Container;
-import org.jboss.weld.environment.ContainerContext;
 import org.jboss.weld.environment.ContainerInstance;
 import org.jboss.weld.environment.ContainerInstanceFactory;
 import org.jboss.weld.environment.deployment.WeldBeanDeploymentArchive;
diff --git a/environments/servlet/core/src/main/java/org/jboss/weld/environment/tomcat/TomcatContainer.java b/environments/servlet/core/src/main/java/org/jboss/weld/environment/tomcat/TomcatContainer.java
index da613a9e64f..3434d8ee42e 100644
--- a/environments/servlet/core/src/main/java/org/jboss/weld/environment/tomcat/TomcatContainer.java
+++ b/environments/servlet/core/src/main/java/org/jboss/weld/environment/tomcat/TomcatContainer.java
@@ -17,9 +17,9 @@
 
 package org.jboss.weld.environment.tomcat;
 
-import org.jboss.weld.environment.AbstractContainer;
-import org.jboss.weld.environment.Container;
-import org.jboss.weld.environment.ContainerContext;
+import org.jboss.weld.environment.servlet.AbstractContainer;
+import org.jboss.weld.environment.servlet.Container;
+import org.jboss.weld.environment.servlet.ContainerContext;
 import org.jboss.weld.environment.servlet.EnhancedListener;
 import org.jboss.weld.environment.servlet.logging.TomcatLogger;
 
diff --git a/environments/servlet/core/src/main/java/org/jboss/weld/environment/undertow/UndertowContainer.java b/environments/servlet/core/src/main/java/org/jboss/weld/environment/undertow/UndertowContainer.java
index 4bdadf30d2d..db67df29748 100644
--- a/environments/servlet/core/src/main/java/org/jboss/weld/environment/undertow/UndertowContainer.java
+++ b/environments/servlet/core/src/main/java/org/jboss/weld/environment/undertow/UndertowContainer.java
@@ -16,8 +16,8 @@
  */
 package org.jboss.weld.environment.undertow;
 
-import org.jboss.weld.environment.Container;
-import org.jboss.weld.environment.ContainerContext;
+import org.jboss.weld.environment.servlet.Container;
+import org.jboss.weld.environment.servlet.ContainerContext;
 import org.jboss.weld.environment.servlet.logging.UndertowLogger;
 import org.jboss.weld.resources.spi.ResourceLoader;
 
diff --git a/environments/servlet/core/src/test/java/org/jboss/weld/environment/servlet/undertow/UndertowSmokeTest.java b/environments/servlet/core/src/test/java/org/jboss/weld/environment/servlet/undertow/UndertowSmokeTest.java
index ad0dbe141a4..b8125c1b91c 100644
--- a/environments/servlet/core/src/test/java/org/jboss/weld/environment/servlet/undertow/UndertowSmokeTest.java
+++ b/environments/servlet/core/src/test/java/org/jboss/weld/environment/servlet/undertow/UndertowSmokeTest.java
@@ -23,7 +23,7 @@
 
 import javax.servlet.ServletException;
 
-import org.jboss.weld.environment.Container;
+import org.jboss.weld.environment.servlet.Container;
 import org.jboss.weld.environment.servlet.Listener;
 import org.jboss.weld.environment.undertow.UndertowContainer;
 import org.junit.Test;

From abfb2e0b50a3f922c248ed668932e574440d4af9 Mon Sep 17 00:00:00 2001
From: Martin Kouba <mkouba@redhat.com>
Date: Mon, 14 Nov 2016 13:08:54 +0100
Subject: [PATCH 2/2] WELD-2189 Retain compat. for
 Container.CONTEXT_PARAM_CONTAINER_CLASS

---
 .../main/java/org/jboss/weld/environment/servlet/Container.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/environments/servlet/core/src/main/java/org/jboss/weld/environment/servlet/Container.java b/environments/servlet/core/src/main/java/org/jboss/weld/environment/servlet/Container.java
index 99c56c65e40..7d6fe0549a7 100644
--- a/environments/servlet/core/src/main/java/org/jboss/weld/environment/servlet/Container.java
+++ b/environments/servlet/core/src/main/java/org/jboss/weld/environment/servlet/Container.java
@@ -28,7 +28,7 @@
  */
 public interface Container {
 
-    String CONTEXT_PARAM_CONTAINER_CLASS = Container.class.getPackage().getName() + ".container.class";
+    String CONTEXT_PARAM_CONTAINER_CLASS = "org.jboss.weld.environment.container.class";
 
     /**
      * Touch if this container can be used.