dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 16305
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2014-08-04 15:20:47 +0200
message:
  Upgrade jetty plugin from mortbay to eclipse 9.2.2
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/smscommand/SMSCode.java
  dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataapproval/DefaultDataApprovalService.java
  dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/validation/ValidationRunContext.java
  dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/validation/ValidatorThread.java
  dhis-2/dhis-web/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-api/src/main/java/org/hisp/dhis/smscommand/SMSCode.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/smscommand/SMSCode.java	2014-07-30 04:28:22 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/smscommand/SMSCode.java	2014-08-04 13:20:47 +0000
@@ -39,7 +39,7 @@
 
     private DataElement dataElement;
     
-    private TrackedEntityAttribute  trackedEntityAttribute;
+    private TrackedEntityAttribute trackedEntityAttribute;
 
     private int optionId;
 
@@ -55,8 +55,6 @@
         this.code = code;
         this.trackedEntityAttribute = trackedEntityAttribute;
     }
-    
-    
 
     public SMSCode()
     {

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataapproval/DefaultDataApprovalService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataapproval/DefaultDataApprovalService.java	2014-08-03 22:03:34 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataapproval/DefaultDataApprovalService.java	2014-08-04 13:20:47 +0000
@@ -380,8 +380,6 @@
                 da.getPeriod().getStartDate(),
                 da.getPeriod().getEndDate() );
 
-        DataApprovalLevel lowestApprovalLevel = null;
-
         for ( Period period : periods )
         {
             DataApprovalStatus status = getDataApprovalStatus( da.getDataSet(), period, da.getOrganisationUnit(),

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/validation/ValidationRunContext.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/validation/ValidationRunContext.java	2014-07-16 11:19:08 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/validation/ValidationRunContext.java	2014-08-04 13:20:47 +0000
@@ -182,7 +182,7 @@
     {
         addPeriodsToContext( periods );
         
-        boolean surveillanceRulesPresent = addRulesToContext ( rules );
+        boolean surveillanceRulesPresent = addRulesToContext( rules );
         
         removeAnyUnneededPeriodTypes();
         

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/validation/ValidatorThread.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/validation/ValidatorThread.java	2014-07-27 19:59:20 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/validation/ValidatorThread.java	2014-08-04 13:20:47 +0000
@@ -582,7 +582,7 @@
                 period.getStartDate(), source, allowedPeriodTypes, context.getAttributeCombo(),
                 context.getCogDimensionConstraints(), context.getCoDimensionConstraints(), lastUpdatedMap );
         }
-
+        
         // See if there are any data elements we need to get recursively:
         Set<DataElement> recursiveDataElementsNeeded = new HashSet<DataElement>( recursiveDataElements );
         recursiveDataElementsNeeded.removeAll( dataElementsToGet );

=== modified file 'dhis-2/dhis-web/pom.xml'
--- dhis-2/dhis-web/pom.xml	2014-07-23 14:53:00 +0000
+++ dhis-2/dhis-web/pom.xml	2014-08-04 13:20:47 +0000
@@ -51,20 +51,19 @@
         </configuration>
       </plugin>	
       <plugin>
-        <groupId>org.mortbay.jetty</groupId>
-        <artifactId>maven-jetty-plugin</artifactId>
-        <version>6.1.26</version>
+        <groupId>org.eclipse.jetty</groupId>
+        <artifactId>jetty-maven-plugin</artifactId>
+        <version>9.2.2.v20140723</version>
         <configuration>
-          <systemPropertyVariables>
-            <org.mortbay.jetty.Request.maxFormContentSize>10000000</org.mortbay.jetty.Request.maxFormContentSize>
-          </systemPropertyVariables>
-          <connectors>
-            <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
-              <port>8080</port>
-              <maxIdleTime>600000</maxIdleTime>
-            </connector>
-          </connectors>
-          <contextPath>/</contextPath>
+          <systemProperties>
+            <systemProperty>
+              <name>org.eclipse.jetty.server.Request.maxFormContentSize</name>
+              <value>10000000</value>
+            </systemProperty>
+          </systemProperties>
+          <webAppConfig>
+            <contextPath>/</contextPath>
+          </webAppConfig>
         </configuration>
       </plugin>
     </plugins>