Merge branch 'master' into fb_tomee2_owb16
Conflicts:
container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiAppContextsService.java
container/openejb-core/src/main/java/org/apache/openejb/cdi/ThreadSingletonServiceImpl.java
server/openejb-http/src/main/java/org/apache/openejb/server/httpd/BeginWebBeansListener.java
server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpRequestImpl.java
server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpSessionImpl.java
tck/cdi-tomee/src/test/resources/failing.xml
tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomEEContainerListener.java
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/6e0ebe15
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/6e0ebe15
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/6e0ebe15
Branch: refs/heads/fb_tomee2_owb16
Commit: 6e0ebe15013797f8b6aa08ba9fb0a09b6c67e519
Parents: cdf0827 87a2991
Author: Mark Struberg <strub...@apache.org>
Authored: Tue May 5 19:21:58 2015 +0200
Committer: Mark Struberg <strub...@apache.org>
Committed: Tue May 5 19:21:58 2015 +0200
----------------------------------------------------------------------
.../openejb/assembler/classic/AppInfo.java | 1 +
.../openejb/assembler/classic/Assembler.java | 5 ++
.../openejb/cdi/ThreadSingletonServiceImpl.java | 3 +-
.../apache/openejb/config/AppInfoBuilder.java | 14 +++
.../org/apache/openejb/config/AppModule.java | 6 ++
.../org/apache/openejb/config/AutoConfig.java | 58 ++++++++++--
.../apache/openejb/config/DeploymentLoader.java | 1 +
.../java/org/apache/openejb/config/Module.java | 1 +
.../HerokuDatabasePropertiesProvider.java | 68 +++++++++++++++
.../openejb/testing/ApplicationComposers.java | 8 +-
.../openejb/util/PropertyPlaceHolderHelper.java | 3 +-
.../apache/openejb/config/AppContainerTest.java | 77 ++++++++++++++++
...uDatabasePropertiesProviderResourceTest.java | 92 ++++++++++++++++++++
.../HerokuDatabasePropertiesProviderTest.java | 47 ++++++++++
.../openejb/maven/plugin/AbstractTomEEMojo.java | 52 +++++++++--
.../maven/plugin/PreconfiguredTomEEXMlTest.java | 68 +++++++++++++++
.../maven/plugin/TomEEMavenPluginRule.java | 4 +-
.../openejb/server/httpd/HttpRequestImpl.java | 8 +-
.../openejb/server/httpd/HttpSessionImpl.java | 34 +++++---
.../server/httpd/HttpRequestImplTest.java | 50 +++++++++++
.../server/httpd/HttpSessionImplTest.java | 68 +++++++++++++++
tck/cdi-embedded/pom.xml | 3 +-
.../src/test/resources/arquillian.xml | 1 +
tck/cdi-tomee/src/test/resources/arquillian.xml | 1 +
24 files changed, 643 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/6e0ebe15/container/openejb-core/src/main/java/org/apache/openejb/cdi/ThreadSingletonServiceImpl.java
----------------------------------------------------------------------
diff --cc
container/openejb-core/src/main/java/org/apache/openejb/cdi/ThreadSingletonServiceImpl.java
index e5c36d0,2f688f7..8967f75
---
a/container/openejb-core/src/main/java/org/apache/openejb/cdi/ThreadSingletonServiceImpl.java
+++
b/container/openejb-core/src/main/java/org/apache/openejb/cdi/ThreadSingletonServiceImpl.java
@@@ -112,8 -112,11 +112,7 @@@ public class ThreadSingletonServiceImp
} else {
properties.setProperty("org.apache.webbeans.proxy.mapping.javax.enterprise.context.RequestScoped",
defaultNormalScopeHandlerClass);
}
--
- if (sessionContextClass() != null && tomee) {
-
properties.setProperty("org.apache.webbeans.proxy.mapping.javax.enterprise.context.SessionScoped",
"org.apache.tomee.catalina.cdi.SessionNormalScopeBeanHandler");
- }
--
++
properties.put(OpenWebBeansConfiguration.PRODUCER_INTERCEPTION_SUPPORT,
SystemInstance.get().getProperty("openejb.cdi.producer.interception", "true"));
properties.putAll(appContext.getProperties());
http://git-wip-us.apache.org/repos/asf/tomee/blob/6e0ebe15/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/6e0ebe15/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpRequestImpl.java
----------------------------------------------------------------------
