[tomee] branch master updated (22df8f4 -> 2b1599a)

[jg...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jgallimore pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git.


    from 22df8f4  Merge pull request #404 from gdiazs/TOMEE-2471
     new d7a7eee  Keep permissions in Set. - If it is list if same permission is added multiple times that list will grow.
     new 8971e7d  Merge branch 'keep-permissions-in-set' of github.com:doychin/tomee into master-prs
     new 9dbe989  Use set instead of List to keep thread context listeners
     new 4f47b98  Move thread context enter code after code that might trigger OpenEJBException
     new db1f077  Remove ThreadSingletonService during server stop
     new 998b695  Add OWBContextThreadListener when service is added and remove it when service is removed
     new f2a224d  create single instance of RequestScopedThreadContextListener add ThreadSingletonService instance as observer Move OWBContextThreadListener registration to ThreadSingletonService
     new 3cacf4a  Create TomcatThreadContextListener as single instance.
     new 7105956  remove AbstractSecurityService as thread context listener when service is destroyed.
     new c5b27fa  Merge branch 'startup-shutdown' of github.com:doychin/tomee into master-prs
     new 4f8a265  updates the code to use switch instead of sequence of if
     new 88c62c2  simplifies the equals using Objects.equals
     new ad94297  simplifies the code using Integer.compare
     new 871b14a  uses removeif condition at Collection
     new 0a4a2a4  uses the good practice to use L instead of l
     new 7fdfb26  removes duplicated condition
     new 50eefba  removes duplicated condition
     new c6066fe  Merge branch 'update_api' of github.com:otaviojava/tomee into master-prs
     new 45b8dc9  Merge remote-tracking branch 'apache/master' into master-prs
     new 2b1599a  Merge remote-tracking branch 'apache/master' into master-prs

The 12232 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../main/java/org/apache/openejb/BeanContext.java  |  6 +-
 .../main/java/org/apache/openejb/Injection.java    |  6 +-
 .../java/org/apache/openejb/OpenEjbContainer.java  |  7 +-
 .../openejb/assembler/classic/Assembler.java       |  5 +-
 .../classic/ComparableValidationConfig.java        | 19 +++--
 .../classic/DelegatePermissionCollection.java      |  6 +-
 .../openejb/assembler/classic/MethodInfoUtil.java  | 40 ++++-----
 .../classic/ReloadableEntityManagerFactory.java    | 26 +++---
 .../java/org/apache/openejb/cdi/CdiBuilder.java    |  7 +-
 .../openejb/cdi/ThreadSingletonServiceImpl.java    | 23 +++++
 .../java/org/apache/openejb/config/ScanUtil.java   | 18 ++--
 .../org/apache/openejb/config/provider/ID.java     |  4 +-
 .../apache/openejb/config/sys/AbstractService.java | 11 +--
 .../org/apache/openejb/config/sys/Resource.java    |  3 +-
 .../org/apache/openejb/core/ThreadContext.java     | 10 +--
 .../core/entity/EntityEjbObjectHandler.java        |  3 +-
 .../openejb/core/interceptor/InterceptorData.java  |  3 +-
 .../openejb/core/ivm/BaseEjbProxyHandler.java      | 20 +++--
 .../apache/openejb/core/ivm/naming/NameNode.java   |  8 +-
 .../apache/openejb/core/ivm/naming/ParsedName.java |  8 +-
 .../openejb/core/managed/ManagedObjectHandler.java |  3 +-
 .../openejb/core/mdb/MdbInstanceManager.java       |  2 +-
 .../core/security/AbstractSecurityService.java     |  5 +-
 .../core/stateful/StatefulEjbObjectHandler.java    |  3 +-
 .../core/stateless/StatelessInstanceManager.java   |  2 +-
 .../org/apache/openejb/math/util/MathUtils.java    | 20 ++---
 .../openejb/persistence/CriteriaLogQuery.java      | 34 +++++---
 .../openejb/persistence/PersistenceBootstrap.java  | 16 ++--
 .../activemq/jms2/cdi/JMS2CDIExtension.java        |  3 +-
 .../jdbc/managed/local/ManagedConnection.java      |  5 +-
 .../main/java/org/apache/openejb/util/Logger.java  | 47 ++++++-----
 .../org/apache/openejb/config/InheritenceTest.java | 97 +++++++++++-----------
 .../org/apache/openejb/core/cmp/jpa/ComplexId.java |  6 +-
 .../core/stateless/StatelessPoolStatsTest.java     |  4 +-
 .../apache/openejb/dyni/DynamicSubclassTest.java   |  2 +-
 .../java/org/apache/openejb/sxc/TldTaglibXml.java  | 31 ++++---
 .../org/apache/openejb/jee/InjectionTarget.java    |  5 +-
 .../java/org/apache/openejb/jee/JaxbJavaee.java    | 38 +++++----
 .../java/org/apache/openejb/jee/MethodParams.java  |  3 +-
 .../java/org/apache/openejb/jee/NamedMethod.java   |  5 +-
 .../java/org/apache/openejb/jee/RemoveMethod.java  |  3 +-
 .../org/apache/tomee/catalina/TomcatLoader.java    |  6 +-
 42 files changed, 323 insertions(+), 250 deletions(-)