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/b3ad8f5d Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/b3ad8f5d Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/b3ad8f5d Branch: refs/heads/tomee-7.0.0-M1 Commit: b3ad8f5d7c3212d79635476f64e2f92dc459e212 Parents: 5fa7192 43581f4 Author: andygumbre...@apache.org <andy...@gmx.de> Authored: Tue Jun 16 09:59:22 2015 +0200 Committer: andygumbre...@apache.org <andy...@gmx.de> Committed: Tue Jun 16 09:59:22 2015 +0200 ---------------------------------------------------------------------- .../core/stateless/StatelessContainer.java | 14 +- .../stateless/StatelessContainerFactory.java | 14 +- .../stateless/StatelessInstanceManager.java | 9 +- .../org/apache/openejb/util/OutputScanner.java | 207 +++++++++---------- .../main/java/org/apache/openejb/util/Pool.java | 48 ++++- .../META-INF/org.apache.openejb/service-jar.xml | 6 + .../openejb/assembler/DeployerEjbTest.java | 16 ++ .../SchedulerThreadStateless1ByBeanTest.java | 51 +++++ .../stateless/SchedulerThreadStatelessTest.java | 51 +++++ .../apache/openejb/junit/ScopesRuleTest.java | 16 ++ .../openejb/util/ReversePasswordCipher.java | 16 ++ .../main/java/org/apache/openejb/jee/Scan.java | 24 ++- .../org/apache/openejb/loader/FilesTest.java | 16 ++ .../test/resources/datasets/expected-users.yml | 14 ++ .../src/test/resources/datasets/users.yml | 14 ++ .../openejb/maven/util/XmlFormatterTest.java | 16 ++ rat.xml | 13 ++ 17 files changed, 418 insertions(+), 127 deletions(-) ----------------------------------------------------------------------
