# \[Branch ~dhis2-devs-core/dhis2/trunk\] Rev 5359: merged	with dxf2:	added controllers and json/xml for document,	validationrule, validationrulegroup

**URL:** <https://community.dhis2.org/t/branch-dhis2-devs-core-dhis2-trunk-rev-5359-merged-with-dxf2-added-controllers-and-json-xml-for-document-validationrule-validationrulegroup/13520>\
**Category:** Support - Assistance technique\
**Created:** [10 December 2011 23:26 UTC](https://community.dhis2.org/t/branch-dhis2-devs-core-dhis2-trunk-rev-5359-merged-with-dxf2-added-controllers-and-json-xml-for-document-validationrule-validationrulegroup/13520 "2011-12-10T23:26:15Z")\
**Posts on this page:** 1\
**Page:** 1

<div class="post-metadata">

**Author:** ![DHIS\_2\_Users](https://dhis2.b-cdn.net/letter_avatar_proxy/v4/letter/d/9fc29f/32.png) [@DHIS\_2\_Users](https://community.dhis2.org/u/DHIS_2_Users)\
**Post date:** [10 December 2011 23:26 UTC](https://community.dhis2.org/t/branch-dhis2-devs-core-dhis2-trunk-rev-5359-merged-with-dxf2-added-controllers-and-json-xml-for-document-validationrule-validationrulegroup/13520/1 "2011-12-10T23:26:15Z")

</div>

Merge authors:  
&nbsp;&nbsp;Morten Olav Hansen (mortenoh)

[revision-diff.txt](https://dhis2.b-cdn.net/uploads/default/original/2X/6/6f51d8586d1ba5ce6a3cb860b02f5712f973e3bd.txt) (70.4 KB)

> **···**
>
> ------------------------------------------------------------  
> revno: 5359 [merge]  
> committer: Morten Olav Hansen \<mortenoh@gmail.com\>  
> branch nick: dhis2  
> timestamp: Sun 2011-12-11 00:24:56 +0100  
> message:  
> &nbsp;&nbsp;merged with dxf2: added controllers and json/xml for document, validationrule, validationrulegroup  
> added:  
> &nbsp;&nbsp;dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/adapter/DocumentXmlAdapter.java  
> &nbsp;&nbsp;dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/adapter/ValidationRuleGroupXmlAdapter.java  
> &nbsp;&nbsp;dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/adapter/ValidationRuleXmlAdapter.java  
> &nbsp;&nbsp;dhis-2/dhis-api/src/main/java/org/hisp/dhis/document/Documents.java  
> &nbsp;&nbsp;dhis-2/dhis-api/src/main/java/org/hisp/dhis/validation/ValidationRuleGroups.java  
> &nbsp;&nbsp;dhis-2/dhis-api/src/main/java/org/hisp/dhis/validation/ValidationRules.java  
> &nbsp;&nbsp;dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/DocumentController.java  
> &nbsp;&nbsp;dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/ValidationRuleController.java  
> &nbsp;&nbsp;dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/ValidationRuleGroupController.java  
> modified:  
> &nbsp;&nbsp;dhis-2/dhis-api/src/main/java/org/hisp/dhis/document/Document.java  
> &nbsp;&nbsp;dhis-2/dhis-api/src/main/java/org/hisp/dhis/document/DocumentService.java  
> &nbsp;&nbsp;dhis-2/dhis-api/src/main/java/org/hisp/dhis/expression/Expression.java  
> &nbsp;&nbsp;dhis-2/dhis-api/src/main/java/org/hisp/dhis/validation/ValidationRule.java  
> &nbsp;&nbsp;dhis-2/dhis-api/src/main/java/org/hisp/dhis/validation/ValidationRuleGroup.java  
> &nbsp;&nbsp;dhis-2/dhis-api/src/main/java/org/hisp/dhis/validation/ValidationRuleService.java  
> &nbsp;&nbsp;dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/common/IdentityPopulator.java  
> &nbsp;&nbsp;dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/validation/DefaultValidationRuleService.java  
> &nbsp;&nbsp;dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/document/impl/DefaultDocumentService.java  
> &nbsp;&nbsp;dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/document/hibernate/Document.hbm.xml  
> &nbsp;&nbsp;dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/utils/WebLinkPopulator.java
> 
> --  
> lp:dhis2
> 
> > **[trunk : Code : DHIS](https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk)**
> >
> > The trunk is where the mainline development takes place.
> 
> Your team DHIS 2 developers is subscribed to branch lp:dhis2.  
> To unsubscribe from this branch go to [OpenID transaction in progress](https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription)