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 2014/12/30 18:29:37 UTC
[1/2] tomee git commit: backporting http as alias for httpejbd with
@randomPort
Repository: tomee
Updated Branches:
refs/heads/tomee-1.7.x c5ecd884c -> 823723f27
backporting http as alias for httpejbd with @randomPort
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/a7bf7fcb
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/a7bf7fcb
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/a7bf7fcb
Branch: refs/heads/tomee-1.7.x
Commit: a7bf7fcba1d2422bdb51f8149d995db8f472c27f
Parents: c5ecd88
Author: Romain Manni-Bucau <rm...@apache.org>
Authored: Tue Dec 30 18:23:47 2014 +0100
Committer: Romain Manni-Bucau <rm...@apache.org>
Committed: Tue Dec 30 18:23:47 2014 +0100
----------------------------------------------------------------------
.../java/org/apache/openejb/testing/ApplicationComposers.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/a7bf7fcb/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java b/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java
index 5e1863f..fb0808f 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java
@@ -427,7 +427,8 @@ public final class ApplicationComposers {
field.setAccessible(true);
}
- final String key = field.getAnnotation(RandomPort.class).value() + ".port";
+ final String service = field.getAnnotation(RandomPort.class).value();
+ final String key = "http".equals(service) ? "httpejbd" : service + ".port";
final String existing = SystemInstance.get().getProperty(key);
final int random;
if (existing == null) {
[2/2] tomee git commit: missing port suffix
Posted by rm...@apache.org.
missing port suffix
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/823723f2
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/823723f2
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/823723f2
Branch: refs/heads/tomee-1.7.x
Commit: 823723f272f177f1a277833ac446bb924db22cfa
Parents: a7bf7fc
Author: Romain Manni-Bucau <rm...@apache.org>
Authored: Tue Dec 30 18:29:24 2014 +0100
Committer: Romain Manni-Bucau <rm...@apache.org>
Committed: Tue Dec 30 18:29:24 2014 +0100
----------------------------------------------------------------------
.../main/java/org/apache/openejb/testing/ApplicationComposers.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/823723f2/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java b/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java
index fb0808f..5ae9594 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java
@@ -428,7 +428,7 @@ public final class ApplicationComposers {
}
final String service = field.getAnnotation(RandomPort.class).value();
- final String key = "http".equals(service) ? "httpejbd" : service + ".port";
+ final String key = ("http".equals(service) ? "httpejbd" : service) + ".port";
final String existing = SystemInstance.get().getProperty(key);
final int random;
if (existing == null) {