diff options
author | jmisinco | 2017-03-29 23:28:19 +0000 |
---|---|---|
committer | jmisinco | 2017-03-30 19:26:48 +0000 |
commit | 4fb9ea85f786d747ba8344a84e5437f2b64872a5 (patch) | |
tree | 7d2b38147bf054db6db0381657fc4a27f120406f | |
parent | c906ef3d9388debd9fbe811b49596510ac6b2896 (diff) | |
download | org.eclipse.osee-OTE_04_04_2017.tar.gz org.eclipse.osee-OTE_04_04_2017.tar.xz org.eclipse.osee-OTE_04_04_2017.zip |
feature[ats_ATS364527]: Add to simulated flag to host env propertiesOTE_04_04_2017
Change-Id: Iaecf0317ba9edb3d74c0ef4f6b8a423845195581
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 5de4765f9b5..61a4dc4756b 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 b4a7fca6605..6a911cadc29 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 a690e03441b..a5c3ce38a99 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()); |