diff options
31 files changed, 55 insertions, 55 deletions
diff --git a/features/org.eclipse.osee.core.feature/feature.xml b/features/org.eclipse.osee.core.feature/feature.xml index bb2b76edf79..8784be9d48b 100644 --- a/features/org.eclipse.osee.core.feature/feature.xml +++ b/features/org.eclipse.osee.core.feature/feature.xml @@ -77,7 +77,7 @@ unpack="false"/> <plugin - id="org.eclipse.osee.rest.client" + id="org.eclipse.osee.jaxrs.client" download-size="0" install-size="0" version="0.0.0" diff --git a/features/org.eclipse.osee.framework.feature/feature.xml b/features/org.eclipse.osee.framework.feature/feature.xml index 39ccf28de59..2d889c1f65c 100644 --- a/features/org.eclipse.osee.framework.feature/feature.xml +++ b/features/org.eclipse.osee.framework.feature/feature.xml @@ -138,7 +138,7 @@ unpack="false"/> <plugin - id="org.eclipse.osee.rest.client" + id="org.eclipse.osee.jaxrs.client" 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 a940a049c40..bb6fe5cfded 100644 --- a/features/org.eclipse.osee.x.core.feature/feature.xml +++ b/features/org.eclipse.osee.x.core.feature/feature.xml @@ -166,6 +166,13 @@ unpack="false"/> <plugin + id="org.eclipse.osee.jaxrs.client" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin id="org.eclipse.osee.account.admin" download-size="0" install-size="0" @@ -228,11 +235,4 @@ version="0.0.0" unpack="false"/> - <plugin - id="org.eclipse.osee.rest.client" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - </feature> diff --git a/plugins/org.eclipse.osee.account.rest.client/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.account.rest.client/META-INF/MANIFEST.MF index d42ce2f3fd1..3e294638efb 100644 --- a/plugins/org.eclipse.osee.account.rest.client/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.account.rest.client/META-INF/MANIFEST.MF @@ -17,7 +17,7 @@ Import-Package: com.google.inject, javax.ws.rs.core, org.eclipse.osee.account.rest.model, org.eclipse.osee.framework.jdk.core.type, - org.eclipse.osee.rest.client, + org.eclipse.osee.jaxrs.client, org.eclipse.osee.jaxrs Export-Package: org.eclipse.osee.account.rest.client Bundle-Vendor: Eclipse Open System Engineering Environment diff --git a/plugins/org.eclipse.osee.account.rest.client/OSGI-INF/account.rest.client.xml b/plugins/org.eclipse.osee.account.rest.client/OSGI-INF/account.rest.client.xml index b26ef7b5096..f244843eb57 100644 --- a/plugins/org.eclipse.osee.account.rest.client/OSGI-INF/account.rest.client.xml +++ b/plugins/org.eclipse.osee.account.rest.client/OSGI-INF/account.rest.client.xml @@ -4,5 +4,5 @@ <service> <provide interface="org.eclipse.osee.account.rest.client.AccountClient"/> </service> - <reference bind="setWebClientProvider" cardinality="1..1" interface="org.eclipse.osee.rest.client.WebClientProvider" name="WebClientProvider" policy="static"/> + <reference bind="setWebClientProvider" cardinality="1..1" interface="org.eclipse.osee.jaxrs.client.WebClientProvider" name="WebClientProvider" policy="static"/> </scr:component> diff --git a/plugins/org.eclipse.osee.account.rest.client/src/org/eclipse/osee/account/rest/client/AccountClientStandaloneSetup.java b/plugins/org.eclipse.osee.account.rest.client/src/org/eclipse/osee/account/rest/client/AccountClientStandaloneSetup.java index 5ffc678a102..908675bc9f6 100644 --- a/plugins/org.eclipse.osee.account.rest.client/src/org/eclipse/osee/account/rest/client/AccountClientStandaloneSetup.java +++ b/plugins/org.eclipse.osee.account.rest.client/src/org/eclipse/osee/account/rest/client/AccountClientStandaloneSetup.java @@ -12,8 +12,8 @@ package org.eclipse.osee.account.rest.client; import org.eclipse.osee.account.rest.client.internal.AccountClientImpl; import org.eclipse.osee.account.rest.client.internal.AccountClientModule; -import org.eclipse.osee.rest.client.OseeClientConfig; -import org.eclipse.osee.rest.client.OseeRestClientStandaloneSetup; +import org.eclipse.osee.jaxrs.client.OseeClientConfig; +import org.eclipse.osee.jaxrs.client.OseeRestClientStandaloneSetup; import com.google.inject.Module; /** diff --git a/plugins/org.eclipse.osee.account.rest.client/src/org/eclipse/osee/account/rest/client/internal/AccountClientImpl.java b/plugins/org.eclipse.osee.account.rest.client/src/org/eclipse/osee/account/rest/client/internal/AccountClientImpl.java index 8f7ed44075f..45e7e90ba7f 100644 --- a/plugins/org.eclipse.osee.account.rest.client/src/org/eclipse/osee/account/rest/client/internal/AccountClientImpl.java +++ b/plugins/org.eclipse.osee.account.rest.client/src/org/eclipse/osee/account/rest/client/internal/AccountClientImpl.java @@ -28,8 +28,8 @@ import org.eclipse.osee.account.rest.model.AccountSessionData; import org.eclipse.osee.account.rest.model.AccountSessionDetailsData; import org.eclipse.osee.framework.jdk.core.type.ResultSet; import org.eclipse.osee.framework.jdk.core.type.ResultSets; -import org.eclipse.osee.rest.client.OseeClientProperties; -import org.eclipse.osee.rest.client.WebClientProvider; +import org.eclipse.osee.jaxrs.client.OseeClientProperties; +import org.eclipse.osee.jaxrs.client.WebClientProvider; import com.google.inject.Inject; import com.sun.jersey.api.client.ClientResponse; import com.sun.jersey.api.client.UniformInterfaceException; diff --git a/plugins/org.eclipse.osee.rest.client/.classpath b/plugins/org.eclipse.osee.jaxrs.client/.classpath index ad32c83a788..ad32c83a788 100644 --- a/plugins/org.eclipse.osee.rest.client/.classpath +++ b/plugins/org.eclipse.osee.jaxrs.client/.classpath diff --git a/plugins/org.eclipse.osee.rest.client/.project b/plugins/org.eclipse.osee.jaxrs.client/.project index 3f4eebace5a..a7b3e93440e 100644 --- a/plugins/org.eclipse.osee.rest.client/.project +++ b/plugins/org.eclipse.osee.jaxrs.client/.project @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>org.eclipse.osee.rest.client</name> + <name>org.eclipse.osee.jaxrs.client</name> <comment></comment> <projects> </projects> diff --git a/plugins/org.eclipse.osee.rest.client/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.jaxrs.client/META-INF/MANIFEST.MF index f35f1441d3d..c65d5f371c0 100644 --- a/plugins/org.eclipse.osee.rest.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 REST Client (Incubation) -Bundle-SymbolicName: org.eclipse.osee.rest.client +Bundle-Name: OSEE JAX-RS Client (Incubation) +Bundle-SymbolicName: org.eclipse.osee.jaxrs.client Bundle-Version: 0.17.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-Vendor: Eclipse Open System Engineering Environment @@ -20,7 +20,7 @@ Import-Package: com.google.inject, org.eclipse.osee.framework.jdk.core.type, org.eclipse.osee.framework.jdk.core.util, org.eclipse.osee.jaxrs -Export-Package: org.eclipse.osee.rest.client +Export-Package: org.eclipse.osee.jaxrs.client Require-Bundle: org.eclipse.core.runtime;visibility:=reexport, javax.servlet;visibility:=reexport, com.google.inject, diff --git a/plugins/org.eclipse.osee.jaxrs.client/OSGI-INF/web.client.provider.xml b/plugins/org.eclipse.osee.jaxrs.client/OSGI-INF/web.client.provider.xml new file mode 100644 index 00000000000..319c0f619af --- /dev/null +++ b/plugins/org.eclipse.osee.jaxrs.client/OSGI-INF/web.client.provider.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" > + <implementation class="org.eclipse.osee.jaxrs.client.internal.WebClientProviderImpl"/> + <service> + <provide interface="org.eclipse.osee.jaxrs.client.WebClientProvider"/> + </service> +</scr:component> diff --git a/plugins/org.eclipse.osee.rest.client/build.properties b/plugins/org.eclipse.osee.jaxrs.client/build.properties index 6d4f3aa975c..6d4f3aa975c 100644 --- a/plugins/org.eclipse.osee.rest.client/build.properties +++ b/plugins/org.eclipse.osee.jaxrs.client/build.properties diff --git a/plugins/org.eclipse.osee.rest.client/pom.xml b/plugins/org.eclipse.osee.jaxrs.client/pom.xml index e192f365523..75cb3eb6441 100644 --- a/plugins/org.eclipse.osee.rest.client/pom.xml +++ b/plugins/org.eclipse.osee.jaxrs.client/pom.xml @@ -10,9 +10,9 @@ <relativePath>../../plugins/org.eclipse.osee.x.core.parent</relativePath> </parent> - <artifactId>org.eclipse.osee.rest.client</artifactId> + <artifactId>org.eclipse.osee.jaxrs.client</artifactId> <packaging>eclipse-plugin</packaging> - <name>OSEE Rest Client - (Incubation)</name> + <name>OSEE JAX-RS Client - (Incubation)</name> <build> <!-- workaround for https://issues.sonatype.org/browse/TYCHO-168 --> diff --git a/plugins/org.eclipse.osee.rest.client/src/org/eclipse/osee/rest/client/OseeClientConfig.java b/plugins/org.eclipse.osee.jaxrs.client/src/org/eclipse/osee/jaxrs/client/OseeClientConfig.java index efb293c02c3..a4975f6d80d 100644 --- a/plugins/org.eclipse.osee.rest.client/src/org/eclipse/osee/rest/client/OseeClientConfig.java +++ b/plugins/org.eclipse.osee.jaxrs.client/src/org/eclipse/osee/jaxrs/client/OseeClientConfig.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.rest.client; +package org.eclipse.osee.jaxrs.client; /** * @author Roberto E. Escobar diff --git a/plugins/org.eclipse.osee.rest.client/src/org/eclipse/osee/rest/client/OseeClientProperties.java b/plugins/org.eclipse.osee.jaxrs.client/src/org/eclipse/osee/jaxrs/client/OseeClientProperties.java index 1b7c213bd71..b974319af35 100644 --- a/plugins/org.eclipse.osee.rest.client/src/org/eclipse/osee/rest/client/OseeClientProperties.java +++ b/plugins/org.eclipse.osee.jaxrs.client/src/org/eclipse/osee/jaxrs/client/OseeClientProperties.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.rest.client; +package org.eclipse.osee.jaxrs.client; /** * @author Roberto E. Escobar diff --git a/plugins/org.eclipse.osee.rest.client/src/org/eclipse/osee/rest/client/OseeHttpProxyAddress.java b/plugins/org.eclipse.osee.jaxrs.client/src/org/eclipse/osee/jaxrs/client/OseeHttpProxyAddress.java index cab41a43c15..9ee0ca6b30d 100644 --- a/plugins/org.eclipse.osee.rest.client/src/org/eclipse/osee/rest/client/OseeHttpProxyAddress.java +++ b/plugins/org.eclipse.osee.jaxrs.client/src/org/eclipse/osee/jaxrs/client/OseeHttpProxyAddress.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.rest.client; +package org.eclipse.osee.jaxrs.client; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/plugins/org.eclipse.osee.rest.client/src/org/eclipse/osee/rest/client/OseeRestClientStandaloneSetup.java b/plugins/org.eclipse.osee.jaxrs.client/src/org/eclipse/osee/jaxrs/client/OseeRestClientStandaloneSetup.java index 44630c8f0ca..5f05ded93ab 100644 --- a/plugins/org.eclipse.osee.rest.client/src/org/eclipse/osee/rest/client/OseeRestClientStandaloneSetup.java +++ b/plugins/org.eclipse.osee.jaxrs.client/src/org/eclipse/osee/jaxrs/client/OseeRestClientStandaloneSetup.java @@ -8,11 +8,11 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.rest.client; +package org.eclipse.osee.jaxrs.client; import java.util.ArrayList; import java.util.List; -import org.eclipse.osee.rest.client.internal.StandaloneModule; +import org.eclipse.osee.jaxrs.client.internal.StandaloneModule; import com.google.inject.Guice; import com.google.inject.Injector; import com.google.inject.Module; diff --git a/plugins/org.eclipse.osee.rest.client/src/org/eclipse/osee/rest/client/OseeServerAddress.java b/plugins/org.eclipse.osee.jaxrs.client/src/org/eclipse/osee/jaxrs/client/OseeServerAddress.java index e1f7512b809..3085a768a43 100644 --- a/plugins/org.eclipse.osee.rest.client/src/org/eclipse/osee/rest/client/OseeServerAddress.java +++ b/plugins/org.eclipse.osee.jaxrs.client/src/org/eclipse/osee/jaxrs/client/OseeServerAddress.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.rest.client; +package org.eclipse.osee.jaxrs.client; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/plugins/org.eclipse.osee.rest.client/src/org/eclipse/osee/rest/client/WebClientProvider.java b/plugins/org.eclipse.osee.jaxrs.client/src/org/eclipse/osee/jaxrs/client/WebClientProvider.java index 049ce6f16bf..9f2421e82b4 100644 --- a/plugins/org.eclipse.osee.rest.client/src/org/eclipse/osee/rest/client/WebClientProvider.java +++ b/plugins/org.eclipse.osee.jaxrs.client/src/org/eclipse/osee/jaxrs/client/WebClientProvider.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.rest.client; +package org.eclipse.osee.jaxrs.client; import java.net.URI; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; diff --git a/plugins/org.eclipse.osee.rest.client/src/org/eclipse/osee/rest/client/internal/StandadloneWebClientProvider.java b/plugins/org.eclipse.osee.jaxrs.client/src/org/eclipse/osee/jaxrs/client/internal/StandadloneWebClientProvider.java index ba0e8ad164d..fe5d7694196 100644 --- a/plugins/org.eclipse.osee.rest.client/src/org/eclipse/osee/rest/client/internal/StandadloneWebClientProvider.java +++ b/plugins/org.eclipse.osee.jaxrs.client/src/org/eclipse/osee/jaxrs/client/internal/StandadloneWebClientProvider.java @@ -8,12 +8,12 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.rest.client.internal; +package org.eclipse.osee.jaxrs.client.internal; import java.net.URI; import java.util.Map; import org.eclipse.osee.framework.jdk.core.util.Strings; -import org.eclipse.osee.rest.client.OseeHttpProxyAddress; +import org.eclipse.osee.jaxrs.client.OseeHttpProxyAddress; import com.google.inject.Inject; import com.sun.jersey.api.client.config.ClientConfig; import com.sun.jersey.client.apache.config.ApacheHttpClientConfig; diff --git a/plugins/org.eclipse.osee.rest.client/src/org/eclipse/osee/rest/client/internal/StandaloneModule.java b/plugins/org.eclipse.osee.jaxrs.client/src/org/eclipse/osee/jaxrs/client/internal/StandaloneModule.java index c184a5b6515..d31bc1a0af8 100644 --- a/plugins/org.eclipse.osee.rest.client/src/org/eclipse/osee/rest/client/internal/StandaloneModule.java +++ b/plugins/org.eclipse.osee.jaxrs.client/src/org/eclipse/osee/jaxrs/client/internal/StandaloneModule.java @@ -8,12 +8,12 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.rest.client.internal; +package org.eclipse.osee.jaxrs.client.internal; -import org.eclipse.osee.rest.client.OseeClientConfig; -import org.eclipse.osee.rest.client.OseeHttpProxyAddress; -import org.eclipse.osee.rest.client.OseeServerAddress; -import org.eclipse.osee.rest.client.WebClientProvider; +import org.eclipse.osee.jaxrs.client.OseeClientConfig; +import org.eclipse.osee.jaxrs.client.OseeHttpProxyAddress; +import org.eclipse.osee.jaxrs.client.OseeServerAddress; +import org.eclipse.osee.jaxrs.client.WebClientProvider; import com.google.inject.AbstractModule; /** diff --git a/plugins/org.eclipse.osee.rest.client/src/org/eclipse/osee/rest/client/internal/WebClientProviderImpl.java b/plugins/org.eclipse.osee.jaxrs.client/src/org/eclipse/osee/jaxrs/client/internal/WebClientProviderImpl.java index 2aa0f467727..3096d3f5492 100644 --- a/plugins/org.eclipse.osee.rest.client/src/org/eclipse/osee/rest/client/internal/WebClientProviderImpl.java +++ b/plugins/org.eclipse.osee.jaxrs.client/src/org/eclipse/osee/jaxrs/client/internal/WebClientProviderImpl.java @@ -8,13 +8,13 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.rest.client.internal; +package org.eclipse.osee.jaxrs.client.internal; import java.net.URI; import java.util.Map; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.jaxrs.ErrorResponse; -import org.eclipse.osee.rest.client.WebClientProvider; +import org.eclipse.osee.jaxrs.client.WebClientProvider; import com.sun.jersey.api.client.AsyncWebResource; import com.sun.jersey.api.client.Client; import com.sun.jersey.api.client.ClientResponse; diff --git a/plugins/org.eclipse.osee.orcs.rest.client/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.orcs.rest.client/META-INF/MANIFEST.MF index 669037178f2..5584c1ff89c 100644 --- a/plugins/org.eclipse.osee.orcs.rest.client/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.orcs.rest.client/META-INF/MANIFEST.MF @@ -13,7 +13,7 @@ Import-Package: com.sun.jersey.api.client, org.eclipse.osee.framework.jdk.core.type, org.eclipse.osee.orcs.rest.model, org.eclipse.osee.orcs.rest.model.search.artifact, - org.eclipse.osee.rest.client + org.eclipse.osee.jaxrs.client Export-Package: org.eclipse.osee.orcs.rest.client Bundle-ActivationPolicy: lazy Require-Bundle: com.google.inject, diff --git a/plugins/org.eclipse.osee.orcs.rest.client/OSGI-INF/osee.client.xml b/plugins/org.eclipse.osee.orcs.rest.client/OSGI-INF/osee.client.xml index 928fe203b79..fa3684b5026 100644 --- a/plugins/org.eclipse.osee.orcs.rest.client/OSGI-INF/osee.client.xml +++ b/plugins/org.eclipse.osee.orcs.rest.client/OSGI-INF/osee.client.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="start" deactivate="stop" name="org.eclipse.osee.orcs.rest.client.internal.OseeClientImpl"> +<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="start" deactivate="stop"> <implementation class="org.eclipse.osee.orcs.rest.client.internal.OseeClientImpl"/> <service> <provide interface="org.eclipse.osee.orcs.rest.client.OseeClient"/> </service> - <reference bind="setWebClientProvider" cardinality="1..1" interface="org.eclipse.osee.rest.client.WebClientProvider" name="WebClientProvider" policy="static"/> + <reference bind="setWebClientProvider" cardinality="1..1" interface="org.eclipse.osee.jaxrs.client.WebClientProvider" name="WebClientProvider" policy="static"/> </scr:component> diff --git a/plugins/org.eclipse.osee.orcs.rest.client/src/org/eclipse/osee/orcs/rest/client/OseeClientStandaloneSetup.java b/plugins/org.eclipse.osee.orcs.rest.client/src/org/eclipse/osee/orcs/rest/client/OseeClientStandaloneSetup.java index e4241de1a4a..ffb5adc86da 100644 --- a/plugins/org.eclipse.osee.orcs.rest.client/src/org/eclipse/osee/orcs/rest/client/OseeClientStandaloneSetup.java +++ b/plugins/org.eclipse.osee.orcs.rest.client/src/org/eclipse/osee/orcs/rest/client/OseeClientStandaloneSetup.java @@ -10,10 +10,10 @@ *******************************************************************************/ package org.eclipse.osee.orcs.rest.client; +import org.eclipse.osee.jaxrs.client.OseeClientConfig; +import org.eclipse.osee.jaxrs.client.OseeRestClientStandaloneSetup; import org.eclipse.osee.orcs.rest.client.internal.OrcsClientModule; import org.eclipse.osee.orcs.rest.client.internal.OseeClientImpl; -import org.eclipse.osee.rest.client.OseeClientConfig; -import org.eclipse.osee.rest.client.OseeRestClientStandaloneSetup; import com.google.inject.Module; /** diff --git a/plugins/org.eclipse.osee.orcs.rest.client/src/org/eclipse/osee/orcs/rest/client/internal/OseeClientImpl.java b/plugins/org.eclipse.osee.orcs.rest.client/src/org/eclipse/osee/orcs/rest/client/internal/OseeClientImpl.java index e8864c3ea57..c9714b5a654 100644 --- a/plugins/org.eclipse.osee.orcs.rest.client/src/org/eclipse/osee/orcs/rest/client/internal/OseeClientImpl.java +++ b/plugins/org.eclipse.osee.orcs.rest.client/src/org/eclipse/osee/orcs/rest/client/internal/OseeClientImpl.java @@ -17,6 +17,8 @@ import javax.ws.rs.core.MediaType; import javax.ws.rs.core.UriBuilder; import org.eclipse.osee.framework.core.data.IOseeBranch; import org.eclipse.osee.framework.core.data.OseeCodeVersion; +import org.eclipse.osee.jaxrs.client.OseeClientProperties; +import org.eclipse.osee.jaxrs.client.WebClientProvider; import org.eclipse.osee.orcs.rest.client.OseeClient; import org.eclipse.osee.orcs.rest.client.QueryBuilder; import org.eclipse.osee.orcs.rest.client.internal.search.PredicateFactory; @@ -26,8 +28,6 @@ import org.eclipse.osee.orcs.rest.client.internal.search.QueryExecutorV1; import org.eclipse.osee.orcs.rest.client.internal.search.QueryOptions; import org.eclipse.osee.orcs.rest.model.Client; import org.eclipse.osee.orcs.rest.model.search.artifact.Predicate; -import org.eclipse.osee.rest.client.OseeClientProperties; -import org.eclipse.osee.rest.client.WebClientProvider; import com.google.inject.Inject; import com.sun.jersey.api.client.UniformInterfaceException; import com.sun.jersey.api.client.WebResource; diff --git a/plugins/org.eclipse.osee.orcs.rest.client/src/org/eclipse/osee/orcs/rest/client/internal/search/QueryExecutorV1.java b/plugins/org.eclipse.osee.orcs.rest.client/src/org/eclipse/osee/orcs/rest/client/internal/search/QueryExecutorV1.java index ed723e2f9d5..1b4bc4ea296 100644 --- a/plugins/org.eclipse.osee.orcs.rest.client/src/org/eclipse/osee/orcs/rest/client/internal/search/QueryExecutorV1.java +++ b/plugins/org.eclipse.osee.orcs.rest.client/src/org/eclipse/osee/orcs/rest/client/internal/search/QueryExecutorV1.java @@ -16,13 +16,13 @@ import javax.ws.rs.core.MediaType; import javax.ws.rs.core.UriBuilder; import org.eclipse.osee.framework.core.data.IOseeBranch; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; +import org.eclipse.osee.jaxrs.client.WebClientProvider; import org.eclipse.osee.orcs.rest.model.search.artifact.OutputFormat; import org.eclipse.osee.orcs.rest.model.search.artifact.Predicate; import org.eclipse.osee.orcs.rest.model.search.artifact.RequestType; import org.eclipse.osee.orcs.rest.model.search.artifact.SearchRequest; import org.eclipse.osee.orcs.rest.model.search.artifact.SearchResponse; import org.eclipse.osee.orcs.rest.model.search.artifact.SearchResult; -import org.eclipse.osee.rest.client.WebClientProvider; import com.sun.jersey.api.client.UniformInterfaceException; import com.sun.jersey.api.client.WebResource; diff --git a/plugins/org.eclipse.osee.rest.client/OSGI-INF/web.client.provider.xml b/plugins/org.eclipse.osee.rest.client/OSGI-INF/web.client.provider.xml deleted file mode 100644 index e493acd498f..00000000000 --- a/plugins/org.eclipse.osee.rest.client/OSGI-INF/web.client.provider.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.osee.rest.client.internal.WebClientProviderImpl"> - <implementation class="org.eclipse.osee.rest.client.internal.WebClientProviderImpl"/> - <service> - <provide interface="org.eclipse.osee.rest.client.WebClientProvider"/> - </service> -</scr:component> diff --git a/plugins/org.eclipse.osee.x.core.parent/pom.xml b/plugins/org.eclipse.osee.x.core.parent/pom.xml index 38e47ad53d3..28f8dffb3ef 100644 --- a/plugins/org.eclipse.osee.x.core.parent/pom.xml +++ b/plugins/org.eclipse.osee.x.core.parent/pom.xml @@ -70,7 +70,7 @@ <module>../../plugins/org.eclipse.osee.jaxrs</module> <module>../../plugins/org.eclipse.osee.jaxrs.server</module> <module>../../plugins/org.eclipse.osee.jaxrs.server.test</module> - <module>../../plugins/org.eclipse.osee.rest.client</module> + <module>../../plugins/org.eclipse.osee.jaxrs.client</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.x.server.integration.tests/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.x.server.integration.tests/META-INF/MANIFEST.MF index 95c40a020e9..4304c2ec6f0 100644 --- a/plugins/org.eclipse.osee.x.server.integration.tests/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.x.server.integration.tests/META-INF/MANIFEST.MF @@ -16,5 +16,5 @@ Import-Package: org.apache.commons.lang.math, org.eclipse.osee.framework.core.enums, org.eclipse.osee.framework.core.exception, org.eclipse.osee.framework.jdk.core.type, - org.eclipse.osee.rest.client, + org.eclipse.osee.jaxrs.client, org.eclipse.osee.jaxrs diff --git a/plugins/org.eclipse.osee.x.server.integration.tests/src/org/eclipse/osee/x/server/integration/tests/performance/IntegrationUtil.java b/plugins/org.eclipse.osee.x.server.integration.tests/src/org/eclipse/osee/x/server/integration/tests/performance/IntegrationUtil.java index 1c0590b4e71..41f2b0102ce 100644 --- a/plugins/org.eclipse.osee.x.server.integration.tests/src/org/eclipse/osee/x/server/integration/tests/performance/IntegrationUtil.java +++ b/plugins/org.eclipse.osee.x.server.integration.tests/src/org/eclipse/osee/x/server/integration/tests/performance/IntegrationUtil.java @@ -16,9 +16,9 @@ import org.databene.contiperf.report.CSVSummaryReportModule; import org.databene.contiperf.report.HtmlReportModule; import org.eclipse.osee.account.rest.client.AccountClient; import org.eclipse.osee.account.rest.client.AccountClientStandaloneSetup; +import org.eclipse.osee.jaxrs.client.OseeClientConfig; import org.eclipse.osee.orcs.rest.client.OseeClient; import org.eclipse.osee.orcs.rest.client.OseeClientStandaloneSetup; -import org.eclipse.osee.rest.client.OseeClientConfig; import org.junit.rules.MethodRule; public final class IntegrationUtil { |