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/24 10:53:50 UTC
[46/50] [abbrv] aries-jax-rs-whiteboard git commit: add logging to
example and integration tests and other cleanup
add logging to example and integration tests and other cleanup
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/ed563e77
Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/ed563e77
Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/ed563e77
Branch: refs/heads/master
Commit: ed563e771736e4a577ef53fe7f39354f3debb5d0
Parents: e2a4c01
Author: Raymond Auge <ra...@liferay.com>
Authored: Tue Nov 8 14:26:24 2016 -0500
Committer: Raymond Auge <ra...@liferay.com>
Committed: Tue Nov 8 14:26:24 2016 -0500
----------------------------------------------------------------------
jax-rs.example-run/example.bndrun | 45 +++++++++++++++++++++-------------
jax-rs.example-run/pom.xml | 7 +++++-
jax-rs.itests-run/itest.bndrun | 6 +++--
jax-rs.itests-run/pom.xml | 5 ++++
4 files changed, 43 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/ed563e77/jax-rs.example-run/example.bndrun
----------------------------------------------------------------------
diff --git a/jax-rs.example-run/example.bndrun b/jax-rs.example-run/example.bndrun
index dccf286..2f2c96a 100644
--- a/jax-rs.example-run/example.bndrun
+++ b/jax-rs.example-run/example.bndrun
@@ -12,6 +12,7 @@
-runrequires: \
osgi.identity;filter:='(osgi.identity=org.apache.aries.jax.rs.example)',\
+ osgi.identity;filter:='(osgi.identity=org.apache.aries.jax.rs.log4j-configuration)',\
osgi.identity;filter:='(osgi.identity=org.apache.felix.gogo.jline)'
# ,\
@@ -19,28 +20,38 @@
-runfw: org.eclipse.osgi;version='[3.10.100.v20150529-1857,3.10.100.v20150529-1857]'
-runbundles: \
- javax.annotation-api;version='[1.2.0,1.2.1)',\
- javax.json-api;version='[1.0.0,1.0.1)',\
- javax.ws.rs-api;version='[2.0.1,2.0.2)',\
- log4j;version='[1.2.17,1.2.18)',\
- org.apache.aries.jax.rs.example;version='[1.0.0,1.0.1)',\
- org.apache.aries.jax.rs.whiteboard;version='[1.0.0,1.0.1)',\
- org.apache.felix.configadmin;version='[1.8.8,1.8.9)',\
- org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
- org.apache.felix.scr;version='[2.0.2,2.0.3)',\
- org.apache.ws.xmlschema.core;version='[2.2.1,2.2.2)',\
- org.eclipse.equinox.event;version='[1.3.100,1.3.101)',\
- org.eclipse.equinox.metatype;version='[1.4.100,1.4.101)',\
- org.objectweb.asm;version='[5.0.4,5.0.5)',\
- org.osgi.service.event;version='[1.3.1,1.3.2)',\
- org.osgi.service.metatype;version='[1.3.0,1.3.1)',\
- slf4j.api;version='[1.7.21,1.7.22)',\
+ javax.annotation-api; version='[1.2.0,1.2.1)',\
+ javax.json-api; version='[1.0.0,1.0.1)',\
+ javax.ws.rs-api; version='[2.0.1,2.0.2)',\
+ log4j; version='[1.2.17,1.2.18)',\
+ org.apache.aries.jax.rs.example; version='[1.0.0,1.0.1)',\
+ org.apache.aries.jax.rs.log4j-configuration; version='[1.0.0,1.0.1)',\
+ org.apache.aries.jax.rs.whiteboard; version='[1.0.0,1.0.1)',\
+ 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.gogo.command; version='[1.0.0,1.0.1)',\
+ org.apache.felix.gogo.jline; version='[1.0.0,1.0.1)',\
+ org.apache.felix.gogo.runtime; version='[1.0.0,1.0.1)',\
+ org.apache.felix.http.api; version='[3.0.0,3.0.1)',\
+ org.apache.felix.http.jetty; version='[3.4.0,3.4.1)',\
+ org.apache.felix.http.servlet-api; version='[1.1.2,1.1.3)',\
+ org.apache.felix.scr; version='[2.0.2,2.0.3)',\
+ org.apache.ws.xmlschema.core; version='[2.2.1,2.2.2)',\
+ org.eclipse.equinox.event; version='[1.3.100,1.3.101)',\
+ org.eclipse.equinox.metatype; version='[1.4.100,1.4.101)',\
+ org.jline; version='[3.0.0,3.0.1)',\
+ org.objectweb.asm; version='[5.0.4,5.0.5)',\
+ org.osgi.service.event; version='[1.3.1,1.3.2)',\
+ org.osgi.service.metatype; version='[1.3.0,1.3.1)',\
+ slf4j.api; version='[1.7.21,1.7.22)',\
slf4j.log4j12;version='[1.6.1,1.6.2)'
-runee: JavaSE-1.8
-resolve.effective: resolve, active
--runproperties.eqnx: \
+-runproperties: \
osgi.console.enable.builtin=false, \
osgi.console=, \
org.osgi.service.http.port=8080
-runsystemcapabilities.dflt: ${native_capability}
+-runblacklist:\
+ osgi.identity;filter:='(osgi.identity=org.osgi.compendium)'
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/ed563e77/jax-rs.example-run/pom.xml
----------------------------------------------------------------------
diff --git a/jax-rs.example-run/pom.xml b/jax-rs.example-run/pom.xml
index 4041dd9..17721a2 100644
--- a/jax-rs.example-run/pom.xml
+++ b/jax-rs.example-run/pom.xml
@@ -20,7 +20,7 @@
<version>3.4.0-SNAPSHOT</version>
<configuration>
<failOnChanges>false</failOnChanges>
- <resolve>true</resolve>
+ <resolve>false</resolve>
<bndruns>
<bndrun>example.bndrun</bndrun>
</bndruns>
@@ -44,6 +44,11 @@
</dependency>
<dependency>
<groupId>org.apache.aries</groupId>
+ <artifactId>org.apache.aries.jax.rs.log4j-configuration</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries</groupId>
<artifactId>org.apache.aries.jax.rs.whiteboard</artifactId>
<version>1.0.0-SNAPSHOT</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/ed563e77/jax-rs.itests-run/itest.bndrun
----------------------------------------------------------------------
diff --git a/jax-rs.itests-run/itest.bndrun b/jax-rs.itests-run/itest.bndrun
index 6fb7b34..847b2ae 100644
--- a/jax-rs.itests-run/itest.bndrun
+++ b/jax-rs.itests-run/itest.bndrun
@@ -9,7 +9,8 @@
location=${.}/target/cached.xml
-runrequires: \
- osgi.identity;filter:='(osgi.identity=org.apache.aries.jax.rs.itests)'
+ osgi.identity;filter:='(osgi.identity=org.apache.aries.jax.rs.itests)',\
+ osgi.identity;filter:='(osgi.identity=org.apache.aries.jax.rs.log4j-configuration)'
-runfw: org.eclipse.osgi;version='[3.10.100.v20150529-1857,3.10.100.v20150529-1857]'
@@ -20,7 +21,7 @@
-runsystempackages.eqnx: javax.script
-runsystemcapabilities.dflt: ${native_capability}
--runproperties.eqnx: \
+-runproperties: \
osgi.console.enable.builtin=false, \
osgi.console=, \
org.osgi.service.http.port=8080
@@ -30,6 +31,7 @@
javax.ws.rs-api; version='[2.0.1,2.0.2)',\
log4j; version='[1.2.17,1.2.18)',\
org.apache.aries.jax.rs.itests; version='[1.0.0,1.0.1)',\
+ org.apache.aries.jax.rs.log4j-configuration; version='[1.0.0,1.0.1)',\
org.apache.aries.jax.rs.whiteboard; version='[1.0.0,1.0.1)',\
org.apache.felix.bundlerepository; version='[1.6.0,1.6.1)',\
org.apache.felix.configadmin; version='[1.8.8,1.8.9)',\
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/ed563e77/jax-rs.itests-run/pom.xml
----------------------------------------------------------------------
diff --git a/jax-rs.itests-run/pom.xml b/jax-rs.itests-run/pom.xml
index 5852275..72469c8 100644
--- a/jax-rs.itests-run/pom.xml
+++ b/jax-rs.itests-run/pom.xml
@@ -47,6 +47,11 @@
</dependency>
<dependency>
<groupId>org.apache.aries</groupId>
+ <artifactId>org.apache.aries.jax.rs.log4j-configuration</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries</groupId>
<artifactId>org.apache.aries.jax.rs.whiteboard</artifactId>
<version>1.0.0-SNAPSHOT</version>
</dependency>