Merge branch 'minor-changes' of github.com:cicekhayri/tomee
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/6d1e8fb8 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/6d1e8fb8 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/6d1e8fb8 Branch: refs/heads/master Commit: 6d1e8fb8e3d05e205b2f370fb78a5175efa19667 Parents: 85a226f f0d3f26 Author: dblevins <[email protected]> Authored: Sun Dec 2 19:26:30 2018 -0800 Committer: dblevins <[email protected]> Committed: Sun Dec 2 19:26:30 2018 -0800 ---------------------------------------------------------------------- .../catalina/startup/OpenEJBContextConfig.java | 12 +-- .../org/apache/tomee/catalina/ContextValue.java | 3 +- .../tomee/catalina/GlobalListenerSupport.java | 4 + .../tomee/catalina/IgnoredStandardContext.java | 1 + .../tomee/catalina/LazyStopStandardRoot.java | 7 ++ .../apache/tomee/catalina/OpenEJBContext.java | 29 ++++++ .../catalina/OpenEJBNamingContextListener.java | 2 + .../tomee/catalina/OpenEJBNamingResource.java | 2 +- .../org/apache/tomee/catalina/OpenEJBValve.java | 1 + .../apache/tomee/catalina/ServerListener.java | 1 + .../catalina/TomEEClassLoaderEnricher.java | 6 +- .../tomee/catalina/TomEEContainerListener.java | 8 +- .../tomee/catalina/TomcatDeploymentLoader.java | 4 +- .../tomee/catalina/TomcatJndiBuilder.java | 5 +- .../org/apache/tomee/catalina/TomcatLoader.java | 10 +- .../tomee/catalina/TomcatSecurityService.java | 27 ++++-- .../catalina/TomcatThreadContextListener.java | 12 ++- .../tomee/catalina/TomcatWebAppBuilder.java | 97 ++++++++++---------- .../tomee/common/AbstractObjectFactory.java | 1 + .../org/apache/tomee/common/EjbFactory.java | 2 + .../org/apache/tomee/common/EnumFactory.java | 1 + .../tomee/common/LegacyAnnotationProcessor.java | 25 +++++ .../org/apache/tomee/common/LookupFactory.java | 1 + .../org/apache/tomee/common/NamingUtil.java | 2 +- .../tomee/common/PersistenceContextFactory.java | 2 + .../tomee/common/PersistenceUnitFactory.java | 2 + .../apache/tomee/common/ResourceFactory.java | 2 + .../tomee/common/SystemComponentFactory.java | 1 + .../tomee/common/UserTransactionFactory.java | 1 + .../java/org/apache/tomee/common/WsFactory.java | 3 + .../java/org/apache/tomee/installer/Alerts.java | 6 +- .../apache/tomee/installer/InstallerTools.java | 2 +- .../org/apache/tomee/installer/Installers.java | 3 +- .../java/org/apache/tomee/installer/Paths.java | 2 +- .../tomee/embedded/EmbeddedTomEEContainer.java | 6 +- .../java/org/apache/tomee/embedded/FatApp.java | 2 +- .../internal/StandardContextCustomizer.java | 3 +- .../jul/formatter/AsyncConsoleHandler.java | 1 + .../apache/tomee/loader/OpenEJBListener.java | 8 +- .../org/apache/tomee/loader/TomEEListener.java | 3 +- .../java/org/apache/tomee/loader/UrlSet.java | 18 ++-- .../apache/tomee/loader/filter/FilterList.java | 2 +- .../org/apache/tomee/loader/filter/Filters.java | 16 ++-- .../apache/tomee/webapp/installer/Common.java | 2 +- .../apache/tomee/webapp/installer/Runner.java | 2 +- .../tomee/webservices/TomcatWsRegistry.java | 1 + 46 files changed, 229 insertions(+), 122 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/6d1e8fb8/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java ----------------------------------------------------------------------
