[jira] [Resolved] (TOMEE-1633) upgrade javamail to 1.9.0-alpha-2
[ https://issues.apache.org/jira/browse/TOMEE-1633?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Romain Manni-Bucau resolved TOMEE-1633. --- Resolution: Fixed > upgrade javamail to 1.9.0-alpha-2 > - > > Key: TOMEE-1633 > URL: https://issues.apache.org/jira/browse/TOMEE-1633 > Project: TomEE > Issue Type: Dependency upgrade >Reporter: Romain Manni-Bucau >Assignee: Romain Manni-Bucau > Fix For: 1.7.3, 7.0.0-M2 > > -- This message was sent by Atlassian JIRA (v6.3.4#6332)
tomee git commit: TOMEE-1633 geronimo-javamail_1.4_mail 1.9.0-alpha-2
Repository: tomee Updated Branches: refs/heads/tomee-1.7.x 704f7d46d -> 9e27b5e1c TOMEE-1633 geronimo-javamail_1.4_mail 1.9.0-alpha-2 Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/9e27b5e1 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/9e27b5e1 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/9e27b5e1 Branch: refs/heads/tomee-1.7.x Commit: 9e27b5e1c1a855c4d729a9ea3862d8512629f53e Parents: 704f7d4 Author: Romain Manni-Bucau Authored: Mon Sep 28 17:19:16 2015 -0700 Committer: Romain Manni-Bucau Committed: Mon Sep 28 17:19:16 2015 -0700 -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/tomee/blob/9e27b5e1/pom.xml -- diff --git a/pom.xml b/pom.xml index 00de03c..ea81a76 100644 --- a/pom.xml +++ b/pom.xml @@ -1496,7 +1496,7 @@ org.apache.geronimo.javamail geronimo-javamail_1.4_mail -1.8.3 +1.9.0-alpha-2 org.apache.geronimo.javamail
[jira] [Created] (TOMEE-1633) upgrade javamail to 1.9.0-alpha-2
Romain Manni-Bucau created TOMEE-1633: - Summary: upgrade javamail to 1.9.0-alpha-2 Key: TOMEE-1633 URL: https://issues.apache.org/jira/browse/TOMEE-1633 Project: TomEE Issue Type: Dependency upgrade Reporter: Romain Manni-Bucau Assignee: Romain Manni-Bucau Fix For: 1.7.3, 7.0.0-M2 -- This message was sent by Atlassian JIRA (v6.3.4#6332)
buildbot success in ASF Buildbot on tomee-trunk-ubuntu
The Buildbot has detected a restored build on builder tomee-trunk-ubuntu while building tomee. Full details are available at: http://ci.apache.org/builders/tomee-trunk-ubuntu/builds/62 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: hemera_ubuntu Build Reason: The SingleBranchScheduler scheduler named 'on-tomee-trunk-ubuntu-commit' triggered this build Build Source Stamp: [branch master] 5c743b5068e247ee7023deaebb17fb0953cd80fa Blamelist: andygumbre...@apache.org Build succeeded! Sincerely, -The Buildbot
[5/9] tomee git commit: fixing ArchivingTest
fixing ArchivingTest
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/b2002617
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/b2002617
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/b2002617
Branch: refs/heads/tomee-7.0.0-M1
Commit: b200261787fe658ba1779cd2953b87ee85b5f30c
Parents: 94b4a96
Author: Romain Manni-Bucau
Authored: Mon Sep 28 10:47:31 2015 -0700
Committer: Romain Manni-Bucau
Committed: Mon Sep 28 10:47:31 2015 -0700
--
.../org/apache/tomee/jul/handler/rotating/ArchivingTest.java| 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tomee/blob/b2002617/tomee/tomee-juli/src/test/java/org/apache/tomee/jul/handler/rotating/ArchivingTest.java
--
diff --git
a/tomee/tomee-juli/src/test/java/org/apache/tomee/jul/handler/rotating/ArchivingTest.java
b/tomee/tomee-juli/src/test/java/org/apache/tomee/jul/handler/rotating/ArchivingTest.java
index 77da90b..89215f5 100644
---
a/tomee/tomee-juli/src/test/java/org/apache/tomee/jul/handler/rotating/ArchivingTest.java
+++
b/tomee/tomee-juli/src/test/java/org/apache/tomee/jul/handler/rotating/ArchivingTest.java
@@ -97,18 +97,19 @@ public class ArchivingTest {
final File logGzip = new File("target/ArchivingTest-" + format +
"/logs/archives/test.2015-09-01.0.log." + format);
assertTrue(logGzip.getAbsolutePath(), logGzip.isFile());
+// note: size depends on the date so just use a > min
if ("gzip".equals(format)) {
try (final GZIPInputStream gis = new GZIPInputStream(new
FileInputStream("target/ArchivingTest-gzip/logs/archives/test.2015-09-01.0.log.gzip")))
{
final String content = IOUtils.toString(gis);
assertTrue(content.contains("INFO: abcdefghij\n"));
-assertEquals(10258, content.length());
+assertTrue(content.length() > 1);
}
} else {
try (final ZipInputStream zis = new ZipInputStream(new
FileInputStream("target/ArchivingTest-zip/logs/archives/test.2015-09-01.0.log.zip")))
{
assertEquals("test.2015-09-01.0.log",
zis.getNextEntry().getName());
final String content = IOUtils.toString(zis);
assertTrue(content.contains("INFO: abcdefghij\n"));
-assertEquals(10258, content.length());
+assertTrue(content.length() > 1);
assertNull(zis.getNextEntry());
}
}
[8/9] tomee git commit: Java7
Java7
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/5c743b50
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/5c743b50
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/5c743b50
Branch: refs/heads/tomee-7.0.0-M1
Commit: 5c743b5068e247ee7023deaebb17fb0953cd80fa
Parents: 4f2c20b
Author: andygumbre...@apache.org
Authored: Mon Sep 28 23:35:23 2015 +0200
Committer: andygumbre...@apache.org
Committed: Mon Sep 28 23:35:23 2015 +0200
--
.../org/apache/tomee/jul/handler/rotating/LocalFileHandler.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tomee/blob/5c743b50/tomee/tomee-juli/src/main/java/org/apache/tomee/jul/handler/rotating/LocalFileHandler.java
--
diff --git
a/tomee/tomee-juli/src/main/java/org/apache/tomee/jul/handler/rotating/LocalFileHandler.java
b/tomee/tomee-juli/src/main/java/org/apache/tomee/jul/handler/rotating/LocalFileHandler.java
index a3471e4..b662b6d 100644
---
a/tomee/tomee-juli/src/main/java/org/apache/tomee/jul/handler/rotating/LocalFileHandler.java
+++
b/tomee/tomee-juli/src/main/java/org/apache/tomee/jul/handler/rotating/LocalFileHandler.java
@@ -529,13 +529,13 @@ public class LocalFileHandler extends Handler {
}
@Override
-public void write(final byte buff[]) throws IOException {
+public void write(final byte[] buff) throws IOException {
out.write(buff);
written += buff.length;
}
@Override
-public void write(final byte buff[], final int off, final int len)
throws IOException {
+public void write(final byte[] buff, final int off, final int len)
throws IOException {
out.write(buff, off, len);
written += len;
}
[9/9] tomee git commit: Merge branch 'master' into tomee-7.0.0-M1
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(-) --
[7/9] tomee git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/tomee
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/tomee Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/4f2c20b9 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/4f2c20b9 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/4f2c20b9 Branch: refs/heads/tomee-7.0.0-M1 Commit: 4f2c20b9172ee435514e7478d23047463b9cb8e5 Parents: 68119e2 b200261 Author: andygumbre...@apache.org Authored: Mon Sep 28 23:15:50 2015 +0200 Committer: andygumbre...@apache.org Committed: Mon Sep 28 23:15:50 2015 +0200 -- .../org/apache/tomee/jul/handler/rotating/ArchivingTest.java| 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tomee/blob/4f2c20b9/tomee/tomee-juli/src/test/java/org/apache/tomee/jul/handler/rotating/ArchivingTest.java --
[1/9] tomee git commit: Rat
Repository: tomee Updated Branches: refs/heads/tomee-7.0.0-M1 cb2a26ae8 -> bc6005a7d Rat Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/8652068e Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/8652068e Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/8652068e Branch: refs/heads/tomee-7.0.0-M1 Commit: 8652068e95d4d46c37daf49d64541835ed7e466b Parents: 9376249 Author: andygumbre...@apache.org Authored: Fri Sep 25 18:26:13 2015 +0200 Committer: andygumbre...@apache.org Committed: Fri Sep 25 18:26:13 2015 +0200 -- .../jdbc/ResettableDataSourceHandlerTest.java | 17 + rat.xml| 1 + 2 files changed, 18 insertions(+) -- http://git-wip-us.apache.org/repos/asf/tomee/blob/8652068e/container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/ResettableDataSourceHandlerTest.java -- diff --git a/container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/ResettableDataSourceHandlerTest.java b/container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/ResettableDataSourceHandlerTest.java index 8eeb5c5..78a43b2 100644 --- a/container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/ResettableDataSourceHandlerTest.java +++ b/container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/ResettableDataSourceHandlerTest.java @@ -1,3 +1,20 @@ +/** + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.apache.openejb.resource.jdbc; import org.apache.openejb.junit.ApplicationComposer; http://git-wip-us.apache.org/repos/asf/tomee/blob/8652068e/rat.xml -- diff --git a/rat.xml b/rat.xml index e273f2a..91f9d31 100644 --- a/rat.xml +++ b/rat.xml @@ -60,6 +60,7 @@ +
[3/9] tomee git commit: jcs beta-1 doesnt work for us
jcs beta-1 doesnt work for us Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/96bcc48a Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/96bcc48a Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/96bcc48a Branch: refs/heads/tomee-7.0.0-M1 Commit: 96bcc48a200123ed79d860d1aeb4ba74bf8cace9 Parents: af57554 Author: Romain Manni-Bucau Authored: Sun Sep 27 07:44:15 2015 -0700 Committer: Romain Manni-Bucau Committed: Sun Sep 27 07:44:15 2015 -0700 -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/tomee/blob/96bcc48a/pom.xml -- diff --git a/pom.xml b/pom.xml index 0d42b62..62169e1 100644 --- a/pom.xml +++ b/pom.xml @@ -98,7 +98,7 @@ 2.4.0 1.6.2 -2.0-beta-1 +2.0-SNAPSHOT 2.3.7
[6/9] tomee git commit: PMD
PMD
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/68119e24
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/68119e24
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/68119e24
Branch: refs/heads/tomee-7.0.0-M1
Commit: 68119e241914de48eca92e2be9c0731170e24388
Parents: 94b4a96
Author: andygumbre...@apache.org
Authored: Mon Sep 28 23:15:12 2015 +0200
Committer: andygumbre...@apache.org
Committed: Mon Sep 28 23:15:12 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 | 58 +--
.../apache/tomee/jul/handler/rotating/Size.java | 108 --
.../jul/formatter/SimpleTomEEFormatterTest.java | 161 +
.../jul/handler/rotating/ArchivingTest.java | 10 +-
.../handler/rotating/LocalFileHandlerTest.java | 4 +-
.../tomee/jul/handler/rotating/PerfRunner.java | 14 +-
12 files changed, 724 insertions(+), 603 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tomee/blob/68119e24/tomee/tomee-juli/src/main/java/org/apache/tomee/jul/formatter/AsyncConsoleHandler.java
--
diff --git
a/tomee/tomee-juli/src/main/java/org/apache/tomee/jul/formatter/AsyncConsoleHandler.java
b/tomee/tomee-juli/src/main/java/org/apache/tomee/jul/formatter/AsyncConsoleHandler.java
index c6724c0..e212428 100644
---
a/tomee/tomee-juli/src/main/java/org/apache/tomee/jul/formatter/AsyncConsoleHandler.java
+++
b/tomee/tomee-juli/src/main/java/org/apache/tomee/jul/formatter/AsyncConsoleHandler.java
@@ -1,62 +1,63 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.tomee.jul.formatter;
-
-import org.apache.juli.AsyncFileHandler;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.logging.ConsoleHandler;
-import java.util.logging.Formatter;
-import java.util.logging.LogRecord;
-
-public class AsyncConsoleHandler extends AsyncFileHandler {
-private final ConsoleHandler delegate = new ConsoleHandler() {{
-setFormatter(new SingleLineFormatter()); // console -> dev. File uses
plain old format
-}};
-
-protected void publishInternal(final LogRecord record) {
-delegate.publish(record);
-}
-
-// copy cause of classloading
-private static class SingleLineFormatter extends Formatter {
-private static final String SEP = System.getProperty("line.separator",
"\n");
-
-@Override
-public synchronized String format(final LogRecord record) {
-final boolean exception = record.getThrown() != null;
-final StringBuilder sbuf = new StringBuilder();
-sbuf.append(record.getLevel().getLocalizedName());
-sbuf.append(" - ");
-sbuf.append(this.formatMessage(record));
-sbuf.append(SEP);
-if (exception) {
-try {
-final StringWriter sw = new StringWriter();
-final PrintWriter pw = new PrintWriter(sw);
-record.getThrown().printStackTrace(pw);
-pw.close();
-sbuf.append(sw.toString());
-} catch (final Exception ex) {
-// no-op
-}
-}
-return sbuf.toString();
-}
-}
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ *
[4/9] tomee git commit: TOMEE-1632 dont hide IOException in Client
TOMEE-1632 dont hide IOException in Client
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/94b4a96f
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/94b4a96f
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/94b4a96f
Branch: refs/heads/tomee-7.0.0-M1
Commit: 94b4a96f4dca812e6e1cc8186cc06f6ad15725db
Parents: 96bcc48
Author: Romain Manni-Bucau
Authored: Sun Sep 27 08:19:21 2015 -0700
Committer: Romain Manni-Bucau
Committed: Sun Sep 27 08:19:21 2015 -0700
--
.../src/main/java/org/apache/openejb/client/Client.java | 8
.../test/java/org/apache/openejb/server/ejbd/ZEjbdTest.java | 3 +--
2 files changed, 5 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tomee/blob/94b4a96f/server/openejb-client/src/main/java/org/apache/openejb/client/Client.java
--
diff --git
a/server/openejb-client/src/main/java/org/apache/openejb/client/Client.java
b/server/openejb-client/src/main/java/org/apache/openejb/client/Client.java
index 2834f2e..837a2ea 100644
--- a/server/openejb-client/src/main/java/org/apache/openejb/client/Client.java
+++ b/server/openejb-client/src/main/java/org/apache/openejb/client/Client.java
@@ -50,17 +50,15 @@ import static
org.apache.openejb.client.Exceptions.newIOException;
public class Client {
-public static final String OPENEJB_CLIENT_RETRY_CONDITION_MAX =
"openejb.client.retry.condition.max";
private static final String OPENEJB_CLIENT_COMPATIBILITY_VERSION =
"openejb.client.protocol.version";
private static final Logger logger = Logger.getLogger("OpenEJB.client");
private boolean FINEST = logger.isLoggable(Level.FINEST);
private boolean FINER = logger.isLoggable(Level.FINER);
-public static final ThreadLocal> failed = new
ThreadLocal>();
+public static final ThreadLocal> failed = new ThreadLocal<>();
private static final ProtocolMetaData PROTOCOL_META_DATA = new
ProtocolMetaData();
-private static final int maxConditionRetry =
Integer.parseInt(System.getProperty(OPENEJB_CLIENT_RETRY_CONDITION_MAX, "20"));
private static Client client = new Client();
private static final ProtocolMetaData COMPATIBLE_META_DATA;
@@ -69,7 +67,7 @@ public class Client {
COMPATIBLE_META_DATA = (null != version ? new
ProtocolMetaData(version) : null);
}
-private List> retryConditions = new
CopyOnWriteArrayList>();
+private List> retryConditions = new
CopyOnWriteArrayList<>();
private boolean retry = false;
private final Observers observers = new Observers();
@@ -389,6 +387,8 @@ public class Client {
}
throw new RemoteFailoverException("Cannot complete
request. Retry attempted on " + failed.size() + " servers", e);
}
+} else {
+throw new RemoteException("Cannot read the response from the
server (" + protocolRequest.getSpec() + ") : " + e.getMessage(), e);
}
} catch (final Throwable error) {
http://git-wip-us.apache.org/repos/asf/tomee/blob/94b4a96f/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/ZEjbdTest.java
--
diff --git
a/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/ZEjbdTest.java
b/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/ZEjbdTest.java
index 5852661..8c0fb7b 100644
---
a/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/ZEjbdTest.java
+++
b/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/ZEjbdTest.java
@@ -16,7 +16,6 @@
*/
package org.apache.openejb.server.ejbd;
-import org.apache.openejb.client.ClientRuntimeException;
import org.apache.openejb.client.RemoteInitialContextFactory;
import org.apache.openejb.jee.EnterpriseBean;
import org.apache.openejb.jee.SingletonBean;
@@ -77,7 +76,7 @@ public class ZEjbdTest {
remoteCall("zejbd");
}
-@Test(expected = ClientRuntimeException.class)
+@Test(expected = NamingException.class)
public void checkEjbdFailWithAGzipServer() throws Exception {
remoteCall("ejbd");
}
[2/9] tomee git commit: TOMEE-1631 LocalFileHandler
TOMEE-1631 LocalFileHandler
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/af575544
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/af575544
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/af575544
Branch: refs/heads/tomee-7.0.0-M1
Commit: af575544450425cb3f4b1060ae7d4ef12862eba5
Parents: 8652068
Author: Romain Manni-Bucau
Authored: Sat Sep 26 19:32:50 2015 -0700
Committer: Romain Manni-Bucau
Committed: Sat Sep 26 19:32:50 2015 -0700
--
tomee/tomee-juli/pom.xml| 27 +
.../handler/rotating/BackgroundTaskRunner.java | 91 +++
.../tomee/jul/handler/rotating/Duration.java| 178 ++
.../jul/handler/rotating/LocalFileHandler.java | 553 +++
.../apache/tomee/jul/handler/rotating/Size.java | 343
.../jul/handler/rotating/ArchivingTest.java | 215 +++
.../handler/rotating/LocalFileHandlerTest.java | 128 +
.../tomee/jul/handler/rotating/PerfRunner.java | 109
8 files changed, 1644 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/tomee/blob/af575544/tomee/tomee-juli/pom.xml
--
diff --git a/tomee/tomee-juli/pom.xml b/tomee/tomee-juli/pom.xml
index eb4147e..885f55d 100644
--- a/tomee/tomee-juli/pom.xml
+++ b/tomee/tomee-juli/pom.xml
@@ -46,8 +46,35 @@
slf4j-api
provided
+
+
+ junit
+ junit
+ test
+
+
+ org.openjdk.jmh
+ jmh-core
+ ${jmh.version}
+ test
+
+
+ org.openjdk.jmh
+ jmh-generator-annprocess
+ ${jmh.version}
+ test
+
+
+ commons-io
+ commons-io
+ test
+
+
+1.10.5
+
+
http://git-wip-us.apache.org/repos/asf/tomee/blob/af575544/tomee/tomee-juli/src/main/java/org/apache/tomee/jul/handler/rotating/BackgroundTaskRunner.java
--
diff --git
a/tomee/tomee-juli/src/main/java/org/apache/tomee/jul/handler/rotating/BackgroundTaskRunner.java
b/tomee/tomee-juli/src/main/java/org/apache/tomee/jul/handler/rotating/BackgroundTaskRunner.java
new file mode 100644
index 000..5b88b5f
--- /dev/null
+++
b/tomee/tomee-juli/src/main/java/org/apache/tomee/jul/handler/rotating/BackgroundTaskRunner.java
@@ -0,0 +1,91 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.tomee.jul.handler.rotating;
+
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.logging.LogManager;
+
+// Note: don't touch this class while not needed to avoid to trigger the
executor service init
+// mainly there to avoid all handlers to have their own threads
+class BackgroundTaskRunner {
+private static final ExecutorService EXECUTOR_SERVICE;
+private static final boolean SYNCHRONOUS;
+
+static {
+final LogManager logManager = LogManager.getLogManager();
+SYNCHRONOUS = Boolean.parseBoolean(getProperty(logManager,
BackgroundTaskRunner.class.getName() + ".synchronous"));
+if (SYNCHRONOUS) {
+EXECUTOR_SERVICE = null;
+} else {
+
+final String threadCount = getProperty(logManager,
BackgroundTaskRunner.class.getName() + ".threads");
+final String shutdownTimeoutStr = getProperty(logManager,
BackgroundTaskRunner.class.getName() + ".shutdownTimeout");
+final Duration shutdownTimeout = new Duration(shutdownTimeoutStr
== null ? "30 seconds" : shutdownTimeoutStr);
+EXECUTOR_SERVICE =
Executors.newFixedThreadPool(Integer.parseInt(threadCount == null ? "2" :
threadCount), new ThreadFactory() {
+private final ThreadGroup group;
+private final AtomicInteger threadNumber = new
AtomicInteger(1);
+private final String namePrefix =
"com.tomitribe.logging.jul.han
tomee git commit: Java7
Repository: tomee
Updated Branches:
refs/heads/master 4f2c20b91 -> 5c743b506
Java7
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/5c743b50
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/5c743b50
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/5c743b50
Branch: refs/heads/master
Commit: 5c743b5068e247ee7023deaebb17fb0953cd80fa
Parents: 4f2c20b
Author: andygumbre...@apache.org
Authored: Mon Sep 28 23:35:23 2015 +0200
Committer: andygumbre...@apache.org
Committed: Mon Sep 28 23:35:23 2015 +0200
--
.../org/apache/tomee/jul/handler/rotating/LocalFileHandler.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tomee/blob/5c743b50/tomee/tomee-juli/src/main/java/org/apache/tomee/jul/handler/rotating/LocalFileHandler.java
--
diff --git
a/tomee/tomee-juli/src/main/java/org/apache/tomee/jul/handler/rotating/LocalFileHandler.java
b/tomee/tomee-juli/src/main/java/org/apache/tomee/jul/handler/rotating/LocalFileHandler.java
index a3471e4..b662b6d 100644
---
a/tomee/tomee-juli/src/main/java/org/apache/tomee/jul/handler/rotating/LocalFileHandler.java
+++
b/tomee/tomee-juli/src/main/java/org/apache/tomee/jul/handler/rotating/LocalFileHandler.java
@@ -529,13 +529,13 @@ public class LocalFileHandler extends Handler {
}
@Override
-public void write(final byte buff[]) throws IOException {
+public void write(final byte[] buff) throws IOException {
out.write(buff);
written += buff.length;
}
@Override
-public void write(final byte buff[], final int off, final int len)
throws IOException {
+public void write(final byte[] buff, final int off, final int len)
throws IOException {
out.write(buff, off, len);
written += len;
}
buildbot exception in ASF Buildbot on tomee-trunk-ubuntu
The Buildbot has detected a build exception on builder tomee-trunk-ubuntu while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomee-trunk-ubuntu/builds/60 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: hemera_ubuntu Build Reason: forced: by IRC user on channel #openejb: None Build Source Stamp: HEAD Blamelist: BUILD FAILED: exception check-formatting interrupted Sincerely, -The Buildbot
[1/2] tomee git commit: PMD
Repository: tomee
Updated Branches:
refs/heads/master b20026178 -> 4f2c20b91
PMD
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/68119e24
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/68119e24
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/68119e24
Branch: refs/heads/master
Commit: 68119e241914de48eca92e2be9c0731170e24388
Parents: 94b4a96
Author: andygumbre...@apache.org
Authored: Mon Sep 28 23:15:12 2015 +0200
Committer: andygumbre...@apache.org
Committed: Mon Sep 28 23:15:12 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 | 58 +--
.../apache/tomee/jul/handler/rotating/Size.java | 108 --
.../jul/formatter/SimpleTomEEFormatterTest.java | 161 +
.../jul/handler/rotating/ArchivingTest.java | 10 +-
.../handler/rotating/LocalFileHandlerTest.java | 4 +-
.../tomee/jul/handler/rotating/PerfRunner.java | 14 +-
12 files changed, 724 insertions(+), 603 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tomee/blob/68119e24/tomee/tomee-juli/src/main/java/org/apache/tomee/jul/formatter/AsyncConsoleHandler.java
--
diff --git
a/tomee/tomee-juli/src/main/java/org/apache/tomee/jul/formatter/AsyncConsoleHandler.java
b/tomee/tomee-juli/src/main/java/org/apache/tomee/jul/formatter/AsyncConsoleHandler.java
index c6724c0..e212428 100644
---
a/tomee/tomee-juli/src/main/java/org/apache/tomee/jul/formatter/AsyncConsoleHandler.java
+++
b/tomee/tomee-juli/src/main/java/org/apache/tomee/jul/formatter/AsyncConsoleHandler.java
@@ -1,62 +1,63 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.tomee.jul.formatter;
-
-import org.apache.juli.AsyncFileHandler;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.logging.ConsoleHandler;
-import java.util.logging.Formatter;
-import java.util.logging.LogRecord;
-
-public class AsyncConsoleHandler extends AsyncFileHandler {
-private final ConsoleHandler delegate = new ConsoleHandler() {{
-setFormatter(new SingleLineFormatter()); // console -> dev. File uses
plain old format
-}};
-
-protected void publishInternal(final LogRecord record) {
-delegate.publish(record);
-}
-
-// copy cause of classloading
-private static class SingleLineFormatter extends Formatter {
-private static final String SEP = System.getProperty("line.separator",
"\n");
-
-@Override
-public synchronized String format(final LogRecord record) {
-final boolean exception = record.getThrown() != null;
-final StringBuilder sbuf = new StringBuilder();
-sbuf.append(record.getLevel().getLocalizedName());
-sbuf.append(" - ");
-sbuf.append(this.formatMessage(record));
-sbuf.append(SEP);
-if (exception) {
-try {
-final StringWriter sw = new StringWriter();
-final PrintWriter pw = new PrintWriter(sw);
-record.getThrown().printStackTrace(pw);
-pw.close();
-sbuf.append(sw.toString());
-} catch (final Exception ex) {
-// no-op
-}
-}
-return sbuf.toString();
-}
-}
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ *
[2/2] tomee git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/tomee
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/tomee Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/4f2c20b9 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/4f2c20b9 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/4f2c20b9 Branch: refs/heads/master Commit: 4f2c20b9172ee435514e7478d23047463b9cb8e5 Parents: 68119e2 b200261 Author: andygumbre...@apache.org Authored: Mon Sep 28 23:15:50 2015 +0200 Committer: andygumbre...@apache.org Committed: Mon Sep 28 23:15:50 2015 +0200 -- .../org/apache/tomee/jul/handler/rotating/ArchivingTest.java| 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tomee/blob/4f2c20b9/tomee/tomee-juli/src/test/java/org/apache/tomee/jul/handler/rotating/ArchivingTest.java --
tomee git commit: another TomEELogConfigurer.configureLogs to get rid of
Repository: tomee
Updated Branches:
refs/heads/tomee-1.7.x 74f65eba1 -> 704f7d46d
another TomEELogConfigurer.configureLogs to get rid of
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/704f7d46
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/704f7d46
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/704f7d46
Branch: refs/heads/tomee-1.7.x
Commit: 704f7d46d1e48595f6f59d9b1303d5e532bd3476
Parents: 74f65eb
Author: Romain Manni-Bucau
Authored: Mon Sep 28 11:11:46 2015 -0700
Committer: Romain Manni-Bucau
Committed: Mon Sep 28 11:11:46 2015 -0700
--
.../src/main/java/org/apache/tomee/catalina/ServerListener.java | 3 ---
1 file changed, 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tomee/blob/704f7d46/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/ServerListener.java
--
diff --git
a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/ServerListener.java
b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/ServerListener.java
index ba79d53..9c40b0e 100644
---
a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/ServerListener.java
+++
b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/ServerListener.java
@@ -27,7 +27,6 @@ import org.apache.openejb.loader.IO;
import org.apache.openejb.loader.ProvisioningUtil;
import org.apache.openejb.loader.SystemInstance;
import org.apache.openejb.util.OpenEjbVersion;
-import org.apache.tomee.TomEELogConfigurer;
import org.apache.tomee.loader.TomcatHelper;
import java.io.File;
@@ -167,8 +166,6 @@ public class ServerListener implements LifecycleListener {
loader.initialize(properties);
-TomEELogConfigurer.configureLogs();
-
listenerInstalled.set(true);
} catch (final Exception e) {
LOGGER.log(Level.SEVERE, "TomEE Listener can't start OpenEJB",
e);
tomee git commit: restoring deleted file - bad cp
Repository: tomee
Updated Branches:
refs/heads/tomee-1.7.x 82942f077 -> 74f65eba1
restoring deleted file - bad cp
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/74f65eba
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/74f65eba
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/74f65eba
Branch: refs/heads/tomee-1.7.x
Commit: 74f65eba16fded8956553e68fee0be7cb88bdee0
Parents: 82942f0
Author: Romain Manni-Bucau
Authored: Mon Sep 28 11:06:09 2015 -0700
Committer: Romain Manni-Bucau
Committed: Mon Sep 28 11:06:09 2015 -0700
--
.../org/apache/juli/logging/LogFactory.java | 133 +++
1 file changed, 133 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/tomee/blob/74f65eba/tomee/tomee-juli/src/main/java/org/apache/juli/logging/LogFactory.java
--
diff --git
a/tomee/tomee-juli/src/main/java/org/apache/juli/logging/LogFactory.java
b/tomee/tomee-juli/src/main/java/org/apache/juli/logging/LogFactory.java
new file mode 100644
index 000..fe66c8c
--- /dev/null
+++ b/tomee/tomee-juli/src/main/java/org/apache/juli/logging/LogFactory.java
@@ -0,0 +1,133 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.juli.logging;
+
+
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Properties;
+import java.util.logging.LogManager;
+
+
+// tomcat doesn't have any spi mecanism so forking this class
+public /* abstract */ class LogFactory {
+public static final String FACTORY_PROPERTY =
+"org.apache.commons.logging.LogFactory";
+
+public static final String FACTORY_DEFAULT =
+"org.apache.commons.logging.impl.LogFactoryImpl";
+
+public static final String FACTORY_PROPERTIES =
+"commons-logging.properties";
+
+public static final String HASHTABLE_IMPLEMENTATION_PROPERTY =
+"org.apache.commons.logging.LogFactory.HashtableImpl";
+
+private static LogFactory singleton=new LogFactory();
+private final Collection names = new HashSet();
+
+Properties logConfig;
+
+protected LogFactory() {
+logConfig=new Properties();
+}
+
+protected static void setSingleton(final LogFactory singleton) {
+if (singleton == null) {
+return;
+}
+LogFactory.singleton = singleton;
+}
+
+void setLogConfig( final Properties p ) {
+this.logConfig=p;
+}
+
+public synchronized Collection getNames() {
+return names;
+}
+
+public synchronized Log getInstance(final String name) throws
LogConfigurationException {
+names.add(name);
+return DirectJDKLog.getInstance(name);
+}
+
+public void release() {
+DirectJDKLog.release();
+}
+
+public Object getAttribute(final String name) {
+return logConfig.get(name);
+}
+
+public String[] getAttributeNames() {
+final String[] result = new String[logConfig.size()];
+return logConfig.keySet().toArray(result);
+}
+
+public void removeAttribute(final String name) {
+logConfig.remove(name);
+}
+
+public void setAttribute(final String name, final Object value) {
+logConfig.put(name, value);
+}
+
+public Log getInstance(final Class clazz)
+throws LogConfigurationException {
+return getInstance( clazz.getName());
+}
+
+public static LogFactory getFactory() throws LogConfigurationException {
+return singleton;
+}
+
+public static Log getLog(final Class clazz)
+throws LogConfigurationException {
+return getFactory().getInstance(clazz);
+
+}
+
+public static Log getLog(final String name)
+throws LogConfigurationException {
+return getFactory().getInstance(name);
+
+}
+
+public static void release(final ClassLoader classLoader) {
+// JULI's log manager looks at the current classLoader so there is no
+// need to use the passed in classLoader, the default imp
tomee git commit: org.apache.tomee.TomEELogConfigurer no more needed
Repository: tomee
Updated Branches:
refs/heads/tomee-1.7.x da4df975e -> 82942f077
org.apache.tomee.TomEELogConfigurer no more needed
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/82942f07
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/82942f07
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/82942f07
Branch: refs/heads/tomee-1.7.x
Commit: 82942f077359f1300c03178594ba7e36d84fdd54
Parents: da4df97
Author: Romain Manni-Bucau
Authored: Mon Sep 28 10:55:41 2015 -0700
Committer: Romain Manni-Bucau
Committed: Mon Sep 28 10:55:41 2015 -0700
--
.../src/main/java/org/apache/tomee/loader/OpenEJBListener.java | 2 --
1 file changed, 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tomee/blob/82942f07/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/OpenEJBListener.java
--
diff --git
a/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/OpenEJBListener.java
b/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/OpenEJBListener.java
index 6d6d8d5..3eb0e9a 100644
---
a/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/OpenEJBListener.java
+++
b/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/OpenEJBListener.java
@@ -26,7 +26,6 @@ import org.apache.catalina.core.StandardContext;
import org.apache.catalina.core.StandardEngine;
import org.apache.catalina.core.StandardHost;
import org.apache.catalina.core.StandardServer;
-import org.apache.tomee.TomEELogConfigurer;
import java.io.BufferedOutputStream;
import java.io.File;
@@ -91,7 +90,6 @@ public class OpenEJBListener implements LifecycleListener {
properties.setProperty("openejb.embedder.source",
OpenEJBListener.class.getSimpleName());
TomcatEmbedder.embed(properties,
StandardServer.class.getClassLoader());
listenerInstalled = true;
-TomEELogConfigurer.configureLogs();
} else if (logWebappNotFound) {
LOGGER.info("tomee webapp not found from the listener, will
try from the webapp if exists");
logWebappNotFound = false;
[jira] [Updated] (TOMEE-1631) Basic Rotating JUL Handler
[
https://issues.apache.org/jira/browse/TOMEE-1631?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Romain Manni-Bucau updated TOMEE-1631:
--
Fix Version/s: 1.7.3
> Basic Rotating JUL Handler
> --
>
> Key: TOMEE-1631
> URL: https://issues.apache.org/jira/browse/TOMEE-1631
> Project: TomEE
> Issue Type: Bug
> Environment: Supporting rotation by day AND size, archiving of old
> logs and purge of old archives.
>Reporter: Romain Manni-Bucau
>Assignee: Romain Manni-Bucau
> Fix For: 7.0.0-M1, 1.7.3
>
>
> Doc:
>NOTE: for simplicity the prefix
> `org.apache.tomee.jul.handler.rotating.LocalFileHandler.` has been removed of
> name columns.
>
>
>| Name | Default Value
> | Description
>| filenamePattern | ${catalina.base}/logs/logs.%s.%03d.log
> | where log files are created, it uses String.format() and gives you the
> date and file number - in this order.
>| limit | 10 Megabytes
> | limit size indicating the file should be rotated
>| dateCheckInterval | 5 seconds
> | how often the date should be computed to rotate the file (don't do it
> each time for performances reason, means you can get few records of next day
> in a file name with current day)
>| bufferSize| -1 bytes
> | if positive the in memory buffer used to store data before flushing
> them to the disk
>| encoding | -
> | file encoding
>| level | ALL
> | level this handler accepts
>| filter| -
> | filter used to check if the message should be logged
>| formatter | java.util.logging.SimpleFormatter
> | formatter used to format messages
>| archiveDirectory | ${catalina.base}/logs/archives/
> | where compressed logs are put.
>| archiveFormat | gzip
> | zip or gzip.
>| archiveOlderThan | -1 days
> | how many days files are kept before being compressed
>| purgeOlderThan| -1 days
> | how many days files are kept before being deleted, note: it applies on
> archives and not log files so 2 days of archiving and 3 days of purge makes
> it deleted after 5 days.
>| compressionLevel | -1
> | In case of zip archiving the zip compression level (-1 for off or 0-9).
>
>
>NOTE: archiving and purging are done only when a file is rotated, it means
> it can be ignored during days if there is no logging activity.
>
> NOTE: archiving and purging is done in a background thread pool, you can
> configure the number of threads in thanks to
> `org.apache.tomee.jul.handler.rotating.BackgroundTaskRunner.threads`
> property in `conf/logging.properties`.
> Default is 2 which should be fine for most applications.
--
This message was sent by Atlassian JIRA
(v6.3.4#6332)
[2/2] tomee git commit: backporting TOMEE-1631 - Rotating JUL Handler
backporting TOMEE-1631 - Rotating JUL Handler
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/da4df975
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/da4df975
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/da4df975
Branch: refs/heads/tomee-1.7.x
Commit: da4df975e5caf6d022788c6f9fe605c2cc197d4e
Parents: 8afa54e
Author: Romain Manni-Bucau
Authored: Mon Sep 28 10:48:52 2015 -0700
Committer: Romain Manni-Bucau
Committed: Mon Sep 28 10:48:52 2015 -0700
--
tomee/tomee-juli/pom.xml| 27 +
.../org/apache/juli/logging/LogFactory.java | 133 -
.../org/apache/tomee/TomEELogConfigurer.java| 96 ---
.../jul/formatter/AsyncConsoleHandler.java | 34 +-
.../tomee/jul/formatter/log/JULLogger.java | 179 ++
.../tomee/jul/formatter/log/LoggerFactory.java | 23 +
.../tomee/jul/formatter/log/NoopLogger.java | 117
.../tomee/jul/formatter/log/ReloadableLog.java | 111
.../tomee/jul/formatter/log/TomEELog.java | 164 +
.../handler/rotating/BackgroundTaskRunner.java | 91 +++
.../tomee/jul/handler/rotating/Duration.java| 178 ++
.../jul/handler/rotating/LocalFileHandler.java | 593 +++
.../apache/tomee/jul/handler/rotating/Size.java | 343 +++
.../jul/handler/rotating/ArchivingTest.java | 215 +++
.../handler/rotating/LocalFileHandlerTest.java | 128
.../tomee/jul/handler/rotating/PerfRunner.java | 109
16 files changed, 2311 insertions(+), 230 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tomee/blob/da4df975/tomee/tomee-juli/pom.xml
--
diff --git a/tomee/tomee-juli/pom.xml b/tomee/tomee-juli/pom.xml
index 3c57d80..bc578f8 100644
--- a/tomee/tomee-juli/pom.xml
+++ b/tomee/tomee-juli/pom.xml
@@ -45,8 +45,35 @@
slf4j-api
provided
+
+
+ junit
+ junit
+ test
+
+
+ org.openjdk.jmh
+ jmh-core
+ ${jmh.version}
+ test
+
+
+ org.openjdk.jmh
+ jmh-generator-annprocess
+ ${jmh.version}
+ test
+
+
+ commons-io
+ commons-io
+ test
+
+
+1.10.5
+
+
http://git-wip-us.apache.org/repos/asf/tomee/blob/da4df975/tomee/tomee-juli/src/main/java/org/apache/juli/logging/LogFactory.java
--
diff --git
a/tomee/tomee-juli/src/main/java/org/apache/juli/logging/LogFactory.java
b/tomee/tomee-juli/src/main/java/org/apache/juli/logging/LogFactory.java
deleted file mode 100644
index 019b45f..000
--- a/tomee/tomee-juli/src/main/java/org/apache/juli/logging/LogFactory.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.juli.logging;
-
-
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Properties;
-import java.util.logging.LogManager;
-
-
-// tomcat doesn't have any spi mecanism so forking this class
-public /* abstract */ class LogFactory {
-public static final String FACTORY_PROPERTY =
-"org.apache.commons.logging.LogFactory";
-
-public static final String FACTORY_DEFAULT =
-"org.apache.commons.logging.impl.LogFactoryImpl";
-
-public static final String FACTORY_PROPERTIES =
-"commons-logging.properties";
-
-public static final String HASHTABLE_IMPLEMENTATION_PROPERTY =
-"org.apache.commons.logging.LogFactory.HashtableImpl";
-
-private static LogFactory singleton=new LogFactory();
-private final Collection names = new HashSet();
-
-Properties logConfig;
-
-protected LogFactory() {
-logConfig=new Properties();
-}
-
-protected static void setSingleton(final LogFactory singleton) {
-if (singleton == null) {
-return;
-}
-LogFactory.singleton = singleton;
-}
-
-void setLogConfig( final Properties p ) {
-this.logConfig=p;
-
[1/2] tomee git commit: backporting TOMEE-1631 - Rotating JUL Handler
Repository: tomee
Updated Branches:
refs/heads/tomee-1.7.x 8afa54e86 -> da4df975e
http://git-wip-us.apache.org/repos/asf/tomee/blob/da4df975/tomee/tomee-juli/src/test/java/org/apache/tomee/jul/handler/rotating/ArchivingTest.java
--
diff --git
a/tomee/tomee-juli/src/test/java/org/apache/tomee/jul/handler/rotating/ArchivingTest.java
b/tomee/tomee-juli/src/test/java/org/apache/tomee/jul/handler/rotating/ArchivingTest.java
new file mode 100644
index 000..c022149
--- /dev/null
+++
b/tomee/tomee-juli/src/test/java/org/apache/tomee/jul/handler/rotating/ArchivingTest.java
@@ -0,0 +1,215 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.tomee.jul.handler.rotating;
+
+import org.apache.commons.io.IOUtils;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import java.io.File;
+import java.io.FileFilter;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.logging.Level;
+import java.util.logging.LogRecord;
+import java.util.zip.GZIPInputStream;
+import java.util.zip.ZipInputStream;
+
+import static java.util.Arrays.asList;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+@RunWith(Parameterized.class)
+public class ArchivingTest {
+@Parameterized.Parameters(name = "{0}")
+public static Iterable formats() {
+return asList(new Object[] {"zip"}, new Object[] {"gzip"});
+}
+
+@Parameterized.Parameter(0)
+public String format;
+
+@Test
+public void logAndRotate() throws IOException, NoSuchMethodException {
+clean("target/ArchivingTest-" + format + "/logs");
+
+final AtomicReference today = new AtomicReference();
+final Map config = new HashMap();
+
+// initial config
+today.set("2015-09-01");
+config.put("filenamePattern", "target/ArchivingTest-" + format +
"/logs/test.%s.%d.log");
+config.put("archiveDirectory", "target/ArchivingTest-" + format +
"/logs/archives");
+config.put("archiveFormat", format);
+config.put("archiveOlderThan", "1 s");
+config.put("limit", "10 kilobytes");
+config.put("level", "INFO");
+config.put("dateCheckInterval", "1 second");
+
+final LocalFileHandler handler = new LocalFileHandler() {
+@Override
+protected String currentDate() {
+return today.get();
+}
+
+@Override
+protected String getProperty(final String name, final String
defaultValue) {
+final String s =
config.get(name.substring(name.lastIndexOf('.') + 1));
+return s != null ? s : defaultValue;
+}
+};
+
+final String string10chars = "abcdefghij";
+final int iterations = 950;
+for (int i = 0; i < iterations; i++) {
+handler.publish(new LogRecord(Level.INFO, string10chars));
+}
+
+today.set("2015-09-02");
+try { // ensure we test the date
+Thread.sleep(1500);
+} catch (final InterruptedException e) {
+Thread.interrupted();
+}
+handler.publish(new LogRecord(Level.INFO, string10chars)); // will
trigger the archiving
+handler.close();
+
+final File logGzip = new File("target/ArchivingTest-" + format +
"/logs/archives/test.2015-09-01.0.log." + format);
+assertTrue(logGzip.getAbsolutePath(), logGzip.isFile());
+
+if ("gzip".equals(format)) {
+final GZIPInputStream gis = new GZIPInputStream(new
FileInputStream("target/ArchivingTest-gzip/logs/archives/test.2015-09-01.0.log.gzip"));
+final String content = IOUtils.toString(gis);
+assertTrue(content.contains("INFO: abcdefghij\n"));
+assertTrue(content.length() > 1);
+gis.close();
+} else {
+final ZipInputStream zis = new ZipInputStream(new
File
tomee git commit: fixing ArchivingTest
Repository: tomee
Updated Branches:
refs/heads/master 94b4a96f4 -> b20026178
fixing ArchivingTest
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/b2002617
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/b2002617
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/b2002617
Branch: refs/heads/master
Commit: b200261787fe658ba1779cd2953b87ee85b5f30c
Parents: 94b4a96
Author: Romain Manni-Bucau
Authored: Mon Sep 28 10:47:31 2015 -0700
Committer: Romain Manni-Bucau
Committed: Mon Sep 28 10:47:31 2015 -0700
--
.../org/apache/tomee/jul/handler/rotating/ArchivingTest.java| 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tomee/blob/b2002617/tomee/tomee-juli/src/test/java/org/apache/tomee/jul/handler/rotating/ArchivingTest.java
--
diff --git
a/tomee/tomee-juli/src/test/java/org/apache/tomee/jul/handler/rotating/ArchivingTest.java
b/tomee/tomee-juli/src/test/java/org/apache/tomee/jul/handler/rotating/ArchivingTest.java
index 77da90b..89215f5 100644
---
a/tomee/tomee-juli/src/test/java/org/apache/tomee/jul/handler/rotating/ArchivingTest.java
+++
b/tomee/tomee-juli/src/test/java/org/apache/tomee/jul/handler/rotating/ArchivingTest.java
@@ -97,18 +97,19 @@ public class ArchivingTest {
final File logGzip = new File("target/ArchivingTest-" + format +
"/logs/archives/test.2015-09-01.0.log." + format);
assertTrue(logGzip.getAbsolutePath(), logGzip.isFile());
+// note: size depends on the date so just use a > min
if ("gzip".equals(format)) {
try (final GZIPInputStream gis = new GZIPInputStream(new
FileInputStream("target/ArchivingTest-gzip/logs/archives/test.2015-09-01.0.log.gzip")))
{
final String content = IOUtils.toString(gis);
assertTrue(content.contains("INFO: abcdefghij\n"));
-assertEquals(10258, content.length());
+assertTrue(content.length() > 1);
}
} else {
try (final ZipInputStream zis = new ZipInputStream(new
FileInputStream("target/ArchivingTest-zip/logs/archives/test.2015-09-01.0.log.zip")))
{
assertEquals("test.2015-09-01.0.log",
zis.getNextEntry().getName());
final String content = IOUtils.toString(zis);
assertTrue(content.contains("INFO: abcdefghij\n"));
-assertEquals(10258, content.length());
+assertTrue(content.length() > 1);
assertNull(zis.getNextEntry());
}
}
