OpenMRS

Timestamp:

07/02/08 14:40:36 (2 months ago)

Author:

bmckown

Message:

Merging trunk to complex-obs [4379][4764]

Files:

• openmrs/branches/complex-obs/build.properties (modified) (view diffs)
• openmrs/branches/complex-obs/build.xml (modified) (view diffs)
• openmrs/branches/complex-obs/dir_conflicts.prej (added)
• openmrs/branches/complex-obs/libs.txt (added)
• openmrs/branches/complex-obs/metadata/api/hibernate/org/openmrs/api/db/hibernate/Cohort.hbm.xml (modified) (view diffs)
• openmrs/branches/complex-obs/metadata/api/hibernate/org/openmrs/api/db/hibernate/Concept.hbm.xml (modified) (view diffs)
• openmrs/branches/complex-obs/metadata/api/hibernate/org/openmrs/api/db/hibernate/ConceptName.hbm.xml (modified) (view diffs)
• openmrs/branches/complex-obs/metadata/api/hibernate/org/openmrs/api/db/hibernate/Program.hbm.xml (modified) (view diffs)
• openmrs/branches/complex-obs/metadata/api/spring/applicationContext-service.xml (modified) (view diffs)
• openmrs/branches/complex-obs/metadata/model/1.3.0-createdb-from-scratch-with-demo-data.sql (modified) (view diffs)
• openmrs/branches/complex-obs/metadata/model/1.3.0-schema-only.sql (modified) (view diffs)
• openmrs/branches/complex-obs/metadata/model/1.3.0-schema-with-core-and-demo-data.sql (modified) (view diffs)
• openmrs/branches/complex-obs/metadata/model/1.3.0-schema-with-core-data.sql (modified) (view diffs)
• openmrs/branches/complex-obs/metadata/model/readme.txt (modified) (view diffs)
• openmrs/branches/complex-obs/metadata/model/test-data-conventions.sql (deleted)
• openmrs/branches/complex-obs/metadata/model/update-to-latest-db.mysqldiff.sql (modified) (view diffs)
• openmrs/branches/complex-obs/metadata/model/util (copied) (copied from openmrs/trunk/metadata/model/util) (view diffs)
• openmrs/branches/complex-obs/metadata/model/util/test-data-conventions.sql (copied) (copied from openmrs/trunk/metadata/model/util/test-data-conventions.sql) (view diffs)
• openmrs/branches/complex-obs/metadata/model/util/update-scripts-to-latest.sh (copied) (copied from openmrs/trunk/metadata/model/util/update-scripts-to-latest.sh) (view diffs)
• openmrs/branches/complex-obs/src/api/org/openmrs/Cohort.java (modified) (view diffs)
• openmrs/branches/complex-obs/src/api/org/openmrs/Concept.java (modified) (view diffs)
• openmrs/branches/complex-obs/src/api/org/openmrs/ConceptNumeric.java (modified) (view diffs)
• openmrs/branches/complex-obs/src/api/org/openmrs/ConceptWord.java (modified) (view diffs)
• openmrs/branches/complex-obs/src/api/org/openmrs/Encounter.java (modified) (view diffs)
• openmrs/branches/complex-obs/src/api/org/openmrs/Location.java (modified) (view diffs)
• openmrs/branches/complex-obs/src/api/org/openmrs/Obs.java (modified) (view diffs)
• openmrs/branches/complex-obs/src/api/org/openmrs/Patient.java (modified) (view diffs)
• openmrs/branches/complex-obs/src/api/org/openmrs/PersonAttribute.java (modified) (view diffs)
• openmrs/branches/complex-obs/src/api/org/openmrs/Program.java (modified) (view diffs)
• openmrs/branches/complex-obs/src/api/org/openmrs/ProgramWorkflowState.java (modified) (view diffs)
• openmrs/branches/complex-obs/src/api/org/openmrs/annotation/Logging.java (modified) (view diffs)
• openmrs/branches/complex-obs/src/api/org/openmrs/aop/LoggingAdvice.java (modified) (view diffs)
• openmrs/branches/complex-obs/src/api/org/openmrs/api/CohortService.java (modified) (view diffs)
• openmrs/branches/complex-obs/src/api/org/openmrs/api/ConceptService.java (modified) (view diffs)
• openmrs/branches/complex-obs/src/api/org/openmrs/api/DataSetService.java (modified) (view diffs)
• openmrs/branches/complex-obs/src/api/org/openmrs/api/EncounterService.java (modified) (view diffs)
• openmrs/branches/complex-obs/src/api/org/openmrs/api/ObsService.java (modified) (view diffs)
• openmrs/branches/complex-obs/src/api/org/openmrs/api/PatientService.java (modified) (view diffs)
• openmrs/branches/complex-obs/src/api/org/openmrs/api/ProgramWorkflowService.java (modified) (view diffs)
• openmrs/branches/complex-obs/src/api/org/openmrs/api/UserService.java (modified) (view diffs)
• openmrs/branches/complex-obs/src/api/org/openmrs/api/db/CohortDAO.java (modified) (view diffs)
• openmrs/branches/complex-obs/src/api/org/openmrs/api/db/hibernate/HibernateAdministrationDAO.java (modified) (view diffs)
• openmrs/branches/complex-obs/src/api/org/openmrs/api/db/hibernate/HibernateCohortDAO.java (modified) (view diffs)
• openmrs/branches/complex-obs/src/api/org/openmrs/api/db/hibernate/HibernateConceptDAO.java (modified) (view diffs)
• openmrs/branches/complex-obs/src/api/org/openmrs/api/db/hibernate/HibernateEncounterDAO.java (modified) (view diffs)
• openmrs/branches/complex-obs/src/api/org/openmrs/api/db/hibernate/HibernatePatientDAO.java (modified) (view diffs)
• openmrs/branches/complex-obs/src/api/org/openmrs/api/db/hibernate/HibernatePatientSetDAO.java (modified) (view diffs)
• openmrs/branches/complex-obs/src/api/org/openmrs/api/db/hibernate/HibernateProgramWorkflowDAO.java (modified) (view diffs)
• openmrs/branches/complex-obs/src/api/org/openmrs/api/db/hibernate/HibernateUserDAO.java (modified) (view diffs)
• openmrs/branches/complex-obs/src/api/org/openmrs/api/impl/CohortServiceImpl.java (modified) (view diffs)
• openmrs/branches/complex-obs/src/api/org/openmrs/api/impl/ConceptServiceImpl.java (modified) (view diffs)
• openmrs/branches/complex-obs/src/api/org/openmrs/api/impl/EncounterServiceImpl.java (modified) (view diffs)
• openmrs/branches/complex-obs/src/api/org/openmrs/api/impl/ObsServiceImpl.java (modified) (view diffs)
• openmrs/branches/complex-obs/src/api/org/openmrs/api/impl/OrderServiceImpl.java (modified) (view diffs)
• openmrs/branches/complex-obs/src/api/org/openmrs/api/impl/PatientServiceImpl.java (modified) (view diffs)
• openmrs/branches/complex-obs/src/api/org/openmrs/api/impl/PersonServiceImpl.java (modified) (view diffs)
• openmrs/branches/complex-obs/src/api/org/openmrs/api/impl/ProgramWorkflowServiceImpl.java (modified) (view diffs)
• openmrs/branches/complex-obs/src/api/org/openmrs/cohort/CohortDefinitionItemHolder.java (copied) (copied from openmrs/trunk/src/api/org/openmrs/cohort/CohortDefinitionItemHolder.java) (view diffs)
• openmrs/branches/complex-obs/src/api/org/openmrs/cohort/CohortDefinitionProvider.java (modified) (view diffs)
• openmrs/branches/complex-obs/src/api/org/openmrs/cohort/impl/PatientSearchCohortDefinitionProvider.java (modified) (view diffs)
• openmrs/branches/complex-obs/src/api/org/openmrs/cohort/impl/StaticCohortDefinitionProvider.java (modified) (view diffs)
• openmrs/branches/complex-obs/src/api/org/openmrs/hl7/handler/ORUR01Handler.java (modified) (view diffs)
• openmrs/branches/complex-obs/src/api/org/openmrs/logic/rule/ReferenceRule.java (modified) (view diffs)
• openmrs/branches/complex-obs/src/api/org/openmrs/migration/MigrationHelper.java (modified) (view diffs)
• openmrs/branches/complex-obs/src/api/org/openmrs/module/ModuleFactory.java (modified) (view diffs)
• openmrs/branches/complex-obs/src/api/org/openmrs/module/ModuleUtil.java (modified) (view diffs)
• openmrs/branches/complex-obs/src/api/org/openmrs/patient/impl/BaseHyphenatedIdentifierValidator.java (modified) (view diffs)
• openmrs/branches/complex-obs/src/api/org/openmrs/patient/impl/LuhnIdentifierValidator.java (modified) (view diffs)
• openmrs/branches/complex-obs/src/api/org/openmrs/propertyeditor/ConceptAnswersEditor.java (modified) (view diffs)
• openmrs/branches/complex-obs/src/api/org/openmrs/propertyeditor/ConceptSetsEditor.java (modified) (view diffs)
• openmrs/branches/complex-obs/src/api/org/openmrs/propertyeditor/WorkflowCollectionEditor.java (modified) (view diffs)
• openmrs/branches/complex-obs/src/api/org/openmrs/report/EvaluationContext.java (modified) (view diffs)
• openmrs/branches/complex-obs/src/api/org/openmrs/report/impl/DelimitedTextReportRenderer.java (modified) (view diffs)
• openmrs/branches/complex-obs/src/api/org/openmrs/reporting/ReportObjectFactory.java (modified) (view diffs)
• openmrs/branches/complex-obs/src/api/org/openmrs/reporting/ReportObjectService.java (modified) (view diffs)
• openmrs/branches/complex-obs/src/api/org/openmrs/reporting/db/ReportObjectDAO.java (modified) (view diffs)
• openmrs/branches/complex-obs/src/api/org/openmrs/reporting/db/hibernate/HibernateReportObjectDAO.java (modified) (view diffs)
• openmrs/branches/complex-obs/src/api/org/openmrs/reporting/export/DataExportUtil.java (modified) (view diffs)
• openmrs/branches/complex-obs/src/api/org/openmrs/reporting/impl/ReportObjectServiceImpl.java (modified) (view diffs)
• openmrs/branches/complex-obs/src/api/org/openmrs/scheduler/timer/TimerSchedulerServiceImpl.java (modified) (view diffs)
• openmrs/branches/complex-obs/src/api/org/openmrs/util/OpenmrsClassLoader.java (modified) (view diffs)
• openmrs/branches/complex-obs/src/api/org/openmrs/util/OpenmrsConstants.java (modified) (view diffs)
• openmrs/branches/complex-obs/src/api/org/openmrs/util/OpenmrsUtil.java (modified) (view diffs)
• openmrs/branches/complex-obs/src/web/org/openmrs/module/web/extension/BoxExt.java (modified) (view diffs)
• openmrs/branches/complex-obs/src/web/org/openmrs/module/web/taglib/ExtensionPointTag.java (modified) (view diffs)
• openmrs/branches/complex-obs/src/web/org/openmrs/web/Listener.java (modified) (view diffs)
• openmrs/branches/complex-obs/src/web/org/openmrs/web/controller/ConceptFormController.java (modified) (view diffs)
• openmrs/branches/complex-obs/src/web/org/openmrs/web/controller/PatientSetPortletController.java (modified) (view diffs)
• openmrs/branches/complex-obs/src/web/org/openmrs/web/controller/PortletController.java (modified) (view diffs)
• openmrs/branches/complex-obs/src/web/org/openmrs/web/controller/analysis/CohortBuilderController.java (modified) (view diffs)
• openmrs/branches/complex-obs/src/web/org/openmrs/web/controller/concept/ConceptClassFormController.java (modified) (view diffs)
• openmrs/branches/complex-obs/src/web/org/openmrs/web/controller/concept/ConceptClassListController.java (modified) (view diffs)
• openmrs/branches/complex-obs/src/web/org/openmrs/web/controller/concept/ConceptWordFormController.java (modified) (view diffs)
• openmrs/branches/complex-obs/src/web/org/openmrs/web/controller/patient/NewPatientFormController.java (modified) (view diffs)
• openmrs/branches/complex-obs/src/web/org/openmrs/web/controller/patient/PatientFormController.java (modified) (view diffs)
• openmrs/branches/complex-obs/src/web/org/openmrs/web/controller/person/PersonFormController.java (modified) (view diffs)
• openmrs/branches/complex-obs/src/web/org/openmrs/web/controller/program/ProgramFormController.java (modified) (view diffs)
• openmrs/branches/complex-obs/src/web/org/openmrs/web/controller/report/ReportMacrosFormController.java (modified) (view diffs)
• openmrs/branches/complex-obs/src/web/org/openmrs/web/controller/report/ReportObjectFormController.java (modified) (view diffs)
• openmrs/branches/complex-obs/src/web/org/openmrs/web/dwr/DWRCohortBuilderService.java (modified) (view diffs)
• openmrs/branches/complex-obs/src/web/org/openmrs/web/dwr/DWRObsService.java (modified) (view diffs)
• openmrs/branches/complex-obs/src/web/org/openmrs/web/servlet/DownloadDictionaryServlet.java (modified) (view diffs)
• openmrs/branches/complex-obs/src/web/org/openmrs/web/servlet/SummaryServlet.java (modified) (view diffs)
• openmrs/branches/complex-obs/src/web/org/openmrs/web/taglib/RequireTag.java (modified) (view diffs)
• openmrs/branches/complex-obs/src/web/org/openmrs/web/taglib/fieldgen/FieldGenHandlerFactory.java (modified) (view diffs)
• openmrs/branches/complex-obs/src/web/org/openmrs/web/taglib/fieldgen/ProgramWorkflowHandler.java (modified) (view diffs)
• openmrs/branches/complex-obs/test/api/org/openmrs/test/api/AdministrationServiceTest.java (modified) (view diffs)
• openmrs/branches/complex-obs/test/api/org/openmrs/test/api/ConceptServiceTest.java (modified) (view diffs)
• openmrs/branches/complex-obs/test/api/org/openmrs/test/api/EncounterServiceTest.java (modified) (view diffs)
• openmrs/branches/complex-obs/test/api/org/openmrs/test/api/PatientServiceTest.java (modified) (view diffs)
• openmrs/branches/complex-obs/test/api/org/openmrs/test/api/PatientSetServiceTest.java (copied) (copied from openmrs/trunk/test/api/org/openmrs/test/api/PatientSetServiceTest.java) (view diffs)
• openmrs/branches/complex-obs/test/api/org/openmrs/test/api/PersonServiceTest.java (modified) (view diffs)
• openmrs/branches/complex-obs/test/api/org/openmrs/test/api/include/ConceptServiceTest-initialConcepts.xml (modified) (view diffs)
• openmrs/branches/complex-obs/test/api/org/openmrs/test/api/include/EncounterServiceTest-initialData.xml (modified) (view diffs)
• openmrs/branches/complex-obs/test/api/org/openmrs/test/api/include/PatientServiceTest-findPatients.xml (modified) (view diffs)
• openmrs/branches/complex-obs/test/api/org/openmrs/test/logic/LogicBasicTest.java (modified) (view diffs)
• openmrs/branches/complex-obs/test/api/org/openmrs/test/logic/LogicEvalTest.java (modified) (view diffs)
• openmrs/branches/complex-obs/test/api/org/openmrs/test/logic/LogicServiceTest.java (modified) (view diffs)
• openmrs/branches/complex-obs/test/api/org/openmrs/test/logic/include/LogicBasicTest.concepts.xml (copied) (copied from openmrs/trunk/test/api/org/openmrs/test/logic/include/LogicBasicTest.concepts.xml) (view diffs)
• openmrs/branches/complex-obs/test/api/org/openmrs/test/logic/include/LogicEvalTest.testSimpleLogic.xml (modified) (view diffs)
• openmrs/branches/complex-obs/test/api/org/openmrs/test/logic/include/LogicTests-patients.xml (modified) (view diffs)
• openmrs/branches/complex-obs/test/api/org/openmrs/test/patient/LuhnIdentifierValidatorTest.java (modified) (view diffs)
• openmrs/branches/complex-obs/test/api/org/openmrs/test/report/PepfarReportFromMacrosTest.java (deleted)
• openmrs/branches/complex-obs/test/api/org/openmrs/test/reporting/export/DataExportTest.java (modified) (view diffs)
• openmrs/branches/complex-obs/test/web/org/openmrs/web/test/NewPatientFormControllerTest.java (copied) (copied from openmrs/trunk/test/web/org/openmrs/web/test/NewPatientFormControllerTest.java) (view diffs)
• openmrs/branches/complex-obs/test/web/org/openmrs/web/test/include/NewPatientFormControllerTest-patients.xml (copied) (copied from openmrs/trunk/test/web/org/openmrs/web/test/include/NewPatientFormControllerTest-patients.xml) (view diffs)
• openmrs/branches/complex-obs/test/web/org/openmrs/web/test/include/NewPatientFormControllerTest.xml (copied) (copied from openmrs/trunk/test/web/org/openmrs/web/test/include/NewPatientFormControllerTest.xml) (view diffs)
• openmrs/branches/complex-obs/web/WEB-INF/dwr.xml (modified) (view diffs)
• openmrs/branches/complex-obs/web/WEB-INF/messages.properties (modified) (view diffs)
• openmrs/branches/complex-obs/web/WEB-INF/messages_es.properties (copied) (copied from openmrs/trunk/web/WEB-INF/messages_es.properties) (view diffs)
• openmrs/branches/complex-obs/web/WEB-INF/openmrs-servlet.xml (modified) (view diffs)
• openmrs/branches/complex-obs/web/WEB-INF/tags/drugField.tag (modified) (view diffs)
• openmrs/branches/complex-obs/web/WEB-INF/tags/encounterField.tag (modified) (view diffs)
• openmrs/branches/complex-obs/web/WEB-INF/tags/locationPopupField.tag (modified) (view diffs)
• openmrs/branches/complex-obs/web/WEB-INF/tags/patientField.tag (modified) (view diffs)
• openmrs/branches/complex-obs/web/WEB-INF/tags/personField.tag (modified) (view diffs)
• openmrs/branches/complex-obs/web/WEB-INF/tags/userField.tag (modified) (view diffs)
• openmrs/branches/complex-obs/web/WEB-INF/view/admin/concepts/conceptDrugForm.jsp (modified) (view diffs)
• openmrs/branches/complex-obs/web/WEB-INF/view/admin/concepts/conceptDrugList.jsp (modified) (view diffs)
• openmrs/branches/complex-obs/web/WEB-INF/view/admin/encounters/obsDisplay.jsp (modified) (view diffs)
• openmrs/branches/complex-obs/web/WEB-INF/view/admin/forms/fieldList.jsp (modified) (view diffs)
• openmrs/branches/complex-obs/web/WEB-INF/view/admin/forms/localHeader.jsp (modified) (view diffs)
• openmrs/branches/complex-obs/web/WEB-INF/view/admin/maintenance/localHeader.jsp (modified) (view diffs)
• openmrs/branches/complex-obs/web/WEB-INF/view/admin/reports/localHeader.jsp (modified) (view diffs)
• openmrs/branches/complex-obs/web/WEB-INF/view/admin/reports/reportDataForm.jsp (modified) (view diffs)
• openmrs/branches/complex-obs/web/WEB-INF/view/admin/reports/runReportList.jsp (modified) (view diffs)
• openmrs/branches/complex-obs/web/WEB-INF/view/admin/reports/summaryForm.jsp (deleted)
• openmrs/branches/complex-obs/web/WEB-INF/view/admin/users/alertForm.jsp (modified) (view diffs)
• openmrs/branches/complex-obs/web/WEB-INF/view/encounters/encounterDisplay.jsp (modified) (view diffs)
• openmrs/branches/complex-obs/web/WEB-INF/view/portlets/patientHeader.jsp (modified) (view diffs)
• openmrs/branches/complex-obs/web/WEB-INF/view/portlets/patientOverview.jsp (modified) (view diffs)
• openmrs/branches/complex-obs/web/WEB-INF/web.xml (modified) (view diffs)
• openmrs/branches/complex-obs/web/openmrs.js (modified) (view diffs)