=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/AttributeTypeController.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/AttributeTypeController.java 2011-12-19 19:47:55 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/AttributeTypeController.java 2012-02-21 07:42:09 +0000 @@ -152,7 +152,8 @@ response.setStatus( HttpServletResponse.SC_CREATED ); response.setHeader( "Location", AttributeTypeController.RESOURCE_PATH + "/" + attribute.getUid() ); } - } catch ( Exception e ) + } + catch ( Exception e ) { response.setStatus( HttpServletResponse.SC_CONFLICT ); } === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/DataElementGroupController.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/DataElementGroupController.java 2011-12-19 19:45:07 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/DataElementGroupController.java 2012-02-21 07:42:09 +0000 @@ -193,8 +193,6 @@ @PreAuthorize( "hasRole('ALL') or hasRole('F_WEBAPI_DELETE')" ) public void deleteDataElementGroup( @PathVariable( "uid" ) String uid ) throws Exception { - // throw new HttpRequestMethodNotSupportedException( RequestMethod.DELETE.toString() ); - DataElementGroup dataElementGroup = dataElementService.getDataElementGroup( uid ); if ( dataElementGroup != null ) === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/DataElementGroupSetController.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/DataElementGroupSetController.java 2011-12-19 19:45:07 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/DataElementGroupSetController.java 2012-02-21 07:42:09 +0000 @@ -160,7 +160,8 @@ response.setStatus( HttpServletResponse.SC_CREATED ); response.setHeader( "Location", DataElementController.RESOURCE_PATH + "/" + dataElementGroupSet.getUid() ); } - } catch ( Exception e ) + } + catch ( Exception e ) { response.setStatus( HttpServletResponse.SC_CONFLICT ); } @@ -196,8 +197,6 @@ @PreAuthorize( "hasRole('ALL') or hasRole('F_WEBAPI_DELETE')" ) public void deleteDataElementGroupSet( @PathVariable( "uid" ) String uid ) throws Exception { - // throw new HttpRequestMethodNotSupportedException( RequestMethod.DELETE.toString() ); - DataElementGroupSet dataElementGroupSet = dataElementService.getDataElementGroupSet( uid ); if ( dataElementGroupSet != null ) === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/OrganisationUnitController.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/OrganisationUnitController.java 2011-12-19 17:20:37 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/OrganisationUnitController.java 2012-02-21 07:42:09 +0000 @@ -133,7 +133,8 @@ response.setStatus( HttpServletResponse.SC_CREATED ); response.setHeader( "Location", DataElementController.RESOURCE_PATH + "/" + organisationUnit.getUid() ); } - } catch ( Exception e ) + } + catch ( Exception ex ) { response.setStatus( HttpServletResponse.SC_CONFLICT ); } === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/OrganisationUnitGroupController.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/OrganisationUnitGroupController.java 2011-12-19 19:45:07 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/OrganisationUnitGroupController.java 2012-02-21 07:42:09 +0000 @@ -134,7 +134,8 @@ response.setStatus( HttpServletResponse.SC_CREATED ); response.setHeader( "Location", DataElementController.RESOURCE_PATH + "/" + organisationUnitGroup.getUid() ); } - } catch ( Exception e ) + } + catch ( Exception ex ) { response.setStatus( HttpServletResponse.SC_CONFLICT ); } === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/OrganisationUnitGroupSetController.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/OrganisationUnitGroupSetController.java 2011-12-19 19:45:07 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/OrganisationUnitGroupSetController.java 2012-02-21 07:42:09 +0000 @@ -160,7 +160,8 @@ response.setStatus( HttpServletResponse.SC_CREATED ); response.setHeader( "Location", DataElementController.RESOURCE_PATH + "/" + organisationUnitGroupSet.getUid() ); } - } catch ( Exception e ) + } + catch ( Exception e ) { response.setStatus( HttpServletResponse.SC_CONFLICT ); } === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/utils/IdentifiableObjectParams.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/utils/IdentifiableObjectParams.java 2011-12-19 17:20:37 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/utils/IdentifiableObjectParams.java 2012-02-21 07:42:09 +0000 @@ -40,17 +40,12 @@ private String nameLike; - /** - * Paging related - */ - private boolean paging = true; private int page = 1; public IdentifiableObjectParams() { - } public boolean hasLinks() === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/view/Jaxb2Utils.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/view/Jaxb2Utils.java 2012-02-15 18:08:10 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/view/Jaxb2Utils.java 2012-02-21 07:42:09 +0000 @@ -66,7 +66,8 @@ } @SuppressWarnings("unchecked") - public static T unmarshal( Class clazz, InputStream input ) throws JAXBException + public static T unmarshal( Class clazz, InputStream input ) + throws JAXBException { return (T) Jaxb2Utils.createUnmarshaller( clazz ).unmarshal( input ); } === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/view/Jaxb2View.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/view/Jaxb2View.java 2012-02-15 17:54:32 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/view/Jaxb2View.java 2012-02-21 07:42:09 +0000 @@ -66,14 +66,5 @@ Marshaller marshaller = Jaxb2Utils.createMarshaller( domainModel ); marshaller.marshal( domainModel, outputStream ); - -/* - Marshaller.Listener listener = new IdentifiableObjectListener(request); - marshaller.setListener(listener); - - marshaller.setProperty("com.sun.xml.internal.bind.xmlHeaders", - "\n\n"); -*/ } - }