openpixpdq-svn Mailing List for OpenPIXPDQ (Page 3)

Status: Alpha

Brought to you by: ale5ha, sundaresan_k, tsarver, wenzhi

openpixpdq-svn — The email list for SVN changes

You can subscribe to this list here.

2008	_Jan	_Feb	_Mar	_Apr	_May	_Jun	_Jul	_Aug	_Sep	_Oct (1)	_Nov (18)	_Dec (100)
2009	_Jan (76)	_Feb (45)	_Mar (68)	_Apr (1)	_May	_Jun	_Jul	_Aug	_Sep	_Oct	_Nov	_Dec

Flat | Threaded

<< < 1 2 3 4 5 .. 13 > >> (Page 3 of 13)

[Openpixpdq-svn] SF.net SVN: openpixpdq:[267] trunk/OpenPIXPDQ/src/java/org/ openhealthexchange/openpixpdq/ihe/log

From: <we...@us...> - 2009-03-10 15:46:38

Revision: 267
          http://openpixpdq.svn.sourceforge.net/openpixpdq/?rev=267&view=rev
Author:   wenzhi
Date:     2009-03-10 15:46:23 +0000 (Tue, 10 Mar 2009)

Log Message:
-----------
Moved IMesaLogger to the log package.

Modified Paths:
--------------
    trunk/OpenPIXPDQ/src/java/org/openhealthexchange/openpixpdq/ihe/log/Log4jLogger.java

Added Paths:
-----------
    trunk/OpenPIXPDQ/src/java/org/openhealthexchange/openpixpdq/ihe/log/IMesaLogger.java

Copied: trunk/OpenPIXPDQ/src/java/org/openhealthexchange/openpixpdq/ihe/log/IMesaLogger.java (from rev 251, trunk/OpenPIXPDQ/src/java/org/openhealthexchange/openpixpdq/ihe/IMesaLogger.java)
===================================================================
--- trunk/OpenPIXPDQ/src/java/org/openhealthexchange/openpixpdq/ihe/log/IMesaLogger.java	                        (rev 0)
+++ trunk/OpenPIXPDQ/src/java/org/openhealthexchange/openpixpdq/ihe/log/IMesaLogger.java	2009-03-10 15:46:23 UTC (rev 267)
@@ -0,0 +1,57 @@
+/* Copyright 2009 Misys PLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); 
+ * you may not use this file except in compliance with the License. 
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0 
+ * 
+ * Unless required by applicable law or agreed to in writing, software 
+ * distributed under the License is distributed on an "AS IS" BASIS, 
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or 
+ * implied. See the License for the specific language governing 
+ * permissions and limitations under the License. 
+ */
+package org.openhealthexchange.openpixpdq.ihe.log;
+
+import javax.xml.soap.SOAPMessage;
+
+import org.apache.axiom.om.OMElement;
+
+import ca.uhn.hl7v2.model.Message;
+
+/**
+ * Interface that enables IHE Actors to write stuff to the
+ * MESA test log, when appropriate.
+ * 
+ * @author Jim Firby
+ * @version 1.0 - Nov 2, 2005
+ */
+public interface IMesaLogger {
+
+	/**
+	 * Write a text string to the MESA log
+	 * 
+	 * @param message The text string to display
+	 */
+	public void writeString(String message);
+
+	/**
+	 * Write a SOAP message to the MESA log
+	 * 
+	 * @param message The SOAP message to display
+	 */
+	public void writeSoapMessage(SOAPMessage message);
+
+	/**
+	 * Write out an Axiom OMElement message to the logger.
+	 */
+	public void writeAxiomElementMessage(OMElement message);
+
+	/**
+	 * Write an HL7 message to the MESA log
+	 * 
+	 * @param message The HL7 message to display
+	 */
+	public void writeHL7Message(Message message);
+}

Modified: trunk/OpenPIXPDQ/src/java/org/openhealthexchange/openpixpdq/ihe/log/Log4jLogger.java
===================================================================
--- trunk/OpenPIXPDQ/src/java/org/openhealthexchange/openpixpdq/ihe/log/Log4jLogger.java	2009-03-10 15:38:17 UTC (rev 266)
+++ trunk/OpenPIXPDQ/src/java/org/openhealthexchange/openpixpdq/ihe/log/Log4jLogger.java	2009-03-10 15:46:23 UTC (rev 267)
@@ -28,7 +28,6 @@
 import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.impl.llom.util.AXIOMUtil;
 import org.apache.log4j.Logger;
-import org.openhealthexchange.openpixpdq.ihe.IMesaLogger;
 import org.openhealthexchange.openpixpdq.util.AxiomUtil;
 
 import ca.uhn.hl7v2.HL7Exception;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openpixpdq-svn] SF.net SVN: openpixpdq:[266] trunk/OpenPIXPDQ/src/java/org/ openhealthexchange/openpixpdq/data

From: <we...@us...> - 2009-03-10 15:38:30

Revision: 266
          http://openpixpdq.svn.sourceforge.net/openpixpdq/?rev=266&view=rev
Author:   wenzhi
Date:     2009-03-10 15:38:17 +0000 (Tue, 10 Mar 2009)

Log Message:
-----------
1. Fixed Issue: [ 2679075 ] Parameters missing in call to super()
2. Updated Javadoc

Modified Paths:
--------------
    trunk/OpenPIXPDQ/src/java/org/openhealthexchange/openpixpdq/data/PatientIdentifier.java
    trunk/OpenPIXPDQ/src/java/org/openhealthexchange/openpixpdq/data/PersonIdentifier.java

Modified: trunk/OpenPIXPDQ/src/java/org/openhealthexchange/openpixpdq/data/PatientIdentifier.java
===================================================================
--- trunk/OpenPIXPDQ/src/java/org/openhealthexchange/openpixpdq/data/PatientIdentifier.java	2009-03-06 21:25:37 UTC (rev 265)
+++ trunk/OpenPIXPDQ/src/java/org/openhealthexchange/openpixpdq/data/PatientIdentifier.java	2009-03-10 15:38:17 UTC (rev 266)
@@ -12,20 +12,6 @@
  * implied. See the License for the specific language governing 
  * permissions and limitations under the License. 
  */
-/* Copyright 2009 Misys PLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); 
- * you may not use this file except in compliance with the License. 
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0 
- * 
- * Unless required by applicable law or agreed to in writing, software 
- * distributed under the License is distributed on an "AS IS" BASIS, 
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or 
- * implied. See the License for the specific language governing 
- * permissions and limitations under the License. 
- */
 package org.openhealthexchange.openpixpdq.data;
 
 import com.misyshealthcare.connect.net.Identifier;
@@ -44,6 +30,6 @@
 		super();
 	}
 	public PatientIdentifier(String id, Identifier assigningAuthority) {
-		super();
+		super(id, assigningAuthority);
 	}
 }

Modified: trunk/OpenPIXPDQ/src/java/org/openhealthexchange/openpixpdq/data/PersonIdentifier.java
===================================================================
--- trunk/OpenPIXPDQ/src/java/org/openhealthexchange/openpixpdq/data/PersonIdentifier.java	2009-03-06 21:25:37 UTC (rev 265)
+++ trunk/OpenPIXPDQ/src/java/org/openhealthexchange/openpixpdq/data/PersonIdentifier.java	2009-03-10 15:38:17 UTC (rev 266)
@@ -12,20 +12,6 @@
  * implied. See the License for the specific language governing 
  * permissions and limitations under the License. 
  */
-/* Copyright 2009 Misys PLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); 
- * you may not use this file except in compliance with the License. 
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0 
- * 
- * Unless required by applicable law or agreed to in writing, software 
- * distributed under the License is distributed on an "AS IS" BASIS, 
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or 
- * implied. See the License for the specific language governing 
- * permissions and limitations under the License. 
- */
 package org.openhealthexchange.openpixpdq.data;
 
 import java.util.Calendar;
@@ -50,7 +36,6 @@
 	public PersonIdentifier() {		
 	}
 	public PersonIdentifier(String id, Identifier assigningAuthority) {
-		super();
 		this.id = id;
 		this.assigningAuthority = assigningAuthority;
 	}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openpixpdq-svn] SF.net SVN: openpixpdq:[265] trunk/OpenWeb/build.xml

From: <we...@us...> - 2009-03-06 21:25:42

Revision: 265
          http://openpixpdq.svn.sourceforge.net/openpixpdq/?rev=265&view=rev
Author:   wenzhi
Date:     2009-03-06 21:25:37 +0000 (Fri, 06 Mar 2009)

Log Message:
-----------
Fixed build.xml to remove redundant excludes

Modified Paths:
--------------
    trunk/OpenWeb/build.xml

Modified: trunk/OpenWeb/build.xml
===================================================================
--- trunk/OpenWeb/build.xml	2009-03-06 21:01:00 UTC (rev 264)
+++ trunk/OpenWeb/build.xml	2009-03-06 21:25:37 UTC (rev 265)
@@ -104,7 +104,7 @@
 
 	<target name="-generate-war" depends="debug">
 		<war destfile="${dist.root}/${war.name}" webxml="${web.descriptor.dir}\web.xml" update="true">
-			<fileset dir="${build.web}" excludes="WEB-INF\web.xml" />
+			<fileset dir="${build.web}"/>
 			<!--classes dir="${build.web.classes}"/-->
 		</war>
 		<!--delete dir="${build.root}"/-->


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openpixpdq-svn] SF.net SVN: openpixpdq:[264] trunk/OpenWeb/readme.txt

From: <we...@us...> - 2009-03-06 21:01:02

Revision: 264
          http://openpixpdq.svn.sourceforge.net/openpixpdq/?rev=264&view=rev
Author:   wenzhi
Date:     2009-03-06 21:01:00 +0000 (Fri, 06 Mar 2009)

Log Message:
-----------
removed the old readme.txt

Removed Paths:
-------------
    trunk/OpenWeb/readme.txt

Deleted: trunk/OpenWeb/readme.txt
===================================================================
--- trunk/OpenWeb/readme.txt	2009-03-06 20:44:04 UTC (rev 263)
+++ trunk/OpenWeb/readme.txt	2009-03-06 21:01:00 UTC (rev 264)
@@ -1 +0,0 @@
-Add servlet-api.jar, jsp-api.jar, OpenPIX/PDQ.jar to the library path before creating build.
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openpixpdq-svn] SF.net SVN: openpixpdq:[263] trunk/OpenWeb

From: <we...@us...> - 2009-03-06 20:44:21

Revision: 263
          http://openpixpdq.svn.sourceforge.net/openpixpdq/?rev=263&view=rev
Author:   wenzhi
Date:     2009-03-06 20:44:04 +0000 (Fri, 06 Mar 2009)

Log Message:
-----------
1. Updated the setting 
2. removed the old log4j jar.

Modified Paths:
--------------
    trunk/OpenWeb/.settings/org.eclipse.wst.common.component

Removed Paths:
-------------
    trunk/OpenWeb/Web/WEB-INF/lib/log4j-1.2.9.jar

Modified: trunk/OpenWeb/.settings/org.eclipse.wst.common.component
===================================================================
--- trunk/OpenWeb/.settings/org.eclipse.wst.common.component	2009-03-06 20:39:48 UTC (rev 262)
+++ trunk/OpenWeb/.settings/org.eclipse.wst.common.component	2009-03-06 20:44:04 UTC (rev 263)
@@ -15,6 +15,15 @@
         <dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/OpenEmpiAdapter/lib/jbossall-client.jar">
             <dependency-type>uses</dependency-type>
         </dependent-module>
+        <dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/OpenPIXPDQ/lib/jaxb/jaxb-libs.jar">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/OpenPIXPDQ/lib/jaxb/jaxb-impl.jar">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/OpenPIXPDQ/lib/jaxb/xsdlib.jar">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
         <property name="java-output-path" value="build/classes"/>
         <property name="context-root" value="OpenPIXPDQ"/>
     </wb-module>

Deleted: trunk/OpenWeb/Web/WEB-INF/lib/log4j-1.2.9.jar
===================================================================
(Binary files differ)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openpixpdq-svn] SF.net SVN: openpixpdq:[262] trunk/OpenWeb

From: <we...@us...> - 2009-03-06 20:39:57

Revision: 262
          http://openpixpdq.svn.sourceforge.net/openpixpdq/?rev=262&view=rev
Author:   wenzhi
Date:     2009-03-06 20:39:48 +0000 (Fri, 06 Mar 2009)

Log Message:
-----------
Modified the build script - Pull jars from OpenPIXPDQ and OpenEMPIAdapter to OpenWeb instead of pushing the jars to OpenWeb.

Modified Paths:
--------------
    trunk/OpenWeb/build.properties
    trunk/OpenWeb/build.xml

Modified: trunk/OpenWeb/build.properties
===================================================================
--- trunk/OpenWeb/build.properties	2009-03-06 17:45:31 UTC (rev 261)
+++ trunk/OpenWeb/build.properties	2009-03-06 20:39:48 UTC (rev 262)
@@ -1,9 +1,5 @@
 to.exclude=**/*.java
-lib.src=./web/WEB-INF/lib
-web.src=./src
-web.dir=./web
-webdescriptordir=./web/WEB-INF
-war.name=openweb.war
-jboss.home=D:/jboss-4.0.5.GA
-openpixpdq.build=../OpenPIXPDQ/build.xml
-openempiadapter.build=../OpenEmpiAdapter/build.xml
\ No newline at end of file
+war.name=openpixpdq.war
+jboss.home=c:/jboss/jboss-4.0.5.GA
+openpixpdq.root=../OpenPIXPDQ
+openempiadapter.root=../OpenEmpiAdapter

Modified: trunk/OpenWeb/build.xml
===================================================================
--- trunk/OpenWeb/build.xml	2009-03-06 17:45:31 UTC (rev 261)
+++ trunk/OpenWeb/build.xml	2009-03-06 20:39:48 UTC (rev 262)
@@ -1,12 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project basedir="." default="install" name="OpenWeb">
 	<property file="build.properties" />
-	<property name="build.root" location="temp" />
-	<property name="build.web" location="${build.root}/WEB-INF" />
-	<property name="build.classes" location="${build.root}/WEB-INF/classes" />
+	<property name="web.src" location="src" />
+	<property name="web.dir" location="web" />
+	<property name="web.descriptor.dir" location="web/WEB-INF" />
+	<property name="lib.src" location="web/WEB-INF/lib" />
+	<property name="build.root" location="build" />
+	<property name="build.web" location="${build.root}/web" />
+	<property name="build.web.classes" location="${build.web}/WEB-INF/classes" />
+	<property name="build.web.lib" location="${build.web}/WEB-INF/lib" />
 	<property name="dist.root" location="dist" />
 	<property name="install.app.dir" location="${jboss.home}/server/default/deploy" />
-
+	<property name="openpixpdq.build" location="${openpixpdq.root}/build.xml" />
+	<property name="openpixpdq.dist.dir" location="${openpixpdq.root}/dist" />
+	<property name="openpixpdq.lib.dir" location="${openpixpdq.root}/lib" />
+	<property name="openempiadapter.build" location="${openempiadapter.root}/build.xml" />
+	<property name="openempiadapter.dist.dir" location="${openempiadapter.root}/dist" />
+	
 	<target name="clean" description="Clean out compiled src">
 		<!-- Remove build/* -->
 		<delete failonerror="false" quiet="true" includeEmptyDirs="true">
@@ -15,7 +25,7 @@
 	</target>
 
 	<target name="compile" depends="setClasspath">
-		<javac failonerror="false" debug="off" srcdir="${web.src}" destdir="${build.classes}" classpath="${classpath}" />
+		<javac failonerror="false" debug="off" srcdir="${web.src}" destdir="${build.web.classes}" classpath="${classpath}" />
 	</target>
 
 	<target name="setClasspath">
@@ -24,6 +34,12 @@
 			<fileset dir="${lib.src}">
 				<include name="**/*.jar" />
 			</fileset>
+			<fileset dir="${openpixpdq.dist.dir}">
+				<include name="**/*.jar" />
+			</fileset>
+			<fileset dir="${openpixpdq.lib.dir}/">
+				<include name="**/*.jar" />
+			</fileset>
 		</path>
 		<property name="classpath" refid="build.classpath" />
 		<echo message="Classpath Settings done: ${classpath}" />
@@ -37,9 +53,41 @@
 		</antcall>
 		<property name="built" value="true" />
 
-		<copy todir="${build.classes}" >
-			<fileset dir="${web.src}" excludes="to.exclude">
+		<!-- Copy web source configuration files -->
+		<copy todir="${build.web.classes}">
+			<fileset dir="${web.src}" excludes="${to.exclude}"/>
+		</copy>
+
+		<!-- Copy web application files -->
+		<copy todir="${build.web}">
+			<fileset dir="${web.dir}" />
+		</copy>
+		
+		<!-- Copy lib from OpenEmpiAdapter -->
+		<copy todir="${build.web.lib}">
+			<fileset file="${openempiadapter.dist.dir}/*.jar" />
+		</copy>
+		<!-- Copy libraries from OpenPIXPDQ -->
+		<copy todir="${build.web.lib}">
+			<fileset file="${openpixpdq.dist.dir}/*.jar" />
+			<fileset dir="${openpixpdq.lib.dir}">
+				<include name="*.jar" />
 			</fileset>
+			<fileset dir="${openpixpdq.lib.dir}/apache-commons">
+				<include name="*.jar" />
+			</fileset>
+			<fileset dir="${openpixpdq.lib.dir}/axis2-1.3">
+				<include name="*.jar" />
+			</fileset>
+			<!--fileset dir="${openpixpdq.lib.dir}/beepcore">
+				<include name="*.jar" />
+			</fileset-->
+			<fileset dir="${openpixpdq.lib.dir}/braid">
+				<include name="*.jar" />
+			</fileset>
+			<fileset dir="${openpixpdq.lib.dir}/jaxb">
+				<include name="*.jar" />
+			</fileset>
 		</copy>
 
 	</target>
@@ -48,18 +96,18 @@
 
 		<property name="initted" value="true" />
 
-		<mkdir dir="${build.root}" />
-		<mkdir dir="${build.classes}" />
-		<mkdir dir="${dist.root}" />
+		<mkdir dir="${build.root}"/>
+		<mkdir dir="${build.web.classes}"/>
+		<mkdir dir="${dist.root}"/>
 
 	</target>
 
 	<target name="-generate-war" depends="debug">
-		<war destfile="${dist.root}/${war.name}" webxml="${webdescriptordir}\web.xml" update="true">
-			<fileset dir="${web.dir}" excludes="WEB-INF\web.xml" />
-			<classes dir="${build.classes}"/>
+		<war destfile="${dist.root}/${war.name}" webxml="${web.descriptor.dir}\web.xml" update="true">
+			<fileset dir="${build.web}" excludes="WEB-INF\web.xml" />
+			<!--classes dir="${build.web.classes}"/-->
 		</war>
-		<delete dir="${build.root}"/>
+		<!--delete dir="${build.root}"/-->
 	</target>
 
 	<target name="install" depends="openpixpdq,-generate-war" description="Installs application in the domain">		


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openpixpdq-svn] SF.net SVN: openpixpdq:[261] trunk/OpenPIXPDQ/.classpath

From: <we...@us...> - 2009-03-06 17:45:34

Revision: 261
          http://openpixpdq.svn.sourceforge.net/openpixpdq/?rev=261&view=rev
Author:   wenzhi
Date:     2009-03-06 17:45:31 +0000 (Fri, 06 Mar 2009)

Log Message:
-----------
Updated Classpath - Added jbossall-client

Modified Paths:
--------------
    trunk/OpenPIXPDQ/.classpath

Modified: trunk/OpenPIXPDQ/.classpath
===================================================================
--- trunk/OpenPIXPDQ/.classpath	2009-03-06 17:39:10 UTC (rev 260)
+++ trunk/OpenPIXPDQ/.classpath	2009-03-06 17:45:31 UTC (rev 261)
@@ -26,5 +26,6 @@
 	<classpathentry kind="lib" path="lib/braid/braid-base-1.1.jar" sourcepath="/base/src"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/OpenEmpiAdapter"/>
 	<classpathentry kind="lib" path="/OpenEmpiAdapter/lib/openempi-ejb.jar" sourcepath="C:/projects/CDE/openempi/src/java"/>
+	<classpathentry kind="lib" path="/OpenEmpiAdapter/lib/jbossall-client.jar"/>
 	<classpathentry kind="output" path="build"/>
 </classpath>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openpixpdq-svn] SF.net SVN: openpixpdq:[260] trunk/OpenPIXPDQ

From: <we...@us...> - 2009-03-06 17:39:14

Revision: 260
          http://openpixpdq.svn.sourceforge.net/openpixpdq/?rev=260&view=rev
Author:   wenzhi
Date:     2009-03-06 17:39:10 +0000 (Fri, 06 Mar 2009)

Log Message:
-----------
1. Added MANIFEST file
2. added openempi-ejb.jar which is used by junit test.

Modified Paths:
--------------
    trunk/OpenPIXPDQ/.classpath

Added Paths:
-----------
    trunk/OpenPIXPDQ/src/java/META-INF/
    trunk/OpenPIXPDQ/src/java/META-INF/MANIFEST.MF

Modified: trunk/OpenPIXPDQ/.classpath
===================================================================
--- trunk/OpenPIXPDQ/.classpath	2009-03-06 17:36:18 UTC (rev 259)
+++ trunk/OpenPIXPDQ/.classpath	2009-03-06 17:39:10 UTC (rev 260)
@@ -25,5 +25,6 @@
 	<classpathentry kind="lib" path="lib/apache-commons/commons-logging-1.1.jar"/>
 	<classpathentry kind="lib" path="lib/braid/braid-base-1.1.jar" sourcepath="/base/src"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/OpenEmpiAdapter"/>
+	<classpathentry kind="lib" path="/OpenEmpiAdapter/lib/openempi-ejb.jar" sourcepath="C:/projects/CDE/openempi/src/java"/>
 	<classpathentry kind="output" path="build"/>
 </classpath>

Added: trunk/OpenPIXPDQ/src/java/META-INF/MANIFEST.MF
===================================================================
--- trunk/OpenPIXPDQ/src/java/META-INF/MANIFEST.MF	                        (rev 0)
+++ trunk/OpenPIXPDQ/src/java/META-INF/MANIFEST.MF	2009-03-06 17:39:10 UTC (rev 260)
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Class-Path: 
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openpixpdq-svn] SF.net SVN: openpixpdq:[259] trunk/OpenPIXPDQ/src/java/org/ openhealthexchange/openpixpdq/ihe/configuration/ConfigurationLoader.java

From: <we...@us...> - 2009-03-06 17:36:27

Revision: 259
          http://openpixpdq.svn.sourceforge.net/openpixpdq/?rev=259&view=rev
Author:   wenzhi
Date:     2009-03-06 17:36:18 +0000 (Fri, 06 Mar 2009)

Log Message:
-----------
cleaned up unused import

Modified Paths:
--------------
    trunk/OpenPIXPDQ/src/java/org/openhealthexchange/openpixpdq/ihe/configuration/ConfigurationLoader.java

Modified: trunk/OpenPIXPDQ/src/java/org/openhealthexchange/openpixpdq/ihe/configuration/ConfigurationLoader.java
===================================================================
--- trunk/OpenPIXPDQ/src/java/org/openhealthexchange/openpixpdq/ihe/configuration/ConfigurationLoader.java	2009-03-06 17:34:30 UTC (rev 258)
+++ trunk/OpenPIXPDQ/src/java/org/openhealthexchange/openpixpdq/ihe/configuration/ConfigurationLoader.java	2009-03-06 17:36:18 UTC (rev 259)
@@ -35,7 +35,6 @@
 import org.openhealthexchange.openpixpdq.ihe.IPixManagerAdapter;
 import org.openhealthexchange.openpixpdq.ihe.PatientBroker;
 import org.openhealthexchange.openpixpdq.ihe.audit.IheAuditTrail;
-import org.openhealthexchange.openpixpdq.ihe.impl_v2.MockMessageStoreLogger;
 import org.openhealthexchange.openpixpdq.ihe.impl_v2.PdSupplier;
 import org.openhealthexchange.openpixpdq.ihe.impl_v2.PixManager;
 import org.openhealthexchange.openpixpdq.ihe.log.IMessageStoreLogger;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openpixpdq-svn] SF.net SVN: openpixpdq:[258] trunk/OpenPIXPDQ

From: <we...@us...> - 2009-03-06 17:34:33

Revision: 258
          http://openpixpdq.svn.sourceforge.net/openpixpdq/?rev=258&view=rev
Author:   wenzhi
Date:     2009-03-06 17:34:30 +0000 (Fri, 06 Mar 2009)

Log Message:
-----------
Modified the build script - Pull the jar from OpenPIXPDQ to OpenWeb instead of pushing the jar to OpenWeb.

Modified Paths:
--------------
    trunk/OpenPIXPDQ/build.properties
    trunk/OpenPIXPDQ/build.xml

Modified: trunk/OpenPIXPDQ/build.properties
===================================================================
--- trunk/OpenPIXPDQ/build.properties	2009-03-06 17:31:30 UTC (rev 257)
+++ trunk/OpenPIXPDQ/build.properties	2009-03-06 17:34:30 UTC (rev 258)
@@ -3,4 +3,3 @@
 src.dir=./src/java
 jar.name=openpixpdq.jar
 openempi.adapter.lib.dir=../OpenEmpiAdapter/lib
-open.web.lib.dir=../MessageStore/Web/WEB-INF/lib
\ No newline at end of file

Modified: trunk/OpenPIXPDQ/build.xml
===================================================================
--- trunk/OpenPIXPDQ/build.xml	2009-03-06 17:31:30 UTC (rev 257)
+++ trunk/OpenPIXPDQ/build.xml	2009-03-06 17:34:30 UTC (rev 258)
@@ -64,28 +64,6 @@
 		<copy todir="${openempi.adapter.lib.dir}">
 			<fileset file="${dist.root}/${jar.name}" />
 		</copy>
-		<!-- Copy libraries to OpenWEb lib -->
-		<copy todir="${open.web.lib.dir}">
-			<fileset file="${dist.root}/${jar.name}" />
-			<fileset dir="${lib.src}">
-				<include name="*.jar" />
-			</fileset>
-			<fileset dir="${lib.src}/apache-commons">
-				<include name="*.jar" />
-			</fileset>
-			<fileset dir="${lib.src}/axis2-1.3">
-				<include name="*.jar" />
-			</fileset>
-			<fileset dir="${lib.src}/beepcore">
-				<include name="*.jar" />
-			</fileset>
-			<fileset dir="${lib.src}/braid">
-				<include name="*.jar" />
-			</fileset>
-			<fileset dir="${lib.src}/jaxb">
-				<include name="*.jar" />
-			</fileset>
-		</copy>
 	</target>
 
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openpixpdq-svn] SF.net SVN: openpixpdq:[257] trunk/OpenEmpiAdapter

From: <we...@us...> - 2009-03-06 17:31:36

Revision: 257
          http://openpixpdq.svn.sourceforge.net/openpixpdq/?rev=257&view=rev
Author:   wenzhi
Date:     2009-03-06 17:31:30 +0000 (Fri, 06 Mar 2009)

Log Message:
-----------
Modified the build script - Pull the jar from OpenEMPIAdapter to OpenWeb instead of pushing the jar to OpenWeb.

Modified Paths:
--------------
    trunk/OpenEmpiAdapter/build.properties
    trunk/OpenEmpiAdapter/build.xml
    trunk/OpenEmpiAdapter/lib/openpixpdq.jar

Added Paths:
-----------
    trunk/OpenEmpiAdapter/src/java/META-INF/
    trunk/OpenEmpiAdapter/src/java/META-INF/MANIFEST.MF

Modified: trunk/OpenEmpiAdapter/build.properties
===================================================================
--- trunk/OpenEmpiAdapter/build.properties	2009-03-05 20:54:27 UTC (rev 256)
+++ trunk/OpenEmpiAdapter/build.properties	2009-03-06 17:31:30 UTC (rev 257)
@@ -2,4 +2,3 @@
 lib.src=./lib
 src.dir=./src/java
 jar.name=openempi-adapter.jar
-open.web.lib.dir=../MessageStore/Web/WEB-INF/lib
\ No newline at end of file

Modified: trunk/OpenEmpiAdapter/build.xml
===================================================================
--- trunk/OpenEmpiAdapter/build.xml	2009-03-05 20:54:27 UTC (rev 256)
+++ trunk/OpenEmpiAdapter/build.xml	2009-03-06 17:31:30 UTC (rev 257)
@@ -52,10 +52,5 @@
 		<echo message="Deleting temporary directory:[${build.root}]" />
 		<delete dir="${build.root}" />
 
-		<!-- Copy openempi-adapter.jar and libraries to OpenWeb lib -->
-		<copy todir="${open.web.lib.dir}">
-			<fileset file="${dist.root}/${jar.name}" />
-			
-		</copy>
 	</target>
 </project>

Modified: trunk/OpenEmpiAdapter/lib/openpixpdq.jar
===================================================================
(Binary files differ)

Added: trunk/OpenEmpiAdapter/src/java/META-INF/MANIFEST.MF
===================================================================
--- trunk/OpenEmpiAdapter/src/java/META-INF/MANIFEST.MF	                        (rev 0)
+++ trunk/OpenEmpiAdapter/src/java/META-INF/MANIFEST.MF	2009-03-06 17:31:30 UTC (rev 257)
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Class-Path: 
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openpixpdq-svn] SF.net SVN: openpixpdq:[256] trunk/OpenWeb/src

From: <we...@us...> - 2009-03-05 20:54:32

Revision: 256
          http://openpixpdq.svn.sourceforge.net/openpixpdq/?rev=256&view=rev
Author:   wenzhi
Date:     2009-03-05 20:54:27 +0000 (Thu, 05 Mar 2009)

Log Message:
-----------
Replace log4j.properties with log4j.xml.

Added Paths:
-----------
    trunk/OpenWeb/src/log4j.xml

Removed Paths:
-------------
    trunk/OpenWeb/src/log4j.properties

Deleted: trunk/OpenWeb/src/log4j.properties
===================================================================
--- trunk/OpenWeb/src/log4j.properties	2009-03-04 17:13:36 UTC (rev 255)
+++ trunk/OpenWeb/src/log4j.properties	2009-03-05 20:54:27 UTC (rev 256)
@@ -1,9 +0,0 @@
-log4j.rootCategory=info, console
-
-log4j.appender.console=org.apache.log4j.ConsoleAppender
-log4j.appender.console.layout=org.apache.log4j.PatternLayout
-log4j.appender.console.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n
-
-log4j.logger.org.openhealthexchange.messagelog.action=debug
-l
-#log4j.category.org.hibernate.type=debug

Added: trunk/OpenWeb/src/log4j.xml
===================================================================
--- trunk/OpenWeb/src/log4j.xml	                        (rev 0)
+++ trunk/OpenWeb/src/log4j.xml	2009-03-05 20:54:27 UTC (rev 256)
@@ -0,0 +1,285 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<!-- ===================================================================== -->
+<!--                                                                       -->
+<!--  Log4j Configuration                                                  -->
+<!--                                                                       -->
+<!-- ===================================================================== -->
+
+<!-- $Id: log4j.xml,v 1.14 2008/06/06 16:01:01 sunquestindia\joshiv Exp $ -->
+
+<!--
+   | For more configuration infromation and examples see the Jakarta Log4j
+   | owebsite: http://jakarta.apache.org/log4j
+ -->
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+
+   <!-- ================================= -->
+   <!-- Preserve messages in a local file -->
+   <!-- ================================= -->
+
+
+   <!-- A size based file rolling appender -->
+   <appender name="FILE" class="org.apache.log4j.RollingFileAppender">
+     <param name="File" value="OpenPIXPDQ.log"/>
+     <param name="Append" value="false"/>
+     <param name="MaxFileSize" value="500KB"/>
+     <param name="MaxBackupIndex" value="1"/>
+
+     <layout class="org.apache.log4j.PatternLayout">
+       <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/>
+     </layout>	    
+   </appender>
+
+   <!-- ============================== -->
+   <!-- Append messages to the console -->
+   <!-- ============================== -->
+
+   <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+      <param name="Target" value="System.out"/>
+      <param name="Threshold" value="INFO"/>
+
+      <layout class="org.apache.log4j.PatternLayout">
+         <!-- The default pattern: Date Priority [Category] Message\n -->
+         <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
+      </layout>
+   </appender>
+
+   <!-- ====================== -->
+   <!-- More Appender examples -->
+   <!-- ====================== -->
+
+   <!-- Buffer events and log them asynchronously
+   <appender name="ASYNC" class="org.apache.log4j.AsyncAppender">
+     <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+     <appender-ref ref="FILE"/>
+     <appender-ref ref="CONSOLE"/>
+     <appender-ref ref="SMTP"/>
+   </appender>
+   -->
+
+   <!-- EMail events to an administrator
+   <appender name="SMTP" class="org.apache.log4j.net.SMTPAppender">
+     <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+     <param name="Threshold" value="ERROR"/>
+     <param name="To" value="ad...@my..."/>
+     <param name="From" value="no...@my..."/>
+     <param name="Subject" value="JBoss Sever Errors"/>
+     <param name="SMTPHost" value="localhost"/>
+     <param name="BufferSize" value="10"/>
+     <layout class="org.apache.log4j.PatternLayout">
+       <param name="ConversionPattern" value="[%d{ABSOLUTE},%c{1}] %m%n"/>
+     </layout>
+   </appender>
+   -->
+
+   <!-- Syslog events
+   <appender name="SYSLOG" class="org.apache.log4j.net.SyslogAppender">
+     <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+     <param name="Facility" value="LOCAL7"/>
+     <param name="FacilityPrinting" value="true"/>
+     <param name="SyslogHost" value="localhost"/>
+     <layout class="org.apache.log4j.PatternLayout">
+       <param name="ConversionPattern" value="[%d{ABSOLUTE},%c{1}] %m%n"/>
+     </layout>
+   </appender>
+   -->
+
+   <!-- Log events to JMS (requires a topic to be created)
+   <appender name="JMS" class="org.apache.log4j.net.JMSAppender">
+     <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+     <param name="Threshold" value="ERROR"/>
+     <param name="TopicConnectionFactoryBindingName" value="java:/ConnectionFactory"/>
+     <param name="TopicBindingName" value="topic/MyErrorsTopic"/>
+   </appender>
+   -->
+
+   <!-- Log events through SNMP
+   <appender name="TRAP_LOG" class="org.apache.log4j.ext.SNMPTrapAppender">
+     <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+     <param name="ImplementationClassName" value="org.apache.log4j.ext.JoeSNMPTrapSender"/>
+     <param name="ManagementHost" value="127.0.0.1"/>
+     <param name="ManagementHostTrapListenPort" value="162"/>
+     <param name="EnterpriseOID" value="1.3.6.1.4.1.24.0"/>
+     <param name="LocalIPAddress" value="127.0.0.1"/>
+     <param name="LocalTrapSendPort" value="161"/>
+     <param name="GenericTrapType" value="6"/>
+     <param name="SpecificTrapType" value="12345678"/>
+     <param name="CommunityString" value="public"/>
+     <param name="ForwardStackTraceWithTrap" value="true"/>
+     <param name="Threshold" value="DEBUG"/>
+     <param name="ApplicationTrapOID" value="1.3.6.1.4.1.24.12.10.22.64"/>
+     <layout class="org.apache.log4j.PatternLayout">
+            <param name="ConversionPattern" value="%d,%p,[%t],[%c],%m%n"/>
+     </layout>
+   </appender>
+   -->
+
+   <!--  Emit events as JMX notifications
+   <appender name="JMX" class="org.jboss.monitor.services.JMXNotificationAppender">
+      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+      
+      <param name="Threshold" value="WARN"/>
+      <param name="ObjectName" value="jboss.system:service=Logging,type=JMXNotificationAppender"/>
+      
+      <layout class="org.apache.log4j.PatternLayout">
+         <param name="ConversionPattern" value="%d %-5p [%c] %m"/>
+      </layout>
+   </appender>
+   -->
+   
+   <!-- ================ -->
+   <!-- Limit categories -->
+   <!-- ================ -->
+
+	<!-- Limit the org.openhealthexchange.openpixpdq category-->
+	<category name="org.openhealthexchange.openpixpdq">
+		<priority value="INFO" />
+	</category>
+
+	<!-- Limit the com.misyshealthcare.connect category-->
+	<category name="com.misyshealthcare.connect">
+		<priority value="INFO" />
+	</category>
+
+	<!-- Limit the ca.uhn.hl7v2 (HAPI API) category -->
+	<category name="ca.uhn.hl7v2">
+		<priority value="INFO" />
+	</category>
+	<category name="ca.uhn.hl7v2.app">
+		<priority value="WARN" />
+	</category>
+
+   <!-- Limit the org.apache category to INFO as its DEBUG is verbose -->
+   <category name="org.apache">
+      <priority value="INFO"/>
+   </category>
+
+   <!-- Limit the org.hibernate category to WARN -->
+   <category name="org.hibernate">
+      <priority value="WARN"/>
+   </category>
+
+   <!-- Limit the org.jgroups category to WARN as its INFO is verbose -->
+   <category name="org.jgroups">
+      <priority value="WARN"/>
+   </category>
+
+   <!-- Limit jboss axis to INFO as its DEBUG is even more verbose -->
+   <category name="org.jboss.axis">
+      <priority value="INFO"/>
+   </category>
+
+   <!-- Limit JBoss categories
+   <category name="org.jboss">
+      <priority value="INFO"/>
+   </category>
+   -->
+
+   <!-- Limit the JSR77 categories -->
+   <category name="org.jboss.management">
+      <priority value="INFO"/>
+   </category>
+
+   <!-- Limit JBoss webservice category
+   <category name="org.jboss.webservice">
+      <priority value="DEBUG"/>
+   </category>
+   -->
+
+   <!-- Decrease the priority threshold for the org.jboss.varia category
+   <category name="org.jboss.varia">
+     <priority value="DEBUG"/>
+   </category>
+   -->
+
+   <!-- Show the evolution of the DataSource pool in the logs [inUse/Available/Max]
+   <category name="org.jboss.resource.connectionmanager.JBossManagedConnectionPool">
+     <priority value="TRACE" class="org.jboss.logging.XLevel"/>
+   </category>
+   -->
+
+   <!--
+      | An example of enabling the custom TRACE level priority that is used
+      | by the JBoss internals to diagnose low level details. This example
+      | turns on TRACE level msgs for the org.jboss.ejb.plugins package and its
+      | subpackages. This will produce A LOT of logging output.
+   <category name="org.jboss.system">
+     <priority value="TRACE" class="org.jboss.logging.XLevel"/>
+   </category>
+   <category name="org.jboss.ejb.plugins">
+     <priority value="TRACE" class="org.jboss.logging.XLevel"/>
+   </category>
+   -->
+  
+   <!--
+       | Logs these events to SNMP:
+           - server starts/stops
+           - cluster evolution (node death/startup)
+           - When an EJB archive is deployed (and associated verified messages)
+           - When an EAR archive is deployed
+      	 
+   <category name="org.jboss.system.server.Server">
+     <priority value="INFO" />
+     <appender-ref ref="TRAP_LOG"/>
+   </category>
+  
+   <category name="org.jboss.ha.framework.interfaces.HAPartition.lifecycle">
+     <priority value="INFO" />
+     <appender-ref ref="TRAP_LOG"/>
+   </category>
+
+   <category name="org.jboss.deployment.MainDeployer">
+     <priority value="ERROR" />
+     <appender-ref ref="TRAP_LOG"/>
+   </category>
+   
+   <category name="org.jboss.ejb.EJBDeployer">
+     <priority value="INFO" />
+     <appender-ref ref="TRAP_LOG"/>
+   </category>
+   
+   <category name="org.jboss.deployment.EARDeployer">
+     <priority value="INFO" />
+     <appender-ref ref="TRAP_LOG"/>
+   </category>
+  
+   -->
+
+   <!-- ======================= -->
+   <!-- Setup the Root category -->
+   <!-- ======================= -->
+
+   <root>
+      <appender-ref ref="CONSOLE"/>
+      <appender-ref ref="FILE"/>
+   </root>
+
+   <!-- Clustering logging -->
+   <!-- Uncomment the following to redirect the org.jgroups and
+      org.jboss.ha categories to a cluster.log file.
+
+   <appender name="CLUSTER" class="org.jboss.logging.appender.RollingFileAppender">
+     <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+     <param name="File" value="${jboss.server.home.dir}/log/cluster.log"/>
+     <param name="Append" value="false"/>
+     <param name="MaxFileSize" value="500KB"/>
+     <param name="MaxBackupIndex" value="1"/>
+
+     <layout class="org.apache.log4j.PatternLayout">
+       <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/>
+     </layout>
+   </appender>
+   <category name="org.jgroups">
+     <priority value="DEBUG" />
+     <appender-ref ref="CLUSTER"/>
+   </category>
+   <category name="org.jboss.ha">
+     <priority value="DEBUG" />
+     <appender-ref ref="CLUSTER"/>
+   </category>
+   -->
+
+</log4j:configuration>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openpixpdq-svn] SF.net SVN: openpixpdq:[255] trunk/OpenPIXPDQ/src/test/org/ openhealthexchange/openpixpdq/integrationtests

From: <we...@us...> - 2009-03-04 17:13:47

Revision: 255
          http://openpixpdq.svn.sourceforge.net/openpixpdq/?rev=255&view=rev
Author:   wenzhi
Date:     2009-03-04 17:13:36 +0000 (Wed, 04 Mar 2009)

Log Message:
-----------
Added more tests based on Connectathon scenarios.

Modified Paths:
--------------
    trunk/OpenPIXPDQ/src/test/org/openhealthexchange/openpixpdq/integrationtests/PdqMoreTest.java
    trunk/OpenPIXPDQ/src/test/org/openhealthexchange/openpixpdq/integrationtests/PixUpdateNotificationTest.java

Modified: trunk/OpenPIXPDQ/src/test/org/openhealthexchange/openpixpdq/integrationtests/PdqMoreTest.java
===================================================================
--- trunk/OpenPIXPDQ/src/test/org/openhealthexchange/openpixpdq/integrationtests/PdqMoreTest.java	2009-03-04 15:52:22 UTC (rev 254)
+++ trunk/OpenPIXPDQ/src/test/org/openhealthexchange/openpixpdq/integrationtests/PdqMoreTest.java	2009-03-04 17:13:36 UTC (rev 255)
@@ -115,5 +115,114 @@
 		}
 	}
 
+	/**
+	 * Test PDQ: Exact Last Name and Address Line1 Search (found one exact matching patient)
+     *    PID.5.1 = MOORE   (Last Name)
+     *    PID.11.1 = 10 PINETREE  (Address Line1)
+	 */
+	public void testLastNameAddressLine1Search() {
+		try {
+			// PDQ Request Message: 
+			String msg = "MSH|^~\\&|MESA_PD_CONSUMER|MESA_DEPARTMENT|MESA_PD_SUPPLIER|XYZ_HOSPITAL|||QBP^Q22|11311110|P|2.5||||||||\r" + 
+		      "QPD|IHE PDQ Query|QRY11311110|@PID.5.1^MOORE~@PID.11.1^10 PINETREE|||||^^^HIMSS2005&1.3.6.1.4.1.21367.2005.1.1&ISO\r" +
+		      "RCP|I|10^RD|||||";
+	
+			PipeParser pipeParser = new PipeParser();
+			Message adt = pipeParser.parse(msg);
+			
+			Initiator initiator = connection.getInitiator();
+			Message response = initiator.sendAndReceive(adt);
+			String responseString = pipeParser.encode(response);	        
+			//System.out.println("Received response:\n" + responseString);
+			MSA msa = (MSA)response.get("MSA");
+			assertEquals("AA", msa.getAcknowledgmentCode().getValue());
+			QAK qak = (QAK)response.get("QAK");
+			assertEquals("OK", qak.getQueryResponseStatus().getValue());
+			RSP_K21_QUERY_RESPONSE qrs = ((RSP_K21)response).getQUERY_RESPONSE();
+			PID pid = qrs.getPID();
+			assertEquals("MOORE", pid.getPatientName(0).getFamilyName().getSurname().getValue());
+			assertEquals("CHIP", pid.getPatientName(0).getGivenName().getValue());
 
+		}catch(Exception e) {
+			e.printStackTrace();
+			fail("Fail to test PDQ last name and address line1 search");
+		}
+	}
+	/**
+	 * Test PDQ: Exact Last Name and Address Line1 Search (found one exact matching patient)
+     *    PID.5.1.1 = MOORE   (Last Name)
+     *    PID.11.1.1^10 PINETREE  (Address Line1)
+	 */
+	public void testLastNameStreetLine1Search2() {
+		try {
+//			MSH|^~\&|PAT_IDENTITY_X_REF_MGR_MISYS_TLS|ALLSCRIPTS|OTHER_IBM_BRIDGE_TLS|IBM|20090226141540-0500||RSP^K22|OpenPIXPDQ10.243.0.65.19770811854243|P|2.5
+//			MSA|AA|6880881378099874844
+//			QAK|6058651775104617438922166242613|OK||4|4|0
+//			QPD|Q22^Find Candidates^HL7|6058651775104617438922166242613|@PID.5.1.1^MOORE~@PID.11.1.1^10 PINETREE
+		
+//			MSH|^~\&|OTHER_IBM_BRIDGE_TLS|IBM|PAT_IDENTITY_X_REF_MGR_MISYS|ALLSCRIPTS|20090226131543-0600||QBP^Q22^QBP_Q21|6880881378099874844|P|2.5
+//			QPD|Q22^Find Candidates^HL7|6058651775104617438922166242613|@PID.5.1.1^MOORE~@PID.11.1.1^10 PINETREE
+//			RCP|I|10^RD			
+			// PDQ Request Message: 
+			String msg = "MSH|^~\\&|OTHER_IBM_BRIDGE_TLS|IBM|PAT_IDENTITY_X_REF_MGR_MISYS|ALLSCRIPTS|20090226131543-0600||QBP^Q22^QBP_Q21|6880881378099874844|P|2.5\r" + 
+		      "QPD|Q22^Find Candidates^HL7|6058651775104617438922166242613|@PID.5.1.1^MOORE~@PID.11.1.1^10 PINETREE\r" +
+		      "RCP|I|10^RD";
+	
+			PipeParser pipeParser = new PipeParser();
+			Message adt = pipeParser.parse(msg);
+			
+			Initiator initiator = connection.getInitiator();
+			Message response = initiator.sendAndReceive(adt);
+			String responseString = pipeParser.encode(response);	        
+			//System.out.println("Received response:\n" + responseString);
+			MSA msa = (MSA)response.get("MSA");
+			assertEquals("AA", msa.getAcknowledgmentCode().getValue());
+			QAK qak = (QAK)response.get("QAK");
+			assertEquals("OK", qak.getQueryResponseStatus().getValue());
+			RSP_K21_QUERY_RESPONSE qrs = ((RSP_K21)response).getQUERY_RESPONSE();
+			PID pid = qrs.getPID();
+			assertEquals("MOORE", pid.getPatientName(0).getFamilyName().getSurname().getValue());
+			assertEquals("CHIP", pid.getPatientName(0).getGivenName().getValue());
+
+		}catch(Exception e) {
+			e.printStackTrace();
+			fail("Fail to test PDQ last name and AddressLine1 search");
+		}
+	}	
+
+	
+	/**
+	 * Test PDQ: Exact Last Name and Address Line1 Search (found one exact matching patient)
+     *    PID.5.1 = MO*   (Last Name)
+     *    PID.8 = F (Sex)
+	 */
+	public void testPartialLastNameSexSearch() {
+		try {
+			// PDQ Request Message: 
+			String msg = "MSH|^~\\&|MESA_PD_CONSUMER|MESA_DEPARTMENT|MESA_PD_SUPPLIER|XYZ_HOSPITAL|||QBP^Q22|11311110|P|2.5||||||||\r" + 
+		      "QPD|IHE PDQ Query|QRY11311110|@PID.5.1^MO*~@PID.8^F|||||^^^HIMSS2005&1.3.6.1.4.1.21367.2005.1.1&ISO\r" +
+		      "RCP|I|10^RD|||||";
+	
+			PipeParser pipeParser = new PipeParser();
+			Message adt = pipeParser.parse(msg);
+			
+			Initiator initiator = connection.getInitiator();
+			Message response = initiator.sendAndReceive(adt);
+			String responseString = pipeParser.encode(response);	        
+			//System.out.println("Received response:\n" + responseString);
+			MSA msa = (MSA)response.get("MSA");
+			assertEquals("AA", msa.getAcknowledgmentCode().getValue());
+			QAK qak = (QAK)response.get("QAK");
+			assertEquals("OK", qak.getQueryResponseStatus().getValue());
+			RSP_K21_QUERY_RESPONSE qrs = ((RSP_K21)response).getQUERY_RESPONSE();
+			PID pid = qrs.getPID();
+			assertEquals("MOHR", pid.getPatientName(0).getFamilyName().getSurname().getValue());
+			assertEquals("ALICE", pid.getPatientName(0).getGivenName().getValue());
+
+		}catch(Exception e) {
+			e.printStackTrace();
+			fail("Fail to test PDQ partial last name and sex search");
+		}
+	}
+
 }

Modified: trunk/OpenPIXPDQ/src/test/org/openhealthexchange/openpixpdq/integrationtests/PixUpdateNotificationTest.java
===================================================================
--- trunk/OpenPIXPDQ/src/test/org/openhealthexchange/openpixpdq/integrationtests/PixUpdateNotificationTest.java	2009-03-04 15:52:22 UTC (rev 254)
+++ trunk/OpenPIXPDQ/src/test/org/openhealthexchange/openpixpdq/integrationtests/PixUpdateNotificationTest.java	2009-03-04 17:13:36 UTC (rev 255)
@@ -23,14 +23,12 @@
 import ca.uhn.hl7v2.parser.PipeParser;
 
 /**
- * Test PIX Manager transactions: PIX Feed and PIX Query. 
- * First PIX Query find one matching; the second Query found 
- * nothing.
+ * Test PIX Manager Update Notification Transactions. 
  * 
- * The sample came from Mesa tests 10501.
+ * The sample came from Connectathon 2009.
  * 
  * @author Wenzhi Li
- * @version 1.0, Jan 22, 2009
+ * @version 1.0, Feb 23, 2009
  */
 public class PixUpdateNotificationTest extends AbstractPixPdqTestCase {
 
@@ -50,7 +48,10 @@
 	}
 
 	/**
-	 * This one tests PIX Update Notification:
+	 * Before running this test, you need to configure at least one PIX Consumer
+	 * that accept PIX Update Notification. See relevant configuration docs. 
+	 * 
+	 * This test case tests PIX Update Notification:
 	 * <p>1. Create a patient in master (global) domain. ANDERS^MARIAN, 1944.04.04, Female, Addr=444 Main St., Seattle, WA, 36013.
 	 * This patient is admitted with the Master Assigning Authority value. 
 	 * </p> 
@@ -62,7 +63,14 @@
 	 * <p>4. The PIX Manager cross-references patient Marion Anders. The Update Notification is sent from the PIX Mgr to the PIX Consumer.
 	 * It contains ids from both the Local Assigning Authority of the PIX Source and the Master Assinging Authority.  
 	 * </p> 
-	 * 
+	 * <p>5. Note - the following steps are optional. Although they follow the scenario in the Technical Framework, not all PIX Managers will unlink the patients because of the address change. </br> 
+	 *  On the Local Patient Identity source, change Marian Ander's address to 111 New Street, Portland, Oregon. 
+	 * The PIX Mgr determines this patient is in the local domain is no longer the same patient as that in the master 
+	 * affinity domain. It sends an update notification to the Consumer with Marian Anders' patient id from the Local 
+	 * Assigning Authority.
+	 * PIX Manager sends a second update notification with Marian Anders' patient id from the Master Assigning Authority. 
+	 *  
+	 * </p>
 	 */
 	public void testPixUpdateNotification() {
 		try {
@@ -81,8 +89,8 @@
 			assertEquals("AA", msa.getAcknowledgementCode().getValue());
 			assertEquals("00000688", msa.getMessageControlID().getValue());
 	
-			//Wait for two ten seconds
-			Thread.sleep(10000);
+			//Wait for five seconds
+			Thread.sleep(5000);
 			
 			//Step 2: PIX Feed the same patient with Local patient id.
 			msg = "MSH|^~\\&|XDSDEMO_ADT|XDSDEMO|PAT_IDENTITY_X_REF_MGR_MISYSPLC|ALLSCRIPTS|200901271417||ADT^A04^ADT_A01|00000738|P|2.3.1||||||||\r" + 
@@ -97,7 +105,7 @@
 			assertEquals("AA", msa.getAcknowledgementCode().getValue());
 			assertEquals("00000738", msa.getMessageControlID().getValue());
 
-			Thread.sleep(10000);
+			Thread.sleep(5000);
 			//Step 3: PIX Update the local ANDERS 
 			msg = "MSH|^~\\&|MESA_ADT|DOMAIN1_ADMITTING|MESA_XREF|XYZ_HOSPITAL|200310011100||ADT^A08|10506104|P|2.3.1||||||||\r" + 
 		      "EVN||200310011100||||200310011043\r" +


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openpixpdq-svn] SF.net SVN: openpixpdq:[254] trunk/OpenPIXPDQ/src/java/org/ openhealthexchange/openpixpdq/ihe/impl_v2/PdQueryHandler.java

From: <we...@us...> - 2009-03-04 15:52:34

Revision: 254
          http://openpixpdq.svn.sourceforge.net/openpixpdq/?rev=254&view=rev
Author:   wenzhi
Date:     2009-03-04 15:52:22 +0000 (Wed, 04 Mar 2009)

Log Message:
-----------
Added PDQ search for AddressLine1 PID.11.1.1 

Modified Paths:
--------------
    trunk/OpenPIXPDQ/src/java/org/openhealthexchange/openpixpdq/ihe/impl_v2/PdQueryHandler.java

Modified: trunk/OpenPIXPDQ/src/java/org/openhealthexchange/openpixpdq/ihe/impl_v2/PdQueryHandler.java
===================================================================
--- trunk/OpenPIXPDQ/src/java/org/openhealthexchange/openpixpdq/ihe/impl_v2/PdQueryHandler.java	2009-03-04 15:38:53 UTC (rev 253)
+++ trunk/OpenPIXPDQ/src/java/org/openhealthexchange/openpixpdq/ihe/impl_v2/PdQueryHandler.java	2009-03-04 15:52:22 UTC (rev 254)
@@ -884,7 +884,8 @@
             else if (key.equalsIgnoreCase("@PID.8"))
                ret.setSex(SharedEnums.SexType.getByString(value));
             // PID-11 - Address
-            else if (key.equalsIgnoreCase("@PID.11.1")) {
+            else if (key.equalsIgnoreCase("@PID.11.1") || 
+            		 key.equalsIgnoreCase("@PID.11.1.1") ) {
                 if (address == null ) address = new Address();
                 address.setAddLine1( value );
             }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openpixpdq-svn] SF.net SVN: openpixpdq:[253] trunk/OpenEmpiAdapter/lib/braid-base-1.1.jar

From: <we...@us...> - 2009-03-04 15:39:04

Revision: 253
          http://openpixpdq.svn.sourceforge.net/openpixpdq/?rev=253&view=rev
Author:   wenzhi
Date:     2009-03-04 15:38:53 +0000 (Wed, 04 Mar 2009)

Log Message:
-----------
Updated braid lib

Modified Paths:
--------------
    trunk/OpenEmpiAdapter/lib/braid-base-1.1.jar

Modified: trunk/OpenEmpiAdapter/lib/braid-base-1.1.jar
===================================================================
(Binary files differ)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openpixpdq-svn] SF.net SVN: openpixpdq:[252] trunk/OpenPIXPDQ/lib/braid/braid-base-1.1.jar

From: <we...@us...> - 2009-03-04 15:38:48

Revision: 252
          http://openpixpdq.svn.sourceforge.net/openpixpdq/?rev=252&view=rev
Author:   wenzhi
Date:     2009-03-04 15:38:36 +0000 (Wed, 04 Mar 2009)

Log Message:
-----------
Updated braid lib

Modified Paths:
--------------
    trunk/OpenPIXPDQ/lib/braid/braid-base-1.1.jar

Modified: trunk/OpenPIXPDQ/lib/braid/braid-base-1.1.jar
===================================================================
(Binary files differ)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openpixpdq-svn] SF.net SVN: openpixpdq:[251] trunk/OpenWeb/src

From: <an...@us...> - 2009-03-03 14:34:28

Revision: 251
          http://openpixpdq.svn.sourceforge.net/openpixpdq/?rev=251&view=rev
Author:   anil114
Date:     2009-03-03 14:34:13 +0000 (Tue, 03 Mar 2009)

Log Message:
-----------
fixed hibernate session problem in message store

Modified Paths:
--------------
    trunk/OpenWeb/src/hibernate.cfg.xml
    trunk/OpenWeb/src/org/openhealthexchange/messagestore/dao/MessageStoreDAOImpl.java

Added Paths:
-----------
    trunk/OpenWeb/src/org/openhealthexchange/messagestore/service/HiberUtil.java

Modified: trunk/OpenWeb/src/hibernate.cfg.xml
===================================================================
--- trunk/OpenWeb/src/hibernate.cfg.xml	2009-03-01 10:07:59 UTC (rev 250)
+++ trunk/OpenWeb/src/hibernate.cfg.xml	2009-03-03 14:34:13 UTC (rev 251)
@@ -27,7 +27,7 @@
 
       <property name="show_sql">false</property>
  
-      <property name="hbm2ddl.auto">update</property>
+      <!-- property name="hbm2ddl.auto">update</property> -->
       
       <mapping resource="MessageStore.hbm.xml"/>
 </session-factory>

Modified: trunk/OpenWeb/src/org/openhealthexchange/messagestore/dao/MessageStoreDAOImpl.java
===================================================================
--- trunk/OpenWeb/src/org/openhealthexchange/messagestore/dao/MessageStoreDAOImpl.java	2009-03-01 10:07:59 UTC (rev 250)
+++ trunk/OpenWeb/src/org/openhealthexchange/messagestore/dao/MessageStoreDAOImpl.java	2009-03-03 14:34:13 UTC (rev 251)
@@ -10,10 +10,9 @@
 import org.hibernate.Criteria;
 import org.hibernate.HibernateException;
 import org.hibernate.Session;
-import org.hibernate.SessionFactory;
-import org.hibernate.cfg.Configuration;
 import org.hibernate.criterion.MatchMode;
 import org.hibernate.criterion.Restrictions;
+import org.openhealthexchange.messagestore.service.HiberUtil;
 import org.openhealthexchange.openpixpdq.ihe.log.MessageStore;
 
 /**
@@ -26,17 +25,15 @@
 	private static Logger log = Logger.getLogger(MessageStoreDAOImpl.class);
 	
 	public void saveLog(MessageStore messageLog){
-		Session session = null;
-		try{
-		SessionFactory sessionFactory = new Configuration().configure()
-				.buildSessionFactory();
-		session = sessionFactory.openSession();
-		org.hibernate.Transaction tx = session.beginTransaction();
-		//session.saveOrUpdate(messageLog);
-		session.save(messageLog);
-		tx.commit();
-		session.flush();
-		session.close();
+		try{		
+			Session session = HiberUtil.getSession();
+	        HiberUtil.beginTransaction();
+
+	        session.save(messageLog);
+
+	        HiberUtil.commitTransaction();
+	        HiberUtil.closeSession();
+		
 		}catch(HibernateException e){
 			log.error(e);			
 		}
@@ -51,9 +48,7 @@
 		Criteria crit = null;
 		List<MessageStore> messages = null;
 		try{
-		SessionFactory sessionFactory = new Configuration().configure()
-				.buildSessionFactory();
-		session = sessionFactory.openSession();
+		 session = HiberUtil.getSession();
 		crit = session.createCriteria(MessageStore.class);
 
 		if (messageLog.getIp() != null) {
@@ -105,7 +100,7 @@
 					.getReceivingApplication(), MatchMode.ANYWHERE));
 		}
 		messages = crit.list();
-		session.close();
+		HiberUtil.closeSession();
 		}catch(HibernateException e){
 			log.error(e);
 		}catch(Exception e){

Added: trunk/OpenWeb/src/org/openhealthexchange/messagestore/service/HiberUtil.java
===================================================================
--- trunk/OpenWeb/src/org/openhealthexchange/messagestore/service/HiberUtil.java	                        (rev 0)
+++ trunk/OpenWeb/src/org/openhealthexchange/messagestore/service/HiberUtil.java	2009-03-03 14:34:13 UTC (rev 251)
@@ -0,0 +1,111 @@
+package org.openhealthexchange.messagestore.service;
+
+import org.apache.log4j.Logger;
+import org.hibernate.SessionFactory;
+import org.hibernate.Session;
+import org.hibernate.Transaction;
+import org.hibernate.HibernateException;
+import org.hibernate.cfg.Configuration;
+import java.sql.Connection;
+import java.sql.SQLException;
+
+
+
+/**
+ * @author : Anil kumar
+ * @version : 1.0  March 03, 2009
+ */
+public class HiberUtil {
+    // TODO: Get the proper logging scheme later
+    private static Logger logger = Logger.getLogger(HiberUtil.class.getName());
+    private static final SessionFactory sessionFactory;
+
+
+    static {
+        try {
+            // Create the SessionFactory from hibernate.cfg.xml
+            Configuration config = new Configuration().configure();
+            sessionFactory = config.buildSessionFactory();
+        } catch (Throwable ex) {
+            // Make sure you log the exception, as it might be swallowed
+            System.err.println("Initial SessionFactory creation failed." + ex);
+            throw new ExceptionInInitializerError(ex);
+        }
+    }
+
+    private static final ThreadLocal<Session> threadSession = new ThreadLocal<Session>();
+    private static final ThreadLocal<Transaction> threadTransaction = new ThreadLocal<Transaction>();
+
+    public static Session getSession() {
+        Session session = threadSession.get();
+        try {
+            if(session == null) {
+
+            session = sessionFactory.openSession();
+            session.connection().setTransactionIsolation(Connection.TRANSACTION_READ_COMMITTED);
+            logger.info("Opened session for thread :" + Thread.currentThread().getId());
+            threadSession.set(session);
+            }
+        } catch(HibernateException e) {
+           logger.debug("Can not open session"+e);
+        } catch(SQLException e) {
+        	logger.debug("Can not open session"+e);
+        }
+        return threadSession.get();
+    }
+
+    public static void closeSession(){
+        try {
+            Session session = threadSession.get();
+            threadSession.set(null);
+            if(session != null && session.isOpen())
+                session.close();
+            logger.info("Closed session for thread :" + Thread.currentThread().getId());
+        } catch(HibernateException e) {
+        	logger.debug("Can not close session"+e);
+        }
+    }
+
+    public static void beginTransaction(){
+        Transaction tx = threadTransaction.get();
+        try {
+            if(tx == null) {
+                logger.info("Starting transaction for Thread : " + Thread.currentThread().getId());
+                tx = getSession().beginTransaction();
+                threadTransaction.set(tx);
+            }
+
+        } catch(HibernateException e) {
+        	logger.debug("Can not start transaction"+e);
+        }
+    }
+
+    public static void commitTransaction(){
+        Transaction tx = threadTransaction.get();
+        try {
+            if(tx != null && !tx.wasCommitted() && !tx.wasRolledBack()) {
+                logger.info("Commiting transaction for Thread : " + Thread.currentThread().getId());
+                tx.commit();
+            }
+            threadTransaction.set(null);
+        } catch(HibernateException e) {
+        	logger.debug("Can not commit transaction"+e);
+        }
+    }
+
+    public static void rollbackTransaction() {
+        Transaction tx = threadTransaction.get();
+        try {
+            threadTransaction.set(null);
+            if(tx != null && !tx.wasCommitted() && !tx.wasRolledBack()) {
+                logger.info("Trying to rollback transaction for Thread : " + Thread.currentThread().getId());
+                tx.rollback();
+            }
+        } catch(HibernateException e) {
+        	logger.debug("Can not rollback transaction"+e);
+        } finally {
+            closeSession();
+        }
+    }
+}
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openpixpdq-svn] SF.net SVN: openpixpdq:[250] trunk/OpenPIXPDQ

From: <an...@us...> - 2009-03-01 10:08:05

Revision: 250
          http://openpixpdq.svn.sourceforge.net/openpixpdq/?rev=250&view=rev
Author:   anil114
Date:     2009-03-01 10:07:59 +0000 (Sun, 01 Mar 2009)

Log Message:
-----------
Added licenses folder,
Removed build script errors

Modified Paths:
--------------
    trunk/OpenPIXPDQ/build.xml

Added Paths:
-----------
    trunk/OpenPIXPDQ/licenses/
    trunk/OpenPIXPDQ/licenses/FastInfoset-LICENSE.txt
    trunk/OpenPIXPDQ/licenses/XmlSchema-LICENSE.txt
    trunk/OpenPIXPDQ/licenses/activation-LICENSE.txt
    trunk/OpenPIXPDQ/licenses/annogen-LICENSE.txt
    trunk/OpenPIXPDQ/licenses/axiom-api-LICENSE.txt
    trunk/OpenPIXPDQ/licenses/axiom-dom-LICENSE.txt
    trunk/OpenPIXPDQ/licenses/axiom-impl-LICENSE.txt
    trunk/OpenPIXPDQ/licenses/axis2-LICENSE.txt
    trunk/OpenPIXPDQ/licenses/backport-util-concurrent-LICENSE.txt
    trunk/OpenPIXPDQ/licenses/bcmail-LICENSE.txt
    trunk/OpenPIXPDQ/licenses/bcprov-LICENSE.txt
    trunk/OpenPIXPDQ/licenses/beepcore-LICENSE.txt
    trunk/OpenPIXPDQ/licenses/beepsasl-LICENSE.txt
    trunk/OpenPIXPDQ/licenses/beeptls-LICENSE.txt
    trunk/OpenPIXPDQ/licenses/commons-codec-LICENSE.txt
    trunk/OpenPIXPDQ/licenses/commons-httpclient-LICENSE.txt
    trunk/OpenPIXPDQ/licenses/commons-logging-LICENSE.txt
    trunk/OpenPIXPDQ/licenses/jaxb-api-LICENSE.txt
    trunk/OpenPIXPDQ/licenses/jaxb-impl-LICENSE.txt
    trunk/OpenPIXPDQ/licenses/jaxb-libs-LICENSE.txt
    trunk/OpenPIXPDQ/licenses/jaxb-xjc-LICENSE.txt
    trunk/OpenPIXPDQ/licenses/jaxp-LICENSE.txt
    trunk/OpenPIXPDQ/licenses/jaxrpc-LICENSE.txt
    trunk/OpenPIXPDQ/licenses/jsr173-1_0-LICENSE.txt
    trunk/OpenPIXPDQ/licenses/junit-LICENSE.txt
    trunk/OpenPIXPDQ/licenses/log4j-LICENSE.txt
    trunk/OpenPIXPDQ/licenses/mail-LICENSE.txt
    trunk/OpenPIXPDQ/licenses/neethi-LICENSE.txt
    trunk/OpenPIXPDQ/licenses/relaxngDatatype-LICENSE.txt
    trunk/OpenPIXPDQ/licenses/saaj-LICENSE.txt
    trunk/OpenPIXPDQ/licenses/saaj-imple-LICENSE.txt
    trunk/OpenPIXPDQ/licenses/velocity-LICENSE.txt
    trunk/OpenPIXPDQ/licenses/wsdl4j-LICENSE.txt
    trunk/OpenPIXPDQ/licenses/xalan-LICENSE.txt
    trunk/OpenPIXPDQ/licenses/xbean-LICENSE.txt
    trunk/OpenPIXPDQ/licenses/xercesImpl-LICENSE.txt
    trunk/OpenPIXPDQ/licenses/xml-apis-LICENSE.txt
    trunk/OpenPIXPDQ/licenses/xsdlib-LICENSE.txt

Modified: trunk/OpenPIXPDQ/build.xml
===================================================================
--- trunk/OpenPIXPDQ/build.xml	2009-03-01 10:03:17 UTC (rev 249)
+++ trunk/OpenPIXPDQ/build.xml	2009-03-01 10:07:59 UTC (rev 250)
@@ -3,7 +3,7 @@
 	<property file="build.properties" />
 	<property name="build.root" location="temp" />
 	<property name="dist.root" location="dist" />
-	<property name="build.config" location="${build.root}/config" />
+	<property name="build.conf" location="${build.root}/config" />
 	<property name="build.classes" location="${build.root}/classes" />
 	<property name="build.lib" location="${build.root}/lib" />
 
@@ -37,8 +37,8 @@
 		</antcall>
 		<property name="built" value="true" />
 
-		<copy todir="${build.config}">
-			<fileset dir="${src.dir}/config" />
+		<copy todir="${build.conf}">
+			<fileset dir="conf" />
 		</copy>
 
 	</target>
@@ -48,7 +48,7 @@
 		<property name="initted" value="true" />
 
 		<mkdir dir="${build.root}" />
-		<mkdir dir="${build.config}"/>
+		<mkdir dir="${build.conf}"/>
 		<mkdir dir="${dist.root}" />
 	</target>
 


Property changes on: trunk/OpenPIXPDQ/licenses
___________________________________________________________________
Added: svn:mergeinfo
   + 

Added: trunk/OpenPIXPDQ/licenses/FastInfoset-LICENSE.txt
===================================================================
--- trunk/OpenPIXPDQ/licenses/FastInfoset-LICENSE.txt	                        (rev 0)
+++ trunk/OpenPIXPDQ/licenses/FastInfoset-LICENSE.txt	2009-03-01 10:07:59 UTC (rev 250)
@@ -0,0 +1,202 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+

Added: trunk/OpenPIXPDQ/licenses/XmlSchema-LICENSE.txt
===================================================================
--- trunk/OpenPIXPDQ/licenses/XmlSchema-LICENSE.txt	                        (rev 0)
+++ trunk/OpenPIXPDQ/licenses/XmlSchema-LICENSE.txt	2009-03-01 10:07:59 UTC (rev 250)
@@ -0,0 +1,202 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+

Added: trunk/OpenPIXPDQ/licenses/activation-LICENSE.txt
===================================================================
--- trunk/OpenPIXPDQ/licenses/activation-LICENSE.txt	                        (rev 0)
+++ trunk/OpenPIXPDQ/licenses/activation-LICENSE.txt	2009-03-01 10:07:59 UTC (rev 250)
@@ -0,0 +1,119 @@
+COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
+
+1. Definitions.
+
+1.1. Contributor means each individual or entity that creates or contributes to the creation of Modifications.
+
+1.2. Contributor Version means the combination of the Original Software, prior Modifications used by a Contributor (if any), and the Modifications made by that particular Contributor.
+
+1.3. Covered Software means (a) the Original Software, or (b) Modifications, or (c) the combination of files containing Original Software with files containing Modifications, in each case including portions thereof.
+
+1.4. Executable means the Covered Software in any form other than Source Code.
+
+1.5. Initial Developer means the individual or entity that first makes Original Software available under this License.
+
+1.6. Larger Work means a work which combines Covered Software or portions thereof with code not governed by the terms of this License.
+
+1.7. License means this document.
+
+1.8. Licensable means having the right to grant, to the maximum extent possible, whether at the time of the initial grant or subsequently acquired, any and all of the rights conveyed herein.
+
+1.9. Modifications means the Source Code and Executable form of any of the following:
+
+A. Any file that results from an addition to, deletion from or modification of the contents of a file containing Original Software or previous Modifications;
+
+B. Any new file that contains any part of the Original Software or previous Modification; or
+
+C. Any new file that is contributed or otherwise made available under the terms of this License.
+
+1.10. Original Software means the Source Code and Executable form of computer software code that is originally released under this License.
+
+1.11. Patent Claims means any patent claim(s), now owned or hereafter acquired, including without limitation, method, process, and apparatus claims, in any patent Licensable by grantor.
+
+1.12. Source Code means (a) the common form of computer software code in which modifications are made and (b) associated documentation included in or with such code.
+
+1.13. You (or Your) means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, You includes any entity which controls, is controlled by, or is under common control with You. For purposes of this definition, control means (a)�the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (b)�ownership of more than fifty percent (50%) of the outstanding shares or beneficial ownership of such entity.
+
+2. License Grants.
+
+2.1. The Initial Developer Grant.
+Conditioned upon Your compliance with Section 3.1 below and subject to third party intellectual property claims, the Initial Developer hereby grants You a world-wide, royalty-free, non-exclusive license:
+(a) under intellectual property rights (other than patent or trademark) Licensable by Initial Developer, to use, reproduce, modify, display, perform, sublicense and distribute the Original Software (or portions thereof), with or without Modifications, and/or as part of a Larger Work; and
+(b) under Patent Claims infringed by the making, using or selling of Original Software, to make, have made, use, practice, sell, and offer for sale, and/or otherwise dispose of the Original Software (or portions thereof).
+(c) The licenses granted in Sections�2.1(a) and (b) are effective on the date Initial Developer first distributes or otherwise makes the Original Software available to a third party under the terms of this License.
+(d) Notwithstanding Section�2.1(b) above, no patent license is granted: (1)�for code that You delete from the Original Software, or (2)�for infringements caused by: (i)�the modification of the Original Software, or (ii)�the combination of the Original Software with other software or devices.
+
+2.2. Contributor Grant.
+Conditioned upon Your compliance with Section 3.1 below and subject to third party intellectual property claims, each Contributor hereby grants You a world-wide, royalty-free, non-exclusive license:
+(a) under intellectual property rights (other than patent or trademark) Licensable by Contributor to use, reproduce, modify, display, perform, sublicense and distribute the Modifications created by such Contributor (or portions thereof), either on an unmodified basis, with other Modifications, as Covered Software and/or as part of a Larger Work; and
+(b) under Patent Claims infringed by the making, using, or selling of Modifications made by that Contributor either alone and/or in combination with its Contributor Version (or portions of such combination), to make, use, sell, offer for sale, have made, and/or otherwise dispose of: (1)�Modifications made by that Contributor (or portions thereof); and (2)�the combination of Modifications made by that Contributor with its Contributor Version (or portions of such combination).
+(c) The licenses granted in Sections�2.2(a) and 2.2(b) are effective on the date Contributor first distributes or otherwise makes the Modifications available to a third party.
+(d) Notwithstanding Section�2.2(b) above, no patent license is granted: (1)�for any code that Contributor has deleted from the Contributor Version; (2)�for infringements caused by: (i)�third party modifications of Contributor Version, or (ii)�the combination of Modifications made by that Contributor with other software (except as part of the Contributor Version) or other devices; or (3)�under Patent Claims infringed by Covered Software in the absence of Modifications made by that Contributor.
+
+3. Distribution Obligations.
+
+3.1. Availability of Source Code.
+
+Any Covered Software that You distribute or otherwise make available in Executable form must also be made available in Source Code form and that Source Code form must be distributed only under the terms of this License. You must include a copy of this License with every copy of the Source Code form of the Covered Software You distribute or otherwise make available. You must inform recipients of any such Covered Software in Executable form as to how they can obtain such Covered Software in Source Code form in a reasonable manner on or through a medium customarily used for software exchange.
+
+3.2. Modifications.
+
+The Modifications that You create or to which You contribute are governed by the terms of this License. You represent that You believe Your Modifications are Your original creation(s) and/or You have sufficient rights to grant the rights conveyed by this License.
+
+3.3. Required Notices.
+You must include a notice in each of Your Modifications that identifies You as the Contributor of the Modification. You may not remove or alter any copyright, patent or trademark notices contained within the Covered Software, or any notices of licensing or any descriptive text giving attribution to any Contributor or the Initial Developer.
+
+3.4. Application of Additional Terms.
+You may not offer or impose any terms on any Covered Software in Source Code form that alters or restricts the applicable version of this License or the recipients rights hereunder. You may choose to offer, and to charge a fee for, warranty, support, indemnity or liability obligations to one or more recipients of Covered Software. However, you may do so only on Your own behalf, and not on behalf of the Initial Developer or any Contributor. You must make it absolutely clear that any such warranty, support, indemnity or liability obligation is offered by You alone, and You hereby agree to indemnify the Initial Developer and every Contributor for any liability incurred by the Initial Developer or such Contributor as a result of warranty, support, indemnity or liability terms You offer.
+
+3.5. Distribution of Executable Versions.
+You may distribute the Executable form of the Covered Software under the terms of this License or under the terms of a license of Your choice, which may contain terms different from this License, provided that You are in compliance with the terms of this License and that the license for the Executable form does not attempt to limit or alter the recipients rights in the Source Code form from the rights set forth in this License. If You distribute the Covered Software in Executable form under a different license, You must make it absolutely clear that any terms which differ from this License are offered by You alone, not by the Initial Developer or Contributor. You hereby agree to indemnify the Initial Developer and every Contributor for any liability incurred by the Initial Developer or such Contributor as a result of any such terms You offer.
+
+3.6. Larger Works.
+You may create a Larger Work by combining Covered Software with other code not governed by the terms of this License and distribute the Larger Work as a single product. In such a case, You must make sure the requirements of this License are fulfilled for the Covered Software.
+
+4. Versions of the License.
+
+4.1. New Versions.
+Sun Microsystems, Inc. is the initial license steward and may publish revised and/or new versions of this License from time to time. Each version will be given a distinguishing version number. Except as provided in Section 4.3, no one other than the license steward has the right to modify this License.
+
+4.2. Effect of New Versions.
+
+You may always continue to use, distribute or otherwise make the Covered Software available under the terms of the version of the License under which You originally received the Covered Software. If the Initial Developer includes a notice in the Original Software prohibiting it from being distributed or otherwise made available under any subsequent version of the License, You must distribute and make the Covered Software available under the terms of the version of the License under which You originally received the Covered Software. Otherwise, You may also choose to use, distribute or otherwise make the Covered Software available under the terms of any subsequent version of the License published by the license steward.
+4.3. Modified Versions.
+
+When You are an Initial Developer and You want to create a new license for Your Original Software, You may create and use a modified version of this License if You: (a)�rename the license and remove any references to the name of the license steward (except to note that the license differs from this License); and (b)�otherwise make it clear that the license contains terms which differ from this License.
+
+5. DISCLAIMER OF WARRANTY.
+
+COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN AS IS BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED SOFTWARE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED SOFTWARE IS WITH YOU. SHOULD ANY COVERED SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
+
+6. TERMINATION.
+
+6.1. This License and the rights granted hereunder will terminate automatically if You fail to comply with terms herein and fail to cure such breach within 30 days of becoming aware of the breach. Provisions which, by their nature, must remain in effect beyond the termination of this License shall survive.
+
+6.2. If You assert a patent infringement claim (excluding declaratory judgment actions) against Initial Developer or a Contributor (the Initial Developer or Contributor against whom You assert such claim is referred to as Participant) alleging that the Participant Software (meaning the Contributor Version where the Participant is a Contributor or the Original Software where the Participant is the Initial Developer) directly or indirectly infringes any patent, then any and all rights granted directly or indirectly to You by such Participant, the Initial Developer (if the Initial Developer is not the Participant) and all Contributors under Sections�2.1 and/or 2.2 of this License shall, upon 60 days notice from Participant terminate prospectively and automatically at the expiration of such 60 day notice period, unless if within such 60 day period You withdraw Your claim with respect to the Participant Software against such Participant either unilaterally or pursuant to a written agreement with Participant.
+
+6.3. In the event of termination under Sections�6.1 or 6.2 above, all end user licenses that have been validly granted by You or any distributor hereunder prior to termination (excluding licenses granted to You by any distributor) shall survive termination.
+
+7. LIMITATION OF LIABILITY.
+
+UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED SOFTWARE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOST PROFITS, LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SUCH PARTYS NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
+
+8. U.S. GOVERNMENT END USERS.
+
+The Covered Software is a commercial item, as that term is defined in 48�C.F.R.�2.101 (Oct. 1995), consisting of commercial computer software (as that term is defined at 48 C.F.R. �252.227-7014(a)(1)) and commercial computer software documentation as such terms are used in 48�C.F.R.�12.212 (Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all U.S. Government End Users acquire Covered Software with only those rights set forth herein. This U.S. Government Rights clause is in lieu of, and supersedes, any other FAR, DFAR, or other clause or provision that addresses Government rights in computer software under this License.
+
+9. MISCELLANEOUS.
+
+This License represents the complete agreement concerning subject matter hereof. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable. This License shall be governed by the law of the jurisdiction specified in a notice contained within the Original Software (except to the extent applicable law, if any, provides otherwise), excluding such jurisdictions conflict-of-law provisions. Any litigation relating to this License shall be subject to the jurisdiction of the courts located in the jurisdiction and venue specified in a notice contained within the Original Software, with the losing party responsible for costs, including, without limitation, court costs and reasonable attorneys fees and expenses. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any law or regulation which provides that the language of a contract shall be construed against the drafter shall not apply to this License. You agree that You alone are responsible for compliance with the United States export administration regulations (and the export control laws and regulation of any other countries) when You use, distribute or otherwise make available any Covered Software.
+
+10. RESPONSIBILITY FOR CLAIMS.
+
+As between Initial Developer and the Contributors, each party is responsible for claims and damages arising, directly or indirectly, out of its utilization of rights under this License and You agree to work with Initial Developer and Contributors to distribute such responsibility on an equitable basis. Nothing herein is intended or shall be deemed to constitute any admission of liability.
+
+NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL)
+The GlassFish code released under the CDDL shall be governed by the laws of the State of California (excluding conflict-of-law provisions). Any litigation relating to this License shall be subject to the jurisdiction of the Federal Courts of the Northern District of California and the state courts of the State of California, with venue lying in Santa Clara County, California. 
+
+
+

Added: trunk/OpenPIXPDQ/licenses/annogen-LICENSE.txt
===================================================================
--- trunk/OpenPIXPDQ/licenses/annogen-LICENSE.txt	                        (rev 0)
+++ trunk/OpenPIXPDQ/licenses/annogen-LICENSE.txt	2009-03-01 10:07:59 UTC (rev 250)
@@ -0,0 +1,202 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+

Added: trunk/OpenPIXPDQ/licenses/axiom-api-LICENSE.txt
===================================================================
--- trunk/OpenPIXPDQ/licenses/axiom-api-LICENSE.txt	                        (rev 0)
+++ trunk/OpenPIXPDQ/licenses/axiom-api-LICENSE.txt	2009-03-01 10:07:59 UTC (rev 250)
@@ -0,0 +1,202 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent Li...
 
[truncated message content]

[Openpixpdq-svn] SF.net SVN: openpixpdq:[249] trunk/OpenWeb

From: <an...@us...> - 2009-03-01 10:03:31

Revision: 249
          http://openpixpdq.svn.sourceforge.net/openpixpdq/?rev=249&view=rev
Author:   anil114
Date:     2009-03-01 10:03:17 +0000 (Sun, 01 Mar 2009)

Log Message:
-----------
Updated UI styles,
Checking nulls,
Added servlet-api.jar and removed sqlserver jars
updated build scripts to run OpenPIXPDQ and OpenEmpiAdapter buils

Modified Paths:
--------------
    trunk/OpenWeb/Web/css/jmesa.css
    trunk/OpenWeb/Web/css/table.css
    trunk/OpenWeb/Web/pages/MessageStore.jsp
    trunk/OpenWeb/Web/pages/body.jsp
    trunk/OpenWeb/Web/pages/config.jsp
    trunk/OpenWeb/Web/pages/pdquery.jsp
    trunk/OpenWeb/Web/pages/pixpdqLayout.jsp
    trunk/OpenWeb/Web/pages/pixquery.jsp
    trunk/OpenWeb/Web/pages/registration.jsp
    trunk/OpenWeb/build.properties
    trunk/OpenWeb/build.xml
    trunk/OpenWeb/src/org/openhealthexchange/messagestore/action/PixManagerAction.java
    trunk/OpenWeb/src/org/openhealthexchange/messagestore/grid/OverflowCell.java

Added Paths:
-----------
    trunk/OpenWeb/Web/WEB-INF/lib/servlet-api.jar

Removed Paths:
-------------
    trunk/OpenWeb/Web/WEB-INF/lib/msbase.jar
    trunk/OpenWeb/Web/WEB-INF/lib/mssqlserver.jar
    trunk/OpenWeb/Web/WEB-INF/lib/msutil.jar

Deleted: trunk/OpenWeb/Web/WEB-INF/lib/msbase.jar
===================================================================
(Binary files differ)

Deleted: trunk/OpenWeb/Web/WEB-INF/lib/mssqlserver.jar
===================================================================
(Binary files differ)

Deleted: trunk/OpenWeb/Web/WEB-INF/lib/msutil.jar
===================================================================
(Binary files differ)

Added: trunk/OpenWeb/Web/WEB-INF/lib/servlet-api.jar
===================================================================
(Binary files differ)


Property changes on: trunk/OpenWeb/Web/WEB-INF/lib/servlet-api.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: trunk/OpenWeb/Web/css/jmesa.css
===================================================================
--- trunk/OpenWeb/Web/css/jmesa.css	2009-02-26 18:15:16 UTC (rev 248)
+++ trunk/OpenWeb/Web/css/jmesa.css	2009-03-01 10:03:17 UTC (rev 249)
@@ -17,8 +17,8 @@
     border: 0px solid silver;
     padding: 2px;
     background-color: #dcdcd6;
-   	table-layout: fixed;
-	width: 100%; 
+ 	table-layout: fixed;
+	width: 100%; 
 }
 .jmesa .tbody{
 	background-color:#dcdcd6; 
@@ -73,12 +73,12 @@
     font-size: 11px;
     padding: 0;
     margin: 0;
-    border: 1px solid #c0c0c0;
+    border: 0px solid #c0c0c0;
     background-color: #efebe7;
     height: 15px;
     white-space: nowrap;
     cursor: pointer;
-    display: none;
+    display: none;
 }
 
 .jmesa .filter #dynFilterDiv {
@@ -88,9 +88,9 @@
     padding: 0;
     margin: 0;
     height: 17px;
-    border: 1px solid #c0c0c0;
+    border: 0px solid #c0c0c0;
     background-color: #e1ebf4;
-     display: none;
+    display: none;
 }
 
 .jmesa .filter #dynFilterInput {
@@ -100,7 +100,7 @@
     margin: 0;
     border-style: none;
     background-color: #e1ebf4;
-     display: none;
+	display: none;     
 }
 
 .jmesa .filter #dynFilterDroplistDiv {
@@ -112,8 +112,7 @@
     height: 17px;
     background-color: #e1ebf4;
     z-index: 2;
-     display: none;
-    
+   display: none;    
 }
 
 .jmesa .filter #dynFilterDroplist {
@@ -121,21 +120,22 @@
     font-size: 12px;
     padding: 0;
     margin: 0;
-    border: 1px solid #c0c0c0;
+    border: 0px solid #c0c0c0;
     background-color: #e1ebf4;
-     display: none;
+   	display: none;
 }
 
 .jmesa .header td {
     white-space: nowrap;
     background-color: #406679;
     color: white;
-    font-size: 12px;
+    font-size: 11px;
     font-weight: bold;
     padding: 4px 3px 4px 3px;
     border-right-style: solid;
     border-right-width: 1px;
-    border-color: white;
+    border-color: white;
+     width: auto;
 }
 
 .jmesa .odd a,.jmesa .even a {
@@ -144,10 +144,9 @@
 
 .jmesa .odd td,.jmesa .even td {
     font-family: verdana, arial, helvetica, sans-serif;
-    font-size: 11px;
+    font-size: 10px;
     padding: 2px 3px 2px 3px;
-    border: 1px solid #b3b3a3;
-    overflow: auto;
+    border: 1px solid #b3b3a3;    
 }
 
 .jmesa .odd td {
@@ -168,7 +167,7 @@
 
 .jmesa .highlight td {
     font-family: verdana, arial, helvetica, sans-serif;
-    font-size: 11px;
+    font-size: 10px;
     padding: 3px 4px 3px 4px;
     background-color: #dcdcd6;
     
@@ -180,7 +179,7 @@
 
 .jmesa .statusBar td {
     font-family: verdana, arial, helvetica, sans-serif;
-    font-size: 11px;
+    font-size: 10px;
     border-top: 1px solid silver;
     background-color: #dcdcd6;
     padding: 2px;

Modified: trunk/OpenWeb/Web/css/table.css
===================================================================
--- trunk/OpenWeb/Web/css/table.css	2009-02-26 18:15:16 UTC (rev 248)
+++ trunk/OpenWeb/Web/css/table.css	2009-03-01 10:03:17 UTC (rev 249)
@@ -1,16 +1,31 @@
 
+body { 
+overflow:hidden;
+height: auto;
+width: auto;
+padding: 0px;
+margin: 0px;
+}
+
 .body {
 	width: 100%;
 	height: 100%;
 	padding-top: 0px;
 	background-color: #dcdcd6;
-	
 }
 .Table{
 	height: 100%;
 	width: 100%;
 	overflow: auto;
-}	
+	margin: 0px;
+	padding: 0px;
+}
+.DivRG{
+	height: 100%;
+	width: 100%;
+	background-color: #dcdcd6;
+}
+	
 TABLE.TableBODY{
 height: 101%;
 width: 100%;
@@ -25,20 +40,21 @@
 
 TABLE.TableJMESA{
 	width: 100%;
+	font-size: 11px;
 }
 TABLE.TableTS {
 	width: 100%;
-	height: 100%;
+	height: 98%;
 	font-family: verdana, arial, helvetica, sans-serif;
 	font-size: 12px;
 	font-weight: bold;
 	background-color: #dcdcd6;
-	margin-top: -5px;
-	padding-top: -5px;
+	margin-top: 0px;
+	padding-top: 0px;
 }
 THEAD.TableTS {
 	width: 100%;
-	height: 40px;
+	height: 35px;
 	font-size: 14px;
 	background-color: #013741;
 	color: white;
@@ -47,8 +63,8 @@
 	width: 100%; font-size : 12px;
 	font-family: verdana, arial, helvetica, sans-serif;
 	color: white;
-	margin-top: -4px; 
-	padding-top: -2px;
+	margin-top: 0px; 
+	padding-top: 0px;
 	padding-left:20px;
 	border-left: 0px #406679;
 	border-top: 0px #406679;
@@ -61,6 +77,7 @@
 	width: 100%;
 	background-color: #dcdcd6;
 	padding-left: 0px;
+	height: 10px;
 }
 
 TD.TableTS {
@@ -69,9 +86,9 @@
 	border-bottom: 1px solid silver;
 	cursor: default;
 	font-weight: bold;
-	font-size: 12px;
+	font-size: 11px;
 	padding-left: 20px;
-	padding-top: 20px;
+	padding-top: 0px;
 }
 TD.TableRG {
 	font-family: verdana, arial, helvetica, sans-serif;
@@ -85,7 +102,7 @@
 }
 TR.lock-header {
 	background-color: white;
-	top: expression(getParentElementById(this, "extremeTable") . scrollTop );
+	top: expression(getParentElementById(this, "tabletag") . scrollTop );
 	position: relative;
 }
 
@@ -126,7 +143,7 @@
 /*Registarion Page*/
 
 TABLE.TableRG {
-	width: 65%;
+	width: 70%;
 	font-family: verdana, arial, helvetica, sans-serif;
 	font-size: 12px;
 	font-weight: bold;
@@ -136,7 +153,7 @@
 TABLE.TablePIX {
 	width: 100%;
 	font-family: verdana, arial, helvetica, sans-serif;
-	font-size: 12px;
+	font-size: 11px;
 	font-weight: bold;
 	background-color: #dcdcd6;
 	padding-left: 20px;
@@ -144,7 +161,7 @@
 TABLE.TablePDQ {
 	width: 100%;
 	font-family: verdana, arial, helvetica, sans-serif;
-	font-size: 12px;
+	font-size: 11px;
 	font-weight: bold;
 	background-color: #dcdcd6;
 	padding-left: 20px;
@@ -152,7 +169,7 @@
 TABLE.TableMS{
 	width: 100%;
 	font-family: verdana, arial, helvetica, sans-serif;
-	font-size: 12px;
+	font-size: 11px;
 	font-weight: bold;
 	background-color: #dcdcd6;
 	padding-left: 20px;
@@ -160,7 +177,7 @@
 TABLE.TableCON{
 	width: 100%;
 	font-family: verdana, arial, helvetica, sans-serif;
-	font-size: 12px;
+	font-size: 11px;
 	font-weight: bold;
 	background-color: #dcdcd6;
 	padding-left: 20px;
@@ -186,7 +203,7 @@
 	color: white;
 	padding: 2px;
 	border-left: 0px #406679;
-	border-top: 1px #406679;
+	border-top: 0px #406679;
 	border-right: 0px #406679;
 	font-weight: bold;
 }

Modified: trunk/OpenWeb/Web/pages/MessageStore.jsp
===================================================================
--- trunk/OpenWeb/Web/pages/MessageStore.jsp	2009-02-26 18:15:16 UTC (rev 248)
+++ trunk/OpenWeb/Web/pages/MessageStore.jsp	2009-03-01 10:03:17 UTC (rev 249)
@@ -18,7 +18,7 @@
 
 
 <input type="hidden" id="contextRoot" name="contextRoot" value="<%=request.getContextPath() %>">
-<table class="TableTS" >
+<table class="TableTS" cellpadding="0" cellspacing="0">
  	<thead class="TableTS" align="left">
 		<th class="TableTS">Message Log - SearchCriteria:</th>
 	</thead>
@@ -53,7 +53,7 @@
 			<td align="right"><html:submit property="action" value="Search" ></html:submit></td>
         </tr>
  </table>
-<table class = "TableJMESA">
+<table class = "TableJMESA" cellpadding="0" cellspacing="0">
 <tr><td>
  <div id="tabletag">
  
@@ -64,17 +64,17 @@
                        stateAttr="restore" var="bean" rowFilter="" >
                        <jmesa:htmlTable width="100%">              
                                <jmesa:htmlRow uniqueProperty="messageId"> 
-                                      <jmesa:htmlColumn title="IP" property="ip" cellRenderer="org.openhealthexchange.messagestore.grid.OverflowCell"/>
-                                      <jmesa:htmlColumn title="MessageId" property="messageId" cellRenderer="org.openhealthexchange.messagestore.grid.OverflowCell"/>
-                                      <jmesa:htmlColumn title="ErrorMessage" property="errorMessage" cellRenderer="org.openhealthexchange.messagestore.grid.OverflowCell" />
-                                      <jmesa:htmlColumn title="SendingFacility" property="sendingFacility" cellRenderer="org.openhealthexchange.messagestore.grid.OverflowCell"/>
-                                      <jmesa:htmlColumn title="SendingAppl" property="sendingApplication" cellRenderer="org.openhealthexchange.messagestore.grid.OverflowCell"/>
-                                      <jmesa:htmlColumn title="ReceivingFacility" property="receivingFacility" cellRenderer="org.openhealthexchange.messagestore.grid.OverflowCell"/>
-                                      <jmesa:htmlColumn title="ReceivingAppl" property="receivingApplication"  cellRenderer="org.openhealthexchange.messagestore.grid.OverflowCell"/>
-                                      <jmesa:htmlColumn title="MessageDate" property="messageDate" pattern="yyyy-MM-dd HH:mm:SS.sssz" cellEditor="org.jmesa.view.editor.DateCellEditor" cellRenderer="org.openhealthexchange.messagestore.grid.OverflowCell"/>
-                                      <jmesa:htmlColumn title="Event" property="triggerEvent"  cellRenderer="org.openhealthexchange.messagestore.grid.OverflowCell"/>
-                                      <jmesa:htmlColumn title="InputMsg" property="inMessage" cellRenderer="org.openhealthexchange.messagestore.grid.OverflowCell" />                                                                                                                                                      
-									  <jmesa:htmlColumn  title="OutputMsg" property="outMessage" cellRenderer="org.openhealthexchange.messagestore.grid.OverflowCell" />
+                                      <jmesa:htmlColumn title="IP" property="ip" width="40px" cellRenderer="org.openhealthexchange.messagestore.grid.OverflowCell"/>
+                                      <jmesa:htmlColumn title="MessageId" property="messageId" width="100px" cellRenderer="org.openhealthexchange.messagestore.grid.OverflowCell" />
+                                      <jmesa:htmlColumn title="Error<br/>Message" property="errorMessage" width="110px" cellRenderer="org.openhealthexchange.messagestore.grid.OverflowCell" /> 
+                                      <jmesa:htmlColumn title="Sending<br/>Facility" property="sendingFacility" width="150px" cellRenderer="org.openhealthexchange.messagestore.grid.OverflowCell"/>
+                                      <jmesa:htmlColumn title="Sending<br/>Application" property="sendingApplication" width="100px" cellRenderer="org.openhealthexchange.messagestore.grid.OverflowCell"/>
+                                      <jmesa:htmlColumn title="Receiving<br/>Facility" property="receivingFacility" width="150px" cellRenderer="org.openhealthexchange.messagestore.grid.OverflowCell"/>
+                                      <jmesa:htmlColumn title="Receiving<br/>Application" property="receivingApplication" width="100px" cellRenderer="org.openhealthexchange.messagestore.grid.OverflowCell"/>
+                                      <jmesa:htmlColumn title="MessageDate" property="messageDate" pattern="yyyy-MM-ddHH:mm:SS.sssz" cellRenderer="org.openhealthexchange.messagestore.grid.OverflowCell"/>
+                                      <jmesa:htmlColumn title="Event" property="triggerEvent" width="60px" cellRenderer="org.openhealthexchange.messagestore.grid.OverflowCell"/>
+                                      <jmesa:htmlColumn title="Input<br/>Message" property="inMessage" width="100px" cellRenderer="org.openhealthexchange.messagestore.grid.OverflowCell"/>                                                                                                                                                      
+									  <jmesa:htmlColumn  title="Output<br/>Message" property="outMessage" width="100px" cellRenderer="org.openhealthexchange.messagestore.grid.OverflowCell"/>
 									  
                                </jmesa:htmlRow>
                        </jmesa:htmlTable> 

Modified: trunk/OpenWeb/Web/pages/body.jsp
===================================================================
--- trunk/OpenWeb/Web/pages/body.jsp	2009-02-26 18:15:16 UTC (rev 248)
+++ trunk/OpenWeb/Web/pages/body.jsp	2009-03-01 10:03:17 UTC (rev 249)
@@ -5,13 +5,13 @@
 <script type="text/javascript" language="javascript" src="<c:url value='/scripts/domTT.js'>"></script>
 
 <div class="body">
-<table class = "TableBODY">
+<table class = "TableBODY" cellpadding="0" cellspacing="0">
   <tr class = "TableBODY">
   <td class = "TableBODY">
 		<iframe
 			id="iSelectedApplication"  class="iSelectedApplication" name="iSelectedApplication" width="100%"
 			height="100%" src="" TOPMARGIN="0" LEFTMARGIN="0" MARGINHEIGHT="0"
-			MARGINWIDTH="0" FRAMEBORDER="0" BORDER="0" scrolling="no"> </iframe>
+			MARGINWIDTH="0" FRAMEBORDER="0" BORDER="0" scrolling="auto"> </iframe>
 			
 </td>
  </tr>

Modified: trunk/OpenWeb/Web/pages/config.jsp
===================================================================
--- trunk/OpenWeb/Web/pages/config.jsp	2009-02-26 18:15:16 UTC (rev 248)
+++ trunk/OpenWeb/Web/pages/config.jsp	2009-03-01 10:03:17 UTC (rev 249)
@@ -9,7 +9,7 @@
 
 <link rel="stylesheet" href="<%= request.getContextPath() %>/css/table.css" type="text/css" />
 <body>
-<table class="TableTS">
+<table class="TableTS" cellpadding="0" cellspacing="0">
 <tr><td><div class="Table">
 <form name="ConfigBean" method="post" action="Config.do">
 
@@ -17,7 +17,7 @@
   ConfigBean cb = (ConfigBean) request.getAttribute("ConfiBean");
     %>
     <div class="Table">
-  <table class = "TableCON">
+  <table class = "TableCON" cellpadding="0" cellspacing="0">
   <thead class = "TableTS">
   <th colspan="5" class = "TableTS"> 
 		IHE Configuration

Modified: trunk/OpenWeb/Web/pages/pdquery.jsp
===================================================================
--- trunk/OpenWeb/Web/pages/pdquery.jsp	2009-02-26 18:15:16 UTC (rev 248)
+++ trunk/OpenWeb/Web/pages/pdquery.jsp	2009-03-01 10:03:17 UTC (rev 249)
@@ -17,7 +17,7 @@
 
 </head>
 <body>
-<table class="TableTS">
+<table class="TableTS" cellpadding="0" cellspacing="0">
 <thead class="TableTS" align="left">
 		<th class="TableTS">Patient Demographic Query - SearchCriteria:</th>
 	</thead>
@@ -25,37 +25,37 @@
 <html:form action="Pdquery.do" method="post">
 <table class="TablePDQ">			
 		<tr>
-			<td align="left">Last Name:</td>
+			<td align="left" width="250px;">LastName:</td>
 			<td align="left"><html:text property="lName" size="15" /></td>
-			<td align="left">First Name:</td>
+			<td align="left" width="250px;">FirstName:</td>
 			<td align="left"><html:text property="fName" size="15" /></td>
 		</tr>
 		<tr>
-			<td align="left">Street Address:</td>
+			<td align="left" width="250px;">StreetAddress:</td>
 			<td align="left"><html:text property="address"  size="15"/></td>
-			<td align="left">City:</td>
+			<td align="left" width="250px;">City:</td>
 			<td align="left"><html:text property="city" size="15"/></td>
-			<td align="left">State:</td>
+			<td align="left" width="250px;">State:</td>
 			<td align="left"><html:text property="state" size="15"/></td>
-			<td align="left">Zip Code:</td>
+			<td align="left" width="250px;">ZipCode:</td>
 			<td align="left"><html:text property="zip" size="15"/></td>
-			<td align="left">Country:</td>
+			<td align="left" width="250px;">Country:</td>
 			<td align="left"><html:text property="country" size="15"/></td>
 			
 		</tr>		
 		<tr>
-			<td align="left">Email Address</td>
+			<td align="left"width="250px;">Email Address:</td>
 			<td align="left"><html:text property="email"  size="15" /></td>
-			<td align="left">Birth Date(dd/mm/yyyy):</td>
+			<td align="left"width="250px;">BirthDate(dd/mm/yyyy):</td>
 			<td align="left"><html:text property="dob" size="15"/></td>
-			<td align="left">Sex:</td>
+			<td align="left"width="250px;">Sex:</td>
 			<td align="left"><html:text property="gender" size="15"/></td>
 			<td></td><td></td><td></td>
 			<td align="right"><html:submit property="action"  value="Submit Query">Submit Query</html:submit></td>
 			
 		</tr>				
 </table>
-<table class = "TableJMESA">
+<table class = "TableJMESA" cellpadding="0" cellspacing="0">
 <tr><td>
 	<div id="tabletag">
 	<jmesa:tableFacade id="tag" items="${beanList}" maxRows="10" editable="false"

Modified: trunk/OpenWeb/Web/pages/pixpdqLayout.jsp
===================================================================
--- trunk/OpenWeb/Web/pages/pixpdqLayout.jsp	2009-02-26 18:15:16 UTC (rev 248)
+++ trunk/OpenWeb/Web/pages/pixpdqLayout.jsp	2009-03-01 10:03:17 UTC (rev 249)
@@ -2,7 +2,8 @@
 <%@ taglib uri="/WEB-INF/lib/struts-tiles.tld" prefix="tiles"%>
 <%@ taglib uri="/WEB-INF/lib/core.tld" prefix="c"%>
 <%@ taglib uri="/WEB-INF/lib/jmesa.tld" prefix="jmesa"%>
-
+<html>
+<head>
 <link rel="stylesheet" href="<c:url value='/css/tabs.css'/>" type="text/css" />
 <link rel="stylesheet" href="<c:url value='/css/table.css'/>" type="text/css" />
 <link rel="stylesheet" href="<c:url value='/css/jmesa.css'/>" type="text/css"/>
@@ -11,7 +12,9 @@
 <script type="text/javascript" src="<c:url value='/scripts/jmesa.js'/>"></script>
 <script type="text/javascript" src="<c:url value='/scripts/jquery-1.2.2.pack.js'/>"></script>
 <script type="text/javascript" language="javascript" src="<c:url value="/scripts/ConfigurationUI.js"/>"></script>
-<table class="wholePage" border="0" width="100%" height="100%" cellpadding="0"> 
+</head>
+<body marginheight="0" marginwidth="0">
+<table class="wholePage" border="0" width="100%" style="height: 100%;" cellpadding="0" cellspacing="0"> 
 	<tr class="wholePage">
 		<td><tiles:insert name="header" /></td>
 	</tr>
@@ -19,4 +22,5 @@
 		<td><tiles:insert name="body" /></td>
 	</tr>
 </table>
-
+</body>
+</html>

Modified: trunk/OpenWeb/Web/pages/pixquery.jsp
===================================================================
--- trunk/OpenWeb/Web/pages/pixquery.jsp	2009-02-26 18:15:16 UTC (rev 248)
+++ trunk/OpenWeb/Web/pages/pixquery.jsp	2009-03-01 10:03:17 UTC (rev 249)
@@ -14,7 +14,7 @@
 <script type="text/javascript" language="javascript" src="<c:url value="/scripts/domLib.js"/>"></script>
 <script type="text/javascript" language="javascript" src="<c:url value="/scripts/domTT.js"/>"></script>
 
-<table class="TableTS">
+<table class="TableTS" cellpadding="0" cellspacing="0">
 	<thead class="TableTS" align="left">
 		<th class="TableTS">Patient Demographic Query - SearchCriteria:</th>
 	</thead>
@@ -36,7 +36,7 @@
 			</tr>
 
 		</table>
-		<table class = "TableJMESA">
+		<table class = "TableJMESA" cellpadding="0" cellspacing="0">
 		<tr><td>
 		<div id="tabletag">
 	<jmesa:tableFacade id="tag" items="${beanList}" maxRows="10" editable="false"

Modified: trunk/OpenWeb/Web/pages/registration.jsp
===================================================================
--- trunk/OpenWeb/Web/pages/registration.jsp	2009-02-26 18:15:16 UTC (rev 248)
+++ trunk/OpenWeb/Web/pages/registration.jsp	2009-03-01 10:03:17 UTC (rev 249)
@@ -7,58 +7,57 @@
 <%@ taglib uri="/WEB-INF/lib/struts-html.tld" prefix="html"%>
 <script type="text/javascript" src="<c:url value="/../../scripts/ConfigurationUI.js"/>"></script>
 <link rel="stylesheet" href="<c:url value='/css/table.css'/>" type="text/css"/>
-<table class="TableTS">
+<table class="TableTS" cellpadding="0" cellspacing="0">
 	<thead class="TableTS" align="left">
 		<th class="TableTS">Patient Registration</th>
 	</thead>
-	<tr class="TableTS"><td class="TableRG"><div class="Table">
+	<tr class="TableTS"><td class="TableRG"><div class="DivRG">
 	<html:form action="Registration.do" method="post">
-		<table class="TableRG">
-
+		<table class="TableRG" align="left">
 			<tr>
-				<td align="left"><font size="1" color="red">*</font>Last Name:</td>
+				<td align="left" width="250px;"><font size="1" color="red">*</font>Last Name:</td>
 				<td align="left"><html:text property="lName" size="18" /></td>
 			</tr>
 			<tr>
-				<td align="left"><font size="1" color="red">*</font>First Name:</td>
+				<td align="left" width="250px;"><font size="1" color="red">*</font>First Name:</td>
 				<td align="left"><html:text property="fName" size="18" /></td>
 			</tr>
 			<tr>
-				<td align="left">&nbsp; Street Address:</td>
+				<td align="left" width="250px;">&nbsp; Street Address:</td>
 				<td align="left"><html:text property="address" size="18" /></td>
 			</tr>
 			<tr>
-				<td align="left">&nbsp; City:</td>
+				<td align="left" width="250px;">&nbsp; City:</td>
 				<td align="left"><html:text property="city" size="18" /></td>
 			</tr>
 			<tr>
-				<td align="left">&nbsp; State</td>
+				<td align="left" width="250px;">&nbsp; State:</td>
 				<td align="left"><html:text property="state" size="18" /></td>
 			</tr>
 			<tr>
-				<td align="left">&nbsp; Zip Code:</td>
+				<td align="left" width="250px;">&nbsp; Zip Code:</td>
 				<td align="left"><html:text property="zip" size="18" /></td>
 			</tr>
 			<tr>
-				<td align="left">&nbsp; Country:</td>
+				<td align="left" width="250px;">&nbsp; Country:</td>
 				<td align="left"><html:text property="country" size="18" /></td>
 			</tr>
 			<tr>
-				<td align="left">&nbsp; Email Address:</td>
+				<td align="left" width="250px;">&nbsp; Email Address:</td>
 				<td align="left"><html:text property="email" size="18" /></td>
 			</tr>
 			<tr>
-				<td align="left"><font size="1" color="red">*</font>Birth Day(dd/mm/yyyy):</td>
+				<td align="left" width="320px;"><font size="1" color="red">*</font>Birth Day(dd/mm/yyyy):</td>
 				<td align="left"><html:text property="dob" size="18" /></td>
 			</tr>
 			<tr>
-				<td align="left"><font size="1" color="red">*</font>Sex:</td>
+				<td align="left" width="250px;"><font size="1" color="red">*</font>Sex:</td>
 				<td align="left"><html:text property="gender" size="18" /></td>
 			</tr>
 			<tr>
-				<td align="left"><font size="1" color="red">*</font>Patient ID:</td>
+				<td align="left" width="250px;"><font size="1" color="red">*</font>Patient ID:</td>
 				<td align="left"><html:text property="localid" size="18" /></td>
-				<td align="left"><font size="1" color="red">*</font>Assigning Authority:</td>
+				<td align="left" width="300px;"><font size="1" color="red">*</font>Assigning Authority:</td>
 				<td>
 				<html:select property="systemid" style="width: 150px;">   
   					<html:optionsCollection property="assigninglist" value="value" label="key" />   
@@ -68,27 +67,14 @@
 			&nbsp;
 			&nbsp;
 			<tr>
-				<td align="right"><html:submit property="action" value="Reset"></html:submit></td>
+				<td align="right"><html:reset></html:reset></td>
 				<td align="center"><html:submit property="action" value="Save"></html:submit></td>
 			</tr>
-			<tr>
-			<td>
-			</td>			
-			</tr>	
-			<tr>
-			<td></td>
-			</tr>	
-	</table>
-	
+		</table>	
 	</html:form>
 	</div>
 </td></tr>
-<tr>
-<td>
-
-</td>
-</tr>
-<tr><td align="center" height="30px">
+<tr><td align="center" height="25px">
 <%String ip= (String)request.getAttribute("serverport"); 
 if(ip != null){
 %>

Modified: trunk/OpenWeb/build.properties
===================================================================
--- trunk/OpenWeb/build.properties	2009-02-26 18:15:16 UTC (rev 248)
+++ trunk/OpenWeb/build.properties	2009-03-01 10:03:17 UTC (rev 249)
@@ -4,4 +4,6 @@
 web.dir=./web
 webdescriptordir=./web/WEB-INF
 war.name=openweb.war
-jboss.home=D:/jboss-4.0.5.GA
\ No newline at end of file
+jboss.home=D:/jboss-4.0.5.GA
+openpixpdq.build=../OpenPIXPDQ/build.xml
+openempiadapter.build=../OpenEmpiAdapter/build.xml
\ No newline at end of file

Modified: trunk/OpenWeb/build.xml
===================================================================
--- trunk/OpenWeb/build.xml	2009-02-26 18:15:16 UTC (rev 248)
+++ trunk/OpenWeb/build.xml	2009-03-01 10:03:17 UTC (rev 249)
@@ -62,10 +62,14 @@
 		<delete dir="${build.root}"/>
 	</target>
 
-	<target name="install" depends="-generate-war" description="Installs application in the domain">
+	<target name="install" depends="openpixpdq,-generate-war" description="Installs application in the domain">		
 		<copy overwrite="${FORCE}" todir="${install.app.dir}">
 			<fileset file="${dist.root}/${war.name}" />
 		</copy>
 
 	</target>
+	<target name="openpixpdq">
+		 <ant antfile="${openpixpdq.build}" target="Jar" inheritall="false"/>
+		 <ant antfile="${openempiadapter.build}" target="Jar" inheritall="false"/>
+	</target>
 </project>

Modified: trunk/OpenWeb/src/org/openhealthexchange/messagestore/action/PixManagerAction.java
===================================================================
--- trunk/OpenWeb/src/org/openhealthexchange/messagestore/action/PixManagerAction.java	2009-02-26 18:15:16 UTC (rev 248)
+++ trunk/OpenWeb/src/org/openhealthexchange/messagestore/action/PixManagerAction.java	2009-03-01 10:03:17 UTC (rev 249)
@@ -171,19 +171,20 @@
 	private String getAddressString(List<Address> addresslist){
 		Address address = addresslist.get(0);
 		StringBuffer addString = new StringBuffer();
-		if(address.getAddLine1() != null)
+		if(address != null){
+		if(address.getAddLine1() != null && address.getAddLine1().equalsIgnoreCase("") != true)
 			addString.append(address.getAddLine1()).append(",");
-		if(address.getAddLine2() != null)
+		if(address.getAddLine2() != null && address.getAddLine2().equalsIgnoreCase("")  != true)
 			addString.append(address.getAddLine2()).append(",");
-		if(address.getAddCity() != null)
+		if(address.getAddCity() != null && address.getAddCity().equalsIgnoreCase("") != true)
 			addString.append(address.getAddCity()).append(",");
-		if(address.getAddState()!= null)
+		if(address.getAddState()!= null && address.getAddState().equalsIgnoreCase("") != true)
 			addString.append(address.getAddState()).append(",");
-		if(address.getAddCountry()!= null)
+		if(address.getAddCountry()!= null && address.getAddCountry().equalsIgnoreCase("") != true)
 			addString.append(address.getAddCountry()).append(",");
-		if(address.getAddZip()!=null)
+		if(address.getAddZip()!=null && address.getAddZip().equalsIgnoreCase("") != true)
 			addString.append(address.getAddZip());
-	
+		}
 	return addString.toString();	
 	}
 	/**
@@ -199,7 +200,11 @@
 		query.setPatientIdentifier(getPatientID(bean));
 		query.setPersonName(getPersonName(bean.getlName(),bean.getfName()));
 		if(bean.getGender()!= null)
-		query.setSex((bean.getGender().equalsIgnoreCase("male"))? SharedEnums.SexType.MALE : SharedEnums.SexType.FEMALE);
+			if(bean.getGender().equalsIgnoreCase("male")||bean.getGender().equalsIgnoreCase("M")){
+				query.setSex(SharedEnums.SexType.MALE);
+			}else if(bean.getGender().equalsIgnoreCase("female")||bean.getGender().equalsIgnoreCase("F")){
+				query.setSex(SharedEnums.SexType.FEMALE);
+			}
 		
 	return query;
 	}

Modified: trunk/OpenWeb/src/org/openhealthexchange/messagestore/grid/OverflowCell.java
===================================================================
--- trunk/OpenWeb/src/org/openhealthexchange/messagestore/grid/OverflowCell.java	2009-02-26 18:15:16 UTC (rev 248)
+++ trunk/OpenWeb/src/org/openhealthexchange/messagestore/grid/OverflowCell.java	2009-03-01 10:03:17 UTC (rev 249)
@@ -27,6 +27,9 @@
 			//html.style(" text-overflow: ellipsis; overflow: hidden;	white-space: nowrap; ");
 		}
 		html.style(getStyle());
+		if (StringUtils.isNotEmpty( getColumn().getWidth())) {
+			html.width(getColumn().getWidth());
+		}
 		html.onmouseover(JS_MOUSEOVER_OVERFLOW);
 		html.close();
 		Object value = ItemUtils.getItemValue(item, property);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openpixpdq-svn] SF.net SVN: openpixpdq:[248] trunk/OpenPIXPDQ/conf/mesatests/actors

From: <we...@us...> - 2009-02-26 18:15:22

Revision: 248
          http://openpixpdq.svn.sourceforge.net/openpixpdq/?rev=248&view=rev
Author:   wenzhi
Date:     2009-02-26 18:15:16 +0000 (Thu, 26 Feb 2009)

Log Message:
-----------
1. Configured Audit Repository Configuration for Conenctathon.
2. Added PIX Consumer Configuration for Connectathon.

Modified Paths:
--------------
    trunk/OpenPIXPDQ/conf/mesatests/actors/AuditRepositoryConnections.xml
    trunk/OpenPIXPDQ/conf/mesatests/actors/IheActors.xml
    trunk/OpenPIXPDQ/conf/mesatests/actors/PixConsumerConnections.xml

Modified: trunk/OpenPIXPDQ/conf/mesatests/actors/AuditRepositoryConnections.xml
===================================================================
--- trunk/OpenPIXPDQ/conf/mesatests/actors/AuditRepositoryConnections.xml	2009-02-26 18:14:08 UTC (rev 247)
+++ trunk/OpenPIXPDQ/conf/mesatests/actors/AuditRepositoryConnections.xml	2009-02-26 18:15:16 UTC (rev 248)
@@ -4,7 +4,46 @@
 <!-- For IHE Actor Test -->
 
 <Configuration>
+	<standardconnection name="nist-arr-bsd">
+		<hostname>nist1.ihe.net</hostname>
+		<port>8087</port>
+		<Property name="TYPE" value="BSD SYSLOG" />
+		<PropertySet name="localhost">
+            <entry name="MACHINENAME" value="allscripts4" />
+            <entry name="HOSTNAME" value="allscripts4" />
+            <entry name="IP" value="10.242.0.51" />
+            <entry name="SITE" value="ALLSCRIPTS" />
+            <entry name="SOURCE" value="ALLSCRIPTS" />
+            <entry name="APPNAME" value="PAT_IDENTITY_X_REF_MGR_MISYS" />
+            <entry name="FACILITY" value="ALLSCRIPTS" />
+			<!--entry value="AENAME=ER_MISYS" name="AENAME"/-->
+		</PropertySet>
+		<propertyset name="ParticipantObject">
+			<entry name="PatientNameEncoding" value="HL7" />
+			<entry name="PatientIdEncoding" value="HL7" />
+		</propertyset>
+	</standardconnection>
 
+	<standardconnection name="ibm-arr-bsd">
+		<hostname>nist1.ihe.net</hostname>
+		<port>15500</port>
+		<Property name="TYPE" value="BSD SYSLOG" />
+		<PropertySet name="localhost">
+            <entry name="MACHINENAME" value="allscripts4" />
+            <entry name="HOSTNAME" value="allscripts4" />
+            <entry name="IP" value="10.242.0.51" />
+            <entry name="SITE" value="ALLSCRIPTS" />
+            <entry name="SOURCE" value="ALLSCRIPTS" />
+            <entry name="APPNAME" value="PAT_IDENTITY_X_REF_MGR_MISYS" />
+            <entry name="FACILITY" value="ALLSCRIPTS" />
+			<!--entry value="AENAME=ER_MISYS" name="AENAME"/-->
+		</PropertySet>
+		<propertyset name="ParticipantObject">
+			<entry name="PatientNameEncoding" value="HL7" />
+			<entry name="PatientIdEncoding" value="HL7" />
+		</propertyset>
+	</standardconnection>
+
 	<standardconnection name="log4j_audittrail">
 		<Property name="TYPE" value="LOG4J LOGGER" />
 		<PropertySet name="localhost">
@@ -20,17 +59,6 @@
 			<entry name="PatientNameEncoding" value="HL7" />
 			<entry name="PatientIdEncoding" value="HL7" />
 		</propertyset>
-    <!--  <Identifier name="LocalAssigningAuthority">
-			<NamespaceId>Test</NamespaceId>
-			<UniversalId>1.2.3.4.5</UniversalId>
-			<UniversalIdType>ISO</UniversalIdType>
-        </Identifier>
-        <Identifier name="AssigningAuthority">
-			<NamespaceId>Test</NamespaceId>
-			<UniversalId>1.2.3.4.5</UniversalId>
-			<UniversalIdType>ISO</UniversalIdType>
-        </Identifier>
-     -->   
 	</standardconnection>
 	
 	<standardconnection name="mesa_arr_bsd">

Modified: trunk/OpenPIXPDQ/conf/mesatests/actors/IheActors.xml
===================================================================
--- trunk/OpenPIXPDQ/conf/mesatests/actors/IheActors.xml	2009-02-26 18:14:08 UTC (rev 247)
+++ trunk/OpenPIXPDQ/conf/mesatests/actors/IheActors.xml	2009-02-26 18:15:16 UTC (rev 248)
@@ -20,14 +20,14 @@
       <connection source="misys-pix-manager" />
       <!--Define 0 or more PIX Consumers that subscribe to PIX Update Notification -->
       <pixconsumer connection="swpartners" />
-      <pixconsumer connection="emds" />
+      <!-- pixconsumer connection="tiani-spirit" /-->
     </actor>
     <actor name="pixman_secure" type="PixManager">
       <description>Misys Secure PIX Manager</description>
       <connection source="misys-secure-pix-manager" />
       <!--Define 0 or more PIX Consumers that subscribe to PIX Update Notification -->
       <pixconsumer connection="swpartners" />
-      <pixconsumer connection="emds" />
+      <pixconsumer connection="tiani-spirit" />
     </actor>
 
     <!--The PD Supplier actor configuration-->
@@ -46,7 +46,14 @@
         <audittrail consumer="mesa_arr_bsd" />
         <audittrail consumer="log4j_audittrail" />
 	</actor>
- 
+    <actor name="auditnist" type="SecureNode">
+		<description>NIST AUDIT TRAILS</description>
+		<audittrail consumer="nist-arr-bsd" />
+	</actor>
+    <actor name="auditibm" type="SecureNode">
+		<description>IBM AUDIT TRAILS</description>
+		<audittrail consumer="ibm-arr-bsd" />
+	</actor>	
     <actor name="localaudit" type="SecureNode">
 		<description>LOCAL AUDIT</description>
 		<audittrail consumer="log4j_audittrail" />

Modified: trunk/OpenPIXPDQ/conf/mesatests/actors/PixConsumerConnections.xml
===================================================================
--- trunk/OpenPIXPDQ/conf/mesatests/actors/PixConsumerConnections.xml	2009-02-26 18:14:08 UTC (rev 247)
+++ trunk/OpenPIXPDQ/conf/mesatests/actors/PixConsumerConnections.xml	2009-02-26 18:15:16 UTC (rev 248)
@@ -5,7 +5,7 @@
 <Configuration>
     <standardconnection name="swpartners">
         <!--The host name of the PIX Consumer-->
-        <hostname>testws.swpartners.com</hostname>
+        <hostname>10.243.0.83</hostname>
         <!--The port for PIX Update Notification-->
         <port>2200</port>
         <Identifier name="SendingApplication">
@@ -23,13 +23,60 @@
 
         <!-- This property is for test purpose, which would not actually 
              submit PIX Update Notification. It defaults to false. -->
-        <Property name="DoNotNotify" value="true" />
+        <Property name="DoNotNotify" value="false" />
 
         <!--Configuration file for domains of interest to the consumer-->
-	    <includefile name="PixPdqClientDomains.xml" />
+	    <!-- includefile name="PixPdqClientDomains.xml" /-->
+	     <Identifier type="domain" name="Master">
+	         <NamespaceId>IHENA</NamespaceId>
+	         <UniversalId>1.3.6.1.4.1.21367.2009.1.2.300</UniversalId>
+	         <UniversalIdType>ISO</UniversalIdType>
+	     </Identifier>
+	     <Identifier type="domain" name="Local">
+	         <NamespaceId>IHELOCAL</NamespaceId>
+	         <UniversalId>1.3.6.1.4.1.21367.2009.1.2.310</UniversalId>
+	         <UniversalIdType>ISO</UniversalIdType>
+	     </Identifier>
         
     </standardconnection>
 
+    <standardconnection name="tiani-spirit">
+        <!--The host name of the PIX Consumer-->
+        <hostname>10.242.0.82</hostname>
+        <!--The port for PIX Update Notification-->
+        <port>2380</port>
+        <Identifier name="SendingApplication">
+            <NamespaceId>PAT_IDENTITY_X_REF_MGR_MISYS</NamespaceId>
+        </Identifier>
+        <Identifier name="SendingFacility">
+            <NamespaceId>ALLSCRIPTS</NamespaceId>
+        </Identifier>
+        <Identifier name="ReceivingApplication">
+            <NamespaceId>EHR_SPIRIT</NamespaceId>
+        </Identifier>
+        <Identifier name="ReceivingFacility">
+            <NamespaceId>SPIRIT</NamespaceId>
+        </Identifier>
+
+        <!-- This property is for test purpose, which would not actually 
+             submit PIX Update Notification. It defaults to false. -->
+        <Property name="DoNotNotify" value="false" />
+
+        <!--Configuration file for domains of interest to the consumer-->
+	    <!-- includefile name="PixPdqClientDomains.xml" /-->
+	     <Identifier type="domain" name="Master">
+	         <NamespaceId>IHENA</NamespaceId>
+	         <UniversalId>1.3.6.1.4.1.21367.2009.1.2.300</UniversalId>
+	         <UniversalIdType>ISO</UniversalIdType>
+	     </Identifier>
+	     <Identifier type="domain" name="Local">
+	         <NamespaceId>IHELOCAL</NamespaceId>
+	         <UniversalId>1.3.6.1.4.1.21367.2009.1.2.310</UniversalId>
+	         <UniversalIdType>ISO</UniversalIdType>
+	     </Identifier>
+        
+    </standardconnection>
+
     <standardconnection name="emds">
         <hostname>24.153.226.221</hostname>
         <port>5950</port>
@@ -48,7 +95,7 @@
 
         <!-- This property is for test purpose, which would not actually 
              submit PIX Update Notification. It defaults to false. -->
-        <Property name="DoNotNotify" value="false" />
+        <Property name="DoNotNotify" value="true" />
    
    	    <includefile name="PixPdqClientDomains.xml" />
    	           


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openpixpdq-svn] SF.net SVN: openpixpdq:[247] trunk/OpenPIXPDQ/conf/mesatests/actors/ PixPdqClientDomains.xml

From: <we...@us...> - 2009-02-26 18:14:13

Revision: 247
          http://openpixpdq.svn.sourceforge.net/openpixpdq/?rev=247&view=rev
Author:   wenzhi
Date:     2009-02-26 18:14:08 +0000 (Thu, 26 Feb 2009)

Log Message:
-----------
Added NIST(2005) domain

Modified Paths:
--------------
    trunk/OpenPIXPDQ/conf/mesatests/actors/PixPdqClientDomains.xml

Modified: trunk/OpenPIXPDQ/conf/mesatests/actors/PixPdqClientDomains.xml
===================================================================
--- trunk/OpenPIXPDQ/conf/mesatests/actors/PixPdqClientDomains.xml	2009-02-26 18:01:20 UTC (rev 246)
+++ trunk/OpenPIXPDQ/conf/mesatests/actors/PixPdqClientDomains.xml	2009-02-26 18:14:08 UTC (rev 247)
@@ -14,6 +14,11 @@
          <UniversalId>1.3.6.1.4.1.21367.2005.1.2</UniversalId>
          <UniversalIdType>ISO</UniversalIdType>
      </Identifier>
+     <Identifier type="domain" name="NIST">
+         <NamespaceId>NIST</NamespaceId>
+         <UniversalId>1.3.6.1.4.1.21367.2005.3.7</UniversalId>
+         <UniversalIdType>ISO</UniversalIdType>
+     </Identifier>
      <Identifier type="domain" name="Master">
          <NamespaceId>IHENA</NamespaceId>
          <UniversalId>1.3.6.1.4.1.21367.2009.1.2.300</UniversalId>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openpixpdq-svn] SF.net SVN: openpixpdq:[245] trunk/OpenPIXPDQ/src/java/org/ openhealthexchange/openpixpdq/ihe/impl_v2/PixFeedHandler.java

From: <we...@us...> - 2009-02-26 18:06:00

Revision: 245
          http://openpixpdq.svn.sourceforge.net/openpixpdq/?rev=245&view=rev
Author:   wenzhi
Date:     2009-02-26 17:56:59 +0000 (Thu, 26 Feb 2009)

Log Message:
-----------
Reconciled patient assigning authority.

Modified Paths:
--------------
    trunk/OpenPIXPDQ/src/java/org/openhealthexchange/openpixpdq/ihe/impl_v2/PixFeedHandler.java

Modified: trunk/OpenPIXPDQ/src/java/org/openhealthexchange/openpixpdq/ihe/impl_v2/PixFeedHandler.java
===================================================================
--- trunk/OpenPIXPDQ/src/java/org/openhealthexchange/openpixpdq/ihe/impl_v2/PixFeedHandler.java	2009-02-25 03:17:56 UTC (rev 244)
+++ trunk/OpenPIXPDQ/src/java/org/openhealthexchange/openpixpdq/ihe/impl_v2/PixFeedHandler.java	2009-02-26 17:56:59 UTC (rev 245)
@@ -598,7 +598,7 @@
 					.getNamespaceID().getValue(), cx.getAssigningFacility()
 					.getUniversalID().getValue(), cx.getAssigningFacility()
 					.getUniversalIDType().getValue());
-			identifier.setAssigningAuthority(assignAuth);
+			identifier.setAssigningAuthority(AssigningAuthorityUtil.reconcileIdentifier(assignAuth, connection));
 			identifier.setAssigningFacility(assignFac);
 			identifier.setId(cx.getID().getValue());
 			identifier.setIdentifierTypeCode(cx.getIdentifierTypeCode()
@@ -624,7 +624,7 @@
 					.getNamespaceID().getValue(), cx.getAssigningFacility()
 					.getUniversalID().getValue(), cx.getAssigningFacility()
 					.getUniversalIDType().getValue());
-			identifier.setAssigningAuthority(assignAuth);
+			identifier.setAssigningAuthority(AssigningAuthorityUtil.reconcileIdentifier(assignAuth, connection));
 			identifier.setAssigningFacility(assignFac);
 			identifier.setId(cx.getID().getValue());
 			identifier.setIdentifierTypeCode(cx.getIdentifierTypeCode()


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openpixpdq-svn] SF.net SVN: openpixpdq:[246] trunk/OpenPIXPDQ/src/java/org/ openhealthexchange/openpixpdq/ihe/impl_v2/PdQueryHandler.java

From: <we...@us...> - 2009-02-26 18:05:59

Revision: 246
          http://openpixpdq.svn.sourceforge.net/openpixpdq/?rev=246&view=rev
Author:   wenzhi
Date:     2009-02-26 18:01:20 +0000 (Thu, 26 Feb 2009)

Log Message:
-----------
1. Added PID-1 field (set ID) in the PID segment of PDQ response. 
2. Added the support of PID-3.4 subcomponent search.

Modified Paths:
--------------
    trunk/OpenPIXPDQ/src/java/org/openhealthexchange/openpixpdq/ihe/impl_v2/PdQueryHandler.java

Modified: trunk/OpenPIXPDQ/src/java/org/openhealthexchange/openpixpdq/ihe/impl_v2/PdQueryHandler.java
===================================================================
--- trunk/OpenPIXPDQ/src/java/org/openhealthexchange/openpixpdq/ihe/impl_v2/PdQueryHandler.java	2009-02-26 17:56:59 UTC (rev 245)
+++ trunk/OpenPIXPDQ/src/java/org/openhealthexchange/openpixpdq/ihe/impl_v2/PdQueryHandler.java	2009-02-26 18:01:20 UTC (rev 246)
@@ -430,7 +430,8 @@
 	private void popluatePIDGroup(RSP_K21 reply, List<List<Patient>> finalPatients, List<Identifier> returnDomains) 
 	throws HL7Exception, ApplicationException {
         boolean useFirstPID = true;
-        for (List<Patient> patientRecord : finalPatients) {
+        for (int patientIndex=0; patientIndex<finalPatients.size(); patientIndex++) {
+        	List<Patient> patientRecord = finalPatients.get(patientIndex);
             //We grab the first patient descriptor as the patient demograhpics.
             Patient patient = patientRecord.get(0);
             RSP_K21_QUERY_RESPONSE qr = reply.getQUERY_RESPONSE();
@@ -446,7 +447,7 @@
                 pid = (PID)qr.get(name);
             }
             try {
-                int idIndex = populatePID(pid, patient, returnDomains);
+                int idIndex = populatePID(pid, patient, patientIndex+1, returnDomains);
                 //For subsequent patient record, we only retrieve its patient id
                 for (int i=1; i<patientRecord.size(); i++) { //has to start with the second one, the first was handled above
                     Patient pd = (Patient)patientRecord.get(i);                        
@@ -773,6 +774,36 @@
             	if (patientIdentifier==null) patientIdentifier = new PatientIdentifier();
             	patientIdentifier.setAssigningAuthority(new Identifier(value,null,null));
             }
+            else if(key.equalsIgnoreCase("@PID.3.4.1")) {
+            	if (patientIdentifier==null) patientIdentifier = new PatientIdentifier();
+            	Identifier aa = patientIdentifier.getAssigningAuthority();
+            	if (aa == null) {
+            		aa = new Identifier(value, null, null);
+            	} else {
+            		aa.setNamespaceId(value);
+            	}
+            	patientIdentifier.setAssigningAuthority(aa);
+            }
+            else if(key.equalsIgnoreCase("@PID.3.4.2")) {
+            	if (patientIdentifier==null) patientIdentifier = new PatientIdentifier();
+            	Identifier aa = patientIdentifier.getAssigningAuthority();
+            	if (aa == null) {
+            		aa = new Identifier(null, value, null);
+            	} else {
+            		aa.setUniversalId(value);
+            	}
+            	patientIdentifier.setAssigningAuthority(aa);
+            }
+            else if(key.equalsIgnoreCase("@PID.3.4.3")) {
+            	if (patientIdentifier==null) patientIdentifier = new PatientIdentifier();
+            	Identifier aa = patientIdentifier.getAssigningAuthority();
+            	if (aa == null) {
+            		aa = new Identifier(null, null, value);
+            	} else {
+            		aa.setUniversalIdType(value);
+            	}
+            	patientIdentifier.setAssigningAuthority(aa);
+            }
             else if(key.equalsIgnoreCase("@PID.3.5")) {
             	if (patientIdentifier==null) patientIdentifier = new PatientIdentifier();
             	patientIdentifier.setIdentifierTypeCode(value);
@@ -980,16 +1011,19 @@
     *
     * @param pid The PID segment to be populated
     * @param patient The patient demographic data
-    * @param returnDomains a list of domains whose patient record to be returend
-    * @return the number of patient populated IDs whcih
+    * @param returnDomains a list of domains whose patient record to be returned
+    * @return the number of matching IDs in this PID segment
     * @throws IheConfigurationException When this connection is not properly configured to encode messages
     * @throws PatientException When required patient information is missing
     * @throws HL7Exception When the patient information cannot be encoded properly into HL7
     */
-    private int populatePID(PID pid, Patient patient, List<Identifier> returnDomains) throws HL7Exception, IheConfigurationException, PatientException {
+    private int populatePID(PID pid, Patient patient, int setId, List<Identifier> returnDomains) throws HL7Exception, IheConfigurationException, PatientException {
         int numberOfPatientId = 0;
         
         List<PatientIdentifier> pids = patient.getPatientIds();
+        // PID-1 Set ID - PID (SI) 00104
+        if (setId >= 1)
+        	pid.getSetIDPID().setValue(Integer.toString(setId));
         // PID-2 - Deprecated ID, our authority makes this ID > 20 characters, the allowed limit
         //populateCX(pid.getPatientID(), patientId, authority);
         // PID-3 - Preferred ID


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openpixpdq-svn] SF.net SVN: openpixpdq:[244] trunk/OpenPIXPDQ/src/test/org/ openhealthexchange/openpixpdq/integrationtests/PixUpdateNotificationTest. java

From: <we...@us...> - 2009-02-25 03:18:02

Revision: 244
          http://openpixpdq.svn.sourceforge.net/openpixpdq/?rev=244&view=rev
Author:   wenzhi
Date:     2009-02-25 03:17:56 +0000 (Wed, 25 Feb 2009)

Log Message:
-----------
Added a test case for PIX Update Notification from (Connectathon 2009 test case)

Added Paths:
-----------
    trunk/OpenPIXPDQ/src/test/org/openhealthexchange/openpixpdq/integrationtests/PixUpdateNotificationTest.java

Added: trunk/OpenPIXPDQ/src/test/org/openhealthexchange/openpixpdq/integrationtests/PixUpdateNotificationTest.java
===================================================================
--- trunk/OpenPIXPDQ/src/test/org/openhealthexchange/openpixpdq/integrationtests/PixUpdateNotificationTest.java	                        (rev 0)
+++ trunk/OpenPIXPDQ/src/test/org/openhealthexchange/openpixpdq/integrationtests/PixUpdateNotificationTest.java	2009-02-25 03:17:56 UTC (rev 244)
@@ -0,0 +1,121 @@
+/* Copyright 2009 Misys PLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); 
+ * you may not use this file except in compliance with the License. 
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0 
+ * 
+ * Unless required by applicable law or agreed to in writing, software 
+ * distributed under the License is distributed on an "AS IS" BASIS, 
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or 
+ * implied. See the License for the specific language governing 
+ * permissions and limitations under the License. 
+ */
+package org.openhealthexchange.openpixpdq.integrationtests;
+
+import ca.uhn.hl7v2.app.Initiator;
+import ca.uhn.hl7v2.model.Message;
+import ca.uhn.hl7v2.model.v231.segment.MSA;
+import ca.uhn.hl7v2.model.v25.group.RSP_K23_QUERY_RESPONSE;
+import ca.uhn.hl7v2.model.v25.message.RSP_K23;
+import ca.uhn.hl7v2.model.v25.segment.PID;
+import ca.uhn.hl7v2.parser.PipeParser;
+
+/**
+ * Test PIX Manager transactions: PIX Feed and PIX Query. 
+ * First PIX Query find one matching; the second Query found 
+ * nothing.
+ * 
+ * The sample came from Mesa tests 10501.
+ * 
+ * @author Wenzhi Li
+ * @version 1.0, Jan 22, 2009
+ */
+public class PixUpdateNotificationTest extends AbstractPixPdqTestCase {
+
+    /* (non-Javadoc)
+	 * @see junit.framework.TestCase#setUp()
+	 */
+	protected void setUp() throws Exception {
+		super.setUp();
+		createPIXConnection();
+	}
+
+	/* (non-Javadoc)
+	 * @see junit.framework.TestCase#tearDown()
+	 */
+	protected void tearDown() throws Exception {
+		super.tearDown();
+	}
+
+	/**
+	 * This one tests PIX Update Notification:
+	 * <p>1. Create a patient in master (global) domain. ANDERS^MARIAN, 1944.04.04, Female, Addr=444 Main St., Seattle, WA, 36013.
+	 * This patient is admitted with the Master Assigning Authority value. 
+	 * </p> 
+	 * <p>2. The Update Notification is sent from the PIX Mgr to the PIX Consumer. It contains the Master Assigning Authority.  
+	 * </p> 
+	 * <p>3. Admit the same patient at a different local domain. ANDERS^MARIAN, 1944.04.04, Female, Addr=444 Main St., Seattle, WA, 36013.
+	 * This patient is admitted with the Local Assigning Authority value of the PIX Source. 
+	 * </p> 
+	 * <p>4. The PIX Manager cross-references patient Marion Anders. The Update Notification is sent from the PIX Mgr to the PIX Consumer.
+	 * It contains ids from both the Local Assigning Authority of the PIX Source and the Master Assinging Authority.  
+	 * </p> 
+	 * 
+	 */
+	public void testPixUpdateNotification() {
+		try {
+			//Step 1: PIX Feed ANDERS with Global (Master Patient Id
+			String msg = "MSH|^~\\&|XDSDEMO_ADT|XDSDEMO|PAT_IDENTITY_X_REF_MGR_MISYSPLC|ALLSCRIPTS|200901271417||ADT^A04^ADT_A01|00000688|P|2.3.1||||||||\r" + 
+		      "EVN||200901271417||||200901271417\r" +
+		      "PID|||465884^^^IHENA&1.3.6.1.4.1.21367.2009.1.2.300&ISO||ANDERS^MARIAN||19440404|F|||444 Main St.^^Seattle^WA^36013^USA|||||||463423||||||||||||\r" +
+		      "PV1||O||||||||||||||||||||||||||||||||||||||||||||||||||";
+			PipeParser pipeParser = new PipeParser();
+			Message adt = pipeParser.parse(msg);
+			Initiator initiator = connection.getInitiator();
+			Message response = initiator.sendAndReceive(adt);
+			String responseString = pipeParser.encode(response);	        
+			System.out.println("Received response:\n" + responseString);
+			MSA msa = (MSA)response.get("MSA");
+			assertEquals("AA", msa.getAcknowledgementCode().getValue());
+			assertEquals("00000688", msa.getMessageControlID().getValue());
+	
+			//Wait for two ten seconds
+			Thread.sleep(10000);
+			
+			//Step 2: PIX Feed the same patient with Local patient id.
+			msg = "MSH|^~\\&|XDSDEMO_ADT|XDSDEMO|PAT_IDENTITY_X_REF_MGR_MISYSPLC|ALLSCRIPTS|200901271417||ADT^A04^ADT_A01|00000738|P|2.3.1||||||||\r" + 
+		      "EVN||200901271417||||200901271417\r" +
+		      "PID|||465885^^^IHELOCAL&1.3.6.1.4.1.21367.2009.1.2.310&ISO||ANDERS^MARIAN||19440404|F|||444 Main St.^^Seattle^WA^36013^USA|||||||463423||||||||||||\r" +
+		      "PV1||O||||||||||||||||||||||||||||||||||||||||||||||||||";
+			adt = pipeParser.parse(msg);
+			response = initiator.sendAndReceive(adt);
+			responseString = pipeParser.encode(response);	        
+			System.out.println("Received response:\n" + responseString);
+			msa = (MSA)response.get("MSA");
+			assertEquals("AA", msa.getAcknowledgementCode().getValue());
+			assertEquals("00000738", msa.getMessageControlID().getValue());
+
+			Thread.sleep(10000);
+			//Step 3: PIX Update the local ANDERS 
+			msg = "MSH|^~\\&|MESA_ADT|DOMAIN1_ADMITTING|MESA_XREF|XYZ_HOSPITAL|200310011100||ADT^A08|10506104|P|2.3.1||||||||\r" + 
+		      "EVN||200310011100||||200310011043\r" +
+		      "PID|||465885^^^IHELOCAL&1.3.6.1.4.1.21367.2009.1.2.310&ISO||ANDERS^MARIAN||19440404|F|||111 New Street^^Portland^OR^37765^USA|||||||463423||||||||||||\r" +
+		      "PV1||O||||||||||||||||||||||||||||||||||||||||||||||||||";
+			adt = pipeParser.parse(msg);
+			response = initiator.sendAndReceive(adt);
+			responseString = pipeParser.encode(response);	        
+			System.out.println("Received response:\n" + responseString);
+			msa = (MSA)response.get("MSA");
+			assertEquals("AA", msa.getAcknowledgementCode().getValue());
+			
+		}catch(Exception e) {
+			e.printStackTrace();
+			fail("Fail to test PIX");
+		}
+
+	}
+
+
+}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openpixpdq-svn] SF.net SVN: openpixpdq:[243] trunk/OpenPIXPDQ

From: <we...@us...> - 2009-02-23 16:34:42

Revision: 243
          http://openpixpdq.svn.sourceforge.net/openpixpdq/?rev=243&view=rev
Author:   wenzhi
Date:     2009-02-23 16:34:35 +0000 (Mon, 23 Feb 2009)

Log Message:
-----------
Added Load Connectathon Test Patients

Added Paths:
-----------
    trunk/OpenPIXPDQ/conf/tests/ConnectathonTestsPatients.txt
    trunk/OpenPIXPDQ/src/test/org/openhealthexchange/openpixpdq/integrationtests/PixLoadConnectathonPatientTest.java

Added: trunk/OpenPIXPDQ/conf/tests/ConnectathonTestsPatients.txt
===================================================================
--- trunk/OpenPIXPDQ/conf/tests/ConnectathonTestsPatients.txt	                        (rev 0)
+++ trunk/OpenPIXPDQ/conf/tests/ConnectathonTestsPatients.txt	2009-02-23 16:34:35 UTC (rev 243)
@@ -0,0 +1,90 @@
+Patient ID (Master)	Namespace ID (Master)	Universal ID + Universal ID Type (Master)	Patient ID (IHE Local)	Namespace ID (IHE Local)	Universal ID + Universal ID Type (IHE Local)	Name	Comment	DOB	Street Address	City	State	Zip Code	Participant ID	Sex	Race	Referring
+PDQ113XX01	IHENA	&1.3.6.1.4.1.21367.2009.1.2.300&ISO	LPDQ113XX01	IHELOCAL	&1.3.6.1.4.1.21367.2009.1.2.310&ISO	MOORE^CHIP	PDQ	19380224	10 PINETREE	WEBSTER	MO	63119	x	M	WH	7202^SULLIVAN^KAREN^J^^^MD
+PDQ113XX02	IHENA	&1.3.6.1.4.1.21367.2009.1.2.300&ISO	LPDQ113XX02	IHELOCAL	&1.3.6.1.4.1.21367.2009.1.2.310&ISO	MOORE^RALPH	PDQ	19510707	510 S KINGSHIGHWAY	ST. LOUIS	MO	63110	x	M	WH	7202^SULLIVAN^KAREN^J^^^MD
+PDQ113XX03	IHENA	&1.3.6.1.4.1.21367.2009.1.2.300&ISO	LPDQ113XX03	IHELOCAL	&1.3.6.1.4.1.21367.2009.1.2.310&ISO	MOHR^ALICE	PDQ	19580131	820 JORIE BLVD.	OAK BROOK	IL	60523	x	F	BL	7202^SULLIVAN^KAREN^J^^^MD
+PDQ113XX04	IHENA	&1.3.6.1.4.1.21367.2009.1.2.300&ISO	LPDQ113XX04	IHELOCAL	&1.3.6.1.4.1.21367.2009.1.2.310&ISO	MOODY^WARREN	PDQ	19780820	1000 CLAYTON RD	CLAYTON	MO	63105	x	M	BL	7202^SULLIVAN^KAREN^J^^^MD
+PDQ113XX05	IHENA	&1.3.6.1.4.1.21367.2009.1.2.300&ISO	LPDQ113XX05	IHELOCAL	&1.3.6.1.4.1.21367.2009.1.2.310&ISO	MOONEY^STAN	PDQ	19780920	100 TAYLOR	ST LOUIS	MO	63110	x	M	BL	7202^SULLIVAN^KAREN^J^^^MD
+101	IHENA	&1.3.6.1.4.1.21367.2009.1.2.300&ISO	L101	IHELOCAL	&1.3.6.1.4.1.21367.2009.1.2.310&ISO	FARNSWORTH^STEVE	PIX	19781208	820 JORIE BLVD	CHICAGO	IL	60523	x	M	WH	7202^SULLIVAN^KAREN^J^^^MD
+202	IHENA	&1.3.6.1.4.1.21367.2009.1.2.300&ISO	L202	IHELOCAL	&1.3.6.1.4.1.21367.2009.1.2.310&ISO	WALTERS^WILLIAM	PIXv3	19550505	3900 FLORA PL	ST. LOUIS	MO	63110	x	M	BL	7202^SULLIVAN^KAREN^J^^^MD
+110	IHENA	&1.3.6.1.4.1.21367.2009.1.2.300&ISO	L110	IHELOCAL	&1.3.6.1.4.1.21367.2009.1.2.310&ISO	QED^ZERO	QED	19551201	1742 Lincoln	CLAYTON	MO	63105	x	M	WH	7202^SULLIVAN^KAREN^J^^^MD
+120	IHENA	&1.3.6.1.4.1.21367.2009.1.2.300&ISO	L120	IHELOCAL	&1.3.6.1.4.1.21367.2009.1.2.310&ISO	QED^ONE	QED	19260423	100 N Michigan	Chicago	IL	60501	x	F	BL	7202^SULLIVAN^KAREN^J^^^MD
+130	IHENA	&1.3.6.1.4.1.21367.2009.1.2.300&ISO	L130	IHELOCAL	&1.3.6.1.4.1.21367.2009.1.2.310&ISO	QED^TWO	QED	19910701	100 W Main	ST LOUIS	MO	63101	x	M	WH	7202^SULLIVAN^KAREN^J^^^MD
+140	IHENA	&1.3.6.1.4.1.21367.2009.1.2.300&ISO	L140	IHELOCAL	&1.3.6.1.4.1.21367.2009.1.2.310&ISO	QED^FOUR	QED	19601217	1 Snoway	ST LOUIS	MO	63130	x	M	OT	7202^SULLIVAN^KAREN^J^^^MD
+NA5000	IHENA	&1.3.6.1.4.1.21367.2009.1.2.300&ISO	LNA5000	IHELOCAL	&1.3.6.1.4.1.21367.2009.1.2.310&ISO	XUA^Xavier	XUA	19290622	4040 Key Harbour Dr	St. Joseph	MO	63230	x	F	BL	7202^SULLIVAN^KAREN^J^^^MD
+NA5007	IHENA	&1.3.6.1.4.1.21367.2009.1.2.300&ISO	LNA5007	IHELOCAL	&1.3.6.1.4.1.21367.2009.1.2.310&ISO	XCA^Alexander	XCA	19290712	5950 Ponderosa Court	St. Louis	MO	63268	x	F	BL	7202^SULLIVAN^KAREN^J^^^MD
+NA5008	IHENA	&1.3.6.1.4.1.21367.2009.1.2.300&ISO	LNA5008	IHELOCAL	&1.3.6.1.4.1.21367.2009.1.2.310&ISO	XCA^Amy	XCA	19291005	1730 Pennsylvania	Clayton	MO	63105	x	F	WH	7202^SULLIVAN^KAREN^J^^^MD
+NA5009	IHENA	&1.3.6.1.4.1.21367.2009.1.2.300&ISO	LNA5009	IHELOCAL	&1.3.6.1.4.1.21367.2009.1.2.310&ISO	XCA^Andrew	XCA	19291207	1838 William Tell	Richmond Heights	MO	63117	x	M	BL	7202^SULLIVAN^KAREN^J^^^MD
+NA5010	IHENA	&1.3.6.1.4.1.21367.2009.1.2.300&ISO	LNA5010	IHELOCAL	&1.3.6.1.4.1.21367.2009.1.2.310&ISO	NormalConsent^Ehrallscriptsconnect	BPPC	19291126	685 St. Marie	Belleville	IL	62976	x	F	WH	7202^SULLIVAN^KAREN^J^^^MD
+NA5012	IHENA	&1.3.6.1.4.1.21367.2009.1.2.300&ISO	LNA5012	IHELOCAL	&1.3.6.1.4.1.21367.2009.1.2.310&ISO	RestrictedConsent^Ehrallscriptsconnect	BPPC	19291014	11152 Clarissa	Eureka	MO	63223	x	F	OT	7202^SULLIVAN^KAREN^J^^^MD
+NA5014	IHENA	&1.3.6.1.4.1.21367.2009.1.2.300&ISO	LNA5014	IHELOCAL	&1.3.6.1.4.1.21367.2009.1.2.310&ISO	NormalConsent^Ehrallscriptsenterprise	BPPC	19291229	6825 Natural Bridge	Earth City	MO	63248	x	F	OT	7202^SULLIVAN^KAREN^J^^^MD
+NA5016	IHENA	&1.3.6.1.4.1.21367.2009.1.2.300&ISO	LNA5016	IHELOCAL	&1.3.6.1.4.1.21367.2009.1.2.310&ISO	RestrictedConsent^Ehrallscriptsenterprise	BPPC	19290626	10055 Sheldon	Clayton	MO	63252	x	F	OT	7202^SULLIVAN^KAREN^J^^^MD
+NA5018	IHENA	&1.3.6.1.4.1.21367.2009.1.2.300&ISO	LNA5018	IHELOCAL	&1.3.6.1.4.1.21367.2009.1.2.310&ISO	NormalConsent^Ehrallscriptspro	BPPC	19290725	1301 Hollins	Richmond Heights	MO	63236	x	F	BL	7202^SULLIVAN^KAREN^J^^^MD
+NA5020	IHENA	&1.3.6.1.4.1.21367.2009.1.2.300&ISO	LNA5020	IHELOCAL	&1.3.6.1.4.1.21367.2009.1.2.310&ISO	RestrictedConsent^Ehrallscriptspro	BPPC	19290824	2019 Switzer Road	Arnold	MO	63264	x	F	BL	7202^SULLIVAN^KAREN^J^^^MD
+NA5022	IHENA	&1.3.6.1.4.1.21367.2009.1.2.300&ISO	LNA5022	IHELOCAL	&1.3.6.1.4.1.21367.2009.1.2.310&ISO	NormalConsent^Ehrgreenway	BPPC	19290923	620 Brown Street	Fallon	IL	62978	x	F	BL	7202^SULLIVAN^KAREN^J^^^MD
+NA5024	IHENA	&1.3.6.1.4.1.21367.2009.1.2.300&ISO	LNA5024	IHELOCAL	&1.3.6.1.4.1.21367.2009.1.2.310&ISO	RestrictedConsent^Ehrgreenway	BPPC	19291022	8425 Latty Avenue	Fenton	MO	63263	x	F	WH	7202^SULLIVAN^KAREN^J^^^MD
+NA5026	IHENA	&1.3.6.1.4.1.21367.2009.1.2.300&ISO	LNA5026	IHELOCAL	&1.3.6.1.4.1.21367.2009.1.2.310&ISO	BPPCNormal^Ehrithicoserve	BPPC	19291121	157 Perthshire Avenue	St. Elmo	IL	62989	x	F	WH	7202^SULLIVAN^KAREN^J^^^MD
+NA5028	IHENA	&1.3.6.1.4.1.21367.2009.1.2.300&ISO	LNA5028	IHELOCAL	&1.3.6.1.4.1.21367.2009.1.2.310&ISO	BPPCRestricted^Ehrithicoserve	BPPC	19291220	8206 South Fay	Trenton	IL	62972	x	F	BL	7202^SULLIVAN^KAREN^J^^^MD
+NA5030	IHENA	&1.3.6.1.4.1.21367.2009.1.2.300&ISO	LNA5030	IHELOCAL	&1.3.6.1.4.1.21367.2009.1.2.310&ISO	BPPCNormal^Ehrsage	BPPC	19300110	301 North Central	Jefferson City	MO	63110	x	F	BL	7202^SULLIVAN^KAREN^J^^^MD
+NA5032	IHENA	&1.3.6.1.4.1.21367.2009.1.2.300&ISO	LNA5032	IHELOCAL	&1.3.6.1.4.1.21367.2009.1.2.310&ISO	BPPCRestricted^Ehrsage	BPPC	19290309	131 Holloway Road	Crystal City	MO	63118	x	F	OT	7202^SULLIVAN^KAREN^J^^^MD
+NA5034	IHENA	&1.3.6.1.4.1.21367.2009.1.2.300&ISO	LNA5034	IHELOCAL	&1.3.6.1.4.1.21367.2009.1.2.310&ISO	BPPCNormal^Gatewayswpartners	BPPC	19290308	9821 Wild Deer Road	University City	MO	63259	x	F	OT	7202^SULLIVAN^KAREN^J^^^MD
+NA5036	IHENA	&1.3.6.1.4.1.21367.2009.1.2.300&ISO	LNA5036	IHELOCAL	&1.3.6.1.4.1.21367.2009.1.2.310&ISO	BPPCRestricted^Gatewayswpartners	BPPC	19290407	522 Spring Glen Drive	High Ridge	MO	63228	x	F	BL	7202^SULLIVAN^KAREN^J^^^MD
+NA5038	IHENA	&1.3.6.1.4.1.21367.2009.1.2.300&ISO	LNA5038	IHELOCAL	&1.3.6.1.4.1.21367.2009.1.2.310&ISO	BPPCNormal^Msgrouterhealthvision	BPPC	19290506	14 Stacy Drive	Kankakee	IL	62968	x	F	BL	7202^SULLIVAN^KAREN^J^^^MD
+NA5040	IHENA	&1.3.6.1.4.1.21367.2009.1.2.300&ISO	LNA5040	IHELOCAL	&1.3.6.1.4.1.21367.2009.1.2.310&ISO	BPPCRestricted^Msgrouterhealthvision	BPPC	19290605	3517 Magnolia Avenue	Sullivan	MO	63240	x	F	BL	7202^SULLIVAN^KAREN^J^^^MD
+NA5042	IHENA	&1.3.6.1.4.1.21367.2009.1.2.300&ISO	LNA5042	IHELOCAL	&1.3.6.1.4.1.21367.2009.1.2.310&ISO	BPPCNormal^Phrcapmed	BPPC	19290704	1330 Cabrillo	Tuscola	IL	62995	x	F	WH	7202^SULLIVAN^KAREN^J^^^MD
+NA5044	IHENA	&1.3.6.1.4.1.21367.2009.1.2.300&ISO	LNA5044	IHELOCAL	&1.3.6.1.4.1.21367.2009.1.2.310&ISO	BPPCRestricted^Phrcapmed	BPPC	19290803	9441 Harvest Court	Kirksville	IL	62986	x	F	WH	7202^SULLIVAN^KAREN^J^^^MD
+NA5046	IHENA	&1.3.6.1.4.1.21367.2009.1.2.300&ISO	LNA5046	IHELOCAL	&1.3.6.1.4.1.21367.2009.1.2.310&ISO	BPPCNormal^Phrcapmed^PMC	BPPC	19290902	734 Woodstream Court	Cape Girardeau	MO	63120	x	F	OT	7202^SULLIVAN^KAREN^J^^^MD
+NA5048	IHENA	&1.3.6.1.4.1.21367.2009.1.2.300&ISO	LNA5048	IHELOCAL	&1.3.6.1.4.1.21367.2009.1.2.310&ISO	BPPCRestricted^Phrcapmed^PMC	BPPC	19291001	969 Chula	Balwin	MO	63256	x	F	OT	7202^SULLIVAN^KAREN^J^^^MD
+NA5050	IHENA	&1.3.6.1.4.1.21367.2009.1.2.300&ISO	LNA5050	IHELOCAL	&1.3.6.1.4.1.21367.2009.1.2.310&ISO	NormalConsent^Ehrallscriptsenterprise^PMC	BPPC	19291217	145 Hanley	Richmond Heights	MO	63117	x	F	WH	7202^SULLIVAN^KAREN^J^^^MD
+NA5052	IHENA	&1.3.6.1.4.1.21367.2009.1.2.300&ISO	LNA5052	IHELOCAL	&1.3.6.1.4.1.21367.2009.1.2.310&ISO	RestrictedConsent^Ehrallscriptsenterprise^PMC	BPPC	19291218	14 Main	Rock Ridge	MO	63101	x	F	WH	7202^SULLIVAN^KAREN^J^^^MD
+NA5054	IHENA	&1.3.6.1.4.1.21367.2009.1.2.300&ISO	LNA5054	IHELOCAL	&1.3.6.1.4.1.21367.2009.1.2.310&ISO	NormalConsent^Ehrallscriptspro^PMC	BPPC	19291219	15 Ridgetop	Richmond Heights	MO	63117	x	F	OT	7202^SULLIVAN^KAREN^J^^^MD
+NA5056	IHENA	&1.3.6.1.4.1.21367.2009.1.2.300&ISO	LNA5056	IHELOCAL	&1.3.6.1.4.1.21367.2009.1.2.310&ISO	RestrictedConsent^Ehrallscriptspro^PMC	BPPC	19291220	22 Kingston	St. Louis	MO	63110	x	F	OT	7202^SULLIVAN^KAREN^J^^^MD
+NA5058	IHENA	&1.3.6.1.4.1.21367.2009.1.2.300&ISO	LNA5058	IHELOCAL	&1.3.6.1.4.1.21367.2009.1.2.310&ISO	NormalConsent^Ehrgreenway^PMC	BPPC	19291221	45 Kingsbury	Clayton	MO	63105	x	F	WH	7202^SULLIVAN^KAREN^J^^^MD
+NA5060	IHENA	&1.3.6.1.4.1.21367.2009.1.2.300&ISO	LNA5060	IHELOCAL	&1.3.6.1.4.1.21367.2009.1.2.310&ISO	RestrictedConsent^Ehrgreenway^PMC	BPPC	19291222	22 Thrush	Brentwood	MO	63144	x	F	WH	7202^SULLIVAN^KAREN^J^^^MD
+NA5062	IHENA	&1.3.6.1.4.1.21367.2009.1.2.300&ISO	LNA5062	IHELOCAL	&1.3.6.1.4.1.21367.2009.1.2.310&ISO	NormalConsent^Ehrgreenway^PMC	BPPC	19291223	18 Arundel	Clayton	MO	63105	x	F	OT	7202^SULLIVAN^KAREN^J^^^MD
+NA5064	IHENA	&1.3.6.1.4.1.21367.2009.1.2.300&ISO	LNA5064	IHELOCAL	&1.3.6.1.4.1.21367.2009.1.2.310&ISO	RestrictedConsent^Ehrgreenway^PMC	BPPC	19291224	11293 Olive	Creve Coeur	MO	63141	x	F	OT	7202^SULLIVAN^KAREN^J^^^MD
+NA5066	IHENA	&1.3.6.1.4.1.21367.2009.1.2.300&ISO	LNA5066	IHELOCAL	&1.3.6.1.4.1.21367.2009.1.2.310&ISO	NAV^Greenway	NAV	19291225	14 Flood Plain	Creve Coeur	MO	63146	x	F	WH	7202^SULLIVAN^KAREN^J^^^MD
+NA5068	IHENA	&1.3.6.1.4.1.21367.2009.1.2.300&ISO	LNA5068	IHELOCAL	&1.3.6.1.4.1.21367.2009.1.2.310&ISO	NAV^Ithicoserve	NAV	19291226	19 Abernathy	St Louis	MO	63101	x	F	BL	7202^SULLIVAN^KAREN^J^^^MD
+NA5070	IHENA	&1.3.6.1.4.1.21367.2009.1.2.300&ISO	LNA5070	IHELOCAL	&1.3.6.1.4.1.21367.2009.1.2.310&ISO	NAV^Regenstrief	NAV	19291227	100 Bristol	Creve Coeur	MO	63141	x	F	BL	7202^SULLIVAN^KAREN^J^^^MD
+NA5072	IHENA	&1.3.6.1.4.1.21367.2009.1.2.300&ISO	LNA5072	IHELOCAL	&1.3.6.1.4.1.21367.2009.1.2.310&ISO	NAV^Saic	NAV	19291228	200 Ballas	Creve Coeur	MO	63141	x	F	BL	7202^SULLIVAN^KAREN^J^^^MD
+NA5084	IHENA	&1.3.6.1.4.1.21367.2009.1.2.300&ISO	LNA5084	IHELOCAL	&1.3.6.1.4.1.21367.2009.1.2.310&ISO	Adtgecentricitybusiness^Carolyn	XDS/PIX/PDQ	19291015	314 Trailview Avenue	Earth City	MO	63248	x	F	OT	7202^SULLIVAN^KAREN^J^^^MD
+NA5086	IHENA	&1.3.6.1.4.1.21367.2009.1.2.300&ISO	LNA5086	IHELOCAL	&1.3.6.1.4.1.21367.2009.1.2.310&ISO	Adtgecpn^Catherine	XDS/PIX/PDQ	19291130	4217 Red Bud Ave	Clayton	MO	63252	x	F	BL	7202^SULLIVAN^KAREN^J^^^MD
+NA5088	IHENA	&1.3.6.1.4.1.21367.2009.1.2.300&ISO	LNA5088	IHELOCAL	&1.3.6.1.4.1.21367.2009.1.2.310&ISO	Adtsms^Christine	XDS/PIX/PDQ	19291128	5533 Anna Lee Drive	Richmond	MO	63236	x	F	BL	7202^SULLIVAN^KAREN^J^^^MD
+NA5090	IHENA	&1.3.6.1.4.1.21367.2009.1.2.300&ISO	LNA5090	IHELOCAL	&1.3.6.1.4.1.21367.2009.1.2.310&ISO	Ciscpsi^Claire	XDS/PIX/PDQ	19291105	89 Corisande Hill Road	Arnold	MO	63264	x	F	BL	7202^SULLIVAN^KAREN^J^^^MD
+NA5092	IHENA	&1.3.6.1.4.1.21367.2009.1.2.300&ISO	LNA5092	IHELOCAL	&1.3.6.1.4.1.21367.2009.1.2.310&ISO	Cisgecentricityenterprise^Claudia	XDS/PIX/PDQ	19300104	2700 Henrietta Street	Fallon	IL	62978	x	F	WH	7202^SULLIVAN^KAREN^J^^^MD
+NA5094	IHENA	&1.3.6.1.4.1.21367.2009.1.2.300&ISO	LNA5094	IHELOCAL	&1.3.6.1.4.1.21367.2009.1.2.310&ISO	Contentcreatoremds^Deborah	XDS/PIX/PDQ	19300130	840 Garland Place	Fenton	MO	63263	x	F	WH	7202^SULLIVAN^KAREN^J^^^MD
+NA5096	IHENA	&1.3.6.1.4.1.21367.2009.1.2.300&ISO	LNA5096	IHELOCAL	&1.3.6.1.4.1.21367.2009.1.2.310&ISO	Contentcreatorintel^Dee	XDS/PIX/PDQ	19300110	432 Julian Place	Elmo	IL	62989	x	F	BL	7202^SULLIVAN^KAREN^J^^^MD
+NA5098	IHENA	&1.3.6.1.4.1.21367.2009.1.2.300&ISO	LNA5098	IHELOCAL	&1.3.6.1.4.1.21367.2009.1.2.310&ISO	Ehrallscriptsconnect^Denise	XDS/PIX/PDQ	19290814	1238 Woodgate	Trenton	IL	62972	x	F	BL	7202^SULLIVAN^KAREN^J^^^MD
+NA5100	IHENA	&1.3.6.1.4.1.21367.2009.1.2.300&ISO	LNA5100	IHELOCAL	&1.3.6.1.4.1.21367.2009.1.2.310&ISO	Ehrallscriptsenterprise^Donna	XDS/PIX/PDQ	19290710	5909 Page Avenue	Jefferson City	MO	63110	x	F	OT	7202^SULLIVAN^KAREN^J^^^MD
+NA5102	IHENA	&1.3.6.1.4.1.21367.2009.1.2.300&ISO	LNA5102	IHELOCAL	&1.3.6.1.4.1.21367.2009.1.2.310&ISO	Ehrallscriptsprofessional^Dora	XDS/PIX/PDQ	19290530	7926 Glenside Place	Crystal City	MO	63118	x	F	OT	7202^SULLIVAN^KAREN^J^^^MD
+NA5104	IHENA	&1.3.6.1.4.1.21367.2009.1.2.300&ISO	LNA5104	IHELOCAL	&1.3.6.1.4.1.21367.2009.1.2.310&ISO	Ehrblueware^Eliza	XDS/PIX/PDQ	19300102	1777 Barbara Ave	University City	MO	63259	x	F	BL	7202^SULLIVAN^KAREN^J^^^MD
+NA5106	IHENA	&1.3.6.1.4.1.21367.2009.1.2.300&ISO	LNA5106	IHELOCAL	&1.3.6.1.4.1.21367.2009.1.2.310&ISO	Ehrgecentricityemr^Elizabeth	XDS/PIX/PDQ	19290711	4310 St. Ferdinand	High Ridge	MO	63228	x	F	BL	7202^SULLIVAN^KAREN^J^^^MD
+NA5108	IHENA	&1.3.6.1.4.1.21367.2009.1.2.300&ISO	LNA5108	IHELOCAL	&1.3.6.1.4.1.21367.2009.1.2.310&ISO	Ehrmckesson^Ellen	XDS/PIX/PDQ	19290630	9191 W. Florrisant	Kankakee	IL	62968	x	F	BL	7202^SULLIVAN^KAREN^J^^^MD
+NA5110	IHENA	&1.3.6.1.4.1.21367.2009.1.2.300&ISO	LNA5110	IHELOCAL	&1.3.6.1.4.1.21367.2009.1.2.310&ISO	Ehrsage^Emily	XDS/PIX/PDQ	19290615	4613 Rosalie Ave	Sullivan	MO	63240	x	F	WH	7202^SULLIVAN^KAREN^J^^^MD
+NA5112	IHENA	&1.3.6.1.4.1.21367.2009.1.2.300&ISO	LNA5112	IHELOCAL	&1.3.6.1.4.1.21367.2009.1.2.310&ISO	Ehrspirit^Gina	XDS/PIX/PDQ	19290501	5981 Lotus	Cape Girardeau	MO	63120	x	F	WH	7202^SULLIVAN^KAREN^J^^^MD
+NA5114	IHENA	&1.3.6.1.4.1.21367.2009.1.2.300&ISO	LNA5114	IHELOCAL	&1.3.6.1.4.1.21367.2009.1.2.310&ISO	Gatewayswpartners^Grace	XDS/PIX/PDQ	19290802	419 Cambridge Place	Balwin	MO	63256	x	F	OT	7202^SULLIVAN^KAREN^J^^^MD
+NA5116	IHENA	&1.3.6.1.4.1.21367.2009.1.2.300&ISO	LNA5116	IHELOCAL	&1.3.6.1.4.1.21367.2009.1.2.310&ISO	Msgrouterhealthvision^Hazel	XDS/PIX/PDQ	19291112	12929 Portulaca Drive	Pearl	IL	62992	x	F	OT	7202^SULLIVAN^KAREN^J^^^MD
+NA5118	IHENA	&1.3.6.1.4.1.21367.2009.1.2.300&ISO	LNA5118	IHELOCAL	&1.3.6.1.4.1.21367.2009.1.2.310&ISO	Ofgeris^Heather	XDS/PIX/PDQ	19300120	504 Eastbrook Lane	Springfield	MO	63114	x	F	BL	7202^SULLIVAN^KAREN^J^^^MD
+NA5120	IHENA	&1.3.6.1.4.1.21367.2009.1.2.300&ISO	LNA5120	IHELOCAL	&1.3.6.1.4.1.21367.2009.1.2.310&ISO	Othergehieservices^Jane	XDS/PIX/PDQ	19300110	433 Clara Ave	Alton	IL	62964	x	F	BL	7202^SULLIVAN^KAREN^J^^^MD
+NA5122	IHENA	&1.3.6.1.4.1.21367.2009.1.2.300&ISO	LNA5122	IHELOCAL	&1.3.6.1.4.1.21367.2009.1.2.310&ISO	Otheribmbridge^Janice	XDS/PIX/PDQ	19290831	4301 N. Market	Columbia	MO	63243	x	F	WH	7202^SULLIVAN^KAREN^J^^^MD
+NA5124	IHENA	&1.3.6.1.4.1.21367.2009.1.2.300&ISO	LNA5124	IHELOCAL	&1.3.6.1.4.1.21367.2009.1.2.310&ISO	Pacsagfa^Jenny	XDS/PIX/PDQ	19291130	4381 Delmar Avenue	St. Ann	MO	63251	x	F	WH	7202^SULLIVAN^KAREN^J^^^MD
+NA5126	IHENA	&1.3.6.1.4.1.21367.2009.1.2.300&ISO	LNA5126	IHELOCAL	&1.3.6.1.4.1.21367.2009.1.2.310&ISO	Pacscsh^JoAnn	XDS/PIX/PDQ	19290910	11154 Wiskow Road	Grey Summit	MO	63226	x	F	WH	7202^SULLIVAN^KAREN^J^^^MD
+NA5128	IHENA	&1.3.6.1.4.1.21367.2009.1.2.300&ISO	LNA5128	IHELOCAL	&1.3.6.1.4.1.21367.2009.1.2.310&ISO	Pacsfujifilmtwo^Juliet	XDS/PIX/PDQ	19290710	6016 Maple Avenue	Grafton	IL	62987	x	F	OT	7202^SULLIVAN^KAREN^J^^^MD
+NA5130	IHENA	&1.3.6.1.4.1.21367.2009.1.2.300&ISO	LNA5130	IHELOCAL	&1.3.6.1.4.1.21367.2009.1.2.310&ISO	Pacsgecentricitypacs^Kaitlyn	XDS/PIX/PDQ	19290630	744 Main Street	Potosi	MO	63231	x	F	OT	7202^SULLIVAN^KAREN^J^^^MD
+NA5132	IHENA	&1.3.6.1.4.1.21367.2009.1.2.300&ISO	LNA5132	IHELOCAL	&1.3.6.1.4.1.21367.2009.1.2.310&ISO	Wsxip^Katie	XDS/PIX/PDQ	19290420	9008 Niles	Carbondale	IL	62984	x	F	OT	7202^SULLIVAN^KAREN^J^^^MD
+NA5134	IHENA	&1.3.6.1.4.1.21367.2009.1.2.300&ISO	LNA5134	IHELOCAL	&1.3.6.1.4.1.21367.2009.1.2.310&ISO	Xdsaebmtech^Linda	XDS/PIX/PDQ	19300102	1417 Yount Drive	St. Peters	MO	63112	x	F	BL	7202^SULLIVAN^KAREN^J^^^MD
+NA5136	IHENA	&1.3.6.1.4.1.21367.2009.1.2.300&ISO	LNA5136	IHELOCAL	&1.3.6.1.4.1.21367.2009.1.2.310&ISO	Othersaic^Lori	XDS/PIX/PDQ	19300115	4271 Shenandoah	Washington	MO	63122	x	F	BL	7202^SULLIVAN^KAREN^J^^^MD
+NA5138	IHENA	&1.3.6.1.4.1.21367.2009.1.2.300&ISO	LNA5138	IHELOCAL	&1.3.6.1.4.1.21367.2009.1.2.310&ISO	Adtphreesia^Marcy	XDS/PIX/PDQ	19291012	9771 E. Vista Drive	St. James	MO	63242	x	F	BL	7202^SULLIVAN^KAREN^J^^^MD
+NA5140	IHENA	&1.3.6.1.4.1.21367.2009.1.2.300&ISO	LNA5140	IHELOCAL	&1.3.6.1.4.1.21367.2009.1.2.310&ISO	Ehremergisoft^Margaret	XDS/PIX/PDQ	19291128	11942 Loxley Lane	Branson	MO	63232	x	F	WH	7202^SULLIVAN^KAREN^J^^^MD
+NA5142	IHENA	&1.3.6.1.4.1.21367.2009.1.2.300&ISO	LNA5142	IHELOCAL	&1.3.6.1.4.1.21367.2009.1.2.310&ISO	Ehrepic^Marilyn	XDS/PIX/PDQ	19291012	421 Chelsea Way	Kirkwood	MO	63262	x	F	WH	7202^SULLIVAN^KAREN^J^^^MD
+NA5144	IHENA	&1.3.6.1.4.1.21367.2009.1.2.300&ISO	LNA5144	IHELOCAL	&1.3.6.1.4.1.21367.2009.1.2.310&ISO	Ehrgreenway^Mary	XDS/PIX/PDQ	19290613	5901 S. Kingshighway	Columbia	IL	62960	x	F	BL	7202^SULLIVAN^KAREN^J^^^MD
+NA5146	IHENA	&1.3.6.1.4.1.21367.2009.1.2.300&ISO	LNA5146	IHELOCAL	&1.3.6.1.4.1.21367.2009.1.2.310&ISO	Ehrmie^Paige	XDS/PIX/PDQ	19290418	1085 Penny Royal Way	Hannibal	MO	63234	x	F	BL	7202^SULLIVAN^KAREN^J^^^MD
+NA5148	IHENA	&1.3.6.1.4.1.21367.2009.1.2.300&ISO	LNA5148	IHELOCAL	&1.3.6.1.4.1.21367.2009.1.2.310&ISO	Ehrnextgen^Pamela	XDS/PIX/PDQ	19290419	3032 Sims Avenue	Nashville	IL	62982	x	F	OT	7202^SULLIVAN^KAREN^J^^^MD
+NA5150	IHENA	&1.3.6.1.4.1.21367.2009.1.2.300&ISO	LNA5150	IHELOCAL	&1.3.6.1.4.1.21367.2009.1.2.310&ISO	Cisemergisoft^Peggy	XDS/PIX/PDQ	19290523	1077 Dawn Valley Drive	Rolla	MO	63244	x	F	OT	7202^SULLIVAN^KAREN^J^^^MD
+NA5152	IHENA	&1.3.6.1.4.1.21367.2009.1.2.300&ISO	LNA5152	IHELOCAL	&1.3.6.1.4.1.21367.2009.1.2.310&ISO	Xdsabrephds^Sandy	XDS/PIX/PDQ	19290628	120 Echo Hill Circle	Chicago	IL	62975	x	F	BL	7202^SULLIVAN^KAREN^J^^^MD
+NA5154	IHENA	&1.3.6.1.4.1.21367.2009.1.2.300&ISO	LNA5154	IHELOCAL	&1.3.6.1.4.1.21367.2009.1.2.310&ISO	Xdsbreperc^Sarah	XDS/PIX/PDQ	19300119	504 Trudy Lane	Affton	MO	63254	x	F	BL	7202^SULLIVAN^KAREN^J^^^MD
+NA5156	IHENA	&1.3.6.1.4.1.21367.2009.1.2.300&ISO	LNA5156	IHELOCAL	&1.3.6.1.4.1.21367.2009.1.2.310&ISO	Xdsrephsi^Sherry	XDS/PIX/PDQ	19290529	3310 Texas	Kansas City	MO	63111	x	F	BL	7202^SULLIVAN^KAREN^J^^^MD
+NA5158	IHENA	&1.3.6.1.4.1.21367.2009.1.2.300&ISO	LNA5158	IHELOCAL	&1.3.6.1.4.1.21367.2009.1.2.310&ISO	Phrcapmed^Sonya	XDS/PIX/PDQ	19290529	22 Alfresco Drive	Lebanon	IL	62998	x	F	WH	7202^SULLIVAN^KAREN^J^^^MD
+NA5160	IHENA	&1.3.6.1.4.1.21367.2009.1.2.300&ISO	LNA5160	IHELOCAL	&1.3.6.1.4.1.21367.2009.1.2.310&ISO	Phrepic^Sue	XDS/PIX/PDQ	19300105	103 Big Valley Circle	Hardin	IL	62990	x	F	WH	7202^SULLIVAN^KAREN^J^^^MD
+NA5162	IHENA	&1.3.6.1.4.1.21367.2009.1.2.300&ISO	LNA5162	IHELOCAL	&1.3.6.1.4.1.21367.2009.1.2.310&ISO	Cislumedx^Thelma	XDS/PIX/PDQ	19290426	881 Prigge	Nebo	IL	62962	x	F	OT	7202^SULLIVAN^KAREN^J^^^MD
+NA5164	IHENA	&1.3.6.1.4.1.21367.2009.1.2.300&ISO	LNA5164	IHELOCAL	&1.3.6.1.4.1.21367.2009.1.2.310&ISO	Gemuse^Tina	XDS/PIX/PDQ	19290512	932 Du Pre Street	Urbana	IL	62994	x	F	OT	7202^SULLIVAN^KAREN^J^^^MD
+NA6166	IHENA	&1.3.6.1.4.1.21367.2009.1.2.300&ISO	LNA5166	IHELOCAL	&1.3.6.1.4.1.21367.2009.1.2.310&ISO	Phrnmc^Tracy	XDS/PIX/PDQ	19290513	885 W Prigge	Nebo	IL	62962	x	F	OT	7202^SULLIVAN^KAREN^J^^^MD

Added: trunk/OpenPIXPDQ/src/test/org/openhealthexchange/openpixpdq/integrationtests/PixLoadConnectathonPatientTest.java
===================================================================
--- trunk/OpenPIXPDQ/src/test/org/openhealthexchange/openpixpdq/integrationtests/PixLoadConnectathonPatientTest.java	                        (rev 0)
+++ trunk/OpenPIXPDQ/src/test/org/openhealthexchange/openpixpdq/integrationtests/PixLoadConnectathonPatientTest.java	2009-02-23 16:34:35 UTC (rev 243)
@@ -0,0 +1,147 @@
+/* Copyright 2009 Misys PLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); 
+ * you may not use this file except in compliance with the License. 
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0 
+ * 
+ * Unless required by applicable law or agreed to in writing, software 
+ * distributed under the License is distributed on an "AS IS" BASIS, 
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or 
+ * implied. See the License for the specific language governing 
+ * permissions and limitations under the License. 
+ */
+package org.openhealthexchange.openpixpdq.integrationtests;
+
+import java.io.BufferedReader;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+
+import ca.uhn.hl7v2.app.Initiator;
+import ca.uhn.hl7v2.model.Message;
+import ca.uhn.hl7v2.model.v231.segment.MSA;
+import ca.uhn.hl7v2.parser.PipeParser;
+
+/**
+ * Test to load patient a number of patients for PDQ Tests. The patient data
+ * are from mesa tests.
+ * 
+ * @author Wenzhi Li
+ * @version 1.0, Feb 22, 2009
+ */
+public class PixLoadConnectathonPatientTest extends AbstractPixPdqTestCase {
+    
+	/* (non-Javadoc)
+	 * @see junit.framework.TestCase#setUp()
+	 */
+	protected void setUp() throws Exception {
+		super.setUp();
+		createPIXConnection();
+	}
+
+	/* (non-Javadoc)
+	 * @see junit.framework.TestCase#tearDown()
+	 */
+	protected void tearDown() throws Exception {
+		super.tearDown();
+	    //finally close the connection
+	    connection.close();
+	}
+
+	/**
+	 * Loads all patients
+	 */
+	public void testLoadPatients() {
+    	try {
+    		InputStream is = PixLoadConnectathonPatientTest.class.getResourceAsStream("/tests/ConnectathonTestsPatients.txt");
+    		BufferedReader br = new BufferedReader(new InputStreamReader(is));
+        	//skip the first header line
+    		String line = br.readLine(); 
+    		StringBuffer message = null;
+    		while ((line = br.readLine()) != null) {
+    			String[] fields = line.split("\t");
+    			String globalId = fields[0];
+    			String globalAuthority = fields[1] + fields[2];
+    			String localId = fields[3];
+    			String localAuthority = fields[4] + fields[5];
+    			String name = fields[6];
+    			String dob = fields[8];
+    			String streetline = fields[9];
+    			String city = fields[10];
+    			String state = fields[11];
+    			String zipcode = fields[12];
+    			String sex = fields[14];
+    			String race = fields[15];
+    			String referringDoctor = fields[16];
+    			
+    			//PIX Feed Message Sample:
+//    			MSH|^~\&|MESA_ADT|DOMAIN1_ADMITTING|PAT_IDENTITY_X_REF_MGR_MISYSPLC|ALLSCRIPTS|200902231100||ADT^A04^ADT_A01|113xx01-1|P|2.3.1||||||||
+//    			EVN||200902231100||||200902231043
+//    			PID|||PDQ113XX01^^^IHENA&1.3.6.1.4.1.21367.2009.1.2.300&ISO^PI||MOORE^CHIP||19380224|M||WH|10 PINETREE^^WEBSTER^MO^63119||||||||||||||||||||||||||||
+//    			PV1||O||||||7202^SULLIVAN^KAREN^J^^^MD||||||||||||||||||||||||||||
+
+    			//Create Global ID Feed Message
+    			StringBuffer globalFeedMsg = new StringBuffer("MSH|^~\\&|MESA_ADT|DOMAIN1_ADMITTING|PAT_IDENTITY_X_REF_MGR_MISYSPLC|ALLSCRIPTS|200902231100||ADT^A04^ADT_A01|"+globalId+"-g|P|2.3.1||||||||\r");
+    			globalFeedMsg.append("EVN||200902231100||||200902231043\r");
+    			globalFeedMsg.append("PID|||"+globalId+"^^^"+globalAuthority+"^PI||"+name+"||"+dob+"|"+sex+"||"+race+"|"+streetline+"^^"+city+"^"+state+"^"+zipcode+"||||||||||||||||||||||||||||\r");
+    			globalFeedMsg.append("PV1||O||||||"+referringDoctor+"||||||||||||||||||||||||||||");
+    			PixFeed(globalFeedMsg.toString());
+                Thread.sleep(1000); 
+    			
+    			//Create Local ID Feed Message
+    			StringBuffer localFeedMsg = new StringBuffer("MSH|^~\\&|MESA_ADT|DOMAIN1_ADMITTING|PAT_IDENTITY_X_REF_MGR_MISYSPLC|ALLSCRIPTS|200902231100||ADT^A04^ADT_A01|"+localId+"-l|P|2.3.1||||||||\r");
+    			localFeedMsg.append("EVN||200902231100||||200902231043\r");
+    			localFeedMsg.append("PID|||"+localId+"^^^"+localAuthority+"^PI||"+name+"||"+dob+"|"+sex+"||"+race+"|"+streetline+"^^"+city+"^"+state+"^"+zipcode+"||||||||||||||||||||||||||||\r");
+    			localFeedMsg.append("PV1||O||||||"+referringDoctor+"||||||||||||||||||||||||||||");
+    			PixFeed(localFeedMsg.toString());
+                Thread.sleep(1000); 
+    			
+    		}
+    		is.close();
+    	}catch(Exception e) {
+    		e.printStackTrace();
+    		fail("Fail to load patients");
+    	}
+	}
+	
+	/**
+	 * Loads all patients
+	 */
+//	public void testLoadPatients() {
+//    	try {
+//    		InputStream is = PixLoadConnectathonPatientTest.class.getResourceAsStream("/tests/ConnectathonTestPatients.txt");
+//    		BufferedReader br = new BufferedReader(new InputStreamReader(is));
+//    		String line;
+//    		StringBuffer message = null;
+//    		while ((line = br.readLine()) != null) {
+//    			if (line.startsWith("MSH")) {
+//    				message = new StringBuffer(line);
+//    			} else {
+//    				message.append("\r");
+//    				message.append(line);
+//    				if (line.startsWith("PV1")) {
+//    					PixFeed(message.toString());
+//    				}
+//    			}
+//    		}
+//    		is.close();
+//    	}catch(Exception e) {
+//    		e.printStackTrace();
+//    		fail("Fail to load patients");
+//    	}
+//	}
+	
+	private void PixFeed(String msg) throws Exception {
+		    PipeParser pipeParser = new PipeParser();
+		    Message adt = pipeParser.parse(msg);
+	
+	        Initiator initiator = connection.getInitiator();
+		    Message response = initiator.sendAndReceive(adt);
+	        String responseString = pipeParser.encode(response);	        
+	        MSA msa = (MSA)response.get("MSA");
+	        assertEquals("AA", msa.getAcknowledgementCode().getValue());
+		    System.out.println("Received response:\n" + responseString);
+	}
+	
+}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Flat | Threaded

<< < 1 2 3 4 5 .. 13 > >> (Page 3 of 13)

2008	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct (1)	Nov (18)	Dec (100)
2009	Jan (76)	Feb (45)	Mar (68)	Apr (1)	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec