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:36:34 UTC
[9/9] tomee git commit: Merge branch 'master' into tomee-7.0.0-M1
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/93921cbd
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/93921cbd
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/93921cbd
Branch: refs/heads/tomee-7.0.0-M1
Commit: 93921cbdf8d791fe50196103b9a5d48c1fce2866
Parents: 439eb9a a415f3e
Author: AndyGee <an...@gmx.de>
Authored: Thu Dec 3 04:36:13 2015 +0100
Committer: AndyGee <an...@gmx.de>
Committed: Thu Dec 3 04:36:13 2015 +0100
----------------------------------------------------------------------
container/openejb-core/pom.xml | 4 +
.../openejb/core/ObjectInputStreamFiltered.java | 39 ++++++
.../openejb/core/managed/SimplePassivater.java | 3 +-
.../core/rmi/BlacklistClassResolver.java | 9 +-
.../openejb/monitoring/LocalMBeanServer.java | 2 +-
.../logging/LoggingPreparedSqlStatement.java | 4 +-
.../java/org/apache/openejb/spi/Serializer.java | 39 ++++--
.../timer/EjbTimerImplSerializableTest.java | 3 +-
...ionOfTransactionRolledBackExceptionTest.java | 3 +-
.../openejb/util/PojoExternalizationTest.java | 5 +-
.../openejb/util/PojoSerializationTest.java | 5 +-
.../proxy/LocalBeanProxySerializationTest.java | 3 +-
.../proxy/LocalReferenceSerializationTest.java | 3 +-
itests/openejb-itests-beans/pom.xml | 2 +-
pom.xml | 2 +-
.../openejb/server/httpd/HttpResponseImpl.java | 138 ++++++++++---------
.../tck/cdi/tomee/embedded/BeansImpl.java | 15 +-
17 files changed, 183 insertions(+), 96 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/93921cbd/container/openejb-core/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/93921cbd/itests/openejb-itests-beans/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/93921cbd/pom.xml
----------------------------------------------------------------------