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 2016/11/30 18:20:29 UTC
[1/8] aries-jax-rs-whiteboard git commit: Added test dependencies
Repository: aries-jax-rs-whiteboard
Updated Branches:
refs/heads/master c918ae8af -> e0b4a8665
Added test dependencies
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/5c0030b6
Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/5c0030b6
Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/5c0030b6
Branch: refs/heads/master
Commit: 5c0030b62e0fd80e9274756c94e215fb6ba57054
Parents: c918ae8
Author: Carlos Sierra <cs...@apache.org>
Authored: Wed Nov 30 19:09:27 2016 +0100
Committer: Carlos Sierra <cs...@apache.org>
Committed: Wed Nov 30 19:09:27 2016 +0100
----------------------------------------------------------------------
jax-rs.itests-run/itest.bndrun | 4 ++++
jax-rs.itests-run/pom.xml | 5 +++++
jax-rs.itests/pom.xml | 5 +++++
3 files changed, 14 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/5c0030b6/jax-rs.itests-run/itest.bndrun
----------------------------------------------------------------------
diff --git a/jax-rs.itests-run/itest.bndrun b/jax-rs.itests-run/itest.bndrun
index 12355f5..c13d8c2 100644
--- a/jax-rs.itests-run/itest.bndrun
+++ b/jax-rs.itests-run/itest.bndrun
@@ -33,6 +33,10 @@
org.apache.aries.jax.rs.itests; version='[0.0.1,0.0.2)',\
org.apache.aries.jax.rs.log4j-configuration; version='[0.0.1,0.0.2)',\
org.apache.aries.jax.rs.whiteboard; version='[0.0.1,0.0.2)',\
+ org.apache.cxf.cxf-core; version='[3.1.7,3.1.8)',\
+ org.apache.cxf.cxf-rt-transports-http; version='[3.1.7,3.1.8)',\
+ org.apache.cxf.cxf-rt-frontend-jaxrs; version='[3.1.7,3.1.8)',\
+ org.apache.cxf.cxf-rt-rs-client; version='[3.1.7,3.1.8)',\
org.apache.felix.bundlerepository; version='[1.6.0,1.6.1)',\
org.apache.felix.configadmin; version='[1.8.8,1.8.9)',\
org.apache.felix.http.api; version='[3.0.0,3.0.1)',\
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/5c0030b6/jax-rs.itests-run/pom.xml
----------------------------------------------------------------------
diff --git a/jax-rs.itests-run/pom.xml b/jax-rs.itests-run/pom.xml
index 09d6f48..19e75e8 100644
--- a/jax-rs.itests-run/pom.xml
+++ b/jax-rs.itests-run/pom.xml
@@ -74,6 +74,11 @@
<version>0.0.1-SNAPSHOT</version>
</dependency>
<dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-rs-client</artifactId>
+ <version>${cxf.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.http.jetty</artifactId>
<version>3.4.0</version>
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/5c0030b6/jax-rs.itests/pom.xml
----------------------------------------------------------------------
diff --git a/jax-rs.itests/pom.xml b/jax-rs.itests/pom.xml
index 02a468f..59e4b50 100644
--- a/jax-rs.itests/pom.xml
+++ b/jax-rs.itests/pom.xml
@@ -39,6 +39,11 @@
<version>2.0.1</version>
</dependency>
<dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-rs-client</artifactId>
+ <version>${cxf.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<version>5.0.0</version>
[4/8] aries-jax-rs-whiteboard git commit: Create client
Posted by cs...@apache.org.
Create client
Maybe we should use spi-fly for this?
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/50a652a2
Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/50a652a2
Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/50a652a2
Branch: refs/heads/master
Commit: 50a652a22374c25e9c817c28181ae693e1e287bb
Parents: 150b1e1
Author: Carlos Sierra <cs...@apache.org>
Authored: Wed Nov 30 19:13:50 2016 +0100
Committer: Carlos Sierra <cs...@apache.org>
Committed: Wed Nov 30 19:13:50 2016 +0100
----------------------------------------------------------------------
jax-rs.itests/src/main/java/test/JaxrsTest.java | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/50a652a2/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 0570e17..04dcfe9 100644
--- a/jax-rs.itests/src/main/java/test/JaxrsTest.java
+++ b/jax-rs.itests/src/main/java/test/JaxrsTest.java
@@ -67,4 +67,21 @@ public class JaxrsTest extends TestCase {
}
}
+
+ private Client createClient() {
+ Thread thread = Thread.currentThread();
+
+ ClassLoader contextClassLoader = thread.getContextClassLoader();
+
+ try {
+ thread.setContextClassLoader(
+ org.apache.cxf.jaxrs.client.Client.class.getClassLoader());
+
+ return ClientBuilder.newClient();
+ }
+ finally {
+ thread.setContextClassLoader(contextClassLoader);
+ }
+ }
+
}
[5/8] aries-jax-rs-whiteboard git commit: Taking for granted we are
doing everything synchronously for the moment
Posted by cs...@apache.org.
Taking for granted we are doing everything synchronously for the moment
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/2846c129
Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/2846c129
Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/2846c129
Branch: refs/heads/master
Commit: 2846c1299be62732d5e5e071c3ac247598a3b508
Parents: 50a652a
Author: Carlos Sierra <cs...@apache.org>
Authored: Wed Nov 30 19:15:15 2016 +0100
Committer: Carlos Sierra <cs...@apache.org>
Committed: Wed Nov 30 19:15:15 2016 +0100
----------------------------------------------------------------------
jax-rs.itests/src/main/java/test/JaxrsTest.java | 13 -------------
1 file changed, 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/2846c129/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 04dcfe9..654bf59 100644
--- a/jax-rs.itests/src/main/java/test/JaxrsTest.java
+++ b/jax-rs.itests/src/main/java/test/JaxrsTest.java
@@ -46,19 +46,6 @@ public class JaxrsTest extends TestCase {
serviceRegistration = bundleContext.registerService(
Object.class, testAddon, properties);
- // TODO this availability should be checked through a jaxrs runtime service
-
- Filter filter = bundleContext.createFilter("(CXF_ENDPOINT_ADDRESS=/test-addon)");
-
- ServiceTracker<?, ?> st = new ServiceTracker<>(bundleContext, filter, null);
-
- st.open();
-
- if (st.waitForService(5000) == null) {
- fail();
- }
-
- // TODO add http client to connect to the endpoint
}
finally {
if (serviceRegistration != null) {
[7/8] aries-jax-rs-whiteboard git commit: Added test cases
Posted by cs...@apache.org.
Added test cases
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/4aef64fa
Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/4aef64fa
Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/4aef64fa
Branch: refs/heads/master
Commit: 4aef64fac464b3ea10ca6bb445025140e9f49f08
Parents: 745fee3
Author: Carlos Sierra <cs...@apache.org>
Authored: Wed Nov 30 19:19:07 2016 +0100
Committer: Carlos Sierra <cs...@apache.org>
Committed: Wed Nov 30 19:19:07 2016 +0100
----------------------------------------------------------------------
jax-rs.itests/src/main/java/test/JaxrsTest.java | 215 ++++++++++++++++++-
1 file changed, 210 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/4aef64fa/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 bc7d71e..d52d523 100644
--- a/jax-rs.itests/src/main/java/test/JaxrsTest.java
+++ b/jax-rs.itests/src/main/java/test/JaxrsTest.java
@@ -22,36 +22,241 @@ import java.util.Hashtable;
import org.junit.Test;
import org.osgi.framework.BundleContext;
-import org.osgi.framework.Filter;
import org.osgi.framework.FrameworkUtil;
import org.osgi.framework.ServiceRegistration;
-import org.osgi.util.tracker.ServiceTracker;
import test.types.TestAddon;
+import test.types.TestApplication;
+import test.types.TestFilter;
+
+import javax.ws.rs.client.Client;
+import javax.ws.rs.client.ClientBuilder;
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.Application;
+import javax.ws.rs.core.Response;
+
+import static org.junit.Assert.assertEquals;
+
public class JaxrsTest {
static BundleContext bundleContext = FrameworkUtil.getBundle(
JaxrsTest.class).getBundleContext();
-
- @Test
- public void testEndPoint() throws Exception {
+
+ @Test
+ public void testApplication() {
+ ServiceRegistration<?> serviceRegistration = null;
+
+ try {
+ TestApplication testApplication = new TestApplication();
+
+ Dictionary<String, Object> properties = new Hashtable<>();
+
+ properties.put(
+ "osgi.jaxrs.application.base", "/test-application");
+
+ serviceRegistration = bundleContext.registerService(
+ Application.class, testApplication, properties);
+
+ Client client = createClient();
+
+ WebTarget webTarget = client.
+ target("http://localhost:8080").
+ path("/test-application");
+
+ Response response = webTarget.request().get();
+
+ assertEquals("Hello application",
+ response.readEntity(String.class));
+ }
+ finally {
+ if (serviceRegistration != null) {
+ serviceRegistration.unregister();
+ }
+ }
+ }
+
+ @Test
+ public void testApplicationEndpointExtension() {
+ ServiceRegistration<?> applicationRegistration = null;
+
+ ServiceRegistration<?> serviceRegistration = null;
+
+ try {
+ TestApplication testApplication = new TestApplication();
+
+ Dictionary<String, Object> properties = new Hashtable<>();
+
+ properties.put(
+ "osgi.jaxrs.application.base", "/test-application");
+
+ applicationRegistration = bundleContext.registerService(
+ Application.class, testApplication, properties);
+
+ TestAddon testAddon = new TestAddon();
+
+ properties = new Hashtable<>();
+
+ properties.put(
+ "jaxrs.application.select",
+ "(osgi.jaxrs.application.base=/test-application)");
+
+ serviceRegistration = bundleContext.registerService(
+ Object.class, testAddon, properties);
+
+ Client client = createClient();
+
+ WebTarget webTarget = client.
+ target("http://localhost:8080").
+ path("/test-application").
+ path("extended");
+
+ Response response = webTarget.request().get();
+
+ assertEquals("Hello extended",
+ response.readEntity(String.class));
+ }
+ finally {
+ if (applicationRegistration != null) {
+ applicationRegistration.unregister();
+ }
+ if (serviceRegistration != null) {
+ serviceRegistration.unregister();
+ }
+ }
+ }
+
+ @Test
+ public void testApplicationProviderExtension() {
+ ServiceRegistration<?> applicationRegistration = null;
+
+ ServiceRegistration<?> filterRegistration = null;
+
+ try {
+ TestApplication testApplication = new TestApplication();
+
+ Dictionary<String, Object> properties = new Hashtable<>();
+
+ properties.put(
+ "osgi.jaxrs.application.base", "/test-application");
+
+ applicationRegistration = bundleContext.registerService(
+ Application.class, testApplication, properties);
+
+ TestFilter testFilter = new TestFilter();
+
+ properties = new Hashtable<>();
+
+ properties.put(
+ "jaxrs.application.select",
+ "(osgi.jaxrs.application.base=/test-application)");
+
+ filterRegistration = bundleContext.registerService(
+ Object.class, testFilter, properties);
+
+ Client client = createClient();
+
+ WebTarget webTarget = client.
+ target("http://localhost:8080").
+ path("/test-application");
+ Response response = webTarget.request().get();
+
+ assertEquals(
+ "Hello application", response.readEntity(String.class));
+
+ assertEquals(response.getHeaders().getFirst("Filtered"), "true");
+ }
+ finally {
+ if (applicationRegistration != null) {
+ applicationRegistration.unregister();
+ }
+ if (filterRegistration != null) {
+ filterRegistration.unregister();
+ }
+ }
+ }
+
+ @Test
+ public void testStandaloneEndPoint() {
+ ServiceRegistration<?> serviceRegistration = null;
+
+ try {
+ TestAddon testAddon = new TestAddon();
+
+ Dictionary<String, Object> properties = new Hashtable<>();
+
+ properties.put("osgi.jaxrs.resource.base", "/test-addon");
+
+ serviceRegistration = bundleContext.registerService(
+ Object.class, testAddon, properties);
+
+ Client client = createClient();
+
+ WebTarget webTarget = client.
+ target("http://localhost:8080").
+ path("/test-addon").
+ path("test");
+
+ Response response = webTarget.request().get();
+
+ assertEquals(
+ "This should say hello", "Hello test",
+ response.readEntity(String.class));
+ }
+ finally {
+ if (serviceRegistration != null) {
+ serviceRegistration.unregister();
+ }
+ }
+ }
+
+ @Test
+ public void testStandaloneFilter() {
+ ServiceRegistration<?> filterRegistration = null;
+
ServiceRegistration<?> serviceRegistration = null;
try {
TestAddon testAddon = new TestAddon();
Dictionary<String, Object> properties = new Hashtable<>();
+
properties.put("osgi.jaxrs.resource.base", "/test-addon");
serviceRegistration = bundleContext.registerService(
Object.class, testAddon, properties);
+ TestFilter testFilter = new TestFilter();
+
+ properties = new Hashtable<>();
+
+ properties.put("osgi.jaxrs.filter.base", "/test-addon");
+
+ filterRegistration = bundleContext.registerService(
+ Object.class, testFilter, properties);
+
+ Client client = createClient();
+
+ WebTarget webTarget = client.
+ target("http://localhost:8080").
+ path("/test-addon").
+ path("test");
+
+ Response response = webTarget.request().get();
+
+ assertEquals(
+ "This should say hello", "Hello test",
+ response.readEntity(String.class));
+
+ assertEquals(response.getHeaders().getFirst("Filtered"), "true");
}
finally {
if (serviceRegistration != null) {
serviceRegistration.unregister();
}
+ if (filterRegistration != null) {
+ filterRegistration.unregister();
+ }
}
}
[3/8] aries-jax-rs-whiteboard git commit: Changes to make tests easier
Posted by cs...@apache.org.
Changes to make tests easier
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/150b1e17
Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/150b1e17
Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/150b1e17
Branch: refs/heads/master
Commit: 150b1e17db154ec149b7cd6e59cce7b74571ddce
Parents: f9169a5
Author: Carlos Sierra <cs...@apache.org>
Authored: Wed Nov 30 19:12:04 2016 +0100
Committer: Carlos Sierra <cs...@apache.org>
Committed: Wed Nov 30 19:12:04 2016 +0100
----------------------------------------------------------------------
.../src/main/java/test/types/TestApplication.java | 2 +-
.../src/main/java/test/types/TestFilter.java | 16 +++++++++++-----
2 files changed, 12 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/150b1e17/jax-rs.itests/src/main/java/test/types/TestApplication.java
----------------------------------------------------------------------
diff --git a/jax-rs.itests/src/main/java/test/types/TestApplication.java b/jax-rs.itests/src/main/java/test/types/TestApplication.java
index 42fbbe3..b58e1e0 100644
--- a/jax-rs.itests/src/main/java/test/types/TestApplication.java
+++ b/jax-rs.itests/src/main/java/test/types/TestApplication.java
@@ -34,7 +34,7 @@ public class TestApplication extends Application {
@GET
@Produces("text/plain")
public String sayHello() {
- return "Hello world";
+ return "Hello application";
}
}
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/150b1e17/jax-rs.itests/src/main/java/test/types/TestFilter.java
----------------------------------------------------------------------
diff --git a/jax-rs.itests/src/main/java/test/types/TestFilter.java b/jax-rs.itests/src/main/java/test/types/TestFilter.java
index 96213e2..1757ca3 100644
--- a/jax-rs.itests/src/main/java/test/types/TestFilter.java
+++ b/jax-rs.itests/src/main/java/test/types/TestFilter.java
@@ -18,19 +18,25 @@
package test.types;
import java.io.IOException;
+import java.util.Collections;
import javax.ws.rs.container.ContainerRequestContext;
-import javax.ws.rs.container.ContainerRequestFilter;
+import javax.ws.rs.container.ContainerResponseContext;
+import javax.ws.rs.container.ContainerResponseFilter;
+import javax.ws.rs.core.MultivaluedMap;
import javax.ws.rs.ext.Provider;
@Provider
-public class TestFilter implements ContainerRequestFilter {
+public class TestFilter implements ContainerResponseFilter {
@Override
- public void filter(ContainerRequestContext requestContext)
- throws IOException {
+ public void filter(
+ ContainerRequestContext requestContext,
+ ContainerResponseContext responseContext) throws IOException {
- System.out.println("FILTERED!");
+ MultivaluedMap<String, Object> headers = responseContext.getHeaders();
+
+ headers.put("Filtered", Collections.singletonList("true"));
}
}
[8/8] aries-jax-rs-whiteboard git commit: Update .gitignore
Posted by cs...@apache.org.
Update .gitignore
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/e0b4a866
Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/e0b4a866
Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/e0b4a866
Branch: refs/heads/master
Commit: e0b4a86654dc00068a80a4554ff2d0767937344e
Parents: 4aef64f
Author: Carlos Sierra <cs...@apache.org>
Authored: Wed Nov 30 19:19:40 2016 +0100
Committer: Carlos Sierra <cs...@apache.org>
Committed: Wed Nov 30 19:19:40 2016 +0100
----------------------------------------------------------------------
.gitignore | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/e0b4a866/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 99b9097..feb04fe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
.project
.settings
+.idea
*.iml
*/.classpath
*/.project
[6/8] aries-jax-rs-whiteboard git commit: Use annotations in tests
Posted by cs...@apache.org.
Use annotations in tests
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/745fee37
Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/745fee37
Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/745fee37
Branch: refs/heads/master
Commit: 745fee37dc9e070587402efe451b496739231639
Parents: 2846c12
Author: Carlos Sierra <cs...@apache.org>
Authored: Wed Nov 30 19:17:09 2016 +0100
Committer: Carlos Sierra <cs...@apache.org>
Committed: Wed Nov 30 19:17:09 2016 +0100
----------------------------------------------------------------------
jax-rs.itests/src/main/java/test/JaxrsTest.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/745fee37/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 654bf59..bc7d71e 100644
--- a/jax-rs.itests/src/main/java/test/JaxrsTest.java
+++ b/jax-rs.itests/src/main/java/test/JaxrsTest.java
@@ -20,20 +20,21 @@ package test;
import java.util.Dictionary;
import java.util.Hashtable;
+import org.junit.Test;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Filter;
import org.osgi.framework.FrameworkUtil;
import org.osgi.framework.ServiceRegistration;
import org.osgi.util.tracker.ServiceTracker;
-import junit.framework.TestCase;
import test.types.TestAddon;
-public class JaxrsTest extends TestCase {
+public class JaxrsTest {
static BundleContext bundleContext = FrameworkUtil.getBundle(
JaxrsTest.class).getBundleContext();
-
+
+ @Test
public void testEndPoint() throws Exception {
ServiceRegistration<?> serviceRegistration = null;
[2/8] aries-jax-rs-whiteboard git commit: Code cleaning
Posted by cs...@apache.org.
Code cleaning
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/f9169a55
Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/f9169a55
Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/f9169a55
Branch: refs/heads/master
Commit: f9169a55f8896b4d49799007c5b92c2b075f84ed
Parents: 5c0030b
Author: Carlos Sierra <cs...@apache.org>
Authored: Wed Nov 30 19:11:43 2016 +0100
Committer: Carlos Sierra <cs...@apache.org>
Committed: Wed Nov 30 19:11:43 2016 +0100
----------------------------------------------------------------------
jax-rs.itests/src/main/java/test/types/TestAddon.java | 12 ------------
.../src/main/java/test/types/TestApplication.java | 1 -
jax-rs.itests/src/main/java/test/types/TestFilter.java | 4 ----
3 files changed, 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/f9169a55/jax-rs.itests/src/main/java/test/types/TestAddon.java
----------------------------------------------------------------------
diff --git a/jax-rs.itests/src/main/java/test/types/TestAddon.java b/jax-rs.itests/src/main/java/test/types/TestAddon.java
index 0811b8b..7310248 100644
--- a/jax-rs.itests/src/main/java/test/types/TestAddon.java
+++ b/jax-rs.itests/src/main/java/test/types/TestAddon.java
@@ -17,14 +17,10 @@
package test.types;
-import javax.annotation.PostConstruct;
import javax.ws.rs.GET;
import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.UriInfo;
-//property = "osgi.jaxrs.resource.base=/test-addon",
public class TestAddon {
@GET
@@ -33,12 +29,4 @@ public class TestAddon {
return "Hello " + name;
}
- @PostConstruct
- public void init() {
- System.out.println("URIINFO: " + _uriInfo);
- }
-
- @Context
- UriInfo _uriInfo;
-
}
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/f9169a55/jax-rs.itests/src/main/java/test/types/TestApplication.java
----------------------------------------------------------------------
diff --git a/jax-rs.itests/src/main/java/test/types/TestApplication.java b/jax-rs.itests/src/main/java/test/types/TestApplication.java
index a665c4d..42fbbe3 100644
--- a/jax-rs.itests/src/main/java/test/types/TestApplication.java
+++ b/jax-rs.itests/src/main/java/test/types/TestApplication.java
@@ -24,7 +24,6 @@ import javax.ws.rs.GET;
import javax.ws.rs.Produces;
import javax.ws.rs.core.Application;
-// property = "osgi.jaxrs.application.base=/example-application",
public class TestApplication extends Application {
@Override
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/f9169a55/jax-rs.itests/src/main/java/test/types/TestFilter.java
----------------------------------------------------------------------
diff --git a/jax-rs.itests/src/main/java/test/types/TestFilter.java b/jax-rs.itests/src/main/java/test/types/TestFilter.java
index e5893a1..96213e2 100644
--- a/jax-rs.itests/src/main/java/test/types/TestFilter.java
+++ b/jax-rs.itests/src/main/java/test/types/TestFilter.java
@@ -23,10 +23,6 @@ import javax.ws.rs.container.ContainerRequestContext;
import javax.ws.rs.container.ContainerRequestFilter;
import javax.ws.rs.ext.Provider;
-// property = {
-// "jaxrs.application.select=(component.name=org.apache.aries.jax.rs.example.ExampleApplication)",
-// "osgi.jaxrs.filter.base=/examples"
-// }
@Provider
public class TestFilter implements ContainerRequestFilter {