You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by an...@apache.org on 2015/12/03 04:34:33 UTC
[5/5] tomee git commit: Merge branch 'tomee-1.7.x' into
tomee-1.7.3-prepare
Merge branch 'tomee-1.7.x' into tomee-1.7.3-prepare
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/4408e959
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/4408e959
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/4408e959
Branch: refs/heads/tomee-1.7.3-prepare
Commit: 4408e959e80cc6d862f941760c7800039c7395ae
Parents: 124eb43 b3aec94
Author: AndyGee <an...@gmx.de>
Authored: Thu Dec 3 04:34:13 2015 +0100
Committer: AndyGee <an...@gmx.de>
Committed: Thu Dec 3 04:34:13 2015 +0100
----------------------------------------------------------------------
container/openejb-core/pom.xml | 4 ++
.../openejb/config/rules/CheckClassLoading.java | 4 +-
.../openejb/core/ObjectInputStreamFiltered.java | 39 ++++++++++++
.../openejb/core/ivm/EjbObjectInputStream.java | 9 ++-
.../openejb/core/managed/SimplePassivater.java | 17 +++--
.../core/rmi/BlacklistClassResolver.java | 67 ++++++++++++++++++++
.../openejb/core/timer/EjbTimerServiceImpl.java | 2 +-
.../apache/openejb/core/timer/TimerData.java | 26 +++++---
.../timer/quartz/QuartzObjectInputStream.java | 3 +-
.../log/commonslogging/OpenEJBCommonsLog.java | 2 +-
.../openejb/monitoring/LocalMBeanServer.java | 2 +-
.../activemq/ConnectionFactoryWrapper.java | 24 ++++---
.../resource/activemq/ConnectionWrapper.java | 24 ++++---
.../resource/activemq/SessionWrapper.java | 24 ++++---
.../java/org/apache/openejb/spi/Serializer.java | 39 +++++++++---
.../apache/openejb/util/PojoSerialization.java | 31 ++++++---
.../core/rmi/BlacklistClassResolverTest.java | 41 ++++++++++++
examples/deltaspike-fullstack/pom.xml | 2 +-
examples/troubleshooting/README.md | 2 +-
pom.xml | 19 ++++--
.../openejb/client/EjbObjectInputStream.java | 43 ++++++++++++-
.../openejb/server/httpd/HttpResponseImpl.java | 42 ++++++++----
.../openejb/tck/cdi/embedded/BeansImpl.java | 16 +++--
.../tck/cdi/tomee/embedded/BeansImpl.java | 16 +++--
.../org/apache/tomee/common/EjbFactory.java | 5 +-
25 files changed, 400 insertions(+), 103 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/4408e959/container/openejb-core/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/4408e959/examples/deltaspike-fullstack/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/4408e959/pom.xml
----------------------------------------------------------------------