OpenMRS

Timestamp:

05/07/08 18:19:14 (8 months ago)

Author:

catullus

Message:

data-synchronization-bidirectional: merge with trunk [4097:4128] in order to get messages with attachments.

Files:

• openmrs/branches/data_synchronization_bidirectional/.classpath (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/build.xml (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/lib/xstream/xstream-1.3.jar (copied) (copied from openmrs/trunk/lib/xstream/xstream-1.3.jar) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/metadata/api/hibernate/org/openmrs/api/db/hibernate/Encounter.hbm.xml (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/metadata/api/spring/applicationContext-service.xml (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/metadata/model/openmrs_1.2.0-to-latest-mysqldiff.sql (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/properties.xml (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/src/api/org/openmrs/api/AdministrationService.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/src/api/org/openmrs/api/EventListeners.java (copied) (copied from openmrs/trunk/src/api/org/openmrs/api/EventListeners.java) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/src/api/org/openmrs/api/GlobalPropertyListener.java (copied) (copied from openmrs/trunk/src/api/org/openmrs/api/GlobalPropertyListener.java) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/src/api/org/openmrs/api/db/AdministrationDAO.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/src/api/org/openmrs/api/db/hibernate/HibernateAdministrationDAO.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/src/api/org/openmrs/api/db/hibernate/package.html (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/src/api/org/openmrs/api/impl/AdministrationServiceImpl.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/src/api/org/openmrs/notification/Message.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/src/api/org/openmrs/notification/MessageService.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/src/api/org/openmrs/notification/impl/MessageServiceImpl.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/src/api/org/openmrs/notification/mail/MailMessageSender.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/src/api/org/openmrs/order/DrugOrderSupport.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/src/api/org/openmrs/util/OpenmrsConstants.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/src/web/org/openmrs/web/controller/PortletController.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/src/web/org/openmrs/web/controller/patient/PatientDashboardController.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/src/web/org/openmrs/web/dwr/DWRObsService.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/src/web/org/openmrs/web/taglib/ConceptTag.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/test/api/org/openmrs/test/api/include/notification (added)
• openmrs/branches/data_synchronization_bidirectional/test/api/org/openmrs/test/api/include/notification/include (added)
• openmrs/branches/data_synchronization_bidirectional/test/api/org/openmrs/test/api/include/notification/include/MessageServiceTest-initial.xml (added)
• openmrs/branches/data_synchronization_bidirectional/test/api/org/openmrs/test/api/notification (copied) (copied from openmrs/trunk/test/api/org/openmrs/test/api/notification) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/test/api/org/openmrs/test/api/notification/MessageServiceTest.java (copied) (copied from openmrs/trunk/test/api/org/openmrs/test/api/notification/MessageServiceTest.java) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/test/api/org/openmrs/test/api/notification/MessageTest.java (copied) (copied from openmrs/trunk/test/api/org/openmrs/test/api/notification/MessageTest.java) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/test/api/org/openmrs/test/api/notification/include (copied) (copied from openmrs/trunk/test/api/org/openmrs/test/api/notification/include) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/test/api/org/openmrs/test/api/notification/include/MessageServiceTest-initial.xml (copied) (copied from openmrs/trunk/test/api/org/openmrs/test/api/notification/include/MessageServiceTest-initial.xml) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/test/api/org/openmrs/test/notification (deleted)
• openmrs/branches/data_synchronization_bidirectional/web/WEB-INF/dwr.xml (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/web/WEB-INF/messages.properties (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/web/WEB-INF/openmrs-servlet.xml (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/web/WEB-INF/view/analysis/cohortBuilder.jsp (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/web/WEB-INF/view/portlets/patientOverview.jsp (modified) (view diffs)