You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by ro...@apache.org on 2017/08/10 17:13:42 UTC
[1/3] aries-jax-rs-whiteboard git commit: stabilize factory tests
Repository: aries-jax-rs-whiteboard
Updated Branches:
refs/heads/master 9c7620caf -> f28fc0d38
stabilize factory tests
Signed-off-by: Raymond Auge <ro...@apache.org>
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/92705d07
Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/92705d07
Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/92705d07
Branch: refs/heads/master
Commit: 92705d07e732719a192c467464eff5fd0c760bf1
Parents: 9c7620c
Author: Raymond Auge <ro...@apache.org>
Authored: Thu Aug 10 13:04:38 2017 -0400
Committer: Raymond Auge <ro...@apache.org>
Committed: Thu Aug 10 13:06:00 2017 -0400
----------------------------------------------------------------------
.../src/main/java/test/WhiteboardFactoryTest.java | 16 +++++++++++++++-
.../jax/rs/whiteboard/internal/TargetFilter.java | 2 +-
2 files changed, 16 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/92705d07/jax-rs.itests/src/main/java/test/WhiteboardFactoryTest.java
----------------------------------------------------------------------
diff --git a/jax-rs.itests/src/main/java/test/WhiteboardFactoryTest.java b/jax-rs.itests/src/main/java/test/WhiteboardFactoryTest.java
index 8a3d01e..1534fb9 100644
--- a/jax-rs.itests/src/main/java/test/WhiteboardFactoryTest.java
+++ b/jax-rs.itests/src/main/java/test/WhiteboardFactoryTest.java
@@ -20,6 +20,7 @@ package test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
+import static org.osgi.service.http.whiteboard.HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_PATTERN;
import static org.osgi.service.jaxrs.whiteboard.JaxRSWhiteboardConstants.JAX_RS_APPLICATION_BASE;
import static org.osgi.service.jaxrs.whiteboard.JaxRSWhiteboardConstants.JAX_RS_RESOURCE;
@@ -29,6 +30,7 @@ import java.util.Hashtable;
import org.junit.Test;
import org.osgi.framework.BundleContext;
+import org.osgi.framework.Constants;
import org.osgi.framework.FrameworkUtil;
import org.osgi.framework.ServiceReference;
import org.osgi.framework.ServiceRegistration;
@@ -97,10 +99,22 @@ public class WhiteboardFactoryTest {
Configuration configuration = admin.createFactoryConfiguration(
"org.apache.aries.jax.rs.whiteboard", "?");
- configuration.update(new Hashtable<>());
+ Dictionary<String, Object> properties = new Hashtable<>();
+
+ properties.put(
+ HTTP_WHITEBOARD_SERVLET_PATTERN,
+ "/new-whiteboard");
+ properties.put(Constants.SERVICE_RANKING, 1000);
+
+ configuration.update(properties);
do {
Thread.sleep(50);
+
+ if (!"/new-whiteboard".equals(
+ runtimeTracker.getServiceReference().getProperty(HTTP_WHITEBOARD_SERVLET_PATTERN))) {
+ trackingCount = runtimeTracker.getTrackingCount();
+ }
}
while (runtimeTracker.getTrackingCount() <= trackingCount);
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/92705d07/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/TargetFilter.java
----------------------------------------------------------------------
diff --git a/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/TargetFilter.java b/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/TargetFilter.java
index d83caa8..901f23a 100644
--- a/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/TargetFilter.java
+++ b/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/TargetFilter.java
@@ -32,7 +32,7 @@ public class TargetFilter<T> implements Predicate<ServiceReference<T>> {
}
catch (InvalidSyntaxException ise) {
if (_log.isErrorEnabled()) {
- _log.error("Invalid '{}' syntax in {}", JAX_RS_WHITEBOARD_TARGET, ref, ise);
+ _log.error("Invalid '{}' filter syntax in {}", JAX_RS_WHITEBOARD_TARGET, ref);
}
return false;
[3/3] aries-jax-rs-whiteboard git commit: wedeploy start script
Posted by ro...@apache.org.
wedeploy start script
Signed-off-by: Raymond Auge <ro...@apache.org>
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/f28fc0d3
Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/f28fc0d3
Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/f28fc0d3
Branch: refs/heads/master
Commit: f28fc0d387cc1f5f861a389a65ade37134a6b4f9
Parents: 195f438
Author: Raymond Auge <ro...@apache.org>
Authored: Thu Aug 10 13:12:49 2017 -0400
Committer: Raymond Auge <ro...@apache.org>
Committed: Thu Aug 10 13:12:49 2017 -0400
----------------------------------------------------------------------
start | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/f28fc0d3/start
----------------------------------------------------------------------
diff --git a/start b/start
new file mode 100644
index 0000000..edd28bf
--- /dev/null
+++ b/start
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+# This is a https://wedeploy.com start script.
+
+java -jar jax-rs.example/target/example.jar
\ No newline at end of file
[2/3] aries-jax-rs-whiteboard git commit: update the resolutions to
reflect the fixed API bundle
Posted by ro...@apache.org.
update the resolutions to reflect the fixed API bundle
Signed-off-by: Raymond Auge <ro...@apache.org>
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/195f4381
Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/195f4381
Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/195f4381
Branch: refs/heads/master
Commit: 195f438102553ab78ca4f0ba6081f774e6c7c523
Parents: 92705d0
Author: Raymond Auge <ro...@apache.org>
Authored: Thu Aug 10 13:06:18 2017 -0400
Committer: Raymond Auge <ro...@apache.org>
Committed: Thu Aug 10 13:08:18 2017 -0400
----------------------------------------------------------------------
jax-rs.example/example.bndrun | 2 --
jax-rs.example/pom.xml | 10 ----------
jax-rs.itests/itest.bndrun | 2 --
jax-rs.itests/pom.xml | 10 ----------
4 files changed, 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/195f4381/jax-rs.example/example.bndrun
----------------------------------------------------------------------
diff --git a/jax-rs.example/example.bndrun b/jax-rs.example/example.bndrun
index af22a5c..c6a3b96 100644
--- a/jax-rs.example/example.bndrun
+++ b/jax-rs.example/example.bndrun
@@ -44,7 +44,5 @@
org.objectweb.asm;version='[5.0.4,5.0.5)',\
org.osgi.service.http;version='[1.2.1,1.2.2)',\
org.osgi.service.jaxrs;version='[1.0.0,1.0.1)',\
- org.osgi.util.function;version='[1.1.0,1.1.1)',\
- org.osgi.util.promise;version='[1.1.0,1.1.1)',\
slf4j.api;version='[1.7.25,1.7.26)',\
org.osgi.service.http.whiteboard;version='[1.0.0,1.0.1)'
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/195f4381/jax-rs.example/pom.xml
----------------------------------------------------------------------
diff --git a/jax-rs.example/pom.xml b/jax-rs.example/pom.xml
index c33ff7e..6f90fb6 100644
--- a/jax-rs.example/pom.xml
+++ b/jax-rs.example/pom.xml
@@ -175,20 +175,10 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.util.function</artifactId>
- <version>LATEST</version>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
<artifactId>org.osgi.service.jaxrs</artifactId>
<version>LATEST</version>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.util.promise</artifactId>
- <version>LATEST</version>
- </dependency>
- <dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
<version>5.0.4</version>
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/195f4381/jax-rs.itests/itest.bndrun
----------------------------------------------------------------------
diff --git a/jax-rs.itests/itest.bndrun b/jax-rs.itests/itest.bndrun
index f87d845..c74b820 100644
--- a/jax-rs.itests/itest.bndrun
+++ b/jax-rs.itests/itest.bndrun
@@ -37,8 +37,6 @@
org.apache.ws.xmlschema.core;version='[2.2.1,2.2.2)',\
org.objectweb.asm;version='[5.0.4,5.0.5)',\
org.osgi.service.jaxrs;version='[1.0.0,1.0.1)',\
- org.osgi.util.function;version='[1.1.0,1.1.1)',\
- org.osgi.util.promise;version='[1.1.0,1.1.1)',\
osgi.enroute.hamcrest.wrapper;version='[1.3.0,1.3.1)',\
osgi.enroute.junit.wrapper;version='[4.12.0,4.12.1)',\
slf4j.api;version='[1.7.25,1.7.26)',\
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/195f4381/jax-rs.itests/pom.xml
----------------------------------------------------------------------
diff --git a/jax-rs.itests/pom.xml b/jax-rs.itests/pom.xml
index 8d94f57..8c06936 100644
--- a/jax-rs.itests/pom.xml
+++ b/jax-rs.itests/pom.xml
@@ -142,21 +142,11 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.util.function</artifactId>
- <version>LATEST</version>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
<artifactId>org.osgi.service.jaxrs</artifactId>
<version>LATEST</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.util.promise</artifactId>
- <version>LATEST</version>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
<artifactId>osgi.enroute.junit.wrapper</artifactId>
<version>4.12.0</version>
</dependency>