You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2015/03/26 09:23:50 UTC
[1/2] tomee git commit: TOMEE-1530 try to guess app ctx if not found
from class
Repository: tomee
Updated Branches:
refs/heads/master 9c6a31497 -> 849292df6
TOMEE-1530 try to guess app ctx if not found from class
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/f24db560
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/f24db560
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/f24db560
Branch: refs/heads/master
Commit: f24db560b815ccd3f8c1964fb04934ec754481b7
Parents: 9c6a314
Author: Romain Manni-Bucau <rm...@apache.org>
Authored: Wed Mar 25 11:35:27 2015 +0100
Committer: Romain Manni-Bucau <rm...@apache.org>
Committed: Wed Mar 25 11:35:27 2015 +0100
----------------------------------------------------------------------
.../arquillian/common/enrichment/OpenEJBEnricher.java | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/f24db560/arquillian/arquillian-common/src/main/java/org/apache/openejb/arquillian/common/enrichment/OpenEJBEnricher.java
----------------------------------------------------------------------
diff --git a/arquillian/arquillian-common/src/main/java/org/apache/openejb/arquillian/common/enrichment/OpenEJBEnricher.java b/arquillian/arquillian-common/src/main/java/org/apache/openejb/arquillian/common/enrichment/OpenEJBEnricher.java
index 6cea677..aa7eb7e 100644
--- a/arquillian/arquillian-common/src/main/java/org/apache/openejb/arquillian/common/enrichment/OpenEJBEnricher.java
+++ b/arquillian/arquillian-common/src/main/java/org/apache/openejb/arquillian/common/enrichment/OpenEJBEnricher.java
@@ -27,6 +27,7 @@ import org.apache.openejb.core.ThreadContext;
import org.apache.openejb.core.WebContext;
import org.apache.openejb.loader.SystemInstance;
import org.apache.openejb.spi.ContainerSystem;
+import org.apache.openejb.util.AppFinder;
import org.apache.webbeans.annotation.AnyLiteral;
import org.apache.webbeans.annotation.DefaultLiteral;
import org.apache.webbeans.config.WebBeansContext;
@@ -61,11 +62,15 @@ public final class OpenEJBEnricher {
// no-op
}
- public static void enrich(final Object testInstance, final AppContext ctx) {
+ public static void enrich(final Object testInstance, final AppContext appCtx) {
// don't rely on arquillian since this enrichment should absolutely be done before the following ones
new MockitoEnricher().enrich(testInstance);
+ AppContext ctx = appCtx;
if (ctx == null) {
- return;
+ ctx = AppFinder.findAppContextOrWeb(Thread.currentThread().getContextClassLoader(), AppFinder.AppContextTransformer.INSTANCE);
+ if (ctx == null) {
+ return;
+ }
}
final BeanContext context = SystemInstance.get().getComponent(ContainerSystem.class).getBeanContext(ctx.getId() + "_" + testInstance.getClass().getName());
[2/2] tomee git commit: TOMEE-1021 fully tolerate faces-config.xml ee
namespace even when unknown while we don't upgrade our model
Posted by rm...@apache.org.
TOMEE-1021 fully tolerate faces-config.xml ee namespace even when unknown while we don't upgrade our model
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/849292df
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/849292df
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/849292df
Branch: refs/heads/master
Commit: 849292df65394762a97cb47e3276715433a3116d
Parents: f24db56
Author: Romain Manni-Bucau <rm...@apache.org>
Authored: Thu Mar 26 09:23:40 2015 +0100
Committer: Romain Manni-Bucau <rm...@apache.org>
Committed: Thu Mar 26 09:23:40 2015 +0100
----------------------------------------------------------------------
.../org/apache/openejb/jee/FacesConfig$JAXB.java | 2 +-
.../src/test/resources/a-faces-config-22.xml | 15 ++++++++++++++-
2 files changed, 15 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/849292df/container/openejb-jee-accessors/src/main/java/org/apache/openejb/jee/FacesConfig$JAXB.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee-accessors/src/main/java/org/apache/openejb/jee/FacesConfig$JAXB.java b/container/openejb-jee-accessors/src/main/java/org/apache/openejb/jee/FacesConfig$JAXB.java
index e5d1554..3d5c320 100644
--- a/container/openejb-jee-accessors/src/main/java/org/apache/openejb/jee/FacesConfig$JAXB.java
+++ b/container/openejb-jee-accessors/src/main/java/org/apache/openejb/jee/FacesConfig$JAXB.java
@@ -336,7 +336,7 @@ public class FacesConfig$JAXB
}
}
facesConfigExtension.add(facesConfigExtensionItem);
- } else if (("flow-definition" == elementReader.getLocalName()) && ("http://java.sun.com/xml/ns/javaee" == elementReader.getNamespaceURI())) {
+ } else if ("http://java.sun.com/xml/ns/javaee" == elementReader.getNamespaceURI()) {
// just here ATM to not prevent users to get JSF 2.2 feature because we can't read it
// TODO: read it if we need it (= classes to add to injectable classes, other file to parse to find them etc...)
} else {
http://git-wip-us.apache.org/repos/asf/tomee/blob/849292df/container/openejb-jee-accessors/src/test/resources/a-faces-config-22.xml
----------------------------------------------------------------------
diff --git a/container/openejb-jee-accessors/src/test/resources/a-faces-config-22.xml b/container/openejb-jee-accessors/src/test/resources/a-faces-config-22.xml
index f388a26..1731a63 100644
--- a/container/openejb-jee-accessors/src/test/resources/a-faces-config-22.xml
+++ b/container/openejb-jee-accessors/src/test/resources/a-faces-config-22.xml
@@ -20,7 +20,10 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
http://xmlns.jcp.org/xml/ns/javaee/web-facesconfig_2_2.xsd">
-
+ <factory>
+ <flash-factory>com.foo.Bar</flash-factory>
+ <flow-handler-factory>com.foo.Dummy</flow-handler-factory>
+ </factory>
<application>
<el-resolver>UnknownButSuperResolver</el-resolver>
<resource-library-contracts>
@@ -52,4 +55,14 @@
</outbound-parameter>
</flow-call>
</flow-definition>
+ <navigation-case>
+ <from-outcome>myLetters</from-outcome>
+ <to-view-id>/portal/letter/letterList.xhtml</to-view-id>
+ <redirect>
+ <redirect-param>
+ <name>type</name>
+ <value>LETTER</value>
+ </redirect-param>
+ </redirect>
+ </navigation-case>
</faces-config>