You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by cs...@apache.org on 2017/08/29 10:27:00 UTC
aries-jax-rs-whiteboard git commit: Changing the port to see if tests
pass in CI
Repository: aries-jax-rs-whiteboard
Updated Branches:
refs/heads/master ee151a8bd -> ab76adb4e
Changing the port to see if tests pass in CI
Project: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/commit/ab76adb4
Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/ab76adb4
Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/ab76adb4
Branch: refs/heads/master
Commit: ab76adb4e05331350c629e01bf5e1e367d227bde
Parents: ee151a8
Author: Carlos Sierra <cs...@apache.org>
Authored: Tue Aug 29 12:26:34 2017 +0200
Committer: Carlos Sierra <cs...@apache.org>
Committed: Tue Aug 29 12:26:34 2017 +0200
----------------------------------------------------------------------
jax-rs.itests/itest.bndrun | 2 +-
jax-rs.itests/src/main/java/test/JaxrsTest.java | 44 ++++++++++----------
.../java/test/WhiteboardTargetFilterTest.java | 6 +--
3 files changed, 26 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/ab76adb4/jax-rs.itests/itest.bndrun
----------------------------------------------------------------------
diff --git a/jax-rs.itests/itest.bndrun b/jax-rs.itests/itest.bndrun
index 6ec43a0..193ab99 100644
--- a/jax-rs.itests/itest.bndrun
+++ b/jax-rs.itests/itest.bndrun
@@ -17,7 +17,7 @@
logback.configurationFile=file:${.}/logback.xml,\
osgi.console.enable.builtin=false, \
osgi.console=, \
- org.osgi.service.http.port=8080
+ org.osgi.service.http.port=65532
-runblacklist:\
osgi.identity;filter:='(osgi.identity=org.osgi.compendium)',\
osgi.identity;filter:='(osgi.identity=osgi.cmpn)'
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/ab76adb4/jax-rs.itests/src/main/java/test/JaxrsTest.java
----------------------------------------------------------------------
diff --git a/jax-rs.itests/src/main/java/test/JaxrsTest.java b/jax-rs.itests/src/main/java/test/JaxrsTest.java
index 0fd9e0a..6aa409a 100644
--- a/jax-rs.itests/src/main/java/test/JaxrsTest.java
+++ b/jax-rs.itests/src/main/java/test/JaxrsTest.java
@@ -108,7 +108,7 @@ public class JaxrsTest extends TestHelper {
Client client = createClient();
WebTarget webTarget = client.
- target("http://localhost:8080").
+ target("http://localhost:65532").
path("/test-application");
Response response = webTarget.request().get();
@@ -149,7 +149,7 @@ public class JaxrsTest extends TestHelper {
Client client = createClient();
WebTarget webTarget = client.
- target("http://localhost:8080").
+ target("http://localhost:65532").
path("/test-application");
assertEquals(404, webTarget.request().get().getStatus());
@@ -167,7 +167,7 @@ public class JaxrsTest extends TestHelper {
Client client = createClient();
WebTarget webTarget = client.
- target("http://localhost:8080").
+ target("http://localhost:65532").
path("test-application");
ServiceRegistration<?> serviceRegistration2;
@@ -205,7 +205,7 @@ public class JaxrsTest extends TestHelper {
Client client = createClient();
WebTarget webTarget = client.
- target("http://localhost:8080").
+ target("http://localhost:65532").
path("/test-application").
path("extended");
@@ -227,7 +227,7 @@ public class JaxrsTest extends TestHelper {
Client client = createClient();
WebTarget webTarget = client.
- target("http://localhost:8080").
+ target("http://localhost:65532").
path("/test-application").
path("extended");
@@ -264,7 +264,7 @@ public class JaxrsTest extends TestHelper {
Client client = createClient();
WebTarget webTarget = client.
- target("http://localhost:8080").
+ target("http://localhost:65532").
path("test-application");
JaxRSServiceRuntime runtime = getJaxRSServiceRuntime();
@@ -317,7 +317,7 @@ public class JaxrsTest extends TestHelper {
Client client = createClient();
WebTarget webTarget = client.
- target("http://localhost:8080").
+ target("http://localhost:65532").
path("/test-application");
registerApplication(new TestApplication());
@@ -340,7 +340,7 @@ public class JaxrsTest extends TestHelper {
Client client = createClient();
WebTarget webTarget = client.
- target("http://localhost:8080").
+ target("http://localhost:65532").
path("/test-application");
registerApplication(new TestApplication());
@@ -385,7 +385,7 @@ public class JaxrsTest extends TestHelper {
Client client = createClient();
WebTarget webTarget = client.
- target("http://localhost:8080").
+ target("http://localhost:65532").
path("/test-application");
JaxRSServiceRuntime runtime = getJaxRSServiceRuntime();
@@ -536,7 +536,7 @@ public class JaxrsTest extends TestHelper {
Client client = createClient();
WebTarget webTarget = client.
- target("http://localhost:8080").
+ target("http://localhost:65532").
path("conflict");
registerAddon(new TestAddonConflict());
@@ -572,7 +572,7 @@ public class JaxrsTest extends TestHelper {
Client client = createClient();
WebTarget webTarget = client.
- target("http://localhost:8080").
+ target("http://localhost:65532").
path("test-application");
JaxRSServiceRuntime runtime = getJaxRSServiceRuntime();
@@ -624,7 +624,7 @@ public class JaxrsTest extends TestHelper {
Client client = createClient();
WebTarget webTarget = client.
- target("http://localhost:8080").
+ target("http://localhost:65532").
path("test-application");
JaxRSServiceRuntime runtime = getJaxRSServiceRuntime();
@@ -697,7 +697,7 @@ public class JaxrsTest extends TestHelper {
Client client = createClient();
WebTarget webTarget = client.
- target("http://localhost:8080").
+ target("http://localhost:65532").
path("test");
JaxRSServiceRuntime runtime = getJaxRSServiceRuntime();
@@ -718,7 +718,7 @@ public class JaxrsTest extends TestHelper {
Client client = createClient();
WebTarget webTarget = client.
- target("http://localhost:8080").
+ target("http://localhost:65532").
path("/test-addon-lifecycle");
registerAddonLifecycle(false, JAX_RS_RESOURCE, "true");
@@ -735,7 +735,7 @@ public class JaxrsTest extends TestHelper {
Client client = createClient();
WebTarget webTarget = client.
- target("http://localhost:8080").
+ target("http://localhost:65532").
path("test");
Runnable testCase = () -> {
@@ -767,7 +767,7 @@ public class JaxrsTest extends TestHelper {
Client client = createClient();
WebTarget webTarget = client.
- target("http://localhost:8080").
+ target("http://localhost:65532").
path("/test-addon-lifecycle");
registerAddonLifecycle(true, JAX_RS_RESOURCE, "true");
@@ -786,7 +786,7 @@ public class JaxrsTest extends TestHelper {
Client client = createClient();
WebTarget webTarget = client.
- target("http://localhost:8080").
+ target("http://localhost:65532").
path("test");
JaxRSServiceRuntime runtime = getJaxRSServiceRuntime();
@@ -885,7 +885,7 @@ public class JaxrsTest extends TestHelper {
Client client = createClient();
WebTarget webTarget = client.
- target("http://localhost:8080").
+ target("http://localhost:65532").
path("test");
JaxRSServiceRuntime runtime = getJaxRSServiceRuntime();
@@ -922,7 +922,7 @@ public class JaxrsTest extends TestHelper {
Client client = createClient();
WebTarget webTarget = client.
- target("http://localhost:8080").
+ target("http://localhost:65532").
path("test");
JaxRSServiceRuntime runtime = getJaxRSServiceRuntime();
@@ -974,7 +974,7 @@ public class JaxrsTest extends TestHelper {
Client client = createClient();
WebTarget webTarget = client.
- target("http://localhost:8080").
+ target("http://localhost:65532").
path("test-application");
registerApplication(new TestApplicationWithException());
@@ -996,7 +996,7 @@ public class JaxrsTest extends TestHelper {
Client client = createClient();
WebTarget webTarget = client.
- target("http://localhost:8080").
+ target("http://localhost:65532").
path("test");
JaxRSServiceRuntime runtime = getJaxRSServiceRuntime();
@@ -1045,7 +1045,7 @@ public class JaxrsTest extends TestHelper {
Client client = createClient();
WebTarget webTarget = client.
- target("http://localhost:8080").
+ target("http://localhost:65532").
path("test");
registerAddon(new TestAddon());
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/ab76adb4/jax-rs.itests/src/main/java/test/WhiteboardTargetFilterTest.java
----------------------------------------------------------------------
diff --git a/jax-rs.itests/src/main/java/test/WhiteboardTargetFilterTest.java b/jax-rs.itests/src/main/java/test/WhiteboardTargetFilterTest.java
index c3ef3de..acc3e6e 100644
--- a/jax-rs.itests/src/main/java/test/WhiteboardTargetFilterTest.java
+++ b/jax-rs.itests/src/main/java/test/WhiteboardTargetFilterTest.java
@@ -42,7 +42,7 @@ public class WhiteboardTargetFilterTest extends TestHelper {
Client client = createClient();
WebTarget webTarget = client.
- target("http://localhost:8080").
+ target("http://localhost:65532").
path("extended");
assertEquals(
@@ -71,7 +71,7 @@ public class WhiteboardTargetFilterTest extends TestHelper {
Client client = createClient();
WebTarget webTarget = client.
- target("http://localhost:8080").
+ target("http://localhost:65532").
path("extended");
assertEquals(
@@ -100,7 +100,7 @@ public class WhiteboardTargetFilterTest extends TestHelper {
Client client = createClient();
WebTarget webTarget = client.
- target("http://localhost:8080").
+ target("http://localhost:65532").
path("extended");
assertEquals(