You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by st...@apache.org on 2017/08/16 05:14:06 UTC
[05/11] tomee git commit: TOMEE-2115 intermediate Servlet upgrade
commit
TOMEE-2115 intermediate Servlet upgrade commit
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/eed53029
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/eed53029
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/eed53029
Branch: refs/heads/fb_tomee8
Commit: eed530291c29933095a8b247bc862d8c334756c2
Parents: 21fd730
Author: Mark Struberg <st...@apache.org>
Authored: Tue Aug 15 23:10:57 2017 +0200
Committer: Mark Struberg <st...@apache.org>
Committed: Tue Aug 15 23:10:57 2017 +0200
----------------------------------------------------------------------
.gitignore | 1 +
.../org/apache/openejb/cdi/WebappBeanManager.java | 14 +++++++-------
.../openejb/rest/ThreadLocalServletContext.java | 6 ++++++
examples/rest-example-with-application/pom.xml | 15 +++++++++++++++
examples/rest-example/pom.xml | 15 +++++++++++++++
5 files changed, 44 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/eed53029/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 9bbb2a3..548c9c3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@ quick.bat
/tomee/tomee-plus-webapp/overlays/
/temp
/report.txt
+nb-configuration.xml
http://git-wip-us.apache.org/repos/asf/tomee/blob/eed53029/container/openejb-core/src/main/java/org/apache/openejb/cdi/WebappBeanManager.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/cdi/WebappBeanManager.java b/container/openejb-core/src/main/java/org/apache/openejb/cdi/WebappBeanManager.java
index eacfc5d..b201628 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/cdi/WebappBeanManager.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/cdi/WebappBeanManager.java
@@ -67,17 +67,17 @@ public class WebappBeanManager extends BeanManagerImpl {
@Override
public void fireEvent(final Object event, final EventMetadataImpl metadata, final boolean isLifecycleEvent) {
- getNotificationManager().fireEvent(event, metadata, isLifecycleEvent);
+ fireEvent(event, metadata, isLifecycleEvent);
if (isEvent(event)) {
final BeanManagerImpl parentBm = getParentBm();
if (parentBm != null) {
- parentBm.getNotificationManager().fireEvent(event, metadata, isLifecycleEvent);
+ parentBm.fireEvent(event, metadata, isLifecycleEvent);
}
}
}
@Override
- public List<Interceptor<?>> resolveInterceptors(final InterceptionType type, final Annotation... interceptorBindings) {
+ public List<Interceptor<?>> resolveInterceptors(InterceptionType type, Annotation... interceptorBindings) {
final List<Interceptor<?>> interceptors = super.resolveInterceptors(type, interceptorBindings);
final List<Interceptor<?>> parentInterceptors = getParentBm().resolveInterceptors(type, interceptorBindings);
for (final Interceptor<?> i : parentInterceptors) {
@@ -91,12 +91,12 @@ public class WebappBeanManager extends BeanManagerImpl {
@Override
public <T> Set<ObserverMethod<? super T>> resolveObserverMethods(final T event, final EventMetadataImpl metadata) {
final Set<ObserverMethod<? super T>> set = new HashSet<>();
- set.addAll(getNotificationManager().resolveObservers(event, metadata, false));
+ set.addAll(super.resolveObserverMethods(event, metadata));
if (isEvent(event)) {
final BeanManagerImpl parentBm = getParentBm();
if (parentBm != null) {
- set.addAll(parentBm.getNotificationManager().resolveObservers(event, metadata, false));
+ set.addAll(parentBm.resolveObserverMethods(event, metadata));
}
} // else nothing since extensions are loaded by classloader so we already have it
@@ -137,7 +137,7 @@ public class WebappBeanManager extends BeanManagerImpl {
}
@Override
- public <T> CreationalContextImpl<T> createCreationalContext(final Contextual<T> contextual) {
+ public <T> CreationalContextImpl<T> createCreationalContext(Contextual<T> contextual) {
try {
return super.createCreationalContext(contextual);
} catch (final RuntimeException e) { // can happen?
@@ -163,7 +163,7 @@ public class WebappBeanManager extends BeanManagerImpl {
}
@Override
- public boolean isPassivatingScope(final Class<? extends Annotation> annotationType) {
+ public boolean isPassivatingScope(Class<? extends Annotation> annotationType) {
try {
return super.isPassivatingScope(annotationType);
} catch (final RuntimeException e) {
http://git-wip-us.apache.org/repos/asf/tomee/blob/eed53029/container/openejb-core/src/main/java/org/apache/openejb/rest/ThreadLocalServletContext.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/rest/ThreadLocalServletContext.java b/container/openejb-core/src/main/java/org/apache/openejb/rest/ThreadLocalServletContext.java
index c3c72b8..0e6a5f9 100755
--- a/container/openejb-core/src/main/java/org/apache/openejb/rest/ThreadLocalServletContext.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/rest/ThreadLocalServletContext.java
@@ -170,6 +170,8 @@ public class ThreadLocalServletContext extends AbstractRestThreadLocalProxy<Serv
return get().getServletContextName();
}
+
+
@Override
public ServletRegistration.Dynamic addServlet(final String servletName, final String className) throws IllegalArgumentException, IllegalStateException {
return get().addServlet(servletName, className);
@@ -299,4 +301,8 @@ public class ThreadLocalServletContext extends AbstractRestThreadLocalProxy<Serv
public JspConfigDescriptor getJspConfigDescriptor() {
return get().getJspConfigDescriptor();
}
+
+ public void setResponseCharacterEncoding(String encoding) {
+ return get().setResponseCharacterEncoding(encoding);
+ }
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/eed53029/examples/rest-example-with-application/pom.xml
----------------------------------------------------------------------
diff --git a/examples/rest-example-with-application/pom.xml b/examples/rest-example-with-application/pom.xml
index f135dd0..dec7f4f 100644
--- a/examples/rest-example-with-application/pom.xml
+++ b/examples/rest-example-with-application/pom.xml
@@ -99,6 +99,21 @@
<version>7.0</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.glassfish.jersey.containers</groupId>
+ <artifactId>jersey-container-servlet</artifactId>
+ <version>2.5.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.jersey.core</groupId>
+ <artifactId>jersey-client</artifactId>
+ <version>2.5.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.jersey.media</groupId>
+ <artifactId>jersey-media-moxy</artifactId>
+ <version>2.5.1</version>
+ </dependency>
</dependencies>
<!--
This section allows you to configure where to publish libraries for sharing.
http://git-wip-us.apache.org/repos/asf/tomee/blob/eed53029/examples/rest-example/pom.xml
----------------------------------------------------------------------
diff --git a/examples/rest-example/pom.xml b/examples/rest-example/pom.xml
index e5700ac..b733ca2 100644
--- a/examples/rest-example/pom.xml
+++ b/examples/rest-example/pom.xml
@@ -157,6 +157,21 @@
<version>${tomee.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.glassfish.jersey.containers</groupId>
+ <artifactId>jersey-container-servlet</artifactId>
+ <version>2.5.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.jersey.core</groupId>
+ <artifactId>jersey-client</artifactId>
+ <version>2.5.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.jersey.media</groupId>
+ <artifactId>jersey-media-moxy</artifactId>
+ <version>2.5.1</version>
+ </dependency>
</dependencies>
<!--