dependency changes -- but still need to fix poms
Merge branch 'master' of http://github.com/maurya/openmrs-module-integration

Conflicts:
	api/target/classes/CategoryCombo.hbm.xml
Merge branch 'master' of http://github.com/maurya/openmrs-module-integration
Merge branch 'master' of http://github.com/maurya/openmrs-module-integration

Conflicts:
	omod/src/main/resources/config.xml
	omod/target/classes/config.xml
	pom.xml

resolving conflicts
Integrating roger's Code changes
Roger's WIP 8/31/13
1.  Renamed MappingCohortController to MappingCohortPortletController
and moved up to controller package, eliminated portlet package 
2.  Removed Spring mapping for MappingCohortController from
ModuleApplicationContext to WebModuleApplicationContext and modelled on
HTTPFormFlowsheet module
3.  Added <context> to ModuleApplicationContext
4.  Modified dhis_orgunit, changing parent_id link from uid to id5. 
Modified OrgUnit.hbm.xml removing Report fields, adding code,
changing representation of parent_id to set
6.  Modified OrgUnit.java removing ParentOrg adding ChildOrgs.
API commits of 8/31/13
Omod commits of 8/31/13
api tests are working 8/31
Changes of Roger
changed according to roger's changes
what i did 9/1/13
1.  Restored MasterTemplate.xml, .xsd, Categories-Export.xml, .xsd,
CategoryOptionCombo-Detailed.xml, .xsd, OrganisationUnit-Export.xml,
.xsd, and metaData.xsd to api/resources
2.  Made code required="false" for Option.hbm.xml, OptionSet.hbm.xml,
CategoryCombo.hbm.xml, CategoryOption.hbm.xml, ReportTemplate.hbm.xml,
DataElement.hbm.xml.  Modified dhis_option, dhis_categoryoption,
dhis_reporttemplate, dhis_dataelement to allow nulls in code.  ALTER
TABLE `new19`.`dhis_categoryoption` CHANGE COLUMN `code` `code`
VARCHAR(50) NULL  ;
3.  Made type required="false" for DataElement.hbm.xml.  Modified
dhis_dataelement to allow nulls in type.
4.  Added field uid to CategoryOption.hbm.xml.
5.  Removed field ReportTemplateId from dhis_reporttemplate.  Removed
get/setReportTemplateId, added id property, modified get/set id in
ReportTemplate.java.
6.  Modified mapping of set dataValueTemplates in
ReportTemplate.hbm.xml.
7.  Modified dhis_integrationserver, set username, password, url,
mastertemplate, emailorurl, transport_type nullable.
roger's changes 1/9/2013
Merge branch 'master' of git://github.com/r-friedman/openmrs-module-integration into IntegratingJaxb

Conflicts:
	api/pom.xml
	api/src/main/java/org/openmrs/module/integration/CategoryCombo.java
	api/src/main/java/org/openmrs/module/integration/CategoryOption.java
	api/src/main/java/org/openmrs/module/integration/Option.java
	api/src/main/java/org/openmrs/module/integration/OptionSet.java
	api/src/main/java/org/openmrs/module/integration/OrgUnit.java
	api/src/main/java/org/openmrs/module/integration/api/DhisService.java
	api/src/main/java/org/openmrs/module/integration/api/db/DhisDAO.java
	api/src/main/java/org/openmrs/module/integration/api/db/hibernate/HibernateDhisDAO.java
	api/src/main/java/org/openmrs/module/integration/api/impl/DhisServiceImpl.java
	api/src/main/java/org/openmrs/module/integration/api/impl/DhisXmlUtils.java
	api/src/main/java/org/openmrs/module/integration/api/jaxb/MetaData.java
	api/src/main/java/org/openmrs/module/integration/api/jaxb/ObjectFactory.java
	api/src/main/java/org/openmrs/module/integration/api/jaxb/OrgUnitType.java
	api/src/main/java/org/openmrs/module/integration/api/jaxb/ReportTemplates.java
	api/src/main/resources/IntegrationServer.hbm.xml
	api/src/main/resources/OrgUnit.hbm.xml
	api/src/main/resources/messages.properties
	api/src/main/resources/moduleApplicationContext.xml
	api/src/test/java/org/openmrs/module/integration/api/impl/DhisXmlUtilsTest.java
	api/src/test/resources/test-hibernate.cfg.xml
	api/target/classes/IntegrationServer.hbm.xml
	api/target/classes/OrgUnit.hbm.xml
	api/target/classes/messages.properties
	api/target/classes/moduleApplicationContext.xml
	api/target/test-classes/test-hibernate.cfg.xml
	omod/.classpath
	omod/pom.xml
	omod/src/main/java/org/openmrs/module/integration/web/controller/MappingCohortPortletController.java
	omod/src/main/resources/config.xml
	omod/src/main/resources/webModuleApplicationContext.xml
	omod/src/test/resources/TestingApplicationContext.xml
	omod/src/test/resources/config.xml
	omod/target/classes/IntegrationServer.hbm.xml
	omod/target/classes/META-INF/MANIFEST.MF
	omod/target/classes/META-INF/maven/org.openmrs.module/integration-api/pom.xml
	omod/target/classes/META-INF/maven/org.openmrs.module/integration-omod/pom.properties
	omod/target/classes/META-INF/maven/org.openmrs.module/integration-omod/pom.xml
	omod/target/classes/OrgUnit.hbm.xml
	omod/target/classes/config.xml
	omod/target/classes/messages.properties
	omod/target/classes/moduleApplicationContext.xml
	omod/target/classes/org/openmrs/module/integration/CategoryCombo.class
	omod/target/classes/org/openmrs/module/integration/CategoryOption.class
	omod/target/classes/org/openmrs/module/integration/Option.class
	omod/target/classes/org/openmrs/module/integration/OptionSet.class
	omod/target/classes/org/openmrs/module/integration/OrgUnit.class
	omod/target/classes/org/openmrs/module/integration/api/DhisService.class
	omod/target/classes/org/openmrs/module/integration/api/db/DhisDAO.class
	omod/target/classes/org/openmrs/module/integration/api/db/hibernate/HibernateDhisDAO.class
	omod/target/classes/org/openmrs/module/integration/api/impl/DhisServiceImpl.class
	omod/target/classes/org/openmrs/module/integration/web/controller/IntegrationServerAdminController.class
	omod/target/classes/org/openmrs/module/integration/web/controller/ManageReportTemplatesController.class
	omod/target/classes/org/openmrs/module/integration/web/controller/ShowDataElementsController.class
	omod/target/classes/org/openmrs/module/integration/web/controller/ShowOptionsController.class
	omod/target/classes/webModuleApplicationContext.xml
	omod/target/integration-1.0-SNAPSHOT.jar
	omod/target/integration-1.0-SNAPSHOT.omod
	omod/target/integration-1.0-SNAPSHOT/IntegrationServer.hbm.xml
	omod/target/integration-1.0-SNAPSHOT/META-INF/maven/org.openmrs.module/integration-api/pom.xml
	omod/target/integration-1.0-SNAPSHOT/OrgUnit.hbm.xml
	omod/target/integration-1.0-SNAPSHOT/lib/integration-api-1.0-SNAPSHOT.jar
	omod/target/integration-1.0-SNAPSHOT/messages.properties
	omod/target/integration-1.0-SNAPSHOT/moduleApplicationContext.xml
	omod/target/integration-1.0-SNAPSHOT/org/openmrs/module/integration/OrgUnit.class
	omod/target/integration-1.0-SNAPSHOT/webModuleApplicationContext.xml
	pom.xml
new update
commiting changes to as of 1/9/2013
trash
trash-2