You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jg...@apache.org on 2016/05/13 14:33:47 UTC
[2/2] tomee git commit: Merge remote-tracking branch 'apache/master'
Merge remote-tracking branch 'apache/master'
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/e8c1d70d
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/e8c1d70d
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/e8c1d70d
Branch: refs/heads/master
Commit: e8c1d70d4e319dd0a857bad8dca9a59165c3e263
Parents: 7054afc 53a6bab
Author: Jonathan Gallimore <jo...@jrg.me.uk>
Authored: Fri May 13 15:32:09 2016 +0100
Committer: Jonathan Gallimore <jo...@jrg.me.uk>
Committed: Fri May 13 15:32:09 2016 +0100
----------------------------------------------------------------------
.../arquillian/tests/securityejb/Init.java | 40 ++
.../securityejb/SecurityEJBPropagationTest.java | 53 +++
.../securityejb/TheAuthConfigProvider.java | 69 +++
.../arquillian/tests/securityejb/TheEJb.java | 33 ++
.../tests/securityejb/TheServerAuthConfig.java | 83 ++++
.../tests/securityejb/TheServerAuthContext.java | 55 +++
.../tests/securityejb/TheServerAuthModule.java | 90 ++++
.../tests/securityejb/TheServlet.java | 65 +++
.../org/apache/openejb/ClassLoaderUtil.java | 3 +
.../main/java/org/apache/openejb/OpenEJB.java | 1 -
.../org/apache/openejb/config/AutoConfig.java | 3 +-
.../apache/openejb/config/sys/SaxOpenejb.java | 6 +
.../apache/openejb/config/sys/StackHandler.java | 3 +
.../core/security/AbstractSecurityService.java | 5 +
.../openejb/resource/AutoConnectionTracker.java | 5 +
.../GeronimoConnectionManagerFactory.java | 105 +++--
.../resource/activemq/ActiveMQ5Factory.java | 113 ++++-
.../openejb/ri/sp/PseudoSecurityService.java | 6 +
.../org/apache/openejb/spi/SecurityService.java | 8 +
.../main/java/org/apache/openejb/util/URLs.java | 5 +-
.../src/main/resources/default.exclusions | 1 +
.../openejb/activemq/AMQXASupportTest.java | 6 +-
.../openejb/activemq/KahaDBSupportTest.java | 5 +-
.../apache/openejb/config/AutoConfigTest.java | 448 +++++++++++++++++++
.../core/stateless/StatelessPoolStatsTest.java | 1 +
.../GeronimoConnectionManagerFactoryTest.java | 184 ++++++++
.../resource/activemq/ActiveMQ5FactoryTest.java | 18 +
.../org/apache/openejb/loader/JarLocation.java | 31 +-
.../apache/openejb/loader/SystemInstance.java | 83 ++++
examples/jpa-eclipselink/pom.xml | 2 +-
.../org/superbiz/eclipselink/MoviesTest.java | 54 +++
.../src/main/webapp/WEB-INF/moviefun.jsp | 4 -
examples/moviefun/src/main/webapp/index.jsp | 5 -
examples/moviefun/src/main/webapp/setup.jsp | 4 -
.../apache/openejb/maven/plugin/ExecMojo.java | 3 +
.../maven/plugin/customizer/monkey/Monkey.java | 94 ++++
.../monkey/classloader/ClassLoaderFactory.java | 75 ++++
.../monkey/file/PatchFolderFinder.java | 36 ++
.../customizer/monkey/index/FileIndexer.java | 137 ++++++
.../plugin/customizer/monkey/index/Item.java | 52 +++
.../customizer/monkey/jar/JarPatcher.java | 190 ++++++++
.../plugin/customizer/monkey/MonkeyTest.java | 115 +++++
.../src/test/java/test/patch/MyMain.java | 22 +
.../src/test/java/test/patch/foo/Another.java | 16 +
.../main/resources/archetype-resources/pom.xml | 10 +-
pom.xml | 4 +-
.../apache/openejb/server/httpd/EEFilter.java | 293 ++++++++++++
.../openejb/server/httpd/HttpRequestImpl.java | 4 +-
.../openejb/server/httpd/WebBeansFilter.java | 259 -----------
.../catalina/startup/OpenEJBContextConfig.java | 6 +-
.../tomee/catalina/JavaeeInstanceManager.java | 4 +-
.../org/apache/tomee/catalina/TomEERealm.java | 58 +--
.../tomee/catalina/TomEEWebappClassLoader.java | 2 +
.../tomee/catalina/TomcatSecurityService.java | 12 +
.../tomee/catalina/TomcatWebAppBuilder.java | 5 +-
.../java/org/apache/tomee/embedded/Main.java | 29 +-
.../internal/StandardContextCustomizer.java | 6 +-
57 files changed, 2628 insertions(+), 401 deletions(-)
----------------------------------------------------------------------