[1/2] aries-jax-rs-whiteboard git commit: Extract application registration
Repository: aries-jax-rs-whiteboard
Updated Branches:
refs/heads/master e0b4a8665 -> 3dae7ed72
Extract application registration
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/840cce2e
Tree:
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/840cce2e
Diff:
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/840cce2e
Branch: refs/heads/master
Commit: 840cce2ea2e3337b122965d23dca4a04d4a7387d
Parents: e0b4a86
Author: Carlos Sierra
Authored: Wed Nov 30 20:01:58 2016 +0100
Committer: Carlos Sierra
Committed: Wed Nov 30 20:04:20 2016 +0100
--
jax-rs.itests/src/main/java/test/JaxrsTest.java | 46
1 file changed, 18 insertions(+), 28 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/840cce2e/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 d52d523..b81d5da 100644
--- a/jax-rs.itests/src/main/java/test/JaxrsTest.java
+++ b/jax-rs.itests/src/main/java/test/JaxrsTest.java
@@ -48,15 +48,7 @@ public class JaxrsTest {
ServiceRegistration serviceRegistration = null;
try {
-TestApplication testApplication = new TestApplication();
-
-Dictionary properties = new Hashtable<>();
-
-properties.put(
-"osgi.jaxrs.application.base", "/test-application");
-
-serviceRegistration = bundleContext.registerService(
-Application.class, testApplication, properties);
+serviceRegistration = registerApplication();
Client client = createClient();
@@ -83,19 +75,12 @@ public class JaxrsTest {
ServiceRegistration serviceRegistration = null;
try {
-TestApplication testApplication = new TestApplication();
+applicationRegistration = registerApplication();
-Dictionary 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<>();
+Dictionary properties = new Hashtable<>();
properties.put(
"jaxrs.application.select",
@@ -133,19 +118,11 @@ public class JaxrsTest {
ServiceRegistration filterRegistration = null;
try {
-TestApplication testApplication = new TestApplication();
-
-Dictionary properties = new Hashtable<>();
-
-properties.put(
-"osgi.jaxrs.application.base", "/test-application");
-
-applicationRegistration = bundleContext.registerService(
-Application.class, testApplication, properties);
+applicationRegistration = registerApplication();
TestFilter testFilter = new TestFilter();
-properties = new Hashtable<>();
+Dictionary properties = new Hashtable<>();
properties.put(
"jaxrs.application.select",
@@ -277,4 +254,17 @@ public class JaxrsTest {
}
}
+
+private ServiceRegistration registerApplication() {
+TestApplication testApplication = new TestApplication();
+
+Dictionary properties = new Hashtable<>();
+
+properties.put(
+"osgi.jaxrs.application.base", "/test-application");
+
+return bundleContext.registerService(
+Application.class, testApplication, properties);
+}
+
}
[2/2] aries-jax-rs-whiteboard git commit: Add case for application unregistration and registration
Add case for application unregistration and registration
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/3dae7ed7
Tree:
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/3dae7ed7
Diff:
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/3dae7ed7
Branch: refs/heads/master
Commit: 3dae7ed724ea00803cfac22f429de613460016d9
Parents: 840cce2
Author: Carlos Sierra
Authored: Wed Nov 30 20:04:33 2016 +0100
Committer: Carlos Sierra
Committed: Wed Nov 30 20:04:33 2016 +0100
--
jax-rs.itests/src/main/java/test/JaxrsTest.java | 48 +++-
1 file changed, 46 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/3dae7ed7/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 b81d5da..1c8e41a 100644
--- a/jax-rs.itests/src/main/java/test/JaxrsTest.java
+++ b/jax-rs.itests/src/main/java/test/JaxrsTest.java
@@ -36,6 +36,7 @@ import javax.ws.rs.core.Application;
import javax.ws.rs.core.Response;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
public class JaxrsTest {
@@ -69,6 +70,51 @@ public class JaxrsTest {
}
@Test
+public void testApplicationReadd() {
+ServiceRegistration serviceRegistration = null;
+
+Client client = createClient();
+
+WebTarget webTarget = client.
+target("http://localhost:8080";).
+path("/test-application");
+
+assertTrue(webTarget.request().get().getStatus() == 404);
+
+try {
+serviceRegistration = registerApplication();
+
+assertEquals(
+"Hello application",
+webTarget.
+request().
+get().
+readEntity(String.class));
+}
+finally {
+if (serviceRegistration != null) {
+serviceRegistration.unregister();
+}
+}
+
+assertTrue(webTarget.request().get().getStatus() == 404);
+
+try {
+serviceRegistration = registerApplication();
+
+assertEquals("Hello application",
+webTarget.
+request().
+get().readEntity(String.class));
+}
+finally {
+if (serviceRegistration != null) {
+serviceRegistration.unregister();
+}
+}
+}
+
+@Test
public void testApplicationEndpointExtension() {
ServiceRegistration applicationRegistration = null;
@@ -77,7 +123,6 @@ public class JaxrsTest {
try {
applicationRegistration = registerApplication();
-
TestAddon testAddon = new TestAddon();
Dictionary properties = new Hashtable<>();
@@ -237,7 +282,6 @@ public class JaxrsTest {
}
}
-
private Client createClient() {
Thread thread = Thread.currentThread();
[6/8] aries-jax-rs-whiteboard git commit: Use annotations in tests
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
Authored: Wed Nov 30 19:17:09 2016 +0100
Committer: Carlos Sierra
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;
[7/8] aries-jax-rs-whiteboard git commit: Added test cases
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
Authored: Wed Nov 30 19:19:07 2016 +0100
Committer: Carlos Sierra
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 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 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
[8/8] aries-jax-rs-whiteboard git commit: Update .gitignore
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 Authored: Wed Nov 30 19:19:40 2016 +0100 Committer: Carlos Sierra 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
[4/8] aries-jax-rs-whiteboard git commit: Create client
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
Authored: Wed Nov 30 19:13:50 2016 +0100
Committer: Carlos Sierra
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);
+}
+}
+
}
[2/8] aries-jax-rs-whiteboard git commit: Code cleaning
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
Authored: Wed Nov 30 19:11:43 2016 +0100
Committer: Carlos Sierra
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 {
[5/8] aries-jax-rs-whiteboard git commit: Taking for granted we are doing everything synchronously for the moment
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
Authored: Wed Nov 30 19:15:15 2016 +0100
Committer: Carlos Sierra
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) {
[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
Authored: Wed Nov 30 19:09:27 2016 +0100
Committer: Carlos Sierra
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 @@
0.0.1-SNAPSHOT
+org.apache.cxf
+cxf-rt-rs-client
+${cxf.version}
+
+
org.apache.felix
org.apache.felix.http.jetty
3.4.0
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 @@
2.0.1
+org.apache.cxf
+cxf-rt-rs-client
+${cxf.version}
+
+
org.osgi
org.osgi.core
5.0.0
[3/8] aries-jax-rs-whiteboard git commit: Changes to make tests easier
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
Authored: Wed Nov 30 19:12:04 2016 +0100
Committer: Carlos Sierra
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 headers = responseContext.getHeaders();
+
+headers.put("Filtered", Collections.singletonList("true"));
}
}
aries-jax-rs-whiteboard git commit: Simplify ServicesRegistrator
Repository: aries-jax-rs-whiteboard
Updated Branches:
refs/heads/master d442835ef -> c918ae8af
Simplify ServicesRegistrator
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/c918ae8a
Tree:
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/c918ae8a
Diff:
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/c918ae8a
Branch: refs/heads/master
Commit: c918ae8afef7576b4dedad3a1a12aa69b9ea80c8
Parents: d442835
Author: Christian Schneider
Authored: Wed Nov 30 18:45:17 2016 +0100
Committer: Christian Schneider
Committed: Wed Nov 30 18:45:17 2016 +0100
--
.../activator/ServicesRegistrator.java | 117 ---
1 file changed, 47 insertions(+), 70 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c918ae8a/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/activator/ServicesRegistrator.java
--
diff --git
a/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/activator/ServicesRegistrator.java
b/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/activator/ServicesRegistrator.java
index 1061ff5..7905c4a 100644
---
a/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/activator/ServicesRegistrator.java
+++
b/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/activator/ServicesRegistrator.java
@@ -18,6 +18,7 @@
package org.apache.aries.jax.rs.whiteboard.activator;
import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.CXFBusFactory;
import org.apache.cxf.transport.servlet.CXFNonSpringServlet;
import org.osgi.framework.BundleContext;
@@ -27,105 +28,89 @@ import org.osgi.framework.InvalidSyntaxException;
import org.osgi.framework.ServiceReference;
import org.osgi.framework.ServiceRegistration;
import org.osgi.service.http.context.ServletContextHelper;
-import org.osgi.service.http.whiteboard.HttpWhiteboardConstants;
import org.osgi.util.tracker.ServiceTracker;
import org.osgi.util.tracker.ServiceTrackerCustomizer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.servlet.Servlet;
+
+import static
org.osgi.service.http.whiteboard.HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_NAME;
+import static
org.osgi.service.http.whiteboard.HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_PATH;
+import static
org.osgi.service.http.whiteboard.HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_SELECT;
+import static
org.osgi.service.http.whiteboard.HttpWhiteboardConstants.HTTP_WHITEBOARD_DEFAULT_CONTEXT_NAME;
+import static
org.osgi.service.http.whiteboard.HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_PATTERN;
+
import java.util.Dictionary;
import java.util.Hashtable;
public class ServicesRegistrator
implements ServiceTrackerCustomizer {
+private static final Logger _logger =
LoggerFactory.getLogger(ServicesRegistrator.class);
+
+private final BundleContext _bundleContext;
+private ServiceRegistration _busServiceRegistration;
+private ServiceTracker _serviceTracker;
+private ServiceRegistration _servletServiceRegistration;
+
public ServicesRegistrator(BundleContext bundleContext) {
_bundleContext = bundleContext;
}
@Override
-public Object addingService(
-ServiceReference reference) {
-
-String contextPath = (String)reference.getProperty(
-HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_PATH);
-
-CXFNonSpringServlet cxfNonSpringServlet = new CXFNonSpringServlet();
-
-CXFBusFactory cxfBusFactory =
-(CXFBusFactory) CXFBusFactory.newInstance(
-CXFBusFactory.class.getName());
-
-Bus bus = cxfBusFactory.createBus();
+public Object addingService(ServiceReference
reference) {
+Bus bus =
BusFactory.newInstance(CXFBusFactory.class.getName()).createBus();
+_servletServiceRegistration = createCXFServletService(bus);
+_busServiceRegistration = createBusService(reference, bus);
+return new Object();
+}
+private ServiceRegistration createCXFServletService(Bus bus) {
Dictionary properties = new Hashtable<>();
-
-properties.put(
-HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_SELECT,
-"(" + HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_NAME + "=" +
-HttpWhiteboardConstants.HTTP_WHITEBOARD_DEFAULT_CONTEXT_NAME +
")");
-properties.put(
-HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_PATTERN, "/*");
+properties.put(HTTP_WHITEBOARD_CONTEXT_SELECT,
+"(" + HTTP_WHITEBOARD_CONTEXT_NAME + "=" +
HTTP_
aries-jax-rs-whiteboard git commit: Extract RuntimeDelegate init
Repository: aries-jax-rs-whiteboard
Updated Branches:
refs/heads/master bb42cc1a8 -> d442835ef
Extract RuntimeDelegate init
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/d442835e
Tree:
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/d442835e
Diff:
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/d442835e
Branch: refs/heads/master
Commit: d442835eff13e9e7bf80f00e7cdfe97975d10447
Parents: bb42cc1
Author: Christian Schneider
Authored: Wed Nov 30 18:20:26 2016 +0100
Committer: Christian Schneider
Committed: Wed Nov 30 18:20:26 2016 +0100
--
.../activator/CXFJaxRsBundleActivator.java | 53 +++-
1 file changed, 18 insertions(+), 35 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/d442835e/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/activator/CXFJaxRsBundleActivator.java
--
diff --git
a/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/activator/CXFJaxRsBundleActivator.java
b/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/activator/CXFJaxRsBundleActivator.java
index 6c98993..918b619 100644
---
a/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/activator/CXFJaxRsBundleActivator.java
+++
b/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/activator/CXFJaxRsBundleActivator.java
@@ -17,14 +17,9 @@
package org.apache.aries.jax.rs.whiteboard.activator;
-import java.util.ArrayList;
-import java.util.Dictionary;
-import java.util.Hashtable;
-
import javax.ws.rs.ext.RuntimeDelegate;
import org.apache.cxf.Bus;
-import org.osgi.framework.Bundle;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Filter;
@@ -42,58 +37,46 @@ public class CXFJaxRsBundleActivator implements
BundleActivator {
@Override
public void start(BundleContext bundleContext) throws Exception {
-Thread thread = Thread.currentThread();
-
-ClassLoader contextClassLoader = thread.getContextClassLoader();
-
-Bundle bundle = bundleContext.getBundle();
-
-BundleWiring bundleWiring = bundle.adapt(BundleWiring.class);
-
-thread.setContextClassLoader(bundleWiring.getClassLoader());
-
-try {
-
-// Initialize instance so it is never looked up again
-
-RuntimeDelegate.getInstance();
-}
-finally {
-thread.setContextClassLoader(contextClassLoader);
-}
-
-Dictionary runtimeProperties = new Hashtable<>();
-
-runtimeProperties.put("endpoints", new ArrayList());
+initRuntimeDelegate(bundleContext);
// TODO make the context path of the JAX-RS Whiteboard configurable.
-
_servicesRegistrator = new ServicesRegistrator(bundleContext);
-
_servicesRegistrator.start();
_busServiceTracker = new ServiceTracker<>(
bundleContext, Bus.class,
new BusServiceTrackerCustomizer(bundleContext));
-
_busServiceTracker.open();
Filter filter = bundleContext.createFilter(
"(jaxrs.application.select=*)");
-
_singletonsTracker = new ServiceTracker<>(
bundleContext, filter,
new ServicesServiceTrackerCustomizer(bundleContext));
-
_singletonsTracker.open();
}
+/**
+ * Initialize instance so it is never looked up again
+ * @param bundleContext
+ */
+private void initRuntimeDelegate(BundleContext bundleContext) {
+Thread thread = Thread.currentThread();
+ClassLoader oldClassLoader = thread.getContextClassLoader();
+BundleWiring bundleWiring =
bundleContext.getBundle().adapt(BundleWiring.class);
+thread.setContextClassLoader(bundleWiring.getClassLoader());
+try {
+RuntimeDelegate.getInstance();
+}
+finally {
+thread.setContextClassLoader(oldClassLoader);
+}
+}
+
@Override
public void stop(BundleContext context) throws Exception {
_busServiceTracker.close();
-
_singletonsTracker.close();
-
_servicesRegistrator.stop();
}
svn commit: r1772042 - /aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml
Author: alien11689 Date: Wed Nov 30 13:27:11 2016 New Revision: 1772042 URL: http://svn.apache.org/viewvc?rev=1772042&view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml?rev=1772042&r1=1772041&r2=1772042&view=diff == --- aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml (original) +++ aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml Wed Nov 30 13:27:11 2016 @@ -31,7 +31,7 @@ org.apache.aries.blueprint blueprint-maven-plugin maven-plugin -1.5.0 +1.5.1-SNAPSHOT Apache Aries Blueprint Maven Plugin Maven plugin to create blueprint files from annotations @@ -43,9 +43,9 @@ - scm:svn:http://svn.apache.org/repos/asf/aries/tags/blueprint-maven-plugin-1.5.0 - scm:svn:https://svn.apache.org/repos/asf/aries/tags/blueprint-maven-plugin-1.5.0 - http://svn.apache.org/viewvc/aries/tags/blueprint-maven-plugin-1.5.0 + scm:svn:http://svn.apache.org/repos/asf/aries/trunk/blueprint/plugin/blueprint-maven-plugin + scm:svn:https://svn.apache.org/repos/asf/aries/trunk/blueprint/plugin/blueprint-maven-plugin + http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin
svn commit: r1772041 - /aries/tags/blueprint-maven-plugin-1.5.0/
Author: alien11689 Date: Wed Nov 30 13:27:08 2016 New Revision: 1772041 URL: http://svn.apache.org/viewvc?rev=1772041&view=rev Log: [maven-release-plugin] copy for tag blueprint-maven-plugin-1.5.0 Added: aries/tags/blueprint-maven-plugin-1.5.0/ (props changed) - copied from r1772040, aries/trunk/blueprint/plugin/blueprint-maven-plugin/ Propchange: aries/tags/blueprint-maven-plugin-1.5.0/ -- --- svn:mergeinfo (added) +++ svn:mergeinfo Wed Nov 30 13:27:08 2016 @@ -0,0 +1 @@ +/aries/branches/1.0-prototype/blueprint/plugin/blueprint-maven-plugin:1306564-1337594
svn commit: r1772040 - /aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml
Author: alien11689 Date: Wed Nov 30 13:27:05 2016 New Revision: 1772040 URL: http://svn.apache.org/viewvc?rev=1772040&view=rev Log: [maven-release-plugin] prepare release blueprint-maven-plugin-1.5.0 Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml?rev=1772040&r1=1772039&r2=1772040&view=diff == --- aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml (original) +++ aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml Wed Nov 30 13:27:05 2016 @@ -31,7 +31,7 @@ org.apache.aries.blueprint blueprint-maven-plugin maven-plugin -1.5.0-SNAPSHOT +1.5.0 Apache Aries Blueprint Maven Plugin Maven plugin to create blueprint files from annotations @@ -43,9 +43,9 @@ - scm:svn:http://svn.apache.org/repos/asf/aries/trunk/blueprint/plugin/blueprint-maven-plugin - scm:svn:https://svn.apache.org/repos/asf/aries/trunk/blueprint/plugin/blueprint-maven-plugin - http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin + scm:svn:http://svn.apache.org/repos/asf/aries/tags/blueprint-maven-plugin-1.5.0 + scm:svn:https://svn.apache.org/repos/asf/aries/tags/blueprint-maven-plugin-1.5.0 + http://svn.apache.org/viewvc/aries/tags/blueprint-maven-plugin-1.5.0 @@ -105,7 +105,7 @@ - +
svn commit: r1772039 - /aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml
Author: alien11689 Date: Wed Nov 30 13:25:21 2016 New Revision: 1772039 URL: http://svn.apache.org/viewvc?rev=1772039&view=rev Log: Bump spi and annotation version in blueprint maven plugin Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml?rev=1772039&r1=1772038&r2=1772039&view=diff == --- aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml (original) +++ aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml Wed Nov 30 13:25:21 2016 @@ -120,7 +120,7 @@ org.apache.aries.blueprint blueprint-maven-plugin-spi -1.0.0-SNAPSHOT +1.0.0 @@ -162,7 +162,7 @@ org.apache.aries.blueprint blueprint-maven-plugin-annotation - 1.0.0-SNAPSHOT + 1.0.0 org.apache.maven
svn commit: r1772037 - /aries/tags/blueprint-maven-plugin-annotation-1.0.0/
Author: alien11689 Date: Wed Nov 30 13:16:22 2016 New Revision: 1772037 URL: http://svn.apache.org/viewvc?rev=1772037&view=rev Log: [maven-release-plugin] copy for tag blueprint-maven-plugin-annotation-1.0.0 Added: aries/tags/blueprint-maven-plugin-annotation-1.0.0/ (props changed) - copied from r1772036, aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/ Propchange: aries/tags/blueprint-maven-plugin-annotation-1.0.0/ -- --- svn:mergeinfo (added) +++ svn:mergeinfo Wed Nov 30 13:16:22 2016 @@ -0,0 +1 @@ +/aries/branches/1.0-prototype/blueprint/plugin/blueprint-maven-plugin-annotation:1306564-1337594
svn commit: r1772036 - /aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/pom.xml
Author: alien11689 Date: Wed Nov 30 13:16:18 2016 New Revision: 1772036 URL: http://svn.apache.org/viewvc?rev=1772036&view=rev Log: [maven-release-plugin] prepare release blueprint-maven-plugin-annotation-1.0.0 Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/pom.xml Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/pom.xml URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/pom.xml?rev=1772036&r1=1772035&r2=1772036&view=diff == --- aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/pom.xml (original) +++ aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/pom.xml Wed Nov 30 13:16:18 2016 @@ -8,12 +8,12 @@ org.apache.aries.blueprint blueprint-maven-plugin-annotation - 1.0.0-SNAPSHOT + 1.0.0 Apache Aries Blueprint Plugin Annotations - scm:svn:http://svn.apache.org/repos/asf/aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation - scm:svn:https://svn.apache.org/repos/asf/aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation - http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation + scm:svn:http://svn.apache.org/repos/asf/aries/tags/blueprint-maven-plugin-annotation-1.0.0 + scm:svn:https://svn.apache.org/repos/asf/aries/tags/blueprint-maven-plugin-annotation-1.0.0 + http://svn.apache.org/viewvc/aries/tags/blueprint-maven-plugin-annotation-1.0.0
svn commit: r1772038 - /aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/pom.xml
Author: alien11689 Date: Wed Nov 30 13:16:24 2016 New Revision: 1772038 URL: http://svn.apache.org/viewvc?rev=1772038&view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/pom.xml Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/pom.xml URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/pom.xml?rev=1772038&r1=1772037&r2=1772038&view=diff == --- aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/pom.xml (original) +++ aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/pom.xml Wed Nov 30 13:16:24 2016 @@ -8,12 +8,12 @@ org.apache.aries.blueprint blueprint-maven-plugin-annotation - 1.0.0 + 1.0.1-SNAPSHOT Apache Aries Blueprint Plugin Annotations - scm:svn:http://svn.apache.org/repos/asf/aries/tags/blueprint-maven-plugin-annotation-1.0.0 - scm:svn:https://svn.apache.org/repos/asf/aries/tags/blueprint-maven-plugin-annotation-1.0.0 - http://svn.apache.org/viewvc/aries/tags/blueprint-maven-plugin-annotation-1.0.0 + scm:svn:http://svn.apache.org/repos/asf/aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation + scm:svn:https://svn.apache.org/repos/asf/aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation + http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation
svn commit: r1772035 - /aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/pom.xml
Author: alien11689 Date: Wed Nov 30 13:15:37 2016 New Revision: 1772035 URL: http://svn.apache.org/viewvc?rev=1772035&view=rev Log: Fix pom Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/pom.xml Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/pom.xml URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/pom.xml?rev=1772035&r1=1772034&r2=1772035&view=diff == --- aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/pom.xml (original) +++ aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/pom.xml Wed Nov 30 13:15:37 2016 @@ -8,12 +8,12 @@ org.apache.aries.blueprint blueprint-maven-plugin-annotation - 1.0.0 + 1.0.0-SNAPSHOT Apache Aries Blueprint Plugin Annotations - scm:svn:http://svn.apache.org/repos/asf/aries/tags/blueprint-maven-plugin-annotation-1.0.0 - scm:svn:https://svn.apache.org/repos/asf/aries/tags/blueprint-maven-plugin-annotation-1.0.0 - http://svn.apache.org/viewvc/aries/tags/blueprint-maven-plugin-annotation-1.0.0 + scm:svn:http://svn.apache.org/repos/asf/aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation + scm:svn:https://svn.apache.org/repos/asf/aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation + http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation
svn commit: r1772034 - in /aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation: pom.xml src/main/java/org/apache/aries/blueprint/annotation/config/ConfigProperty.java
Author: alien11689
Date: Wed Nov 30 13:13:20 2016
New Revision: 1772034
URL: http://svn.apache.org/viewvc?rev=1772034&view=rev
Log:
Fix ConfigProperty javadoc
Modified:
aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/pom.xml
aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/config/ConfigProperty.java
Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/pom.xml?rev=1772034&r1=1772033&r2=1772034&view=diff
==
--- aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/pom.xml
(original)
+++ aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/pom.xml Wed
Nov 30 13:13:20 2016
@@ -8,12 +8,12 @@
org.apache.aries.blueprint
blueprint-maven-plugin-annotation
- 1.0.0-SNAPSHOT
+ 1.0.0
Apache Aries Blueprint Plugin Annotations
-
scm:svn:http://svn.apache.org/repos/asf/aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation
-
scm:svn:https://svn.apache.org/repos/asf/aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation
-
http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation
+
scm:svn:http://svn.apache.org/repos/asf/aries/tags/blueprint-maven-plugin-annotation-1.0.0
+
scm:svn:https://svn.apache.org/repos/asf/aries/tags/blueprint-maven-plugin-annotation-1.0.0
+
http://svn.apache.org/viewvc/aries/tags/blueprint-maven-plugin-annotation-1.0.0
Modified:
aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/config/ConfigProperty.java
URL:
http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/config/ConfigProperty.java?rev=1772034&r1=1772033&r2=1772034&view=diff
==
---
aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/config/ConfigProperty.java
(original)
+++
aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/config/ConfigProperty.java
Wed Nov 30 13:13:20 2016
@@ -7,7 +7,7 @@ import java.lang.annotation.Target;
/**
* Annotate fields with this to inject configuration like:
- * @ConfigProperty("${mykey}")
+ * @ConfigProperty("${mykey}")
*/
@Target({ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER})
@Retention(RetentionPolicy.RUNTIME)
svn commit: r1772032 - /aries/trunk/blueprint/plugin/blueprint-maven-plugin-spi/pom.xml
Author: alien11689 Date: Wed Nov 30 13:07:12 2016 New Revision: 1772032 URL: http://svn.apache.org/viewvc?rev=1772032&view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin-spi/pom.xml Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin-spi/pom.xml URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin-spi/pom.xml?rev=1772032&r1=1772031&r2=1772032&view=diff == --- aries/trunk/blueprint/plugin/blueprint-maven-plugin-spi/pom.xml (original) +++ aries/trunk/blueprint/plugin/blueprint-maven-plugin-spi/pom.xml Wed Nov 30 13:07:12 2016 @@ -11,12 +11,12 @@ org.apache.aries.blueprint blueprint-maven-plugin-spi -1.0.0 +1.0.1-SNAPSHOT - scm:svn:http://svn.apache.org/repos/asf/aries/tags/blueprint-maven-plugin-spi-1.0.0 - scm:svn:https://svn.apache.org/repos/asf/aries/tags/blueprint-maven-plugin-spi-1.0.0 - http://svn.apache.org/viewvc/aries/tags/blueprint-maven-plugin-spi-1.0.0 + scm:svn:http://svn.apache.org/repos/asf/aries/trunk/blueprint/plugin/blueprint-maven-plugin-spi + scm:svn:https://svn.apache.org/repos/asf/aries/trunk/blueprint/plugin/blueprint-maven-plugin-spi + http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin-spi
svn commit: r1772030 - /aries/trunk/blueprint/plugin/blueprint-maven-plugin-spi/pom.xml
Author: alien11689 Date: Wed Nov 30 13:07:06 2016 New Revision: 1772030 URL: http://svn.apache.org/viewvc?rev=1772030&view=rev Log: [maven-release-plugin] prepare release blueprint-maven-plugin-spi-1.0.0 Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin-spi/pom.xml Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin-spi/pom.xml URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin-spi/pom.xml?rev=1772030&r1=1772029&r2=1772030&view=diff == --- aries/trunk/blueprint/plugin/blueprint-maven-plugin-spi/pom.xml (original) +++ aries/trunk/blueprint/plugin/blueprint-maven-plugin-spi/pom.xml Wed Nov 30 13:07:06 2016 @@ -11,12 +11,12 @@ org.apache.aries.blueprint blueprint-maven-plugin-spi -1.0.0-SNAPSHOT +1.0.0 - scm:svn:http://svn.apache.org/repos/asf/aries/trunk/blueprint/plugin/blueprint-maven-plugin-spi - scm:svn:https://svn.apache.org/repos/asf/aries/trunk/blueprint/plugin/blueprint-maven-plugin-spi - http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin-spi + scm:svn:http://svn.apache.org/repos/asf/aries/tags/blueprint-maven-plugin-spi-1.0.0 + scm:svn:https://svn.apache.org/repos/asf/aries/tags/blueprint-maven-plugin-spi-1.0.0 + http://svn.apache.org/viewvc/aries/tags/blueprint-maven-plugin-spi-1.0.0
svn commit: r1772031 - /aries/tags/blueprint-maven-plugin-spi-1.0.0/
Author: alien11689 Date: Wed Nov 30 13:07:10 2016 New Revision: 1772031 URL: http://svn.apache.org/viewvc?rev=1772031&view=rev Log: [maven-release-plugin] copy for tag blueprint-maven-plugin-spi-1.0.0 Added: aries/tags/blueprint-maven-plugin-spi-1.0.0/ (props changed) - copied from r1772030, aries/trunk/blueprint/plugin/blueprint-maven-plugin-spi/ Propchange: aries/tags/blueprint-maven-plugin-spi-1.0.0/ -- --- svn:mergeinfo (added) +++ svn:mergeinfo Wed Nov 30 13:07:10 2016 @@ -0,0 +1 @@ +/aries/branches/1.0-prototype/blueprint/plugin/blueprint-maven-plugin-spi:1306564-1337594
svn commit: r1772029 - in /aries/trunk/blueprint/plugin: blueprint-maven-plugin-annotation/pom.xml blueprint-maven-plugin-spi/pom.xml blueprint-maven-plugin/pom.xml
Author: alien11689 Date: Wed Nov 30 13:06:09 2016 New Revision: 1772029 URL: http://svn.apache.org/viewvc?rev=1772029&view=rev Log: Update blueprint plugin scm Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/pom.xml aries/trunk/blueprint/plugin/blueprint-maven-plugin-spi/pom.xml aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/pom.xml URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/pom.xml?rev=1772029&r1=1772028&r2=1772029&view=diff == --- aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/pom.xml (original) +++ aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/pom.xml Wed Nov 30 13:06:09 2016 @@ -6,8 +6,14 @@ 2.0.1 ../../../parent/pom.xml - org.apache.aries.blueprint + org.apache.aries.blueprint blueprint-maven-plugin-annotation 1.0.0-SNAPSHOT Apache Aries Blueprint Plugin Annotations - \ No newline at end of file + + + scm:svn:http://svn.apache.org/repos/asf/aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation + scm:svn:https://svn.apache.org/repos/asf/aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation + http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation + + Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin-spi/pom.xml URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin-spi/pom.xml?rev=1772029&r1=1772028&r2=1772029&view=diff == --- aries/trunk/blueprint/plugin/blueprint-maven-plugin-spi/pom.xml (original) +++ aries/trunk/blueprint/plugin/blueprint-maven-plugin-spi/pom.xml Wed Nov 30 13:06:09 2016 @@ -11,12 +11,12 @@ org.apache.aries.blueprint blueprint-maven-plugin-spi -1.0.1-SNAPSHOT +1.0.0-SNAPSHOT - scm:svn:http://svn.apache.org/repos/asf/aries/trunk/blueprint/blueprint-maven-plugin-spi - scm:svn:https://svn.apache.org/repos/asf/aries/trunk/blueprint/blueprint-maven-plugin-spi - http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-maven-plugin-spi + scm:svn:http://svn.apache.org/repos/asf/aries/trunk/blueprint/plugin/blueprint-maven-plugin-spi + scm:svn:https://svn.apache.org/repos/asf/aries/trunk/blueprint/plugin/blueprint-maven-plugin-spi + http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin-spi @@ -32,4 +32,4 @@ Apache Aries Blueprint Plugin Spi - \ No newline at end of file + Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml?rev=1772029&r1=1772028&r2=1772029&view=diff == --- aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml (original) +++ aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml Wed Nov 30 13:06:09 2016 @@ -43,9 +43,9 @@ - scm:svn:http://svn.apache.org/repos/asf/aries/trunk/blueprint/blueprint-maven-plugin - scm:svn:https://svn.apache.org/repos/asf/aries/trunk/blueprint/blueprint-maven-plugin - http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-maven-plugin + scm:svn:http://svn.apache.org/repos/asf/aries/trunk/blueprint/plugin/blueprint-maven-plugin + scm:svn:https://svn.apache.org/repos/asf/aries/trunk/blueprint/plugin/blueprint-maven-plugin + http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin @@ -80,7 +80,7 @@ - org.eclipse.m2e
svn commit: r1772027 - /aries/tags/blueprint-maven-plugin-spi-1.0.0/
Author: alien11689 Date: Wed Nov 30 12:56:45 2016 New Revision: 1772027 URL: http://svn.apache.org/viewvc?rev=1772027&view=rev Log: Invalid tag Removed: aries/tags/blueprint-maven-plugin-spi-1.0.0/
svn commit: r1772023 - /aries/trunk/blueprint/plugin/blueprint-maven-plugin-spi/pom.xml
Author: alien11689 Date: Wed Nov 30 12:37:20 2016 New Revision: 1772023 URL: http://svn.apache.org/viewvc?rev=1772023&view=rev Log: [maven-release-plugin] prepare release blueprint-maven-plugin-spi-1.0.0 Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin-spi/pom.xml Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin-spi/pom.xml URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin-spi/pom.xml?rev=1772023&r1=1772022&r2=1772023&view=diff == --- aries/trunk/blueprint/plugin/blueprint-maven-plugin-spi/pom.xml (original) +++ aries/trunk/blueprint/plugin/blueprint-maven-plugin-spi/pom.xml Wed Nov 30 12:37:20 2016 @@ -1,7 +1,5 @@ -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/xsd/maven-4.0.0.xsd";> +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/xsd/maven-4.0.0.xsd";> 4.0.0 @@ -13,12 +11,12 @@ org.apache.aries.blueprint blueprint-maven-plugin-spi -1.0.0-SNAPSHOT +1.0.0 - scm:svn:http://svn.apache.org/repos/asf/aries/trunk/blueprint/blueprint-maven-plugin-spi - scm:svn:https://svn.apache.org/repos/asf/aries/trunk/blueprint/blueprint-maven-plugin-spi - http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-maven-plugin-spi + scm:svn:http://svn.apache.org/repos/asf/aries/tags/blueprint-maven-plugin-spi-1.0.0 + scm:svn:https://svn.apache.org/repos/asf/aries/tags/blueprint-maven-plugin-spi-1.0.0 + http://svn.apache.org/viewvc/aries/tags/blueprint-maven-plugin-spi-1.0.0
svn commit: r1772025 - /aries/trunk/blueprint/plugin/blueprint-maven-plugin-spi/pom.xml
Author: alien11689 Date: Wed Nov 30 12:37:26 2016 New Revision: 1772025 URL: http://svn.apache.org/viewvc?rev=1772025&view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin-spi/pom.xml Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin-spi/pom.xml URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin-spi/pom.xml?rev=1772025&r1=1772024&r2=1772025&view=diff == --- aries/trunk/blueprint/plugin/blueprint-maven-plugin-spi/pom.xml (original) +++ aries/trunk/blueprint/plugin/blueprint-maven-plugin-spi/pom.xml Wed Nov 30 12:37:26 2016 @@ -11,12 +11,12 @@ org.apache.aries.blueprint blueprint-maven-plugin-spi -1.0.0 +1.0.1-SNAPSHOT - scm:svn:http://svn.apache.org/repos/asf/aries/tags/blueprint-maven-plugin-spi-1.0.0 - scm:svn:https://svn.apache.org/repos/asf/aries/tags/blueprint-maven-plugin-spi-1.0.0 - http://svn.apache.org/viewvc/aries/tags/blueprint-maven-plugin-spi-1.0.0 + scm:svn:http://svn.apache.org/repos/asf/aries/trunk/blueprint/blueprint-maven-plugin-spi + scm:svn:https://svn.apache.org/repos/asf/aries/trunk/blueprint/blueprint-maven-plugin-spi + http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-maven-plugin-spi
svn commit: r1772024 - /aries/tags/blueprint-maven-plugin-spi-1.0.0/
Author: alien11689 Date: Wed Nov 30 12:37:23 2016 New Revision: 1772024 URL: http://svn.apache.org/viewvc?rev=1772024&view=rev Log: [maven-release-plugin] copy for tag blueprint-maven-plugin-spi-1.0.0 Added: aries/tags/blueprint-maven-plugin-spi-1.0.0/ (props changed) - copied from r1772023, aries/trunk/blueprint/blueprint-maven-plugin-spi/ Propchange: aries/tags/blueprint-maven-plugin-spi-1.0.0/ -- --- svn:mergeinfo (added) +++ svn:mergeinfo Wed Nov 30 12:37:23 2016 @@ -0,0 +1 @@ +/aries/branches/1.0-prototype/blueprint/blueprint-maven-plugin-spi:1306564-1337594
