tomee git commit: Backporting - Java 6 fixes
Repository: tomee Updated Branches: refs/heads/tomee-1.7.x 0fd8e6cab -> 2b07bcd18 Backporting - Java 6 fixes Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/2b07bcd1 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/2b07bcd1 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/2b07bcd1 Branch: refs/heads/tomee-1.7.x Commit: 2b07bcd18c8ee5416a1a9bf81b5df693c30ca366 Parents: 0fd8e6c Author: Jonathan GallimoreAuthored: Mon May 30 22:24:19 2016 +0100 Committer: Jonathan Gallimore Committed: Mon May 30 22:24:19 2016 +0100 -- .../openejb/resource/GeronimoConnectionManagerFactory.java | 4 ++-- .../openejb/resource/GeronimoConnectionManagerFactoryTest.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tomee/blob/2b07bcd1/container/openejb-core/src/main/java/org/apache/openejb/resource/GeronimoConnectionManagerFactory.java -- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/resource/GeronimoConnectionManagerFactory.java b/container/openejb-core/src/main/java/org/apache/openejb/resource/GeronimoConnectionManagerFactory.java index 9f22091..f2e83a8 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/resource/GeronimoConnectionManagerFactory.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/resource/GeronimoConnectionManagerFactory.java @@ -495,14 +495,14 @@ public class GeronimoConnectionManagerFactory { try { final Map connections; if (stack instanceof SinglePoolConnectionInterceptor) { -connections = new HashMap<>(); +connections = new HashMap (); for (final ManagedConnectionInfo info : (List) pool) { connections.put(info.getManagedConnection(), info); } } else if (stack instanceof SinglePoolMatchAllConnectionInterceptor) { connections = (Map ) pool; } else { -connections = new HashMap<>(); +connections = new HashMap (); } for (final ManagedConnectionInfo info : autoConnectionTracker.connections()) { connections.put(info.getManagedConnection(), info); http://git-wip-us.apache.org/repos/asf/tomee/blob/2b07bcd1/container/openejb-core/src/test/java/org/apache/openejb/resource/GeronimoConnectionManagerFactoryTest.java -- diff --git a/container/openejb-core/src/test/java/org/apache/openejb/resource/GeronimoConnectionManagerFactoryTest.java b/container/openejb-core/src/test/java/org/apache/openejb/resource/GeronimoConnectionManagerFactoryTest.java index e2a5646..8a84b6f 100644 --- a/container/openejb-core/src/test/java/org/apache/openejb/resource/GeronimoConnectionManagerFactoryTest.java +++ b/container/openejb-core/src/test/java/org/apache/openejb/resource/GeronimoConnectionManagerFactoryTest.java @@ -68,7 +68,7 @@ public class GeronimoConnectionManagerFactoryTest { } public static class MyMcf implements ManagedConnectionFactory, ValidatingManagedConnectionFactory { -private final Set connections = new HashSet<>(); +private final Set connections = new HashSet(); private final AtomicBoolean evicted = new AtomicBoolean(false); private final AtomicBoolean destroyed = new AtomicBoolean(false);
tomee git commit: TOMEE-1806 patch from Javier Pedrido + ensuring we can find managed connection during eviction
Repository: tomee Updated Branches: refs/heads/tomee-1.7.x 446e7856f -> 0fd8e6cab TOMEE-1806 patch from Javier Pedrido + ensuring we can find managed connection during eviction Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/0fd8e6ca Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/0fd8e6ca Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/0fd8e6ca Branch: refs/heads/tomee-1.7.x Commit: 0fd8e6cab662b6f53eddb6c42651b3378a4b62a2 Parents: 446e785 Author: Romain manni-BucauAuthored: Thu May 12 10:10:32 2016 +0200 Committer: Jonathan Gallimore Committed: Mon May 30 21:24:48 2016 +0100 -- .../openejb/resource/AutoConnectionTracker.java | 5 + .../GeronimoConnectionManagerFactory.java | 105 +++ .../GeronimoConnectionManagerFactoryTest.java | 184 +++ 3 files changed, 261 insertions(+), 33 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tomee/blob/0fd8e6ca/container/openejb-core/src/main/java/org/apache/openejb/resource/AutoConnectionTracker.java -- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/resource/AutoConnectionTracker.java b/container/openejb-core/src/main/java/org/apache/openejb/resource/AutoConnectionTracker.java index 915e7d9..1c14c5e 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/resource/AutoConnectionTracker.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/resource/AutoConnectionTracker.java @@ -31,6 +31,7 @@ import java.lang.reflect.InvocationHandler; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.lang.reflect.Proxy; +import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; @@ -38,6 +39,10 @@ public class AutoConnectionTracker implements ConnectionTracker { private final ConcurrentMap references = new ConcurrentHashMap (); private final ReferenceQueue referenceQueue = new ReferenceQueue(); +public Set connections() { +return references.keySet(); +} + /** * Releases any managed connections held by a garbage collected connection proxy. * http://git-wip-us.apache.org/repos/asf/tomee/blob/0fd8e6ca/container/openejb-core/src/main/java/org/apache/openejb/resource/GeronimoConnectionManagerFactory.java -- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/resource/GeronimoConnectionManagerFactory.java b/container/openejb-core/src/main/java/org/apache/openejb/resource/GeronimoConnectionManagerFactory.java index 20ae9ce..9f22091 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/resource/GeronimoConnectionManagerFactory.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/resource/GeronimoConnectionManagerFactory.java @@ -78,10 +78,19 @@ public class GeronimoConnectionManagerFactory { private int poolMaxSize = 10; private int poolMinSize; private boolean allConnectionsEqual = true; +private boolean assumeOneMatch = false; private int connectionMaxWaitMilliseconds = 5000; private int connectionMaxIdleMinutes = 15; -private int validationInterval = -1; private ManagedConnectionFactory mcf; +private int validationIntervalMs = -1; + +public boolean isAssumeOneMatch() { +return assumeOneMatch; +} + +public void setAssumeOneMatch(final boolean assumeOneMatch) { +this.assumeOneMatch = assumeOneMatch; +} public ManagedConnectionFactory getMcf() { return mcf; @@ -196,19 +205,18 @@ public class GeronimoConnectionManagerFactory { } public int getValidationInterval() { -return validationInterval; +return validationIntervalMs < 0 ? -1 : (int) TimeUnit.MILLISECONDS.toMinutes(validationIntervalMs); } public void setValidationInterval(final int validationInterval) { -this.validationInterval = validationInterval; +this.validationIntervalMs = validationInterval < 0 ? -1 : (int) TimeUnit.MINUTES.toMillis(validationInterval); } public void setValidationInterval(final Duration validationInterval) { if (validationInterval.getUnit() == null) { validationInterval.setUnit(TimeUnit.MINUTES); } -final long minutes = TimeUnit.MINUTES.convert(validationInterval.getTime(), validationInterval.getUnit()); -setValidationInterval((int) minutes); +validationIntervalMs = (int)
[1/2] tomee git commit: TOMEE-1817 avoid NPE if a RA has a getter which is not supposed to be handled by the container
Repository: tomee Updated Branches: refs/heads/tomee-1.7.x 72927b156 -> 446e7856f TOMEE-1817 avoid NPE if a RA has a getter which is not supposed to be handled by the container Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/513df6fb Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/513df6fb Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/513df6fb Branch: refs/heads/tomee-1.7.x Commit: 513df6fba20342a65d44e71b6a973202b4dc257a Parents: 72927b1 Author: Romain manni-BucauAuthored: Fri May 20 08:49:51 2016 +0200 Committer: Jonathan Gallimore Committed: Mon May 30 20:39:26 2016 +0100 -- .../openejb/config/AnnotationDeployer.java | 30 ++- .../openejb/config/GetterConnectorTest.java | 250 +++ 2 files changed, 267 insertions(+), 13 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tomee/blob/513df6fb/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java -- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java b/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java index 911a3a8..04e240f 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java @@ -844,24 +844,29 @@ public class AnnotationDeployer implements DynamicDeployer { } if (!containsConfigProperty(configProperties, name)) { - final ConfigProperty configProperty = new ConfigProperty(); configProperties.add(configProperty); Object value = null; -try { -value = propertyDescriptor.getReadMethod().invoke(o); -} catch (final Exception e) { -// no-op +if (propertyDescriptor.getReadMethod() != null) { +try { +value = propertyDescriptor.getReadMethod().invoke(o); +} catch (final Exception e) { +// no-op +} } -javax.resource.spi.ConfigProperty annotation = propertyDescriptor.getWriteMethod().getAnnotation(javax.resource.spi.ConfigProperty.class); -if (annotation == null) { -try { -// if there's no annotation on the setter, we'll try and scrape one off the field itself (assuming the same name) -annotation = clazz.getDeclaredField(name).getAnnotation(javax.resource.spi.ConfigProperty.class); -} catch (final Exception ignored) { -// no-op : getDeclaredField() throws exceptions and does not return null +final Method write = propertyDescriptor.getWriteMethod(); +javax.resource.spi.ConfigProperty annotation = null; +if (write != null) { +annotation = write.getAnnotation(javax.resource.spi.ConfigProperty.class); +if (annotation == null) { +try { +// if there's no annotation on the setter, we'll try and scrape one off the field itself (assuming the same name) +annotation = clazz.getDeclaredField(name).getAnnotation(javax.resource.spi.ConfigProperty.class); +} catch (final Exception ignored) { +// no-op : getDeclaredField() throws exceptions and does not return null +} } } @@ -880,7 +885,6 @@ public class AnnotationDeployer implements DynamicDeployer { configProperty.setConfigPropertySupportsDynamicUpdates(annotation.supportsDynamicUpdates()); configProperty.setDescriptions(stringsToTexts(annotation.description())); } - } } http://git-wip-us.apache.org/repos/asf/tomee/blob/513df6fb/container/openejb-core/src/test/java/org/apache/openejb/config/GetterConnectorTest.java -- diff --git
[tomee] Git Push Summary
Repository: tomee Updated Tags: refs/tags/tomee-7.0.0 [created] eb455f585
[jira] [Commented] (TOMEE-1021) Allow read JSF 2.2 faces-config.xml files
[ https://issues.apache.org/jira/browse/TOMEE-1021?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15306450#comment-15306450 ] Romain Manni-Bucau commented on TOMEE-1021: --- [~abyss] can you 1. open another issue targetting 7.0.0 2. share the faces-config.xml you use and the full stack trace please? We surely need to enhance a test cause https://github.com/apache/tomee/blob/master/container/openejb-jee-accessors/src/test/resources/a-faces-config-22.xml#L61 should check it > Allow read JSF 2.2 faces-config.xml files > - > > Key: TOMEE-1021 > URL: https://issues.apache.org/jira/browse/TOMEE-1021 > Project: TomEE > Issue Type: Improvement >Reporter: Leonardo Uribe > Fix For: 1.7.0 > > > Hi > I'm working on MyFaces 2.2.x, and on the way I have found that Tomee doesn't > allow faces-config.xml files in JSF 2.2 format. Since the spec was out some > months ago, it would be great if you guys can allow this so I can test > MyFaces 2.2.x + Tomee just changing the jars. > Here is the exception I have: > org.apache.catalina.LifecycleException: Failed to start component > [StandardEngine[Catalina].StandardHost[localhost].StandardContext[]] > at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:154) > at > org.apache.catalina.core.ContainerBase.addChildInternal(ContainerBase.java:901) > at > org.apache.catalina.core.ContainerBase.addChild(ContainerBase.java:877) > at org.apache.catalina.core.StandardHost.addChild(StandardHost.java:633) > at > org.apache.catalina.startup.HostConfig.deployDirectory(HostConfig.java:1113) > at > org.apache.catalina.startup.HostConfig$DeployDirectory.run(HostConfig.java:1671) > at > java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:471) > at java.util.concurrent.FutureTask$Sync.innerRun(FutureTask.java:334) > at java.util.concurrent.FutureTask.run(FutureTask.java:166) > at > java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145) > at > java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615) > at java.lang.Thread.run(Thread.java:724) > Caused by: org.apache.tomee.catalina.TomEERuntimeException: > org.apache.openejb.OpenEJBException: Cannot unmarshall the faces > configuration file: Unexpected element > {http://xmlns.jcp.org/xml/ns/javaee}flow-definition, expected > [{http://java.sun.com/xml/ns/javaee}application, > {http://java.sun.com/xml/ns/javaee}ordering, > {http://java.sun.com/xml/ns/javaee}absolute-ordering, > {http://java.sun.com/xml/ns/javaee}factory, > {http://java.sun.com/xml/ns/javaee}component, > {http://java.sun.com/xml/ns/javaee}converter, > {http://java.sun.com/xml/ns/javaee}managed-bean, > {http://java.sun.com/xml/ns/javaee}name, > {http://java.sun.com/xml/ns/javaee}navigation-rule, > {http://java.sun.com/xml/ns/javaee}referenced-bean, > {http://java.sun.com/xml/ns/javaee}render-kit, > {http://java.sun.com/xml/ns/javaee}lifecycle, > {http://java.sun.com/xml/ns/javaee}validator, > {http://java.sun.com/xml/ns/javaee}behavior, > {http://java.sun.com/xml/ns/javaee}faces-config-extension] > at > org.apache.tomee.catalina.TomcatWebAppBuilder.loadApplication(TomcatWebAppBuilder.java:1953) > at > org.apache.tomee.catalina.TomcatWebAppBuilder.startInternal(TomcatWebAppBuilder.java:1025) > at > org.apache.tomee.catalina.TomcatWebAppBuilder.configureStart(TomcatWebAppBuilder.java:985) > at > org.apache.tomee.catalina.GlobalListenerSupport.lifecycleEvent(GlobalListenerSupport.java:127) > at > org.apache.catalina.util.LifecycleSupport.fireLifecycleEvent(LifecycleSupport.java:119) > at > org.apache.catalina.util.LifecycleBase.fireLifecycleEvent(LifecycleBase.java:90) > at > org.apache.catalina.core.StandardContext.startInternal(StandardContext.java:5322) > at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:150) > ... 11 more > Caused by: org.apache.openejb.OpenEJBException: Cannot unmarshall the faces > configuration file: : Unexpected element > {http://xmlns.jcp.org/xml/ns/javaee}flow-definition, expected > [{http://java.sun.com/xml/ns/javaee}application, > {http://java.sun.com/xml/ns/javaee}ordering, > {http://java.sun.com/xml/ns/javaee}absolute-ordering, > {http://java.sun.com/xml/ns/javaee}factory, > {http://java.sun.com/xml/ns/javaee}component, > {http://java.sun.com/xml/ns/javaee}converter, > {http://java.sun.com/xml/ns/javaee}managed-bean, > {http://java.sun.com/xml/ns/javaee}name, > {http://java.sun.com/xml/ns/javaee}navigation-rule, > {http://java.sun.com/xml/ns/javaee}referenced-bean, > {http://java.sun.com/xml/ns/javaee}render-kit, > {http://java.sun.com/xml/ns/javaee}lifecycle, >
[jira] [Commented] (TOMEE-1021) Allow read JSF 2.2 faces-config.xml files
[ https://issues.apache.org/jira/browse/TOMEE-1021?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15306430#comment-15306430 ] Petras commented on TOMEE-1021: --- This issue is marked as resolved, though I still get exception using TomEE 7.0.0 if I try to used {{redirect-param}} element insider {{redirect}} as shown in my previous post: {code} Caused by: org.apache.tomee.catalina.TomEERuntimeException: org.apache.openejb.OpenEJBException: Cannot unmarshall the faces configuration file: file:/C:/.../WEB-INF/navigation-rules.xml: Unexpected element {http://xmlns.jcp.org/xml/ns/javaee}redirect-param, expected [{http://java.sun.com/xml/ns/javaee}view-param] at org.apache.tomee.catalina.TomcatWebAppBuilder.loadApplication(TomcatWebAppBuilder.java:2213) at org.apache.tomee.catalina.TomcatWebAppBuilder.startInternal(TomcatWebAppBuilder.java:1133) at org.apache.tomee.catalina.TomcatWebAppBuilder.configureStart(TomcatWebAppBuilder.java:1094) at org.apache.tomee.catalina.GlobalListenerSupport.lifecycleEvent(GlobalListenerSupport.java:133) at org.apache.catalina.util.LifecycleSupport.fireLifecycleEvent(LifecycleSupport.java:95) at org.apache.catalina.util.LifecycleBase.fireLifecycleEvent(LifecycleBase.java:90) at org.apache.catalina.core.StandardContext.startInternal(StandardContext.java:5154) at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:147) ... 56 more {code} > Allow read JSF 2.2 faces-config.xml files > - > > Key: TOMEE-1021 > URL: https://issues.apache.org/jira/browse/TOMEE-1021 > Project: TomEE > Issue Type: Improvement >Reporter: Leonardo Uribe > Fix For: 1.7.0 > > > Hi > I'm working on MyFaces 2.2.x, and on the way I have found that Tomee doesn't > allow faces-config.xml files in JSF 2.2 format. Since the spec was out some > months ago, it would be great if you guys can allow this so I can test > MyFaces 2.2.x + Tomee just changing the jars. > Here is the exception I have: > org.apache.catalina.LifecycleException: Failed to start component > [StandardEngine[Catalina].StandardHost[localhost].StandardContext[]] > at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:154) > at > org.apache.catalina.core.ContainerBase.addChildInternal(ContainerBase.java:901) > at > org.apache.catalina.core.ContainerBase.addChild(ContainerBase.java:877) > at org.apache.catalina.core.StandardHost.addChild(StandardHost.java:633) > at > org.apache.catalina.startup.HostConfig.deployDirectory(HostConfig.java:1113) > at > org.apache.catalina.startup.HostConfig$DeployDirectory.run(HostConfig.java:1671) > at > java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:471) > at java.util.concurrent.FutureTask$Sync.innerRun(FutureTask.java:334) > at java.util.concurrent.FutureTask.run(FutureTask.java:166) > at > java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145) > at > java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615) > at java.lang.Thread.run(Thread.java:724) > Caused by: org.apache.tomee.catalina.TomEERuntimeException: > org.apache.openejb.OpenEJBException: Cannot unmarshall the faces > configuration file: Unexpected element > {http://xmlns.jcp.org/xml/ns/javaee}flow-definition, expected > [{http://java.sun.com/xml/ns/javaee}application, > {http://java.sun.com/xml/ns/javaee}ordering, > {http://java.sun.com/xml/ns/javaee}absolute-ordering, > {http://java.sun.com/xml/ns/javaee}factory, > {http://java.sun.com/xml/ns/javaee}component, > {http://java.sun.com/xml/ns/javaee}converter, > {http://java.sun.com/xml/ns/javaee}managed-bean, > {http://java.sun.com/xml/ns/javaee}name, > {http://java.sun.com/xml/ns/javaee}navigation-rule, > {http://java.sun.com/xml/ns/javaee}referenced-bean, > {http://java.sun.com/xml/ns/javaee}render-kit, > {http://java.sun.com/xml/ns/javaee}lifecycle, > {http://java.sun.com/xml/ns/javaee}validator, > {http://java.sun.com/xml/ns/javaee}behavior, > {http://java.sun.com/xml/ns/javaee}faces-config-extension] > at > org.apache.tomee.catalina.TomcatWebAppBuilder.loadApplication(TomcatWebAppBuilder.java:1953) > at > org.apache.tomee.catalina.TomcatWebAppBuilder.startInternal(TomcatWebAppBuilder.java:1025) > at > org.apache.tomee.catalina.TomcatWebAppBuilder.configureStart(TomcatWebAppBuilder.java:985) > at > org.apache.tomee.catalina.GlobalListenerSupport.lifecycleEvent(GlobalListenerSupport.java:127) > at > org.apache.catalina.util.LifecycleSupport.fireLifecycleEvent(LifecycleSupport.java:119) > at > org.apache.catalina.util.LifecycleBase.fireLifecycleEvent(LifecycleBase.java:90) > at >