You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by st...@apache.org on 2017/08/17 20:43:48 UTC
[1/4] tomee git commit: TOMEE-2115 fix recursive fireEvent
invocations due to missing super call
Repository: tomee
Updated Branches:
refs/heads/fb_tomee8 1895baf1b -> d47723ada
TOMEE-2115 fix recursive fireEvent invocations due to missing super call
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/606cad6f
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/606cad6f
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/606cad6f
Branch: refs/heads/fb_tomee8
Commit: 606cad6ffca0007e40a901df53d0ae23deae58cd
Parents: 1895baf
Author: Mark Struberg <st...@apache.org>
Authored: Thu Aug 17 09:18:55 2017 +0200
Committer: Mark Struberg <st...@apache.org>
Committed: Thu Aug 17 09:18:55 2017 +0200
----------------------------------------------------------------------
.../src/main/java/org/apache/openejb/cdi/WebappBeanManager.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/606cad6f/container/openejb-core/src/main/java/org/apache/openejb/cdi/WebappBeanManager.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/cdi/WebappBeanManager.java b/container/openejb-core/src/main/java/org/apache/openejb/cdi/WebappBeanManager.java
index b201628..73ab2b0 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/cdi/WebappBeanManager.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/cdi/WebappBeanManager.java
@@ -67,7 +67,7 @@ public class WebappBeanManager extends BeanManagerImpl {
@Override
public void fireEvent(final Object event, final EventMetadataImpl metadata, final boolean isLifecycleEvent) {
- fireEvent(event, metadata, isLifecycleEvent);
+ super.fireEvent(event, metadata, isLifecycleEvent);
if (isEvent(event)) {
final BeanManagerImpl parentBm = getParentBm();
if (parentBm != null) {
[2/4] tomee git commit: TOMEE-2115 down to surefire 2.19
Posted by st...@apache.org.
TOMEE-2115 down to surefire 2.19
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/160ff486
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/160ff486
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/160ff486
Branch: refs/heads/fb_tomee8
Commit: 160ff486bc86040b9098e2a8b4278c9ab44c3626
Parents: 606cad6
Author: Mark Struberg <st...@apache.org>
Authored: Thu Aug 17 22:40:34 2017 +0200
Committer: Mark Struberg <st...@apache.org>
Committed: Thu Aug 17 22:40:34 2017 +0200
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/160ff486/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index baebe03..99f2e89 100644
--- a/pom.xml
+++ b/pom.xml
@@ -334,7 +334,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.21-SNAPSHOT</version>
+ <version>2.19</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
[4/4] tomee git commit: TOMEE-2115 Multipoint test blows up the same
way than Multicast
Posted by st...@apache.org.
TOMEE-2115 Multipoint test blows up the same way than Multicast
Only happens on hardened systems which do not freely allow multicast.
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/d47723ad
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/d47723ad
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/d47723ad
Branch: refs/heads/fb_tomee8
Commit: d47723adace0973ce574ff8dd2f0029ee3c81f27
Parents: 7f2b429
Author: Mark Struberg <st...@apache.org>
Authored: Thu Aug 17 22:42:43 2017 +0200
Committer: Mark Struberg <st...@apache.org>
Committed: Thu Aug 17 22:42:43 2017 +0200
----------------------------------------------------------------------
server/openejb-multicast/pom.xml | 4 ++--
.../openejb/server/discovery/MultipointDiscoveryAgentTest.java | 4 ++++
2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/d47723ad/server/openejb-multicast/pom.xml
----------------------------------------------------------------------
diff --git a/server/openejb-multicast/pom.xml b/server/openejb-multicast/pom.xml
index c7d7504..983dc8c 100644
--- a/server/openejb-multicast/pom.xml
+++ b/server/openejb-multicast/pom.xml
@@ -17,15 +17,15 @@
limitations under the License.
-->
-<!-- $Rev$ $Date$ -->
-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<artifactId>server</artifactId>
<groupId>org.apache.tomee</groupId>
<version>8.0.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
+
<modelVersion>4.0.0</modelVersion>
<artifactId>openejb-multicast</artifactId>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/tomee/blob/d47723ad/server/openejb-multicast/src/test/java/org/apache/openejb/server/discovery/MultipointDiscoveryAgentTest.java
----------------------------------------------------------------------
diff --git a/server/openejb-multicast/src/test/java/org/apache/openejb/server/discovery/MultipointDiscoveryAgentTest.java b/server/openejb-multicast/src/test/java/org/apache/openejb/server/discovery/MultipointDiscoveryAgentTest.java
index 54b4b98..6796507 100644
--- a/server/openejb-multicast/src/test/java/org/apache/openejb/server/discovery/MultipointDiscoveryAgentTest.java
+++ b/server/openejb-multicast/src/test/java/org/apache/openejb/server/discovery/MultipointDiscoveryAgentTest.java
@@ -50,6 +50,10 @@ public class MultipointDiscoveryAgentTest extends TestCase {
public void test() throws Exception {
+ if ("true".equals(System.getProperty("skipMulticastTests"))) {
+ Logger.getLogger(this.getClass().getName()).warning("Skipping MulticastTest " + this.getClass().getName());
+ return;
+ }
final URI testService = new URI("green://localhost:0");
[3/4] tomee git commit: TOMEE-2115 only use 1 thread.
Posted by st...@apache.org.
TOMEE-2115 only use 1 thread.
With 2 threads I got random file locking failures.
Will only happen on fast boxes, but still very nasty.
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/7f2b429a
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/7f2b429a
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/7f2b429a
Branch: refs/heads/fb_tomee8
Commit: 7f2b429a2ae29df888a79466d1754226b66d94f2
Parents: 160ff48
Author: Mark Struberg <st...@apache.org>
Authored: Thu Aug 17 22:41:38 2017 +0200
Committer: Mark Struberg <st...@apache.org>
Committed: Thu Aug 17 22:41:38 2017 +0200
----------------------------------------------------------------------
container/openejb-core/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/7f2b429a/container/openejb-core/pom.xml
----------------------------------------------------------------------
diff --git a/container/openejb-core/pom.xml b/container/openejb-core/pom.xml
index 3fb2a16..33c212f 100644
--- a/container/openejb-core/pom.xml
+++ b/container/openejb-core/pom.xml
@@ -315,11 +315,11 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.17</version>
+ <version>${surefire.version}</version>
<configuration>
<childDelegation>true</childDelegation>
<reuseForks>false</reuseForks>
- <forkCount>2</forkCount>
+ <forkCount>1</forkCount>
<testNGArtifactName>none:none</testNGArtifactName>
<argLine>
-javaagent:${project.basedir}/target/openejb-javaagent-${project.version}.jar