Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

WELD-2189 Jigsaw modularization #1510

Closed
wants to merge 2 commits into from
Closed

WELD-2189 Jigsaw modularization #1510

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1f7c84a
WELD-2189 prepare Jigsaw modularisation
antoinesd Jul 5, 2016
abfb2e0
WELD-2189 Retain compat. for Container.CONTEXT_PARAM_CONTAINER_CLASS
mkouba Nov 14, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...rvlet/core/src/main/java/org/jboss/weld/environment/gwtdev/GwtDevHostedModeContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...s/servlet/core/src/main/java/org/jboss/weld/environment/jetty/AbstractJettyContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions environments/servlet/core/src/main/java/org/jboss/weld/environment/jetty/JettyContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...s/weld/environment/AbstractContainer.java → ...nvironment/servlet/AbstractContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...org/jboss/weld/environment/Container.java → ...s/weld/environment/servlet/Container.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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.
Expand Down
3 changes: 1 addition & 2 deletions ...ss/weld/environment/ContainerContext.java → ...environment/servlet/ContainerContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 0 additions & 2 deletions ...s/servlet/core/src/main/java/org/jboss/weld/environment/servlet/WeldServletLifecycle.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions ...onments/servlet/core/src/main/java/org/jboss/weld/environment/tomcat/TomcatContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
4 changes: 2 additions & 2 deletions ...nts/servlet/core/src/main/java/org/jboss/weld/environment/undertow/UndertowContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion ...let/core/src/test/java/org/jboss/weld/environment/servlet/undertow/UndertowSmokeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down