Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjmisinco2017-03-29 19:28:19 -0400
committerjmisinco2017-03-30 15:26:48 -0400
commit4fb9ea85f786d747ba8344a84e5437f2b64872a5 (patch)
tree7d2b38147bf054db6db0381657fc4a27f120406f
parentc906ef3d9388debd9fbe811b49596510ac6b2896 (diff)
downloadorg.eclipse.osee-4fb9ea85f786d747ba8344a84e5437f2b64872a5.tar.gz
org.eclipse.osee-4fb9ea85f786d747ba8344a84e5437f2b64872a5.tar.xz
org.eclipse.osee-4fb9ea85f786d747ba8344a84e5437f2b64872a5.zip
feature[ats_ATS364527]: Add to simulated flag to host env propertiesOTE_04_04_2017
-rw-r--r--plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/HostServerProperties.java3
-rw-r--r--plugins/org.eclipse.osee.ote.server/src/org/eclipse/osee/ote/server/internal/EnvironmentCreationParameter.java5
-rw-r--r--plugins/org.eclipse.osee.ote.server/src/org/eclipse/osee/ote/server/internal/OteService.java1
3 files changed, 8 insertions, 1 deletions
diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/HostServerProperties.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/HostServerProperties.java
index 5de4765f9b..61a4dc4756 100644
--- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/HostServerProperties.java
+++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/HostServerProperties.java
@@ -15,5 +15,6 @@ public enum HostServerProperties {
activeMq,
appServerURI,
oteUdpEndpoint,
- serverLaunchWorkingDir
+ serverLaunchWorkingDir,
+ isSim
}
diff --git a/plugins/org.eclipse.osee.ote.server/src/org/eclipse/osee/ote/server/internal/EnvironmentCreationParameter.java b/plugins/org.eclipse.osee.ote.server/src/org/eclipse/osee/ote/server/internal/EnvironmentCreationParameter.java
index b4a7fca660..6a911cadc2 100644
--- a/plugins/org.eclipse.osee.ote.server/src/org/eclipse/osee/ote/server/internal/EnvironmentCreationParameter.java
+++ b/plugins/org.eclipse.osee.ote.server/src/org/eclipse/osee/ote/server/internal/EnvironmentCreationParameter.java
@@ -59,6 +59,11 @@ class EnvironmentCreationParameter {
public String getOutfileLocation() {
return config.getOutfileLocation();
}
+
+ public boolean isSimulated() {
+ String toCheck = factory == null ? environmentFactoryClass : factory.getClass().getName();
+ return toCheck.contains("Sun");
+ }
public MessageSystemTestEnvironment createEnvironment() throws Throwable {
if (factory == null) {
diff --git a/plugins/org.eclipse.osee.ote.server/src/org/eclipse/osee/ote/server/internal/OteService.java b/plugins/org.eclipse.osee.ote.server/src/org/eclipse/osee/ote/server/internal/OteService.java
index a690e03441..a5c3ce38a9 100644
--- a/plugins/org.eclipse.osee.ote.server/src/org/eclipse/osee/ote/server/internal/OteService.java
+++ b/plugins/org.eclipse.osee.ote.server/src/org/eclipse/osee/ote/server/internal/OteService.java
@@ -76,6 +76,7 @@ public class OteService implements IHostTestEnvironment {
enhancedProperties.setProperty(HostServerProperties.group.name(), "OSEE Test Environment");
enhancedProperties.setProperty(HostServerProperties.owner.name(), OtePropertiesCore.userName.getValue());
enhancedProperties.setProperty(HostServerProperties.id.name(), serviceID.toString());
+ enhancedProperties.setProperty(HostServerProperties.isSim.name(), Boolean.toString(environmentCreation.isSimulated()));
// enhancedProperties.setProperty(HostServerProperties.activeMq.name(), environmentCreation.getBroker().getUri().toString());
try {
String format = String.format("tcp://%s:%d", receiver.getLocalEndpoint().getAddress().getHostAddress(), receiver.getLocalEndpoint().getPort());

Back to the top