[openempi~source-repository:52] OPENEMPI-4 Made various changes to simplify the configuration and deploym
- From: odysseas@kenai.com
- To: commits@openempi.kenai.com
- Subject: [openempi~source-repository:52] OPENEMPI-4 Made various changes to simplify the configuration and deploym
- Date: Sat, 13 Mar 2010 18:23:15 +0000
Project: openempi
Repository: source-repository
Revision: 52
Author: odysseas
Date: 2010-03-13 18:23:10 UTC
Link:
Log Message:
------------
OPENEMPI-4 Made various changes to simplify the configuration and deployment
of OpenEMPI
Revisions:
----------
52
Modified Paths:
---------------
branches/2.0.4-development/openempi/pom.xml
branches/2.0.4-development/openempi/src/main/assembly/assembly.xml
branches/2.0.4-development/openempi/webapp-web/src/main/java/org/openempi/webapp/client/ui/mainpane/HeaderPane.java
branches/2.0.4-development/setEnv.bat
branches/2.0.4-development/openempi/pixpdq-adapter/.classpath
branches/2.0.4-development/setenv.cmd
branches/2.0.4-development/openempi/core/src/main/java/org/openhie/openempi/configuration/Configuration.java
branches/2.0.4-development/data/create_database_schema.sql
branches/2.0.4-development/openempi/webapp-server/.classpath
branches/2.0.4-development/data/drop_database_schema.sql
Added Paths:
------------
branches/2.0.4-development/openempi/webapp-server/src/test/resources
branches/2.0.4-development/openempi/core/mpi-config.xml
branches/2.0.4-development/openempi/webapp-web/src/main/resources/mail.properties
branches/2.0.4-development/openempi/webapp-web/src/main/resources/log4j.properties
branches/2.0.4-development/openempi/webapp-server/src/test/resources/log4j.properties
branches/2.0.4-development/openempi/webapp-server/src/test/resources/mail.properties
branches/2.0.4-development/openempi/webapp-web/src/main/resources/jdbc.properties
branches/2.0.4-development/openempi/webapp-server/src/test/resources/jdbc.properties
Diffs:
------
Index: branches/2.0.4-development/setenv.cmd
===================================================================
--- branches/2.0.4-development/setenv.cmd (revision 51)
+++ branches/2.0.4-development/setenv.cmd (revision 52)
@@ -11,7 +11,7 @@
@rem ----------------------------------------------------------------
@rem Define ICS parameters
@rem ----------------------------------------------------------------
-set OPENEMPI20_HOME=D:\projects\OpenHealthTools\openhie\openempi
+set OPENEMPI20_HOME=v:\projects\kenai\openempi
@rem ----------------------------------------------------------------
@rem Define JAVA_Home
Index: branches/2.0.4-development/data/create_database_schema.sql
===================================================================
--- branches/2.0.4-development/data/create_database_schema.sql (revision 51)
+++ branches/2.0.4-development/data/create_database_schema.sql (revision 52)
@@ -2746,10 +2746,6 @@
ALTER TABLE ONLY audit_event
ADD CONSTRAINT audit_event_pkey PRIMARY KEY (audit_event_id);
--- Definition for index idx_audit_event_type (OID = 59458):
-ALTER TABLE ONLY audit_event
- ADD CONSTRAINT idx_audit_event_type UNIQUE (audit_event_type_cd);
-
-- Definition for index audit_event_type_pkey (OID = 59464):
ALTER TABLE ONLY audit_event_type
ADD CONSTRAINT audit_event_type_pkey PRIMARY KEY (audit_event_type_cd);
Index: branches/2.0.4-development/data/drop_database_schema.sql
===================================================================
--- branches/2.0.4-development/data/drop_database_schema.sql (revision 51)
+++ branches/2.0.4-development/data/drop_database_schema.sql (revision 52)
@@ -81,6 +81,7 @@
DROP SEQUENCE public.hibernate_sequence;
DROP SEQUENCE public.audit_event_seq;
DROP SEQUENCE public.person_link_review_seq;
+DROP SEQUENCE public.user_file_seq;
DROP TABLE public.user_session;
DROP TABLE public.user_role;
@@ -100,6 +101,7 @@
DROP TABLE public.identifier_domain_attribute;
DROP TABLE public.gender;
DROP TABLE public.ethnic_group;
+DROP TABLE public.user_file;
DROP TABLE public.app_user;
DROP TABLE public.address_type;
-DROP TABLE public.user_file;
+
Index: branches/2.0.4-development/setEnv.bat
===================================================================
--- branches/2.0.4-development/setEnv.bat (revision 51)
+++ branches/2.0.4-development/setEnv.bat (revision 52)
@@ -1,11 +1,11 @@
@echo off
set JAVA_HOME=d:\tools\jdk1.6.0
-set MAVEN_HOME=D:\dev\maven-2.0.9
+set MAVEN_HOME=v:\dev\maven-2.0.9
set MAVEN_OPTS=-Xmx512m -Xms256m
set ANT_HOME=D:\tools\apache-ant-1.7.0
set PATH=%JAVA_HOME%\bin;%MAVEN_HOME%\bin;%ANT_HOME%\bin;%PATH%
-D:
-cd d:\projects\kenai\openempi
+v:
+cd v:\projects\kenai\openempi
echo -----------------------------------
echo OpenEMPI 2.0 - Kenai
Index: branches/2.0.4-development/openempi/webapp-server/.classpath
===================================================================
--- branches/2.0.4-development/openempi/webapp-server/.classpath
(revision 51)
+++ branches/2.0.4-development/openempi/webapp-server/.classpath
(revision 52)
@@ -3,6 +3,7 @@
<classpathentry kind="src" output="target/classes"
path="src/main/java"/>
<classpathentry excluding="**" kind="src" output="target/classes"
path="src/main/resources"/>
<classpathentry kind="src" output="target/test-classes"
path="src/test/java"/>
+ <classpathentry kind="src" path="src/test/resources"/>
<classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con"
path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry combineaccessrules="false" kind="src"
path="/openempi-core"/>
Index:
branches/2.0.4-development/openempi/webapp-server/src/test/resources/log4j.properties
===================================================================
---
branches/2.0.4-development/openempi/webapp-server/src/test/resources/log4j.properties
(revision 0)
+++
branches/2.0.4-development/openempi/webapp-server/src/test/resources/log4j.properties
(revision 52)
@@ -0,0 +1,20 @@
+log4j.rootCategory=debug, R, O
+
+# Stdout
+log4j.appender.O=org.apache.log4j.ConsoleAppender
+
+# File
+log4j.appender.R=org.apache.log4j.RollingFileAppender
+log4j.appender.R.File=log4j.log
+
+# Control the maximum log file size
+log4j.appender.R.MaxFileSize=100KB
+
+# Archive log files (one backup file here)
+log4j.appender.R.MaxBackupIndex=1
+
+log4j.appender.R.layout=org.apache.log4j.PatternLayout
+log4j.appender.O.layout=org.apache.log4j.PatternLayout
+
+log4j.appender.R.layout.ConversionPattern=[%d{ISO8601}]%5p%6.6r[%t]%x -
%C.%M(%F:%L) - %m%n
+log4j.appender.O.layout.ConversionPattern=[%d{ISO8601}]%5p%6.6r[%t]%x -
%C.%M(%F:%L) - %m%n
\ No newline at end of file
Property changes on:
branches/2.0.4-development/openempi/webapp-server/src/test/resources/log4j.properties
___________________________________________________________________
Added: svn:eol-style
+ native
Index:
branches/2.0.4-development/openempi/webapp-server/src/test/resources/jdbc.properties
===================================================================
---
branches/2.0.4-development/openempi/webapp-server/src/test/resources/jdbc.properties
(revision 0)
+++
branches/2.0.4-development/openempi/webapp-server/src/test/resources/jdbc.properties
(revision 52)
@@ -0,0 +1,29 @@
+/**
+ *
+ * Copyright (C) 2009 SYSNET International, Inc. <support@sysnetint.com>
+ *
+ * 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.
+ *
+ */
+jdbc.driverClassName=org.postgresql.Driver
+jdbc.url=jdbc:postgresql://localhost/openempi2
+jdbc.username=openempi
+jdbc.password=openempi
+
+hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
+
+# Needed by Hibernate3 Maven Plugin defined in pom.xml
+hibernate.connection.username=openempi
+hibernate.connection.password=openempi
+hibernate.connection.url=jdbc:postgresql://localhost/openempi2
+hibernate.connection.driver_class=org.postgresql.Driver
\ No newline at end of file
Property changes on:
branches/2.0.4-development/openempi/webapp-server/src/test/resources/jdbc.properties
___________________________________________________________________
Added: svn:eol-style
+ native
Index:
branches/2.0.4-development/openempi/webapp-server/src/test/resources/mail.properties
===================================================================
---
branches/2.0.4-development/openempi/webapp-server/src/test/resources/mail.properties
(revision 0)
+++
branches/2.0.4-development/openempi/webapp-server/src/test/resources/mail.properties
(revision 52)
@@ -0,0 +1,26 @@
+/**
+ *
+ * Copyright (C) 2009 SYSNET International, Inc. <support@sysnetint.com>
+ *
+ * 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.
+ *
+ */
+# This properties file is used to configure mail settings in
+# /WEB-INF/applicationContext-service.xml.
+
+mail.default.from=AppFuse <appfuse@raibledesigns.com>
+mail.debug=false
+mail.transport.protocol=smtp
+mail.host=localhost
+mail.username=
+mail.password=
Property changes on:
branches/2.0.4-development/openempi/webapp-server/src/test/resources/mail.properties
___________________________________________________________________
Added: svn:eol-style
+ native
Index:
branches/2.0.4-development/openempi/webapp-server/src/main/resources/log4j.properties
===================================================================
---
branches/2.0.4-development/openempi/webapp-server/src/main/resources/log4j.properties
(revision 51)
+++
branches/2.0.4-development/openempi/webapp-server/src/main/resources/log4j.properties
(revision 52)
@@ -1,20 +0,0 @@
-log4j.rootCategory=warn, R, O
-
-# Stdout
-log4j.appender.O=org.apache.log4j.ConsoleAppender
-
-# File
-log4j.appender.R=org.apache.log4j.RollingFileAppender
-log4j.appender.R.File=log4j.log
-
-# Control the maximum log file size
-log4j.appender.R.MaxFileSize=100KB
-
-# Archive log files (one backup file here)
-log4j.appender.R.MaxBackupIndex=1
-
-log4j.appender.R.layout=org.apache.log4j.PatternLayout
-log4j.appender.O.layout=org.apache.log4j.PatternLayout
-
-log4j.appender.R.layout.ConversionPattern=[%d{ISO8601}]%5p%6.6r[%t]%x -
%C.%M(%F:%L) - %m%n
-log4j.appender.O.layout.ConversionPattern=[%d{ISO8601}]%5p%6.6r[%t]%x -
%C.%M(%F:%L) - %m%n
\ No newline at end of file
Index:
branches/2.0.4-development/openempi/webapp-server/src/main/resources/jdbc.properties
===================================================================
---
branches/2.0.4-development/openempi/webapp-server/src/main/resources/jdbc.properties
(revision 51)
+++
branches/2.0.4-development/openempi/webapp-server/src/main/resources/jdbc.properties
(revision 52)
@@ -1,80 +0,0 @@
-#
-#
-# Copyright (C) 2009 SYSNET International, Inc. <support@sysnetint.com>
-#
-# 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.
-#
-#
-#
-# ====
-#
-# Copyright (C) 2009 SYSNET International, Inc. <sypport@sysnetint.com>
-#
-# 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.
-#
-# ====
-#
-# Copyright (C) 2009 SYSNET International, Inc. <sypport@sysnetint.com>
-#
-# 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.
-#
-#
-#
-#
-# Copyright (C) ${year} ${company} <${email}>
-#
-# 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.
-#
-#
-jdbc.driverClassName=org.postgresql.Driver
-jdbc.url=jdbc:postgresql://localhost/openempi2
-jdbc.username=openempi
-jdbc.password=openempi
-
-hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
-
-# Needed by Hibernate3 Maven Plugin defined in pom.xml
-hibernate.connection.username=openempi
-hibernate.connection.password=openempi
-hibernate.connection.url=jdbc:postgresql://localhost/openempi2
-hibernate.connection.driver_class=org.postgresql.Driver
\ No newline at end of file
Index:
branches/2.0.4-development/openempi/webapp-server/src/main/resources/mail.properties
===================================================================
---
branches/2.0.4-development/openempi/webapp-server/src/main/resources/mail.properties
(revision 51)
+++
branches/2.0.4-development/openempi/webapp-server/src/main/resources/mail.properties
(revision 52)
@@ -1,77 +0,0 @@
-#
-#
-# Copyright (C) 2009 SYSNET International, Inc. <support@sysnetint.com>
-#
-# 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.
-#
-#
-#
-# ====
-#
-# Copyright (C) 2009 SYSNET International, Inc. <sypport@sysnetint.com>
-#
-# 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.
-#
-# ====
-#
-# Copyright (C) 2009 SYSNET International, Inc. <sypport@sysnetint.com>
-#
-# 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.
-#
-#
-#
-#
-# Copyright (C) ${year} ${company} <${email}>
-#
-# 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.
-#
-#
-# This properties file is used to configure mail settings in
-# /WEB-INF/applicationContext-service.xml.
-
-mail.default.from=AppFuse <appfuse@raibledesigns.com>
-mail.debug=false
-mail.transport.protocol=smtp
-mail.host=localhost
-mail.username=
-mail.password=
Index: branches/2.0.4-development/openempi/pixpdq-adapter/.classpath
===================================================================
--- branches/2.0.4-development/openempi/pixpdq-adapter/.classpath
(revision 51)
+++ branches/2.0.4-development/openempi/pixpdq-adapter/.classpath
(revision 52)
@@ -4,8 +4,8 @@
<classpathentry kind="src" path="src/test/resources"/>
<classpathentry kind="src" path="src/test/java"/>
<classpathentry kind="src" path="src/main/resources"/>
- <classpathentry kind="lib" path="/OpenPIXPDQ/dist/openpixpdq-1.1.jar"
sourcepath="/OpenPIXPDQ/src/java"/>
<classpathentry kind="con"
path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry combineaccessrules="false" kind="src"
path="/OpenPIXPDQ"/>
<classpathentry kind="output" path="target/test-classes"/>
</classpath>
Index: branches/2.0.4-development/openempi/src/main/assembly/assembly.xml
===================================================================
--- branches/2.0.4-development/openempi/src/main/assembly/assembly.xml
(revision 51)
+++ branches/2.0.4-development/openempi/src/main/assembly/assembly.xml
(revision 52)
@@ -44,6 +44,26 @@
<directoryMode>0755</directoryMode>
</fileSet>
<fileSet>
+ <directory>../data</directory>
+ <outputDirectory>conf</outputDirectory>
+ <includes>
+ <include>dataset_A_1000.csv</include>
+ </includes>
+ <useDefaultExcludes>true</useDefaultExcludes>
+ <fileMode>0644</fileMode>
+ <directoryMode>0755</directoryMode>
+ </fileSet>
+ <fileSet>
+ <directory>../data</directory>
+ <outputDirectory>conf</outputDirectory>
+ <includes>
+
<include>pixpdq_connectathon_patients.csv</include>
+ </includes>
+ <useDefaultExcludes>true</useDefaultExcludes>
+ <fileMode>0644</fileMode>
+ <directoryMode>0755</directoryMode>
+ </fileSet>
+ <fileSet>
<directory>web/src/main/resources</directory>
<outputDirectory>conf</outputDirectory>
<includes>
Index: branches/2.0.4-development/openempi/core/mpi-config.xml
===================================================================
--- branches/2.0.4-development/openempi/core/mpi-config.xml (revision 0)
+++ branches/2.0.4-development/openempi/core/mpi-config.xml (revision 52)
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+
+ Copyright (C) 2009 SYSNET International, Inc. <support@sysnetint.com>
+
+ 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.
+
+
+-->
+<mpi-config xmlns="http://configuration.openempi.openhie.org/mpiconfig";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+
xsi:schemaLocation="http://configuration.openempi.openhie.org/mpiconfig ;
mpi-config.xsd">
+
+ <global-identifier>
+ <assign-global-identifier>false</assign-global-identifier>
+
<namespace-identifier>2.16.840.1.113883.4.357</namespace-identifier>
+
<universal-identifier>2.16.840.1.113883.4.357</universal-identifier>
+ <universal-identifier-type>hl7</universal-identifier-type>
+ </global-identifier>
+
+ <transforms>
+ <transform>
+ <id>doubleMetaphone</id>
+ <class>
+
org.openhie.openempi.transformation.DoubleMetaphoneFunction
+ </class>
+ </transform>
+ </transforms>
+
+ <custom-fields>
+ <custom-field>
+ <field-name>custom1</field-name>
+ <source-field-name>familyName</source-field-name>
+ <function>doubleMetaphone</function>
+ </custom-field>
+ <custom-field>
+ <field-name>custom2</field-name>
+ <source-field-name>givenName</source-field-name>
+ <function>doubleMetaphone</function>
+ </custom-field>
+ </custom-fields>
+
+ <blocking-configuration>
+ <blocking-rounds>
+ <blocking-round>
+ <blocking-fields>
+ <blocking-field>
+
<field-name>custom1</field-name>
+ </blocking-field>
+ </blocking-fields>
+ </blocking-round>
+ </blocking-rounds>
+ </blocking-configuration>
+
+ <matching-configuratio n>
+ <false-negative-probability>0.2</false-negative-probability>
+ <false-positive-probability>0.2</false-positive-probability>
+ <match-fields>
+ <match-field>
+ <field-name>givenName</field-name>
+
<agreement-probability>0.9</agreement-probability>
+
<disagreement-probability>0.1</disagreement-probability>
+
<string-comparator>JaroWinkler</string-comparator>
+ <match-threshold>0.725</match-threshold>
+ </match-field>
+ <match-field>
+ <field-name>familyName</field-name>
+
<agreement-probability>0.9</agreement-probability>
+
<disagreement-probability>0.1</disagreement-probability>
+
<string-comparator>Levenshtein</string-comparator>
+ <match-threshold>0.8125</match-threshold>
+ </match-field>
+ <match-field>
+ <field-name>phoneNumber</field-name>
+
<agreement-probability>0.9</agreement-probability>
+
<disagreement-probability>0.1</disagreement-probability>
+
<string-comparator>JaroWinkler</string-comparator>
+ <match-threshold>0.725</match-threshold>
+ </match-field>
+ <match-field>
+ <field-name>dateOfBirth</field-name>
+
<agreement-probability>0.9</agreement-probability>
+
<disagreement-probability>0.1</disagreement-probability>
+
<string-comparator>JaroWinkler</string-comparator>
+ <match-threshold>0.725</match-threshold>
+ </match-field>
+ <match-field>
+ <field-name>city</field-name>
+
<agreement-probability>0.9</agreement-probability>
+
<disagreement-probability>0.1</disagreement-probability>
+
<string-comparator>JaroWinkler</string-comparator>
+ <match-threshold>0.725</match-threshold>
+ </match-field>
+ </match-fields>
+
<config-file-directory>D:/projects/OpenHealthTools/openhie-2.0/OSCDE/openempi</config-file-directory>
+ </matching-configuration>
+
+ <admin-configuration>
+
<file-repository-directory>fileRepository</file-repository-directory>
+ </admin-configuration>
+</mpi-config>
Property changes on: branches/2.0.4-development/openempi/core/mpi-config.xml
___________________________________________________________________
Added: svn:eol-style
+ native
Index:
branches/2.0.4-development/openempi/core/src/main/java/org/openhie/openempi/configuration/Configuration.java
===================================================================
---
branches/2.0.4-development/openempi/core/src/main/java/org/openhie/openempi/configuration/Configuration.java
(revision 51)
+++
branches/2.0.4-development/openempi/core/src/main/java/org/openhie/openempi/configuration/Configuration.java
(revision 52)
@@ -273,18 +273,20 @@
}
private MpiConfigDocument loadConfigurationFromSource() throws
XmlException, IOException {
+ File dir = new File(System.getProperty("user.dir"));
+ File file = new File(dir, configFile);
+ log.debug("Checking for presence of the configuration in
file: " + file.getAbsolutePath());
+ if (file.exists() && file.isFile()) {
+ log.info("Loading configuration from file: " +
file.getAbsolutePath());
+ return MpiConfigDocument.Factory.parse(file);
+ }
+
URL fileUrl = Configuration.class.getResource(configFile);
if (fileUrl != null) {
log.info("Loading configuration from URL: " +
fileUrl);
return MpiConfigDocument.Factory.parse(fileUrl);
}
- File dir = new File(System.getProperty("user.dir"));
- File file = new File(dir, configFile);
- if (file.exists() && file.isFile()) {
- log.info("Loading configuration from file: " +
file.getAbsolutePath());
- return MpiConfigDocument.Factory.parse(fileUrl);
- }
log.error("Unable to load configuration information.");
throw new RuntimeException("Unable to load configuration
information.");
}
Index:
branches/2.0.4-development/openempi/webapp-web/src/main/java/org/openempi/webapp/client/ui/mainpane/HeaderPane.java
===================================================================
---
branches/2.0.4-development/openempi/webapp-web/src/main/java/org/openempi/webapp/client/ui/mainpane/HeaderPane.java
(revision 51)
+++
branches/2.0.4-development/openempi/webapp-web/src/main/java/org/openempi/webapp/client/ui/mainpane/HeaderPane.java
(revision 52)
@@ -111,43 +111,43 @@
}
private void logout() {
- getServiceRegistry().getSecurityService().logout(
- new AsyncCallback<String>() {
- public void onFailure(Throwable
caught) {
- throw new
RuntimeException(caught);
- }
-
- public void onSuccess(String caught) {
- reset();
- }
- });
+// getServiceRegistry().getSecurityService().logout(
+// new AsyncCallback<String>() {
+// public void onFailure(Throwable
caught) {
+// throw new
RuntimeException(caught);
+// }
+//
+// public void onSuccess(String caught) {
+// reset();
+// }
+// });
}
private void login(String userName) {
- getServiceRegistry().getSecurityService().login(userName,
- new AsyncCallback<String>() {
- public void onFailure(Throwable
caught) {
- throw new
RuntimeException(caught);
- }
+// getServiceRegistry().getSecurityService().login(userName,
+// new AsyncCallback<String>() {
+// public void onFailure(Throwable
caught) {
+// throw new
RuntimeException(caught);
+// }
+//
+// //after we log them in, make another
call to get their name
+// //and set it in the ClientState.
This is inefficient, but it
+// //demonstrates making two
asynchronous calls serially
+// public void onSuccess(String caught) {
+//
getServiceRegistry().getSecurityService().getCurrentAuthentication(
+// (new
AsyncCallback<Authentication>() {
+// public void
onFailure(Throwable caught) {
+// throw new
RuntimeException(caught);
+// }
+// public void
onSuccess(Authentication authentication) {
+//
getClientState().setUserName(authentication.getUsername());
+// reset();
+// }
+// }));
+// }
+// });
- //after we log them in, make another
call to get their name
- //and set it in the ClientState.
This is inefficient, but it
- //demonstrates making two
asynchronous calls serially
- public void onSuccess(String caught) {
-
getServiceRegistry().getSecurityService().getCurrentAuthentication(
- (new
AsyncCallback<Authentication>() {
- public void
onFailure(Throwable caught) {
- throw new
RuntimeException(caught);
- }
- public void
onSuccess(Authentication authentication) {
-
getClientState().setUserName(authentication.getUsername());
- reset();
- }
- }));
- }
- });
-
}
private void showNewUserNameRequestPopupPanel() {
Index:
branches/2.0.4-development/openempi/webapp-web/src/main/resources/log4j.xml
===================================================================
---
branches/2.0.4-development/openempi/webapp-web/src/main/resources/log4j.xml
(revision 51)
+++
branches/2.0.4-development/openempi/webapp-web/src/main/resources/log4j.xml
(revision 52)
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-
-
- Copyright (C) 2009 SYSNET International, Inc. <support@sysnetint.com>
-
- 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.
-
-
--->
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/";>
-
- <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern"
- value="%p - %C.%M(%L) | %m%n"/>
- </layout>
- </appender>
-
- <appender name="FILE" class="org.apache.log4j.FileAppender">
- <param name="File" value="openempi.log" />
- <param name="Append" value="true" />
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%t - %-5p - %C.%M(%L)
%c{2} - %m%n"/>
- </layout>
- </appender>
-
- <logger name="net.sf.ehcache">
- <level value="ERROR"/>
- </logger>
-
- <!-- Suppress success logging from InteractiveAuthenticationSuccessEvent
-->
- <logger name="org.springframework.security">
- <level value="ERROR"/>
- </logger>
-
- <logger name="org.apache">
- <level value="WARN"/>
- </logger>
-
- <logger name="org.apache.velocity">
- <level value="FATAL"/>
- </logger>
-
- <logger name="org.hibernate">
- <level value="WARN"/>
- </logger>
-
- <logger name="org.hibernate.SQL">
- <level value="DEBUG"/>
- </logger>
-
- <logger name="org.hibernate.transaction">
- <level value="DEBUG"/>
- </logger>
-
- <logger name="org.springframework">
- <level value="ERROR"/>
- </logger>
-
- <logger name="org.springframework.transaction">
- <level value="WARN"/>
- </logger>
-
- <logger name="org.openhie.openempi">
- <level value="TRACE"/>
- </logger>
-
- <root>
- <level value="WARN"/>
- <appender-ref ref="CONSOLE"/>
- <appender-ref ref="FILE"/>
- </root>
-
-</log4j:configuration>
Index:
branches/2.0.4-development/openempi/webapp-web/src/main/resources/log4j.properties
===================================================================
---
branches/2.0.4-development/openempi/webapp-web/src/main/resources/log4j.properties
(revision 0)
+++
branches/2.0.4-development/openempi/webapp-web/src/main/resources/log4j.properties
(revision 52)
@@ -0,0 +1,20 @@
+log4j.rootCategory=debug, R, O
+
+# Stdout
+log4j.appender.O=org.apache.log4j.ConsoleAppender
+
+# File
+log4j.appender.R=org.apache.log4j.RollingFileAppender
+log4j.appender.R.File=log4j.log
+
+# Control the maximum log file size
+log4j.appender.R.MaxFileSize=1MB
+
+# Archive log files (one backup file here)
+log4j.appender.R.MaxBackupIndex=3
+
+log4j.appender.R.layout=org.apache.log4j.PatternLayout
+log4j.appender.O.layout=org.apache.log4j.PatternLayout
+
+log4j.appender.R.layout.ConversionPattern=[%d{ISO8601}]%5p%6.6r[%t]%x -
%C.%M(%F:%L) - %m%n
+log4j.appender.O.layout.ConversionPattern=[%d{ISO8601}]%5p%6.6r[%t]%x -
%C.%M(%F:%L) - %m%n
\ No newline at end of file
Property changes on:
branches/2.0.4-development/openempi/webapp-web/src/main/resources/log4j.properties
___________________________________________________________________
Added: svn:eol-style
+ native
Index:
branches/2.0.4-development/openempi/webapp-web/src/main/resources/jdbc.properties
===================================================================
---
branches/2.0.4-development/openempi/webapp-web/src/main/resources/jdbc.properties
(revision 0)
+++
branches/2.0.4-development/openempi/webapp-web/src/main/resources/jdbc.properties
(revision 52)
@@ -0,0 +1,29 @@
+/**
+ *
+ * Copyright (C) 2009 SYSNET International, Inc. <support@sysnetint.com>
+ *
+ * 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.
+ *
+ */
+jdbc.driverClassName=org.postgresql.Driver
+jdbc.url=jdbc:postgresql://localhost/openempi
+jdbc.username=openempi
+jdbc.password=openempi
+
+hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
+
+# Needed by Hibernate3 Maven Plugin defined in pom.xml
+hibernate.connection.username=openempi
+hibernate.connection.password=openempi
+hibernate.connection.url=jdbc:postgresql://localhost/openempi
+hibernate.connection.driver_class=org.postgresql.Driver
\ No newline at end of file
Property changes on:
branches/2.0.4-development/openempi/webapp-web/src/main/resources/jdbc.properties
___________________________________________________________________
Added: svn:eol-style
+ native
Index:
branches/2.0.4-development/openempi/webapp-web/src/main/resources/mail.properties
===================================================================
---
branches/2.0.4-development/openempi/webapp-web/src/main/resources/mail.properties
(revision 0)
+++
branches/2.0.4-development/openempi/webapp-web/src/main/resources/mail.properties
(revision 52)
@@ -0,0 +1,26 @@
+/**
+ *
+ * Copyright (C) 2009 SYSNET International, Inc. <support@sysnetint.com>
+ *
+ * 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.
+ *
+ */
+# This properties file is used to configure mail settings in
+# /WEB-INF/applicationContext-service.xml.
+
+mail.default.from=AppFuse <appfuse@raibledesigns.com>
+mail.debug=false
+mail.transport.protocol=smtp
+mail.host=localhost
+mail.username=
+mail.password=
Property changes on:
branches/2.0.4-development/openempi/webapp-web/src/main/resources/mail.properties
___________________________________________________________________
Added: svn:eol-style
+ native
Index: branches/2.0.4-development/openempi/pom.xml
===================================================================
--- branches/2.0.4-development/openempi/pom.xml (revision 51)
+++ branches/2.0.4-development/openempi/pom.xml (revision 52)
@@ -465,7 +465,7 @@
</profiles>
<properties>
- <release.version>2.0.4-development</release.version>
+ <release.version>2.0.4</release.version>
<maven.compiler.source>5</maven.compiler.source>
<maven.compiler.target>5</maven.compiler.target>
|
[openempi~source-repository:52] OPENEMPI-4 Made various changes to simplify the configuration and deploym |
odysseas | 03/13/2010 |
