Version 2.1.0

usnistgov · Feb 23, 2021 · 75b5592 · 75b5592
1 parent 99b558f
commit 75b5592
Show file tree

Hide file tree

Showing 23 changed files with 96 additions and 7,014 deletions.
diff --git a/asbestos-adapter/pom.xml b/asbestos-adapter/pom.xml
@@ -7,11 +7,11 @@
  <parent>
  <groupId>gov.nist.asbestos</groupId>
  <artifactId>asbestos</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0</version>
  </parent>
 
  <artifactId>asbestos-adapter</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0</version>
 
  <name>Asbestos Adapter</name>
 

diff --git a/asbestos-analysis/pom.xml b/asbestos-analysis/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <artifactId>asbestos</artifactId>
  <groupId>gov.nist.asbestos</groupId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 
@@ -15,19 +15,19 @@
  <dependency>
  <groupId>gov.nist.asbestos</groupId>
  <artifactId>asbestos-proxy-support</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0</version>
  </dependency>
 
  <dependency>
  <groupId>gov.nist.asbestos</groupId>
  <artifactId>asbestos-test-engine</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0</version>
  </dependency>
 
  <dependency>
  <groupId>gov.nist.asbestos</groupId>
  <artifactId>asbestos-mhd</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0</version>
  </dependency>
 
 <!-- <dependency>-->

diff --git a/asbestos-assembly/README.html b/asbestos-assembly/README.html
@@ -1,3 +1,3 @@
 <html>
-<body>The Asbestos Installation Guide v1.0.0 is located at <a href="https://github.com/usnistgov/asbestos/wiki/xInstallation-Guide-v1.0.0">https://github.com/usnistgov/asbestos/wiki/xInstallation-Guide-v1.0.0</a></body>
+<body>The Asbestos Installation Guide v2.1.0 is located at <a href="https://github.com/usnistgov/asbestos/wiki/xInstallation-Guide-v2.x.x">https://github.com/usnistgov/asbestos/wiki/xInstallation-Guide-v2.x.x</a></body>
 </html>
diff --git a/asbestos-assembly/bundled-tomcat-9.0.26/Toolkits/XdsToolkit/bin/setenv.bat b/asbestos-assembly/bundled-tomcat-9.0.26/Toolkits/XdsToolkit/bin/setenv.bat
@@ -4,4 +4,6 @@ REM External Cache
 REM If an alternate External Cache location is desired, please update the -DEXTERNAL_CACHE Java System Property below OR Use the Toolkit Configuration UI.
 SET "CATALINA_OPTS=%CATALINA_OPTS% -DEXTERNAL_CACHE=%TOOLKITS_DIR%\ExternalCache"
 
+REM Toolkit Properties
+SET "CATALINA_OPTS=%CATALINA_OPTS% -DTOOLKIT_PROPERTIES=%TOOLKITS_DIR%\XdsToolkit\conf\toolkit.properties"
 
diff --git a/asbestos-assembly/bundled-tomcat-9.0.26/Toolkits/XdsToolkit/conf/toolkit.properties b/asbestos-assembly/bundled-tomcat-9.0.26/Toolkits/XdsToolkit/conf/toolkit.properties
@@ -1,15 +1,17 @@
 #
 Toolkit_TLS_Port=${xdsToolkitTlsPort}
 Toolkit_Port=${xdsToolkitHttpPort}
-Default_Environment=cat
+Default_Environment=default
+Default_Test_Session=default
+#Toolkit_Host=cat-nist-tools.ihe-europe.net
+Toolkit_Host=localhost
 Enable_all_ciphers=false
 Admin_password=easy
 Use_Actors_File=false
 Listener_Port_Range=5000, 5035
 Gazelle_Config_URL=https://gazelle.ihe.net/EU-CAT/systemConfigurations.seam
 Gazelle_testing_session=42
 External_Cache=SETENV_AUTOMATIC
-Toolkit_Host=cat-nist-tools.ihe-europe.net
 Gazelle_Assertions_for_Connectathon_URL=https://gazelle.ihe.net/gazelle-documentation/Gazelle-STS/user.html
 Enable_SAML=true
 #directory to store files
@@ -29,7 +31,6 @@ Nonce_size=6
 # Using_SSL for the UI?
 Using_SSL=false
 SSL_Port=${xdsToolkitTlsPort}
-Default_Test_Session=cat
 Default_Test_Session_is_Protected=true
 Bypass_SecurityHeaderMuOnIncomingResponse=true
 Sts_ActorName=GazelleSts

diff --git a/asbestos-assembly/pom.xml b/asbestos-assembly/pom.xml
@@ -6,7 +6,7 @@
  <parent>
  <artifactId>asbestos</artifactId>
  <groupId>gov.nist.asbestos</groupId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 
@@ -26,47 +26,46 @@
  <!-- Production port number must match the bundled-tomcat application base's conf\server.xml Connector port -->
  <!-- Base path should not end with a slash -->
  <build.profile.id>Production</build.profile.id>
-
-<!-- <fhirToolkitUIHomePage>http://localhost:9760</fhirToolkitUIHomePage> &lt;!&ndash; If https is used here, the self-signed certificate fhirtoolkitui.p7b must be trusted by the Web browser unless another keystore was configured with a real certificate. &ndash;&gt;-->
-<!-- <httpsFhirToolkitBase>https://fhirtoolkit.test:9743/asbestos</httpsFhirToolkitBase>--><!-- used for Admin login and channel locking features -->
-<!-- <fhirToolkitBase>http://localhost:9760/asbestos</fhirToolkitBase> &lt;!&ndash; If https is used here, then this value must be the same as the httpsFhirToolkitBase value &ndash;&gt;-->
-<!-- <hapiFhirBase>http://localhost:9770/fhir/fhir</hapiFhirBase>-->
-<!-- <xdsToolkitBase>http://localhost:9770/xdstools</xdsToolkitBase>-->
-<!-- <tlsXdsToolkitBase>http://localhost:9773/xdstools</tlsXdsToolkitBase>-->
+ <fhirToolkitUIHomePage>http://localhost:9760</fhirToolkitUIHomePage> <!-- If https is used here, the self-signed certificate fhirtoolkitui.p7b must be trusted by the Web browser unless another keystore was configured with a real certificate. -->
+ <httpsFhirToolkitBase>https://fhirtoolkit.test:9743/asbestos</httpsFhirToolkitBase> <!-- used for Admin login and channel locking features -->
+ <fhirToolkitBase>http://localhost:9760/asbestos</fhirToolkitBase> <!-- If https is used here, then this value must be the same as the httpsFhirToolkitBase value -->
+ <hapiFhirBase>http://localhost:9770/fhir/fhir</hapiFhirBase>
+ <xdsToolkitBase>http://localhost:9770/xdstools</xdsToolkitBase>
+ <tlsXdsToolkitBase>http://localhost:9773/xdstools</tlsXdsToolkitBase>
  <!--
 README.txt and Tomcat server.xml use the properties below.
 If only the xdsToolkitBase property shown above is used to point to an existing toolkit outside of the Asbestos installation directory, the XdsToolkit\webapps should be empty to prevent
 it from starting up a Tomcat which would potentially take up the port as defined by the xdsToolkitHttpPort. In other words, if Tomcat does not start in XdsToolkit then the xdsToolkitHttpPort is not used.
 -->
-
-<!-- <fhirToolkitHttpPort>9760</fhirToolkitHttpPort>-->
- <!-- <fhirToolkitTlsPort>9743</fhirToolkitTlsPort>-->
-<!--  <xdsToolkitHttpPort>9770</xdsToolkitHttpPort>-->
-<!--  <xdsToolkitTlsPort>9773</xdsToolkitTlsPort>-->
-<!--  <fhirValidationServer>http://localhost:9770/fhir/fhir</fhirValidationServer>-->
-<!-- <startUpSession>default</startUpSession>-->
+ <hapiFhirHttpPort>9790</hapiFhirHttpPort> <!-- must be unique -->
+ <fhirValidationServer>http://localhost:9790/fhir/fhir</fhirValidationServer>
+ <fhirToolkitHttpPort>9760</fhirToolkitHttpPort>
+ <fhirToolkitTlsPort>9743</fhirToolkitTlsPort>
+ <xdsToolkitHttpPort>9770</xdsToolkitHttpPort>
+ <xdsToolkitTlsPort>9773</xdsToolkitTlsPort>
+ <startUpSession>default</startUpSession>
 
  <!-- begin CAT -->
 
- <fhirToolkitUIHomePage>https://cat-nist-tools.ihe-europe.net:9443</fhirToolkitUIHomePage> <!-- If https is used here, the self-signed certificate fhirtoolkitui.p7b must be trusted by the Web browser unless another keystore was configured with a real certificate. -->
- <httpsFhirToolkitBase>https://cat-nist-tools.ihe-europe.net:9443/asbestos</httpsFhirToolkitBase> <!-- used for Admin login and channel locking features -->
- <fhirToolkitBase>http://cat-nist-tools.ihe-europe.net:9760/asbestos</fhirToolkitBase> <!-- should be http only -->
- <hapiFhirBase>http://localhost:7080/fhir/fhir</hapiFhirBase> <!-- If fhir is placed along side XTK webapps, need to use the same port as XTK -->
- <xdsToolkitBase>http://localhost:8080/xdstools</xdsToolkitBase>
- <tlsXdsToolkitBase>http://localhost:8443/xdstools</tlsXdsToolkitBase>
+<!-- <fhirToolkitUIHomePage>https://cat-nist-tools.ihe-europe.net:9443</fhirToolkitUIHomePage> &lt;!&ndash; If https is used here, the self-signed certificate fhirtoolkitui.p7b must be trusted by the Web browser unless another keystore was configured with a real certificate. &ndash;&gt;-->
+<!-- <httpsFhirToolkitBase>https://cat-nist-tools.ihe-europe.net:9443/asbestos</httpsFhirToolkitBase> &lt;!&ndash; used for Admin login and channel locking features &ndash;&gt;-->
+<!-- <fhirToolkitBase>http://cat-nist-tools.ihe-europe.net:9760/asbestos</fhirToolkitBase> &lt;!&ndash; should be http only &ndash;&gt;-->
+<!-- <hapiFhirBase>http://localhost:7080/fhir/fhir</hapiFhirBase> &lt;!&ndash; If fhir is placed along side XTK webapps, need to use the same port as XTK &ndash;&gt;-->
+<!-- <xdsToolkitBase>http://localhost:8080/xdstools</xdsToolkitBase>-->
+<!-- <tlsXdsToolkitBase>http://localhost:8443/xdstools</tlsXdsToolkitBase>-->
 
  <!--
  README.txt and Tomcat server.xml use the properties below.
  If only the xdsToolkitBase property shown above is used to point to an existing toolkit outside of the Asbestos installation directory, the XdsToolkit\webapps should be empty to prevent
  it from starting up a Tomcat which would potentially take up the port as defined by the xdsToolkitHttpPort. In other words, if Tomcat does not start in XdsToolkit then the xdsToolkitHttpPort is not used.
  -->
- <hapiFhirHttpPort>7080</hapiFhirHttpPort>
- <fhirToolkitHttpPort>9760</fhirToolkitHttpPort>
- <fhirToolkitTlsPort>9443</fhirToolkitTlsPort>
- <xdsToolkitHttpPort>8080</xdsToolkitHttpPort>
- <xdsToolkitTlsPort>8443</xdsToolkitTlsPort>
- <fhirValidationServer>http://localhost:7080/fhir/fhir</fhirValidationServer>
- <startUpSession>cat</startUpSession>
+<!-- <hapiFhirHttpPort>7080</hapiFhirHttpPort>-->
+<!-- <fhirValidationServer>http://localhost:7080/fhir/fhir</fhirValidationServer>-->
+<!-- <fhirToolkitHttpPort>9760</fhirToolkitHttpPort>-->
+<!-- <fhirToolkitTlsPort>9443</fhirToolkitTlsPort>-->
+<!-- <xdsToolkitHttpPort>8080</xdsToolkitHttpPort>-->
+<!-- <xdsToolkitTlsPort>8443</xdsToolkitTlsPort>-->
+<!-- <startUpSession>cat</startUpSession>-->
 
  <!-- end CAT -->
  </properties>
@@ -86,9 +85,6 @@ it from starting up a Tomcat which would potentially take up the port as defined
  <id>Sunil</id>
  <properties>
  <build.profile.id>Sunil</build.profile.id>
- <!-- Make use of the existing XDS Toolkit that should already be running in the background. -->
- <hapiFhirBase>http://localhost:8080/fhir/fhir</hapiFhirBase>
- <xdsToolkitBase>http://localhost:8080/xdstools</xdsToolkitBase>
  </properties>
  </profile>
  </profiles>

diff --git a/asbestos-codes-jaxb/pom.xml b/asbestos-codes-jaxb/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <artifactId>asbestos</artifactId>
  <groupId>gov.nist.asbestos</groupId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

diff --git a/asbestos-debug-testscript/pom.xml b/asbestos-debug-testscript/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <artifactId>asbestos</artifactId>
  <groupId>gov.nist.asbestos</groupId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 
@@ -20,7 +20,7 @@
  <dependency>
  <groupId>gov.nist.asbestos</groupId>
  <artifactId>asbestos-proxy</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0</version>
  <scope>compile</scope>
  </dependency>
  </dependencies>

diff --git a/asbestos-http/pom.xml b/asbestos-http/pom.xml
@@ -8,11 +8,11 @@
  <parent>
  <groupId>gov.nist.asbestos</groupId>
  <artifactId>asbestos</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0</version>
  </parent>
 
  <artifactId>asbestos-http</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0</version>
 
 
  <properties>

diff --git a/asbestos-mhd/pom.xml b/asbestos-mhd/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <artifactId>asbestos</artifactId>
  <groupId>gov.nist.asbestos</groupId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 
@@ -15,27 +15,27 @@
  <dependency>
  <groupId>gov.nist.asbestos</groupId>
  <artifactId>asbestos-utilities</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0</version>
  </dependency>
  <dependency>
  <groupId>gov.nist.asbestos</groupId>
  <artifactId>asbestos-codes-jaxb</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0</version>
  </dependency>
  <dependency>
  <groupId>gov.nist.asbestos</groupId>
  <artifactId>asbestos-xds-jaxb</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0</version>
  </dependency>
  <dependency>
  <groupId>gov.nist.asbestos</groupId>
  <artifactId>asbestos-proxy-support</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0</version>
  </dependency>
  <dependency>
  <groupId>gov.nist.asbestos</groupId>
  <artifactId>asbestos-service-properties</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0</version>
  </dependency>
  </dependencies>
 

diff --git a/asbestos-proxy-support/pom.xml b/asbestos-proxy-support/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <artifactId>asbestos</artifactId>
  <groupId>gov.nist.asbestos</groupId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 
@@ -15,32 +15,32 @@
  <dependency>
  <groupId>gov.nist.asbestos</groupId>
  <artifactId>asbestos-http</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0</version>
  </dependency>
  <dependency>
  <groupId>gov.nist.asbestos</groupId>
  <artifactId>simapi</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0</version>
  </dependency>
 <!-- <dependency>-->
 <!-- <groupId>gov.nist.asbestos</groupId>-->
 <!-- <artifactId>asbestos-shared-objects</artifactId>-->
-<!-- <version>2.1.0-SNAPSHOT</version>-->
+<!-- <version>2.1.0</version>-->
 <!-- </dependency>-->
  <dependency>
  <groupId>gov.nist.asbestos</groupId>
  <artifactId>asbestos-codes-jaxb</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0</version>
  </dependency>
  <dependency>
  <groupId>gov.nist.asbestos</groupId>
  <artifactId>asbestos-service-properties</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0</version>
  </dependency>
  <dependency>
  <groupId>gov.nist.asbestos</groupId>
  <artifactId>asbestos-service-properties</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0</version>
  <scope>compile</scope>
  </dependency>
  </dependencies>

diff --git a/asbestos-proxy/pom.xml b/asbestos-proxy/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <artifactId>asbestos</artifactId>
  <groupId>gov.nist.asbestos</groupId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 
@@ -22,42 +22,42 @@
  <dependency>
  <groupId>gov.nist.asbestos</groupId>
  <artifactId>asbestos-test-engine</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0</version>
  </dependency>
  <dependency>
  <groupId>gov.nist.asbestos</groupId>
  <artifactId>asbestos-mhd</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0</version>
  </dependency>
  <dependency>
  <groupId>gov.nist.asbestos</groupId>
  <artifactId>asbestos-http</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0</version>
  </dependency>
  <dependency>
  <groupId>gov.nist.asbestos</groupId>
  <artifactId>asbestos-adapter</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0</version>
  </dependency>
  <dependency>
  <groupId>gov.nist.asbestos</groupId>
  <artifactId>asbestos-analysis</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0</version>
  </dependency>
  <dependency>
  <groupId>gov.nist.asbestos</groupId>
  <artifactId>simapi</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0</version>
  </dependency>
  <dependency>
  <groupId>gov.nist.asbestos</groupId>
  <artifactId>asbestos-proxy-support</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0</version>
  </dependency>
  <dependency>
  <groupId>gov.nist.asbestos</groupId>
  <artifactId>asbestos-service-properties</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0</version>
  </dependency>
  <dependency>
  <groupId>gov.nist.toolkit</groupId>

diff --git a/asbestos-rest-services/pom.xml b/asbestos-rest-services/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <artifactId>asbestos</artifactId>
  <groupId>gov.nist.asbestos</groupId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 
@@ -15,12 +15,12 @@
  <dependency>
  <groupId>gov.nist.asbestos</groupId>
  <artifactId>asbestos-proxy</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0</version>
  </dependency>
  <dependency>
  <groupId>gov.nist.asbestos</groupId>
  <artifactId>asbestos-proxy-support</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0</version>
  </dependency>
  </dependencies>