Changeset 1124

Show
Ignore:
Timestamp:
02/16/09 13:32:40 (3 years ago)
Author:
olger
Message:

Released 1.5.0

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • his/tags/1.5.0/configuration/startsite/tomcat/conf/his.properties

    r822 r1124  
    3333# 
    3434jpa.database=MYSQL 
    35 jpa.showSql=true 
     35jpa.showSql=false 
    3636jpa.generateDdl=false 
    3737jpa.databasePlatform=org.hibernate.dialect.MySQL5InnoDBDialect 
    …… 
    4747xmldb.healthrecord.collection.path=/his/healthrecords 
    4848 
    49 # 
    50 # LDAP configuration 
    51 # 
    52 ldap.url=ldap://www.joiningtracks.org:19389 
    53 ldap.baseDn=dc=jttest,dc=joiningtracks,dc=org 
    54 ldap.userDn=uid=root,cn=users,dc=jttest,dc=joiningtracks,dc=org 
    55 ldap.password=jttest 
     49 # 
     50 # LDAP configuration 
     51 # 
     52# ldap.url=ldap://kantoor.zorginitiatieven.nl:389 
     53# ldap.baseDn=dc=kantoor,dc=zorginitiatieven,dc=nl 
     54# ldap.userDn=uid=ccis,cn=users,dc=kantoor,dc=zorginitiatieven,dc=nl 
     55# ldap.password=hBvVw1nd! 
    5656 
    57 #The maximum size (in pixels) for the photo by the patient saved in the ldap 
    58 ldap.patientMaxPhotoSize=150 
     57# Properties for the localhost debug ldap server with OSX schema 
     58 ldap.url=ldap://localhost:19389 
     59 ldap.baseDn=dc=jttest,dc=spectare,dc=nl 
     60 ldap.userDn=uid=root,cn=users,dc=jttest,dc=spectare,dc=nl 
     61 ldap.password=jttest 
     62#user olger with password olger is in the directory (just set other passwords when required..) 
    5963 
    60 # For each patient, a new user is created in Open Directory (LDAP) 
    61 # These are some static values that are filled in for each patient user 
    62 # The group id is an id for the 'patients' group, they have their own group. 
    63 opendirectory.patientuser.groupId=1027 
    64 # Every patient user can have the same uid. 
    65 opendirectory.patientuser.uidNumber=999 
    66 # The default password, base64 encoded. 
    67 opendirectory.patientuser.userPassword=KioqKioqKio= 
    68 # Home directory. 99 is an empty home directory 
    69 opendirectory.patientuser.homeDirectory=99 
    70 # This is the Apple services locator for the calendar service. Copy this value from a user in 
    71 # Open Directory who has access to the Calendar Service. 
    72 opendirectory.patientuser.appleserviceslocator=6B188068-CA61-4F2F-AE09-AABACD50F915:985E8857-6D37-47F9-801A-04D609195FC8:calendar 
    73 #  The groupId that contains the employees as members (gidNumber) 
    74 opendirectory.employee.groupId=1026 
     64 
     65 #The maximum size (in pixels) for the photo by the patient saved in the ldap 
     66 ldap.patientMaxPhotoSize=150 
     67 
     68 # For each patient, a new user is created in Open Directory (LDAP) 
     69 # These are some static values that are filled in for each patient user 
     70 # The group id is an id for the 'patients' group, they have their own group. 
     71 opendirectory.patientuser.groupId=1027 
     72 # Every patient user can have the same uid. 
     73 opendirectory.patientuser.uidNumber=999 
     74 # The default password, base64 encoded. 
     75 opendirectory.patientuser.userPassword=KioqKioqKio= 
     76 # Home directory. 99 is an empty home directory 
     77 opendirectory.patientuser.homeDirectory=99 
     78 # This is the Apple services locator for the calendar service. Copy this value from a user in 
     79 # Open Directory who has access to the Calendar Service. 
     80 opendirectory.patientuser.appleserviceslocator=FA9D478A-89A5-45D6-8C4F-3DA99CFD6D43:1FD31695-5026-4EFC-95D5-04F326EE5154:calendar 
     81 # Open Directory employee groupId 
     82# opendirectory.employee.groupId=1028 
     83 opendirectory.employee.groupId=20 
    7584 
    7685# 
    …… 
    93102# Folder where the OSGi container stores its state (configuration, state of bundles, etc) 
    94103# 
    95 osgi.configuration.dir=/tmp/osgi_config 
     104osgi.configuration.dir=/opt/apache-tomcat-6.0.14/osgi-runtime 
    96105 
    97106# 
    98107# Folder where the application watches for new plugins 
    99108# 
    100 osgi.bundles.pickup.dir=/tmp/osgi_pickup 
     109osgi.bundles.pickup.dir=/opt/apache-tomcat-6.0.14/bundles 
    101110 
    102111# 
    …… 
    121130#    CalDav plugin configuration     # 
    122131###################################### 
    123 caldav.host=10.0.114.196 
     132caldav.host=localhost 
    124133caldav.port=8008 
    125134caldav.root=/calendars/ 
    126135 
    127 caldav.username=planning 
    128 caldav.password=planning 
     136caldav.username=admin 
     137caldav.password=admin 
    129138###################################### 
    130139# End of CalDav plugin configuration # 

  • his/tags/1.5.0/configuration/startsite/tomcat/conf/log4j.properties

    r1092 r1124  
    1818log4j.appender.Stdout.layout.conversionPattern=%-5p - %-26.26c{1} - %m\n 
    1919 
    20 log4j.rootLogger=ERROR,Stdout 
     20log4j.rootLogger=DEBUG,Stdout 
    2121 
    2222log4j.logger.org.apache.wicket=ERROR 
    …… 
    3030log4j.logger.org.joiningtracks=DEBUG 
    3131log4j.logger.org.joiningtracks.his.data.transaction.JbpmJpaTransactionManager=ERROR 
     32log4j.logger.org.joiningtracks.his.service.planning.converter.AppointmentConverter=ERROR 
     33log4j.logger.org.joiningtracks.his.data.model.NotResolvedAttendee=ERROR 
    3234log4j.logger.org.exist.storage.btree=ERROR 
    33 log4j.logger.org.hibernate=WARN 
     35log4j.logger.org.hibernate=DEBUG 
     36log4j.logger.com.mchange=ERROR 

  • his/tags/1.5.0/configuration/startsite/tomcat/conf/questionnaire.properties

    r1092 r1124  
    3737jpa.databasePlatform=org.hibernate.dialect.MySQL5InnoDBDialect 
    3838 
     39#======================================================================================================================# 
     40#                                               HTTP Response callback settings                                        # 
     41#======================================================================================================================# 
     42http.responseURL=http://localhost:8080/ccis/ 
     43http.authScopeHost=localhost 
     44http.authScopePort=8080 
     45http.user=olger 
     46http.password=olger 
    3947 
    4048#======================================================================================================================# 
    41 #                                               OSGi Container Settings                                                        # 
     49#                                               OSGi Container Settings                                                # 
    4250#======================================================================================================================# 
    4351 

  • his/tags/1.5.0/configuration/startsite/tomcat/conf/security-context.xml

    r1092 r1124  
    2121              http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-2.0.xsd"> 
    2222 
    23     <security:authentication-provider> 
    24         <security:user-service id="userDetailsService" properties="file:${config.directory}/users.properties"/> 
    25     </security:authentication-provider> 
     23    <security:ldap-server id="ldapServer" url="${ldap.url}/${ldap.baseDn}" 
     24                          manager-dn="${ldap.userDn}" 
     25                          manager-password="${ldap.password}"/> 
     26 
     27    <security:ldap-user-service user-search-filter="(uid={0}),cn=users" 
     28                                user-search-base="cn=users" 
     29                                group-search-base="cn=groups" 
     30                                group-search-filter="(memberUid={0})"/> 
     31 
     32    <bean id="ldapAuthenticationProvider" class="org.springframework.security.providers.ldap.LdapAuthenticationProvider"> 
     33        <constructor-arg> 
     34            <bean class="org.springframework.security.providers.ldap.authenticator.BindAuthenticator"> 
     35                <constructor-arg> 
     36                    <ref local="ldapServer"/> 
     37                </constructor-arg> 
     38                <property name="userDnPatterns"> 
     39                    <list> 
     40                        <value>uid={0},cn=users</value> 
     41                    </list> 
     42                </property> 
     43            </bean> 
     44        </constructor-arg> 
     45        <constructor-arg ref="org.joiningtracks.his.support.util.security.OpenDirectoryGroupAuthorityPopulator"/> 
     46        <security:custom-authentication-provider /> 
     47    </bean> 
     48 
     49    <bean class="org.joiningtracks.his.support.util.security.OpenDirectoryGroupAuthorityPopulator"> 
     50        <constructor-arg> 
     51            <ref local="ldapServer"/> 
     52        </constructor-arg> 
     53        <constructor-arg value="cn=groups"/> 
     54        <property name="groupRoleAttribute" value="cn"/> 
     55        <property name="convertToUpperCase" value="true" /> 
     56        <property name="defaultRole" value="ROLE_USER" /> 
     57        <property name="rolePrefix" value="ROLE_" /> 
     58        <property name="searchSubtree" value="true" /> 
     59        <property name="groupSearchFilter" value="(memberUid={0})" /> 
     60    </bean> 
    2661 
    2762</beans> 

  • his/tags/1.5.0/data/pom.xml

    r1092 r1124  
    2020        <groupId>org.joiningtracks</groupId> 
    2121        <artifactId>his</artifactId> 
    22         <version>1.5.0-SNAPSHOT</version> 
     22        <version>1.5.0</version> 
    2323        <relativePath>../pom.xml</relativePath> 
    2424    </parent> 

  • his/tags/1.5.0/frontend/common/pom.xml

    r1108 r1124  
    2020        <groupId>org.joiningtracks</groupId> 
    2121        <artifactId>his-frontend</artifactId> 
    22         <version>1.5.0-SNAPSHOT</version> 
     22        <version>1.5.0</version> 
    2323        <relativePath>../pom.xml</relativePath> 
    2424    </parent> 

  • his/tags/1.5.0/frontend/domform/pom.xml

    r1092 r1124  
    2020        <groupId>org.joiningtracks</groupId> 
    2121        <artifactId>his-frontend</artifactId> 
    22         <version>1.5.0-SNAPSHOT</version> 
     22        <version>1.5.0</version> 
    2323        <relativePath>../pom.xml</relativePath> 
    2424    </parent> 

  • his/tags/1.5.0/frontend/internal/pom.xml

    r1092 r1124  
    2020        <groupId>org.joiningtracks</groupId> 
    2121        <artifactId>his-frontend</artifactId> 
    22         <version>1.5.0-SNAPSHOT</version> 
     22        <version>1.5.0</version> 
    2323        <relativePath>../pom.xml</relativePath> 
    2424    </parent> 

  • his/tags/1.5.0/frontend/pom.xml

    r1092 r1124  
    2020        <groupId>org.joiningtracks</groupId> 
    2121        <artifactId>his</artifactId> 
    22         <version>1.5.0-SNAPSHOT</version> 
     22        <version>1.5.0</version> 
    2323        <relativePath>../pom.xml</relativePath> 
    2424    </parent> 

  • his/tags/1.5.0/frontend/web/pom.xml

    r1092 r1124  
    2020        <groupId>org.joiningtracks</groupId> 
    2121        <artifactId>his-frontend</artifactId> 
    22         <version>1.5.0-SNAPSHOT</version> 
     22        <version>1.5.0</version> 
    2323        <relativePath>../pom.xml</relativePath> 
    2424    </parent> 

  • his/tags/1.5.0/plugin/api/pom.xml

    r1120 r1124  
    2020        <groupId>org.joiningtracks</groupId> 
    2121        <artifactId>his-plugin</artifactId> 
    22         <version>1.5.0-SNAPSHOT</version> 
     22        <version>1.5.0</version> 
    2323        <relativePath>../pom.xml</relativePath> 
    2424    </parent> 

  • his/tags/1.5.0/plugin/bridge/pom.xml

    r1092 r1124  
    2020        <groupId>org.joiningtracks</groupId> 
    2121        <artifactId>his-plugin</artifactId> 
    22         <version>1.5.0-SNAPSHOT</version> 
     22        <version>1.5.0</version> 
    2323        <relativePath>../pom.xml</relativePath> 
    2424    </parent> 

  • his/tags/1.5.0/plugin/pom.xml

    r1092 r1124  
    2020        <groupId>org.joiningtracks</groupId> 
    2121        <artifactId>his</artifactId> 
    22         <version>1.5.0-SNAPSHOT</version> 
     22        <version>1.5.0</version> 
    2323        <relativePath>../pom.xml</relativePath> 
    2424    </parent> 

  • his/tags/1.5.0/pom.xml

    r1120 r1124  
    2424    <groupId>org.joiningtracks</groupId> 
    2525    <artifactId>his</artifactId> 
    26     <version>1.5.0-SNAPSHOT</version> 
     26    <version>1.5.0</version> 
    2727    <packaging>pom</packaging> 
    2828 

  • his/tags/1.5.0/questionnaire/frontend/pom.xml

    r1092 r1124  
    2020        <groupId>org.joiningtracks</groupId> 
    2121        <artifactId>his-questionnaire</artifactId> 
    22         <version>1.5.0-SNAPSHOT</version> 
     22        <version>1.5.0</version> 
    2323        <relativePath>../pom.xml</relativePath> 
    2424    </parent> 

  • his/tags/1.5.0/questionnaire/pom.xml

    r1092 r1124  
    2020        <groupId>org.joiningtracks</groupId> 
    2121        <artifactId>his</artifactId> 
    22         <version>1.5.0-SNAPSHOT</version> 
     22        <version>1.5.0</version> 
    2323        <relativePath>../pom.xml</relativePath> 
    2424    </parent> 

  • his/tags/1.5.0/questionnaire/service/pom.xml

    r1092 r1124  
    2020        <groupId>org.joiningtracks</groupId> 
    2121        <artifactId>his-questionnaire</artifactId> 
    22         <version>1.5.0-SNAPSHOT</version> 
     22        <version>1.5.0</version> 
    2323        <relativePath>../pom.xml</relativePath> 
    2424    </parent> 

  • his/tags/1.5.0/samples/form/pom.xml

    r1107 r1124  
    2020        <groupId>org.joiningtracks</groupId> 
    2121        <artifactId>his-samples</artifactId> 
    22         <version>1.5.0-SNAPSHOT</version> 
     22        <version>1.5.0</version> 
    2323        <relativePath>../pom.xml</relativePath> 
    2424    </parent> 

  • his/tags/1.5.0/samples/frontend-plugin/pom.xml

    r1107 r1124  
    2020        <groupId>org.joiningtracks</groupId> 
    2121        <artifactId>his-samples</artifactId> 
    22         <version>1.5.0-SNAPSHOT</version> 
     22        <version>1.5.0</version> 
    2323        <relativePath>../pom.xml</relativePath> 
    2424    </parent> 

  • his/tags/1.5.0/samples/pathway-plugin/pom.xml

    r1107 r1124  
    2020        <groupId>org.joiningtracks</groupId> 
    2121        <artifactId>his-samples</artifactId> 
    22         <version>1.5.0-SNAPSHOT</version> 
     22        <version>1.5.0</version> 
    2323        <relativePath>../pom.xml</relativePath> 
    2424    </parent> 

  • his/tags/1.5.0/samples/patientpropagation-plugin/pom.xml

    r1107 r1124  
    2020        <groupId>org.joiningtracks</groupId> 
    2121        <artifactId>his-samples</artifactId> 
    22         <version>1.5.0-SNAPSHOT</version> 
     22        <version>1.5.0</version> 
    2323        <relativePath>../pom.xml</relativePath> 
    2424    </parent> 

  • his/tags/1.5.0/samples/pom.xml

    r1092 r1124  
    2020        <groupId>org.joiningtracks</groupId> 
    2121        <artifactId>his</artifactId> 
    22         <version>1.5.0-SNAPSHOT</version> 
     22        <version>1.5.0</version> 
    2323        <relativePath>../pom.xml</relativePath> 
    2424    </parent> 

  • his/tags/1.5.0/service/pom.xml

    r1106 r1124  
    2020        <groupId>org.joiningtracks</groupId> 
    2121        <artifactId>his</artifactId> 
    22         <version>1.5.0-SNAPSHOT</version> 
     22        <version>1.5.0</version> 
    2323        <relativePath>../pom.xml</relativePath> 
    2424    </parent> 

  • his/tags/1.5.0/support/data/pom.xml

    r1092 r1124  
    2020        <groupId>org.joiningtracks</groupId> 
    2121        <artifactId>his-support</artifactId> 
    22         <version>1.5.0-SNAPSHOT</version> 
     22        <version>1.5.0</version> 
    2323        <relativePath>../pom.xml</relativePath> 
    2424    </parent> 

  • his/tags/1.5.0/support/pom.xml

    r1092 r1124  
    2020        <groupId>org.joiningtracks</groupId> 
    2121        <artifactId>his</artifactId> 
    22         <version>1.5.0-SNAPSHOT</version> 
     22        <version>1.5.0</version> 
    2323        <relativePath>../pom.xml</relativePath> 
    2424    </parent> 

  • his/tags/1.5.0/support/testutil/pom.xml

    r1092 r1124  
    2020        <groupId>org.joiningtracks</groupId> 
    2121        <artifactId>his-support</artifactId> 
    22         <version>1.5.0-SNAPSHOT</version> 
     22        <version>1.5.0</version> 
    2323        <relativePath>../pom.xml</relativePath> 
    2424    </parent> 

  • his/tags/1.5.0/support/testutil/src/main/resources/test.properties

    r1092 r1124  
    5050# LDAP configuration 
    5151# 
    52 ldap.url=ldap://www.joiningtracks.org:19389 
     52ldap.url=ldap://localhost:19389 
    5353ldap.baseDn=dc=jttest,dc=joiningtracks,dc=org 
    5454ldap.userDn=uid=root,cn=users,dc=jttest,dc=joiningtracks,dc=org 
    …… 
    116116#    CalDav plugin configuration     # 
    117117###################################### 
    118 caldav.host=10.0.114.196 
     118caldav.host=localhost 
    119119caldav.port=8008 
    120120caldav.root=/calendars/ 

  • his/tags/1.5.0/support/util/pom.xml

    r1092 r1124  
    2020        <groupId>org.joiningtracks</groupId> 
    2121        <artifactId>his-support</artifactId> 
    22         <version>1.5.0-SNAPSHOT</version> 
     22        <version>1.5.0</version> 
    2323        <relativePath>../pom.xml</relativePath> 
    2424    </parent> 

  • his/tags/1.5.0/support/xmldb/pom.xml

    r1092 r1124  
    2020        <groupId>org.joiningtracks</groupId> 
    2121        <artifactId>his-support</artifactId> 
    22         <version>1.5.0-SNAPSHOT</version> 
     22        <version>1.5.0</version> 
    2323        <relativePath>../pom.xml</relativePath> 
    2424    </parent> 

  • his/tags/1.5.0/tools/pom.xml

    r1092 r1124  
    1919        <artifactId>his</artifactId> 
    2020        <groupId>org.joiningtracks</groupId> 
    21         <version>1.5.0-SNAPSHOT</version> 
     21        <version>1.5.0</version> 
    2222        <relativePath>../pom.xml</relativePath> 
    2323    </parent> 

  • his/tags/1.5.0/tools/src/main/resources/archetype-resources/pom.xml

    r1107 r1124  
    88        <artifactId>his-samples</artifactId> 
    99        <groupId>org.joiningtracks</groupId> 
    10         <version>1.5.0-SNAPSHOT</version> 
     10        <version>1.5.0</version> 
    1111    </parent> 
    1212 

  • his/tags/1.5.0/vecozo/pom.xml

    r1107 r1124  
    2020        <groupId>org.joiningtracks</groupId> 
    2121        <artifactId>his</artifactId> 
    22         <version>1.5.0-SNAPSHOT</version> 
     22        <version>1.5.0</version> 
    2323        <relativePath>../pom.xml</relativePath> 
    2424    </parent> 

  • his/tags/1.5.0/vecozo/src/main/resources/vecozo-client.properties

    r763 r1124  
    1 webservice.endpoint.uri=<enter the URI of the Vecozo Webservice here> 
    2 truststore.location=<enter the location of the truststore here> 
    3 truststore.password=<enter the password of the certificate here> 
     1webservice.endpoint.uri=https://certificaten.vecozo.nl/webservices/cov/vz3738.asmx 
     2truststore.location=/Library/Tomcat/conf/Vecozo-NOK-SOAP-Apple.p12 
     3truststore.password=hBvVw1nd!