Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--features/org.eclipse.osee.client.all.feature/feature.xml4
-rw-r--r--features/org.eclipse.osee.core.server.external.feature/feature.xml96
-rw-r--r--features/org.eclipse.osee.core.server.external.feature/pom.xml12
-rw-r--r--features/org.eclipse.osee.core.server.feature/feature.xml40
-rw-r--r--features/org.eclipse.osee.core.server.feature/pom.xml5
-rw-r--r--features/org.eclipse.osee.dep.feature/feature.xml184
-rw-r--r--features/org.eclipse.osee.dep.feature/pom.xml35
-rw-r--r--features/org.eclipse.osee.disposition.feature/feature.xml1
-rw-r--r--features/org.eclipse.osee.external.feature/feature.xml85
-rw-r--r--features/org.eclipse.osee.external.feature/pom.xml12
-rw-r--r--features/org.eclipse.osee.framework.feature/feature.xml79
-rw-r--r--features/org.eclipse.osee.framework.feature/pom.xml12
-rw-r--r--plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/agile/AgileEndpointApi.java2
-rw-r--r--plugins/org.eclipse.osee.client.parent/pom.xml8
-rw-r--r--plugins/org.eclipse.osee.core.server.parent/pom.xml2
-rw-r--r--plugins/org.eclipse.osee.dep.p2/pom.xml1
-rw-r--r--plugins/org.eclipse.osee.dep.parent/pom.xml39
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet.test/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.osee.icteam.web.rest.layer/icTeam.target2
-rw-r--r--plugins/org.eclipse.osee.jaxrs.client.test/META-INF/MANIFEST.MF10
-rw-r--r--plugins/org.eclipse.osee.jaxrs.client.test/src/org/eclipse/osee/jaxrs/client/internal/ext/OAuth2FlowsTest.java23
-rw-r--r--plugins/org.eclipse.osee.jaxrs.client/META-INF/MANIFEST.MF5
-rw-r--r--plugins/org.eclipse.osee.jaxrs.client/src/org/eclipse/osee/jaxrs/client/internal/JaxRsClientRuntime.java4
-rw-r--r--plugins/org.eclipse.osee.jaxrs.client/src/org/eclipse/osee/jaxrs/client/internal/ext/CxfJaxRsClientConfigurator.java11
-rw-r--r--plugins/org.eclipse.osee.jaxrs.client/src/org/eclipse/osee/jaxrs/client/internal/ext/OAuth2Flows.java10
-rw-r--r--plugins/org.eclipse.osee.jaxrs.client/src/org/eclipse/osee/jaxrs/client/internal/ext/OAuth2Serializer.java2
-rw-r--r--plugins/org.eclipse.osee.jaxrs.client/src/org/eclipse/osee/jaxrs/client/internal/ext/OAuth2Transport.java2
-rw-r--r--plugins/org.eclipse.osee.jaxrs.server/META-INF/MANIFEST.MF3
-rw-r--r--plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/ext/CxfJaxRsFactory.java4
-rw-r--r--plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/OAuth2DataProvider.java29
-rw-r--r--plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/OAuth2ServerProvider.java3
-rw-r--r--plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/adapters/AccessToken.java5
-rw-r--r--plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/adapters/AuthorizationCode.java5
-rw-r--r--plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/adapters/OAuthEncryption.java18
-rw-r--r--plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/adapters/RefreshOAuthToken.java5
-rw-r--r--plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/adapters/SubjectProviderImpl.java46
-rw-r--r--plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/endpoints/AbstractClientService.java4
-rw-r--r--plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/endpoints/AuthorizationCodeEndpoint.java7
-rw-r--r--plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/endpoints/ImplicitGrantEndpoint.java11
-rw-r--r--plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/writers/AuthorizationDataHtmlWriter.java30
-rw-r--r--plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/security/JaxRsOAuthResourceServerFilter.java17
-rw-r--r--plugins/org.eclipse.osee.orcs.rest.model/META-INF/MANIFEST.MF1
-rw-r--r--plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/ArtifactIdReportColumn.java34
-rw-r--r--plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/ReportLevel.java5
-rw-r--r--plugins/org.eclipse.osee.parent/pom.xml2
-rw-r--r--plugins/org.eclipse.osee.support.config/ClientServerTargetPlatform.target45
-rw-r--r--plugins/org.eclipse.osee.support.config/launchConfig/OSEE_Application_Server_[HSQLDB].launch1
48 files changed, 590 insertions, 375 deletions
diff --git a/features/org.eclipse.osee.client.all.feature/feature.xml b/features/org.eclipse.osee.client.all.feature/feature.xml
index 2d978aa2572..0a2ddd4ab89 100644
--- a/features/org.eclipse.osee.client.all.feature/feature.xml
+++ b/features/org.eclipse.osee.client.all.feature/feature.xml
@@ -17,10 +17,10 @@
%license
</license>
- <includes
+ <includes
id="edu.umd.cs.findbugs.plugin.eclipse"
version="0.0.0"/>
-
+
<includes
id="org.eclipse.osee.client.feature"
version="0.0.0"/>
diff --git a/features/org.eclipse.osee.core.server.external.feature/feature.xml b/features/org.eclipse.osee.core.server.external.feature/feature.xml
index 2eda4491f66..607c03f8a95 100644
--- a/features/org.eclipse.osee.core.server.external.feature/feature.xml
+++ b/features/org.eclipse.osee.core.server.external.feature/feature.xml
@@ -28,6 +28,13 @@
<includes
id="org.eclipse.jgit"
version="5.0.0"/>
+
+ <plugin
+ id="org.apache.cxf.cxf-rt-rs-service-description"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
<plugin
id="org.postgresql.driver"
@@ -48,7 +55,6 @@
download-size="0"
install-size="0"
version="0.0.0"/>
-
<plugin
id="org.eclipse.oss.ajax"
download-size="0"
@@ -61,7 +67,30 @@
install-size="0"
version="0.0.0"
unpack="false"/>
-
+
+ <plugin
+ id="org.apache.cxf.cxf-rt-rs-security-jose"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.cxf.cxf-rt-rs-security-jose-jaxrs"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.cxf.cxf-rt-rs-json-basic"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+
+
<plugin
id="org.eclipse.jdt.annotation"
download-size="0"
@@ -82,12 +111,7 @@
version="0.0.0"
unpack="false"/>
- <plugin
- id="org.xerial.sqlite"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
+
<plugin
id="com.jcraft.jsch"
@@ -523,12 +547,14 @@
install-size="0"
version="9.4.35"
unpack="false"/>
+
<plugin
id="org.eclipse.jetty.util.ajax"
download-size="0"
install-size="0"
version="9.4.35"
- unpack="false"/>
+ unpack="false"/>
+
<plugin
id="org.apache.felix.gogo.command"
download-size="0"
@@ -617,7 +643,7 @@
id="javax.annotation"
download-size="0"
install-size="0"
- version="1.2.0"
+ version="0.0.0"
unpack="false"/>
<plugin
@@ -719,53 +745,46 @@
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"
+ id="org.apache.cxf.cxf-rt-rs-security-oauth2"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
-
+
<plugin
- id="org.apache.cxf.jaxrs.frontend"
+ id="org.apache.cxf.cxf-core"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
- <plugin
- id="org.apache.cxf.jaxrs.model.wadl"
+ <plugin
+ id="org.apache.cxf.cxf-rt-transports-http"
download-size="0"
install-size="0"
version="0.0.0"
- unpack="false"/>
+ unpack="false"/>
<plugin
- id="org.apache.cxf.jaxrs.provider"
+ id="org.apache.cxf.cxf-rt-rs-client"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
-
- <plugin
- id="org.apache.cxf.rs.security.oauth2"
+
+ <plugin
+ id="org.apache.cxf.cxf-rt-frontend-jaxrs"
download-size="0"
install-size="0"
version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.apache.cxf.transport.http"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.cxf.cxf-rt-security"
download-size="0"
install-size="0"
version="0.0.0"
- unpack="false"/>
+ unpack="false"/>
<plugin
id="com.ctc.wstx"
@@ -773,14 +792,14 @@
install-size="0"
version="0.0.0"
unpack="false"/>
-
+
<plugin
- id="org.apache.ws.commons.schema"
+ id="org.apache.ws.xmlschema.core"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
-
+
<plugin
id="org.codehaus.stax2"
download-size="0"
@@ -823,13 +842,6 @@
version="0.0.0"
unpack="false"/>
- <plugin
- id="org.apache.cxf.core.config"
- download-size="0"
- install-size="0"
- version="0.0.0"
- fragment="true"
- unpack="false"/>
<plugin
id="org.eclipse.text"
diff --git a/features/org.eclipse.osee.core.server.external.feature/pom.xml b/features/org.eclipse.osee.core.server.external.feature/pom.xml
index 62b8d0665e3..b5cb1fba2d1 100644
--- a/features/org.eclipse.osee.core.server.external.feature/pom.xml
+++ b/features/org.eclipse.osee.core.server.external.feature/pom.xml
@@ -26,14 +26,25 @@
<configuration>
<excludes>
<plugin id="ch.qos.logback.slf4j" />
+ <plugin id="org.apache.cxf.cxf-core" />
+ <plugin id="org.apache.cxf.cxf-rt-rs-security-oauth2" />
+ <plugin id="org.apache.cxf.cxf-rt-security" />
+ <plugin id="org.apache.cxf.cxf-rt-transports-http" />
+ <plugin id="org.apache.cxf.cxf-rt-rs-client" />
+ <plugin id="org.apache.cxf.cxf-rt-frontend-jaxrs" />
<plugin id="javaewah" />
+ <plugin id="org.apache.ws.xmlschema.core" />
<plugin id="org.postgresql.driver" />
<plugin id="org.eclipse.egit" />
<plugin id="javax.servlet" />
<plugin id="javax.ws.rs" />
<plugin id="javax.wsdl" />
+ <plugin id="org.apache.cxf.cxf-rt-rs-security-jose-jaxrs" />
+ <plugin id="org.apache.cxf.cxf-rt-rs-security-jose" />
+ <plugin id="org.apache.cxf.cxf-rt-rs-json-basic" />
<plugin id="javax.xml.bind" />
<plugin id="org.eclipse.jdt.launching" />
+ <plugin id="javax.annotation" />
<plugin id="javax.xml" />
<plugin id="com.jcraft.jsch" />
<plugin id="org.eclipse.egit" />
@@ -49,6 +60,7 @@
<plugin id="org.apache.xml.serializer" />
<plugin id="org.eclipse.core.net" />
<plugin id="org.eclipse.equinox.security" />
+ <plugin id= "org.apache.cxf.cxf-rt-rs-service-description" />
<plugin id="javax.xml.stream" />
<plugin id="org.eclipse.osee.logback.config" />
<plugin id="org.eclipse.osee.web.ui" />
diff --git a/features/org.eclipse.osee.core.server.feature/feature.xml b/features/org.eclipse.osee.core.server.feature/feature.xml
index 7e7a6daa356..152dc333a59 100644
--- a/features/org.eclipse.osee.core.server.feature/feature.xml
+++ b/features/org.eclipse.osee.core.server.feature/feature.xml
@@ -486,12 +486,12 @@
version="0.0.0"
unpack="false"/>
- <plugin
- id="org.apache.cxf.transport.http"
+ <plugin
+ id="org.apache.cxf.cxf-rt-transports-http"
download-size="0"
install-size="0"
- version="0.0.0"
- unpack="false"/>
+ version="3.2.11"
+ unpack="false"/>
<plugin
id="org.apache.cxf.jaxrs.client"
@@ -499,14 +499,28 @@
install-size="0"
version="0.0.0"
unpack="false"/>
-
+
<plugin
- id="org.apache.cxf.rs.security.oauth2"
+ id="org.apache.cxf.cxf-rt-rs-client"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="3.2.11"
unpack="false"/>
+
+ <plugin
+ id="org.apache.cxf.cxf-rt-frontend-jaxrs"
+ download-size="0"
+ install-size="0"
+ version="3.2.11"
+ unpack="false"/>
+ <plugin
+ id="org.apache.cxf.cxf-rt-rs-security-oauth2"
+ download-size="0"
+ install-size="0"
+ version="3.2.11"
+ unpack="false"/>
+
<plugin
id="org.apache.cxf.jaxrs.model.wadl"
download-size="0"
@@ -756,42 +770,42 @@
id="org.eclipse.jetty.http"
download-size="0"
install-size="0"
- version="9.4.11"
+ version="9.4.35"
unpack="false"/>
<plugin
id="org.eclipse.jetty.io"
download-size="0"
install-size="0"
- version="9.4.11"
+ version="9.4.35"
unpack="false"/>
<plugin
id="org.eclipse.jetty.security"
download-size="0"
install-size="0"
- version="9.4.11"
+ version="9.4.35"
unpack="false"/>
<plugin
id="org.eclipse.jetty.server"
download-size="0"
install-size="0"
- version="9.4.11"
+ version="9.4.35"
unpack="false"/>
<plugin
id="org.eclipse.jetty.servlet"
download-size="0"
install-size="0"
- version="9.4.11"
+ version="9.4.35"
unpack="false"/>
<plugin
id="org.eclipse.jetty.util"
download-size="0"
install-size="0"
- version="9.4.11"
+ version="9.4.35"
unpack="false"/>
<plugin
diff --git a/features/org.eclipse.osee.core.server.feature/pom.xml b/features/org.eclipse.osee.core.server.feature/pom.xml
index 4ee2bc48a82..b99962d11ad 100644
--- a/features/org.eclipse.osee.core.server.feature/pom.xml
+++ b/features/org.eclipse.osee.core.server.feature/pom.xml
@@ -25,7 +25,12 @@
</goals>
<configuration>
<excludes>
+ <plugin id="org.apache.cxf.cxf-rt-transports-http" />
+ <plugin id="org.apache.cxf.cxf-rt-rs-security-oauth2" />
<plugin id="org.eclipse.osee.logback.config" />
+ <plugin id="org.apache.cxf.cxf-rt-rs-client" />
+ <plugin id="org.apache.cxf.cxf-rt-frontend-jaxrs" />
+ <plugin id="org.apache.cxf.cxf-core" />
<plugin id="org.hamcrest" />
<plugin id="com.jcraft.jsch" />
<plugin id="javax.xml.bind" />
diff --git a/features/org.eclipse.osee.dep.feature/feature.xml b/features/org.eclipse.osee.dep.feature/feature.xml
index 43fa160cfdc..0236c86a19d 100644
--- a/features/org.eclipse.osee.dep.feature/feature.xml
+++ b/features/org.eclipse.osee.dep.feature/feature.xml
@@ -16,8 +16,7 @@
<license url="%licenseURL">
%license
</license>
-
-
+
<includes
id="edu.umd.cs.findbugs.plugin.eclipse"
version="0.0.0"/>
@@ -29,7 +28,6 @@
<includes
id="org.eclipse.wst.xml_userdoc.feature"
version="0.0.0"/>
-
<includes
id="org.eclipse.xsd"
@@ -422,15 +420,15 @@
<includes
id="org.eclipse.launchbar"
version="0.0.0"/>
-
- <includes
+
+ <includes
id="org.polarion.eclipse.team.svn.connector"
version="0.0.0"/>
<includes
id="org.polarion.eclipse.team.svn.connector.svnkit18"
version="0.0.0"/>
-
+
<includes
id="org.eclipse.eclemma.feature"
version="0.0.0"/>
@@ -524,7 +522,35 @@
install-size="0"
version="0.0.0"
unpack="false" />
-
+
+ <plugin
+ id="org.apache.cxf.cxf-rt-rs-security-jose"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.ws.xmlschema.core"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.cxf.cxf-rt-rs-security-jose-jaxrs"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.cxf.cxf-rt-rs-json-basic"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
<plugin
id="org.flywaydb.core"
download-size="0"
@@ -616,7 +642,9 @@
install-size="0"
version="0.0.0"
unpack="false"/>
+
+
<plugin
id="org.antlr.runtime"
download-size="0"
@@ -679,43 +707,7 @@
install-size="0"
version="0.0.0"
unpack="false"/>
-
- <plugin
- id="org.apache.cxf.core.config"
- download-size="0"
- install-size="0"
- version="0.0.0"
- fragment="true"
- 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="org.apache.log4j"
download-size="0"
@@ -724,13 +716,6 @@
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"
@@ -836,12 +821,7 @@
version="0.0.0"
unpack="false"/>
- <plugin
- id="org.xerial.sqlite"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
+
<plugin
id="rest.assured"
@@ -877,14 +857,64 @@
install-size="0"
version="0.0.0"
unpack="false"/>
+
+ <plugin
+ id="org.apache.cxf.cxf-core"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.cxf.cxf-rt-transports-http"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.cxf.cxf-rt-rs-security-oauth2"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.cxf.cxf-rt-rs-client"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.cxf.cxf-rt-frontend-jaxrs"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
<plugin
+ id="org.apache.cxf.cxf-rt-rs-service-description"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.cxf.cxf-rt-security"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
id="org.objectweb.asm"
download-size="0"
install-size="0"
version="6.1.1"
unpack="false"/>
+
<plugin
id="org.slf4j.api"
download-size="0"
@@ -990,18 +1020,13 @@
version="0.0.0"
unpack="false"/>
- <plugin
- id="javax.ws.rs"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
+
<plugin
id="javax.annotation"
download-size="0"
install-size="0"
- version="1.2.0"
+ version="0.0.0"
unpack="false"/>
<plugin
@@ -1026,6 +1051,13 @@
unpack="false"/>
<plugin
+ id="javax.ws.rs"
+ download-size="0"
+ install-size="0"
+ version="2.0.1"
+ unpack="false"/>
+
+ <plugin
id="org.eclipse.osgi"
download-size="0"
install-size="0"
@@ -1067,26 +1099,7 @@
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="javax.activation"
@@ -2088,6 +2101,7 @@
install-size="0"
version="0.0.0"
unpack="false"/>
+
<plugin
id="javax.xml.soap"
download-size="0"
@@ -2127,7 +2141,7 @@
id="org.eclipse.jetty.webapp"
download-size="0"
install-size="0"
- version="9.4.35"
+ version="0.0.0"
unpack="false"/>
<plugin
@@ -2141,7 +2155,7 @@
id="org.eclipse.jetty.xml"
download-size="0"
install-size="0"
- version="9.4.35"
+ version="0.0.0"
unpack="false"/>
<plugin
diff --git a/features/org.eclipse.osee.dep.feature/pom.xml b/features/org.eclipse.osee.dep.feature/pom.xml
index 2d76ed71dfd..de6e686dc9e 100644
--- a/features/org.eclipse.osee.dep.feature/pom.xml
+++ b/features/org.eclipse.osee.dep.feature/pom.xml
@@ -29,9 +29,21 @@
<configuration>
<excludes>
<plugin id="org.apache.xerces" />
+ <plugin id="org.apache.cxf.cxf-core" />
+ <plugin id="org.apache.cxf.cxf-rt-security" />
+ <plugin id="org.apache.cxf.cxf-rt-transports-http" />
+ <plugin id="org.apache.cxf.cxf-rt-rs-security-oauth2" />
+ <plugin id="org.apache.cxf.cxf-rt-rs-security-oauth" />
+ <plugin id="org.apache.cxf.cxf-rt-rs-security-jose" />
+ <plugin id="org.apache.cxf.cxf-rt-rs-json-basic" />
+ <plugin id="org.apache.cxf.cxf-rt-rs-client" />
+ <plugin id="org.apache.cxf.cxf-rt-frontend-jaxrs" />
<plugin id="org.eclipse.m2e.maven.runtime" />
+ <plugin id="org.apache.cxf.cxf-rt-transports-http" />
+ <plugin id= "org.apache.cxf.cxf-rt-rs-service-description" />
+ <plugin id="javax.mail" />
<plugin id="org.eclipse.m2e.archetype.common" />
- <plugin id="org.eclipse.m2e.maven.indexer" />
+ <plugin id="org.eclipse.m2e.mwsaven.indexer" />
<plugin id="org.eclipse.m2e.workspace.cli" />
<feature id="org.eclipse.cdt.sdk" />
<feature id="org.eclipse.mylyn.commons" />
@@ -46,7 +58,7 @@
<feature id="org.eclipse.launchbar" />
<feature id="org.eclipse.tm.terminal.control.feature" />
<plugin id="javax.xml" />
- <plugin id="javax.mail" />
+ <plugin id="org.apache.cxf.cxf-rt-rs-security-jose-jaxrs" />
<plugin id="javax.xml.rpc" />
<plugin id="org.apache.commons.discovery" />
<feature id="org.eclipse.mylyn_feature" />
@@ -68,6 +80,7 @@
<plugin id="org.eclipse.m2e.maven.runtime.slf4j.simple" />
<plugin id="org.eclipse.xtext" />
<plugin id="org.antlr.runtime" />
+ <plugin id="javax.annotation" />
<plugin id="org.cyberneko.html" />
<plugin id="org.apache.commons.io" />
<plugin id="org.apache.commons.cli" />
@@ -80,6 +93,7 @@
<plugin id="org.eclipse.swt" />
<plugin id="org.eclipse.wst.common.project.facet.core" />
<plugin id="org.eclipse.wst.xml.core" />
+ <plugin id="org.apache.ws.xmlschema.core" />
<plugin id="org.uddi4j" />
<plugin id="org.eclipse.wst.internet.monitor.core" />
<plugin id="org.eclipse.wst.common.project.facet.ui" />
@@ -94,7 +108,7 @@
<plugin id="org.eclipse.gmf.runtime.emf.type.core" />
<plugin id="org.eclipse.gmf.runtime.emf.ui" />
<plugin id="org.eclipse.uml2.uml" />
- <plugin id="org.apache.wsil4j" />
+ <plugin id="org.apache.wsil4j" />
<plugin id="org.eclipse.uml2.uml.resources" />
<plugin id="org.eclipse.uml2.uml.edit" />
<plugin id="org.eclipse.uml2.uml.editor" />
@@ -124,20 +138,20 @@
<feature id="org.eclipse.xtext.ui" />
<feature id="org.eclipse.wst.common_core.feature" />
<feature id="org.eclipse.wst.xml.xpath2.processor.feature" />
- <feature id="org.eclipse.wst.ws_core.feature" />
+ <feature id="org.eclipse.wst.ws_core.feature" />
<feature id="org.eclipse.wst.server_userdoc.feature" />
<feature id="org.eclipse.wst.xsl.feature" />
- <plugin id="java_cup.runtime" />
+ <plugin id="java_cup.runtime" />
<feature id="org.eclipse.wst.server_core.feature" />
- <feature id="org.eclipse.wst.server_adapters.feature" />
- <feature id="org.eclipse.m2e.feature" />
- <feature id="org.eclipse.wst.server_ui.feature" />
+ <feature id="org.eclipse.wst.server_adapters.feature" />
+ <feature id="org.eclipse.m2e.feature" />
+ <feature id="org.eclipse.wst.server_ui.feature" />
<feature id="org.eclipse.jgit.lfs" />
<feature id="org.eclipse.wst.xml_userdoc.feature" />
<feature id="org.eclipse.wst.web_ui.feature" />
<feature id="org.eclipse.wst.jsdt.feature" />
<feature id="org.eclipse.xsd.edit" />
- <feature id="org.eclipse.wst.common_ui.feature" />
+ <feature id="org.eclipse.wst.common_ui.feature" />
<feature id="org.eclipse.wst.common.fproj" />
<feature id="org.eclipse.jgit.http.apache" />
<plugin id="org.eclipse.uml2.codegen.ecore" />
@@ -177,6 +191,9 @@
</execution>
</executions>
</plugin>
+
+
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
diff --git a/features/org.eclipse.osee.disposition.feature/feature.xml b/features/org.eclipse.osee.disposition.feature/feature.xml
index e4889a9f5fd..f4f3b985238 100644
--- a/features/org.eclipse.osee.disposition.feature/feature.xml
+++ b/features/org.eclipse.osee.disposition.feature/feature.xml
@@ -28,7 +28,6 @@
<import plugin="org.eclipse.osgi"/>
<import plugin="org.eclipse.osee.console.admin"/>
<import plugin="org.eclipse.osgi.services"/>
- <import plugin="org.xerial.sqlite"/>
</requires>
<plugin
diff --git a/features/org.eclipse.osee.external.feature/feature.xml b/features/org.eclipse.osee.external.feature/feature.xml
index 0f058a6adde..8387bff0572 100644
--- a/features/org.eclipse.osee.external.feature/feature.xml
+++ b/features/org.eclipse.osee.external.feature/feature.xml
@@ -42,9 +42,30 @@
<import plugin="org.apache.commons.logging" version="1.1.1" match="equivalent"/>
<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.annotation" version="1.2.0" match="greaterOrEqual"/>
</requires>
+
+ <plugin
+ id="org.apache.cxf.cxf-rt-rs-security-jose"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.cxf.cxf-rt-rs-security-jose-jaxrs"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+
+
+ <plugin
+ id="org.apache.cxf.cxf-rt-rs-json-basic"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
<plugin
id="org.eclipse.equinox.common"
@@ -351,8 +372,6 @@
version="0.0.0"
unpack="false"/>
-
-
<plugin
id="javax.ws.rs"
download-size="0"
@@ -455,7 +474,7 @@
unpack="false"/>
<plugin
- id="org.apache.ws.commons.schema"
+ id="org.apache.ws.xmlschema.core"
download-size="0"
install-size="0"
version="0.0.0"
@@ -469,67 +488,45 @@
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"
+ id="org.apache.cxf.cxf-rt-rs-security-oauth2"
download-size="0"
install-size="0"
version="0.0.0"
- unpack="false"/>
+ unpack="false"/>
<plugin
- id="org.apache.cxf.jaxrs.provider"
+ id="org.apache.cxf.cxf-rt-transports-http"
download-size="0"
install-size="0"
version="0.0.0"
- unpack="false"/>
-
+ unpack="false"/>
+
<plugin
- id="org.apache.cxf.rs.security.oauth2"
+ id="com.sun.xml.fastinfoset"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
-
- <plugin
- id="org.apache.cxf.transport.http"
+
+ <plugin
+ id="org.apache.cxf.cxf-rt-rs-client"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
-
- <plugin
- id="com.sun.xml.fastinfoset"
+
+ <plugin
+ id="org.apache.cxf.cxf-rt-frontend-jaxrs"
download-size="0"
install-size="0"
version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.apache.cxf.core.config"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.cxf.cxf-rt-security"
download-size="0"
install-size="0"
version="0.0.0"
- fragment="true"
unpack="false"/>
<plugin
@@ -539,7 +536,7 @@
version="0.0.0"
unpack="false"/>
- <plugin
+ <plugin
id="org.apache.felix.scr"
download-size="0"
install-size="0"
diff --git a/features/org.eclipse.osee.external.feature/pom.xml b/features/org.eclipse.osee.external.feature/pom.xml
index 5e44fd6e612..2e012cbd464 100644
--- a/features/org.eclipse.osee.external.feature/pom.xml
+++ b/features/org.eclipse.osee.external.feature/pom.xml
@@ -28,8 +28,20 @@
</goals>
<configuration>
<excludes>
+ <plugin id="org.apache.cxf.cxf-rt-transports-http" />
+ <plugin id="org.apache.cxf.cxf-rt-rs-client" />
+ <plugin id="org.apache.cxf.cxf-rt-security" />
+ <plugin id="org.apache.cxf.cxf-rt-rs-security-oauth2" />
+ <plugin id="org.apache.cxf.cxf-rt-rs-security-oauth" />
+ <plugin id="org.apache.cxf.cxf-rt-frontend-jaxrs" />
+ <plugin id="org.apache.cxf.cxf-rt-rs-security-jose-jaxrs" />
+ <plugin id="org.apache.cxf.cxf-core" />
<plugin id="org.apache.xerces" />
<plugin id="javax.xml" />
+ <plugin id="org.apache.ws.xmlschema.core" />
+ <plugin id="javax.annotation" />
+ <plugin id="org.apache.cxf.cxf-rt-rs-security-jose" />
+ <plugin id="org.apache.cxf.cxf-rt-rs-json-basic" />
<plugin id="com.jcraft.jsch" />
<plugin id="org.apache.xml.resolver" />
<plugin id="org.apache.xml.serializer" />
diff --git a/features/org.eclipse.osee.framework.feature/feature.xml b/features/org.eclipse.osee.framework.feature/feature.xml
index b5a797a8177..011c820c582 100644
--- a/features/org.eclipse.osee.framework.feature/feature.xml
+++ b/features/org.eclipse.osee.framework.feature/feature.xml
@@ -45,8 +45,6 @@
<import feature="org.eclipse.osee.core.runtime.feature" version="0.9.5" 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.mockito" version="2.13.0" match="greaterOrEqual"/>
- <import plugin="javax.annotation" version="1.2.0" match="greaterOrEqual"/>
<import plugin="com.fasterxml.jackson.core.jackson-core" version="2.9.2" match="greaterOrEqual"/>
<import plugin="com.fasterxml.jackson.core.jackson-annotations" version="2.9.2" match="greaterOrEqual" />
<import plugin="com.fasterxml.jackson.core.jackson-databind" version="2.9.2" match="greaterOrEqual" />
@@ -56,6 +54,76 @@
<import plugin="org.hsqldb"/>
<import plugin="org.hamcrest.core" version="1.3.0" match="greaterOrEqual" />
</requires>
+
+ <plugin
+ id="org.apache.cxf.cxf-rt-rs-security-jose"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.cxf.cxf-rt-rs-service-description"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.cxf.cxf-rt-rs-security-jose-jaxrs"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.cxf.cxf-rt-rs-json-basic"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.cxf.cxf-core"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.cxf.cxf-rt-transports-http"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.cxf.cxf-rt-rs-security-oauth2"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.cxf.cxf-rt-rs-client"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.cxf.cxf-rt-frontend-jaxrs"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.cxf.cxf-rt-security"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
<plugin
id="javax.xml.stream"
@@ -69,8 +137,7 @@
download-size="0"
install-size="0"
version="0.0.0"/>
-
-
+
<plugin
id="org.eclipse.jdt.launching"
download-size="0"
@@ -113,7 +180,7 @@
id="javax.annotation"
download-size="0"
install-size="0"
- version="1.2.0"
+ version="0.0.0"
unpack="false"/>
<plugin
@@ -132,7 +199,7 @@
<plugin
id="org.eclipse.osee.framework.skynet.core"
- download-size="0"
+ download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
diff --git a/features/org.eclipse.osee.framework.feature/pom.xml b/features/org.eclipse.osee.framework.feature/pom.xml
index dd34dbf7c1f..a4e3812f46f 100644
--- a/features/org.eclipse.osee.framework.feature/pom.xml
+++ b/features/org.eclipse.osee.framework.feature/pom.xml
@@ -31,6 +31,18 @@
<plugin id="org.eclipse.osee.framework.templates" />
<plugin id="org.postgresql.driver" />
<plugin id="org.hamcrest" />
+ <plugin id="org.apache.cxf.cxf-core" />
+ <plugin id="org.apache.cxf.cxf-rt-security" />
+ <plugin id="org.apache.cxf.cxf-rt-transports-http" />
+ <plugin id="org.apache.cxf.cxf-rt-rs-security-oauth2" />
+ <plugin id="org.apache.cxf.cxf-rt-rs-security-oauth" />
+ <plugin id="org.apache.cxf.cxf-rt-rs-security-jose" />
+ <plugin id="org.apache.cxf.cxf-rt-rs-json-basic" />
+ <plugin id="org.apache.cxf.cxf-rt-rs-security-jose-jaxrs" />
+ <plugin id="org.apache.cxf.cxf-rt-rs-client" />
+ <plugin id="javax.annotation" />
+ <plugin id= "org.apache.cxf.cxf-rt-rs-service-description" />
+ <plugin id="org.apache.cxf.cxf-rt-frontend-jaxrs" />
<plugin id="org.eclipse.egit" />
<feature id="org.eclipse.sdk" />
<feature id="org.eclipse.sdk" />
diff --git a/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/agile/AgileEndpointApi.java b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/agile/AgileEndpointApi.java
index c1100b11750..652ac929e2c 100644
--- a/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/agile/AgileEndpointApi.java
+++ b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/agile/AgileEndpointApi.java
@@ -381,6 +381,8 @@ public interface AgileEndpointApi {
@PUT
@Path("item/{itemId}/unplanned")
+ @Consumes(MediaType.APPLICATION_JSON)
+ @Produces(MediaType.APPLICATION_JSON)
public Response setUnPlanned(@PathParam("itemId") long itemId, boolean unPlanned);
/**
diff --git a/plugins/org.eclipse.osee.client.parent/pom.xml b/plugins/org.eclipse.osee.client.parent/pom.xml
index 60ba43afd42..2900bf29a84 100644
--- a/plugins/org.eclipse.osee.client.parent/pom.xml
+++ b/plugins/org.eclipse.osee.client.parent/pom.xml
@@ -27,7 +27,7 @@
</property>
</activation>
<modules>
- <module>../../plugins/org.postgresql.driver</module>
+ <module>../../plugins/org.postgresql.driver</module>
<module>../../plugins/org.eclipse.osee.framework.lifecycle</module>
<module>../../plugins/org.eclipse.osee.framework.lifecycle.test</module>
@@ -162,10 +162,10 @@
<module>../../features/org.eclipse.osee.client.feature</module>
-
<module>../../plugins/org.eclipse.osee.client.integration.tests</module>
-
<module>../../plugins/org.eclipse.osee.client.p2</module>
+
+
</modules>
</profile>
@@ -178,7 +178,7 @@
</activation>
<modules>
<module>../../plugins/org.eclipse.osee.framework.dev.help.ui.test</module>
- <module>../../plugins/org.eclipse.osee.framework.help.ui.test</module>
+ <module>../../plugins/org.eclipse.osee.framework.help.ui.test</module>
</modules>
</profile>
</profiles>
diff --git a/plugins/org.eclipse.osee.core.server.parent/pom.xml b/plugins/org.eclipse.osee.core.server.parent/pom.xml
index 1f3ee1b2521..a5ee0ec2e9a 100644
--- a/plugins/org.eclipse.osee.core.server.parent/pom.xml
+++ b/plugins/org.eclipse.osee.core.server.parent/pom.xml
@@ -61,7 +61,7 @@
<module>../../plugins/org.eclipse.osee.jaxrs.server</module>
<module>../../plugins/org.eclipse.osee.jaxrs.server.test</module>
<module>../../plugins/org.eclipse.osee.jaxrs.client</module>
- <module>../../plugins/org.eclipse.osee.jaxrs.client.test</module>
+ <module>../../plugins/org.eclipse.osee.jaxrs.client.test</module>
<module>../../plugins/org.eclipse.osee.account.rest.model</module>
<module>../../plugins/org.eclipse.osee.account.rest</module>
diff --git a/plugins/org.eclipse.osee.dep.p2/pom.xml b/plugins/org.eclipse.osee.dep.p2/pom.xml
index 465960a973a..5cc2fdfaf83 100644
--- a/plugins/org.eclipse.osee.dep.p2/pom.xml
+++ b/plugins/org.eclipse.osee.dep.p2/pom.xml
@@ -17,6 +17,7 @@
<build>
<plugins>
+
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-p2-repository-plugin</artifactId>
diff --git a/plugins/org.eclipse.osee.dep.parent/pom.xml b/plugins/org.eclipse.osee.dep.parent/pom.xml
index aa968f73917..c917730a255 100644
--- a/plugins/org.eclipse.osee.dep.parent/pom.xml
+++ b/plugins/org.eclipse.osee.dep.parent/pom.xml
@@ -75,36 +75,42 @@
<repositories>
- <repository>
+ <repository>
<id>jetty</id>
<layout>p2</layout>
<url>http://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.35.v20201120/</url>
- </repository>
+ </repository>
- <repository>
+ <repository>
<id>mylyn2</id>
<layout>p2</layout>
<url>http://download.eclipse.org/mylyn/drops/3.5.1/v20110422-0200/</url>
</repository>
-
+
<repository>
<id>orbit</id>
<layout>p2</layout>
<url>${orbit-site}</url>
</repository>
- <repository>
+ <repository>
<id>findbugs</id>
<layout>p2</layout>
<url>http://findbugs.cs.umd.edu/eclipse</url>
- </repository>
-
- <repository>
+ </repository>
+
+ <repository>
<id>eclipse</id>
<layout>p2</layout>
<url>${eclipse-site}</url>
</repository>
+ <repository>
+ <id>polarion</id>
+ <layout>p2</layout>
+ <url>${polarion-site}</url>
+ </repository>
+
<repository>
<id>eclipse-ip</id>
<layout>p2</layout>
@@ -117,26 +123,19 @@
<url>${papyrus-site}</url>
</repository>
- <repository>
+ <repository>
<id>nebula</id>
<layout>p2</layout>
- <url>${nebula-site}</url>
+ <url>${nebula-site}</url>
+ </repository>
- </repository>
-
- <repository>
+ <repository>
<id>subversive</id>
<layout>p2</layout>
<url>${subversive-site}</url>
</repository>
- <repository>
- <id>polarion</id>
- <layout>p2</layout>
- <url>${polarion-site}</url>
- </repository>
-
- <repository>
+ <repository>
<id>emma</id>
<layout>p2</layout>
<url>${emma-site}</url>
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.ui.skynet.test/META-INF/MANIFEST.MF
index f8544a8ef3a..9c29e5b9a5b 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet.test/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.framework.ui.skynet.test/META-INF/MANIFEST.MF
@@ -8,6 +8,8 @@ Fragment-Host: org.eclipse.osee.framework.ui.skynet
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Export-Package: org.eclipse.osee.framework.ui.skynet
Import-Package: org.eclipse.nebula.widgets.xviewer.core.model,
+ org.apache.cxf.jaxrs.client,
+ org.apache.cxf.jaxrs.client.spec,
org.eclipse.osee.framework.access,
org.eclipse.osee.framework.core.enums,
org.eclipse.osee.framework.core.enums.token,
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.ui.skynet/META-INF/MANIFEST.MF
index 878c3d55dfd..2537e837c81 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/META-INF/MANIFEST.MF
@@ -10,6 +10,8 @@ Service-Component: OSGI-INF/*.xml
Bundle-Vendor: Eclipse Open System Engineering Environment
Import-Package: com.fasterxml.jackson.core.type,
com.fasterxml.jackson.databind,
+ org.apache.cxf.jaxrs.client,
+ org.apache.cxf.jaxrs.client.spec,
com.google.common.base,
com.google.common.cache,
com.google.common.collect,
diff --git a/plugins/org.eclipse.osee.icteam.web.rest.layer/icTeam.target b/plugins/org.eclipse.osee.icteam.web.rest.layer/icTeam.target
index efeb184b827..bc39449b8a8 100644
--- a/plugins/org.eclipse.osee.icteam.web.rest.layer/icTeam.target
+++ b/plugins/org.eclipse.osee.icteam.web.rest.layer/icTeam.target
@@ -2,7 +2,7 @@
<?pde version="3.8"?><target name="icTeam" sequenceNumber="29">
<locations>
<location path="C:\Users\nhh5kor\icTeam\iCTeam_new_target\OSEE_026\org.eclipse.osee.runtime.p2" type="Directory"/>
-<location path="C:\Users\nhh5kor\icTeam\iCTeam_new_target\OSEE_026\org.eclipse.ip.p2-18.0.0.v201709271724-DEV" type="Directory"/>
+<location path="C:\Users\nhh5kor\icTeam\iCTeam_new_target\OSEE_026\org.eclipse.ip.p2-0.26.0.v201709271724-DEV" type="Directory"/>
<location path="C:\Users\nhh5kor\icTeam\iCTeam_new_target\OSEE_026\postgresql_driver" type="Directory"/>
<location path="C:\Users\nhh5kor\icTeam\iCTeam_new_target\OSEE_026\org.eclipse.osee.client.all.p2" type="Directory"/>
</locations>
diff --git a/plugins/org.eclipse.osee.jaxrs.client.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.jaxrs.client.test/META-INF/MANIFEST.MF
index 54ba75a2c0e..1050265661e 100644
--- a/plugins/org.eclipse.osee.jaxrs.client.test/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.jaxrs.client.test/META-INF/MANIFEST.MF
@@ -7,10 +7,12 @@ Bundle-Version: 0.26.0.qualifier
Fragment-Host: org.eclipse.osee.jaxrs.client
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-Vendor: Eclipse Open System Engineering Environment
-Require-Bundle: org.junit;visibility:=reexport
+Require-Bundle: org.junit;visibility:=reexport,
+ org.hamcrest.core
Import-Package: org.junit,
org.junit.rules,
org.junit.runner,
- org.junit.runners
-Require-Bundle: org.hamcrest.core,
- org.mockito;visibility:=reexport
+ org.junit.runners,
+ org.mockito,
+ org.mockito.stubbing,
+ org.mockito.invocation
diff --git a/plugins/org.eclipse.osee.jaxrs.client.test/src/org/eclipse/osee/jaxrs/client/internal/ext/OAuth2FlowsTest.java b/plugins/org.eclipse.osee.jaxrs.client.test/src/org/eclipse/osee/jaxrs/client/internal/ext/OAuth2FlowsTest.java
index 331ee89391c..d0b160f2f00 100644
--- a/plugins/org.eclipse.osee.jaxrs.client.test/src/org/eclipse/osee/jaxrs/client/internal/ext/OAuth2FlowsTest.java
+++ b/plugins/org.eclipse.osee.jaxrs.client.test/src/org/eclipse/osee/jaxrs/client/internal/ext/OAuth2FlowsTest.java
@@ -34,12 +34,12 @@ import javax.ws.rs.core.Form;
import javax.ws.rs.core.MultivaluedMap;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.Status;
-import org.apache.cxf.rs.security.oauth2.client.OAuthClientUtils.Consumer;
+import org.apache.cxf.rs.security.oauth2.client.Consumer;
import org.apache.cxf.rs.security.oauth2.common.AccessTokenValidation;
import org.apache.cxf.rs.security.oauth2.common.ClientAccessToken;
import org.apache.cxf.rs.security.oauth2.common.OAuthAuthorizationData;
+import org.apache.cxf.rs.security.oauth2.common.OAuthPermission;
import org.apache.cxf.rs.security.oauth2.common.OOBAuthorizationResponse;
-import org.apache.cxf.rs.security.oauth2.common.Permission;
import org.apache.cxf.rs.security.oauth2.utils.OAuthConstants;
import org.eclipse.osee.jaxrs.client.JaxRsConfirmAccessHandler;
import org.eclipse.osee.jaxrs.client.JaxRsConfirmAccessHandler.ConfirmAccessRequest;
@@ -60,7 +60,7 @@ import org.mockito.stubbing.Answer;
/**
* Test Case for {@link OAuth2Flows}
- *
+ *
* @author Roberto E. Escobar
*/
public class OAuth2FlowsTest {
@@ -101,26 +101,26 @@ public class OAuth2FlowsTest {
@Mock private OAuth2Transport transport;
@Mock private OwnerCredentials owner;
@Mock private Consumer client;
-
+
@Mock private JaxRsConfirmAccessHandler handler;
@Captor private ArgumentCaptor<Form> formCaptor;
@Captor private ArgumentCaptor<Map<String, String>> paramsCaptor;
@Captor private ArgumentCaptor<URI> authUriCaptor;
-
+
@Mock private Response response1;
@Mock private OAuthAuthorizationData authData;
@Mock private OOBAuthorizationResponse oobResponse;
@Mock private MultivaluedMap<String, Object> headers;
-
+
@Mock private Response response2;
@Captor private ArgumentCaptor<ConfirmAccessRequest> confirmCaptor;
@Mock private ConfirmAccessResponse confirmResponse;
-
+
//@formatter:on
private OAuth2Flows flows;
private ClientAccessToken token;
- private Permission permission;
+ private OAuthPermission permission;
private Map<String, String> appProperties;
private AccessTokenValidation tokenValidation;
@@ -139,10 +139,9 @@ public class OAuth2FlowsTest {
when(owner.getUsername()).thenReturn(USERNAME);
when(owner.getPassword()).thenReturn(PASSWORD);
-
- permission = new Permission(PERMISSION_NAME, PERMISSION_DESCR);
- permission.setDefault(true);
- List<? extends Permission> permissions = Arrays.asList(permission);
+ permission = new OAuthPermission(PERMISSION_NAME, PERMISSION_DESCR);
+ permission.setDefaultPermission(true);
+ List<? extends OAuthPermission> permissions = Arrays.asList(permission);
appProperties = new HashMap<>();
appProperties.put("prop1", "a");
diff --git a/plugins/org.eclipse.osee.jaxrs.client/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.jaxrs.client/META-INF/MANIFEST.MF
index 599144ddbee..1bc5a9ad7fd 100644
--- a/plugins/org.eclipse.osee.jaxrs.client/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.jaxrs.client/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: OSEE JAX-RS Client (Incubation)
-Bundle-SymbolicName: org.eclipse.osee.jaxrs.client;singleton:=true
+Bundle-SymbolicName: org.eclipse.osee.jaxrs.client
Bundle-ActivationPolicy: lazy
Bundle-Version: 0.26.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
@@ -34,6 +34,8 @@ Import-Package: com.fasterxml.jackson.annotation,
org.apache.cxf.rs.security.oauth2.provider,
org.apache.cxf.rs.security.oauth2.utils,
org.apache.cxf.rs.security.oauth2.utils.crypto,
+ org.apache.cxf.rt.security,
+ org.apache.cxf.rt.security.crypto,
org.apache.cxf.transport.common.gzip,
org.apache.cxf.transport.http,
org.apache.cxf.transports.http.configuration,
@@ -42,5 +44,6 @@ Import-Package: com.fasterxml.jackson.annotation,
org.eclipse.osee.framework.core.util,
org.eclipse.osee.framework.jdk.core.type,
org.eclipse.osee.framework.jdk.core.util,
+ org.eclipse.osee.framework.logging,
org.eclipse.osee.jaxrs
Export-Package: org.eclipse.osee.jaxrs.client
diff --git a/plugins/org.eclipse.osee.jaxrs.client/src/org/eclipse/osee/jaxrs/client/internal/JaxRsClientRuntime.java b/plugins/org.eclipse.osee.jaxrs.client/src/org/eclipse/osee/jaxrs/client/internal/JaxRsClientRuntime.java
index 8389647442d..c530341f5cd 100644
--- a/plugins/org.eclipse.osee.jaxrs.client/src/org/eclipse/osee/jaxrs/client/internal/JaxRsClientRuntime.java
+++ b/plugins/org.eclipse.osee.jaxrs.client/src/org/eclipse/osee/jaxrs/client/internal/JaxRsClientRuntime.java
@@ -19,7 +19,7 @@ import com.google.common.cache.CacheBuilder;
import java.net.URI;
import java.util.Collections;
import java.util.concurrent.TimeUnit;
-import org.apache.cxf.rs.security.oauth2.client.OAuthClientUtils;
+import org.apache.cxf.rs.security.oauth2.client.Consumer;
import org.apache.cxf.rs.security.oauth2.common.ClientAccessToken;
import org.eclipse.osee.framework.core.OrcsTokenService;
import org.eclipse.osee.framework.jdk.core.util.Conditions;
@@ -64,7 +64,7 @@ public final class JaxRsClientRuntime {
@Override
public OAuth2ClientRequestFilter newOAuthClientFilter(String username, String password, String clientId, String clientSecret, String authorizeUri, String tokenUri, String tokenValidationUri) {
OwnerCredentials owner = newOwner(username, password);
- OAuthClientUtils.Consumer client = new OAuthClientUtils.Consumer(clientId, clientSecret);
+ Consumer client = new Consumer(clientId, clientSecret);
OAuth2Transport transport = new OAuth2Transport();
OAuth2Flows flowManager =
new OAuth2Flows(transport, owner, client, authorizeUri, tokenUri, tokenValidationUri);
diff --git a/plugins/org.eclipse.osee.jaxrs.client/src/org/eclipse/osee/jaxrs/client/internal/ext/CxfJaxRsClientConfigurator.java b/plugins/org.eclipse.osee.jaxrs.client/src/org/eclipse/osee/jaxrs/client/internal/ext/CxfJaxRsClientConfigurator.java
index 90cbfe91ed2..915654240f3 100644
--- a/plugins/org.eclipse.osee.jaxrs.client/src/org/eclipse/osee/jaxrs/client/internal/ext/CxfJaxRsClientConfigurator.java
+++ b/plugins/org.eclipse.osee.jaxrs.client/src/org/eclipse/osee/jaxrs/client/internal/ext/CxfJaxRsClientConfigurator.java
@@ -23,6 +23,7 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
+import java.util.logging.Level;
import javax.ws.rs.client.ClientBuilder;
import javax.ws.rs.ext.RuntimeDelegate;
import org.apache.cxf.configuration.security.AuthorizationPolicy;
@@ -39,6 +40,7 @@ import org.eclipse.osee.framework.core.OrcsTokenService;
import org.eclipse.osee.framework.core.util.JsonUtil;
import org.eclipse.osee.framework.jdk.core.util.Conditions;
import org.eclipse.osee.framework.jdk.core.util.Strings;
+import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.jaxrs.OrcsParamConverterProvider;
import org.eclipse.osee.jaxrs.client.JaxRsClientConfig;
import org.eclipse.osee.jaxrs.client.JaxRsClientConstants.ConnectionType;
@@ -92,7 +94,6 @@ public final class CxfJaxRsClientConfigurator implements JaxRsClientConfigurator
// Ensure CXF JAX-RS implementation is loaded
RuntimeDelegate runtimeDelegate = new org.apache.cxf.jaxrs.impl.RuntimeDelegateImpl();
RuntimeDelegate.setInstance(runtimeDelegate);
-
new org.apache.cxf.jaxrs.client.spec.ClientBuilderImpl();
System.setProperty(JAVAX_WS_RS_CLIENT_BUILDER_PROPERTY, DEFAULT_JAXRS_CLIENT_BUILDER_IMPL);
}
@@ -251,7 +252,13 @@ public final class CxfJaxRsClientConfigurator implements JaxRsClientConfigurator
private static void register(ClientBuilder builder, Iterable<? extends Object> objects) {
for (Object object : objects) {
- builder.register(object);
+ try {
+ builder.register(object);
+ }
+
+ catch (Exception ex) {
+ OseeLog.log(CxfJaxRsClientConfigurator.class, Level.WARNING, ex);
+ }
}
}
diff --git a/plugins/org.eclipse.osee.jaxrs.client/src/org/eclipse/osee/jaxrs/client/internal/ext/OAuth2Flows.java b/plugins/org.eclipse.osee.jaxrs.client/src/org/eclipse/osee/jaxrs/client/internal/ext/OAuth2Flows.java
index 32f0c14ffd9..7e173d0c155 100644
--- a/plugins/org.eclipse.osee.jaxrs.client/src/org/eclipse/osee/jaxrs/client/internal/ext/OAuth2Flows.java
+++ b/plugins/org.eclipse.osee.jaxrs.client/src/org/eclipse/osee/jaxrs/client/internal/ext/OAuth2Flows.java
@@ -22,13 +22,13 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import org.apache.cxf.rs.security.oauth2.client.Consumer;
import javax.ws.rs.core.Form;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.Status.Family;
import javax.ws.rs.core.Response.StatusType;
import javax.ws.rs.core.UriBuilder;
import org.apache.cxf.rs.security.oauth2.client.OAuthClientUtils;
-import org.apache.cxf.rs.security.oauth2.client.OAuthClientUtils.Consumer;
import org.apache.cxf.rs.security.oauth2.common.AccessTokenValidation;
import org.apache.cxf.rs.security.oauth2.common.ClientAccessToken;
import org.apache.cxf.rs.security.oauth2.common.OAuthAuthorizationData;
@@ -277,7 +277,7 @@ public class OAuth2Flows {
public List<? extends Permission> getPermissionsRequested() {
if (permissions == null) {
List<Permission> permissions = new ArrayList<>();
- for (org.apache.cxf.rs.security.oauth2.common.Permission perm : data.getPermissions()) {
+ for (org.apache.cxf.rs.security.oauth2.common.OAuthPermission perm : data.getPermissions()) {
permissions.add(asPermission(perm));
}
this.permissions = Collections.unmodifiableList(permissions);
@@ -316,14 +316,14 @@ public class OAuth2Flows {
}
};
- protected static Permission asPermission(final org.apache.cxf.rs.security.oauth2.common.Permission perm) {
+ protected static Permission asPermission(final org.apache.cxf.rs.security.oauth2.common.OAuthPermission perm) {
return new PermissionWrapper(perm);
}
private static final class PermissionWrapper implements Permission {
- private final org.apache.cxf.rs.security.oauth2.common.Permission perm;
+ private final org.apache.cxf.rs.security.oauth2.common.OAuthPermission perm;
- public PermissionWrapper(org.apache.cxf.rs.security.oauth2.common.Permission perm) {
+ public PermissionWrapper(org.apache.cxf.rs.security.oauth2.common.OAuthPermission perm) {
super();
this.perm = perm;
}
diff --git a/plugins/org.eclipse.osee.jaxrs.client/src/org/eclipse/osee/jaxrs/client/internal/ext/OAuth2Serializer.java b/plugins/org.eclipse.osee.jaxrs.client/src/org/eclipse/osee/jaxrs/client/internal/ext/OAuth2Serializer.java
index 55d88f6c0e4..17ac67b6adf 100644
--- a/plugins/org.eclipse.osee.jaxrs.client/src/org/eclipse/osee/jaxrs/client/internal/ext/OAuth2Serializer.java
+++ b/plugins/org.eclipse.osee.jaxrs.client/src/org/eclipse/osee/jaxrs/client/internal/ext/OAuth2Serializer.java
@@ -22,7 +22,7 @@ import javax.crypto.SecretKey;
import org.apache.cxf.rs.security.oauth2.client.OAuthClientUtils;
import org.apache.cxf.rs.security.oauth2.common.ClientAccessToken;
import org.apache.cxf.rs.security.oauth2.provider.OAuthJSONProvider;
-import org.apache.cxf.rs.security.oauth2.utils.crypto.CryptoUtils;
+import org.apache.cxf.rt.security.crypto.CryptoUtils;
import org.eclipse.osee.framework.jdk.core.util.Lib;
import org.eclipse.osee.framework.jdk.core.util.Strings;
diff --git a/plugins/org.eclipse.osee.jaxrs.client/src/org/eclipse/osee/jaxrs/client/internal/ext/OAuth2Transport.java b/plugins/org.eclipse.osee.jaxrs.client/src/org/eclipse/osee/jaxrs/client/internal/ext/OAuth2Transport.java
index fc6c43fafd1..7eb6f79d09f 100644
--- a/plugins/org.eclipse.osee.jaxrs.client/src/org/eclipse/osee/jaxrs/client/internal/ext/OAuth2Transport.java
+++ b/plugins/org.eclipse.osee.jaxrs.client/src/org/eclipse/osee/jaxrs/client/internal/ext/OAuth2Transport.java
@@ -23,8 +23,8 @@ import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import org.apache.cxf.jaxrs.client.WebClient;
+import org.apache.cxf.rs.security.oauth2.client.Consumer;
import org.apache.cxf.rs.security.oauth2.client.OAuthClientUtils;
-import org.apache.cxf.rs.security.oauth2.client.OAuthClientUtils.Consumer;
import org.apache.cxf.rs.security.oauth2.common.AccessTokenValidation;
import org.apache.cxf.rs.security.oauth2.common.ClientAccessToken;
import org.apache.cxf.rs.security.oauth2.grants.code.AuthorizationCodeGrant;
diff --git a/plugins/org.eclipse.osee.jaxrs.server/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.jaxrs.server/META-INF/MANIFEST.MF
index e9699e78eae..4595fa4d42d 100644
--- a/plugins/org.eclipse.osee.jaxrs.server/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.jaxrs.server/META-INF/MANIFEST.MF
@@ -25,6 +25,8 @@ Import-Package: com.fasterxml.jackson.core,
javax.ws.rs.ext,
org.apache.cxf,
org.apache.cxf.attachment,
+ org.apache.cxf.rt.security,
+ org.apache.cxf.rt.security.crypto,
org.apache.cxf.binding,
org.apache.cxf.common.security,
org.apache.cxf.common.util,
@@ -41,7 +43,6 @@ Import-Package: com.fasterxml.jackson.core,
org.apache.cxf.jaxrs.model,
org.apache.cxf.jaxrs.model.wadl,
org.apache.cxf.jaxrs.provider,
- org.apache.cxf.jaxrs.provider.json,
org.apache.cxf.jaxrs.security,
org.apache.cxf.jaxrs.utils,
org.apache.cxf.jaxrs.utils.multipart,
diff --git a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/ext/CxfJaxRsFactory.java b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/ext/CxfJaxRsFactory.java
index 8f5fbccd410..2d5666d2767 100644
--- a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/ext/CxfJaxRsFactory.java
+++ b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/ext/CxfJaxRsFactory.java
@@ -184,8 +184,8 @@ public final class CxfJaxRsFactory implements JaxRsFactory {
boolean ignoreApplicationPath = true;
boolean staticSubresourceResolution = true;
- JAXRSServerFactoryBean bean =
- ResourceUtils.createApplication(application, ignoreApplicationPath, staticSubresourceResolution);
+ JAXRSServerFactoryBean bean = ResourceUtils.createApplication(application, ignoreApplicationPath,
+ staticSubresourceResolution, staticSubresourceResolution, bus);
if (JaxRsUtils.hasPath(applicationPath)) {
String subAddress = JaxRsUtils.normalize(applicationPath);
diff --git a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/OAuth2DataProvider.java b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/OAuth2DataProvider.java
index f32660dbf68..c570a16ee55 100644
--- a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/OAuth2DataProvider.java
+++ b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/OAuth2DataProvider.java
@@ -150,9 +150,13 @@ public class OAuth2DataProvider implements AuthorizationCodeDataProvider {
grant.setAudience(reg.getAudience());
grant.setRedirectUri(reg.getRedirectUri());
- grant.setClientCodeVerifier(reg.getClientCodeVerifier());
+ System.out.println("Server props: " + reg.getExtraProperties().keySet());
+ System.out.println();
+ grant.setCodeVerifier(reg.getNonce());
+ reg.setClientCodeChallenge(reg.getClientCodeChallenge());
grant.setApprovedScopes(getApprovedScopes(reg.getRequestedScope(), reg.getApprovedScope()));
- grant.setClientCodeVerifier(reg.getClientCodeVerifier());
+ grant.setCodeVerifier(reg.getNonce());
+ reg.setClientCodeChallenge(reg.getClientCodeChallenge());
String encrypted = serializer.encryptCodeGrant(grant, getSecretKey());
grant.setCode(encrypted);
@@ -193,7 +197,6 @@ public class OAuth2DataProvider implements AuthorizationCodeDataProvider {
accessToken.setSubject(reg.getSubject());
accessToken.setTokenType(type.getType());
- accessToken.setAudience(reg.getAudience());
accessToken.setGrantType(reg.getGrantType());
accessToken.setScopes(permissions);
@@ -252,7 +255,6 @@ public class OAuth2DataProvider implements AuthorizationCodeDataProvider {
newAccessToken.setSubject(oldRefreshToken.getSubject());
newAccessToken.setTokenType(type.getType());
- newAccessToken.setAudience(oldRefreshToken.getAudience());
newAccessToken.setGrantType(oldRefreshToken.getGrantType());
newAccessToken.setScopes(oldRefreshToken.getScopes());
@@ -277,16 +279,14 @@ public class OAuth2DataProvider implements AuthorizationCodeDataProvider {
toReturn.setClient(token.getClient());
toReturn.setSubject(token.getSubject());
- toReturn.setAudience(token.getAudience());
+ toReturn.setAudiences(token.getAudiences());
toReturn.setGrantType(token.getGrantType());
toReturn.setScopes(token.getScopes());
-
String encryptedRefreshToken = serializer.encryptRefreshToken(toReturn, secretKey);
toReturn.setTokenKey(encryptedRefreshToken);
return toReturn;
}
- @Override
public void removeAccessToken(ServerAccessToken accessToken) {
storage.removeTokenByKey(accessToken.getTokenKey());
}
@@ -391,4 +391,19 @@ public class OAuth2DataProvider implements AuthorizationCodeDataProvider {
private List<String> getApprovedScopes(List<String> requestedScopes, List<String> approvedScopes) {
return approvedScopes.isEmpty() ? requestedScopes : approvedScopes;
}
+
+ @Override
+ public List<ServerAccessToken> getAccessTokens(Client arg0, UserSubject arg1) throws OAuthServiceException {
+ return null;
+ }
+
+ @Override
+ public List<RefreshToken> getRefreshTokens(Client arg0, UserSubject arg1) throws OAuthServiceException {
+ return null;
+ }
+
+ @Override
+ public List<ServerAuthorizationCodeGrant> getCodeGrants(Client arg0, UserSubject arg1) throws OAuthServiceException {
+ return null;
+ }
} \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/OAuth2ServerProvider.java b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/OAuth2ServerProvider.java
index 9291b209f5c..0a065bcba24 100644
--- a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/OAuth2ServerProvider.java
+++ b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/OAuth2ServerProvider.java
@@ -304,8 +304,6 @@ public class OAuth2ServerProvider {
if (object instanceof AbstractAccessTokenValidator) {
AbstractAccessTokenValidator validator = (AbstractAccessTokenValidator) object;
validator.setRealm(config.getRealm());
-
- validator.setAudiences(audiences);
validator.setTokenValidators(tokenValidators);
}
@@ -339,7 +337,6 @@ public class OAuth2ServerProvider {
if (object instanceof AccessTokenService) {
AccessTokenService accessTokenService = (AccessTokenService) object;
- accessTokenService.setAudiences(audiences);
accessTokenService.setGrantHandlers(grantHandlers);
}
diff --git a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/adapters/AccessToken.java b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/adapters/AccessToken.java
index 73c0469abfe..307fb4ef221 100644
--- a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/adapters/AccessToken.java
+++ b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/adapters/AccessToken.java
@@ -57,4 +57,9 @@ public class AccessToken extends ServerAccessToken implements OAuthToken {
return type;
}
+ @Override
+ public String getAudience() {
+ return getAudiences().get(0);
+ }
+
}
diff --git a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/adapters/AuthorizationCode.java b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/adapters/AuthorizationCode.java
index d684e165622..6d0d47b01c2 100644
--- a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/adapters/AuthorizationCode.java
+++ b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/adapters/AuthorizationCode.java
@@ -49,4 +49,9 @@ public class AuthorizationCode extends ServerAuthorizationCodeGrant implements O
return clientId;
}
+ @Override
+ public String getClientCodeVerifier() {
+ return getCodeVerifier();
+ }
+
}
diff --git a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/adapters/OAuthEncryption.java b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/adapters/OAuthEncryption.java
index 1a9fab0224c..c9dfa8ee223 100644
--- a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/adapters/OAuthEncryption.java
+++ b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/adapters/OAuthEncryption.java
@@ -25,8 +25,8 @@ import org.apache.cxf.rs.security.oauth2.common.UserSubject;
import org.apache.cxf.rs.security.oauth2.grants.code.ServerAuthorizationCodeGrant;
import org.apache.cxf.rs.security.oauth2.provider.OAuthDataProvider;
import org.apache.cxf.rs.security.oauth2.tokens.refresh.RefreshToken;
-import org.apache.cxf.rs.security.oauth2.utils.crypto.CryptoUtils;
-import org.apache.cxf.rs.security.oauth2.utils.crypto.KeyProperties;
+import org.apache.cxf.rt.security.crypto.CryptoUtils;
+import org.apache.cxf.rt.security.crypto.KeyProperties;
import org.eclipse.osee.framework.jdk.core.util.Collections;
import org.eclipse.osee.framework.jdk.core.util.Strings;
import org.eclipse.osee.jaxrs.server.session.SessionData;
@@ -78,7 +78,7 @@ public class OAuthEncryption {
state.append(tokenizeString(grant.getAudience()));
state.append(SEP);
// 6: code verifier
- state.append(tokenizeString(grant.getClientCodeVerifier()));
+ state.append(tokenizeString(grant.getCodeVerifier()));
state.append(SEP);
// 7: approved scopes
state.append(grant.getApprovedScopes().toString());
@@ -136,7 +136,7 @@ public class OAuthEncryption {
Long.valueOf(parts[2]), Long.valueOf(parts[3]));
grant.setRedirectUri(getStringPart(parts[4]));
grant.setAudience(getStringPart(parts[5]));
- grant.setClientCodeVerifier(getStringPart(parts[6]));
+ grant.setCodeVerifier(getStringPart(parts[6]));
grant.setApprovedScopes(parseSimpleList(parts[7]));
grant.setSubject(recreateUserSubject(parts[8]));
return grant;
@@ -222,7 +222,10 @@ public class OAuthEncryption {
newToken.setRefreshToken(getStringPart(parts[5]));
newToken.setGrantType(getStringPart(parts[6]));
- newToken.setAudience(getStringPart(parts[7]));
+ List<String> audi = new LinkedList<String>();
+ audi.add(parts[7]);
+
+ newToken.setAudiences(audi);
newToken.setParameters(parseSimpleMap(parts[8]));
// Permissions
@@ -231,7 +234,8 @@ public class OAuthEncryption {
String[] allPermParts = parts[9].split("&");
for (int i = 0; i + 4 < allPermParts.length; i = i + 5) {
OAuthPermission perm = new OAuthPermission(allPermParts[i], allPermParts[i + 1]);
- perm.setDefault(Boolean.valueOf(allPermParts[i + 2]));
+
+ perm.setDefaultPermission(Boolean.valueOf(allPermParts[i + 2]));
perm.setHttpVerbs(parseSimpleList(allPermParts[i + 3]));
perm.setUris(parseSimpleList(allPermParts[i + 4]));
perms.add(perm);
@@ -323,7 +327,7 @@ public class OAuthEncryption {
state.append(tokenizeString(token.getGrantType()));
// 7: audience
state.append(SEP);
- state.append(tokenizeString(token.getAudience()));
+ state.append(tokenizeString(token.getAudiences().toString()));
// 8: other parameters
state.append(SEP);
// {key=value, key=value}
diff --git a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/adapters/RefreshOAuthToken.java b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/adapters/RefreshOAuthToken.java
index 05bb56c64d0..64da5890e11 100644
--- a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/adapters/RefreshOAuthToken.java
+++ b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/adapters/RefreshOAuthToken.java
@@ -57,4 +57,9 @@ public class RefreshOAuthToken extends org.apache.cxf.rs.security.oauth2.tokens.
return type;
}
+ @Override
+ public String getAudience() {
+ return null;
+ }
+
}
diff --git a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/adapters/SubjectProviderImpl.java b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/adapters/SubjectProviderImpl.java
index 4f6c8b59083..d1a3e3a695b 100644
--- a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/adapters/SubjectProviderImpl.java
+++ b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/adapters/SubjectProviderImpl.java
@@ -27,6 +27,8 @@ import javax.ws.rs.core.MultivaluedMap;
import org.apache.cxf.jaxrs.ext.MessageContext;
import org.apache.cxf.jaxrs.ext.MessageContextImpl;
import org.apache.cxf.phase.PhaseInterceptorChain;
+import org.apache.cxf.rs.security.oauth2.common.Client;
+import org.apache.cxf.rs.security.oauth2.common.OAuthRedirectionState;
import org.apache.cxf.rs.security.oauth2.common.UserSubject;
import org.apache.cxf.rs.security.oauth2.provider.OAuthServiceException;
import org.apache.cxf.rs.security.oauth2.utils.OAuthConstants;
@@ -104,7 +106,7 @@ public class SubjectProviderImpl implements SubjectProvider {
}
// Create Authenticity Session Token
- @Override
+
public String createSessionToken(MessageContext mc, MultivaluedMap<String, String> params, UserSubject subject) {
logger.debug("Create Session Token - subject[%s]", subject);
@@ -158,7 +160,6 @@ public class SubjectProviderImpl implements SubjectProvider {
return sessionAuthenticityToken;
}
- @Override
public UserSubject createUserSubject(MessageContext mc) throws OAuthServiceException {
UserSubject subject = mc.getContent(UserSubject.class);
if (subject == null) {
@@ -255,7 +256,6 @@ public class SubjectProviderImpl implements SubjectProvider {
return toReturn;
}
- @Override
public UserSubject createSubject(String username, String password) {
OseePrincipal principal = authenticate(OAuthConstants.BASIC_SCHEME, username, password);
return OAuthUtil.newUserSubject(principal);
@@ -290,4 +290,44 @@ public class SubjectProviderImpl implements SubjectProvider {
return subject;
}
+
+ @Override
+ public String createSessionToken(MessageContext mc, MultivaluedMap<String, String> arg1, UserSubject subject, OAuthRedirectionState arg3) {
+ logger.debug("Create Session Token - subject[%s]", subject);
+
+ String sessionAuthenticityToken = null;
+ if (sessionDelegate != null) {
+ Long subjectId = OAuthUtil.getUserSubjectUuid(subject);
+ sessionAuthenticityToken = sessionDelegate.createAuthenticitySessionToken(subjectId);
+ } else {
+ HttpSession session = mc.getHttpServletRequest().getSession();
+ sessionAuthenticityToken = (String) session.getAttribute(OAuthConstants.SESSION_AUTHENTICITY_TOKEN);
+ if (!Strings.isValid(sessionAuthenticityToken)) {
+ sessionAuthenticityToken = UUID.randomUUID().toString();
+ session.setAttribute(OAuthConstants.SESSION_AUTHENTICITY_TOKEN, sessionAuthenticityToken);
+ }
+ }
+ return sessionAuthenticityToken;
+ }
+
+ @Override
+ public OAuthRedirectionState getSessionState(MessageContext mc, String arg1, UserSubject subject) {
+ return null;
+ }
+
+ @Override
+ public UserSubject createUserSubject(MessageContext mc, MultivaluedMap<String, String> arg1) throws OAuthServiceException {
+ UserSubject subject = mc.getContent(UserSubject.class);
+ if (subject == null) {
+ SecurityContext securityContext = getSecurityContext(mc);
+ subject = OAuthUtil.newSubject(securityContext);
+ }
+ return subject;
+ }
+
+ @Override
+ public UserSubject createSubject(Client client, String username, String password) {
+ OseePrincipal principal = authenticate(OAuthConstants.BASIC_SCHEME, username, password);
+ return OAuthUtil.newUserSubject(principal);
+ }
} \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/endpoints/AbstractClientService.java b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/endpoints/AbstractClientService.java
index fe93c3ec349..193c110f658 100644
--- a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/endpoints/AbstractClientService.java
+++ b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/endpoints/AbstractClientService.java
@@ -84,7 +84,7 @@ public abstract class AbstractClientService {
protected UserSubject createUserSubject(SecurityContext securityContext) {
UserSubject subject = null;
if (subjectCreator != null) {
- subject = subjectCreator.createUserSubject(getMessageContext());
+ subject = subjectCreator.createUserSubject(getMessageContext(), null);
if (subject != null) {
return subject;
}
@@ -130,7 +130,7 @@ public abstract class AbstractClientService {
protected void addAuthenticityTokenToSession(ClientRegistrationData data, MultivaluedMap<String, String> params, UserSubject subject) {
String sessionToken;
if (sessionAuthenticityTokenProvider != null) {
- sessionToken = sessionAuthenticityTokenProvider.createSessionToken(getMessageContext(), params, subject);
+ sessionToken = sessionAuthenticityTokenProvider.createSessionToken(getMessageContext(), params, subject, null);
} else {
HttpSession session = mc.getHttpServletRequest().getSession();
sessionToken = (String) session.getAttribute(OAuthConstants.SESSION_AUTHENTICITY_TOKEN);
diff --git a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/endpoints/AuthorizationCodeEndpoint.java b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/endpoints/AuthorizationCodeEndpoint.java
index 624449f2e5b..90c73142128 100644
--- a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/endpoints/AuthorizationCodeEndpoint.java
+++ b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/endpoints/AuthorizationCodeEndpoint.java
@@ -56,7 +56,7 @@ public class AuthorizationCodeEndpoint extends AuthorizationCodeGrantService {
* Extra security features:
* - only confidential clients should have a client secret
* - if they are not confidential they should not have a client secret.
- *
+ *
* If desired, add the following:
* && !c.isConfidential() && c.getClientSecret() == null
* </pre>
@@ -78,9 +78,10 @@ public class AuthorizationCodeEndpoint extends AuthorizationCodeGrantService {
/**
* Override fixes OAuthAuthorizationData creation
*/
- @Override
+
protected OAuthAuthorizationData createAuthorizationData(Client client, MultivaluedMap<String, String> params, UserSubject subject, String redirectUri, List<OAuthPermission> perms) {
- OAuthAuthorizationData secData = super.createAuthorizationData(client, params, subject, redirectUri, perms);
+ OAuthAuthorizationData secData =
+ super.createAuthorizationData(client, params, redirectUri, subject, perms, perms, canSupportPublicClients);
secData.setApplicationName(client.getApplicationName());
secData.setApplicationCertificates(client.getApplicationCertificates());
diff --git a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/endpoints/ImplicitGrantEndpoint.java b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/endpoints/ImplicitGrantEndpoint.java
index 4c937fd7ad0..e23d8854592 100644
--- a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/endpoints/ImplicitGrantEndpoint.java
+++ b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/endpoints/ImplicitGrantEndpoint.java
@@ -22,6 +22,7 @@ import javax.ws.rs.core.UriInfo;
import org.apache.cxf.rs.security.oauth2.common.Client;
import org.apache.cxf.rs.security.oauth2.common.OAuthAuthorizationData;
import org.apache.cxf.rs.security.oauth2.common.OAuthPermission;
+import org.apache.cxf.rs.security.oauth2.common.OAuthRedirectionState;
import org.apache.cxf.rs.security.oauth2.common.ServerAccessToken;
import org.apache.cxf.rs.security.oauth2.common.UserSubject;
import org.apache.cxf.rs.security.oauth2.services.ImplicitGrantService;
@@ -42,10 +43,9 @@ public class ImplicitGrantEndpoint extends ImplicitGrantService {
this.clientLogoUriResolver = clientLogoUriResolver;
}
- @Override
protected Response createGrant(MultivaluedMap<String, String> params, Client client, String redirectUri, List<String> requestedScope, List<String> approvedScope, UserSubject userSubject, ServerAccessToken preAuthorizedToken) {
- Response response =
- super.createGrant(params, client, redirectUri, requestedScope, approvedScope, userSubject, preAuthorizedToken);
+ Response response = super.createGrant((OAuthRedirectionState) params, client, requestedScope, approvedScope,
+ userSubject, preAuthorizedToken);
String forwardedServer = OAuthUtil.getForwarderServer();
@@ -106,9 +106,10 @@ public class ImplicitGrantEndpoint extends ImplicitGrantService {
/**
* Override fixes OAuthAuthorizationData creation
*/
- @Override
+
protected OAuthAuthorizationData createAuthorizationData(Client client, MultivaluedMap<String, String> params, UserSubject subject, String redirectUri, List<OAuthPermission> perms) {
- OAuthAuthorizationData secData = super.createAuthorizationData(client, params, subject, redirectUri, perms);
+ OAuthAuthorizationData secData = super.createAuthorizationData(client, params, redirectUri, subject, perms, perms,
+ useRegisteredRedirectUriIfPossible);
String oldReplyTo = secData.getReplyTo();
URI replyToUri = UriBuilder.fromPath(oldReplyTo).buildFromEncoded();
diff --git a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/writers/AuthorizationDataHtmlWriter.java b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/writers/AuthorizationDataHtmlWriter.java
index abb6d5c546d..549423b5c77 100644
--- a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/writers/AuthorizationDataHtmlWriter.java
+++ b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/writers/AuthorizationDataHtmlWriter.java
@@ -21,7 +21,7 @@ import java.util.List;
import javax.ws.rs.ext.Provider;
import org.apache.cxf.rs.security.oauth2.common.OAuthAuthorizationData;
import org.apache.cxf.rs.security.oauth2.common.OAuthPermission;
-import org.apache.cxf.rs.security.oauth2.common.Permission;
+//import org.apache.cxf.rs.security.oauth2.common.OAuthPermission;
import org.apache.cxf.rs.security.oauth2.utils.OAuthConstants;
import org.eclipse.osee.framework.jdk.core.type.ViewModel;
import org.eclipse.osee.jaxrs.server.internal.resources.AbstractHtmlWriter;
@@ -70,24 +70,24 @@ public class AuthorizationDataHtmlWriter extends AbstractHtmlWriter<OAuthAuthori
model.param(AUTHORIZE_PAGE__DECISION_ALLOW_TAG, AUTHORIZATION_DECISION_ALLOW);
model.param(AUTHORIZE_PAGE__DECISION_DENY_TAG, AUTHORIZATION_DECISION_DENY);
- model.param(AUTHORIZE_PAGE__HIDDEN_FIELDS_SECTION_TAG,
- HiddenFormFields.newForm() //
- .add(OAuthConstants.CLIENT_AUDIENCE, data.getAudience()) //
- .add(OAuthConstants.SESSION_AUTHENTICITY_TOKEN, data.getAuthenticityToken())//
- .add(OAuthConstants.CLIENT_ID, data.getClientId()) //
- .add(OAuthConstants.SCOPE, data.getProposedScope())//
- .add(OAuthConstants.REDIRECT_URI, data.getRedirectUri()) //
- .add(OAuthConstants.STATE, data.getState())//
- .build());
+ model.param(AUTHORIZE_PAGE__HIDDEN_FIELDS_SECTION_TAG, HiddenFormFields.newForm() //
+ .add(OAuthConstants.CLIENT_AUDIENCE, data.getAudience()) //
+ .add(OAuthConstants.SESSION_AUTHENTICITY_TOKEN, data.getAuthenticityToken())//
+ .add(OAuthConstants.CLIENT_ID, data.getClientId()) //
+ .add(OAuthConstants.SCOPE, data.getProposedScope())//
+ .add(OAuthConstants.REDIRECT_URI, data.getRedirectUri()) //
+ .add(OAuthConstants.STATE, data.getState())//
+ .build());
InputFields input = InputFields.newListGroupContainer();
- List<? extends Permission> permissions = data.getPermissions();
+ List<? extends OAuthPermission> permissions = data.getPermissions();
if (permissions.isEmpty()) {
- Permission permission = new OAuthPermission("Full Data Access", "Application is able to read/write all data.");
- permission.setDefault(true);
+ OAuthPermission permission =
+ new OAuthPermission("Full Data Access", "Application is able to read/write all data.");
+ permission.setDefaultPermission(true);
addItem(input, permission);
} else {
- for (Permission permission : permissions) {
+ for (OAuthPermission permission : permissions) {
addItem(input, permission);
}
}
@@ -95,7 +95,7 @@ public class AuthorizationDataHtmlWriter extends AbstractHtmlWriter<OAuthAuthori
return model;
}
- private void addItem(InputFields input, Permission perm) {
+ private void addItem(InputFields input, OAuthPermission perm) {
String permissionName = perm.getPermission();
String key = String.format("%s_status", permissionName);
input.add(key, InputType.checkbox, permissionName, perm.getDescription(), "", "allow", perm.isDefault());
diff --git a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/security/JaxRsOAuthResourceServerFilter.java b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/security/JaxRsOAuthResourceServerFilter.java
index 38140472592..d2db5d1be96 100644
--- a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/security/JaxRsOAuthResourceServerFilter.java
+++ b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/security/JaxRsOAuthResourceServerFilter.java
@@ -25,6 +25,7 @@ import javax.ws.rs.client.WebTarget;
import javax.ws.rs.container.ContainerRequestContext;
import javax.ws.rs.container.ContainerRequestFilter;
import javax.ws.rs.core.Form;
+import javax.ws.rs.core.MultivaluedMap;
import javax.ws.rs.ext.Provider;
import org.apache.cxf.jaxrs.ext.MessageContext;
import org.apache.cxf.rs.security.oauth2.common.AccessTokenValidation;
@@ -71,7 +72,7 @@ public class JaxRsOAuthResourceServerFilter implements ContainerRequestFilter {
}
public void setAudiences(List<String> audiences) {
- delegate.setAudiences(audiences);
+ delegate.setAudience(audiences.toString());
}
@Override
@@ -135,6 +136,11 @@ public class JaxRsOAuthResourceServerFilter implements ContainerRequestFilter {
public AccessTokenValidation validateAccessToken(MessageContext mc, final String authScheme, final String accessToken) throws OAuthServiceException {
return getRemoteTokenValidation(authScheme, accessToken);
}
+
+ @Override
+ public AccessTokenValidation validateAccessToken(MessageContext arg0, String arg1, String arg2, MultivaluedMap<String, String> arg3) throws OAuthServiceException {
+ return null;
+ }
};
}
@@ -164,6 +170,11 @@ public class JaxRsOAuthResourceServerFilter implements ContainerRequestFilter {
throw new OAuthServiceException("Error validating access token", ex.getCause());
}
}
+
+ @Override
+ public AccessTokenValidation validateAccessToken(MessageContext arg0, String arg1, String arg2, MultivaluedMap<String, String> arg3) throws OAuthServiceException {
+ return null;
+ }
};
}
@@ -188,6 +199,10 @@ public class JaxRsOAuthResourceServerFilter implements ContainerRequestFilter {
private WebTarget target;
+ public AccessTokenValidation validateAccessToken(MessageContext mc, String authScheme, String accessToken) throws OAuthServiceException {
+ return null;
+ }
+
@Override
public List<String> getSupportedAuthorizationSchemes() {
return Collections.singletonList(OAuthConstants.ALL_AUTH_SCHEMES);
diff --git a/plugins/org.eclipse.osee.orcs.rest.model/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.orcs.rest.model/META-INF/MANIFEST.MF
index a7da3bf60d6..3ffa9393666 100644
--- a/plugins/org.eclipse.osee.orcs.rest.model/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.orcs.rest.model/META-INF/MANIFEST.MF
@@ -19,6 +19,7 @@ Import-Package: com.fasterxml.jackson.annotation,
javax.ws.rs.core,
javax.xml.bind.annotation,
org.apache.cxf.jaxrs.ext.multipart,
+ org.eclipse.osee.define.api.report,
org.eclipse.osee.framework.core.applicability,
org.eclipse.osee.framework.core.data,
org.eclipse.osee.framework.core.enums,
diff --git a/plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/ArtifactIdReportColumn.java b/plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/ArtifactIdReportColumn.java
deleted file mode 100644
index 50a4cbee3f5..00000000000
--- a/plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/ArtifactIdReportColumn.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*********************************************************************
- * Copyright (c) 2020 Boeing
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * Boeing - initial API and implementation
- **********************************************************************/
-
-package org.eclipse.osee.orcs.rest.model;
-
-import org.eclipse.osee.orcs.data.ArtifactReadable;
-
-/**
- * @author David W. Miller
- */
-public class ArtifactIdReportColumn extends ReportColumn {
-
- public ArtifactIdReportColumn(String name) {
- super(name);
- }
-
- @Override
- public String getReportData(ArtifactReadable artifact) {
- if (artifact == null) {
- return "";
- }
- return artifact.getIdString();
- }
-}
diff --git a/plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/ReportLevel.java b/plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/ReportLevel.java
index e833d7926fc..a5de1abc96f 100644
--- a/plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/ReportLevel.java
+++ b/plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/ReportLevel.java
@@ -13,8 +13,11 @@
package org.eclipse.osee.orcs.rest.model;
+import java.util.Collection;
import java.util.LinkedList;
import java.util.List;
+
+import org.eclipse.osee.define.api.report.ArtifactIdReportColumn;
import org.eclipse.osee.framework.core.data.AttributeTypeToken;
import org.eclipse.osee.framework.core.data.RelationTypeSide;
@@ -34,7 +37,7 @@ public class ReportLevel {
}
public ReportLevel column(String columnName) {
- columns.add(new ArtifactIdReportColumn(columnName));
+ columns.addAll((Collection<? extends ReportColumn>) new ArtifactIdReportColumn(columnName));
return this;
}
diff --git a/plugins/org.eclipse.osee.parent/pom.xml b/plugins/org.eclipse.osee.parent/pom.xml
index d9d20f5ff59..9484935c2cb 100644
--- a/plugins/org.eclipse.osee.parent/pom.xml
+++ b/plugins/org.eclipse.osee.parent/pom.xml
@@ -90,7 +90,7 @@
</organization>
-
+
<!-- <pluginRepositories> -->
<!-- <pluginRepository> -->
<!-- <id>cbi-jdt</id> -->
diff --git a/plugins/org.eclipse.osee.support.config/ClientServerTargetPlatform.target b/plugins/org.eclipse.osee.support.config/ClientServerTargetPlatform.target
index 7a2a767197f..a31304ac9ae 100644
--- a/plugins/org.eclipse.osee.support.config/ClientServerTargetPlatform.target
+++ b/plugins/org.eclipse.osee.support.config/ClientServerTargetPlatform.target
@@ -24,7 +24,7 @@
<plugin id="com.google.gerrit.common"/>
<plugin id="com.google.gerrit.prettify"/>
<plugin id="com.google.gerrit.reviewdb"/>
-<plugin id="com.google.guava"/>
+<plugin id="com.google.guava" version="21.0.0.v20170206-1425"/>
<plugin id="com.google.gwt.servlet"/>
<plugin id="com.google.gwtjsonrpc"/>
<plugin id="com.google.gwtorm"/>
@@ -45,19 +45,18 @@
<plugin id="javaewah"/>
<plugin id="javax.activation"/>
<plugin id="javax.activation.source"/>
-<plugin id="javax.annotation" version="1.2.0.v201709271724-DEV"/>
-<plugin id="javax.annotation.source" version="1.2.0.v201709271724-DEV"/>
+<plugin id="javax.annotation"/>
+<plugin id="javax.annotation.source"/>
<plugin id="javax.el"/>
<plugin id="javax.el.source"/>
<plugin id="javax.inject"/>
<plugin id="javax.inject.source"/>
<plugin id="javax.mail.glassfish"/>
<plugin id="javax.mail.glassfish.source"/>
-<plugin id="javax.servlet"/>
+<plugin id="javax.servlet" version="3.1.0.v201410161800"/>
<plugin id="javax.servlet.jsp"/>
<plugin id="javax.servlet.jsp.source"/>
<plugin id="javax.servlet.source"/>
-<plugin id="javax.ws.rs"/>
<plugin id="javax.wsdl"/>
<plugin id="javax.xml"/>
<plugin id="jms.activemq.launch"/>
@@ -82,8 +81,8 @@
<plugin id="org.apache.batik.css.source"/>
<plugin id="org.apache.batik.util.source"/>
<plugin id="org.apache.commons.cli"/>
-<plugin id="org.apache.commons.codec" version="1.9.0.v201709181954-DEV"/>
-<plugin id="org.apache.commons.codec.source" version="1.9.0.v201709181954-DEV"/>
+<plugin id="org.apache.commons.codec"/>
+<plugin id="org.apache.commons.codec.source"/>
<plugin id="org.apache.commons.compress"/>
<plugin id="org.apache.commons.dbcp"/>
<plugin id="org.apache.commons.dbcp.source"/>
@@ -103,21 +102,6 @@
<plugin id="org.apache.commons.net.source"/>
<plugin id="org.apache.commons.pool"/>
<plugin id="org.apache.commons.pool.source"/>
-<plugin id="org.apache.cxf.core"/>
-<plugin id="org.apache.cxf.core.config"/>
-<plugin id="org.apache.cxf.core.source"/>
-<plugin id="org.apache.cxf.jaxrs.client"/>
-<plugin id="org.apache.cxf.jaxrs.client.source"/>
-<plugin id="org.apache.cxf.jaxrs.frontend"/>
-<plugin id="org.apache.cxf.jaxrs.frontend.source"/>
-<plugin id="org.apache.cxf.jaxrs.model.wadl"/>
-<plugin id="org.apache.cxf.jaxrs.model.wadl.source"/>
-<plugin id="org.apache.cxf.jaxrs.provider"/>
-<plugin id="org.apache.cxf.jaxrs.provider.source"/>
-<plugin id="org.apache.cxf.rs.security.oauth2"/>
-<plugin id="org.apache.cxf.rs.security.oauth2.source"/>
-<plugin id="org.apache.cxf.transport.http"/>
-<plugin id="org.apache.cxf.transport.http.source"/>
<plugin id="org.apache.felix.gogo.command"/>
<plugin id="org.apache.felix.gogo.command.source"/>
<plugin id="org.apache.felix.gogo.runtime"/>
@@ -132,8 +116,6 @@
<plugin id="org.apache.oro"/>
<plugin id="org.apache.oro.source"/>
<plugin id="org.apache.solr.client.solrj"/>
-<plugin id="org.apache.ws.commons.schema"/>
-<plugin id="org.apache.ws.commons.schema.source"/>
<plugin id="org.apache.ws.commons.util"/>
<plugin id="org.apache.xerces"/>
<plugin id="org.apache.xml.resolver"/>
@@ -744,7 +726,7 @@
<plugin id="org.postgresql.driver"/>
<plugin id="org.sat4j.core"/>
<plugin id="org.sat4j.pb"/>
-<plugin id="org.slf4j.api" version="1.7.30.v20200204-2150"/>
+<plugin id="org.slf4j.api" version="1.7.10.v20170428-1633"/>
<plugin id="org.slf4j.api.source"/>
<plugin id="org.slf4j.jcl"/>
<plugin id="org.slf4j.jcl.source"/>
@@ -761,8 +743,8 @@
<plugin id="rest.assured"/>
<plugin id="rest.assured.source"/>
<plugin id="org.eclipse.jdt.annotation.source" version="2.2.0.v20180417-0931"/>
-<plugin id="org.objectweb.asm"/>
-<plugin id="org.objectweb.asm.tree"/>
+<plugin id="org.objectweb.asm" version="6.1.1.v20180414-0329"/>
+<plugin id="org.objectweb.asm.tree" version="6.1.1.v20180414-0329"/>
<plugin id="org.objectweb.asm.tree.source"/>
<plugin id="org.apache.felix.scr"/>
<plugin id="org.apache.felix.scr.source"/>
@@ -784,8 +766,6 @@
<plugin id="org.eclipse.xtext.ui.testing"/>
<plugin id="org.eclipse.xtext.ui.codetemplates.ide"/>
<plugin id="com.google.gson"/>
-<plugin id="com.google.guava"/>
-<plugin id="javax.servlet"/>
<plugin id="org.eclipse.xtext.common.types"/>
<plugin id="org.eclipse.mylyn.tasks.core"/>
<plugin id="org.eclipse.mylyn.tasks.ui"/>
@@ -826,12 +806,11 @@
<plugin id="lpg.runtime.java"/>
<plugin id="org.eclipse.ocl.common"/>
<plugin id="org.eclipse.jdt.annotation" version="2.2.0.v20180417-0931"/>
-<plugin id="org.apache.lucene.core"/>
+<plugin id="org.apache.lucene.core" version="7.1.0.v20171214-1510"/>
<plugin id="org.eclipse.help.base"/>
<plugin id="org.eclipse.help.base.source"/>
-<plugin id="org.apache.lucene.analyzers-common"/>
+<plugin id="org.apache.lucene.analyzers-common" version="7.1.0.v20180122-2126"/>
<plugin id="org.apache.lucene.analyzers-smartcn"/>
-<plugin id="org.apache.lucene.core"/>
<plugin id="org.eclipse.e4.ui.workbench"/>
<plugin id="org.eclipse.e4.ui.workbench3"/>
<plugin id="org.eclipse.e4.ui.workbench.renderers.swt"/>
@@ -849,7 +828,7 @@
<plugin id="org.eclipse.ui.genericeditor"/>
<plugin id="javax.xml.stream"/>
<plugin id="org.eclipse.jgit.lfs"/>
- <plugin id="org.slf4j.api" version="1.7.10.v20170428-1633"/>
+ <plugin id="org.slf4j.api" version="1.7.30.v20200204-2150"/>
<plugin id="org.eclipse.equinox.http.jetty"/>
<plugin id="org.eclipse.jetty.http" version="9.4.35.v20201120"/>
<plugin id="org.eclipse.jetty.util.ajax"/>
diff --git a/plugins/org.eclipse.osee.support.config/launchConfig/OSEE_Application_Server_[HSQLDB].launch b/plugins/org.eclipse.osee.support.config/launchConfig/OSEE_Application_Server_[HSQLDB].launch
index 204ba68f403..dfe82546a79 100644
--- a/plugins/org.eclipse.osee.support.config/launchConfig/OSEE_Application_Server_[HSQLDB].launch
+++ b/plugins/org.eclipse.osee.support.config/launchConfig/OSEE_Application_Server_[HSQLDB].launch
@@ -2,7 +2,6 @@
<launchConfiguration type="org.eclipse.pde.ui.EquinoxLauncher">
<setAttribute key="additional_plugins">
<setEntry value="org.apache.commons.logging:1.1.1.v201101211721:default:true"/>
-<setEntry value="org.eclipse.osee.icteam.web.rest.layer:0.26.0.qualifier:default:true"/>
</setAttribute>
<booleanAttribute key="append.args" value="true"/>
<booleanAttribute key="automaticAdd" value="false"/>

Back to the top