Merge branch 'master' into tomee-7.0.0-M1
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/e99dbb77 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/e99dbb77 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/e99dbb77 Branch: refs/heads/tomee-7.0.0-M1 Commit: e99dbb7746d2a60847624b7f5d408937a76079a6 Parents: c610596 58ec241 Author: andygumbre...@apache.org <andy...@gmx.de> Authored: Mon Nov 2 18:10:57 2015 +0100 Committer: andygumbre...@apache.org <andy...@gmx.de> Committed: Mon Nov 2 18:10:57 2015 +0100 ---------------------------------------------------------------------- .../java/org/apache/openejb/BeanContext.java | 25 ++- .../classic/EnterpriseBeanBuilder.java | 23 ++- .../java/org/apache/openejb/cdi/CdiScanner.java | 17 +- .../java/org/apache/openejb/cli/Bootstrap.java | 49 ++++- .../java/org/apache/openejb/config/Cipher.java | 6 +- .../openejb/core/ivm/naming/NameNode.java | 18 +- .../apache/openejb/core/managed/Instance.java | 5 +- .../openejb/core/managed/ManagedContainer.java | 20 +- .../apache/openejb/core/stateful/Instance.java | 5 +- .../core/stateful/StatefulContainer.java | 24 ++- .../openejb/persistence/JtaEntityManager.java | 2 +- .../persistence/JtaEntityManagerRegistry.java | 20 +- .../resource/jdbc/dbcp/BasicDataSource.java | 20 +- .../jdbc/dbcp/BasicManagedDataSource.java | 23 ++- .../jdbc/managed/local/ManagedConnection.java | 50 +++-- .../openejb/cdi/ProducedExtendedEmTest.java | 4 +- .../openejb/ivm/naming/IvmContextTest.java | 83 +++++++++ .../jdbc/CipheredPasswordDataSourceTest.java | 186 +++++++++++++++++++ .../openejb/resource/jdbc/XAPoolTest.java | 120 ++++++++++++ .../openejb/maven/plugin/runner/ExecRunner.java | 81 ++++---- pom.xml | 2 +- .../cxf/rs/logging/LoggingJAXRSCommons.java | 156 ++++++++++++++++ .../ejbmodule/LoggingJAXRSEJBModuleTest.java | 50 +++++ ...gJAXRSEJBModuleWithoutConfigurationTest.java | 50 +++++ ...JAXRSWebAppModuleClassConfigurationTest.java | 55 ++++++ .../LoggingJAXRSWebAppModuleTest.java | 55 ++++++ ...XRSWebAppModuleWithoutConfigurationTest.java | 52 ++++++ .../apache/openejb/server/rest/RESTService.java | 4 + tomee/apache-tomee/src/main/resources/tomee.sh | 25 +-- .../org/apache/tomee/installer/Installer.java | 48 ++--- .../tomee/jdbc/TomcatXADataSourceTest.java | 39 +++- 31 files changed, 1157 insertions(+), 160 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/e99dbb77/pom.xml ----------------------------------------------------------------------
