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 2018/06/26 08:29:12 UTC
[1/9] aries-jax-rs-whiteboard git commit: Source cleaning
Repository: aries-jax-rs-whiteboard
Updated Branches:
refs/heads/master cd85e6706 -> f39982df0
Source 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/59bbb2db
Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/59bbb2db
Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/59bbb2db
Branch: refs/heads/master
Commit: 59bbb2db377e6c92146457dddf7c16ddeed276d2
Parents: cd85e67
Author: Carlos Sierra <cs...@apache.org>
Authored: Mon Jun 25 17:23:14 2018 +0200
Committer: Carlos Sierra <cs...@apache.org>
Committed: Mon Jun 25 17:24:50 2018 +0200
----------------------------------------------------------------------
jax-rs.itests-jaxb-json/src/main/java/test/JaxbJsonTest.java | 2 --
.../aries/jax/rs/jaxb/json/activator/JaxbJsonBundleActivator.java | 3 ++-
2 files changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/59bbb2db/jax-rs.itests-jaxb-json/src/main/java/test/JaxbJsonTest.java
----------------------------------------------------------------------
diff --git a/jax-rs.itests-jaxb-json/src/main/java/test/JaxbJsonTest.java b/jax-rs.itests-jaxb-json/src/main/java/test/JaxbJsonTest.java
index f2e15ce..0a9ee48 100644
--- a/jax-rs.itests-jaxb-json/src/main/java/test/JaxbJsonTest.java
+++ b/jax-rs.itests-jaxb-json/src/main/java/test/JaxbJsonTest.java
@@ -35,8 +35,6 @@ public class JaxbJsonTest extends TestHelper {
String response = webTarget.request().get(String.class);
- System.out.println(response);
-
assertTrue(response.contains("value"));
}
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/59bbb2db/jax-rs.jaxb-json/src/main/java/org/apache/aries/jax/rs/jaxb/json/activator/JaxbJsonBundleActivator.java
----------------------------------------------------------------------
diff --git a/jax-rs.jaxb-json/src/main/java/org/apache/aries/jax/rs/jaxb/json/activator/JaxbJsonBundleActivator.java b/jax-rs.jaxb-json/src/main/java/org/apache/aries/jax/rs/jaxb/json/activator/JaxbJsonBundleActivator.java
index 78d77df..ab549a0 100644
--- a/jax-rs.jaxb-json/src/main/java/org/apache/aries/jax/rs/jaxb/json/activator/JaxbJsonBundleActivator.java
+++ b/jax-rs.jaxb-json/src/main/java/org/apache/aries/jax/rs/jaxb/json/activator/JaxbJsonBundleActivator.java
@@ -38,6 +38,7 @@ import java.util.Optional;
import static org.apache.aries.component.dsl.OSGi.all;
import static org.apache.aries.component.dsl.OSGi.coalesce;
+import static org.apache.aries.component.dsl.OSGi.combine;
import static org.apache.aries.component.dsl.OSGi.configuration;
import static org.apache.aries.component.dsl.OSGi.configurations;
import static org.apache.aries.component.dsl.OSGi.just;
@@ -94,7 +95,7 @@ public class JaxbJsonBundleActivator implements BundleActivator {
name = nameObject.toString();
}
- return OSGi.combine(
+ return combine(
JsonProviderPrototypeServiceFactory::new,
just(properties),
getStaticOptionalServices(name, TypeConverter.class),
[2/9] aries-jax-rs-whiteboard git commit: Use released libraries
Posted by cs...@apache.org.
Use released libraries
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/21c72a90
Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/21c72a90
Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/21c72a90
Branch: refs/heads/master
Commit: 21c72a906f7cc4cd2ef72cfb187afb18c7551d43
Parents: 59bbb2d
Author: Carlos Sierra <cs...@apache.org>
Authored: Mon Jun 18 13:05:31 2018 +0200
Committer: Carlos Sierra <cs...@apache.org>
Committed: Tue Jun 26 09:44:53 2018 +0200
----------------------------------------------------------------------
javax.jax.rs-api/README | 12 ------------
javax.jax.rs-api/bnd.bnd | 9 +++++++--
javax.jax.rs-api/pom.xml | 32 +++++++++++++++----------------
jax-rs.itests-jaxb-json/itest.bndrun | 4 ++--
jax-rs.itests-jsonb/itest.bndrun | 5 +++--
jax-rs.itests-jsonp/itest.bndrun | 5 +++--
jax-rs.itests/itest.bndrun | 4 ++--
jax-rs.whiteboard/pom.xml | 6 +++---
8 files changed, 36 insertions(+), 41 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/21c72a90/javax.jax.rs-api/README
----------------------------------------------------------------------
diff --git a/javax.jax.rs-api/README b/javax.jax.rs-api/README
deleted file mode 100644
index 646a59e..0000000
--- a/javax.jax.rs-api/README
+++ /dev/null
@@ -1,12 +0,0 @@
-
-Apache Aries JAX-RS Specification API
-Copyright 2017 The Apache Software Foundation
-
-This product includes software originating from [1] repackaged under the
-CDDL-1.1 license.
-
-The repackaging adds additional OSGi metadata following the directions
-located at [2].
-
-[1] https://jcp.org/en/jsr/detail?id=370
-[2] http://apache.org/legal/resolved.html#osgi-category-b
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/21c72a90/javax.jax.rs-api/bnd.bnd
----------------------------------------------------------------------
diff --git a/javax.jax.rs-api/bnd.bnd b/javax.jax.rs-api/bnd.bnd
index fcec762..3b68be4 100644
--- a/javax.jax.rs-api/bnd.bnd
+++ b/javax.jax.rs-api/bnd.bnd
@@ -18,7 +18,10 @@
# Keep -include instruction first because order matters
-include: ${.}/target/sources/META-INF/MANIFEST.MF
-Bundle-License: CDDL-1.1;link="https://spdx.org/licenses/CDDL-1.1.html"
+Import-Package:\
+ org.apache.geronimo.osgi.registry.api;resolution:=optional,\
+ *
+
Provide-Capability:\
osgi.contract;\
osgi.contract=JavaJAXRS;\
@@ -27,5 +30,7 @@ Provide-Capability:\
-exportcontents: javax.ws.rs.*;version='2.1'
--includeresource: META-INF/README=README
+-includeresource:\
+ lib/geronimo-osgi-locator.jar=geronimo-osgi-locator-*.jar;lib:=true
+
-removeheaders: Archiver-Version, Created-By, Built-By, Build-Jdk
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/21c72a90/javax.jax.rs-api/pom.xml
----------------------------------------------------------------------
diff --git a/javax.jax.rs-api/pom.xml b/javax.jax.rs-api/pom.xml
index a79f084..a347866 100644
--- a/javax.jax.rs-api/pom.xml
+++ b/javax.jax.rs-api/pom.xml
@@ -32,27 +32,12 @@
<name>Apache Aries JAX-RS Specification API</name>
<version>0.0.1-SNAPSHOT</version>
- <properties>
- <spec.groupId>javax.ws.rs</spec.groupId>
- <spec.artifactId>javax.ws.rs-api</spec.artifactId>
- <spec.version>2.1</spec.version>
- <remoteresources.skip>true</remoteresources.skip>
- </properties>
-
- <licenses>
- <license>
- <name>CDDL-1.1</name>
- <url>https://spdx.org/licenses/CDDL-1.1.html</url>
- <comments>This project uses the javax.ws.rs API artifact under the terms of the CDDL-1.1 license.</comments>
- </license>
- </licenses>
-
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <configuration>
+ <configuration>
<archive>
<manifest>
<addDefaultImplementationEntries>false</addDefaultImplementationEntries>
@@ -96,4 +81,19 @@
</plugins>
<sourceDirectory>${project.build.directory}/sources</sourceDirectory>
</build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-osgi-locator</artifactId>
+ <version>1.0</version>
+ </dependency>
+ </dependencies>
+
+ <properties>
+ <spec.groupId>org.apache.geronimo.specs</spec.groupId>
+ <spec.artifactId>geronimo-jaxrs_2.1_spec</spec.artifactId>
+ <spec.version>1.0</spec.version>
+ <remoteresources.skip>true</remoteresources.skip>
+ </properties>
</project>
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/21c72a90/jax-rs.itests-jaxb-json/itest.bndrun
----------------------------------------------------------------------
diff --git a/jax-rs.itests-jaxb-json/itest.bndrun b/jax-rs.itests-jaxb-json/itest.bndrun
index 2a0a0ea..ae50046 100644
--- a/jax-rs.itests-jaxb-json/itest.bndrun
+++ b/jax-rs.itests-jaxb-json/itest.bndrun
@@ -26,7 +26,6 @@
-runbundles: \
ch.qos.logback.classic;version='[1.2.3,1.2.4)',\
ch.qos.logback.core;version='[1.2.3,1.2.4)',\
- org.apache.aries.javax.annotation-api;version='[0.0.1,0.0.2)',\
org.apache.aries.javax.jax.rs-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)',\
@@ -43,5 +42,6 @@
org.apache.servicemix.specs.json-api-1.1;version='[2.9.0,2.9.1)',\
org.apache.aries.jax.rs.itests-jaxb-json;version='[0.0.1,0.0.2)',\
org.apache.aries.jax.rs.jaxb.json;version='[0.0.1,0.0.2)',\
- org.apache.aries.jax.rs.itests-fragment;version='[0.0.1,0.0.2)'
+ org.apache.aries.jax.rs.itests-fragment;version='[0.0.1,0.0.2)',\
+ org.apache.servicemix.specs.annotation-api-1.3;version='[1.3.0,1.3.1)'
-include: -personal.bnd
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/21c72a90/jax-rs.itests-jsonb/itest.bndrun
----------------------------------------------------------------------
diff --git a/jax-rs.itests-jsonb/itest.bndrun b/jax-rs.itests-jsonb/itest.bndrun
index 5c93446..ed3d612 100644
--- a/jax-rs.itests-jsonb/itest.bndrun
+++ b/jax-rs.itests-jsonb/itest.bndrun
@@ -26,7 +26,6 @@
-runbundles: \
ch.qos.logback.classic;version='[1.2.3,1.2.4)',\
ch.qos.logback.core;version='[1.2.3,1.2.4)',\
- org.apache.aries.javax.annotation-api;version='[0.0.1,0.0.2)',\
org.apache.aries.javax.jax.rs-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)',\
@@ -43,5 +42,7 @@
org.apache.aries.jax.rs.jsonb;version='[0.0.1,0.0.2)',\
org.apache.servicemix.specs.json-api-1.1;version='[2.9.0,2.9.1)',\
org.apache.aries.jax.rs.itests-jsonb;version='[0.0.1,0.0.2)',\
- javax.json.bind-api;version='[1.0.0,1.0.1)'
+ javax.json.bind-api;version='[1.0.0,1.0.1)',\
+ javax.ws.rs-api;version='[2.1.0,2.1.1)',\
+ org.apache.servicemix.specs.annotation-api-1.3;version='[1.3.0,1.3.1)'
-include: -personal.bnd
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/21c72a90/jax-rs.itests-jsonp/itest.bndrun
----------------------------------------------------------------------
diff --git a/jax-rs.itests-jsonp/itest.bndrun b/jax-rs.itests-jsonp/itest.bndrun
index d82927d..341d97f 100644
--- a/jax-rs.itests-jsonp/itest.bndrun
+++ b/jax-rs.itests-jsonp/itest.bndrun
@@ -26,7 +26,6 @@
-runbundles: \
ch.qos.logback.classic;version='[1.2.3,1.2.4)',\
ch.qos.logback.core;version='[1.2.3,1.2.4)',\
- org.apache.aries.javax.annotation-api;version='[0.0.1,0.0.2)',\
org.apache.aries.javax.jax.rs-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)',\
@@ -42,5 +41,7 @@
slf4j.api;version='[1.7.25,1.7.26)',\
org.apache.aries.jax.rs.jsonp;version='[0.0.1,0.0.2)',\
org.apache.servicemix.specs.json-api-1.1;version='[2.9.0,2.9.1)',\
- org.apache.aries.jax.rs.itests-jsonp;version='[0.0.1,0.0.2)'
+ org.apache.aries.jax.rs.itests-jsonp;version='[0.0.1,0.0.2)',\
+ javax.ws.rs-api;version='[2.1.0,2.1.1)',\
+ org.apache.servicemix.specs.annotation-api-1.3;version='[1.3.0,1.3.1)'
-include: -personal.bnd
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/21c72a90/jax-rs.itests/itest.bndrun
----------------------------------------------------------------------
diff --git a/jax-rs.itests/itest.bndrun b/jax-rs.itests/itest.bndrun
index 8839de2..8ad686b 100644
--- a/jax-rs.itests/itest.bndrun
+++ b/jax-rs.itests/itest.bndrun
@@ -25,7 +25,6 @@
-runbundles: \
ch.qos.logback.classic;version='[1.2.3,1.2.4)',\
ch.qos.logback.core;version='[1.2.3,1.2.4)',\
- org.apache.aries.javax.annotation-api;version='[0.0.1,0.0.2)',\
org.apache.aries.javax.jax.rs-api;version='[0.0.1,0.0.2)',\
org.apache.aries.jax.rs.itests-fragment;version='[0.0.1,0.0.2)',\
org.apache.aries.jax.rs.itests;version='[0.0.1,0.0.2)',\
@@ -40,6 +39,7 @@
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)'
+ slf4j.api;version='[1.7.25,1.7.26)',\
+ org.apache.servicemix.specs.annotation-api-1.3;version='[1.3.0,1.3.1)'
-include: -personal.bnd
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/21c72a90/jax-rs.whiteboard/pom.xml
----------------------------------------------------------------------
diff --git a/jax-rs.whiteboard/pom.xml b/jax-rs.whiteboard/pom.xml
index c7519fd..2c952f5 100644
--- a/jax-rs.whiteboard/pom.xml
+++ b/jax-rs.whiteboard/pom.xml
@@ -39,9 +39,9 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.aries.spec</groupId>
- <artifactId>org.apache.aries.javax.annotation-api</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <groupId>org.apache.servicemix.specs</groupId>
+ <artifactId>org.apache.servicemix.specs.annotation-api-1.3</artifactId>
+ <version>1.3_1</version>
</dependency>
<dependency>
<groupId>org.apache.aries.spec</groupId>
[4/9] aries-jax-rs-whiteboard git commit: Remove non releasable
modules
Posted by cs...@apache.org.
Remove non releasable modules
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/55cb9600
Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/55cb9600
Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/55cb9600
Branch: refs/heads/master
Commit: 55cb9600054f7756e04a57362facefdde99c904e
Parents: 21c72a9
Author: Carlos Sierra <cs...@apache.org>
Authored: Mon Jun 25 17:31:38 2018 +0200
Committer: Carlos Sierra <cs...@apache.org>
Committed: Tue Jun 26 09:45:06 2018 +0200
----------------------------------------------------------------------
jax-rs.example/LICENSE | 202 ------------
jax-rs.example/example.bndrun | 46 ---
jax-rs.example/logback.xml | 17 -
jax-rs.example/pom.xml | 186 -----------
.../aries/jax/rs/example/ExampleAddon.java | 56 ----
.../aries/jax/rs/example/ExampleFilter.java | 56 ----
jax-rs.itests-jsonb/LICENSE | 202 ------------
jax-rs.itests-jsonb/bnd.bnd | 24 --
jax-rs.itests-jsonb/itest.bndrun | 48 ---
jax-rs.itests-jsonb/logback.xml | 15 -
jax-rs.itests-jsonb/pom.xml | 198 ------------
.../src/main/java/test/JsonBTest.java | 43 ---
.../src/main/java/test/types/DataObject.java | 32 --
.../src/main/java/test/types/TestHelper.java | 309 -------------------
.../main/java/test/types/TestJSONBAddon.java | 38 ---
jax-rs.itests-jsonp/LICENSE | 202 ------------
jax-rs.itests-jsonp/bnd.bnd | 24 --
jax-rs.itests-jsonp/itest.bndrun | 47 ---
jax-rs.itests-jsonp/logback.xml | 15 -
jax-rs.itests-jsonp/pom.xml | 192 ------------
.../src/main/java/test/JsonPTest.java | 39 ---
.../main/java/test/types/TestApplication.java | 40 ---
.../src/main/java/test/types/TestHelper.java | 309 -------------------
.../main/java/test/types/TestJSONPAddon.java | 39 ---
jax-rs.jsonb/.gitignore | 2 -
jax-rs.jsonb/LICENSE | 202 ------------
jax-rs.jsonb/bnd.bnd | 29 --
jax-rs.jsonb/pom.xml | 102 ------
.../jsonp/activator/JsonbBundleActivator.java | 106 -------
jax-rs.jsonp/LICENSE | 202 ------------
jax-rs.jsonp/bnd.bnd | 23 --
jax-rs.jsonp/pom.xml | 102 ------
.../jsonp/activator/JsonpBundleActivator.java | 96 ------
pom.xml | 5 -
34 files changed, 3248 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/55cb9600/jax-rs.example/LICENSE
----------------------------------------------------------------------
diff --git a/jax-rs.example/LICENSE b/jax-rs.example/LICENSE
deleted file mode 100644
index d645695..0000000
--- a/jax-rs.example/LICENSE
+++ /dev/null
@@ -1,202 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed 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.
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/55cb9600/jax-rs.example/example.bndrun
----------------------------------------------------------------------
diff --git a/jax-rs.example/example.bndrun b/jax-rs.example/example.bndrun
deleted file mode 100644
index c0070a3..0000000
--- a/jax-rs.example/example.bndrun
+++ /dev/null
@@ -1,46 +0,0 @@
--standalone: ${.}/target/index.xml
--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.fileinstall)',\
- osgi.identity;filter:='(osgi.identity=org.apache.felix.gogo.command)',\
- osgi.identity;filter:='(osgi.identity=org.apache.felix.gogo.shell)',\
- osgi.identity;filter:='(osgi.identity=ch.qos.logback.classic)'
-
--runfw: org.eclipse.osgi;version='[3.10.100.v20150529-1857,3.10.100.v20150529-1857]'
-
--runee: JavaSE-1.8
--resolve.effective: resolve, active
--runproperties: \
- logback.configurationFile=file:${.}/logback.xml,\
- 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: \
- ch.qos.logback.classic;version='[1.2.3,1.2.4)',\
- ch.qos.logback.core;version='[1.2.3,1.2.4)',\
- org.apache.aries.javax.annotation-api;version='[0.0.1,0.0.2)',\
- org.apache.aries.javax.jax.rs-api;version='[0.0.1,0.0.2)',\
- org.apache.aries.jax.rs.example;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.gogo.command;version='[1.0.2,1.0.3)',\
- org.apache.felix.gogo.runtime;version='[1.0.6,1.0.7)',\
- org.apache.felix.gogo.shell;version='[1.0.0,1.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.8,2.0.9)',\
- org.osgi.service.http.whiteboard;version='[1.0.0,1.0.1)',\
- 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.apache.felix.fileinstall;version='[3.6.4,3.6.5)'
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/55cb9600/jax-rs.example/logback.xml
----------------------------------------------------------------------
diff --git a/jax-rs.example/logback.xml b/jax-rs.example/logback.xml
deleted file mode 100644
index 5efda45..0000000
--- a/jax-rs.example/logback.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<configuration>
- <contextListener class="ch.qos.logback.classic.jul.LevelChangePropagator">
- <resetJUL>true</resetJUL>
- </contextListener>
-
- <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
- <encoder>
- <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
- </encoder>
- </appender>
-
- <logger name="org.apache.aries.jax.rs.example" level="debug" />
-
- <root level="error">
- <appender-ref ref="STDOUT" />
- </root>
-</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/55cb9600/jax-rs.example/pom.xml
----------------------------------------------------------------------
diff --git a/jax-rs.example/pom.xml b/jax-rs.example/pom.xml
deleted file mode 100644
index a405f57..0000000
--- a/jax-rs.example/pom.xml
+++ /dev/null
@@ -1,186 +0,0 @@
-<?xml version='1.0' encoding='UTF-8' ?>
-<!--
- 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.
--->
-<project xmlns="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">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.aries.jax.rs</groupId>
- <artifactId>org.apache.aries.jax.rs</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- </parent>
-
- <artifactId>org.apache.aries.jax.rs.example</artifactId>
- <description>Apache Aries JAX-RS Executable Example</description>
- <name>Apache Aries JAX-RS Executable Example</name>
-
- <properties>
- <maven.deploy.skip>true</maven.deploy.skip>
- <maven.install.skip>true</maven.install.skip>
- </properties>
-
- <build>
- <plugins>
- <plugin>
- <groupId>biz.aQute.bnd</groupId>
- <artifactId>bnd-indexer-maven-plugin</artifactId>
- <configuration>
- <includeJar>true</includeJar>
- <localURLs>REQUIRED</localURLs>
- </configuration>
- </plugin>
- <plugin>
- <groupId>biz.aQute.bnd</groupId>
- <artifactId>bnd-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>biz.aQute.bnd</groupId>
- <artifactId>bnd-resolver-maven-plugin</artifactId>
- <configuration>
- <failOnChanges>false</failOnChanges>
- <bndruns>
- <bndrun>example.bndrun</bndrun>
- </bndruns>
- </configuration>
- </plugin>
- <plugin>
- <groupId>biz.aQute.bnd</groupId>
- <artifactId>bnd-export-maven-plugin</artifactId>
- <configuration>
- <failOnChanges>false</failOnChanges>
- <resolve>false</resolve>
- <bndruns>
- <bndrun>example.bndrun</bndrun>
- </bndruns>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- <version>1.2.3</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>log4j-over-slf4j</artifactId>
- <version>1.7.25</version>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
- <version>6.0.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.jax.rs</groupId>
- <artifactId>org.apache.aries.jax.rs.whiteboard</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.spec</groupId>
- <artifactId>org.apache.aries.javax.annotation-api</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.spec</groupId>
- <artifactId>org.apache.aries.javax.jax.rs-api</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- </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>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.http.jetty</artifactId>
- <version>3.4.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.http.servlet-api</artifactId>
- <version>1.1.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.gogo.command</artifactId>
- <version>1.0.2</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>
- <artifactId>org.apache.felix.gogo.shell</artifactId>
- <version>1.0.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.scr</artifactId>
- <version>2.0.8</version>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.eclipse.equinox.metatype</artifactId>
- <version>1.4.100.v20150408-1437</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.service.component.annotations</artifactId>
- <version>1.3.0</version>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.service.metatype</artifactId>
- <version>1.3.0</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.function</artifactId>
- <version>LATEST</version>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.util.promise</artifactId>
- <version>LATEST</version>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.fileinstall</artifactId>
- <version>3.6.4</version>
- </dependency>
- </dependencies>
-</project>
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/55cb9600/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
deleted file mode 100644
index f6b7c38..0000000
--- a/jax-rs.example/src/main/java/org/apache/aries/jax/rs/example/ExampleAddon.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * 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.example;
-
-import org.osgi.service.component.annotations.Component;
-import org.osgi.service.jaxrs.whiteboard.JaxrsWhiteboardConstants;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-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;
-
-@Component(
- property = {
- JaxrsWhiteboardConstants.JAX_RS_APPLICATION_SELECT + "=(osgi.jaxrs.name=.default)",
- JaxrsWhiteboardConstants.JAX_RS_RESOURCE + "=true"
- },
- service = ExampleAddon.class
-)
-public class ExampleAddon {
-
- @GET
- @Path("/{name}")
- public String sayHello(@PathParam("name") String name) {
- if (_log.isDebugEnabled()) {
- _log.debug("URI: " + _uriInfo.getAbsolutePath());
- }
-
- return "Hello " + name;
- }
-
- @Context
- UriInfo _uriInfo;
-
- private static final Logger _log = LoggerFactory.getLogger(
- ExampleAddon.class);
-
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/55cb9600/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
deleted file mode 100644
index 81e7674..0000000
--- a/jax-rs.example/src/main/java/org/apache/aries/jax/rs/example/ExampleFilter.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * 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.example;
-
-import org.osgi.service.component.annotations.Component;
-import org.osgi.service.jaxrs.whiteboard.JaxrsWhiteboardConstants;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.ws.rs.container.ContainerRequestContext;
-import javax.ws.rs.container.ContainerRequestFilter;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.UriInfo;
-import javax.ws.rs.ext.Provider;
-import java.io.IOException;
-
-@Component(
- property = {
- JaxrsWhiteboardConstants.JAX_RS_APPLICATION_SELECT + "=(osgi.jaxrs.name=.default)",
- JaxrsWhiteboardConstants.JAX_RS_EXTENSION + "=true"
- }
-)
-@Provider
-public class ExampleFilter implements ContainerRequestFilter {
-
- @Override
- public void filter(ContainerRequestContext requestContext)
- throws IOException {
-
- if (_log.isDebugEnabled()) {
- _log.debug("FILTERED: " + _uriInfo.getAbsolutePath());
- }
- }
-
- @Context
- UriInfo _uriInfo;
-
- private static final Logger _log = LoggerFactory.getLogger(
- ExampleFilter.class);
-
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/55cb9600/jax-rs.itests-jsonb/LICENSE
----------------------------------------------------------------------
diff --git a/jax-rs.itests-jsonb/LICENSE b/jax-rs.itests-jsonb/LICENSE
deleted file mode 100644
index d645695..0000000
--- a/jax-rs.itests-jsonb/LICENSE
+++ /dev/null
@@ -1,202 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed 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.
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/55cb9600/jax-rs.itests-jsonb/bnd.bnd
----------------------------------------------------------------------
diff --git a/jax-rs.itests-jsonb/bnd.bnd b/jax-rs.itests-jsonb/bnd.bnd
deleted file mode 100644
index 422f326..0000000
--- a/jax-rs.itests-jsonb/bnd.bnd
+++ /dev/null
@@ -1,24 +0,0 @@
-# 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.
-
-Bundle-Description: Integration Test bundle for the JSON-P Whiteboard support
-
-Test-Cases: \
- ${classes;CONCRETE;EXTENDS;junit.framework.TestCase},\
- ${classes;CONCRETE;ANNOTATED;org.junit.Test}
-
-Require-Capability: osgi.service;filter:="(objectClass=org.osgi.service.cm.ConfigurationAdmin)"
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/55cb9600/jax-rs.itests-jsonb/itest.bndrun
----------------------------------------------------------------------
diff --git a/jax-rs.itests-jsonb/itest.bndrun b/jax-rs.itests-jsonb/itest.bndrun
deleted file mode 100644
index ed3d612..0000000
--- a/jax-rs.itests-jsonb/itest.bndrun
+++ /dev/null
@@ -1,48 +0,0 @@
--standalone: ${.}/target/index.xml
-
--runrequires: \
- osgi.identity;filter:='(osgi.identity=org.apache.aries.jax.rs.itests-jsonb)',\
- osgi.identity;filter:='(osgi.identity=org.apache.aries.jax.rs.whiteboard)',\
- osgi.identity;filter:='(osgi.identity=org.apache.aries.jax.rs.jsonb)',\
- osgi.identity;filter:='(osgi.identity=ch.qos.logback.classic)'
-
--runfw: org.eclipse.osgi;version='[3.10.100.v20150529-1857,3.10.100.v20150529-1857]'
-
-#-runtrace: true
-
--runee: JavaSE-1.8
--resolve.effective: resolve, active
-
--runsystemcapabilities: ${native_capability}
--runproperties: \
- logback.configurationFile=file:${.}/logback.xml,\
- osgi.console.enable.builtin=false, \
- osgi.console=, \
- org.apache.felix.http.host=localhost,\
- org.osgi.service.http.port=*
--runblacklist:\
- osgi.identity;filter:='(osgi.identity=org.osgi.compendium)',\
- osgi.identity;filter:='(osgi.identity=osgi.cmpn)'
--runbundles: \
- ch.qos.logback.classic;version='[1.2.3,1.2.4)',\
- ch.qos.logback.core;version='[1.2.3,1.2.4)',\
- org.apache.aries.javax.jax.rs-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.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.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)',\
- org.apache.aries.jax.rs.jsonb;version='[0.0.1,0.0.2)',\
- org.apache.servicemix.specs.json-api-1.1;version='[2.9.0,2.9.1)',\
- org.apache.aries.jax.rs.itests-jsonb;version='[0.0.1,0.0.2)',\
- javax.json.bind-api;version='[1.0.0,1.0.1)',\
- javax.ws.rs-api;version='[2.1.0,2.1.1)',\
- org.apache.servicemix.specs.annotation-api-1.3;version='[1.3.0,1.3.1)'
--include: -personal.bnd
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/55cb9600/jax-rs.itests-jsonb/logback.xml
----------------------------------------------------------------------
diff --git a/jax-rs.itests-jsonb/logback.xml b/jax-rs.itests-jsonb/logback.xml
deleted file mode 100644
index 1952216..0000000
--- a/jax-rs.itests-jsonb/logback.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<configuration>
- <contextListener class="ch.qos.logback.classic.jul.LevelChangePropagator">
- <resetJUL>true</resetJUL>
- </contextListener>
-
- <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
- <encoder>
- <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
- </encoder>
- </appender>
-
- <root level="error">
- <appender-ref ref="STDOUT" />
- </root>
-</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/55cb9600/jax-rs.itests-jsonb/pom.xml
----------------------------------------------------------------------
diff --git a/jax-rs.itests-jsonb/pom.xml b/jax-rs.itests-jsonb/pom.xml
deleted file mode 100644
index 2470e3e..0000000
--- a/jax-rs.itests-jsonb/pom.xml
+++ /dev/null
@@ -1,198 +0,0 @@
-<?xml version='1.0' encoding='UTF-8' ?>
-<!--
- 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.
--->
-<project
- xmlns="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">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.aries.jax.rs</groupId>
- <artifactId>org.apache.aries.jax.rs</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- <relativePath>..</relativePath>
- </parent>
-
- <artifactId>org.apache.aries.jax.rs.itests-jsonb</artifactId>
- <description>Apache Aries JAX-RS Integration Tests</description>
- <name>Apache Aries JAX-RS Integration Tests</name>
-
- <properties>
- <maven.deploy.skip>true</maven.deploy.skip>
- <maven.install.skip>true</maven.install.skip>
- </properties>
-
- <build>
- <plugins>
- <plugin>
- <groupId>biz.aQute.bnd</groupId>
- <artifactId>bnd-indexer-maven-plugin</artifactId>
- <configuration>
- <includeJar>true</includeJar>
- <localURLs>REQUIRED</localURLs>
- </configuration>
- </plugin>
- <plugin>
- <groupId>biz.aQute.bnd</groupId>
- <artifactId>bnd-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>biz.aQute.bnd</groupId>
- <artifactId>bnd-resolver-maven-plugin</artifactId>
- <configuration>
- <failOnChanges>false</failOnChanges>
- <bndruns>
- <bndrun>itest.bndrun</bndrun>
- </bndruns>
- </configuration>
- </plugin>
- <plugin>
- <groupId>biz.aQute.bnd</groupId>
- <artifactId>bnd-testing-maven-plugin</artifactId>
- <configuration>
- <failOnChanges>true</failOnChanges>
- <resolve>false</resolve>
- <bndruns>
- <bndrun>itest.bndrun</bndrun>
- </bndruns>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- <version>1.2.3</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
- <version>6.0.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.service.cm</artifactId>
- <version>1.5.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.service.http.whiteboard</artifactId>
- <version>1.0.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.jax.rs</groupId>
- <artifactId>org.apache.aries.jax.rs.whiteboard</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.jax.rs</groupId>
- <artifactId>org.apache.aries.jax.rs.jsonb</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.spec</groupId>
- <artifactId>org.apache.aries.javax.jax.rs-api</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.configadmin</artifactId>
- <version>1.8.14</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.eventadmin</artifactId>
- <version>1.4.8</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.http.jetty</artifactId>
- <version>3.4.0</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.scr</artifactId>
- <version>2.0.8</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.eclipse.osgi</artifactId>
- <version>3.10.100.v20150529-1857</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.specs</groupId>
- <artifactId>org.apache.servicemix.specs.json-api-1.1</artifactId>
- <version>2.9.0</version>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.service.jaxrs</artifactId>
- <version>1.0.0</version>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.util.function</artifactId>
- <version>1.1.0</version>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.util.promise</artifactId>
- <version>1.1.0</version>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.enroute.junit.wrapper</artifactId>
- <version>4.12.0</version>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.enroute.hamcrest.wrapper</artifactId>
- <version>1.3.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-core</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>javax.json.bind</groupId>
- <artifactId>javax.json.bind-api</artifactId>
- <version>1.0</version>
- <scope>runtime</scope>
- </dependency>
- </dependencies>
-</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/55cb9600/jax-rs.itests-jsonb/src/main/java/test/JsonBTest.java
----------------------------------------------------------------------
diff --git a/jax-rs.itests-jsonb/src/main/java/test/JsonBTest.java b/jax-rs.itests-jsonb/src/main/java/test/JsonBTest.java
deleted file mode 100644
index 2456d9a..0000000
--- a/jax-rs.itests-jsonb/src/main/java/test/JsonBTest.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * 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 test;
-
-import org.junit.Test;
-import test.types.TestHelper;
-import test.types.TestJSONBAddon;
-
-import javax.ws.rs.client.WebTarget;
-
-import static org.junit.Assert.assertTrue;
-
-public class JsonBTest extends TestHelper {
-
- @Test
- public void testJSONPEndpoint() {
- WebTarget webTarget = createDefaultTarget().path("jsonb");
-
- registerAddon(new TestJSONBAddon());
-
- String response = webTarget.request().get(String.class);
-
- System.out.println(response);
-
- assertTrue(response.contains("value"));
- }
-
-}
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/55cb9600/jax-rs.itests-jsonb/src/main/java/test/types/DataObject.java
----------------------------------------------------------------------
diff --git a/jax-rs.itests-jsonb/src/main/java/test/types/DataObject.java b/jax-rs.itests-jsonb/src/main/java/test/types/DataObject.java
deleted file mode 100644
index d59d71b..0000000
--- a/jax-rs.itests-jsonb/src/main/java/test/types/DataObject.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * 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 test.types;
-
-public class DataObject {
-
- private String value;
-
- public String getValue() {
- return value;
- }
-
- public void setValue(String value) {
- this.value = value;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/55cb9600/jax-rs.itests-jsonb/src/main/java/test/types/TestHelper.java
----------------------------------------------------------------------
diff --git a/jax-rs.itests-jsonb/src/main/java/test/types/TestHelper.java b/jax-rs.itests-jsonb/src/main/java/test/types/TestHelper.java
deleted file mode 100644
index a9ae9fc..0000000
--- a/jax-rs.itests-jsonb/src/main/java/test/types/TestHelper.java
+++ /dev/null
@@ -1,309 +0,0 @@
-/*
- * 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 test.types;
-
-import javax.ws.rs.client.Client;
-import javax.ws.rs.client.ClientBuilder;
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.container.ContainerResponseFilter;
-import javax.ws.rs.core.Application;
-
-import org.junit.After;
-import org.junit.Before;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.FrameworkUtil;
-import org.osgi.framework.PrototypeServiceFactory;
-import org.osgi.framework.ServiceFactory;
-import org.osgi.framework.ServiceReference;
-import org.osgi.framework.ServiceRegistration;
-import org.osgi.service.cm.ConfigurationAdmin;
-import org.osgi.service.jaxrs.client.SseEventSourceFactory;
-import org.osgi.service.jaxrs.runtime.JaxrsServiceRuntime;
-import org.osgi.service.jaxrs.runtime.dto.RuntimeDTO;
-import org.osgi.util.tracker.ServiceTracker;
-
-import static org.junit.Assert.assertTrue;
-import static org.osgi.service.jaxrs.whiteboard.JaxrsWhiteboardConstants.JAX_RS_APPLICATION_BASE;
-import static org.osgi.service.jaxrs.whiteboard.JaxrsWhiteboardConstants.JAX_RS_EXTENSION;
-import static org.osgi.service.jaxrs.whiteboard.JaxrsWhiteboardConstants.JAX_RS_NAME;
-import static org.osgi.service.jaxrs.whiteboard.JaxrsWhiteboardConstants.JAX_RS_RESOURCE;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Dictionary;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.function.Function;
-import java.util.function.Predicate;
-
-public class TestHelper {
-
- public static BundleContext bundleContext =
- FrameworkUtil.
- getBundle(TestHelper.class).
- getBundleContext();
-
- protected Collection<ServiceRegistration<?>> _registrations =
- new ArrayList<>();
- protected ServiceTracker<JaxrsServiceRuntime, JaxrsServiceRuntime>
- _runtimeTracker;
- protected ServiceTracker<ClientBuilder, ClientBuilder>
- _clientBuilderTracker;
- protected JaxrsServiceRuntime _runtime;
- protected ServiceReference<JaxrsServiceRuntime> _runtimeServiceReference;
-
- @After
- public void tearDown() {
- Iterator<ServiceRegistration<?>> iterator = _registrations.iterator();
-
- while (iterator.hasNext()) {
- ServiceRegistration<?> registration = iterator.next();
-
- try {
- registration.unregister();
- }
- catch(Exception e) {
- }
- finally {
- iterator.remove();
- }
- }
-
- if (_runtimeTracker != null) {
- _runtimeTracker.close();
- }
-
- _clientBuilderTracker.close();
-
- _configurationAdminTracker.close();
-
- _sseEventSourceFactoryTracker.close();
- }
-
- @Before
- public void before() {
- _clientBuilderTracker = new ServiceTracker<>(
- bundleContext, ClientBuilder.class, null);
-
- _clientBuilderTracker.open();
-
- _configurationAdminTracker = new ServiceTracker<>(
- bundleContext, ConfigurationAdmin.class, null);
-
- _configurationAdminTracker.open();
-
- _sseEventSourceFactoryTracker = new ServiceTracker<>(
- bundleContext, SseEventSourceFactory.class, null);
-
- _sseEventSourceFactoryTracker.open();
-
- _runtimeTracker = new ServiceTracker<>(
- bundleContext, JaxrsServiceRuntime.class, null);
-
- _runtimeTracker.open();
-
- try {
- _runtime = _runtimeTracker.waitForService(15000L);
- }
- catch (InterruptedException e) {
- throw new RuntimeException(e);
- }
-
- _runtimeServiceReference = _runtimeTracker.getServiceReference();
- }
-
- private ServiceTracker<ConfigurationAdmin, ConfigurationAdmin>
- _configurationAdminTracker;
-
- private ServiceTracker<SseEventSourceFactory, SseEventSourceFactory>
- _sseEventSourceFactoryTracker;
-
- @SuppressWarnings("unchecked")
- private static String[] canonicalize(Object propertyValue) {
- if (propertyValue == null) {
- return new String[0];
- }
- if (propertyValue instanceof String[]) {
- return (String[]) propertyValue;
- }
- if (propertyValue instanceof Collection) {
- return ((Collection<String>) propertyValue).toArray(new String[0]);
- }
-
- return new String[]{propertyValue.toString()};
- }
-
- public ConfigurationAdmin getConfigurationAdmin() {
-
- try {
- return _configurationAdminTracker.waitForService(5000);
- }
- catch (InterruptedException e) {
- throw new IllegalStateException(e);
- }
- }
-
- protected Client createClient() {
- ClientBuilder clientBuilder;
-
- try {
- clientBuilder = _clientBuilderTracker.waitForService(5000);
-
- return clientBuilder.build();
- }
- catch (InterruptedException ie) {
- throw new RuntimeException(ie);
- }
- }
-
- protected SseEventSourceFactory createSseFactory() {
- try {
- return _sseEventSourceFactoryTracker.waitForService(5000);
- }
- catch (InterruptedException ie) {
- throw new RuntimeException(ie);
- }
- }
-
- protected WebTarget createDefaultTarget() {
- Client client = createClient();
-
- String[] runtimes = canonicalize(
- _runtimeServiceReference.getProperty("osgi.jaxrs.endpoint"));
-
- if (runtimes.length == 0) {
- throw new IllegalStateException(
- "No runtimes could be found on \"osgi.jaxrs.endpoint\" " +
- "runtime service property ");
- }
-
- String runtime = runtimes[0];
-
- return client.target(runtime);
- }
-
- protected static long getServiceId(ServiceRegistration<?> propertyHolder) {
- return (long)propertyHolder.getReference().getProperty("service.id");
- }
-
- protected <T> void assertThatInRuntime(
- Function<RuntimeDTO, T[]> getter, Predicate<T> predicate) {
-
- assertTrue(
- Arrays.stream(getter.apply(getRuntimeDTO())).anyMatch(predicate));
- }
-
- protected JaxrsServiceRuntime getJaxrsServiceRuntime()
- throws InterruptedException {
-
- _runtimeTracker = new ServiceTracker<>(
- bundleContext, JaxrsServiceRuntime.class, null);
-
- _runtimeTracker.open();
-
- return _runtimeTracker.waitForService(15000L);
- }
-
- protected RuntimeDTO getRuntimeDTO() {
- return _runtime.getRuntimeDTO();
- }
-
- protected ServiceRegistration<?> registerAddon(
- Object instance, Object... keyValues) {
-
- Dictionary<String, Object> properties = new Hashtable<>();
-
- properties.put(JAX_RS_RESOURCE, "true");
-
- for (int i = 0; i < keyValues.length; i = i + 2) {
- properties.put(keyValues[i].toString(), keyValues[i + 1]);
- }
-
- ServiceRegistration<Object> serviceRegistration =
- bundleContext.registerService(Object.class, instance, properties);
-
- _registrations.add(serviceRegistration);
-
- return serviceRegistration;
- }
-
- protected ServiceRegistration<Application> registerApplication(
- Application application, Object... keyValues) {
-
- Dictionary<String, Object> properties = new Hashtable<>();
-
- for (int i = 0; i < keyValues.length; i = i + 2) {
- properties.put(keyValues[i].toString(), keyValues[i + 1]);
- }
-
- if (properties.get(JAX_RS_APPLICATION_BASE) == null) {
- properties.put(JAX_RS_APPLICATION_BASE, "/test-application");
- }
-
- ServiceRegistration<Application> serviceRegistration =
- bundleContext.registerService(
- Application.class, application, properties);
-
- _registrations.add(serviceRegistration);
-
- return serviceRegistration;
- }
-
- protected ServiceRegistration<Application> registerApplication(
- ServiceFactory<Application> serviceFactory, Object... keyValues) {
-
- Dictionary<String, Object> properties = new Hashtable<>();
-
- properties.put(JAX_RS_APPLICATION_BASE, "/test-application");
-
- for (int i = 0; i < keyValues.length; i = i + 2) {
- properties.put(keyValues[i].toString(), keyValues[i + 1]);
- }
-
- ServiceRegistration<Application> serviceRegistration =
- bundleContext.registerService(
- Application.class, serviceFactory, properties);
-
- _registrations.add(serviceRegistration);
-
- return serviceRegistration;
- }
-
- protected <T> ServiceRegistration<T> registerExtension(
- Class<T> clazz, T extension, String name, Object... keyValues) {
-
- Dictionary<String, Object> properties = new Hashtable<>();
-
- properties.put(JAX_RS_EXTENSION, true);
- properties.put(JAX_RS_NAME, name);
-
- for (int i = 0; i < keyValues.length; i = i + 2) {
- properties.put(keyValues[i].toString(), keyValues[i + 1]);
- }
-
- ServiceRegistration<T> serviceRegistration =
- bundleContext.registerService(clazz, extension, properties);
-
- _registrations.add(serviceRegistration);
-
- return serviceRegistration;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/55cb9600/jax-rs.itests-jsonb/src/main/java/test/types/TestJSONBAddon.java
----------------------------------------------------------------------
diff --git a/jax-rs.itests-jsonb/src/main/java/test/types/TestJSONBAddon.java b/jax-rs.itests-jsonb/src/main/java/test/types/TestJSONBAddon.java
deleted file mode 100644
index 071538e..0000000
--- a/jax-rs.itests-jsonb/src/main/java/test/types/TestJSONBAddon.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * 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 test.types;
-
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-
-public class TestJSONBAddon {
-
- @GET
- @Produces(MediaType.APPLICATION_JSON)
- @Path("/jsonb")
- public DataObject getJsonObject() {
- DataObject dataObject = new DataObject();
-
- dataObject.setValue("value");
-
- return dataObject;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/55cb9600/jax-rs.itests-jsonp/LICENSE
----------------------------------------------------------------------
diff --git a/jax-rs.itests-jsonp/LICENSE b/jax-rs.itests-jsonp/LICENSE
deleted file mode 100644
index d645695..0000000
--- a/jax-rs.itests-jsonp/LICENSE
+++ /dev/null
@@ -1,202 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed 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.
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/55cb9600/jax-rs.itests-jsonp/bnd.bnd
----------------------------------------------------------------------
diff --git a/jax-rs.itests-jsonp/bnd.bnd b/jax-rs.itests-jsonp/bnd.bnd
deleted file mode 100644
index 422f326..0000000
--- a/jax-rs.itests-jsonp/bnd.bnd
+++ /dev/null
@@ -1,24 +0,0 @@
-# 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.
-
-Bundle-Description: Integration Test bundle for the JSON-P Whiteboard support
-
-Test-Cases: \
- ${classes;CONCRETE;EXTENDS;junit.framework.TestCase},\
- ${classes;CONCRETE;ANNOTATED;org.junit.Test}
-
-Require-Capability: osgi.service;filter:="(objectClass=org.osgi.service.cm.ConfigurationAdmin)"
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/55cb9600/jax-rs.itests-jsonp/itest.bndrun
----------------------------------------------------------------------
diff --git a/jax-rs.itests-jsonp/itest.bndrun b/jax-rs.itests-jsonp/itest.bndrun
deleted file mode 100644
index 341d97f..0000000
--- a/jax-rs.itests-jsonp/itest.bndrun
+++ /dev/null
@@ -1,47 +0,0 @@
--standalone: ${.}/target/index.xml
-
--runrequires: \
- osgi.identity;filter:='(osgi.identity=org.apache.aries.jax.rs.itests-jsonp)',\
- osgi.identity;filter:='(osgi.identity=org.apache.aries.jax.rs.whiteboard)',\
- osgi.identity;filter:='(osgi.identity=org.apache.aries.jax.rs.jsonp)',\
- osgi.identity;filter:='(osgi.identity=ch.qos.logback.classic)'
-
--runfw: org.eclipse.osgi;version='[3.10.100.v20150529-1857,3.10.100.v20150529-1857]'
-
-#-runtrace: true
-
--runee: JavaSE-1.8
--resolve.effective: resolve, active
-
--runsystemcapabilities: ${native_capability}
--runproperties: \
- logback.configurationFile=file:${.}/logback.xml,\
- osgi.console.enable.builtin=false, \
- osgi.console=, \
- org.apache.felix.http.host=localhost,\
- org.osgi.service.http.port=*
--runblacklist:\
- osgi.identity;filter:='(osgi.identity=org.osgi.compendium)',\
- osgi.identity;filter:='(osgi.identity=osgi.cmpn)'
--runbundles: \
- ch.qos.logback.classic;version='[1.2.3,1.2.4)',\
- ch.qos.logback.core;version='[1.2.3,1.2.4)',\
- org.apache.aries.javax.jax.rs-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.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.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)',\
- org.apache.aries.jax.rs.jsonp;version='[0.0.1,0.0.2)',\
- org.apache.servicemix.specs.json-api-1.1;version='[2.9.0,2.9.1)',\
- org.apache.aries.jax.rs.itests-jsonp;version='[0.0.1,0.0.2)',\
- javax.ws.rs-api;version='[2.1.0,2.1.1)',\
- org.apache.servicemix.specs.annotation-api-1.3;version='[1.3.0,1.3.1)'
--include: -personal.bnd
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/55cb9600/jax-rs.itests-jsonp/logback.xml
----------------------------------------------------------------------
diff --git a/jax-rs.itests-jsonp/logback.xml b/jax-rs.itests-jsonp/logback.xml
deleted file mode 100644
index 1952216..0000000
--- a/jax-rs.itests-jsonp/logback.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<configuration>
- <contextListener class="ch.qos.logback.classic.jul.LevelChangePropagator">
- <resetJUL>true</resetJUL>
- </contextListener>
-
- <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
- <encoder>
- <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
- </encoder>
- </appender>
-
- <root level="error">
- <appender-ref ref="STDOUT" />
- </root>
-</configuration>
\ No newline at end of file
[3/9] aries-jax-rs-whiteboard git commit: Remove non releasable
modules
Posted by cs...@apache.org.
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/55cb9600/jax-rs.itests-jsonp/pom.xml
----------------------------------------------------------------------
diff --git a/jax-rs.itests-jsonp/pom.xml b/jax-rs.itests-jsonp/pom.xml
deleted file mode 100644
index 6c891c2..0000000
--- a/jax-rs.itests-jsonp/pom.xml
+++ /dev/null
@@ -1,192 +0,0 @@
-<?xml version='1.0' encoding='UTF-8' ?>
-<!--
- 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.
--->
-<project
- xmlns="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">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.aries.jax.rs</groupId>
- <artifactId>org.apache.aries.jax.rs</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- <relativePath>..</relativePath>
- </parent>
-
- <artifactId>org.apache.aries.jax.rs.itests-jsonp</artifactId>
- <description>Apache Aries JAX-RS Integration Tests</description>
- <name>Apache Aries JAX-RS Integration Tests</name>
-
- <properties>
- <maven.deploy.skip>true</maven.deploy.skip>
- <maven.install.skip>true</maven.install.skip>
- </properties>
-
- <build>
- <plugins>
- <plugin>
- <groupId>biz.aQute.bnd</groupId>
- <artifactId>bnd-indexer-maven-plugin</artifactId>
- <configuration>
- <includeJar>true</includeJar>
- <localURLs>REQUIRED</localURLs>
- </configuration>
- </plugin>
- <plugin>
- <groupId>biz.aQute.bnd</groupId>
- <artifactId>bnd-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>biz.aQute.bnd</groupId>
- <artifactId>bnd-resolver-maven-plugin</artifactId>
- <configuration>
- <failOnChanges>false</failOnChanges>
- <bndruns>
- <bndrun>itest.bndrun</bndrun>
- </bndruns>
- </configuration>
- </plugin>
- <plugin>
- <groupId>biz.aQute.bnd</groupId>
- <artifactId>bnd-testing-maven-plugin</artifactId>
- <configuration>
- <failOnChanges>true</failOnChanges>
- <resolve>false</resolve>
- <bndruns>
- <bndrun>itest.bndrun</bndrun>
- </bndruns>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- <version>1.2.3</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
- <version>6.0.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.service.cm</artifactId>
- <version>1.5.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.service.http.whiteboard</artifactId>
- <version>1.0.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.jax.rs</groupId>
- <artifactId>org.apache.aries.jax.rs.whiteboard</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.jax.rs</groupId>
- <artifactId>org.apache.aries.jax.rs.jsonp</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.spec</groupId>
- <artifactId>org.apache.aries.javax.jax.rs-api</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.configadmin</artifactId>
- <version>1.8.14</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.eventadmin</artifactId>
- <version>1.4.8</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.http.jetty</artifactId>
- <version>3.4.0</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.scr</artifactId>
- <version>2.0.8</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.eclipse.osgi</artifactId>
- <version>3.10.100.v20150529-1857</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.specs</groupId>
- <artifactId>org.apache.servicemix.specs.json-api-1.1</artifactId>
- <version>2.9.0</version>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.service.jaxrs</artifactId>
- <version>1.0.0</version>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.util.function</artifactId>
- <version>1.1.0</version>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.util.promise</artifactId>
- <version>1.1.0</version>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.enroute.junit.wrapper</artifactId>
- <version>4.12.0</version>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.enroute.hamcrest.wrapper</artifactId>
- <version>1.3.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-core</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>
- </dependencies>
-</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/55cb9600/jax-rs.itests-jsonp/src/main/java/test/JsonPTest.java
----------------------------------------------------------------------
diff --git a/jax-rs.itests-jsonp/src/main/java/test/JsonPTest.java b/jax-rs.itests-jsonp/src/main/java/test/JsonPTest.java
deleted file mode 100644
index cb30ff1..0000000
--- a/jax-rs.itests-jsonp/src/main/java/test/JsonPTest.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * 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 test;
-
-import org.junit.Test;
-import test.types.TestHelper;
-import test.types.TestJSONPAddon;
-
-import javax.ws.rs.client.WebTarget;
-
-import static org.junit.Assert.assertTrue;
-
-public class JsonPTest extends TestHelper {
-
- @Test
- public void testJSONPEndpoint() {
- WebTarget webTarget = createDefaultTarget().path("jsonobject");
-
- registerAddon(new TestJSONPAddon());
-
- assertTrue(webTarget.request().get(String.class).contains("key"));
- }
-
-}
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/55cb9600/jax-rs.itests-jsonp/src/main/java/test/types/TestApplication.java
----------------------------------------------------------------------
diff --git a/jax-rs.itests-jsonp/src/main/java/test/types/TestApplication.java b/jax-rs.itests-jsonp/src/main/java/test/types/TestApplication.java
deleted file mode 100644
index b58e1e0..0000000
--- a/jax-rs.itests-jsonp/src/main/java/test/types/TestApplication.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * 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 test.types;
-
-import java.util.Collections;
-import java.util.Set;
-
-import javax.ws.rs.GET;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.Application;
-
-public class TestApplication extends Application {
-
- @Override
- public Set<Object> getSingletons() {
- return Collections.<Object>singleton(this);
- }
-
- @GET
- @Produces("text/plain")
- public String sayHello() {
- return "Hello application";
- }
-
-}
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/55cb9600/jax-rs.itests-jsonp/src/main/java/test/types/TestHelper.java
----------------------------------------------------------------------
diff --git a/jax-rs.itests-jsonp/src/main/java/test/types/TestHelper.java b/jax-rs.itests-jsonp/src/main/java/test/types/TestHelper.java
deleted file mode 100644
index a9ae9fc..0000000
--- a/jax-rs.itests-jsonp/src/main/java/test/types/TestHelper.java
+++ /dev/null
@@ -1,309 +0,0 @@
-/*
- * 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 test.types;
-
-import javax.ws.rs.client.Client;
-import javax.ws.rs.client.ClientBuilder;
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.container.ContainerResponseFilter;
-import javax.ws.rs.core.Application;
-
-import org.junit.After;
-import org.junit.Before;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.FrameworkUtil;
-import org.osgi.framework.PrototypeServiceFactory;
-import org.osgi.framework.ServiceFactory;
-import org.osgi.framework.ServiceReference;
-import org.osgi.framework.ServiceRegistration;
-import org.osgi.service.cm.ConfigurationAdmin;
-import org.osgi.service.jaxrs.client.SseEventSourceFactory;
-import org.osgi.service.jaxrs.runtime.JaxrsServiceRuntime;
-import org.osgi.service.jaxrs.runtime.dto.RuntimeDTO;
-import org.osgi.util.tracker.ServiceTracker;
-
-import static org.junit.Assert.assertTrue;
-import static org.osgi.service.jaxrs.whiteboard.JaxrsWhiteboardConstants.JAX_RS_APPLICATION_BASE;
-import static org.osgi.service.jaxrs.whiteboard.JaxrsWhiteboardConstants.JAX_RS_EXTENSION;
-import static org.osgi.service.jaxrs.whiteboard.JaxrsWhiteboardConstants.JAX_RS_NAME;
-import static org.osgi.service.jaxrs.whiteboard.JaxrsWhiteboardConstants.JAX_RS_RESOURCE;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Dictionary;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.function.Function;
-import java.util.function.Predicate;
-
-public class TestHelper {
-
- public static BundleContext bundleContext =
- FrameworkUtil.
- getBundle(TestHelper.class).
- getBundleContext();
-
- protected Collection<ServiceRegistration<?>> _registrations =
- new ArrayList<>();
- protected ServiceTracker<JaxrsServiceRuntime, JaxrsServiceRuntime>
- _runtimeTracker;
- protected ServiceTracker<ClientBuilder, ClientBuilder>
- _clientBuilderTracker;
- protected JaxrsServiceRuntime _runtime;
- protected ServiceReference<JaxrsServiceRuntime> _runtimeServiceReference;
-
- @After
- public void tearDown() {
- Iterator<ServiceRegistration<?>> iterator = _registrations.iterator();
-
- while (iterator.hasNext()) {
- ServiceRegistration<?> registration = iterator.next();
-
- try {
- registration.unregister();
- }
- catch(Exception e) {
- }
- finally {
- iterator.remove();
- }
- }
-
- if (_runtimeTracker != null) {
- _runtimeTracker.close();
- }
-
- _clientBuilderTracker.close();
-
- _configurationAdminTracker.close();
-
- _sseEventSourceFactoryTracker.close();
- }
-
- @Before
- public void before() {
- _clientBuilderTracker = new ServiceTracker<>(
- bundleContext, ClientBuilder.class, null);
-
- _clientBuilderTracker.open();
-
- _configurationAdminTracker = new ServiceTracker<>(
- bundleContext, ConfigurationAdmin.class, null);
-
- _configurationAdminTracker.open();
-
- _sseEventSourceFactoryTracker = new ServiceTracker<>(
- bundleContext, SseEventSourceFactory.class, null);
-
- _sseEventSourceFactoryTracker.open();
-
- _runtimeTracker = new ServiceTracker<>(
- bundleContext, JaxrsServiceRuntime.class, null);
-
- _runtimeTracker.open();
-
- try {
- _runtime = _runtimeTracker.waitForService(15000L);
- }
- catch (InterruptedException e) {
- throw new RuntimeException(e);
- }
-
- _runtimeServiceReference = _runtimeTracker.getServiceReference();
- }
-
- private ServiceTracker<ConfigurationAdmin, ConfigurationAdmin>
- _configurationAdminTracker;
-
- private ServiceTracker<SseEventSourceFactory, SseEventSourceFactory>
- _sseEventSourceFactoryTracker;
-
- @SuppressWarnings("unchecked")
- private static String[] canonicalize(Object propertyValue) {
- if (propertyValue == null) {
- return new String[0];
- }
- if (propertyValue instanceof String[]) {
- return (String[]) propertyValue;
- }
- if (propertyValue instanceof Collection) {
- return ((Collection<String>) propertyValue).toArray(new String[0]);
- }
-
- return new String[]{propertyValue.toString()};
- }
-
- public ConfigurationAdmin getConfigurationAdmin() {
-
- try {
- return _configurationAdminTracker.waitForService(5000);
- }
- catch (InterruptedException e) {
- throw new IllegalStateException(e);
- }
- }
-
- protected Client createClient() {
- ClientBuilder clientBuilder;
-
- try {
- clientBuilder = _clientBuilderTracker.waitForService(5000);
-
- return clientBuilder.build();
- }
- catch (InterruptedException ie) {
- throw new RuntimeException(ie);
- }
- }
-
- protected SseEventSourceFactory createSseFactory() {
- try {
- return _sseEventSourceFactoryTracker.waitForService(5000);
- }
- catch (InterruptedException ie) {
- throw new RuntimeException(ie);
- }
- }
-
- protected WebTarget createDefaultTarget() {
- Client client = createClient();
-
- String[] runtimes = canonicalize(
- _runtimeServiceReference.getProperty("osgi.jaxrs.endpoint"));
-
- if (runtimes.length == 0) {
- throw new IllegalStateException(
- "No runtimes could be found on \"osgi.jaxrs.endpoint\" " +
- "runtime service property ");
- }
-
- String runtime = runtimes[0];
-
- return client.target(runtime);
- }
-
- protected static long getServiceId(ServiceRegistration<?> propertyHolder) {
- return (long)propertyHolder.getReference().getProperty("service.id");
- }
-
- protected <T> void assertThatInRuntime(
- Function<RuntimeDTO, T[]> getter, Predicate<T> predicate) {
-
- assertTrue(
- Arrays.stream(getter.apply(getRuntimeDTO())).anyMatch(predicate));
- }
-
- protected JaxrsServiceRuntime getJaxrsServiceRuntime()
- throws InterruptedException {
-
- _runtimeTracker = new ServiceTracker<>(
- bundleContext, JaxrsServiceRuntime.class, null);
-
- _runtimeTracker.open();
-
- return _runtimeTracker.waitForService(15000L);
- }
-
- protected RuntimeDTO getRuntimeDTO() {
- return _runtime.getRuntimeDTO();
- }
-
- protected ServiceRegistration<?> registerAddon(
- Object instance, Object... keyValues) {
-
- Dictionary<String, Object> properties = new Hashtable<>();
-
- properties.put(JAX_RS_RESOURCE, "true");
-
- for (int i = 0; i < keyValues.length; i = i + 2) {
- properties.put(keyValues[i].toString(), keyValues[i + 1]);
- }
-
- ServiceRegistration<Object> serviceRegistration =
- bundleContext.registerService(Object.class, instance, properties);
-
- _registrations.add(serviceRegistration);
-
- return serviceRegistration;
- }
-
- protected ServiceRegistration<Application> registerApplication(
- Application application, Object... keyValues) {
-
- Dictionary<String, Object> properties = new Hashtable<>();
-
- for (int i = 0; i < keyValues.length; i = i + 2) {
- properties.put(keyValues[i].toString(), keyValues[i + 1]);
- }
-
- if (properties.get(JAX_RS_APPLICATION_BASE) == null) {
- properties.put(JAX_RS_APPLICATION_BASE, "/test-application");
- }
-
- ServiceRegistration<Application> serviceRegistration =
- bundleContext.registerService(
- Application.class, application, properties);
-
- _registrations.add(serviceRegistration);
-
- return serviceRegistration;
- }
-
- protected ServiceRegistration<Application> registerApplication(
- ServiceFactory<Application> serviceFactory, Object... keyValues) {
-
- Dictionary<String, Object> properties = new Hashtable<>();
-
- properties.put(JAX_RS_APPLICATION_BASE, "/test-application");
-
- for (int i = 0; i < keyValues.length; i = i + 2) {
- properties.put(keyValues[i].toString(), keyValues[i + 1]);
- }
-
- ServiceRegistration<Application> serviceRegistration =
- bundleContext.registerService(
- Application.class, serviceFactory, properties);
-
- _registrations.add(serviceRegistration);
-
- return serviceRegistration;
- }
-
- protected <T> ServiceRegistration<T> registerExtension(
- Class<T> clazz, T extension, String name, Object... keyValues) {
-
- Dictionary<String, Object> properties = new Hashtable<>();
-
- properties.put(JAX_RS_EXTENSION, true);
- properties.put(JAX_RS_NAME, name);
-
- for (int i = 0; i < keyValues.length; i = i + 2) {
- properties.put(keyValues[i].toString(), keyValues[i + 1]);
- }
-
- ServiceRegistration<T> serviceRegistration =
- bundleContext.registerService(clazz, extension, properties);
-
- _registrations.add(serviceRegistration);
-
- return serviceRegistration;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/55cb9600/jax-rs.itests-jsonp/src/main/java/test/types/TestJSONPAddon.java
----------------------------------------------------------------------
diff --git a/jax-rs.itests-jsonp/src/main/java/test/types/TestJSONPAddon.java b/jax-rs.itests-jsonp/src/main/java/test/types/TestJSONPAddon.java
deleted file mode 100644
index b2bc773..0000000
--- a/jax-rs.itests-jsonp/src/main/java/test/types/TestJSONPAddon.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * 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 test.types;
-
-import javax.json.Json;
-import javax.json.JsonObject;
-import javax.json.JsonObjectBuilder;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-
-public class TestJSONPAddon {
-
- @GET
- @Produces(MediaType.APPLICATION_JSON)
- @Path("/jsonobject")
- public JsonObject getJsonObject() {
- JsonObjectBuilder builder = Json.createObjectBuilder();
-
- return builder.add("key", "value").build();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/55cb9600/jax-rs.jsonb/.gitignore
----------------------------------------------------------------------
diff --git a/jax-rs.jsonb/.gitignore b/jax-rs.jsonb/.gitignore
deleted file mode 100644
index 83ccc54..0000000
--- a/jax-rs.jsonb/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/build/
-/bin/
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/55cb9600/jax-rs.jsonb/LICENSE
----------------------------------------------------------------------
diff --git a/jax-rs.jsonb/LICENSE b/jax-rs.jsonb/LICENSE
deleted file mode 100644
index d645695..0000000
--- a/jax-rs.jsonb/LICENSE
+++ /dev/null
@@ -1,202 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed 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.
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/55cb9600/jax-rs.jsonb/bnd.bnd
----------------------------------------------------------------------
diff --git a/jax-rs.jsonb/bnd.bnd b/jax-rs.jsonb/bnd.bnd
deleted file mode 100644
index 49355b3..0000000
--- a/jax-rs.jsonb/bnd.bnd
+++ /dev/null
@@ -1,29 +0,0 @@
-# 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.
-
-Bundle-Activator: org.apache.aries.jax.rs.jsonp.activator.JsonbBundleActivator
-
-Import-Package:\
- !javax.enterprise.context.spi,\
- !javax.enterprise.event,\
- !javax.enterprise.inject.spi,\
- *
-
--includeresource:\
- @johnzon-core-*.jar,\
- @johnzon-jsonb-*.jar,\
- lib/johnzon-mapper.jar=johnzon-mapper-*.jar;lib:=true
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/55cb9600/jax-rs.jsonb/pom.xml
----------------------------------------------------------------------
diff --git a/jax-rs.jsonb/pom.xml b/jax-rs.jsonb/pom.xml
deleted file mode 100644
index 865e396..0000000
--- a/jax-rs.jsonb/pom.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version='1.0' encoding='UTF-8' ?>
-<!--
- 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.
--->
-<project
- xmlns="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"
->
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.aries.jax.rs</groupId>
- <artifactId>org.apache.aries.jax.rs</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- </parent>
-
- <artifactId>org.apache.aries.jax.rs.jsonb</artifactId>
- <description>Apache Aries JAX-RS JSON B</description>
- <name>Apache Aries JAX-RS JSON B</name>
-
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>com.github.hazendaz.spotbugs</groupId>
- <artifactId>spotbugs-maven-plugin</artifactId>
- <version>3.0.6</version>
- <configuration>
- <effort>Max</effort>
- <threshold>Low</threshold>
- <failOnError>false</failOnError>
- <plugins>
- <plugin>
- <groupId>com.h3xstream.findsecbugs</groupId>
- <artifactId>findsecbugs-plugin</artifactId>
- <version>LATEST</version>
- </plugin>
- </plugins>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- <plugins>
- <plugin>
- <groupId>biz.aQute.bnd</groupId>
- <artifactId>bnd-maven-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
- <reporting>
- <plugins>
- <plugin>
- <groupId>com.github.hazendaz.spotbugs</groupId>
- <artifactId>spotbugs-maven-plugin</artifactId>
- <version>3.0.6</version>
- </plugin>
- </plugins>
- </reporting>
-
- <dependencies>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
- <version>6.0.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.johnzon</groupId>
- <artifactId>johnzon-jsonb</artifactId>
- <version>1.1.7</version>
- </dependency>
- <dependency>
- <groupId>javax.ws.rs</groupId>
- <artifactId>javax.ws.rs-api</artifactId>
- <version>2.1</version>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.service.jaxrs</artifactId>
- <version>1.0.0</version>
- </dependency>
- <dependency>
- <groupId>javax.json.bind</groupId>
- <artifactId>javax.json.bind-api</artifactId>
- <version>1.0</version>
- </dependency>
- </dependencies>
-
-</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/55cb9600/jax-rs.jsonb/src/main/java/org/apache/aries/jax/rs/jsonp/activator/JsonbBundleActivator.java
----------------------------------------------------------------------
diff --git a/jax-rs.jsonb/src/main/java/org/apache/aries/jax/rs/jsonp/activator/JsonbBundleActivator.java b/jax-rs.jsonb/src/main/java/org/apache/aries/jax/rs/jsonp/activator/JsonbBundleActivator.java
deleted file mode 100644
index 2342c16..0000000
--- a/jax-rs.jsonb/src/main/java/org/apache/aries/jax/rs/jsonp/activator/JsonbBundleActivator.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * 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.jsonp.activator;
-
-import org.apache.johnzon.jaxrs.jsonb.jaxrs.JsonbJaxrsProvider;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.Constants;
-import org.osgi.framework.PrototypeServiceFactory;
-import org.osgi.framework.ServiceRegistration;
-import org.osgi.framework.wiring.BundleWiring;
-import org.osgi.service.jaxrs.whiteboard.JaxrsWhiteboardConstants;
-
-import javax.json.bind.Jsonb;
-import javax.ws.rs.ext.MessageBodyReader;
-import javax.ws.rs.ext.MessageBodyWriter;
-import java.util.Hashtable;
-
-public class JsonbBundleActivator implements BundleActivator {
-
- @Override
- public void start(BundleContext context) throws Exception {
- _serviceRegistration = context.registerService(
- new String[]{
- MessageBodyReader.class.getName(),
- MessageBodyWriter.class.getName()
- },
- new PrototypeServiceFactory<JsonbJaxrsProvider>() {
- @Override
- public JsonbJaxrsProvider getService(
- Bundle bundle,
- ServiceRegistration<JsonbJaxrsProvider> registration) {
-
- return new JsonbJaxrsProvider() {
-
- @Override
- protected Jsonb createJsonb() {
- Thread thread = Thread.currentThread();
-
- ClassLoader contextClassLoader =
- thread.getContextClassLoader();
-
- thread.setContextClassLoader(
- context.
- getBundle().
- adapt(BundleWiring.class).
- getClassLoader()
- );
- try {
- return super.createJsonb();
- }
- finally {
- thread.setContextClassLoader(
- contextClassLoader);
- }
- }
- };
-
- }
-
- @Override
- public void ungetService(
- Bundle bundle,
- ServiceRegistration<JsonbJaxrsProvider> registration,
- JsonbJaxrsProvider service) {
-
- }
- },
- new Hashtable<String, Object>() {{
- put(JaxrsWhiteboardConstants.JAX_RS_EXTENSION, true);
- put(
- JaxrsWhiteboardConstants.JAX_RS_NAME, "JSON-B");
- put(Constants.SERVICE_RANKING, Integer.MIN_VALUE);
- }});
- }
-
- @Override
- public void stop(BundleContext context) throws Exception {
- try {
- _serviceRegistration.unregister();
- }
- catch (Exception e) {
- e.printStackTrace();
- }
- }
-
- private ServiceRegistration<?> _serviceRegistration;
-
-
-}
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/55cb9600/jax-rs.jsonp/LICENSE
----------------------------------------------------------------------
diff --git a/jax-rs.jsonp/LICENSE b/jax-rs.jsonp/LICENSE
deleted file mode 100644
index d645695..0000000
--- a/jax-rs.jsonp/LICENSE
+++ /dev/null
@@ -1,202 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed 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.
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/55cb9600/jax-rs.jsonp/bnd.bnd
----------------------------------------------------------------------
diff --git a/jax-rs.jsonp/bnd.bnd b/jax-rs.jsonp/bnd.bnd
deleted file mode 100644
index 62bf15a..0000000
--- a/jax-rs.jsonp/bnd.bnd
+++ /dev/null
@@ -1,23 +0,0 @@
-# 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.
-
-Bundle-Activator: org.apache.aries.jax.rs.jsonp.activator.JsonpBundleActivator
-
--includeresource:\
- @johnzon-core-*.jar,\
- lib/johnzon-jaxrs.jar=johnzon-jaxrs-*.jar;lib:=true,\
- lib/johnzon-mapper.jar=johnzon-mapper-*.jar;lib:=true
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/55cb9600/jax-rs.jsonp/pom.xml
----------------------------------------------------------------------
diff --git a/jax-rs.jsonp/pom.xml b/jax-rs.jsonp/pom.xml
deleted file mode 100644
index ff8119e..0000000
--- a/jax-rs.jsonp/pom.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version='1.0' encoding='UTF-8' ?>
-<!--
- 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.
--->
-<project
- xmlns="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"
->
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.aries.jax.rs</groupId>
- <artifactId>org.apache.aries.jax.rs</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- </parent>
-
- <artifactId>org.apache.aries.jax.rs.jsonp</artifactId>
- <description>Apache Aries JAX-RS JSON P</description>
- <name>Apache Aries JAX-RS JSON P</name>
-
- <dependencies>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <version>6.0.0</version>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.service.jaxrs</artifactId>
- <version>1.0.0</version>
- </dependency>
- <dependency>
- <groupId>javax.ws.rs</groupId>
- <artifactId>javax.ws.rs-api</artifactId>
- <version>2.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.specs</groupId>
- <artifactId>org.apache.servicemix.specs.json-api-1.1</artifactId>
- <version>2.9.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.johnzon</groupId>
- <artifactId>johnzon-jaxrs</artifactId>
- <version>1.1.7</version>
- </dependency>
- </dependencies>
-
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>com.github.hazendaz.spotbugs</groupId>
- <artifactId>spotbugs-maven-plugin</artifactId>
- <version>3.0.6</version>
- <configuration>
- <effort>Max</effort>
- <threshold>Low</threshold>
- <failOnError>false</failOnError>
- <plugins>
- <plugin>
- <groupId>com.h3xstream.findsecbugs</groupId>
- <artifactId>findsecbugs-plugin</artifactId>
- <version>LATEST</version>
- </plugin>
- </plugins>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- <plugins>
- <plugin>
- <groupId>biz.aQute.bnd</groupId>
- <artifactId>bnd-maven-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
- <reporting>
- <plugins>
- <plugin>
- <groupId>com.github.hazendaz.spotbugs</groupId>
- <artifactId>spotbugs-maven-plugin</artifactId>
- <version>3.0.6</version>
- </plugin>
- </plugins>
- </reporting>
-
-</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/55cb9600/jax-rs.jsonp/src/main/java/org/apache/aries/jax/rs/jsonp/activator/JsonpBundleActivator.java
----------------------------------------------------------------------
diff --git a/jax-rs.jsonp/src/main/java/org/apache/aries/jax/rs/jsonp/activator/JsonpBundleActivator.java b/jax-rs.jsonp/src/main/java/org/apache/aries/jax/rs/jsonp/activator/JsonpBundleActivator.java
deleted file mode 100644
index 9d8ee8d..0000000
--- a/jax-rs.jsonp/src/main/java/org/apache/aries/jax/rs/jsonp/activator/JsonpBundleActivator.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * 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.jsonp.activator;
-
-import org.apache.johnzon.jaxrs.JsrProvider;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.Constants;
-import org.osgi.framework.PrototypeServiceFactory;
-import org.osgi.framework.ServiceRegistration;
-import org.osgi.framework.wiring.BundleWiring;
-import org.osgi.service.jaxrs.whiteboard.JaxrsWhiteboardConstants;
-
-import javax.ws.rs.ext.MessageBodyReader;
-import javax.ws.rs.ext.MessageBodyWriter;
-import java.util.Hashtable;
-
-public class JsonpBundleActivator implements BundleActivator {
-
- @Override
- public void start(BundleContext context) throws Exception {
- _serviceRegistration = context.registerService(
- new String[]{
- MessageBodyReader.class.getName(),
- MessageBodyWriter.class.getName()
- },
- new PrototypeServiceFactory<JsrProvider>() {
- @Override
- public JsrProvider getService(
- Bundle bundle,
- ServiceRegistration<JsrProvider> registration) {
-
- Thread thread = Thread.currentThread();
-
- ClassLoader contextClassLoader =
- thread.getContextClassLoader();
-
- thread.setContextClassLoader(
- context.
- getBundle().
- adapt(BundleWiring.class).
- getClassLoader()
- );
-
- try {
- return new JsrProvider();
- }
- finally {
- thread.setContextClassLoader(contextClassLoader);
- }
- }
-
- @Override
- public void ungetService(
- Bundle bundle,
- ServiceRegistration<JsrProvider> registration,
- JsrProvider service) {
-
- }
- },
- new Hashtable<String, Object>() {{
- put(JaxrsWhiteboardConstants.JAX_RS_EXTENSION, true);
- put(
- JaxrsWhiteboardConstants.JAX_RS_NAME, "JSON-P");
- put(Constants.SERVICE_RANKING, Integer.MIN_VALUE);
- }});
- }
-
- @Override
- public void stop(BundleContext context) throws Exception {
- try {
- _serviceRegistration.unregister();
- }
- catch (Exception e) {
- e.printStackTrace();
- }
- }
-
- private ServiceRegistration<?> _serviceRegistration;
-}
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/55cb9600/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index bbd8a24..7c9a02b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,12 +52,7 @@
<module>jax-rs.itests</module>
<module>jax-rs.itests-fragment</module>
<module>jax-rs.itests-jaxb-json</module>
- <module>jax-rs.itests-jsonb</module>
- <module>jax-rs.itests-jsonp</module>
- <module>jax-rs.example</module>
<module>jax-rs.jaxb-json</module>
- <module>jax-rs.jsonb</module>
- <module>jax-rs.jsonp</module>
</modules>
<build>
[5/9] aries-jax-rs-whiteboard git commit: Use releases
Posted by cs...@apache.org.
Use releases
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/4e2229d6
Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/4e2229d6
Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/4e2229d6
Branch: refs/heads/master
Commit: 4e2229d657c04ca74033758bb15adec575a55669
Parents: 7e16259
Author: Carlos Sierra <cs...@apache.org>
Authored: Tue Jun 26 09:27:19 2018 +0200
Committer: Carlos Sierra <cs...@apache.org>
Committed: Tue Jun 26 09:45:13 2018 +0200
----------------------------------------------------------------------
jax-rs.whiteboard/pom.xml | 2 +-
pom.xml | 7 -------
2 files changed, 1 insertion(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/4e2229d6/jax-rs.whiteboard/pom.xml
----------------------------------------------------------------------
diff --git a/jax-rs.whiteboard/pom.xml b/jax-rs.whiteboard/pom.xml
index 2c952f5..f16f3a5 100644
--- a/jax-rs.whiteboard/pom.xml
+++ b/jax-rs.whiteboard/pom.xml
@@ -35,7 +35,7 @@
<dependency>
<groupId>org.apache.aries.component-dsl</groupId>
<artifactId>org.apache.aries.component-dsl.component-dsl</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.2.0</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/4e2229d6/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 4c984fb..51b77bd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -174,11 +174,4 @@
</plugins>
</reporting>
- <repositories>
- <repository>
- <id>apache snapshots</id>
- <url>http://repository.apache.org/snapshots/</url>
- <layout>default</layout>
- </repository>
- </repositories>
</project>
\ No newline at end of file
[9/9] aries-jax-rs-whiteboard git commit: Not needed
Posted by cs...@apache.org.
Not needed
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/f39982df
Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/f39982df
Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/f39982df
Branch: refs/heads/master
Commit: f39982df0459ff3807fe1f6d8b6d33de22552c3f
Parents: a0b4d45
Author: Carlos Sierra <cs...@apache.org>
Authored: Tue Jun 26 10:27:33 2018 +0200
Committer: Carlos Sierra <cs...@apache.org>
Committed: Tue Jun 26 10:27:33 2018 +0200
----------------------------------------------------------------------
jax-rs.jaxb-json/.gitignore | 2 --
jax-rs.whiteboard/.gitignore | 2 --
2 files changed, 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/f39982df/jax-rs.jaxb-json/.gitignore
----------------------------------------------------------------------
diff --git a/jax-rs.jaxb-json/.gitignore b/jax-rs.jaxb-json/.gitignore
deleted file mode 100644
index 83ccc54..0000000
--- a/jax-rs.jaxb-json/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/build/
-/bin/
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/f39982df/jax-rs.whiteboard/.gitignore
----------------------------------------------------------------------
diff --git a/jax-rs.whiteboard/.gitignore b/jax-rs.whiteboard/.gitignore
deleted file mode 100644
index 83ccc54..0000000
--- a/jax-rs.whiteboard/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/build/
-/bin/
[6/9] aries-jax-rs-whiteboard git commit: Not needed
Posted by cs...@apache.org.
Not needed
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/4d737db4
Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/4d737db4
Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/4d737db4
Branch: refs/heads/master
Commit: 4d737db4040bfd3a8e6c54d03d22d01c4c4997a3
Parents: 55cb960
Author: Carlos Sierra <cs...@apache.org>
Authored: Tue Jun 26 09:24:16 2018 +0200
Committer: Carlos Sierra <cs...@apache.org>
Committed: Tue Jun 26 09:45:13 2018 +0200
----------------------------------------------------------------------
jax-rs.whiteboard/bnd.bnd | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/4d737db4/jax-rs.whiteboard/bnd.bnd
----------------------------------------------------------------------
diff --git a/jax-rs.whiteboard/bnd.bnd b/jax-rs.whiteboard/bnd.bnd
index 80528f9..38e940d 100644
--- a/jax-rs.whiteboard/bnd.bnd
+++ b/jax-rs.whiteboard/bnd.bnd
@@ -77,7 +77,6 @@ Import-Package:\
-includeresource:\
lib/component-dsl.jar=org.apache.aries.component-dsl.component-dsl-*.jar;lib:=true,\
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-sse.jar=cxf-rt-rs-sse-*.jar;lib:=true,\
[8/9] aries-jax-rs-whiteboard git commit: Proper licenses
Posted by cs...@apache.org.
Proper licenses
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/a0b4d455
Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/a0b4d455
Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/a0b4d455
Branch: refs/heads/master
Commit: a0b4d455f3baac8f542411598f7be79cda839a65
Parents: 4e2229d
Author: Carlos Sierra <cs...@apache.org>
Authored: Tue Jun 26 10:26:57 2018 +0200
Committer: Carlos Sierra <cs...@apache.org>
Committed: Tue Jun 26 10:26:57 2018 +0200
----------------------------------------------------------------------
jax-rs.itests-fragment/pom.xml | 17 ++++++++++++
jax-rs.itests-jaxb-json/itest.bndrun | 17 ++++++++++++
jax-rs.itests-jaxb-json/logback.xml | 18 +++++++++++++
jax-rs.itests/itest.bndrun | 17 ++++++++++++
jax-rs.itests/logback.xml | 18 +++++++++++++
.../main/java/test/types/TestAddonConflict.java | 27 +++++++++++---------
.../java/test/types/TestAddonConflict2.java | 27 +++++++++++---------
jax-rs.whiteboard/README | 9 +++++++
.../src/main/resources/static/index.html | 17 ++++++++++++
.../src/main/resources/static/style.css | 17 ++++++++++++
10 files changed, 160 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/a0b4d455/jax-rs.itests-fragment/pom.xml
----------------------------------------------------------------------
diff --git a/jax-rs.itests-fragment/pom.xml b/jax-rs.itests-fragment/pom.xml
index 15a2d85..ffdb91a 100644
--- a/jax-rs.itests-fragment/pom.xml
+++ b/jax-rs.itests-fragment/pom.xml
@@ -1,4 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+
<project xmlns="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://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/a0b4d455/jax-rs.itests-jaxb-json/itest.bndrun
----------------------------------------------------------------------
diff --git a/jax-rs.itests-jaxb-json/itest.bndrun b/jax-rs.itests-jaxb-json/itest.bndrun
index ae50046..5de9f62 100644
--- a/jax-rs.itests-jaxb-json/itest.bndrun
+++ b/jax-rs.itests-jaxb-json/itest.bndrun
@@ -1,3 +1,20 @@
+# 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.
+
-standalone: ${.}/target/index.xml
-runrequires: \
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/a0b4d455/jax-rs.itests-jaxb-json/logback.xml
----------------------------------------------------------------------
diff --git a/jax-rs.itests-jaxb-json/logback.xml b/jax-rs.itests-jaxb-json/logback.xml
index 1952216..b3a37f9 100644
--- a/jax-rs.itests-jaxb-json/logback.xml
+++ b/jax-rs.itests-jaxb-json/logback.xml
@@ -1,3 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+
<configuration>
<contextListener class="ch.qos.logback.classic.jul.LevelChangePropagator">
<resetJUL>true</resetJUL>
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/a0b4d455/jax-rs.itests/itest.bndrun
----------------------------------------------------------------------
diff --git a/jax-rs.itests/itest.bndrun b/jax-rs.itests/itest.bndrun
index 8ad686b..117a0d6 100644
--- a/jax-rs.itests/itest.bndrun
+++ b/jax-rs.itests/itest.bndrun
@@ -1,3 +1,20 @@
+# 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.
+
-standalone: ${.}/target/index.xml
-runrequires: \
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/a0b4d455/jax-rs.itests/logback.xml
----------------------------------------------------------------------
diff --git a/jax-rs.itests/logback.xml b/jax-rs.itests/logback.xml
index 1952216..b3a37f9 100644
--- a/jax-rs.itests/logback.xml
+++ b/jax-rs.itests/logback.xml
@@ -1,3 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+
<configuration>
<contextListener class="ch.qos.logback.classic.jul.LevelChangePropagator">
<resetJUL>true</resetJUL>
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/a0b4d455/jax-rs.itests/src/main/java/test/types/TestAddonConflict.java
----------------------------------------------------------------------
diff --git a/jax-rs.itests/src/main/java/test/types/TestAddonConflict.java b/jax-rs.itests/src/main/java/test/types/TestAddonConflict.java
index 02f96a7..0916681 100644
--- a/jax-rs.itests/src/main/java/test/types/TestAddonConflict.java
+++ b/jax-rs.itests/src/main/java/test/types/TestAddonConflict.java
@@ -1,15 +1,18 @@
-/**
- * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
- * <p>
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
- * <p>
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
+/*
+ * 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 test.types;
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/a0b4d455/jax-rs.itests/src/main/java/test/types/TestAddonConflict2.java
----------------------------------------------------------------------
diff --git a/jax-rs.itests/src/main/java/test/types/TestAddonConflict2.java b/jax-rs.itests/src/main/java/test/types/TestAddonConflict2.java
index c402753..c17f0b6 100644
--- a/jax-rs.itests/src/main/java/test/types/TestAddonConflict2.java
+++ b/jax-rs.itests/src/main/java/test/types/TestAddonConflict2.java
@@ -1,15 +1,18 @@
-/**
- * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
- * <p>
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
- * <p>
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
+/*
+ * 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 test.types;
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/a0b4d455/jax-rs.whiteboard/README
----------------------------------------------------------------------
diff --git a/jax-rs.whiteboard/README b/jax-rs.whiteboard/README
new file mode 100644
index 0000000..2d351e0
--- /dev/null
+++ b/jax-rs.whiteboard/README
@@ -0,0 +1,9 @@
+Apache Aries JAX-RS Whiteboard
+Copyright 2017 The Apache Software Foundation
+
+This product includes software by Ivan Sagalaev in [1] and by Vasily Polovnyov
+in [2]
+
+[1] resources/static/highlight
+[2] resources/static/highlight/styles/github.css
+
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/a0b4d455/jax-rs.whiteboard/src/main/resources/static/index.html
----------------------------------------------------------------------
diff --git a/jax-rs.whiteboard/src/main/resources/static/index.html b/jax-rs.whiteboard/src/main/resources/static/index.html
index 8980475..d2ad805 100644
--- a/jax-rs.whiteboard/src/main/resources/static/index.html
+++ b/jax-rs.whiteboard/src/main/resources/static/index.html
@@ -1,5 +1,22 @@
<!doctype html>
+<!--
+ 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.
+-->
+
<html lang="en">
<head>
<meta charset="utf-8">
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/a0b4d455/jax-rs.whiteboard/src/main/resources/static/style.css
----------------------------------------------------------------------
diff --git a/jax-rs.whiteboard/src/main/resources/static/style.css b/jax-rs.whiteboard/src/main/resources/static/style.css
index 320c465..0816086 100644
--- a/jax-rs.whiteboard/src/main/resources/static/style.css
+++ b/jax-rs.whiteboard/src/main/resources/static/style.css
@@ -1,3 +1,20 @@
+/*
+ * 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.
+ */
+
html,
body {
font-family: Helvetica, Tahoma, sans-serif;
[7/9] aries-jax-rs-whiteboard git commit: Use latest CXF version
(3.2.5)
Posted by cs...@apache.org.
Use latest CXF version (3.2.5)
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/7e16259c
Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/7e16259c
Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/7e16259c
Branch: refs/heads/master
Commit: 7e16259c6ee784abff6d133711eaef735a76e10b
Parents: 4d737db
Author: Carlos Sierra <cs...@apache.org>
Authored: Tue Jun 26 09:25:36 2018 +0200
Committer: Carlos Sierra <cs...@apache.org>
Committed: Tue Jun 26 09:45:13 2018 +0200
----------------------------------------------------------------------
.../cxf/CxfJaxrsServiceRegistrator.java | 4 +-
.../cxf/sse/OutboundSseEventBodyWriter.java | 141 --------
.../internal/cxf/sse/OutboundSseEventImpl.java | 182 -----------
.../internal/cxf/sse/SseBroadcasterImpl.java | 120 -------
.../internal/cxf/sse/SseContextProvider.java | 31 --
.../cxf/sse/SseEventSinkContextProvider.java | 48 ---
.../internal/cxf/sse/SseEventSinkImpl.java | 161 ----------
.../rs/whiteboard/internal/cxf/sse/SseImpl.java | 38 ---
.../cxf/jaxrs/impl/AsyncResponseImpl.java | 321 -------------------
pom.xml | 2 +-
10 files changed, 3 insertions(+), 1045 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/7e16259c/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/cxf/CxfJaxrsServiceRegistrator.java
----------------------------------------------------------------------
diff --git a/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/cxf/CxfJaxrsServiceRegistrator.java b/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/cxf/CxfJaxrsServiceRegistrator.java
index dc82163..54cb945 100644
--- a/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/cxf/CxfJaxrsServiceRegistrator.java
+++ b/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/cxf/CxfJaxrsServiceRegistrator.java
@@ -40,8 +40,6 @@ import javax.ws.rs.core.Feature;
import javax.ws.rs.core.FeatureContext;
import javax.ws.rs.ext.RuntimeDelegate;
-import org.apache.aries.jax.rs.whiteboard.internal.cxf.sse.SseContextProvider;
-import org.apache.aries.jax.rs.whiteboard.internal.cxf.sse.SseEventSinkContextProvider;
import org.apache.aries.jax.rs.whiteboard.internal.utils.ServiceReferenceResourceProvider;
import org.apache.aries.jax.rs.whiteboard.internal.utils.ServiceTuple;
import org.apache.aries.component.dsl.CachingServiceReference;
@@ -56,6 +54,8 @@ import org.apache.cxf.jaxrs.model.ApplicationInfo;
import org.apache.cxf.jaxrs.model.ClassResourceInfo;
import org.apache.cxf.jaxrs.provider.ProviderFactory.ProviderInfoClassComparator;
import org.apache.cxf.jaxrs.provider.ServerConfigurableFactory;
+import org.apache.cxf.jaxrs.sse.SseContextProvider;
+import org.apache.cxf.jaxrs.sse.SseEventSinkContextProvider;
import org.apache.cxf.jaxrs.utils.AnnotationUtils;
import org.osgi.framework.ServiceObjects;
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/7e16259c/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/cxf/sse/OutboundSseEventBodyWriter.java
----------------------------------------------------------------------
diff --git a/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/cxf/sse/OutboundSseEventBodyWriter.java b/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/cxf/sse/OutboundSseEventBodyWriter.java
deleted file mode 100644
index 32869e6..0000000
--- a/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/cxf/sse/OutboundSseEventBodyWriter.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/**
- * 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.cxf.sse;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Type;
-import java.nio.charset.StandardCharsets;
-
-import javax.ws.rs.InternalServerErrorException;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.ext.MessageBodyWriter;
-import javax.ws.rs.ext.Provider;
-import javax.ws.rs.sse.OutboundSseEvent;
-
-import org.apache.cxf.jaxrs.provider.ServerProviderFactory;
-import org.apache.cxf.message.Exchange;
-import org.apache.cxf.message.Message;
-import org.apache.cxf.message.MessageImpl;
-
-@Provider
-public class OutboundSseEventBodyWriter implements MessageBodyWriter<OutboundSseEvent> {
- public static final String SERVER_SENT_EVENTS = "text/event-stream";
- public static final MediaType SERVER_SENT_EVENTS_TYPE = MediaType.valueOf(SERVER_SENT_EVENTS);
-
- private static final byte[] COMMENT = ": ".getBytes(StandardCharsets.UTF_8);
- private static final byte[] EVENT = "event: ".getBytes(StandardCharsets.UTF_8);
- private static final byte[] ID = "id: ".getBytes(StandardCharsets.UTF_8);
- private static final byte[] RETRY = "retry: ".getBytes(StandardCharsets.UTF_8);
- private static final byte[] DATA = "data: ".getBytes(StandardCharsets.UTF_8);
- private static final byte[] NEW_LINE = "\n".getBytes(StandardCharsets.UTF_8);
-
- private ServerProviderFactory factory;
- private Message message;
-
- protected OutboundSseEventBodyWriter() {
- }
-
- public OutboundSseEventBodyWriter(final ServerProviderFactory factory, final Exchange exchange) {
- this.factory = factory;
- this.message = new MessageImpl();
- this.message.setExchange(exchange);
- }
-
-
- @Override
- public boolean isWriteable(Class<?> cls, Type type, Annotation[] anns, MediaType mt) {
- return OutboundSseEvent.class.isAssignableFrom(cls) || SERVER_SENT_EVENTS_TYPE.isCompatible(mt);
- }
-
- @Override
- public void writeTo(OutboundSseEvent p, Class<?> cls, Type t, Annotation[] anns,
- MediaType mt, MultivaluedMap<String, Object> headers, OutputStream os)
- throws IOException, WebApplicationException {
-
- if (p.getName() != null) {
- os.write(EVENT);
- os.write(p.getName().getBytes(StandardCharsets.UTF_8));
- os.write(NEW_LINE);
- }
-
- if (p.getId() != null) {
- os.write(ID);
- os.write(p.getId().getBytes(StandardCharsets.UTF_8));
- os.write(NEW_LINE);
- }
-
- if (p.getComment() != null) {
- os.write(COMMENT);
- os.write(p.getComment().getBytes(StandardCharsets.UTF_8));
- os.write(NEW_LINE);
- }
-
- if (p.getReconnectDelay() > 0) {
- os.write(RETRY);
- os.write(Long.toString(p.getReconnectDelay()).getBytes(StandardCharsets.UTF_8));
- os.write(NEW_LINE);
- }
-
- if (p.getData() != null) {
- Class<?> payloadClass = p.getType();
- Type payloadType = p.getGenericType();
- if (payloadType == null) {
- payloadType = payloadClass;
- }
-
- if (payloadType == null && payloadClass == null) {
- payloadType = Object.class;
- payloadClass = Object.class;
- }
-
- os.write(DATA);
- writePayloadTo(payloadClass, payloadType, anns, p.getMediaType(), headers, p.getData(), os);
- os.write(NEW_LINE);
- }
-
- os.write(NEW_LINE);
- }
-
- @SuppressWarnings("unchecked")
- private<T> void writePayloadTo(Class<T> cls, Type type, Annotation[] anns, MediaType mt,
- MultivaluedMap<String, Object> headers, Object data, OutputStream os)
- throws IOException, WebApplicationException {
-
- MessageBodyWriter<T> writer = null;
- if (message != null && factory != null) {
- writer = factory.createMessageBodyWriter(cls, type, anns, mt, message);
- }
-
- if (writer == null) {
- throw new InternalServerErrorException("No suitable message body writer for class: " + cls.getName());
- }
-
- writer.writeTo((T)data, cls, type, anns, mt, headers, os);
- }
-
- @Override
- public long getSize(OutboundSseEvent t, Class<?> type, Type genericType, Annotation[] annotations,
- MediaType mediaType) {
- return -1;
- }
-}
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/7e16259c/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/cxf/sse/OutboundSseEventImpl.java
----------------------------------------------------------------------
diff --git a/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/cxf/sse/OutboundSseEventImpl.java b/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/cxf/sse/OutboundSseEventImpl.java
deleted file mode 100644
index 85e9e5b..0000000
--- a/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/cxf/sse/OutboundSseEventImpl.java
+++ /dev/null
@@ -1,182 +0,0 @@
-/**
- * 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.cxf.sse;
-
-import java.lang.reflect.Type;
-
-import javax.ws.rs.core.GenericType;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.sse.OutboundSseEvent;
-
-public final class OutboundSseEventImpl implements OutboundSseEvent {
- private final String id;
- private final String name;
- private final String comment;
- private final long reconnectDelay;
- private final Class<?> type;
- private final Type genericType;
- private final MediaType mediaType;
- private final Object data;
-
- public static class BuilderImpl implements Builder {
- private String id;
- private String name;
- private String comment;
- private long reconnectDelay = -1;
- private Class<?> type;
- private Type genericType;
- private MediaType mediaType = MediaType.TEXT_PLAIN_TYPE;
- private Object data;
-
- @Override
- public Builder id(String newId) {
- this.id = newId;
- return this;
- }
-
- @Override
- public Builder name(String newName) {
- this.name = newName;
- return this;
- }
-
- @Override
- public Builder reconnectDelay(long milliseconds) {
- this.reconnectDelay = milliseconds;
- return this;
- }
-
- @Override
- public Builder mediaType(MediaType newMediaType) {
- this.mediaType = newMediaType;
- return this;
- }
-
- @Override
- public Builder comment(String newComment) {
- this.comment = newComment;
- return this;
- }
-
- @Override
- @SuppressWarnings("rawtypes")
- public Builder data(Class newType, Object newData) {
- if (newType == null || newData == null) {
- throw new IllegalArgumentException("Parameters 'type' and 'data' must not be null.");
- }
- this.type = newType;
- this.data = newData;
- return this;
- }
-
- @Override
- @SuppressWarnings("rawtypes")
- public Builder data(GenericType newType, Object newData) {
- if (newType == null || newData == null) {
- throw new IllegalArgumentException("Parameters 'type' and 'data' must not be null.");
- }
- this.genericType = newType.getType();
- this.data = newData;
- return this;
- }
-
- @Override
- public Builder data(Object newData) {
- if (newData == null) {
- throw new IllegalArgumentException("Parameter 'data' must not be null.");
- }
- this.type = newData.getClass();
- this.data = newData;
- return this;
- }
-
- @Override
- public OutboundSseEvent build() {
- return new OutboundSseEventImpl(
- id,
- name,
- comment,
- reconnectDelay,
- type,
- genericType,
- mediaType,
- data
- );
- }
-
- }
- //CHECKSTYLE:OFF
- private OutboundSseEventImpl(String id, String name, String comment, long reconnectDelay,
- Class<?> type, Type genericType, MediaType mediaType, Object data) {
- this.id = id;
- this.name = name;
- this.comment = comment;
- this.reconnectDelay = reconnectDelay;
- this.type = type;
- this.genericType = genericType;
- this.mediaType = mediaType;
- this.data = data;
- }
- //CHECKSTYLE:ON
-
- @Override
- public String getId() {
- return id;
- }
-
- @Override
- public String getName() {
- return name;
- }
-
- @Override
- public String getComment() {
- return comment;
- }
-
- @Override
- public long getReconnectDelay() {
- return reconnectDelay;
- }
-
- @Override
- public boolean isReconnectDelaySet() {
- return reconnectDelay != -1;
- }
-
- @Override
- public Class<?> getType() {
- return type;
- }
-
- @Override
- public Type getGenericType() {
- return genericType;
- }
-
- @Override
- public MediaType getMediaType() {
- return mediaType;
- }
-
- @Override
- public Object getData() {
- return data;
- }
-}
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/7e16259c/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/cxf/sse/SseBroadcasterImpl.java
----------------------------------------------------------------------
diff --git a/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/cxf/sse/SseBroadcasterImpl.java b/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/cxf/sse/SseBroadcasterImpl.java
deleted file mode 100644
index eee4d70..0000000
--- a/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/cxf/sse/SseBroadcasterImpl.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/**
- * 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.cxf.sse;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Set;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.CompletionStage;
-import java.util.concurrent.CopyOnWriteArraySet;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.function.BiConsumer;
-import java.util.function.Consumer;
-
-import javax.servlet.AsyncContext;
-import javax.servlet.AsyncEvent;
-import javax.servlet.AsyncListener;
-import javax.ws.rs.sse.OutboundSseEvent;
-import javax.ws.rs.sse.SseBroadcaster;
-import javax.ws.rs.sse.SseEventSink;
-
-public class SseBroadcasterImpl implements SseBroadcaster {
- private final Set<SseEventSink> subscribers = new CopyOnWriteArraySet<>();
- private final Set<Consumer<SseEventSink>> closers = new CopyOnWriteArraySet<>();
- private final Set<BiConsumer<SseEventSink, Throwable>> exceptioners = new CopyOnWriteArraySet<>();
- private final AtomicBoolean closed = new AtomicBoolean(false);
-
- @Override
- public void register(SseEventSink sink) {
- assertNotClosed();
-
- final SseEventSinkImpl sinkImpl = (SseEventSinkImpl)sink;
- final AsyncContext ctx = sinkImpl.getAsyncContext();
-
- ctx.addListener(new AsyncListener() {
- @Override
- public void onComplete(AsyncEvent asyncEvent) throws IOException {
- subscribers.remove(sink);
- }
-
- @Override
- public void onTimeout(AsyncEvent asyncEvent) throws IOException {
- subscribers.remove(sink);
- }
-
- @Override
- public void onError(AsyncEvent asyncEvent) throws IOException {
- subscribers.remove(sink);
- }
-
- @Override
- public void onStartAsync(AsyncEvent asyncEvent) throws IOException {
-
- }
- });
-
- subscribers.add(sink);
- }
-
- @Override
- public CompletionStage<?> broadcast(OutboundSseEvent event) {
- assertNotClosed();
-
- final Collection<CompletableFuture<?>> futures = new ArrayList<>();
- for (SseEventSink sink: subscribers) {
- try {
- futures.add(sink.send(event).toCompletableFuture());
- } catch (final Exception ex) {
- exceptioners.forEach(exceptioner -> exceptioner.accept(sink, ex));
- }
- }
-
- return CompletableFuture.allOf(futures.toArray(new CompletableFuture[futures.size()]));
- }
-
- @Override
- public void onClose(Consumer<SseEventSink> subscriber) {
- assertNotClosed();
- closers.add(subscriber);
- }
-
- @Override
- public void onError(BiConsumer<SseEventSink, Throwable> exceptioner) {
- assertNotClosed();
- exceptioners.add(exceptioner);
- }
-
- @Override
- public void close() {
- if (closed.compareAndSet(false, true)) {
- subscribers.forEach(subscriber -> {
- subscriber.close();
- closers.forEach(closer -> closer.accept(subscriber));
- });
- }
- }
-
- private void assertNotClosed() {
- if (closed.get()) {
- throw new IllegalStateException("The SSE broadcaster is already closed");
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/7e16259c/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/cxf/sse/SseContextProvider.java
----------------------------------------------------------------------
diff --git a/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/cxf/sse/SseContextProvider.java b/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/cxf/sse/SseContextProvider.java
deleted file mode 100644
index 6c4b695..0000000
--- a/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/cxf/sse/SseContextProvider.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * 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.cxf.sse;
-
-import javax.ws.rs.sse.Sse;
-
-import org.apache.cxf.jaxrs.ext.ContextProvider;
-import org.apache.cxf.message.Message;
-
-public class SseContextProvider implements ContextProvider<Sse> {
- @Override
- public Sse createContext(Message message) {
- return new SseImpl();
- }
-}
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/7e16259c/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/cxf/sse/SseEventSinkContextProvider.java
----------------------------------------------------------------------
diff --git a/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/cxf/sse/SseEventSinkContextProvider.java b/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/cxf/sse/SseEventSinkContextProvider.java
deleted file mode 100644
index 3240fe5..0000000
--- a/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/cxf/sse/SseEventSinkContextProvider.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/**
- * 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.cxf.sse;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.ext.MessageBodyWriter;
-import javax.ws.rs.sse.OutboundSseEvent;
-import javax.ws.rs.sse.SseEventSink;
-
-import org.apache.cxf.jaxrs.ext.ContextProvider;
-import org.apache.cxf.jaxrs.impl.AsyncResponseImpl;
-import org.apache.cxf.jaxrs.provider.ServerProviderFactory;
-import org.apache.cxf.message.Message;
-import org.apache.cxf.transport.http.AbstractHTTPDestination;
-
-public class SseEventSinkContextProvider implements ContextProvider<SseEventSink> {
-
- @Override
- public SseEventSink createContext(Message message) {
- final HttpServletRequest request = (HttpServletRequest)message.get(AbstractHTTPDestination.HTTP_REQUEST);
- if (request == null) {
- throw new IllegalStateException("Unable to retrieve HTTP request from the context");
- }
-
- final MessageBodyWriter<OutboundSseEvent> writer = new OutboundSseEventBodyWriter(
- ServerProviderFactory.getInstance(message), message.getExchange());
-
- final AsyncResponseImpl async = new AsyncResponseImpl(message);
- return new SseEventSinkImpl(writer, async, request.getAsyncContext());
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/7e16259c/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/cxf/sse/SseEventSinkImpl.java
----------------------------------------------------------------------
diff --git a/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/cxf/sse/SseEventSinkImpl.java b/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/cxf/sse/SseEventSinkImpl.java
deleted file mode 100644
index cdcacb1..0000000
--- a/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/cxf/sse/SseEventSinkImpl.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/**
- * 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.cxf.sse;
-
-import java.lang.annotation.Annotation;
-import java.util.Queue;
-import java.util.concurrent.ArrayBlockingQueue;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.CompletionStage;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.locks.LockSupport;
-import java.util.logging.Logger;
-
-import javax.servlet.AsyncContext;
-import javax.ws.rs.container.AsyncResponse;
-import javax.ws.rs.ext.MessageBodyWriter;
-import javax.ws.rs.sse.OutboundSseEvent;
-import javax.ws.rs.sse.SseEventSink;
-
-import org.apache.cxf.common.logging.LogUtils;
-
-public class SseEventSinkImpl implements SseEventSink {
- private static final Annotation[] EMPTY_ANNOTATIONS = new Annotation [] {};
- private static final Logger LOG = LogUtils.getL7dLogger(SseEventSinkImpl.class);
- private static final int BUFFER_SIZE = 10000; // buffering 10000 messages
-
- private final AsyncContext ctx;
- private final MessageBodyWriter<OutboundSseEvent> writer;
- private final Queue<QueuedEvent> buffer;
- private final AtomicBoolean closed = new AtomicBoolean(false);
- private final AtomicBoolean dispatching = new AtomicBoolean(false);
-
- public SseEventSinkImpl(final MessageBodyWriter<OutboundSseEvent> writer,
- final AsyncResponse async, final AsyncContext ctx) {
-
- this.writer = writer;
- this.buffer = new ArrayBlockingQueue<>(BUFFER_SIZE);
- this.ctx = ctx;
-
- if (ctx == null) {
- throw new IllegalStateException("Unable to retrieve the AsyncContext for this request. "
- + "Is the Servlet configured properly?");
- }
-
- ctx.getResponse().setContentType(OutboundSseEventBodyWriter.SERVER_SENT_EVENTS);
- }
-
- public AsyncContext getAsyncContext() {
- return ctx;
- }
-
- @Override
- public void close() {
- if (closed.compareAndSet(false, true)) {
- // In case we are still dispatching, give the events the chance to be
- // sent over to the consumers. The good example would be sent(event) call,
- // immediately followed by the close() call.
- if (!awaitQueueToDrain(5, TimeUnit.SECONDS)) {
- LOG.warning("There are still SSE events the queue which may not be delivered (closing now)");
- }
-
- try {
- ctx.complete();
- } catch (final IllegalStateException ex) {
- LOG.warning("Failed to close the AsyncContext cleanly: " + ex.getMessage());
- }
- }
- }
-
- private boolean awaitQueueToDrain(int timeout, TimeUnit unit) {
- final long parkTime = unit.toNanos(timeout) / 20;
- int attempt = 0;
-
- while (dispatching.get() && ++attempt < 20) {
- LockSupport.parkNanos(parkTime);
- }
-
- return buffer.isEmpty();
- }
-
- @Override
- public boolean isClosed() {
- return closed.get();
- }
-
- @Override
- public CompletionStage<?> send(OutboundSseEvent event) {
- final CompletableFuture<?> future = new CompletableFuture<>();
-
- if (!closed.get() && writer != null) {
- if (buffer.offer(new QueuedEvent(event, future))) {
- if (dispatching.compareAndSet(false, true)) {
- ctx.start(this::dequeue);
- }
- } else {
- future.completeExceptionally(new IllegalStateException(
- "The buffer is full (10000), unable to queue SSE event for send"));
- }
- } else {
- future.completeExceptionally(new IllegalStateException(
- "The sink is already closed, unable to queue SSE event for send"));
- }
-
- return future;
- }
-
- private void dequeue() {
- try {
- while (true) {
- final QueuedEvent qeuedEvent = buffer.poll();
-
- // Nothing queued, release the thread
- if (qeuedEvent == null) {
- break;
- }
-
- final OutboundSseEvent event = qeuedEvent.event;
- final CompletableFuture<?> future = qeuedEvent.completion;
-
- try {
- writer.writeTo(event, event.getClass(), event.getGenericType(), EMPTY_ANNOTATIONS,
- event.getMediaType(), null, ctx.getResponse().getOutputStream());
- ctx.getResponse().flushBuffer();
- future.complete(null);
- } catch (final Exception ex) {
- future.completeExceptionally(ex);
- }
- }
- } finally {
- dispatching.set(false);
- }
- }
-
- private static class QueuedEvent {
- private final OutboundSseEvent event;
- private final CompletableFuture<?> completion;
-
- QueuedEvent(OutboundSseEvent event, CompletableFuture<?> completion) {
- this.event = event;
- this.completion = completion;
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/7e16259c/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/cxf/sse/SseImpl.java
----------------------------------------------------------------------
diff --git a/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/cxf/sse/SseImpl.java b/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/cxf/sse/SseImpl.java
deleted file mode 100644
index b558120..0000000
--- a/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/cxf/sse/SseImpl.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/**
- * 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.cxf.sse;
-
-import javax.ws.rs.sse.OutboundSseEvent.Builder;
-import javax.ws.rs.sse.Sse;
-import javax.ws.rs.sse.SseBroadcaster;
-
-class SseImpl implements Sse {
- SseImpl() {
- }
-
- @Override
- public Builder newEventBuilder() {
- return new OutboundSseEventImpl.BuilderImpl();
- }
-
- @Override
- public SseBroadcaster newBroadcaster() {
- return new SseBroadcasterImpl();
- }
-}
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/7e16259c/jax-rs.whiteboard/src/main/java/org/apache/cxf/jaxrs/impl/AsyncResponseImpl.java
----------------------------------------------------------------------
diff --git a/jax-rs.whiteboard/src/main/java/org/apache/cxf/jaxrs/impl/AsyncResponseImpl.java b/jax-rs.whiteboard/src/main/java/org/apache/cxf/jaxrs/impl/AsyncResponseImpl.java
deleted file mode 100644
index eb3a8d2..0000000
--- a/jax-rs.whiteboard/src/main/java/org/apache/cxf/jaxrs/impl/AsyncResponseImpl.java
+++ /dev/null
@@ -1,321 +0,0 @@
-/**
- * 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.cxf.jaxrs.impl;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-
-import javax.ws.rs.ServiceUnavailableException;
-import javax.ws.rs.container.AsyncResponse;
-import javax.ws.rs.container.CompletionCallback;
-import javax.ws.rs.container.ConnectionCallback;
-import javax.ws.rs.container.TimeoutHandler;
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.ResponseBuilder;
-
-import org.apache.cxf.continuations.Continuation;
-import org.apache.cxf.continuations.ContinuationCallback;
-import org.apache.cxf.continuations.ContinuationProvider;
-import org.apache.cxf.interceptor.Fault;
-import org.apache.cxf.jaxrs.utils.HttpUtils;
-import org.apache.cxf.message.Message;
-
-
-public class AsyncResponseImpl implements AsyncResponse, ContinuationCallback {
-
- private Continuation cont;
- private Message inMessage;
- private TimeoutHandler timeoutHandler;
- private volatile boolean initialSuspend;
- private volatile boolean cancelled;
- private volatile boolean done;
- private volatile boolean resumedByApplication;
- private volatile Long pendingTimeout;
-
- private List<CompletionCallback> completionCallbacks = new LinkedList<CompletionCallback>();
- private List<ConnectionCallback> connectionCallbacks = new LinkedList<ConnectionCallback>();
- private Throwable unmappedThrowable;
-
- public AsyncResponseImpl(Message inMessage) {
- inMessage.put(AsyncResponse.class, this);
- inMessage.getExchange().put(ContinuationCallback.class, this);
- this.inMessage = inMessage;
-
- initContinuation();
- }
-
- @Override
- public boolean resume(Object response) {
- return doResume(response);
- }
-
- @Override
- public boolean resume(Throwable response) {
- return doResume(response);
- }
-
- private boolean isCancelledOrNotSuspended() {
- return isCancelled() || !isSuspended();
- }
-
- private boolean doResume(Object response) {
- if (isCancelledOrNotSuspended()) {
- return false;
- }
- return doResumeFinal(response);
- }
- private synchronized boolean doResumeFinal(Object response) {
- inMessage.getExchange().put(AsyncResponse.class, this);
- cont.setObject(response);
- resumedByApplication = true;
- if (!initialSuspend) {
- cont.resume();
- } else {
- initialSuspend = false;
- }
- return true;
- }
-
- @Override
- public boolean cancel() {
- return doCancel(null);
- }
-
- @Override
- public boolean cancel(int retryAfter) {
- return doCancel(Integer.toString(retryAfter));
- }
-
- @Override
- public boolean cancel(Date retryAfter) {
- return doCancel(HttpUtils.getHttpDateFormat().format(retryAfter));
- }
-
- private boolean doCancel(String retryAfterHeader) {
- if (cancelled) {
- return true;
- }
- if (!isSuspended()) {
- return false;
- }
-
- cancelled = true;
- ResponseBuilder rb = Response.status(503);
- if (retryAfterHeader != null) {
- rb.header(HttpHeaders.RETRY_AFTER, retryAfterHeader);
- }
- doResumeFinal(rb.build());
- return cancelled;
- }
-
- @Override
- public boolean isSuspended() {
- if (cancelled || resumedByApplication) {
- return false;
- }
- return initialSuspend || cont.isPending();
- }
-
- @Override
- public synchronized boolean isCancelled() {
- return cancelled;
- }
-
- @Override
- public boolean isDone() {
- return done;
- }
-
- @Override
- public synchronized boolean setTimeout(long time, TimeUnit unit) throws IllegalStateException {
- if (isCancelledOrNotSuspended()) {
- return false;
- }
- setAsyncResponseOnExchange();
- long timeout = TimeUnit.MILLISECONDS.convert(time, unit);
- initialSuspend = false;
- if (!cont.isPending()) {
- cont.suspend(timeout);
- } else {
- pendingTimeout = timeout;
- cont.resume();
- }
- return true;
- }
-
- private void setAsyncResponseOnExchange() {
- inMessage.getExchange().put(AsyncResponse.class, this);
- }
-
- @Override
- public void setTimeoutHandler(TimeoutHandler handler) {
- timeoutHandler = handler;
- }
-
- @Override
- public Collection<Class<?>> register(Class<?> callback) throws NullPointerException {
- return register(callback, new Class<?>[]{}).get(callback);
- }
-
- @Override
- public Map<Class<?>, Collection<Class<?>>> register(Class<?> callback, Class<?>... callbacks)
- throws NullPointerException {
- try {
- Object[] extraCallbacks = new Object[callbacks.length];
- for (int i = 0; i < callbacks.length; i++) {
- extraCallbacks[i] = callbacks[i].newInstance();
- }
- return register(callback.newInstance(), extraCallbacks);
- } catch (NullPointerException e) {
- throw e;
- } catch (Throwable t) {
- return Collections.emptyMap();
- }
-
- }
-
- @Override
- public Collection<Class<?>> register(Object callback) throws NullPointerException {
- return register(callback, new Object[]{}).get(callback.getClass());
- }
-
- @Override
- public Map<Class<?>, Collection<Class<?>>> register(Object callback, Object... callbacks)
- throws NullPointerException {
- Map<Class<?>, Collection<Class<?>>> map =
- new HashMap<Class<?>, Collection<Class<?>>>();
-
- Object[] allCallbacks = new Object[1 + callbacks.length];
- allCallbacks[0] = callback;
- System.arraycopy(callbacks, 0, allCallbacks, 1, callbacks.length);
-
- for (int i = 0; i < allCallbacks.length; i++) {
- if (allCallbacks[i] == null) {
- throw new NullPointerException();
- }
- Class<?> callbackCls = allCallbacks[i].getClass();
- Collection<Class<?>> knownCallbacks = map.get(callbackCls);
- if (knownCallbacks == null) {
- knownCallbacks = new HashSet<Class<?>>();
- map.put(callbackCls, knownCallbacks);
- }
-
- if (allCallbacks[i] instanceof CompletionCallback) {
- knownCallbacks.add(CompletionCallback.class);
- completionCallbacks.add((CompletionCallback)allCallbacks[i]);
- } else if (allCallbacks[i] instanceof ConnectionCallback) {
- knownCallbacks.add(ConnectionCallback.class);
- connectionCallbacks.add((ConnectionCallback)allCallbacks[i]);
- }
- }
- return map;
- }
-
- @Override
- public void onComplete() {
- done = true;
- updateCompletionCallbacks(unmappedThrowable);
- }
-
- @Override
- public void onError(Throwable error) {
- updateCompletionCallbacks(error);
- }
-
- private void updateCompletionCallbacks(Throwable error) {
- Throwable actualError = error instanceof Fault ? ((Fault)error).getCause() : error;
- for (CompletionCallback completionCallback : completionCallbacks) {
- completionCallback.onComplete(actualError);
- }
- }
-
- @Override
- public void onDisconnect() {
- for (ConnectionCallback connectionCallback : connectionCallbacks) {
- connectionCallback.onDisconnect(this);
- }
- }
-
- public synchronized boolean suspendContinuationIfNeeded() {
- if (!resumedByApplication && !isDone() && !cont.isPending() && !cont.isResumed()) {
- cont.suspend(AsyncResponse.NO_TIMEOUT);
- initialSuspend = false;
- return true;
- }
- return false;
- }
-
- @SuppressWarnings("resource") // Response that is built here shouldn't be closed here
- public Object getResponseObject() {
- Object obj = cont.getObject();
- if (!(obj instanceof Response) && !(obj instanceof Throwable)) {
- if (obj == null) {
- obj = Response.noContent().build();
- } else {
- obj = Response.ok().entity(obj).build();
- }
- }
- return obj;
- }
-
- public boolean isResumedByApplication() {
- return resumedByApplication;
- }
-
- public synchronized void handleTimeout() {
- if (!resumedByApplication) {
- if (pendingTimeout != null) {
- setAsyncResponseOnExchange();
- cont.suspend(pendingTimeout);
- pendingTimeout = null;
- } else if (timeoutHandler != null) {
- timeoutHandler.handleTimeout(this);
- } else {
- cont.setObject(new ServiceUnavailableException());
- }
- }
- }
-
- private void initContinuation() {
- ContinuationProvider provider =
- (ContinuationProvider)inMessage.get(ContinuationProvider.class.getName());
- cont = provider.getContinuation();
- initialSuspend = true;
- }
-
- public void prepareContinuation() {
- initContinuation();
- }
-
- public void setUnmappedThrowable(Throwable t) {
- unmappedThrowable = t;
- }
- public void reset() {
- cont.reset();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/7e16259c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 7c9a02b..4c984fb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,7 +36,7 @@
<packaging>pom</packaging>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <cxf.version>3.2.4</cxf.version>
+ <cxf.version>3.2.5</cxf.version>
<bnd.version>4.0.0</bnd.version>
</properties>