dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 12255
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2013-09-26 15:17:01 +0200
message:
  minor changes
modified:
  dhis-2/dhis-support/dhis-support-external/pom.xml
  dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/event/EventController.java
  dhis-2/dhis-web/dhis-web-api/src/main/resources/META-INF/dhis/beans.xml
  dhis-2/dhis-web/dhis-web-api/src/main/resources/META-INF/dhis/servlet.xml
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/WEB-INF/classes/log4j.properties
  dhis-2/pom.xml


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== modified file 'dhis-2/dhis-support/dhis-support-external/pom.xml'
--- dhis-2/dhis-support/dhis-support-external/pom.xml	2013-05-31 08:27:38 +0000
+++ dhis-2/dhis-support/dhis-support-external/pom.xml	2013-09-26 13:17:01 +0000
@@ -83,7 +83,11 @@
       <groupId>org.springframework.security</groupId>
       <artifactId>spring-security-config</artifactId>
     </dependency>
-	
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-aspects</artifactId>
+    </dependency>
+
     <!-- Other -->
 	
     <dependency>

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/event/EventController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/event/EventController.java	2013-09-26 11:38:11 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/event/EventController.java	2013-09-26 13:17:01 +0000
@@ -99,13 +99,14 @@
     // -------------------------------------------------------------------------
 
     @RequestMapping( value = "", method = RequestMethod.GET )
+    @PreAuthorize( "hasRole('ALL') or hasRole('F_METADATA_EXPORT')" )
     public String getEvents(
         @RequestParam(value = "program", required = false) String programUid,
         @RequestParam(value = "programStage", required = false) String programStageUid,
         @RequestParam(value = "orgUnit") String orgUnitUid,
         @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date startDate,
         @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date endDate,
-        @RequestParam Map<String, String> parameters, Model model, HttpServletRequest request ) throws Exception
+        @RequestParam Map<String, String> parameters, Model model, HttpServletRequest request ) throws NotFoundException
     {
         WebOptions options = new WebOptions( parameters );
         Program program = manager.get( Program.class, programUid );

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-api/src/main/resources/META-INF/dhis/beans.xml	2012-12-14 13:46:47 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/META-INF/dhis/beans.xml	2013-09-26 13:17:01 +0000
@@ -5,4 +5,5 @@
 	
   <bean id="contextUtils" class="org.hisp.dhis.api.utils.ContextUtils"/>
   <bean id="restTemplate" class="org.springframework.web.client.RestTemplate"/>
+
 </beans>

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/META-INF/dhis/servlet.xml'
--- dhis-2/dhis-web/dhis-web-api/src/main/resources/META-INF/dhis/servlet.xml	2013-09-26 11:38:11 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/META-INF/dhis/servlet.xml	2013-09-26 13:17:01 +0000
@@ -18,6 +18,7 @@
   </mvc:annotation-driven>
 
   <context:component-scan base-package="org.hisp.dhis.api" />
+  <context:annotation-config />
 
   <bean id="fixedContentNegotiationStrategy" class="org.springframework.web.accept.FixedContentNegotiationStrategy">
     <constructor-arg name="defaultContentType" value="application/json" />

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/WEB-INF/classes/log4j.properties'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/WEB-INF/classes/log4j.properties	2013-08-29 18:14:51 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/WEB-INF/classes/log4j.properties	2013-09-26 13:17:01 +0000
@@ -31,5 +31,6 @@
 # Spring framework logging level
 log4j.logger.org.springframework = WARN
 log4j.logger.org.springframework.web = WARN
+log4j.logger.org.springframework.security = WARN
 
 # log4j.logger.org.hisp.dhis.system.util.Timer = ERROR

=== modified file 'dhis-2/pom.xml'
--- dhis-2/pom.xml	2013-09-19 22:38:32 +0000
+++ dhis-2/pom.xml	2013-09-26 13:17:01 +0000
@@ -427,7 +427,7 @@
       <dependency>
         <groupId>org.springframework.hateoas</groupId>
         <artifactId>spring-hateoas</artifactId>
-        <version>0.5.0.RELEASE</version>
+        <version>0.8.0.RELEASE</version>
       </dependency>
       <dependency>
         <groupId>cglib</groupId>
@@ -475,6 +475,11 @@
       </dependency>
       <dependency>
         <groupId>org.springframework.security</groupId>
+        <artifactId>spring-security-aspects</artifactId>
+        <version>${spring.security.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.springframework.security</groupId>
         <artifactId>spring-security-config</artifactId>
         <version>${spring.security.version}</version>
       </dependency>
@@ -482,7 +487,7 @@
       <dependency>
         <groupId>org.springframework.mobile</groupId>
         <artifactId>spring-mobile-device</artifactId>
-        <version>1.0.1.RELEASE</version>
+        <version>1.0.2.RELEASE</version>
       </dependency>
       <!--Other -->
       <dependency>