Merge branch 'tomee-1.7.3-prepare' of https://git-wip-us.apache.org/repos/asf/tomee into tomee-1.7.3-prepare
# Conflicts: # container/openejb-core/src/main/java/org/apache/openejb/core/transaction/JtaTransactionPolicy.java # tomee/apache-tomee/src/main/java/org/apache/tomee/RemoteTomEEEJBContainer.java Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/ba185f5e Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/ba185f5e Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/ba185f5e Branch: refs/heads/tomee-1.7.3-prepare Commit: ba185f5e490ea25ce2968f94a932096c91cb2188 Parents: 352bade 029dd39 Author: AndyGee <[email protected]> Authored: Tue Nov 24 18:19:17 2015 +0100 Committer: AndyGee <[email protected]> Committed: Tue Nov 24 18:19:17 2015 +0100 ---------------------------------------------------------------------- .gitignore | 409 ++++++++++++++++++- .../java/org/apache/openejb/BeanContext.java | 8 +- .../org/apache/openejb/ClientInjections.java | 8 +- .../org/apache/openejb/InjectionProcessor.java | 25 +- .../main/java/org/apache/openejb/Injector.java | 20 +- .../main/java/org/apache/openejb/OpenEJB.java | 6 + .../org/apache/openejb/OpenEjbContainer.java | 25 +- .../cdi/CdiResourceInjectionService.java | 2 +- .../typed/JmsConnectionFactoryBuilder.java | 1 + .../openejb/core/ivm/naming/ContextWrapper.java | 11 + .../core/transaction/JtaTransactionPolicy.java | 27 +- .../resource/activemq/ActiveMQ5Factory.java | 8 +- .../activemq/ConnectionFactoryWrapper.java | 111 +++++ .../resource/activemq/ConnectionWrapper.java | 189 +++++++++ .../resource/activemq/SessionWrapper.java | 253 ++++++++++++ .../org/apache/openejb/core/mdb/MdbInvoker.java | 92 +++-- .../org/apache/openejb/core/mdb/MdbUtil.java | 30 +- .../junit/context/OpenEjbTestContext.java | 11 + examples/injection-of-connectionfactory/pom.xml | 2 +- .../org/superbiz/injection/jms/Messages.java | 8 +- .../injection/jms/MessagingBeanTest.java | 8 +- .../openejb/server/ejbd/JndiRequestHandler.java | 35 +- .../apache/tomee/RemoteTomEEEJBContainer.java | 11 + .../apache/tomee/catalina/OpenEJBContext.java | 42 +- .../tomee/catalina/realm/CdiEventRealm.java | 5 +- .../tomee/common/LegacyAnnotationProcessor.java | 105 +++-- .../tomee/embedded/EmbeddedTomEEContainer.java | 11 + tomee/tomee-juli/pom.xml | 3 +- 28 files changed, 1295 insertions(+), 171 deletions(-) ----------------------------------------------------------------------
