You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2015/02/18 11:13:49 UTC
[1/3] tomee git commit: upgrading javamail
Repository: tomee
Updated Branches:
refs/heads/develop bd7d78bbe -> d48525c4d
upgrading javamail
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/a5561f61
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/a5561f61
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/a5561f61
Branch: refs/heads/develop
Commit: a5561f61715829b72c5585fb019c4ca68a16a571
Parents: bd7d78b
Author: Romain Manni-Bucau <rm...@apache.org>
Authored: Wed Feb 18 11:12:57 2015 +0100
Committer: Romain Manni-Bucau <rm...@apache.org>
Committed: Wed Feb 18 11:12:57 2015 +0100
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/a5561f61/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 4ac1103..c307169 100644
--- a/pom.xml
+++ b/pom.xml
@@ -168,7 +168,7 @@
<scannotation.version>1.0.2</scannotation.version>
<geronimo.connector.version>3.1.1</geronimo.connector.version>
<geronimo-osgi.version>1.1</geronimo-osgi.version>
- <geronimo-javamail_1.4_spec.version>1.7.1</geronimo-javamail_1.4_spec.version>
+ <geronimo-javamail_1.4_spec.version>1.9.0-alpha-1</geronimo-javamail_1.4_spec.version>
<myfaces.version>2.2.7</myfaces.version>
<mojarra.version>2.1.28</mojarra.version>
<slf4j.version>1.7.7</slf4j.version>
[3/3] tomee git commit: test for observermanager#destroy
Posted by rm...@apache.org.
test for observermanager#destroy
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/d48525c4
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/d48525c4
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/d48525c4
Branch: refs/heads/develop
Commit: d48525c4d67667eb8e2a1295602e618cdd6c267d
Parents: 2b0750d
Author: Romain Manni-Bucau <rm...@apache.org>
Authored: Wed Feb 18 11:13:29 2015 +0100
Committer: Romain Manni-Bucau <rm...@apache.org>
Committed: Wed Feb 18 11:13:29 2015 +0100
----------------------------------------------------------------------
.../openejb/observer/ObserverManagerTest.java | 46 ++++++++++++++++++++
1 file changed, 46 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/d48525c4/container/openejb-loader/src/test/java/org/apache/openejb/observer/ObserverManagerTest.java
----------------------------------------------------------------------
diff --git a/container/openejb-loader/src/test/java/org/apache/openejb/observer/ObserverManagerTest.java b/container/openejb-loader/src/test/java/org/apache/openejb/observer/ObserverManagerTest.java
new file mode 100644
index 0000000..9aa8967
--- /dev/null
+++ b/container/openejb-loader/src/test/java/org/apache/openejb/observer/ObserverManagerTest.java
@@ -0,0 +1,46 @@
+/*
+ * 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.observer;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+public class ObserverManagerTest {
+ @Test
+ public void destroy() {
+ final ObserverManager mgr = new ObserverManager();
+ final Obs observer = new Obs();
+ observer.last = null;
+ mgr.addObserver(observer);
+ mgr.fireEvent("hello");
+ assertEquals("hello", observer.last);
+ observer.last = null;
+ mgr.destroy();
+ mgr.fireEvent("I miss you");
+ assertNull(observer.last);
+ }
+
+ public static class Obs {
+ public volatile String last;
+
+ public void listen(@Observes final String event) {
+ last = event;
+ }
+ }
+}
[2/3] tomee git commit: cleaning up observers with the container
Posted by rm...@apache.org.
cleaning up observers with the container
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/2b0750d4
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/2b0750d4
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/2b0750d4
Branch: refs/heads/develop
Commit: 2b0750d455c5c9a37a0fad0b82513ca9410b4f8f
Parents: a5561f6
Author: Romain Manni-Bucau <rm...@apache.org>
Authored: Wed Feb 18 11:13:13 2015 +0100
Committer: Romain Manni-Bucau <rm...@apache.org>
Committed: Wed Feb 18 11:13:13 2015 +0100
----------------------------------------------------------------------
.../apache/openejb/assembler/classic/Assembler.java | 14 ++++++++------
.../org/apache/openejb/loader/SystemInstance.java | 4 ++++
.../org/apache/openejb/observer/ObserverManager.java | 6 ++++++
3 files changed, 18 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/2b0750d4/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
index feac0a1..3b5c656 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
@@ -1526,7 +1526,8 @@ public class Assembler extends AssemblerTool implements org.apache.openejb.spi.A
l.lock();
try {
- SystemInstance.get().fireEvent(new ContainerSystemPreDestroy());
+ SystemInstance systemInstance = SystemInstance.get();
+ systemInstance.fireEvent(new ContainerSystemPreDestroy());
try {
EjbTimerServiceImpl.shutdown();
@@ -1578,11 +1579,12 @@ public class Assembler extends AssemblerTool implements org.apache.openejb.spi.A
// no-op
}
- SystemInstance.get().removeComponent(OpenEjbConfiguration.class);
- SystemInstance.get().removeComponent(JtaEntityManagerRegistry.class);
- SystemInstance.get().removeComponent(TransactionSynchronizationRegistry.class);
- SystemInstance.get().removeComponent(EjbResolver.class);
- SystemInstance.get().fireEvent(new AssemblerDestroyed());
+ systemInstance.removeComponent(OpenEjbConfiguration.class);
+ systemInstance.removeComponent(JtaEntityManagerRegistry.class);
+ systemInstance.removeComponent(TransactionSynchronizationRegistry.class);
+ systemInstance.removeComponent(EjbResolver.class);
+ systemInstance.fireEvent(new AssemblerDestroyed());
+ systemInstance.removeObservers();
SystemInstance.reset();
} finally {
l.unlock();
http://git-wip-us.apache.org/repos/asf/tomee/blob/2b0750d4/container/openejb-loader/src/main/java/org/apache/openejb/loader/SystemInstance.java
----------------------------------------------------------------------
diff --git a/container/openejb-loader/src/main/java/org/apache/openejb/loader/SystemInstance.java b/container/openejb-loader/src/main/java/org/apache/openejb/loader/SystemInstance.java
index 9a3f373..f53d1cb 100644
--- a/container/openejb-loader/src/main/java/org/apache/openejb/loader/SystemInstance.java
+++ b/container/openejb-loader/src/main/java/org/apache/openejb/loader/SystemInstance.java
@@ -380,4 +380,8 @@ public final class SystemInstance {
public boolean hasProperty(final String propName) {
return this.internalProperties.get(propName) != null;
}
+
+ public void removeObservers() {
+ observerManager.destroy();
+ }
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/2b0750d4/container/openejb-loader/src/main/java/org/apache/openejb/observer/ObserverManager.java
----------------------------------------------------------------------
diff --git a/container/openejb-loader/src/main/java/org/apache/openejb/observer/ObserverManager.java b/container/openejb-loader/src/main/java/org/apache/openejb/observer/ObserverManager.java
index 37becbe..75b4f1f 100644
--- a/container/openejb-loader/src/main/java/org/apache/openejb/observer/ObserverManager.java
+++ b/container/openejb-loader/src/main/java/org/apache/openejb/observer/ObserverManager.java
@@ -126,6 +126,12 @@ public class ObserverManager {
return invocation;
}
+ public void destroy() {
+ for (final Observer o : new LinkedList<>(observers)) {
+ removeObserver(o.observer);
+ }
+ }
+
private static enum Phase {
BEFORE,
INVOKE,