Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoberto E. Escobar2014-05-29 21:35:01 +0000
committerRoberto Escobar2014-06-02 17:25:58 +0000
commit6ee7512b783106e243a740cde0fab375a6bf5c07 (patch)
treee7204f1bd10ee050f2d095a67baea48c3f0835c8 /plugins/org.eclipse.osee.cluster.rest
parenta79269df55f813ef0828f7d41133410b8883639a (diff)
downloadorg.eclipse.osee-6ee7512b783106e243a740cde0fab375a6bf5c07.tar.gz
org.eclipse.osee-6ee7512b783106e243a740cde0fab375a6bf5c07.tar.xz
org.eclipse.osee-6ee7512b783106e243a740cde0fab375a6bf5c07.zip
feature[ats_ATS58828]: Use ApplicationPath JAX-RS annotation instead of context.name
Use JAX-RS ApplicationPath annotation instead of OSGI context.name property to specify the servlet path where the JAX-RS application should be registered to. Change-Id: Ibd6650451b167d636a4aac2119dec7a19882a3e4
Diffstat (limited to 'plugins/org.eclipse.osee.cluster.rest')
-rw-r--r--plugins/org.eclipse.osee.cluster.rest/OSGI-INF/cluster.rest.application.xml1
-rw-r--r--plugins/org.eclipse.osee.cluster.rest/src/org/eclipse/osee/cluster/rest/internal/ClusterRestApplication.java2
2 files changed, 2 insertions, 1 deletions
diff --git a/plugins/org.eclipse.osee.cluster.rest/OSGI-INF/cluster.rest.application.xml b/plugins/org.eclipse.osee.cluster.rest/OSGI-INF/cluster.rest.application.xml
index 589c2bdd3e0..4b445c86bfb 100644
--- a/plugins/org.eclipse.osee.cluster.rest/OSGI-INF/cluster.rest.application.xml
+++ b/plugins/org.eclipse.osee.cluster.rest/OSGI-INF/cluster.rest.application.xml
@@ -4,6 +4,5 @@
<service>
<provide interface="javax.ws.rs.core.Application"/>
</service>
- <property name="context.name" type="String" value="cluster"/>
<reference bind="setClusterService" cardinality="1..1" interface="org.eclipse.osee.cluster.ClusterService" name="ClusterService" policy="static"/>
</scr:component> \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.cluster.rest/src/org/eclipse/osee/cluster/rest/internal/ClusterRestApplication.java b/plugins/org.eclipse.osee.cluster.rest/src/org/eclipse/osee/cluster/rest/internal/ClusterRestApplication.java
index 5c3f2baf042..353b4018ad9 100644
--- a/plugins/org.eclipse.osee.cluster.rest/src/org/eclipse/osee/cluster/rest/internal/ClusterRestApplication.java
+++ b/plugins/org.eclipse.osee.cluster.rest/src/org/eclipse/osee/cluster/rest/internal/ClusterRestApplication.java
@@ -12,6 +12,7 @@ package org.eclipse.osee.cluster.rest.internal;
import java.util.HashSet;
import java.util.Set;
+import javax.ws.rs.ApplicationPath;
import javax.ws.rs.core.Application;
import org.eclipse.osee.cluster.ClusterService;
import org.eclipse.osee.cluster.Member;
@@ -21,6 +22,7 @@ import org.eclipse.osee.cluster.Member;
*
* @author Roberto E. Escobar
*/
+@ApplicationPath("cluster")
public class ClusterRestApplication extends Application {
private static ClusterService clusterService;

Back to the top