buildbot success in on tomee-trunk-ubuntu-jvm8
The Buildbot has detected a restored build on builder tomee-trunk-ubuntu-jvm8 while building tomee. Full details are available at: https://ci.apache.org/builders/tomee-trunk-ubuntu-jvm8/builds/718 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: bb_qnode5_ubuntu Build Reason: The SingleBranchScheduler scheduler named 'on-tomee-trunk-ubuntu-jvm8-commit' triggered this build Build Source Stamp: [branch master] 3f731b9ff6fa55fdf954108ef500757ee72453b2 Blamelist: andygumbrecht Build succeeded! Sincerely, -The Buildbot
tomee git commit: Remove xerces axiom 1.2.20
Repository: tomee Updated Branches: refs/heads/master 05c6148d9 -> 0ce4a63af Remove xerces axiom 1.2.20 Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/0ce4a63a Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/0ce4a63a Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/0ce4a63a Branch: refs/heads/master Commit: 0ce4a63af2599815a67ff63a5a8623ae2f8ca469 Parents: 05c6148 Author: Andrew Gumbrecht Authored: Thu Sep 14 00:36:14 2017 +0200 Committer: andygumbrecht Committed: Thu Sep 14 00:36:14 2017 +0200 -- pom.xml | 7 +-- 1 file changed, 1 insertion(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tomee/blob/0ce4a63a/pom.xml -- diff --git a/pom.xml b/pom.xml index 1b44a58..3765410 100644 --- a/pom.xml +++ b/pom.xml @@ -181,7 +181,7 @@ 2.0.1 4.2.0 2.3.2 -1.2.14 +1.2.20 2.7.2 4.2.18.Final 2.6.4 @@ -1391,11 +1391,6 @@ ${version.axiom} -xerces -xercesImpl -2.11.0 - - org.apache.commons commons-math 2.2
tomee git commit: xalan 2.7.2
Repository: tomee Updated Branches: refs/heads/master 3f731b9ff -> 05c6148d9 xalan 2.7.2 Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/05c6148d Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/05c6148d Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/05c6148d Branch: refs/heads/master Commit: 05c6148d934963e42aa9a8a44ec6e1455dc1282f Parents: 3f731b9 Author: andygumbrecht Authored: Thu Sep 14 00:28:28 2017 +0200 Committer: andygumbrecht Committed: Thu Sep 14 00:28:28 2017 +0200 -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/tomee/blob/05c6148d/pom.xml -- diff --git a/pom.xml b/pom.xml index d86fb38..1b44a58 100644 --- a/pom.xml +++ b/pom.xml @@ -182,7 +182,7 @@ 4.2.0 2.3.2 1.2.14 -2.7.1 +2.7.2 4.2.18.Final 2.6.4 2.4.12
[jira] [Updated] (TOMEE-2121) Add system property 'openejb.deployer.repository' to ProvisioningUtil
[ https://issues.apache.org/jira/browse/TOMEE-2121?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Andy Gumbrecht updated TOMEE-2121: -- Description: Add system property 'openejb.deployer.repository' and 'openejb.deployer.snapshots.repository' to ProvisioningUtil to allow override of the hard coded repositories. 7.x has a new impl, but legacy still needs this. was: Add system property 'openejb.deployer.repository' to ProvisioningUtil to allow override of the hard coded repositories. 7.x has a new impl, but legacy still needs this. > Add system property 'openejb.deployer.repository' to ProvisioningUtil > - > > Key: TOMEE-2121 > URL: https://issues.apache.org/jira/browse/TOMEE-2121 > Project: TomEE > Issue Type: New Feature >Affects Versions: 1.7.4, 7.0.3 >Reporter: Andy Gumbrecht >Assignee: Andy Gumbrecht >Priority: Minor > Fix For: 1.7.5, 7.0.4 > > > Add system property 'openejb.deployer.repository' and > 'openejb.deployer.snapshots.repository' to ProvisioningUtil to allow override > of the hard coded repositories. > 7.x has a new impl, but legacy still needs this. -- This message was sent by Atlassian JIRA (v6.4.14#64029)
[jira] [Resolved] (TOMEE-2121) Add system property 'openejb.deployer.repository' to ProvisioningUtil
[ https://issues.apache.org/jira/browse/TOMEE-2121?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Andy Gumbrecht resolved TOMEE-2121. --- Resolution: Done > Add system property 'openejb.deployer.repository' to ProvisioningUtil > - > > Key: TOMEE-2121 > URL: https://issues.apache.org/jira/browse/TOMEE-2121 > Project: TomEE > Issue Type: New Feature >Affects Versions: 1.7.4, 7.0.3 >Reporter: Andy Gumbrecht >Assignee: Andy Gumbrecht >Priority: Minor > Fix For: 1.7.5, 7.0.4 > > > Add system property 'openejb.deployer.repository' and > 'openejb.deployer.snapshots.repository' to ProvisioningUtil to allow override > of the hard coded repositories. > 7.x has a new impl, but legacy still needs this. -- This message was sent by Atlassian JIRA (v6.4.14#64029)
[jira] [Updated] (TOMEE-2121) Add system property 'openejb.deployer.repository' to ProvisioningUtil
[ https://issues.apache.org/jira/browse/TOMEE-2121?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Andy Gumbrecht updated TOMEE-2121: -- Fix Version/s: 7.0.4 > Add system property 'openejb.deployer.repository' to ProvisioningUtil > - > > Key: TOMEE-2121 > URL: https://issues.apache.org/jira/browse/TOMEE-2121 > Project: TomEE > Issue Type: New Feature >Affects Versions: 1.7.4, 7.0.3 >Reporter: Andy Gumbrecht >Assignee: Andy Gumbrecht >Priority: Minor > Fix For: 1.7.5, 7.0.4 > > > Add system property 'openejb.deployer.repository' to ProvisioningUtil to > allow override of the hard coded repositories. > 7.x has a new impl, but legacy still needs this. -- This message was sent by Atlassian JIRA (v6.4.14#64029)
[jira] [Updated] (TOMEE-2121) Add system property 'openejb.deployer.repository' to ProvisioningUtil
[ https://issues.apache.org/jira/browse/TOMEE-2121?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Andy Gumbrecht updated TOMEE-2121: -- Affects Version/s: (was: 7.0.4) 7.0.3 > Add system property 'openejb.deployer.repository' to ProvisioningUtil > - > > Key: TOMEE-2121 > URL: https://issues.apache.org/jira/browse/TOMEE-2121 > Project: TomEE > Issue Type: New Feature >Affects Versions: 1.7.4, 7.0.3 >Reporter: Andy Gumbrecht >Assignee: Andy Gumbrecht >Priority: Minor > Fix For: 1.7.5, 7.0.4 > > > Add system property 'openejb.deployer.repository' to ProvisioningUtil to > allow override of the hard coded repositories. > 7.x has a new impl, but legacy still needs this. -- This message was sent by Atlassian JIRA (v6.4.14#64029)
tomee git commit: Fix non-deterministic test
Repository: tomee Updated Branches: refs/heads/master bd41439b5 -> 3f731b9ff Fix non-deterministic test Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/3f731b9f Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/3f731b9f Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/3f731b9f Branch: refs/heads/master Commit: 3f731b9ff6fa55fdf954108ef500757ee72453b2 Parents: bd41439 Author: andygumbrecht Authored: Wed Sep 13 22:44:01 2017 +0200 Committer: andygumbrecht Committed: Wed Sep 13 22:44:01 2017 +0200 -- pom.xml | 2 +- .../org/apache/tomee/webaccess/test/units/LogTest.groovy| 9 + 2 files changed, 6 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tomee/blob/3f731b9f/pom.xml -- diff --git a/pom.xml b/pom.xml index c3fa9c4..d86fb38 100644 --- a/pom.xml +++ b/pom.xml @@ -185,7 +185,7 @@ 2.7.1 4.2.18.Final 2.6.4 -2.4.8 +2.4.12 1.1.13.Final http://git-wip-us.apache.org/repos/asf/tomee/blob/3f731b9f/tomee/tomee-webaccess/src/test/groovy/org/apache/tomee/webaccess/test/units/LogTest.groovy -- diff --git a/tomee/tomee-webaccess/src/test/groovy/org/apache/tomee/webaccess/test/units/LogTest.groovy b/tomee/tomee-webaccess/src/test/groovy/org/apache/tomee/webaccess/test/units/LogTest.groovy index d483ee9..62f2538 100644 --- a/tomee/tomee-webaccess/src/test/groovy/org/apache/tomee/webaccess/test/units/LogTest.groovy +++ b/tomee/tomee-webaccess/src/test/groovy/org/apache/tomee/webaccess/test/units/LogTest.groovy @@ -21,6 +21,7 @@ package org.apache.tomee.webaccess.test.units import groovy.json.JsonSlurper import org.apache.http.client.methods.HttpGet import org.apache.http.impl.client.CloseableHttpClient +import org.apache.tomee.webaccess.data.dto.ListFilesResultDto import org.apache.tomee.webaccess.rest.ApplicationConfig import org.apache.tomee.webaccess.rest.Authentication import org.apache.tomee.webaccess.rest.Log @@ -53,7 +54,8 @@ class LogTest { Authentication, Log, LogServiceImpl, -LogTest +LogTest, +ListFilesResultDto ).addAsWebResource(new File('src/test/resources/test/context.xml'), 'META-INF/context.xml') } @@ -63,9 +65,8 @@ class LogTest { def json = new JsonSlurper().parseText( Utilities.getBody(client.execute(new HttpGet("${deploymentURL.toURI()}rest/log/list-files"))) ) -Assert.assertEquals( -new JsonSlurper().parseText('{"files":["catalina.2014-02-07.log","localhost_access_log.2014-02-07.txt"]}'), -json +Assert.assertTrue( +new JsonSlurper().parseText('{"files":["catalina.2014-02-07.log","localhost_access_log.2014-02-07.txt"]}').toString().contains(json.toString()) ) Utilities.getBody(client.execute(new HttpGet("${deploymentURL.toURI()}rest/keep-alive"))) })
tomee git commit: Revert checkstyle
Repository: tomee Updated Branches: refs/heads/master 5e0a66056 -> bd41439b5 Revert checkstyle Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/bd41439b Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/bd41439b Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/bd41439b Branch: refs/heads/master Commit: bd41439b5452565b4e056b34a9060e7c79161cd7 Parents: 5e0a660 Author: andygumbrecht Authored: Wed Sep 13 21:44:34 2017 +0200 Committer: andygumbrecht Committed: Wed Sep 13 21:44:34 2017 +0200 -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/tomee/blob/bd41439b/pom.xml -- diff --git a/pom.xml b/pom.xml index 11b5ca8..c3fa9c4 100644 --- a/pom.xml +++ b/pom.xml @@ -314,7 +314,7 @@ org.apache.maven.plugins maven-checkstyle-plugin - 2.17 + 2.13 org.codehaus.gmaven
tomee git commit: Have to support Java 7 with amq 5.14.5
Repository: tomee Updated Branches: refs/heads/master 1a84d2335 -> 5e0a66056 Have to support Java 7 with amq 5.14.5 Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/5e0a6605 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/5e0a6605 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/5e0a6605 Branch: refs/heads/master Commit: 5e0a66056b302b0f921e3b1daf517c155a8b3318 Parents: 1a84d23 Author: andygumbrecht Authored: Wed Sep 13 21:40:11 2017 +0200 Committer: andygumbrecht Committed: Wed Sep 13 21:40:11 2017 +0200 -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/tomee/blob/5e0a6605/pom.xml -- diff --git a/pom.xml b/pom.xml index 056e0cb..11b5ca8 100644 --- a/pom.xml +++ b/pom.xml @@ -166,7 +166,7 @@ 3.3 1.1.2 -5.15.0 +5.14.5 3.1.4.RELEASE 4.12 1.4.1
tomee git commit: Remove static
Repository: tomee Updated Branches: refs/heads/master ca641297d -> 1a84d2335 Remove static Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/1a84d233 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/1a84d233 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/1a84d233 Branch: refs/heads/master Commit: 1a84d2335173b5f2c1756a5e4cbd421df44f0d48 Parents: ca64129 Author: andygumbrecht Authored: Wed Sep 13 21:18:31 2017 +0200 Committer: andygumbrecht Committed: Wed Sep 13 21:18:31 2017 +0200 -- .../src/main/java/org/apache/openejb/observer/ObserverManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/tomee/blob/1a84d233/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 90b3f25..ebd16de 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 @@ -132,7 +132,7 @@ public class ObserverManager { } } -private static enum Phase { +private enum Phase { BEFORE, INVOKE, AFTER
buildbot failure in on tomee-trunk-ubuntu
The Buildbot has detected a new failure on builder tomee-trunk-ubuntu while building tomee. Full details are available at: https://ci.apache.org/builders/tomee-trunk-ubuntu/builds/831 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: bb_qnode5_ubuntu Build Reason: The SingleBranchScheduler scheduler named 'on-tomee-trunk-ubuntu-commit' triggered this build Build Source Stamp: [branch master] ca641297df3d61372bd78bf66dd407500c7776a2 Blamelist: andygumbrecht BUILD FAILED: failed check-formatting test Sincerely, -The Buildbot
[3/5] tomee git commit: Pull versions up to parent activemq 5.15.0 commons-logging 1.2 Remove BeanValidationAppendixInterceptor ref Prefer maven settings.xml values #TOMEE-2121 - properties
Pull versions up to parent activemq 5.15.0 commons-logging 1.2 Remove BeanValidationAppendixInterceptor ref Prefer maven settings.xml values #TOMEE-2121 - properties Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/57b6dd80 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/57b6dd80 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/57b6dd80 Branch: refs/heads/master Commit: 57b6dd805065451115ace93d0cd7d667deaf4572 Parents: 050f087 Author: andygumbrecht Authored: Wed Sep 13 20:31:12 2017 +0200 Committer: andygumbrecht Committed: Wed Sep 13 20:31:12 2017 +0200 -- .../openejb/loader/provisining/MavenResolver.java | 8 .../openejb/loader/provisining/MavenResolverTest.java | 12 ++-- 2 files changed, 14 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tomee/blob/57b6dd80/container/openejb-loader/src/main/java/org/apache/openejb/loader/provisining/MavenResolver.java -- diff --git a/container/openejb-loader/src/main/java/org/apache/openejb/loader/provisining/MavenResolver.java b/container/openejb-loader/src/main/java/org/apache/openejb/loader/provisining/MavenResolver.java index d5d1a9f..b335614 100644 --- a/container/openejb-loader/src/main/java/org/apache/openejb/loader/provisining/MavenResolver.java +++ b/container/openejb-loader/src/main/java/org/apache/openejb/loader/provisining/MavenResolver.java @@ -40,8 +40,8 @@ import java.util.Properties; import java.util.concurrent.atomic.AtomicReference; public class MavenResolver implements ArchiveResolver, ProvisioningResolverAware { -private static final String REPO1 = System.getProperty("openejb.deployer.repository", "http://repo1.maven.org/maven2/";); -private static final String APACHE_SNAPSHOT = System.getProperty("openejb.deployer.repository.snapshots", "https://repository.apache.org/snapshots/";); +private static final String REPO1 = "http://repo1.maven.org/maven2/";; +private static final String APACHE_SNAPSHOT = "https://repository.apache.org/snapshots/";; private static final String SNAPSHOT_SUFFIX = "-SNAPSHOT"; private static final AtomicReference BUILDER = new AtomicReference<>(null); @@ -96,9 +96,9 @@ public class MavenResolver implements ArchiveResolver, ProvisioningResolverAware public String quickMvnUrl(final String raw) throws MalformedURLException { final String base; if (raw.contains(SNAPSHOT_SUFFIX) && raw.contains("apache")) { -base = APACHE_SNAPSHOT; +base = System.getProperty("openejb.deployer.snapshot.repository", APACHE_SNAPSHOT); } else { -base = REPO1; +base = System.getProperty("openejb.deployer.repository", REPO1); } final StringBuilder builder = new StringBuilder(); http://git-wip-us.apache.org/repos/asf/tomee/blob/57b6dd80/container/openejb-loader/src/test/java/org/apache/openejb/loader/provisining/MavenResolverTest.java -- diff --git a/container/openejb-loader/src/test/java/org/apache/openejb/loader/provisining/MavenResolverTest.java b/container/openejb-loader/src/test/java/org/apache/openejb/loader/provisining/MavenResolverTest.java index 4d96b72..ce1b95e 100644 --- a/container/openejb-loader/src/test/java/org/apache/openejb/loader/provisining/MavenResolverTest.java +++ b/container/openejb-loader/src/test/java/org/apache/openejb/loader/provisining/MavenResolverTest.java @@ -42,7 +42,7 @@ public class MavenResolverTest { @Test public void local() throws Exception { -try(InputStream is = resolver.resolve("mvn:junit:junit:4.12:jar")) { +try (InputStream is = resolver.resolve("mvn:junit:junit:4.12:jar")) { Assert.assertNotNull(is); // use version of the pom to ensure it is local } } @@ -59,7 +59,7 @@ public class MavenResolverTest { return file; } -public void resolveCommon(String path) throws Exception { +public void resolveCommon(final String path) throws Exception { final File file = getAvailableFile(); final FileOutputStream to = new FileOutputStream(file); IO.copy(resolver.resolve(path), to); @@ -74,4 +74,12 @@ public class MavenResolverTest { resolveCommon("mvn:http://repo1.maven.org/maven2/!junit:junit:4.12:jar";); resolveCommon("mvn:http://repo1.maven.org/maven2/!junit:junit:LATEST:jar";); } + +@Test +public void overrideRepo() throws Exception { +System.setProperty("openejb.deployer.repository", "https://bob.smith/repo/";); +final String url = resolver.quickMvnUrl("!junit/junit/4.12/jar"); +assertEquals("https://b
[5/5] tomee git commit: Pull versions up to parent activemq 5.15.0 commons-logging 1.2 Remove BeanValidationAppendixInterceptor ref Prefer maven settings.xml values #TOMEE-2121 - properties Plugin ver
Pull versions up to parent activemq 5.15.0 commons-logging 1.2 Remove BeanValidationAppendixInterceptor ref Prefer maven settings.xml values #TOMEE-2121 - properties Plugin versions Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/ca641297 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/ca641297 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/ca641297 Branch: refs/heads/master Commit: ca641297df3d61372bd78bf66dd407500c7776a2 Parents: 2c40bc6 Author: andygumbrecht Authored: Wed Sep 13 20:56:29 2017 +0200 Committer: andygumbrecht Committed: Wed Sep 13 20:56:29 2017 +0200 -- arquillian/arquillian-openejb-embedded/pom.xml | 2 +- arquillian/arquillian-tomee-tests/pom.xml | 2 +- examples/webservice-ws-security/pom.xml| 2 +- .../src/main/resources/archetype-resources/pom.xml | 2 +- tomee/tomee-webaccess/pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tomee/blob/ca641297/arquillian/arquillian-openejb-embedded/pom.xml -- diff --git a/arquillian/arquillian-openejb-embedded/pom.xml b/arquillian/arquillian-openejb-embedded/pom.xml index 839e9aa..8b7f433 100644 --- a/arquillian/arquillian-openejb-embedded/pom.xml +++ b/arquillian/arquillian-openejb-embedded/pom.xml @@ -169,7 +169,7 @@ org.apache.maven.plugins maven-surefire-plugin -2.19.1 +2.20 http://git-wip-us.apache.org/repos/asf/tomee/blob/ca641297/arquillian/arquillian-tomee-tests/pom.xml -- diff --git a/arquillian/arquillian-tomee-tests/pom.xml b/arquillian/arquillian-tomee-tests/pom.xml index b0e0c48..693a0a3 100644 --- a/arquillian/arquillian-tomee-tests/pom.xml +++ b/arquillian/arquillian-tomee-tests/pom.xml @@ -462,7 +462,7 @@ org.apache.maven.plugins maven-surefire-plugin -2.19.1 +2.20 test-tomee-embedded http://git-wip-us.apache.org/repos/asf/tomee/blob/ca641297/examples/webservice-ws-security/pom.xml -- diff --git a/examples/webservice-ws-security/pom.xml b/examples/webservice-ws-security/pom.xml index b444580..b5d2abe 100644 --- a/examples/webservice-ws-security/pom.xml +++ b/examples/webservice-ws-security/pom.xml @@ -68,7 +68,7 @@ org.apache.maven.plugins maven-surefire-plugin - 2.18.1 + 2.20 http://git-wip-us.apache.org/repos/asf/tomee/blob/ca641297/maven/tomee-webapp-archetype/src/main/resources/archetype-resources/pom.xml -- diff --git a/maven/tomee-webapp-archetype/src/main/resources/archetype-resources/pom.xml b/maven/tomee-webapp-archetype/src/main/resources/archetype-resources/pom.xml index ccf4459..f0dd24f 100644 --- a/maven/tomee-webapp-archetype/src/main/resources/archetype-resources/pom.xml +++ b/maven/tomee-webapp-archetype/src/main/resources/archetype-resources/pom.xml @@ -91,7 +91,7 @@ org.apache.maven.plugins maven-surefire-plugin -2.19.1 +2.20 org.apache.maven.plugins http://git-wip-us.apache.org/repos/asf/tomee/blob/ca641297/tomee/tomee-webaccess/pom.xml -- diff --git a/tomee/tomee-webaccess/pom.xml b/tomee/tomee-webaccess/pom.xml index 2cc50c9..e08ae50 100644 --- a/tomee/tomee-webaccess/pom.xml +++ b/tomee/tomee-webaccess/pom.xml @@ -247,7 +247,7 @@ org.apache.maven.plugins maven-surefire-plugin -2.17 +2.20 ${project.basedir}/target/arquillian-tomee
[1/5] tomee git commit: Pull versions up to parent activemq 5.15.0 commons-logging 1.2 Remove BeanValidationAppendixInterceptor ref
Repository: tomee Updated Branches: refs/heads/master bd1bc848e -> ca641297d Pull versions up to parent activemq 5.15.0 commons-logging 1.2 Remove BeanValidationAppendixInterceptor ref Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/6998e215 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/6998e215 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/6998e215 Branch: refs/heads/master Commit: 6998e215055299ff45e20f24439eaa6f79e21a98 Parents: bd1bc84 Author: andygumbrecht Authored: Wed Sep 13 18:26:34 2017 +0200 Committer: andygumbrecht Committed: Wed Sep 13 18:26:34 2017 +0200 -- container/openejb-core/pom.xml| 8 +--- .../WebApp1/src/main/webapp/WEB-INF/ejb-jar.xml | 6 -- .../WebApp2/src/main/webapp/WEB-INF/ejb-jar.xml | 6 -- examples/bval-evaluation-redeployment/pom.xml | 18 +- pom.xml | 14 -- tck/cdi-embedded/pom.xml | 1 - tomee/tomee-embedded/pom.xml | 1 - tomee/tomee-webapp/pom.xml| 1 - 8 files changed, 26 insertions(+), 29 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tomee/blob/6998e215/container/openejb-core/pom.xml -- diff --git a/container/openejb-core/pom.xml b/container/openejb-core/pom.xml index 1d061f9..ceeeaef 100644 --- a/container/openejb-core/pom.xml +++ b/container/openejb-core/pom.xml @@ -236,9 +236,9 @@ **/Messages_hi_input.txt @@ -423,6 +423,7 @@ + ${project.groupId} @@ -701,7 +702,6 @@ org.fusesource.jansi jansi - 1.8 provided @@ -711,7 +711,9 @@ ${batchee.version} provided + + openejb.debug http://git-wip-us.apache.org/repos/asf/tomee/blob/6998e215/examples/bval-evaluation-redeployment/WebApp1/src/main/webapp/WEB-INF/ejb-jar.xml -- diff --git a/examples/bval-evaluation-redeployment/WebApp1/src/main/webapp/WEB-INF/ejb-jar.xml b/examples/bval-evaluation-redeployment/WebApp1/src/main/webapp/WEB-INF/ejb-jar.xml index bfafcc3..7b36835 100644 --- a/examples/bval-evaluation-redeployment/WebApp1/src/main/webapp/WEB-INF/ejb-jar.xml +++ b/examples/bval-evaluation-redeployment/WebApp1/src/main/webapp/WEB-INF/ejb-jar.xml @@ -21,10 +21,4 @@ version="3.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/ejb-jar_3_1.xsd";> - - - WebApp1Service - org.apache.openejb.bval.BeanValidationAppendixInterceptor - - http://git-wip-us.apache.org/repos/asf/tomee/blob/6998e215/examples/bval-evaluation-redeployment/WebApp2/src/main/webapp/WEB-INF/ejb-jar.xml -- diff --git a/examples/bval-evaluation-redeployment/WebApp2/src/main/webapp/WEB-INF/ejb-jar.xml b/examples/bval-evaluation-redeployment/WebApp2/src/main/webapp/WEB-INF/ejb-jar.xml index e1c9b17..7b36835 100644 --- a/examples/bval-evaluation-redeployment/WebApp2/src/main/webapp/WEB-INF/ejb-jar.xml +++ b/examples/bval-evaluation-redeployment/WebApp2/src/main/webapp/WEB-INF/ejb-jar.xml @@ -21,10 +21,4 @@ version="3.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/ejb-jar_3_1.xsd";> - - - WebApp2Service - org.apache.openejb.bval.BeanValidationAppendixInterceptor - - http://git-wip-us.apache.org/repos/asf/tomee/blob/6998e215/examples/bval-evaluation-redeployment/pom.xml -- diff --git a/examples/bval-evaluation-redeployment/pom.xml b/examples/bval-evaluation-redeployment/pom.xml index 1cc3474..f104476 100644 --- a/examples/bval-evaluation-redeployment/pom.xml +++ b/examples/bval-evaluation-redeployment/pom.xml @@ -44,7 +44,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.6.1 + 3.6.2 org.apache.maven.plugins @@ -54,7 +54,7 @@ org.apache.maven.plugins maven-dependency-plugin - 2.10 + 3.0.0 @@ -65,7 +65,7 @@ org.apache.tomee javaee-api -7.0 +7.0-1 provided @@ -88,23 +88,23 @@ com.fasterxml.jackson.jaxrs jackson-jaxrs-json-provider -2.4.0 +2
[2/5] tomee git commit: Pull versions up to parent activemq 5.15.0 commons-logging 1.2 Remove BeanValidationAppendixInterceptor ref Prefer maven settings.xml values #TOMEE-2121
Pull versions up to parent activemq 5.15.0 commons-logging 1.2 Remove BeanValidationAppendixInterceptor ref Prefer maven settings.xml values #TOMEE-2121 Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/050f0873 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/050f0873 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/050f0873 Branch: refs/heads/master Commit: 050f0873dd61fc3a6c9c4aa22674d86976e90c9b Parents: 6998e21 Author: andygumbrecht Authored: Wed Sep 13 20:20:39 2017 +0200 Committer: andygumbrecht Committed: Wed Sep 13 20:20:39 2017 +0200 -- .../loader/provisining/MavenResolver.java | 56 +--- .../loader/provisining/MavenResolverTest.java | 6 ++- 2 files changed, 43 insertions(+), 19 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tomee/blob/050f0873/container/openejb-loader/src/main/java/org/apache/openejb/loader/provisining/MavenResolver.java -- diff --git a/container/openejb-loader/src/main/java/org/apache/openejb/loader/provisining/MavenResolver.java b/container/openejb-loader/src/main/java/org/apache/openejb/loader/provisining/MavenResolver.java index 8f0a22a..d5d1a9f 100644 --- a/container/openejb-loader/src/main/java/org/apache/openejb/loader/provisining/MavenResolver.java +++ b/container/openejb-loader/src/main/java/org/apache/openejb/loader/provisining/MavenResolver.java @@ -35,14 +35,18 @@ import java.io.File; import java.io.InputStream; import java.net.MalformedURLException; import java.net.URL; +import java.util.Objects; import java.util.Properties; +import java.util.concurrent.atomic.AtomicReference; public class MavenResolver implements ArchiveResolver, ProvisioningResolverAware { -private static final String REPO1 = "http://repo1.maven.org/maven2/";; -private static final String APACHE_SNAPSHOT = "https://repository.apache.org/snapshots/";; +private static final String REPO1 = System.getProperty("openejb.deployer.repository", "http://repo1.maven.org/maven2/";); +private static final String APACHE_SNAPSHOT = System.getProperty("openejb.deployer.repository.snapshots", "https://repository.apache.org/snapshots/";); private static final String SNAPSHOT_SUFFIX = "-SNAPSHOT"; +private static final AtomicReference BUILDER = new AtomicReference<>(null); private static final SAXParserFactory FACTORY = SAXParserFactory.newInstance(); + static { FACTORY.setNamespaceAware(false); FACTORY.setValidating(false); @@ -86,7 +90,7 @@ public class MavenResolver implements ArchiveResolver, ProvisioningResolverAware if (resolver != null) { return resolver.resolveStream(repo1Url); } -return SystemInstance.get().getComponent(ProvisioningResolver.class).resolveStream(repo1Url); +return Objects.requireNonNull(SystemInstance.get().getComponent(ProvisioningResolver.class)).resolveStream(repo1Url); } public String quickMvnUrl(final String raw) throws MalformedURLException { @@ -120,6 +124,12 @@ public class MavenResolver implements ArchiveResolver, ProvisioningResolverAware return builder.toString(); } +/** + * Locate the .m2 repository + * First look for the settings.xml value, else assume it is in the .m2 directory + * + * @return String path to repository + */ private static String m2Home() { final Properties properties; @@ -130,23 +140,32 @@ public class MavenResolver implements ArchiveResolver, ProvisioningResolverAware } String home = ""; -File f = new File(properties.getProperty("openejb.m2.home", System.getProperty("user.home") + "/.m2/repository/")); +File f = new File(properties.getProperty("openejb.m2.settings", System.getProperty("user.home") + "/.m2/settings.xml")); if (f.exists()) { -home = f.getAbsolutePath(); -} else { -f = new File(properties.getProperty("openejb.m2.settings", System.getProperty("user.home") + "/.m2/settings.xml")); -if (f.exists()) { -try { +try { + +DocumentBuilder builder = BUILDER.get(); +if (null == builder) { final DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); -final DocumentBuilder builder = factory.newDocumentBuilder(); -final Document document = builder.parse(f); -final XPathFactory xpf = XPathFactory.newInstance(); -final XPath xp = xpf.newXPath(); -home = xp.evaluate("//settings/localRepository/text()", document.getDocumentElement()); -} catch
[4/5] tomee git commit: Pull versions up to parent activemq 5.15.0 commons-logging 1.2 Remove BeanValidationAppendixInterceptor ref Prefer maven settings.xml values #TOMEE-2121 - properties Plugin ver
Pull versions up to parent activemq 5.15.0 commons-logging 1.2 Remove BeanValidationAppendixInterceptor ref Prefer maven settings.xml values #TOMEE-2121 - properties Plugin versions Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/2c40bc6e Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/2c40bc6e Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/2c40bc6e Branch: refs/heads/master Commit: 2c40bc6ea76566326341c5074619987274704eb3 Parents: 57b6dd8 Author: andygumbrecht Authored: Wed Sep 13 20:46:59 2017 +0200 Committer: andygumbrecht Committed: Wed Sep 13 20:46:59 2017 +0200 -- pom.xml | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tomee/blob/2c40bc6e/pom.xml -- diff --git a/pom.xml b/pom.xml index a2facde..056e0cb 100644 --- a/pom.xml +++ b/pom.xml @@ -188,7 +188,7 @@ 2.4.8 -1.1.10.Final +1.1.13.Final 2.1.0 @@ -227,7 +227,7 @@ org.apache.maven.plugins maven-resources-plugin - 2.7 + 3.0.2 org.codehaus.mojo @@ -237,7 +237,7 @@ org.apache.maven.plugins maven-dependency-plugin - 2.10 + 3.0.1 org.apache.maven.plugins @@ -259,7 +259,7 @@ org.apache.maven.plugins maven-failsafe-plugin - 2.18.1 + 2.20 org.apache.geronimo.buildsupport @@ -314,7 +314,7 @@ org.apache.maven.plugins maven-checkstyle-plugin - 2.13 + 2.17 org.codehaus.gmaven @@ -334,12 +334,12 @@ org.apache.maven.plugins maven-surefire-plugin - 2.21-SNAPSHOT + 2.20 org.apache.maven.plugins maven-compiler-plugin - 3.6.1 + 3.6.2
[jira] [Updated] (TOMEE-2121) Add system property 'openejb.deployer.repository' to ProvisioningUtil
[ https://issues.apache.org/jira/browse/TOMEE-2121?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Andy Gumbrecht updated TOMEE-2121: -- Description: Add system property 'openejb.deployer.repository' to ProvisioningUtil to allow override of the hard coded repositories. 7.x has a new impl, but legacy still needs this. was: Add system property 'openejb.deployer.repository' to ProvisioningUtil to allow override of the hard coded repositories. 7.x has a new impl. > Add system property 'openejb.deployer.repository' to ProvisioningUtil > - > > Key: TOMEE-2121 > URL: https://issues.apache.org/jira/browse/TOMEE-2121 > Project: TomEE > Issue Type: New Feature >Affects Versions: 1.7.4, 7.0.4 >Reporter: Andy Gumbrecht >Assignee: Andy Gumbrecht >Priority: Minor > Fix For: 1.7.5 > > > Add system property 'openejb.deployer.repository' to ProvisioningUtil to > allow override of the hard coded repositories. > 7.x has a new impl, but legacy still needs this. -- This message was sent by Atlassian JIRA (v6.4.14#64029)
[jira] [Updated] (TOMEE-2121) Add system property 'openejb.deployer.repository' to ProvisioningUtil
[ https://issues.apache.org/jira/browse/TOMEE-2121?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Andy Gumbrecht updated TOMEE-2121: -- Affects Version/s: 7.0.4 > Add system property 'openejb.deployer.repository' to ProvisioningUtil > - > > Key: TOMEE-2121 > URL: https://issues.apache.org/jira/browse/TOMEE-2121 > Project: TomEE > Issue Type: New Feature >Affects Versions: 1.7.4, 7.0.4 >Reporter: Andy Gumbrecht >Assignee: Andy Gumbrecht >Priority: Minor > Fix For: 1.7.5 > > > Add system property 'openejb.deployer.repository' to ProvisioningUtil to > allow override of the hard coded repositories. > 7.x has a new impl. -- This message was sent by Atlassian JIRA (v6.4.14#64029)
buildbot success in on tomee-1.7.x-ubuntu
The Buildbot has detected a restored build on builder tomee-1.7.x-ubuntu while building tomee. Full details are available at: https://ci.apache.org/builders/tomee-1.7.x-ubuntu/builds/206 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: bb_qnode5_ubuntu Build Reason: The SingleBranchScheduler scheduler named 'on-tomee-1.7.x-ubuntu-commit' triggered this build Build Source Stamp: [branch tomee-1.7.x] 248ef7fd73e52a3253a9288daada960c52a23996 Blamelist: Jonathan Gallimore Build succeeded! Sincerely, -The Buildbot
tomee git commit: TOMEE-2124 potential fix for test breakages
Repository: tomee Updated Branches: refs/heads/tomee-1.7.x e156cf389 -> 248ef7fd7 TOMEE-2124 potential fix for test breakages Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/248ef7fd Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/248ef7fd Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/248ef7fd Branch: refs/heads/tomee-1.7.x Commit: 248ef7fd73e52a3253a9288daada960c52a23996 Parents: e156cf3 Author: Jonathan Gallimore Authored: Tue Sep 12 20:52:45 2017 +0100 Committer: Jonathan Gallimore Committed: Tue Sep 12 20:52:45 2017 +0100 -- .../tomee/catalina/OpenEJBContextConfig.java| 23 ++-- 1 file changed, 16 insertions(+), 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tomee/blob/248ef7fd/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java -- diff --git a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java index df375a1..75e49c9 100644 --- a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java +++ b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java @@ -554,14 +554,9 @@ public class OpenEJBContextConfig extends ContextConfig { final ProxyDirContext dirContext = ProxyDirContext.class.cast(Reflections.get(handler, "context")); final String host = String.class.cast(Reflections.get(dirContext, "hostName")); final String contextPath = String.class.cast(Reflections.get(dirContext, "contextPath")); -final Object context = Reflections.get(dirContext, "dirContext"); - -if (BaseDirContext.class.isInstance(context)) { -file = file.replace("/" + host + contextPath, BaseDirContext.class.cast(context).getDocBase()); -} else { -throw new OpenEJBRuntimeException("Context not supported: " + context); -} +final BaseDirContext context = getBaseDirContext(dirContext); +file = file.replace("/" + host + contextPath, BaseDirContext.class.cast(context).getDocBase()); currentUrlAsFile = new File(file); } else { throw new OpenEJBRuntimeException("can't find webapp [" + webAppInfo.contextRoot + "], connection is not a DirContextURLConnection " + connection); @@ -577,6 +572,20 @@ public class OpenEJBContextConfig extends ContextConfig { internalProcessAnnotations(currentUrlAsFile, webAppInfo, fragment); } +private BaseDirContext getBaseDirContext(final ProxyDirContext dirContext) { +final Object context = Reflections.get(dirContext, "dirContext"); + +if (BaseDirContext.class.isInstance(context)) { +return BaseDirContext.class.cast(context); +} + +if (ProxyDirContext.class.isInstance(context)) { +return getBaseDirContext(ProxyDirContext.class.cast(context)); +} + +throw new OpenEJBRuntimeException("Context not supported: " + context.toString()); +} + private void internalProcessAnnotations(final File currentUrlAsFile, final WebAppInfo webAppInfo, final WebXml fragment) { for (final ClassListInfo webAnnotated : webAppInfo.webAnnotatedClasses) { try {
[jira] [Commented] (TOMEE-2118) @RunAs does not work properly when it is used in servlet
[ https://issues.apache.org/jira/browse/TOMEE-2118?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16164568#comment-16164568 ] Jonathan Gallimore commented on TOMEE-2118: --- Thanks for checking in. I did successfully reproduce and was getting close to a fix. I'll pick it back up later today. > @RunAs does not work properly when it is used in servlet > > > Key: TOMEE-2118 > URL: https://issues.apache.org/jira/browse/TOMEE-2118 > Project: TomEE > Issue Type: Bug >Affects Versions: 7.0.3 >Reporter: Kaloyan Spiridonov >Assignee: Jonathan Gallimore > > I have the following scenario: > Servlet -> EjbOne -> EjbTwo > My expectation is that @RunAs of the servlet will be propagated to EjbOne > and the @RunAs of the EjbOne will be propagated to @EjbTwo. > But this does not happen - see the output below. When i remove @RunAs > annotation from the servlet the @RunAs of EjbOne is propagated correctly. > Actual output: > EjbOne (Before EjbTwo) expected role: Manager, isCallerInRole("Manager"): > false > EjbOne (Before EjbTwo) expected role: Manager, isCallerInRole("VP"): false > EjbOne (Before EjbTwo) expected role: Manager,) > isCallerInRole("Administrator"): false > EjbTwo expected role: VP, isCallerInRole("Manager"): false > EjbTwo expected role: VP, isCallerInRole("VP"): false > EjbTwo expected role: VP, isCallerInRole("Administrator"): false > EjbOne (After EjbTwo) expected role: Manager, isCallerInRole("Manager"): > false > EjbOne (After EjbTwo) expected role: Manager, isCallerInRole("VP"): false > EjbOne (After EjbTwo) expected role: Manager, > isCallerInRole("Administrator"): false > Expected output: > EjbOne (Before EjbTwo) expected role: Manager, isCallerInRole("Manager"): > true > EjbOne (Before EjbTwo) expected role: Manager, isCallerInRole("VP"): false > EjbOne (Before EjbTwo) expected role: Manager,) > isCallerInRole("Administrator"): false > EjbTwo expected role: VP, isCallerInRole("Manager"): false > EjbTwo expected role: VP, isCallerInRole("VP"): true > EjbTwo expected role: VP, isCallerInRole("Administrator"): false > EjbOne (After EjbTwo) expected role: Manager, isCallerInRole("Manager"): > true > EjbOne (After EjbTwo) expected role: Manager, isCallerInRole("VP"): false > EjbOne (After EjbTwo) expected role: Manager, > isCallerInRole("Administrator"): false > Here is the source of the application: https://github.com/kal0ian/Examples -- This message was sent by Atlassian JIRA (v6.4.14#64029)
[jira] [Commented] (TOMEE-2118) @RunAs does not work properly when it is used in servlet
[ https://issues.apache.org/jira/browse/TOMEE-2118?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16164565#comment-16164565 ] Kaloyan Spiridonov commented on TOMEE-2118: --- Hi, any update here ? > @RunAs does not work properly when it is used in servlet > > > Key: TOMEE-2118 > URL: https://issues.apache.org/jira/browse/TOMEE-2118 > Project: TomEE > Issue Type: Bug >Affects Versions: 7.0.3 >Reporter: Kaloyan Spiridonov >Assignee: Jonathan Gallimore > > I have the following scenario: > Servlet -> EjbOne -> EjbTwo > My expectation is that @RunAs of the servlet will be propagated to EjbOne > and the @RunAs of the EjbOne will be propagated to @EjbTwo. > But this does not happen - see the output below. When i remove @RunAs > annotation from the servlet the @RunAs of EjbOne is propagated correctly. > Actual output: > EjbOne (Before EjbTwo) expected role: Manager, isCallerInRole("Manager"): > false > EjbOne (Before EjbTwo) expected role: Manager, isCallerInRole("VP"): false > EjbOne (Before EjbTwo) expected role: Manager,) > isCallerInRole("Administrator"): false > EjbTwo expected role: VP, isCallerInRole("Manager"): false > EjbTwo expected role: VP, isCallerInRole("VP"): false > EjbTwo expected role: VP, isCallerInRole("Administrator"): false > EjbOne (After EjbTwo) expected role: Manager, isCallerInRole("Manager"): > false > EjbOne (After EjbTwo) expected role: Manager, isCallerInRole("VP"): false > EjbOne (After EjbTwo) expected role: Manager, > isCallerInRole("Administrator"): false > Expected output: > EjbOne (Before EjbTwo) expected role: Manager, isCallerInRole("Manager"): > true > EjbOne (Before EjbTwo) expected role: Manager, isCallerInRole("VP"): false > EjbOne (Before EjbTwo) expected role: Manager,) > isCallerInRole("Administrator"): false > EjbTwo expected role: VP, isCallerInRole("Manager"): false > EjbTwo expected role: VP, isCallerInRole("VP"): true > EjbTwo expected role: VP, isCallerInRole("Administrator"): false > EjbOne (After EjbTwo) expected role: Manager, isCallerInRole("Manager"): > true > EjbOne (After EjbTwo) expected role: Manager, isCallerInRole("VP"): false > EjbOne (After EjbTwo) expected role: Manager, > isCallerInRole("Administrator"): false > Here is the source of the application: https://github.com/kal0ian/Examples -- This message was sent by Atlassian JIRA (v6.4.14#64029)