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

2 files changed, 12 insertions, 13 deletions

diff --git a/plugins/org.eclipse.osee.ote.master.rest/OSGI-INF/ote.master.rest.application.xml b/plugins/org.eclipse.osee.ote.master.rest/OSGI-INF/ote.master.rest.application.xml
index f9649cdd48f..e1b24be4a49 100644
--- a/plugins/org.eclipse.osee.ote.master.rest/OSGI-INF/ote.master.rest.application.xml
+++ b/plugins/org.eclipse.osee.ote.master.rest/OSGI-INF/ote.master.rest.application.xml
@@ -4,6 +4,5 @@
    <service>
       <provide interface="javax.ws.rs.core.Application"/>
    </service>
-   <property name="context.name" type="String" value="otemaster"/>
    <reference bind="bindOTELookup" cardinality="1..1" interface="org.eclipse.osee.ote.master.OTELookup" name="OTELookup" policy="static" unbind="unbindOTELookup"/>
 </scr:component>
diff --git a/plugins/org.eclipse.osee.ote.master.rest/src/org/eclipse/osee/ote/master/rest/internal/OTERestApplication.java b/plugins/org.eclipse.osee.ote.master.rest/src/org/eclipse/osee/ote/master/rest/internal/OTERestApplication.java
index 4381c2c1b6a..b735a1c6d39 100644
--- a/plugins/org.eclipse.osee.ote.master.rest/src/org/eclipse/osee/ote/master/rest/internal/OTERestApplication.java
+++ b/plugins/org.eclipse.osee.ote.master.rest/src/org/eclipse/osee/ote/master/rest/internal/OTERestApplication.java
@@ -2,15 +2,15 @@ package org.eclipse.osee.ote.master.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.ote.master.OTELookup;
 
+@ApplicationPath("otemaster")
 public class OTERestApplication extends Application {
 
    private static OTELookup oteLookup;
-   
+
    @Override
    public Set<Class<?>> getClasses() {
       Set<Class<?>> classes = new HashSet<Class<?>>();
@@ -18,21 +18,21 @@ public class OTERestApplication extends Application {
       return classes;
    }
 
-   public void start(){
+   public void start() {
    }
-   
-   public void stop(){
+
+   public void stop() {
    }
-   
-   public void bindOTELookup(OTELookup oteLookupSrv){
+
+   public void bindOTELookup(OTELookup oteLookupSrv) {
       OTERestApplication.oteLookup = oteLookupSrv;
    }
-   
-   public void unbindOTELookup(OTELookup oteLookupSrv){
+
+   public void unbindOTELookup(OTELookup oteLookupSrv) {
       OTERestApplication.oteLookup = null;
    }
-   
-   static OTELookup getOTELookup(){
+
+   static OTELookup getOTELookup() {
       return oteLookup;
    }