You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by tv...@apache.org on 2017/10/27 17:56:05 UTC
[1/5] tomee git commit: porting
https://github.com/apache/tomee/pull/106
Repository: tomee
Updated Branches:
refs/heads/master 6a97e5a41 -> 1618c1c30
porting https://github.com/apache/tomee/pull/106
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/fd4a8037
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/fd4a8037
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/fd4a8037
Branch: refs/heads/master
Commit: fd4a8037fe162c49a78423b3cc2275a2d53510af
Parents: 6a97e5a
Author: Thiago Veronezi <th...@veronezi.org>
Authored: Fri Oct 27 13:32:27 2017 -0400
Committer: Thiago Veronezi <th...@veronezi.org>
Committed: Fri Oct 27 13:32:27 2017 -0400
----------------------------------------------------------------------
.../java/org/apache/openejb/BeanContext.java | 2 ++
.../openejb/monitoring/StatsInterceptor.java | 10 ++++++++++
.../org/apache/openejb/util/LogCategory.java | 1 +
.../main/java/org/apache/openejb/util/Pool.java | 21 +++++---------------
.../openejb/monitoring/Messages.properties | 18 +++++++++++++++++
.../openejb/util/resources/Messages.properties | 3 +++
6 files changed, 39 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/fd4a8037/container/openejb-core/src/main/java/org/apache/openejb/BeanContext.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/BeanContext.java b/container/openejb-core/src/main/java/org/apache/openejb/BeanContext.java
index 5c72841..a0ffeff 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/BeanContext.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/BeanContext.java
@@ -1739,6 +1739,8 @@ public class BeanContext extends DeploymentContext {
} finally {
EjbTransactionUtil.afterInvoke(transactionPolicy, callContext);
}
+ Logger.getInstance(LogCategory.OPENEJB, "org.apache.openejb.util.resources")
+ .info("instance.created", beanInstance.getClass().getName());
// handle cdi decorators
if (cdiEjbBean != null) {
http://git-wip-us.apache.org/repos/asf/tomee/blob/fd4a8037/container/openejb-core/src/main/java/org/apache/openejb/monitoring/StatsInterceptor.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/monitoring/StatsInterceptor.java b/container/openejb-core/src/main/java/org/apache/openejb/monitoring/StatsInterceptor.java
index c165a23..250547c 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/monitoring/StatsInterceptor.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/monitoring/StatsInterceptor.java
@@ -21,6 +21,8 @@ import org.apache.openejb.api.Monitor;
import org.apache.openejb.core.interceptor.InterceptorData;
import org.apache.openejb.loader.SystemInstance;
import org.apache.openejb.math.stat.descriptive.SynchronizedDescriptiveStatistics;
+import org.apache.openejb.util.LogCategory;
+import org.apache.openejb.util.Logger;
import org.apache.xbean.finder.ClassFinder;
import javax.annotation.PostConstruct;
@@ -106,7 +108,11 @@ public class StatsInterceptor {
@PostConstruct
public void PostConstruct(final InvocationContext invocationContext) throws Exception {
+ long start = System.nanoTime();
record(invocationContext, PostConstruct());
+ long end = System.nanoTime();
+ Logger.getInstance(LogCategory.OPENEJB, "org.apache.openejb.util.resources")
+ .info("instance.created", invocationContext.getTarget().getClass().getName(), end - start);
}
public Method PreDestroy() throws NoSuchMethodException {
@@ -115,7 +121,11 @@ public class StatsInterceptor {
@PreDestroy
public void PreDestroy(final InvocationContext invocationContext) throws Exception {
+ long start = System.nanoTime();
record(invocationContext, PreDestroy());
+ long end = System.nanoTime();
+ Logger.getInstance(LogCategory.OPENEJB, "org.apache.openejb.util.resources")
+ .info("instance.discarded", invocationContext.getTarget().getClass().getName(), end - start);
}
public Method PostActivate() throws NoSuchMethodException {
http://git-wip-us.apache.org/repos/asf/tomee/blob/fd4a8037/container/openejb-core/src/main/java/org/apache/openejb/util/LogCategory.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/util/LogCategory.java b/container/openejb-core/src/main/java/org/apache/openejb/util/LogCategory.java
index e1491cd..7c64a3c 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/util/LogCategory.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/util/LogCategory.java
@@ -59,6 +59,7 @@ public final class LogCategory {
public static final LogCategory HTTPSERVER = OPENEJB_SERVER.createChild("http");
public static final LogCategory SERVICEPOOL = OPENEJB_SERVER.createChild("pool");
public static final LogCategory OPENEJB_SQL = OPENEJB.createChild("sql");
+ public static final LogCategory MONITORING = OPENEJB.createChild("monitoring");
private LogCategory(final String name) {
this.name = name == null ? "" : name;
http://git-wip-us.apache.org/repos/asf/tomee/blob/fd4a8037/container/openejb-core/src/main/java/org/apache/openejb/util/Pool.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/util/Pool.java b/container/openejb-core/src/main/java/org/apache/openejb/util/Pool.java
index a743978..3a36f76 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/util/Pool.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/util/Pool.java
@@ -20,22 +20,8 @@ import org.apache.openejb.core.ParentClassLoaderFinder;
import org.apache.openejb.monitoring.Managed;
import java.lang.ref.SoftReference;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.NoSuchElementException;
-import java.util.concurrent.Executor;
-import java.util.concurrent.Executors;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.RejectedExecutionHandler;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.ScheduledFuture;
-import java.util.concurrent.Semaphore;
-import java.util.concurrent.ThreadFactory;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
+import java.util.*;
+import java.util.concurrent.*;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicReference;
@@ -922,6 +908,9 @@ public class Pool<T> {
}
try {
supplier.discard(expired, event);
+ org.apache.openejb.util.Logger
+ .getInstance(LogCategory.OPENEJB, "org.apache.openejb.util.resources")
+ .info("instance.discarded", expired.getClass().getName());
} finally {
out.countDown();
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/fd4a8037/container/openejb-core/src/main/resources/org/apache/openejb/monitoring/Messages.properties
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/resources/org/apache/openejb/monitoring/Messages.properties b/container/openejb-core/src/main/resources/org/apache/openejb/monitoring/Messages.properties
new file mode 100644
index 0000000..5d070b7
--- /dev/null
+++ b/container/openejb-core/src/main/resources/org/apache/openejb/monitoring/Messages.properties
@@ -0,0 +1,18 @@
+#
+# 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.
+#
+instance.created=Instance created: {0} {1}ns
+instance.discarded=Instance discarded: {0} {1}ns
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tomee/blob/fd4a8037/container/openejb-core/src/main/resources/org/apache/openejb/util/resources/Messages.properties
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/resources/org/apache/openejb/util/resources/Messages.properties b/container/openejb-core/src/main/resources/org/apache/openejb/util/resources/Messages.properties
index 8a985b6..08b7892 100644
--- a/container/openejb-core/src/main/resources/org/apache/openejb/util/resources/Messages.properties
+++ b/container/openejb-core/src/main/resources/org/apache/openejb/util/resources/Messages.properties
@@ -262,6 +262,9 @@ deploy.c.061=Deploy option -c. Could not copy jar {0} to {1}. Jar already exist
entityEjbHomeHandler.containerInvocationFailure=Failure at container invocation: {0}
+instance.created=Instance created: {0}
+instance.discarded=Instance discarded: {0}
+
# ConfigurationFactory
# DeploymentLoader.logger.info("validationDisabled");
validationDisabled = Validation is disabled (enable it with the \"{0}\" boolean property)
[5/5] tomee git commit: using new log category
Posted by tv...@apache.org.
using new log category
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/1618c1c3
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/1618c1c3
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/1618c1c3
Branch: refs/heads/master
Commit: 1618c1c30d8c5647a55a19529d72cefebb01dabf
Parents: 6f7257b
Author: Thiago Veronezi <th...@veronezi.org>
Authored: Fri Oct 27 13:52:56 2017 -0400
Committer: Thiago Veronezi <th...@veronezi.org>
Committed: Fri Oct 27 13:52:56 2017 -0400
----------------------------------------------------------------------
.../java/org/apache/openejb/monitoring/StatsInterceptor.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/1618c1c3/container/openejb-core/src/main/java/org/apache/openejb/monitoring/StatsInterceptor.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/monitoring/StatsInterceptor.java b/container/openejb-core/src/main/java/org/apache/openejb/monitoring/StatsInterceptor.java
index 250547c..cb5a890 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/monitoring/StatsInterceptor.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/monitoring/StatsInterceptor.java
@@ -111,7 +111,7 @@ public class StatsInterceptor {
long start = System.nanoTime();
record(invocationContext, PostConstruct());
long end = System.nanoTime();
- Logger.getInstance(LogCategory.OPENEJB, "org.apache.openejb.util.resources")
+ Logger.getInstance(LogCategory.MONITORING, "org.apache.openejb.monitoring")
.info("instance.created", invocationContext.getTarget().getClass().getName(), end - start);
}
@@ -124,7 +124,7 @@ public class StatsInterceptor {
long start = System.nanoTime();
record(invocationContext, PreDestroy());
long end = System.nanoTime();
- Logger.getInstance(LogCategory.OPENEJB, "org.apache.openejb.util.resources")
+ Logger.getInstance(LogCategory.MONITORING, "org.apache.openejb.monitoring")
.info("instance.discarded", invocationContext.getTarget().getClass().getName(), end - start);
}
[4/5] tomee git commit: revert unwanted change on BeanContext.java
Posted by tv...@apache.org.
revert unwanted change on BeanContext.java
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/6f7257b7
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/6f7257b7
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/6f7257b7
Branch: refs/heads/master
Commit: 6f7257b726f89b7d228d5f46ccc444e74d43b014
Parents: 8c232eb
Author: Thiago Veronezi <th...@veronezi.org>
Authored: Fri Oct 27 13:37:45 2017 -0400
Committer: Thiago Veronezi <th...@veronezi.org>
Committed: Fri Oct 27 13:37:45 2017 -0400
----------------------------------------------------------------------
.../openejb-core/src/main/java/org/apache/openejb/BeanContext.java | 2 --
1 file changed, 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/6f7257b7/container/openejb-core/src/main/java/org/apache/openejb/BeanContext.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/BeanContext.java b/container/openejb-core/src/main/java/org/apache/openejb/BeanContext.java
index a0ffeff..5c72841 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/BeanContext.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/BeanContext.java
@@ -1739,8 +1739,6 @@ public class BeanContext extends DeploymentContext {
} finally {
EjbTransactionUtil.afterInvoke(transactionPolicy, callContext);
}
- Logger.getInstance(LogCategory.OPENEJB, "org.apache.openejb.util.resources")
- .info("instance.created", beanInstance.getClass().getName());
// handle cdi decorators
if (cdiEjbBean != null) {
[3/5] tomee git commit: revert unwanted change on
container/openejb-core/src/main/resources/org/apache/openejb/util/resources/Messages.properties
Posted by tv...@apache.org.
revert unwanted change on container/openejb-core/src/main/resources/org/apache/openejb/util/resources/Messages.properties
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/8c232eb9
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/8c232eb9
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/8c232eb9
Branch: refs/heads/master
Commit: 8c232eb92dfaf35405ecffe964b70daf2b77d12b
Parents: ab90e0a
Author: Thiago Veronezi <th...@veronezi.org>
Authored: Fri Oct 27 13:36:15 2017 -0400
Committer: Thiago Veronezi <th...@veronezi.org>
Committed: Fri Oct 27 13:36:15 2017 -0400
----------------------------------------------------------------------
.../org/apache/openejb/util/resources/Messages.properties | 3 ---
1 file changed, 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/8c232eb9/container/openejb-core/src/main/resources/org/apache/openejb/util/resources/Messages.properties
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/resources/org/apache/openejb/util/resources/Messages.properties b/container/openejb-core/src/main/resources/org/apache/openejb/util/resources/Messages.properties
index 08b7892..8a985b6 100644
--- a/container/openejb-core/src/main/resources/org/apache/openejb/util/resources/Messages.properties
+++ b/container/openejb-core/src/main/resources/org/apache/openejb/util/resources/Messages.properties
@@ -262,9 +262,6 @@ deploy.c.061=Deploy option -c. Could not copy jar {0} to {1}. Jar already exist
entityEjbHomeHandler.containerInvocationFailure=Failure at container invocation: {0}
-instance.created=Instance created: {0}
-instance.discarded=Instance discarded: {0}
-
# ConfigurationFactory
# DeploymentLoader.logger.info("validationDisabled");
validationDisabled = Validation is disabled (enable it with the \"{0}\" boolean property)
[2/5] tomee git commit: revert unwanted change on Pool.java
Posted by tv...@apache.org.
revert unwanted change on Pool.java
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/ab90e0a1
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/ab90e0a1
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/ab90e0a1
Branch: refs/heads/master
Commit: ab90e0a13249997f13a1baddd02f53db0824d4fd
Parents: fd4a803
Author: Thiago Veronezi <th...@veronezi.org>
Authored: Fri Oct 27 13:34:47 2017 -0400
Committer: Thiago Veronezi <th...@veronezi.org>
Committed: Fri Oct 27 13:34:47 2017 -0400
----------------------------------------------------------------------
.../main/java/org/apache/openejb/util/Pool.java | 21 +++++++++++++++-----
1 file changed, 16 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/ab90e0a1/container/openejb-core/src/main/java/org/apache/openejb/util/Pool.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/util/Pool.java b/container/openejb-core/src/main/java/org/apache/openejb/util/Pool.java
index 3a36f76..a743978 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/util/Pool.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/util/Pool.java
@@ -20,8 +20,22 @@ import org.apache.openejb.core.ParentClassLoaderFinder;
import org.apache.openejb.monitoring.Managed;
import java.lang.ref.SoftReference;
-import java.util.*;
-import java.util.concurrent.*;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.NoSuchElementException;
+import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.RejectedExecutionHandler;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.Semaphore;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicReference;
@@ -908,9 +922,6 @@ public class Pool<T> {
}
try {
supplier.discard(expired, event);
- org.apache.openejb.util.Logger
- .getInstance(LogCategory.OPENEJB, "org.apache.openejb.util.resources")
- .info("instance.discarded", expired.getClass().getName());
} finally {
out.countDown();
}