[9/9] tomee git commit: Merge branch 'master' into tomee-7.0.0-M1

[andygumbrecht]

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 
Authored: Thu Dec 3 04:36:13 2015 +0100
Committer: AndyGee 
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
--

[9/9] tomee git commit: Merge branch 'master' into tomee-7.0.0-M1

[andygumbrecht]

Merge branch 'master' into tomee-7.0.0-M1

Conflicts:
pom.xml
rat.xml

tomee/tomee-juli/src/main/java/org/apache/tomee/jul/handler/rotating/BackgroundTaskRunner.java

tomee/tomee-juli/src/main/java/org/apache/tomee/jul/handler/rotating/Duration.java

tomee/tomee-juli/src/main/java/org/apache/tomee/jul/handler/rotating/LocalFileHandler.java

tomee/tomee-juli/src/main/java/org/apache/tomee/jul/handler/rotating/Size.java

tomee/tomee-juli/src/test/java/org/apache/tomee/jul/handler/rotating/ArchivingTest.java

tomee/tomee-juli/src/test/java/org/apache/tomee/jul/handler/rotating/LocalFileHandlerTest.java

tomee/tomee-juli/src/test/java/org/apache/tomee/jul/handler/rotating/PerfRunner.java


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/bc6005a7
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/bc6005a7
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/bc6005a7

Branch: refs/heads/tomee-7.0.0-M1
Commit: bc6005a7d7fa14893b81ee50cbfa0b72b91258a8
Parents: cb2a26a 5c743b5
Author: andygumbre...@apache.org 
Authored: Mon Sep 28 23:43:50 2015 +0200
Committer: andygumbre...@apache.org 
Committed: Mon Sep 28 23:43:50 2015 +0200

--
 .../jul/formatter/AsyncConsoleHandler.java  | 125 +++
 .../jul/formatter/SimpleTomEEFormatter.java |  96 ++---
 .../tomee/jul/formatter/log/JULLogger.java  | 359 ++-
 .../tomee/jul/formatter/log/ReloadableLog.java  | 232 ++--
 .../handler/rotating/BackgroundTaskRunner.java  |   2 +-
 .../tomee/jul/handler/rotating/Duration.java| 158 +---
 .../jul/handler/rotating/LocalFileHandler.java  |  62 ++--
 .../apache/tomee/jul/handler/rotating/Size.java | 108 --
 .../jul/formatter/SimpleTomEEFormatterTest.java | 161 +
 .../jul/handler/rotating/ArchivingTest.java |  15 +-
 .../handler/rotating/LocalFileHandlerTest.java  |   4 +-
 .../tomee/jul/handler/rotating/PerfRunner.java  |  14 +-
 12 files changed, 729 insertions(+), 607 deletions(-)
--