Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoberto E. Escobar2014-06-11 22:11:13 -0400
committerRoberto E. Escobar2014-08-28 19:58:39 -0400
commitd4a7765ec05b4f124de987004505b5510b50d36a (patch)
treec9f7e8dca41e9021a4fe9bdcb9659564550493a9 /plugins/org.eclipse.osee.x.server.integration.tests
parent87185d728b0628e8562b5046ec092eb44ff5ba8c (diff)
downloadorg.eclipse.osee-d4a7765ec05b4f124de987004505b5510b50d36a.tar.gz
org.eclipse.osee-d4a7765ec05b4f124de987004505b5510b50d36a.tar.xz
org.eclipse.osee-d4a7765ec05b4f124de987004505b5510b50d36a.zip
feature[ats_ATS55930]: Upgrade JAX-RS to 2.0 API using Apache CXF
Change JAX-RS endpoints to comply with 2.0 API Change JAX-RS clients to use JAX-RS 2.0 Client API instead of using Jersey's client implementation. Remove all Jersey dependencies. Integrate Apache CXF with OSEE JAX-RS Change-Id: I866dff8516b91dbcde07b07819cf0bbc89b5d293
Diffstat (limited to 'plugins/org.eclipse.osee.x.server.integration.tests')
-rw-r--r--plugins/org.eclipse.osee.x.server.integration.tests/META-INF/MANIFEST.MF16
-rw-r--r--plugins/org.eclipse.osee.x.server.integration.tests/pom.xml18
-rw-r--r--plugins/org.eclipse.osee.x.server.integration.tests/src/org/eclipse/osee/x/server/integration/tests/performance/IntegrationUtil.java3
3 files changed, 18 insertions, 19 deletions
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 fb3adbcb06..a259dcf540 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
@@ -5,16 +5,22 @@ Bundle-SymbolicName: org.eclipse.osee.x.server.integration.tests
Bundle-Version: 0.18.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-Vendor: Eclipse Open System Engineering Environment
-Require-Bundle: org.junit,
- org.eclipse.osee.orcs.rest.model,
- org.eclipse.osee.orcs.rest.client,
- org.databene.contiperf
Import-Package: org.apache.commons.lang.math,
+ org.databene.contiperf,
+ org.databene.contiperf.junit,
+ org.databene.contiperf.report,
org.eclipse.osee.account.rest.client,
org.eclipse.osee.account.rest.model,
org.eclipse.osee.framework.core.data,
org.eclipse.osee.framework.core.enums,
org.eclipse.osee.framework.core.exception,
org.eclipse.osee.framework.jdk.core.type,
+ org.eclipse.osee.jaxrs,
org.eclipse.osee.jaxrs.client,
- org.eclipse.osee.jaxrs
+ org.eclipse.osee.orcs.rest.client,
+ org.eclipse.osee.orcs.rest.model.search.artifact,
+ org.hamcrest.core,
+ org.junit,
+ org.junit.rules,
+ org.junit.runner,
+ org.junit.runners
diff --git a/plugins/org.eclipse.osee.x.server.integration.tests/pom.xml b/plugins/org.eclipse.osee.x.server.integration.tests/pom.xml
index 02eb9719da..497d50e717 100644
--- a/plugins/org.eclipse.osee.x.server.integration.tests/pom.xml
+++ b/plugins/org.eclipse.osee.x.server.integration.tests/pom.xml
@@ -53,8 +53,7 @@
<version>${tycho-version}</version>
<configuration>
<debugPort>${int-test-debug-port}</debugPort>
- <!-- <systemProperties combine.children="append"> <equinox.ds.debug>true</equinox.ds.debug>
- </systemProperties> -->
+ <!-- <systemProperties combine.children="append"> <equinox.ds.debug>true</equinox.ds.debug> </systemProperties> -->
</configuration>
</plugin>
</plugins>
@@ -115,18 +114,15 @@
</classpath>
</taskdef>
- <property name="xserver-project"
- value="${project.basedir}/../org.eclipse.osee.x.server.p2" />
+ <property name="xserver-project" value="${project.basedir}/../org.eclipse.osee.x.server.p2" />
<property name="xserver-home" value="${xserver-project}/target/server" />
<property name="xserver-port" value="${osee-server-port}" />
<property name="xserver-telnet-port" value="${osee-server-telnet-port}" />
<property name="xserver-authentication" value="demo" />
- <property name="xserver-data"
- value="${project.build.directory}/server-data" />
+ <property name="xserver-data" value="${project.build.directory}/server-data" />
<property name="xserver-log-config" value="${project.basedir}/logback-test.xml" />
- <property name="xserver-db-home"
- value="file:${xserver-project}/target/server/demo/hsql/osee.hsql.db" />
+ <property name="xserver-db-home" value="file:${xserver-project}/target/server/demo/hsql/osee.hsql.db" />
<property name="xserver-db-name" value="osee-test-db" />
<property name="xserver-db-username" value="public" />
<property name="xserver-db-password" value="" />
@@ -139,8 +135,7 @@
<property name="xserver-log-output" value="${xserver-data}/server-output.log" />
<mkdir dir="${xserver-data}" />
- <ant antfile="${osee-application-server-launch-ant}" target="run"
- inheritRefs="true" output="${xserver-log-output}" />
+ <ant antfile="${osee-application-server-launch-ant}" target="run" inheritRefs="true" output="${xserver-log-output}" />
</target>
</configuration>
<goals>
@@ -162,8 +157,7 @@
<property name="xserver-port" value="${osee-server-port}" />
<property name="xserver-telnet-port" value="${osee-server-telnet-port}" />
- <ant antfile="${osee-application-server-launch-ant}" target="stopServer"
- inheritRefs="true" />
+ <ant antfile="${osee-application-server-launch-ant}" target="stopServer" inheritRefs="true" />
</target>
</configuration>
<goals>
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 13ee1d854e..68758e1a3d 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
@@ -18,7 +18,6 @@ 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.JaxRsClientConstants;
import org.eclipse.osee.orcs.rest.client.OseeClient;
import org.eclipse.osee.orcs.rest.client.OseeClientStandaloneSetup;
import org.junit.rules.MethodRule;
@@ -44,7 +43,7 @@ public final class IntegrationUtil {
private static Map<String, Object> createClientConfig() {
Map<String, Object> config = new HashMap<String, Object>();
String serverAddress = System.getProperty(OSEE_APPLICATION_SERVER, DEFAULT_OSEE_APPLICATION_SERVER);
- config.put(JaxRsClientConstants.JAXRS_CLIENT_SERVER_ADDRESS, serverAddress);
+ config.put(OSEE_APPLICATION_SERVER, serverAddress);
return config;
}

Back to the top