Merge branch 'ttp-prod' of https://github.com/siteadmin/ett

onc-healthit · Aug 15, 2018 · f9edd5a · f9edd5a
2 parents 8cc8de1 + 85fab61
commit f9edd5a
Show file tree

Hide file tree

Showing 6 changed files with 117 additions and 13 deletions.
diff --git a/gui/src/assets/smtptestCases.json b/gui/src/assets/smtptestCases.json
@@ -257,7 +257,7 @@
 		"name": "SMTP MT Test 2 (Receiving HISP Not Trusted)",
 		"id": 102,
 		"desc": "Verify the ability of the system to provide a delivery failure message when a message is sent to an untrusted address). Hitting 'Run' will cause ETT  to send a message to an untrusted final address. Due to SMTP-SMTP configuration limitations, the proctor is to visually inspect for the receipt of the negative delivery status notification message. The expectation is that an appropriate delivery failure message will be returned.",
-		"longDesc": "The email is sent to provider1@direct2.sitenv.org",
+		"longDesc": "The email is sent to direct2.sitenv.org",
 		"protocol": "mu2",
 		"sutRole": "sender",
 		"sutHisp": true,
@@ -296,7 +296,7 @@
 	}, {
 		"name": "SMTP/IMAP MT Test 6 (Receiving HISP Not Trusted)",
 		"id": 106,
-		"longDesc": "The email is sent to provider1@direct2.sitenv.org",
+		"longDesc": "The email is sent to direct2.sitenv.org",
 		"desc": "Verify the ability of the system to provide a delivery failure message  when a message is sent to an untrusted address. Hitting 'Run' will  cause ETT to send a message with a final destination that is not a  trusted HISP. The expectation is that if the message was sent successfully 'Check MDN' will appear. Clicking that will check for the incoming MDN (may have to click multiple times due to lag). The expectation is that an appropriate delivery failure message will be returned.",
 		"protocol": "mu2",
 		"sutRole": "sender",
@@ -336,7 +336,7 @@
 	}, {
 		"name": "SMTP/POP MT Test 10 (Receiving HISP Not Trusted)",
 		"id": 110,
-		"longDesc": "The email is sent to provider1@direct2.sitenv.org",
+		"longDesc": "The email is sent to direct2.sitenv.org",
 		"desc": "Verify the ability of the system to provide a delivery failure message  when a message is sent to an untrusted address. Hitting 'Run' will  cause ETT to send a message with a final destination that is not a  trusted HISP. If the message was sent successfully 'Check MDN' will appear. Clicking that will check for the incoming MDN (may have to click multiple times due to lag). The expectation is that an appropriate delivery failure message will be returned.",
 		"protocol": "mu2",
 		"sutRole": "sender",
@@ -436,8 +436,8 @@
 	}, {
 		"name": "SMTP/IMAP MT Test 24(b) (Receiving HISP Not Trusted)",
 		"id": 124,
-		"longDesc": "The email is sent to provider1@direct2.sitenv.org",
-		"desc": "Verify the ability of the system to provide a delivery failure message  when a message is sent to an untrusted HISP(provider1@direct2.sitenv.org). Hitting 'Run' will  cause ETT to send a message with a final destination that is not a  trusted HISP. If the message was sent successfully 'Check MDN' will appear. Clicking that will check for the incoming MDN (may have to click multiple times due to lag). The expectation is that an appropriate delivery failure message will be returned.",
+		"longDesc": "The email is sent to direct2.sitenv.org",
+		"desc": "Verify the ability of the system to provide a delivery failure message  when a message is sent to an untrusted HISP(direct2.sitenv.org). Hitting 'Run' will  cause ETT to send a message with a final destination that is not a  trusted HISP. If the message was sent successfully 'Check MDN' will appear. Clicking that will check for the incoming MDN (may have to click multiple times due to lag). The expectation is that an appropriate delivery failure message will be returned.",
 		"protocol": "mu2",
 		"sutRole": "sender",
 		"sutHisp": true,
@@ -446,7 +446,7 @@
 	}, {
 		"name": "SMTP/POP MT Test 24(c) (Receiving HISP Not Trusted)",
 		"id": 624,
-		"longDesc": "The email is sent to provider1@direct2.sitenv.org",
+		"longDesc": "The email is sent to direct2.sitenv.org",
 		"desc": "Verify the ability of the system to provide a delivery failure message  when a message is sent to an untrusted HISP. Hitting 'Run' will  cause ETT to send a message with a final destination that is not a  trusted HISP. If the message was sent successfully 'Check MDN' will appear. Clicking that will check for the incoming MDN (may have to click multiple times due to lag). The expectation is that an appropriate delivery failure message will be returned.",
 		"protocol": "mu2",
 		"sutRole": "sender",

diff --git a/mail protocols/src/main/resources/cda-samples/CCDA_AMB.ZIP b/mail protocols/src/main/resources/cda-samples/CCDA_AMB.ZIP
diff --git a/webapp/pom.xml b/webapp/pom.xml
@@ -147,13 +147,13 @@
 						<dependency>
 							<groupId>gov.nist.toolkit</groupId>
 							<artifactId>toolkit-api</artifactId>
-							<version>2.202.0-SNAPSHOT</version>
+							<version>6.3.4</version>
 						</dependency>
 
 						<dependency>
 							<groupId>gov.nist.toolkit</groupId>
 							<artifactId>transaction-notification-service</artifactId>
-							<version>2.202.0-SNAPSHOT</version>
+							<version>6.3.4</version>
 						</dependency>
 					</requiresUnpack>
 				</configuration>

diff --git a/xdr/pom.xml b/xdr/pom.xml
@@ -32,9 +32,113 @@
 		<dependency>
 			<groupId>gov.nist.toolkit</groupId>
 			<artifactId>toolkit-api</artifactId>
-			<version>2.202.0-SNAPSHOT</version>
+			<version>6.3.4</version>
 		</dependency>
 
+		<dependency>
+			<groupId>gov.nist.toolkit</groupId>
+			<artifactId>toolkit-services-common</artifactId>
+			<version>6.3.4</version>
+		</dependency>
+
+		<dependency>
+			<groupId>gov.nist.toolkit</groupId>
+			<artifactId>config-datatypes</artifactId>
+			<version>6.3.4</version>
+		</dependency>
+
+		<dependency>
+			<groupId>javax.ws.rs</groupId>
+			<artifactId>javax.ws.rs-api</artifactId>
+			<version>2.0.1</version>
+		</dependency>
+
+
+		<!-- https://mvnrepository.com/artifact/org.glassfish.jersey.core/jersey-client -->
+		<dependency>
+			<groupId>org.glassfish.jersey.core</groupId>
+			<artifactId>jersey-client</artifactId>
+			<version>2.22.1</version>
+		</dependency>
+
+		<!-- https://mvnrepository.com/artifact/org.glassfish.jersey.core/jersey-common -->
+		<dependency>
+			<groupId>org.glassfish.jersey.core</groupId>
+			<artifactId>jersey-common</artifactId>
+			<version>2.22.1</version>
+		</dependency>
+
+		<!-- https://mvnrepository.com/artifact/org.glassfish.jersey.containers/jersey-container-grizzly2-http -->
+		<dependency>
+			<groupId>org.glassfish.jersey.containers</groupId>
+			<artifactId>jersey-container-grizzly2-http</artifactId>
+			<version>2.22.1</version>
+		</dependency>
+
+		<!-- https://mvnrepository.com/artifact/org.glassfish.jersey.containers/jersey-container-servlet -->
+		<dependency>
+			<groupId>org.glassfish.jersey.containers</groupId>
+			<artifactId>jersey-container-servlet</artifactId>
+			<version>2.22.1</version>
+		</dependency>
+
+		<!-- https://mvnrepository.com/artifact/org.glassfish.jersey.containers/jersey-container-servlet-core -->
+		<dependency>
+			<groupId>org.glassfish.jersey.containers</groupId>
+			<artifactId>jersey-container-servlet-core</artifactId>
+			<version>2.22.1</version>
+		</dependency>
+
+		<!-- https://mvnrepository.com/artifact/org.glassfish.jersey.ext/jersey-entity-filtering -->
+		<dependency>
+			<groupId>org.glassfish.jersey.ext</groupId>
+			<artifactId>jersey-entity-filtering</artifactId>
+			<version>2.22.1</version>
+		</dependency>
+
+		<!-- https://mvnrepository.com/artifact/org.glassfish.jersey.bundles.repackaged/jersey-guava -->
+		<dependency>
+			<groupId>org.glassfish.jersey.bundles.repackaged</groupId>
+			<artifactId>jersey-guava</artifactId>
+			<version>2.22.1</version>
+		</dependency>
+		<!-- https://mvnrepository.com/artifact/org.glassfish.jersey.media/jersey-media-jaxb -->
+		<dependency>
+			<groupId>org.glassfish.jersey.media</groupId>
+			<artifactId>jersey-media-jaxb</artifactId>
+			<version>2.22.1</version>
+		</dependency>
+
+		<!-- https://mvnrepository.com/artifact/org.glassfish.jersey.core/jersey-server -->
+		<dependency>
+			<groupId>org.glassfish.jersey.core</groupId>
+			<artifactId>jersey-server</artifactId>
+			<version>2.22.1</version>
+		</dependency>
+
+
+		<dependency>
+			<groupId>org.glassfish.jersey.media</groupId>
+			<artifactId>jersey-media-json-jackson</artifactId>
+			<version>2.22.1</version>
+		</dependency>
+
+		<!-- https://mvnrepository.com/artifact/com.google.gwt/gwt-servlet -->
+		<dependency>
+			<groupId>com.google.gwt</groupId>
+			<artifactId>gwt-servlet</artifactId>
+			<version>2.8.0</version>
+			<scope>runtime</scope>
+		</dependency>
+
+		<!-- https://mvnrepository.com/artifact/com.google.gwt/gwt-elemental -->
+		<dependency>
+			<groupId>com.google.gwt</groupId>
+			<artifactId>gwt-elemental</artifactId>
+			<version>2.8.0</version>
+		</dependency>
+
+
 
 		<!-- We want to have access to the domain model so we can translate toolkit 
 			data structures in ours -->

diff --git a/xdr/src/main/groovy/gov/nist/healthcare/ttt/xdr/api/XdrReceiverImpl.groovy b/xdr/src/main/groovy/gov/nist/healthcare/ttt/xdr/api/XdrReceiverImpl.groovy
@@ -8,8 +8,8 @@ import gov.nist.healthcare.ttt.misc.Configuration;
 import gov.nist.healthcare.ttt.xdr.domain.CreateEndpointResponseParser
 import gov.nist.healthcare.ttt.xdr.domain.EndpointConfig
 import gov.nist.healthcare.ttt.xdr.web.GroovyRestClient
-import gov.nist.toolkit.configDatatypes.SimulatorActorType
-import gov.nist.toolkit.configDatatypes.SimulatorProperties;
+import gov.nist.toolkit.configDatatypes.server.SimulatorActorType
+import gov.nist.toolkit.configDatatypes.server.SimulatorProperties;
 import gov.nist.toolkit.toolkitApi.BasicSimParameters
 import gov.nist.toolkit.toolkitApi.DocumentRecipient
 import gov.nist.toolkit.toolkitApi.SimulatorBuilder

diff --git a/xdr/src/main/groovy/gov/nist/healthcare/ttt/xdr/api/XdrSenderImpl.groovy b/xdr/src/main/groovy/gov/nist/healthcare/ttt/xdr/api/XdrSenderImpl.groovy
@@ -1,7 +1,7 @@
 package gov.nist.healthcare.ttt.xdr.api
 
-import gov.nist.toolkit.configDatatypes.SimulatorActorType;
-import gov.nist.toolkit.configDatatypes.SimulatorProperties;
+import gov.nist.toolkit.configDatatypes.server.SimulatorActorType;
+import gov.nist.toolkit.configDatatypes.server.SimulatorProperties;
 import gov.nist.healthcare.ttt.tempxdrcommunication.artifact.ArtifactManagement
 import gov.nist.healthcare.ttt.tempxdrcommunication.artifact.Artifacts
 import gov.nist.healthcare.ttt.tempxdrcommunication.artifact.Settings