You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by cs...@apache.org on 2017/06/30 15:59:39 UTC
[1/4] aries-jax-rs-whiteboard git commit: [JAXRS] fix contract
dependency, per spec embed and provide client builder as a service,
make embedded dependencies provided scope
Repository: aries-jax-rs-whiteboard
Updated Branches:
refs/heads/master 712aff838 -> 5715c1236
[JAXRS] fix contract dependency, per spec embed and provide client builder as a service, make embedded dependencies provided scope
Signed-off-by: Raymond Auge <ra...@liferay.com>
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/faf6b1f6
Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/faf6b1f6
Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/faf6b1f6
Branch: refs/heads/master
Commit: faf6b1f693533efb0c52156d987e467c5e9decbd
Parents: 712aff8
Author: Raymond Auge <ra...@liferay.com>
Authored: Thu Jun 29 14:00:04 2017 -0400
Committer: Raymond Auge <ra...@liferay.com>
Committed: Thu Jun 29 14:00:04 2017 -0400
----------------------------------------------------------------------
jax-rs.whiteboard/bnd.bnd | 13 ++---
jax-rs.whiteboard/pom.xml | 55 ++++++++++++++------
.../activator/CXFJaxRsBundleActivator.java | 7 +++
.../internal/ClientBuilderFactory.java | 37 +++++++++++++
4 files changed, 87 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/faf6b1f6/jax-rs.whiteboard/bnd.bnd
----------------------------------------------------------------------
diff --git a/jax-rs.whiteboard/bnd.bnd b/jax-rs.whiteboard/bnd.bnd
index c421f14..6e8a87e 100644
--- a/jax-rs.whiteboard/bnd.bnd
+++ b/jax-rs.whiteboard/bnd.bnd
@@ -9,9 +9,9 @@ Require-Capability: \
Import-Package:\
!com.sun.*,\
!com.ctc.wstx.*,\
+ !javax.cache.*,\
!javax.imageio.*,\
!javax.jws.*,\
- !javax.net.*,\
!javax.security.*,\
!javax.tools.*,\
!javax.validation.*,\
@@ -37,15 +37,7 @@ Import-Package:\
!org.springframework.*,\
*
-#Provide-Capability:\
-# osgi.contract;\
-# osgi.contract=JavaJAXRS;\
-# uses:="javax.ws.rs,javax.ws.rs.core,javax.ws.rs.client,javax.ws.rs.container,javax.ws.rs.ext";\
-# version:Version=2,\
-# osgi.contract;\
-# osgi.contract=JavaJSONP;\
-# uses:="javax.json,javax.json.spi,javax.json.stream";\
-# version:Version=1
+-contract: JavaJAXRS, JavaServlet
-exportcontents:\
org.apache.aries.jax.rs.whiteboard,\
@@ -56,6 +48,7 @@ Import-Package:\
lib/cxf-core.jar=cxf-core-*.jar;lib:=true,\
lib/cxf-rt-databinding-jaxb.jar=cxf-rt-databinding-jaxb-*.jar;lib:=true,\
lib/cxf-rt-frontend-jaxrs.jar=cxf-rt-frontend-jaxrs-*.jar;lib:=true,\
+ lib/cxf-rt-rs-client.jar=cxf-rt-rs-client-*.jar;lib:=true,\
lib/cxf-rt-rs-extension-providers.jar=cxf-rt-rs-extension-providers-*.jar;lib:=true,\
lib/cxf-rt-transports-http.jar=cxf-rt-transports-http-*.jar;lib:=true,\
lib/cxf-tools-common.jar=cxf-tools-common-*.jar;lib:=true,\
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/faf6b1f6/jax-rs.whiteboard/pom.xml
----------------------------------------------------------------------
diff --git a/jax-rs.whiteboard/pom.xml b/jax-rs.whiteboard/pom.xml
index bac9f1f..47b3f1f 100644
--- a/jax-rs.whiteboard/pom.xml
+++ b/jax-rs.whiteboard/pom.xml
@@ -33,44 +33,74 @@
<dependencies>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>3.0.1</version>
+ <groupId>org.apache.aries.component-dsl</groupId>
+ <artifactId>org.apache.aries.component-dsl.component-dsl</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries.jax.rs</groupId>
+ <artifactId>org.apache.aries.jax.rs.jaxrs.api</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-rs-client</artifactId>
+ <version>${cxf.version}</version>
+ <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.ws.rs</groupId>
+ <artifactId>javax.ws.rs-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-databinding-jaxb</artifactId>
<version>${cxf.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-extension-providers</artifactId>
<version>${cxf.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
<version>${cxf.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http</artifactId>
<version>${cxf.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-tools-common</artifactId>
<version>${cxf.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-tools-validator</artifactId>
<version>${cxf.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.http.servlet-api</artifactId>
+ <version>1.1.2</version>
</dependency>
<dependency>
<groupId>org.codehaus.jettison</groupId>
<artifactId>jettison</artifactId>
<version>1.3.8</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
@@ -84,29 +114,24 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.cmpn</artifactId>
- <version>5.0.0</version>
+ <artifactId>org.osgi.service.http</artifactId>
+ <version>1.2.1</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.service.jaxrs</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <artifactId>org.osgi.service.http.whiteboard</artifactId>
+ <version>1.0.0</version>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.http.api</artifactId>
- <version>3.0.0</version>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.jaxrs</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.2</version>
</dependency>
- <dependency>
- <groupId>org.apache.aries.component-dsl</groupId>
- <artifactId>org.apache.aries.component-dsl.component-dsl</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- </dependency>
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/faf6b1f6/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 3546496..0ede97d 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
@@ -18,10 +18,12 @@
package org.apache.aries.jax.rs.whiteboard.activator;
import javax.servlet.Servlet;
+import javax.ws.rs.client.ClientBuilder;
import javax.ws.rs.core.Application;
import javax.ws.rs.ext.RuntimeDelegate;
import org.apache.aries.jax.rs.whiteboard.internal.CXFJaxRsServiceRegistrator;
+import org.apache.aries.jax.rs.whiteboard.internal.ClientBuilderFactory;
import org.apache.aries.osgi.functional.OSGi;
import org.apache.aries.osgi.functional.OSGiResult;
import org.apache.cxf.Bus;
@@ -57,6 +59,7 @@ public class CXFJaxRsBundleActivator implements BundleActivator {
private OSGiResult<?> _applicationSingletonsResult;
private BundleContext _bundleContext;
private Bus _bus;
+ private ServiceRegistration<ClientBuilder> _clientBuilder;
private OSGiResult<?> _extensionsResult;
private OSGiResult<?> _singletonsResult;
@@ -121,10 +124,14 @@ public class CXFJaxRsBundleActivator implements BundleActivator {
);
_singletonsResult = singletons.run(bundleContext);
+
+ _clientBuilder = _bundleContext.registerService(
+ ClientBuilder.class, new ClientBuilderFactory(), null);
}
@Override
public void stop(BundleContext context) throws Exception {
+ _clientBuilder.unregister();
_applicationsResult.close();
_applicationSingletonsResult.close();
_extensionsResult.close();
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/faf6b1f6/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/ClientBuilderFactory.java
----------------------------------------------------------------------
diff --git a/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/ClientBuilderFactory.java b/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/ClientBuilderFactory.java
new file mode 100644
index 0000000..1d5ff81
--- /dev/null
+++ b/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/ClientBuilderFactory.java
@@ -0,0 +1,37 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.aries.jax.rs.whiteboard.internal;
+
+import javax.ws.rs.client.ClientBuilder;
+
+import org.osgi.framework.Bundle;
+import org.osgi.framework.PrototypeServiceFactory;
+import org.osgi.framework.ServiceRegistration;
+
+public class ClientBuilderFactory implements PrototypeServiceFactory<ClientBuilder> {
+
+ @Override
+ public ClientBuilder getService(Bundle bundle, ServiceRegistration<ClientBuilder> registration) {
+ return new org.apache.cxf.jaxrs.client.spec.ClientBuilderImpl();
+ }
+
+ @Override
+ public void ungetService(Bundle bundle, ServiceRegistration<ClientBuilder> registration, ClientBuilder service) {
+ }
+
+}
\ No newline at end of file
[4/4] aries-jax-rs-whiteboard git commit: complete the pom
Posted by cs...@apache.org.
complete the pom
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/5715c123
Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/5715c123
Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/5715c123
Branch: refs/heads/master
Commit: 5715c123688ccf1472eb457d6f8b2f4360216d48
Parents: 608d9cd
Author: Raymond Auge <ra...@liferay.com>
Authored: Fri Jun 30 10:10:25 2017 -0400
Committer: Raymond Auge <ra...@liferay.com>
Committed: Fri Jun 30 11:12:15 2017 -0400
----------------------------------------------------------------------
pom.xml | 25 ++++++++++++-------------
1 file changed, 12 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/5715c123/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 1391f26..5360543 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,6 +21,13 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache</groupId>
+ <artifactId>apache</artifactId>
+ <version>18</version>
+ </parent>
+
<groupId>org.apache.aries.jax.rs</groupId>
<artifactId>org.apache.aries.jax.rs</artifactId>
<version>0.0.1-SNAPSHOT</version>
@@ -31,19 +38,11 @@
<bnd.version>3.4.0-SNAPSHOT</bnd.version>
</properties>
- <distributionManagement>
- <repository>
- <id>apache.releases.https</id>
- <name>Apache Release Distribution Repository</name>
- <url>https://repository.apache.org/service/local/staging/deploy/maven2</url>
- </repository>
- <snapshotRepository>
- <id>apache.snapshots.https</id>
- <name>Apache Development Snapshot Repository</name>
- <url>https://repository.apache.org/content/repositories/snapshots</url>
- <uniqueVersion>false</uniqueVersion>
- </snapshotRepository>
- </distributionManagement>
+ <scm>
+ <connection>scm:git:git://git.apache.org/aries-jax-rs-whiteboard.git</connection>
+ <developerConnection>scm:git:git://git.apache.org/aries-jax-rs-whiteboard.git</developerConnection>
+ <url>git://git.apache.org/aries-jax-rs-whiteboard.git</url>
+ </scm>
<build>
<pluginManagement>
[3/4] aries-jax-rs-whiteboard git commit: [JAXRS] fix examples
Posted by cs...@apache.org.
[JAXRS] fix examples
Signed-off-by: Raymond Auge <ra...@liferay.com>
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/608d9cdf
Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/608d9cdf
Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/608d9cdf
Branch: refs/heads/master
Commit: 608d9cdf7ec8e5221eca88f231e07655bfd1c531
Parents: 9577e66
Author: Raymond Auge <ra...@liferay.com>
Authored: Thu Jun 29 14:01:03 2017 -0400
Committer: Raymond Auge <ra...@liferay.com>
Committed: Fri Jun 30 09:50:08 2017 -0400
----------------------------------------------------------------------
jax-rs.example/example.bndrun | 49 +++++++--------
jax-rs.example/pom.xml | 63 ++++++++++++++++----
.../aries/jax/rs/example/ExampleAddon.java | 7 ++-
.../jax/rs/example/ExampleApplication.java | 7 ++-
.../aries/jax/rs/example/ExampleFilter.java | 7 ++-
pom.xml | 14 +++++
6 files changed, 105 insertions(+), 42 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/608d9cdf/jax-rs.example/example.bndrun
----------------------------------------------------------------------
diff --git a/jax-rs.example/example.bndrun b/jax-rs.example/example.bndrun
index 539323a..4a0a84a 100644
--- a/jax-rs.example/example.bndrun
+++ b/jax-rs.example/example.bndrun
@@ -1,48 +1,49 @@
-standalone: ${.}/target/index.xml
--include: ${.}/augments.bnd
+#-include: ${.}/augments.bnd
-resourceonly: true
-runrequires: \
osgi.identity;filter:='(osgi.identity=org.apache.aries.jax.rs.example)',\
osgi.identity;filter:='(osgi.identity=org.apache.aries.jax.rs.whiteboard)',\
+ osgi.identity;filter:='(osgi.identity=org.apache.felix.gogo.command)',\
osgi.identity;filter:='(osgi.identity=org.apache.felix.gogo.jline)',\
osgi.identity;filter:='(osgi.identity=slf4j.log4j12)'
-runfw: org.eclipse.osgi;version='[3.10.100.v20150529-1857,3.10.100.v20150529-1857]'
+
+-runee: JavaSE-1.8
+-resolve.effective: resolve, active
+-runproperties: \
+ log4j.configuration=file:${.}/log4j.properties,\
+ osgi.console.enable.builtin=false, \
+ osgi.console=, \
+ org.osgi.service.http.port=8080
+-runsystemcapabilities: ${native_capability}
+-runblacklist:\
+ osgi.identity;filter:='(osgi.identity=org.osgi.compendium)',\
+ osgi.identity;filter:='(osgi.identity=osgi.cmpn)'
+
-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='[0.0.1,0.0.2)',\
+ org.apache.aries.jax.rs.jaxrs.api;version='[0.0.1,0.0.2)',\
org.apache.aries.jax.rs.whiteboard;version='[0.0.1,0.0.2)',\
- org.apache.felix.bundlerepository;version='[1.6.0,1.6.1)',\
+ org.apache.felix.configadmin;version='[1.8.14,1.8.15)',\
org.apache.felix.eventadmin;version='[1.4.8,1.4.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.gogo.command;version='[1.0.2,1.0.3)',\
+ org.apache.felix.gogo.jline;version='[1.0.6,1.0.7)',\
+ org.apache.felix.gogo.runtime;version='[1.0.6,1.0.7)',\
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.8,2.0.9)',\
org.apache.ws.xmlschema.core;version='[2.2.1,2.2.2)',\
- org.eclipse.equinox.metatype;version='[1.4.100,1.4.101)',\
- org.jline;version='[3.0.0,3.0.1)',\
+ org.jline;version='[3.2.0,3.2.1)',\
org.objectweb.asm;version='[5.0.4,5.0.5)',\
- org.osgi.service.cm;version='[1.5.0,1.5.1)',\
- org.osgi.service.metatype;version='[1.3.0,1.3.1)',\
+ 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.21,1.7.22)',\
slf4j.log4j12;version='[1.6.1,1.6.2)'
-
--runee: JavaSE-1.8
--resolve.effective: resolve, active
--runproperties: \
- log4j.configuration=file:${.}/log4j.properties,\
- osgi.console.enable.builtin=false, \
- osgi.console=, \
- org.osgi.service.http.port=8080
--runsystemcapabilities: ${native_capability}
--runblacklist:\
- osgi.identity;filter:='(osgi.identity=org.osgi.compendium)',\
- osgi.identity;filter:='(osgi.identity=osgi.cmpn)'
-
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/608d9cdf/jax-rs.example/pom.xml
----------------------------------------------------------------------
diff --git a/jax-rs.example/pom.xml b/jax-rs.example/pom.xml
index 21eef6d..128f20f 100644
--- a/jax-rs.example/pom.xml
+++ b/jax-rs.example/pom.xml
@@ -83,19 +83,30 @@
<version>1.6.1</version>
</dependency>
<dependency>
- <groupId>javax.json</groupId>
- <artifactId>javax.json-api</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.core</artifactId>
<version>6.0.0</version>
</dependency>
<dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.json</groupId>
+ <artifactId>javax.json-api</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.aries.jax.rs</groupId>
- <artifactId>org.apache.aries.jax.rs.log4j-configuration</artifactId>
+ <artifactId>org.apache.aries.jax.rs.jaxrs.api</artifactId>
<version>0.0.1-SNAPSHOT</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.servicemix.specs</groupId>
+ <artifactId>org.apache.servicemix.specs.jsr339-api-2.0.1</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.aries.jax.rs</groupId>
@@ -104,6 +115,11 @@
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.configadmin</artifactId>
+ <version>1.8.14</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.eventadmin</artifactId>
<version>1.4.8</version>
</dependency>
@@ -120,12 +136,17 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.gogo.command</artifactId>
- <version>1.0.0</version>
+ <version>1.0.2</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.gogo.jline</artifactId>
- <version>1.0.0</version>
+ <version>1.0.6</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.gogo.runtime</artifactId>
+ <version>1.0.6</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
@@ -133,6 +154,11 @@
<version>2.0.8</version>
</dependency>
<dependency>
+ <groupId>org.apache.ws.xmlschema</groupId>
+ <artifactId>xmlschema-core</artifactId>
+ <version>2.2.1</version>
+ </dependency>
+ <dependency>
<groupId>org.osgi</groupId>
<artifactId>org.eclipse.equinox.metatype</artifactId>
<version>1.4.100.v20150408-1437</version>
@@ -153,9 +179,24 @@
<version>1.3.0</version>
</dependency>
<dependency>
- <groupId>org.apache.aries.jax.rs</groupId>
- <artifactId>javax.ws.rs_2.0</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <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>
</dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/608d9cdf/jax-rs.example/src/main/java/org/apache/aries/jax/rs/example/ExampleAddon.java
----------------------------------------------------------------------
diff --git a/jax-rs.example/src/main/java/org/apache/aries/jax/rs/example/ExampleAddon.java b/jax-rs.example/src/main/java/org/apache/aries/jax/rs/example/ExampleAddon.java
index 0be9571..d2646dd 100644
--- a/jax-rs.example/src/main/java/org/apache/aries/jax/rs/example/ExampleAddon.java
+++ b/jax-rs.example/src/main/java/org/apache/aries/jax/rs/example/ExampleAddon.java
@@ -18,6 +18,7 @@
package org.apache.aries.jax.rs.example;
import org.osgi.service.component.annotations.Component;
+import org.osgi.service.jaxrs.whiteboard.JaxRSWhiteboardConstants;
import javax.annotation.PostConstruct;
import javax.ws.rs.GET;
@@ -27,8 +28,10 @@ import javax.ws.rs.core.Context;
import javax.ws.rs.core.UriInfo;
@Component(
- immediate = true,
- property = "osgi.jaxrs.resource.base=/examples/example-addon",
+ property = {
+ JaxRSWhiteboardConstants.JAX_RS_APPLICATION_SELECT + "=(osgi.jaxrs.name=example-application)",
+ JaxRSWhiteboardConstants.JAX_RS_RESOURCE + "=true"
+ },
service = ExampleAddon.class
)
public class ExampleAddon {
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/608d9cdf/jax-rs.example/src/main/java/org/apache/aries/jax/rs/example/ExampleApplication.java
----------------------------------------------------------------------
diff --git a/jax-rs.example/src/main/java/org/apache/aries/jax/rs/example/ExampleApplication.java b/jax-rs.example/src/main/java/org/apache/aries/jax/rs/example/ExampleApplication.java
index 6148beb..a38c430 100644
--- a/jax-rs.example/src/main/java/org/apache/aries/jax/rs/example/ExampleApplication.java
+++ b/jax-rs.example/src/main/java/org/apache/aries/jax/rs/example/ExampleApplication.java
@@ -18,6 +18,7 @@
package org.apache.aries.jax.rs.example;
import org.osgi.service.component.annotations.Component;
+import org.osgi.service.jaxrs.whiteboard.JaxRSWhiteboardConstants;
import javax.ws.rs.GET;
import javax.ws.rs.Produces;
@@ -26,8 +27,10 @@ import java.util.Collections;
import java.util.Set;
@Component(
- immediate = true,
- property = "osgi.jaxrs.application.base=/example-application",
+ property = {
+ JaxRSWhiteboardConstants.JAX_RS_APPLICATION_BASE + "=/example-application",
+ JaxRSWhiteboardConstants.JAX_RS_NAME + "=example-application"
+ },
service = Application.class
)
public class ExampleApplication extends Application {
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/608d9cdf/jax-rs.example/src/main/java/org/apache/aries/jax/rs/example/ExampleFilter.java
----------------------------------------------------------------------
diff --git a/jax-rs.example/src/main/java/org/apache/aries/jax/rs/example/ExampleFilter.java b/jax-rs.example/src/main/java/org/apache/aries/jax/rs/example/ExampleFilter.java
index 48425f3..fb051f0 100644
--- a/jax-rs.example/src/main/java/org/apache/aries/jax/rs/example/ExampleFilter.java
+++ b/jax-rs.example/src/main/java/org/apache/aries/jax/rs/example/ExampleFilter.java
@@ -18,6 +18,7 @@
package org.apache.aries.jax.rs.example;
import org.osgi.service.component.annotations.Component;
+import org.osgi.service.jaxrs.whiteboard.JaxRSWhiteboardConstants;
import javax.ws.rs.container.ContainerRequestContext;
import javax.ws.rs.container.ContainerRequestFilter;
@@ -25,10 +26,10 @@ import javax.ws.rs.ext.Provider;
import java.io.IOException;
@Component(
- immediate = true,
property = {
- "jaxrs.application.select=(component.name=org.apache.aries.jax.rs.example.ExampleApplication)",
- "osgi.jaxrs.filter.base=/examples"
+ "osgi.jaxrs.filter.base=/examples",
+ JaxRSWhiteboardConstants.JAX_RS_APPLICATION_SELECT + "=(osgi.jaxrs.name=example-application)",
+ JaxRSWhiteboardConstants.JAX_RS_EXTENSION + "=true"
}
)
@Provider
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/608d9cdf/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index def5ee6..1391f26 100644
--- a/pom.xml
+++ b/pom.xml
@@ -112,6 +112,20 @@
</plugin>
<plugin>
<groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-resolver-maven-plugin</artifactId>
+ <version>${bnd.version}</version>
+ <executions>
+ <execution>
+ <id>resolve</id>
+ <goals>
+ <goal>resolve</goal>
+ </goals>
+ <phase>package</phase>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>biz.aQute.bnd</groupId>
<artifactId>bnd-maven-plugin</artifactId>
<version>${bnd.version}</version>
<executions>
[2/4] aries-jax-rs-whiteboard git commit: [JAXRS] fix tests
Posted by cs...@apache.org.
[JAXRS] fix tests
Signed-off-by: Raymond Auge <ra...@liferay.com>
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/9577e66a
Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/9577e66a
Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/9577e66a
Branch: refs/heads/master
Commit: 9577e66a4c536cee2d2649c77849012aabd97dc9
Parents: faf6b1f
Author: Raymond Auge <ra...@liferay.com>
Authored: Thu Jun 29 14:00:51 2017 -0400
Committer: Raymond Auge <ra...@liferay.com>
Committed: Thu Jun 29 14:00:51 2017 -0400
----------------------------------------------------------------------
jax-rs.itests/bnd.bnd | 2 +
jax-rs.itests/itest.bndrun | 26 +++++-------
jax-rs.itests/pom.xml | 43 +++++++++++++-------
jax-rs.itests/src/main/java/test/JaxrsTest.java | 29 +++++++++----
4 files changed, 63 insertions(+), 37 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/9577e66a/jax-rs.itests/bnd.bnd
----------------------------------------------------------------------
diff --git a/jax-rs.itests/bnd.bnd b/jax-rs.itests/bnd.bnd
index f601893..08f3ff5 100644
--- a/jax-rs.itests/bnd.bnd
+++ b/jax-rs.itests/bnd.bnd
@@ -3,3 +3,5 @@ Bundle-Description: Integration Test bundle for the JAX-RS extender
Test-Cases: \
${classes;CONCRETE;EXTENDS;junit.framework.TestCase},\
${classes;CONCRETE;ANNOTATED;org.junit.Test}
+
+-contract: JavaJAXRS
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/9577e66a/jax-rs.itests/itest.bndrun
----------------------------------------------------------------------
diff --git a/jax-rs.itests/itest.bndrun b/jax-rs.itests/itest.bndrun
index b8cd6ef..b3fc4db 100644
--- a/jax-rs.itests/itest.bndrun
+++ b/jax-rs.itests/itest.bndrun
@@ -23,27 +23,23 @@
osgi.identity;filter:='(osgi.identity=osgi.cmpn)'
-runbundles: \
javax.annotation-api;version='[1.2.0,1.2.1)',\
- org.apache.aries.jax.rs.javax.ws.rs_2.0;version='[0.0.1,0.0.2)',\
+ javax.json-api;version='[1.0.0,1.0.1)',\
log4j;version='[1.2.17,1.2.18)',\
org.apache.aries.jax.rs.itests;version='[0.0.1,0.0.2)',\
- org.apache.cxf.cxf-core;version='[3.1.10,3.1.11)',\
- org.apache.cxf.cxf-rt-transports-http;version='[3.1.10,3.1.11)',\
- org.apache.cxf.cxf-rt-frontend-jaxrs;version='[3.1.10,3.1.11)',\
- org.apache.cxf.cxf-rt-rs-client;version='[3.1.10,3.1.11)',\
- org.apache.ws.xmlschema.core;version='[2.2.1,2.2.2)',\
- org.osgi.service.jaxrs;version='[1.0.0,2.0.0)',\
- org.osgi.util.function;version='[1.1.0,2.0.0)',\
- org.osgi.util.promise;version='[1.1.0,2.0.0)',\
- osgi.enroute.hamcrest.wrapper;version='[1.3.0,1.3.1)',\
- osgi.enroute.junit.wrapper;version='[4.12.0,4.12.1)',\
- javax.json-api;version='[1.0.0,1.0.1)',\
+ org.apache.aries.jax.rs.jaxrs.api;version='[0.0.1,0.0.2)',\
org.apache.aries.jax.rs.whiteboard;version='[0.0.1,0.0.2)',\
+ org.apache.felix.configadmin;version='[1.8.14,1.8.15)',\
+ org.apache.felix.eventadmin;version='[1.4.8,1.4.9)',\
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.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.21,1.7.22)',\
- slf4j.log4j12;version='[1.6.1,1.6.2)',\
- org.apache.felix.eventadmin;version='[1.4.8,1.4.9)',\
- org.osgi.service.cm;version='[1.5.0,1.5.1)'
+ slf4j.log4j12;version='[1.6.1,1.6.2)'
#-runvm: "-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5005"
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/9577e66a/jax-rs.itests/pom.xml
----------------------------------------------------------------------
diff --git a/jax-rs.itests/pom.xml b/jax-rs.itests/pom.xml
index 83817ed..0648798 100644
--- a/jax-rs.itests/pom.xml
+++ b/jax-rs.itests/pom.xml
@@ -91,13 +91,18 @@
<version>6.0.0</version>
</dependency>
<dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>1.2</version>
+ </dependency>
+ <dependency>
<groupId>javax.json</groupId>
<artifactId>javax.json-api</artifactId>
<version>1.0</version>
</dependency>
<dependency>
<groupId>org.apache.aries.jax.rs</groupId>
- <artifactId>org.apache.aries.jax.rs.log4j-configuration</artifactId>
+ <artifactId>org.apache.aries.jax.rs.jaxrs.api</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>
<dependency>
@@ -106,9 +111,9 @@
<version>0.0.1-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-rs-client</artifactId>
- <version>${cxf.version}</version>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.configadmin</artifactId>
+ <version>1.8.14</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
@@ -126,18 +131,33 @@
<version>1.1.2</version>
</dependency>
<dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.scr</artifactId>
+ <version>2.0.8</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ws.xmlschema</groupId>
+ <artifactId>xmlschema-core</artifactId>
+ <version>2.2.1</version>
+ </dependency>
+ <dependency>
<groupId>org.osgi</groupId>
<artifactId>org.eclipse.osgi</artifactId>
<version>3.10.100.v20150529-1857</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.util.promise</artifactId>
+ <artifactId>org.osgi.util.function</artifactId>
<version>LATEST</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.util.function</artifactId>
+ <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>
@@ -151,14 +171,9 @@
<version>1.3.0</version>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.service.jaxrs</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.jax.rs</groupId>
- <artifactId>javax.ws.rs_2.0</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm</artifactId>
+ <version>5.0.4</version>
</dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/9577e66a/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 5fd2b3d..1c6e8e7 100644
--- a/jax-rs.itests/src/main/java/test/JaxrsTest.java
+++ b/jax-rs.itests/src/main/java/test/JaxrsTest.java
@@ -23,6 +23,8 @@ import static org.osgi.service.jaxrs.whiteboard.JaxRSWhiteboardConstants.*;
import java.util.Dictionary;
import java.util.Hashtable;
+import org.junit.After;
+import org.junit.Before;
import org.junit.Test;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
@@ -52,6 +54,20 @@ import static org.junit.Assert.assertNull;
public class JaxrsTest {
+ private ServiceTracker<ClientBuilder, ClientBuilder> _clientBuilderTracker;
+
+ @After
+ public void after() {
+ _clientBuilderTracker.close();
+ }
+
+ @Before
+ public void before() {
+ _clientBuilderTracker = new ServiceTracker<>(bundleContext, ClientBuilder.class, null);
+
+ _clientBuilderTracker.open();
+ }
+
@Test
public void testApplication() {
ServiceRegistration<?> serviceRegistration = null;
@@ -677,18 +693,15 @@ public class JaxrsTest {
}
private Client createClient() {
- Thread thread = Thread.currentThread();
-
- ClassLoader contextClassLoader = thread.getContextClassLoader();
+ ClientBuilder clientBuilder;
try {
- thread.setContextClassLoader(
- org.apache.cxf.jaxrs.client.Client.class.getClassLoader());
+ clientBuilder = _clientBuilderTracker.waitForService(5000);
- return ClientBuilder.newClient();
+ return clientBuilder.build();
}
- finally {
- thread.setContextClassLoader(contextClassLoader);
+ catch (InterruptedException ie) {
+ throw new RuntimeException(ie);
}
}