Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordonald.g.dunne2014-06-27 16:02:56 +0000
committerRoberto E. Escobar2014-08-28 23:59:08 +0000
commita4ea7a176abc7ab51dd90d5ff66f445ed02109b0 (patch)
tree30b6a1a6161cd3ba3f85b4a9e5bac389e8b3c4d9 /plugins/org.eclipse.osee.ats.rest
parent87d0ec2792c0ae6899541095bc4ffa6e069480f0 (diff)
downloadorg.eclipse.osee-a4ea7a176abc7ab51dd90d5ff66f445ed02109b0.tar.gz
org.eclipse.osee-a4ea7a176abc7ab51dd90d5ff66f445ed02109b0.tar.xz
org.eclipse.osee-a4ea7a176abc7ab51dd90d5ff66f445ed02109b0.zip
feature[ats_ATS64164]: CPA: Supporting changes for CPA Importing
Diffstat (limited to 'plugins/org.eclipse.osee.ats.rest')
-rw-r--r--plugins/org.eclipse.osee.ats.rest/META-INF/MANIFEST.MF1
-rw-r--r--plugins/org.eclipse.osee.ats.rest/OSGI-INF/ats.rest.application.xml1
-rw-r--r--plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/AtsApplication.java9
3 files changed, 10 insertions, 1 deletions
diff --git a/plugins/org.eclipse.osee.ats.rest/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ats.rest/META-INF/MANIFEST.MF
index 01699ee329a..56decf83636 100644
--- a/plugins/org.eclipse.osee.ats.rest/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.ats.rest/META-INF/MANIFEST.MF
@@ -46,6 +46,7 @@ Import-Package: com.google.gson;version="2.1.0",
org.eclipse.osee.framework.core.exception,
org.eclipse.osee.framework.core.model,
org.eclipse.osee.framework.core.model.cache,
+ org.eclipse.osee.framework.core.server,
org.eclipse.osee.framework.core.util,
org.eclipse.osee.framework.jdk.core.type,
org.eclipse.osee.framework.jdk.core.util,
diff --git a/plugins/org.eclipse.osee.ats.rest/OSGI-INF/ats.rest.application.xml b/plugins/org.eclipse.osee.ats.rest/OSGI-INF/ats.rest.application.xml
index 07636b30f81..724a1554bb9 100644
--- a/plugins/org.eclipse.osee.ats.rest/OSGI-INF/ats.rest.application.xml
+++ b/plugins/org.eclipse.osee.ats.rest/OSGI-INF/ats.rest.application.xml
@@ -7,4 +7,5 @@
<reference bind="setOrcsApi" cardinality="1..1" interface="org.eclipse.osee.orcs.OrcsApi" name="OrcsApi" policy="static"/>
<reference bind="setLogger" cardinality="1..1" interface="org.eclipse.osee.logger.Log" name="Log" policy="static"/>
<reference bind="setAtsServer" cardinality="1..1" interface="org.eclipse.osee.ats.impl.IAtsServer" name="IAtsServer" policy="static"/>
+ <reference bind="setAppServerMgr" cardinality="1..1" interface="org.eclipse.osee.framework.core.server.IApplicationServerManager" name="IApplicationServerManager" policy="static"/>
</scr:component>
diff --git a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/AtsApplication.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/AtsApplication.java
index 305a43c3243..1b4c968f595 100644
--- a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/AtsApplication.java
+++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/AtsApplication.java
@@ -24,6 +24,7 @@ import org.eclipse.osee.ats.rest.internal.resources.ConvertResource;
import org.eclipse.osee.ats.rest.internal.resources.TeamResource;
import org.eclipse.osee.ats.rest.internal.resources.VersionResource;
import org.eclipse.osee.ats.rest.internal.util.JaxRsExceptionMapper;
+import org.eclipse.osee.framework.core.server.IApplicationServerManager;
import org.eclipse.osee.framework.jdk.core.type.IResourceRegistry;
import org.eclipse.osee.framework.jdk.core.type.ResourceRegistry;
import org.eclipse.osee.logger.Log;
@@ -41,6 +42,7 @@ public class AtsApplication extends Application {
private IAtsServer atsServer;
private OrcsApi orcsApi;
private Log logger;
+ private IApplicationServerManager appServerMgr;
public void setOrcsApi(OrcsApi orcsApi) {
this.orcsApi = orcsApi;
@@ -54,6 +56,10 @@ public class AtsApplication extends Application {
this.atsServer = atsServer;
}
+ public void setAppServerMgr(IApplicationServerManager appServerMgr) {
+ this.appServerMgr = appServerMgr;
+ }
+
public void start() {
IResourceRegistry registry = new ResourceRegistry();
AtsResourceTokens.register(registry);
@@ -71,7 +77,7 @@ public class AtsApplication extends Application {
singletons.add(new ConfigResource(atsServer, orcsApi, logger, registry));
singletons.add(new AtsUiResource(registry, orcsApi));
- System.out.println("ATS - Application started");
+ System.out.println("ATS - Application started - " + appServerMgr.getServerUri());
}
public void stop() {
@@ -82,4 +88,5 @@ public class AtsApplication extends Application {
public Set<Object> getSingletons() {
return singletons;
}
+
}

Back to the top