Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoberto E. Escobar2014-06-12 02:11:13 +0000
committerRoberto E. Escobar2014-08-28 23:58:39 +0000
commitd4a7765ec05b4f124de987004505b5510b50d36a (patch)
treec9f7e8dca41e9021a4fe9bdcb9659564550493a9 /features
parent87185d728b0628e8562b5046ec092eb44ff5ba8c (diff)
downloadorg.eclipse.osee-d4a7765ec05b4f124de987004505b5510b50d36a.tar.gz
org.eclipse.osee-d4a7765ec05b4f124de987004505b5510b50d36a.tar.xz
org.eclipse.osee-d4a7765ec05b4f124de987004505b5510b50d36a.zip
feature[ats_ATS55930]: Upgrade JAX-RS to 2.0 API using Apache CXF
Change JAX-RS endpoints to comply with 2.0 API Change JAX-RS clients to use JAX-RS 2.0 Client API instead of using Jersey's client implementation. Remove all Jersey dependencies. Integrate Apache CXF with OSEE JAX-RS Change-Id: I866dff8516b91dbcde07b07819cf0bbc89b5d293
Diffstat (limited to 'features')
-rw-r--r--features/org.eclipse.osee.client.ote.feature/feature.xml29
-rw-r--r--features/org.eclipse.osee.disposition.feature/feature.xml1
-rw-r--r--features/org.eclipse.osee.external.feature/feature.xml148
-rw-r--r--features/org.eclipse.osee.x.core.external.feature/feature.xml172
-rw-r--r--features/org.eclipse.osee.x.core.feature/feature.xml5
5 files changed, 291 insertions, 64 deletions
diff --git a/features/org.eclipse.osee.client.ote.feature/feature.xml b/features/org.eclipse.osee.client.ote.feature/feature.xml
index 26e43d774e0..69bba0a0b68 100644
--- a/features/org.eclipse.osee.client.ote.feature/feature.xml
+++ b/features/org.eclipse.osee.client.ote.feature/feature.xml
@@ -29,7 +29,6 @@
<import plugin="org.eclipse.osee.framework.messaging"/>
<import plugin="org.eclipse.osee.framework.plugin.core"/>
<import plugin="org.eclipse.osgi.services"/>
- <import plugin="javax.xml"/>
<import plugin="org.eclipse.ui" version="3.5.1" match="greaterOrEqual"/>
<import plugin="org.eclipse.core.resources"/>
<import plugin="org.eclipse.core.jobs"/>
@@ -48,16 +47,34 @@
<import plugin="org.eclipse.jdt.ui"/>
<import plugin="org.eclipse.ui.workbench"/>
<import plugin="jms.libraries"/>
- <import plugin="org.eclipse.help"/>
+ <import plugin="org.apache.felix.gogo.runtime"/>
<import plugin="org.eclipse.jgit"/>
<import plugin="org.eclipse.team.svn.core"/>
- <import plugin="org.apache.felix.gogo.runtime"/>
- <import plugin="com.sun.jersey" version="1.18.0" match="greaterOrEqual"/>
- <import plugin="com.sun.jersey.client.apache" version="1.18.0" match="greaterOrEqual"/>
<import plugin="javax.servlet"/>
- <import plugin="javax.ws.rs"/>
+ <import plugin="javax.ws.rs" version="2.0.0" match="greaterOrEqual"/>
<import plugin="org.apache.commons.lang"/>
<import plugin="org.eclipse.core.net"/>
+ <import plugin="org.apache.cxf.core"/>
+ <import plugin="org.apache.cxf.jaxrs.client"/>
+ <import plugin="org.apache.cxf.jaxrs.frontend"/>
+ <import plugin="org.apache.cxf.jaxrs.model.wadl"/>
+ <import plugin="org.apache.cxf.jaxrs.provider"/>
+ <import plugin="org.apache.cxf.rs.security.oauth2"/>
+ <import plugin="org.apache.cxf.transport.http"/>
+ <import plugin="org.apache.aries.blueprint"/>
+ <import plugin="org.apache.aries.blueprint.annotation"/>
+ <import plugin="org.apache.aries.proxy"/>
+ <import plugin="org.apache.aries.quiesce"/>
+ <import plugin="org.apache.aries.util"/>
+ <import plugin="org.osgi.service.blueprint"/>
+ <import plugin="javax.wsdl"/>
+ <import plugin="javax.validation" version="1.1.0" match="greaterOrEqual"/>
+ <import plugin="javax.annotation" version="1.2.0" match="greaterOrEqual"/>
+ <import plugin="org.codehaus.jackson.core"/>
+ <import plugin="org.codehaus.jackson.jaxrs"/>
+ <import plugin="org.codehaus.jackson.mapper"/>
+ <import plugin="org.codehaus.jackson.xc"/>
+ <import plugin="com.sun.xml.fastinfoset"/>
</requires>
<plugin
diff --git a/features/org.eclipse.osee.disposition.feature/feature.xml b/features/org.eclipse.osee.disposition.feature/feature.xml
index 4a3f0688845..9f20affb914 100644
--- a/features/org.eclipse.osee.disposition.feature/feature.xml
+++ b/features/org.eclipse.osee.disposition.feature/feature.xml
@@ -18,7 +18,6 @@
</license>
<requires>
- <import plugin="com.sun.jersey"/>
<import plugin="javax.ws.rs"/>
<import plugin="org.eclipse.osee.framework.core"/>
<import plugin="org.eclipse.osee.framework.core.model"/>
diff --git a/features/org.eclipse.osee.external.feature/feature.xml b/features/org.eclipse.osee.external.feature/feature.xml
index ae50fa593b0..5a08d07da5f 100644
--- a/features/org.eclipse.osee.external.feature/feature.xml
+++ b/features/org.eclipse.osee.external.feature/feature.xml
@@ -31,12 +31,15 @@
<import feature="org.eclipse.nebula.widgets.ganttchart.feature" version="0.0.0" match="greaterOrEqual"/>
<import plugin="org.apache.commons.dbcp" version="1.4.0" match="compatible"/>
<import plugin="org.apache.commons.pool" version="1.6.0" match="compatible"/>
- <import plugin="org.slf4j.api" version="1.6.1" match="equivalent"/>
<import plugin="com.jcraft.jsch" version="0.1.44" match="greaterOrEqual"/>
<import plugin="org.apache.commons.logging" version="1.1.1" match="equivalent"/>
<import plugin="org.eclipse.jgit"/>
- <import plugin="com.sun.jersey" version="1.18.0" match="equivalent"/>
<import plugin="com.google.guava" version="11.0.0" match="greaterOrEqual"/>
+ <import plugin="org.slf4j.api" version="1.6.1" match="greaterOrEqual"/>
+ <import plugin="javax.wsdl"/>
+ <import plugin="javax.ws.rs" version="2.0.0" match="greaterOrEqual"/>
+ <import plugin="javax.validation" version="1.1.0" match="greaterOrEqual"/>
+ <import plugin="javax.annotation" version="1.2.0" match="greaterOrEqual"/>
</requires>
<plugin
@@ -66,21 +69,21 @@
install-size="0"
version="0.0.0"
unpack="false"/>
-
- <plugin
+
+ <plugin
id="org.eclipse.equinox.cm"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
- <plugin
+ <plugin
id="org.eclipse.equinox.metatype"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
-
+
<plugin
id="org.eclipse.equinox.ds"
download-size="0"
@@ -264,98 +267,203 @@
unpack="false"/>
<plugin
- id="org.jvnet.mimepull"
+ id="javax.ws.rs"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
- id="com.sun.jersey"
+ id="org.objectweb.asm"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
- id="com.sun.jersey.client.apache"
+ id="org.apache.commons.dbcp"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
- id="javax.ws.rs"
+ id="org.apache.commons.pool"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
- id="org.objectweb.asm"
+ id="com.google.guava"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
- id="org.apache.commons.dbcp"
+ id="org.hsqldb"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
- id="org.apache.commons.pool"
+ id="org.codehaus.jackson.core"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
- id="com.google.guava"
+ id="org.codehaus.jackson.jaxrs"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
- id="org.hsqldb"
+ id="org.codehaus.jackson.mapper"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
- id="com.sun.jersey.multipart"
+ id="javax.annotation"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
- id="org.codehaus.jackson.core"
+ id="org.apache.aries.blueprint"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
- id="org.codehaus.jackson.jaxrs"
+ id="org.apache.aries.blueprint.annotation"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
- id="org.codehaus.jackson.mapper"
+ id="org.apache.aries.proxy"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
- id="javax.annotation"
+ id="org.apache.aries.quiesce"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.aries.util"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.osgi.service.blueprint"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.codehaus.stax2"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.ws.commons.schema"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="com.ctc.wstx"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.cxf.core"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.cxf.jaxrs.client"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.cxf.jaxrs.frontend"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.cxf.jaxrs.model.wadl"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.cxf.jaxrs.provider"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.cxf.rs.security.oauth2"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.cxf.transport.http"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="javax.validation"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.codehaus.jackson.xc"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="com.sun.xml.fastinfoset"
download-size="0"
install-size="0"
version="0.0.0"
diff --git a/features/org.eclipse.osee.x.core.external.feature/feature.xml b/features/org.eclipse.osee.x.core.external.feature/feature.xml
index 96937aaeb53..68fdeda8843 100644
--- a/features/org.eclipse.osee.x.core.external.feature/feature.xml
+++ b/features/org.eclipse.osee.x.core.external.feature/feature.xml
@@ -18,7 +18,6 @@
</license>
<requires>
- <import plugin="org.slf4j.jcl"/>
<import plugin="javax.xml" version="1.3.4" match="compatible"/>
<import plugin="org.apache.xml.resolver" version="1.2.0" match="compatible"/>
<import plugin="org.apache.xml.serializer" version="2.7.1" match="compatible"/>
@@ -26,11 +25,11 @@
<import plugin="org.eclipse.equinox.common" version="3.2.0" match="compatible"/>
<import plugin="org.eclipse.core.jobs"/>
<import plugin="org.eclipse.core.runtime"/>
- <import plugin="org.slf4j.api" version="1.6.1" match="equivalent"/>
- <import plugin="javax.servlet" version="2.5.0" match="greaterOrEqual"/>
- <import plugin="javax.servlet.jsp"/>
- <import plugin="org.apache.log4j" version="1.2.15" match="greaterOrEqual"/>
- <import plugin="com.google.guava" version="11.0.0" match="greaterOrEqual"/>
+ <import plugin="org.slf4j.api" version="1.6.1" match="greaterOrEqual"/>
+ <import plugin="javax.wsdl"/>
+ <import plugin="javax.ws.rs" version="2.0.0" match="greaterOrEqual"/>
+ <import plugin="javax.validation" version="1.1.0" match="greaterOrEqual"/>
+ <import plugin="javax.annotation" version="1.2.0" match="greaterOrEqual"/>
</requires>
<plugin
@@ -97,13 +96,6 @@
unpack="false"/>
<plugin
- id="com.sun.jersey"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
id="org.eclipse.persistence.core"
download-size="0"
install-size="0"
@@ -170,13 +162,6 @@
unpack="false"/>
<plugin
- id="org.jvnet.mimepull"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
id="org.objectweb.asm"
download-size="0"
install-size="0"
@@ -290,13 +275,6 @@
unpack="false"/>
<plugin
- id="com.sun.jersey.client.apache"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
id="com.google.guava"
download-size="0"
install-size="0"
@@ -395,35 +373,161 @@
unpack="false"/>
<plugin
- id="com.sun.jersey.multipart"
+ id="org.json"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
- id="org.json"
+ id="javax.annotation"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
- id="javax.annotation"
+ id="org.eclipse.equinox.metatype"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
-
+
<plugin
- id="org.eclipse.equinox.metatype"
+ id="org.eclipse.equinox.cm"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
-
+
<plugin
- id="org.eclipse.equinox.cm"
+ id="org.apache.cxf.core"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.cxf.jaxrs.client"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.cxf.jaxrs.frontend"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.cxf.jaxrs.model.wadl"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.cxf.jaxrs.provider"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.cxf.rs.security.oauth2"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.cxf.transport.http"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="javax.validation"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="com.ctc.wstx"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.ws.commons.schema"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.codehaus.stax2"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.aries.blueprint"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.aries.blueprint.annotation"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.aries.proxy"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.aries.quiesce"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.aries.util"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.osgi.service.blueprint"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.codehaus.jackson.xc"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="com.sun.xml.fastinfoset"
download-size="0"
install-size="0"
version="0.0.0"
diff --git a/features/org.eclipse.osee.x.core.feature/feature.xml b/features/org.eclipse.osee.x.core.feature/feature.xml
index 1f7c092d786..041d51ed994 100644
--- a/features/org.eclipse.osee.x.core.feature/feature.xml
+++ b/features/org.eclipse.osee.x.core.feature/feature.xml
@@ -30,10 +30,9 @@
<import plugin="org.apache.xerces"/>
<import plugin="javax.mail.glassfish"/>
<import plugin="javax.servlet" version="2.5.0" match="greaterOrEqual"/>
- <import plugin="com.sun.jersey" version="1.18.0" match="greaterOrEqual"/>
- <import plugin="javax.ws.rs"/>
- <import plugin="org.junit"/>
+ <import plugin="javax.ws.rs" version="2.0.0" match="greaterOrEqual"/>
<import plugin="com.google.guava" version="11.0.0" match="greaterOrEqual"/>
+ <import plugin="org.junit"/>
</requires>
<plugin

Back to the top