1
=== modified file 'dhis-2/dhis-api/pom.xml'
2
--- dhis-2/dhis-api/pom.xml	2010-04-08 16:55:35 +0000
3
+++ dhis-2/dhis-api/pom.xml	2010-05-07 11:16:36 +0000
4
@@ -1,26 +1,26 @@
27
1
<project xmlns="http://maven.apache.org/POM/4.0.0"
1
<project xmlns="http://maven.apache.org/POM/4.0.0"
28
2
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
29
3
  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
3
  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
30
4
  <modelVersion>4.0.0</modelVersion>
4
  <modelVersion>4.0.0</modelVersion>
31
5
  
5
  
32
6
  <parent>
6
  <parent>
33
7
    <groupId>org.hisp.dhis</groupId>
7
    <groupId>org.hisp.dhis</groupId>
34
8
    <artifactId>dhis</artifactId>
8
    <artifactId>dhis</artifactId>
35
9
    <version>2.0.5-SNAPSHOT</version>
9
    <version>2.0.5-SNAPSHOT</version>
36
10
  </parent>
10
  </parent>
37
11
  
11
  
38
12
  <artifactId>dhis-api</artifactId>
12
  <artifactId>dhis-api</artifactId>
39
13
  <packaging>jar</packaging>
13
  <packaging>jar</packaging>
40
14
  <name>DHIS API</name>
14
  <name>DHIS API</name>
41
15
  
15
  
42
16
  <dependencies>    
16
  <dependencies>    
43
17
    <dependency>
17
    <dependency>
44
18
      <groupId>junit</groupId>
18
      <groupId>junit</groupId>
45
19
      <artifactId>junit</artifactId>
19
      <artifactId>junit</artifactId>
46
20
    </dependency>
20
    </dependency>
47
21
  </dependencies>
21
  </dependencies>
48
22
  
22
  
49
23
  <properties>
23
  <properties>
50
24
    <rootDir>../</rootDir>
24
    <rootDir>../</rootDir>
51
25
  </properties>
25
  </properties>
53
26
</project>
26
</project>
54
27
27
55
=== modified file 'dhis-2/dhis-services/dhis-service-core/pom.xml'
56
--- dhis-2/dhis-services/dhis-service-core/pom.xml	2010-04-22 14:06:28 +0000
57
+++ dhis-2/dhis-services/dhis-service-core/pom.xml	2010-05-07 11:16:36 +0000
58
@@ -1,87 +1,83 @@
142
1
<project xmlns="http://maven.apache.org/POM/4.0.0"
1
<project xmlns="http://maven.apache.org/POM/4.0.0"
143
2
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
144
3
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
3
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
145
4
  <modelVersion>4.0.0</modelVersion>
4
  <modelVersion>4.0.0</modelVersion>
146
5
5
147
6
  <parent>
6
  <parent>
148
7
    <groupId>org.hisp.dhis</groupId>
7
    <groupId>org.hisp.dhis</groupId>
149
8
    <artifactId>dhis-services</artifactId>
8
    <artifactId>dhis-services</artifactId>
150
9
    <version>2.0.5-SNAPSHOT</version>
9
    <version>2.0.5-SNAPSHOT</version>
151
10
  </parent>
10
  </parent>
152
11
11
153
12
  <artifactId>dhis-service-core</artifactId>
12
  <artifactId>dhis-service-core</artifactId>
154
13
  <packaging>jar</packaging>
13
  <packaging>jar</packaging>
155
14
  <name>DHIS Core API Implementations</name>
14
  <name>DHIS Core API Implementations</name>
156
15
15
157
16
  <dependencies>
16
  <dependencies>
158
17
17
159
18
    <!-- DHIS -->
18
    <!-- DHIS -->
160
19
19
161
20
    <dependency>
20
    <dependency>
162
21
      <groupId>org.hisp.dhis</groupId>
21
      <groupId>org.hisp.dhis</groupId>
163
22
      <artifactId>dhis-api</artifactId>
22
      <artifactId>dhis-api</artifactId>
164
23
    </dependency>
23
    </dependency>
165
24
    <dependency>
24
    <dependency>
166
25
      <groupId>org.hisp.dhis</groupId>
25
      <groupId>org.hisp.dhis</groupId>
167
26
      <artifactId>dhis-support-hibernate</artifactId>
26
      <artifactId>dhis-support-hibernate</artifactId>
168
27
    </dependency>
27
    </dependency>
169
28
    <dependency>
28
    <dependency>
170
29
      <groupId>org.hisp.dhis</groupId>
29
      <groupId>org.hisp.dhis</groupId>
171
30
      <artifactId>dhis-support-test</artifactId>
30
      <artifactId>dhis-support-test</artifactId>
172
31
    </dependency>
31
    </dependency>
173
32
    <dependency>
32
    <dependency>
174
33
      <groupId>org.hisp.dhis</groupId>
33
      <groupId>org.hisp.dhis</groupId>
175
34
      <artifactId>dhis-support-system</artifactId>
34
      <artifactId>dhis-support-system</artifactId>
176
35
    </dependency>
35
    </dependency>
177
36
    <dependency>
36
    <dependency>
178
37
      <groupId>org.hisp.dhis</groupId>
37
      <groupId>org.hisp.dhis</groupId>
179
38
      <artifactId>dhis-support-external</artifactId>
38
      <artifactId>dhis-support-external</artifactId>
180
39
    </dependency>
39
    </dependency>
181
40
    <dependency>
40
    <dependency>
182
41
      <groupId>org.hisp.dhis</groupId>
41
      <groupId>org.hisp.dhis</groupId>
183
42
      <artifactId>dhis-support-jdbc</artifactId>
42
      <artifactId>dhis-support-jdbc</artifactId>
184
43
    </dependency>
43
    </dependency>
185
44
    <dependency>
44
    <dependency>
186
45
      <groupId>org.hisp.dhis</groupId>
45
      <groupId>org.hisp.dhis</groupId>
187
46
      <artifactId>dhis-support-i18n</artifactId>
46
      <artifactId>dhis-support-i18n</artifactId>
188
47
    </dependency>
47
    </dependency>
189
48
48
190
49
    <!-- Spring Security -->
49
    <!-- Spring Security -->
191
50
    
50
    
192
51
    <dependency>
51
    <dependency>
193
52
      <groupId>org.springframework.security</groupId>
52
      <groupId>org.springframework.security</groupId>
194
53
      <artifactId>spring-security-core</artifactId>
53
      <artifactId>spring-security-core</artifactId>
195
54
    </dependency>
54
    </dependency>
196
55
    <dependency>
55
    <dependency>
197
56
      <groupId>org.springframework.security</groupId>
56
      <groupId>org.springframework.security</groupId>
198
57
      <artifactId>spring-security-core-tiger</artifactId>
57
      <artifactId>spring-security-web</artifactId>
199
58
    </dependency>
58
    </dependency>
200
59
    
59
    
201
60
    <!-- Other -->
60
    <!-- Other -->
202
61
61
203
62
    <dependency>
62
    <dependency>
204
63
      <groupId>jep</groupId>
63
      <groupId>jep</groupId>
205
64
      <artifactId>jep</artifactId>
64
      <artifactId>jep</artifactId>
206
65
    </dependency>
65
    </dependency>
207
66
    <dependency>
66
    <dependency>
208
67
      <groupId>commons-codec</groupId>
67
      <groupId>commons-codec</groupId>
209
68
      <artifactId>commons-codec</artifactId>
68
      <artifactId>commons-codec</artifactId>
210
69
    </dependency>
69
    </dependency>
211
70
    <dependency>
70
    <dependency>
212
71
      <groupId>commons-collections</groupId>
71
      <groupId>commons-collections</groupId>
213
72
      <artifactId>commons-collections</artifactId>
72
      <artifactId>commons-collections</artifactId>
214
73
    </dependency>
73
    </dependency>
215
74
    <dependency>
74
    <dependency>
216
75
      <groupId>commons-logging</groupId>
75
      <groupId>org.springframework</groupId>
217
76
      <artifactId>commons-logging</artifactId>
76
      <artifactId>spring-tx</artifactId>
218
77
    </dependency>
77
    </dependency>
219
78
    <dependency>
78
      
220
79
      <groupId>org.springframework</groupId>
79
  </dependencies>
138
80
      <artifactId>spring-test</artifactId>
139
81
    </dependency>
140
82
      
141
83
  </dependencies>
221
84
  <properties>
80
  <properties>
222
85
    <rootDir>../../</rootDir>
81
    <rootDir>../../</rootDir>
223
86
  </properties>
82
  </properties>
225
87
</project>
83
</project>
226
88
84
227
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DefaultDataElementService.java'
228
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DefaultDataElementService.java	2010-05-04 06:47:28 +0000
229
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DefaultDataElementService.java	2010-05-07 11:16:36 +0000
230
@@ -27,10 +27,12 @@
231
27
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
27
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
232
28
 */
28
 */
233
29
29
234
30
235
30
import static org.hisp.dhis.i18n.I18nUtils.i18n;
31
import static org.hisp.dhis.i18n.I18nUtils.i18n;
236
31
32
237
32
import java.util.ArrayList;
33
import java.util.ArrayList;
238
33
import java.util.Collection;
34
import java.util.Collection;
239
35
import java.util.Collections;
240
34
import java.util.Date;
36
import java.util.Date;
241
35
import java.util.HashMap;
37
import java.util.HashMap;
242
36
import java.util.HashSet;
38
import java.util.HashSet;
243
@@ -51,7 +53,6 @@
244
51
import org.hisp.dhis.system.util.UUIdUtils;
53
import org.hisp.dhis.system.util.UUIdUtils;
245
52
import org.springframework.transaction.annotation.Transactional;
54
import org.springframework.transaction.annotation.Transactional;
246
53
55
247
54
import edu.emory.mathcs.backport.java.util.Collections;
248
55
56
249
56
/**
57
/**
250
57
 * @author Kristian Nordal
58
 * @author Kristian Nordal
251
58
59
252
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/DefaultUsernameSaltSource.java'
253
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/DefaultUsernameSaltSource.java	2010-04-21 19:45:12 +0000
254
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/DefaultUsernameSaltSource.java	2010-05-07 11:16:36 +0000
255
@@ -27,7 +27,7 @@
256
27
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
27
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
257
28
 */
28
 */
258
29
29
260
30
import  org.springframework.security.userdetails.UserDetails;
30
import  org.springframework.security.core.userdetails.UserDetails;
261
31
31
262
32
/**
32
/**
263
33
 * @author Torgeir Lorange Ostby
33
 * @author Torgeir Lorange Ostby
264
34
34
265
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/UsernameSaltSource.java'
266
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/UsernameSaltSource.java	2010-04-21 19:45:12 +0000
267
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/UsernameSaltSource.java	2010-05-07 11:16:36 +0000
268
@@ -27,7 +27,7 @@
269
27
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
27
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
270
28
 */
28
 */
271
29
29
273
30
import  org.springframework.security.providers.dao.SaltSource;
30
import  org.springframework.security.authentication.dao.SaltSource;
274
31
31
275
32
/**
32
/**
276
33
 * This interface adds a method for getting a salt based on a username. The
33
 * This interface adds a method for getting a salt based on a username. The
277
34
34
278
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/hibernate/HibernateUserDetailsService.java'
279
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/hibernate/HibernateUserDetailsService.java	2010-04-21 19:45:12 +0000
280
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/hibernate/HibernateUserDetailsService.java	2010-05-07 11:16:36 +0000
281
@@ -30,11 +30,6 @@
282
30
import java.util.HashSet;
30
import java.util.HashSet;
283
31
import java.util.Set;
31
import java.util.Set;
284
32
32
285
33
import  org.springframework.security.GrantedAuthority;
286
34
import  org.springframework.security.GrantedAuthorityImpl;
287
35
import  org.springframework.security.userdetails.UserDetails;
288
36
import  org.springframework.security.userdetails.UserDetailsService;
289
37
import  org.springframework.security.userdetails.UsernameNotFoundException;
290
38
import org.hibernate.Criteria;
33
import org.hibernate.Criteria;
291
39
import org.hibernate.Session;
34
import org.hibernate.Session;
292
40
import org.hibernate.SessionFactory;
35
import org.hibernate.SessionFactory;
293
@@ -42,6 +37,12 @@
294
42
import org.hisp.dhis.user.UserAuthorityGroup;
37
import org.hisp.dhis.user.UserAuthorityGroup;
295
43
import org.hisp.dhis.user.UserCredentials;
38
import org.hisp.dhis.user.UserCredentials;
296
44
import org.springframework.dao.DataAccessException;
39
import org.springframework.dao.DataAccessException;
297
40
import org.springframework.security.core.GrantedAuthority;
298
41
import org.springframework.security.core.authority.GrantedAuthorityImpl;
299
42
import org.springframework.security.core.userdetails.User;
300
43
import org.springframework.security.core.userdetails.UserDetails;
301
44
import org.springframework.security.core.userdetails.UserDetailsService;
302
45
import org.springframework.security.core.userdetails.UsernameNotFoundException;
303
45
import org.springframework.transaction.annotation.Transactional;
46
import org.springframework.transaction.annotation.Transactional;
304
46
47
305
47
/**
48
/**
306
@@ -80,7 +81,7 @@
307
80
81
308
81
        GrantedAuthority[] authorities = getGrantedAuthorities( credentials );
82
        GrantedAuthority[] authorities = getGrantedAuthorities( credentials );
309
82
83
311
83
        return new  org.springframework.security.userdetails.User( credentials.getUsername(), credentials.getPassword(), true,
84
        return new User( credentials.getUsername(), credentials.getPassword(), true,
312
84
            true, true, true, authorities );
85
            true, true, true, authorities );
313
85
    }
86
    }
314
86
87
315
87
88
316
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/spring/AbstractSpringSecurityCurrentUserService.java'
317
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/spring/AbstractSpringSecurityCurrentUserService.java	2010-04-21 19:45:12 +0000
318
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/spring/AbstractSpringSecurityCurrentUserService.java	2010-05-07 11:16:36 +0000
319
@@ -28,9 +28,9 @@
320
28
 */
28
 */
321
29
29
322
30
import org.hisp.dhis.user.CurrentUserService;
30
import org.hisp.dhis.user.CurrentUserService;
326
31
import org.springframework.security.Authentication;
31
import org.springframework.security.core.Authentication;
327
32
import org.springframework.security.context.SecurityContextHolder;
32
import org.springframework.security.core.context.SecurityContextHolder;
328
33
import org.springframework.security.userdetails.UserDetails;
33
import org.springframework.security.core.userdetails.UserDetails;
329
34
34
330
35
/**
35
/**
331
36
 * @author Torgeir Lorange Ostby
36
 * @author Torgeir Lorange Ostby
332
37
37
333
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/spring/SpringSecurityPasswordManager.java'
334
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/spring/SpringSecurityPasswordManager.java	2010-04-21 19:45:12 +0000
335
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/spring/SpringSecurityPasswordManager.java	2010-05-07 11:16:36 +0000
336
@@ -29,7 +29,7 @@
337
29
29
338
30
import org.hisp.dhis.security.PasswordManager;
30
import org.hisp.dhis.security.PasswordManager;
339
31
import org.hisp.dhis.security.UsernameSaltSource;
31
import org.hisp.dhis.security.UsernameSaltSource;
341
32
import org.springframework.security.providers.encoding.PasswordEncoder;
32
import org.springframework.security.authentication.encoding.PasswordEncoder;
342
33
33
343
34
/**
34
/**
344
35
 * @author Torgeir Lorange Ostby
35
 * @author Torgeir Lorange Ostby
345
36
36
346
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/vote/AllRequiredRoleVoter.java'
347
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/vote/AllRequiredRoleVoter.java	2010-04-21 19:45:12 +0000
348
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/vote/AllRequiredRoleVoter.java	2010-05-07 11:16:36 +0000
349
@@ -29,18 +29,18 @@
350
29
29
351
30
import java.util.Collection;
30
import java.util.Collection;
352
31
31
357
32
import org.springframework.security.Authentication;
32
import org.springframework.security.access.ConfigAttribute;
358
33
import org.springframework.security.ConfigAttribute;
33
import org.springframework.security.access.vote.RoleVoter;
359
34
import org.springframework.security.ConfigAttributeDefinition;
34
import org.springframework.security.core.Authentication;
360
35
import org.springframework.security.vote.RoleVoter;
35
import org.springframework.security.core.GrantedAuthority;
361
36
36
362
37
/**
37
/**
367
38
 * RoleVoter which requires all  org.springframework.security.ConfigAttributes to be granted
38
 * RoleVoter which requires all org.springframework.security.ConfigAttributes to
368
39
 * authorities, given that the ConfigAttributes have the specified prefix
39
 * be granted authorities, given that the ConfigAttributes have the specified
369
40
 * ("ROLE_" by default). If there are no supported ConfigAttributes it abstains
40
 * prefix ("ROLE_" by default). If there are no supported ConfigAttributes it
370
41
 * from voting.
41
 * abstains from voting.
371
42
 * 
42
 * 
373
43
 * @see  org.springframework.security.vote.RoleVoter
43
 * @see org.springframework.security.access.vote.RoleVoter
374
44
 * 
44
 * 
375
45
 * @author Torgeir Lorange Ostby
45
 * @author Torgeir Lorange Ostby
376
46
 * @version $Id: AllRequiredRoleVoter.java 6070 2008-10-28 17:49:23Z larshelg $
46
 * @version $Id: AllRequiredRoleVoter.java 6070 2008-10-28 17:49:23Z larshelg $
377
@@ -48,13 +48,10 @@
378
48
public class AllRequiredRoleVoter
48
public class AllRequiredRoleVoter
379
49
    extends RoleVoter
49
    extends RoleVoter
380
50
{
50
{
382
51
    public int vote( Authentication authentication, Object object, ConfigAttributeDefinition config )
51
    public int vote( Authentication authentication, Object object, Collection<ConfigAttribute> attributes )
383
52
    {
52
    {
384
53
        int supported = 0;
53
        int supported = 0;
385
54
54
386
55
        @SuppressWarnings( "unchecked" )
387
56
        Collection<ConfigAttribute> attributes = config.getConfigAttributes();
388
57
389
58
        for ( ConfigAttribute attribute : attributes )
55
        for ( ConfigAttribute attribute : attributes )
390
59
        {
56
        {
391
60
            if ( this.supports( attribute ) )
57
            if ( this.supports( attribute ) )
392
@@ -62,9 +59,9 @@
393
62
                ++supported;
59
                ++supported;
394
63
                boolean found = false;
60
                boolean found = false;
395
64
61
397
65
                for ( int i = 0; i < authentication.getAuthorities().length; i++ )
62
                for ( GrantedAuthority authority : authentication.getAuthorities() )
398
66
                {
63
                {
400
67
                    if ( attribute.getAttribute().equals( authentication.getAuthorities()[i].getAuthority() ) )
64
                    if ( attribute.getAttribute().equals( authority ) )
401
68
                    {
65
                    {
402
69
                        found = true;
66
                        found = true;
403
70
                        break;
67
                        break;
404
71
68
405
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml'
406
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml	2010-05-04 06:47:28 +0000
407
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml	2010-05-07 11:16:36 +0000
408
@@ -1,837 +1,837 @@
824
1
<?xml version="1.0" encoding="UTF-8"?>
1
<?xml version="1.0" encoding="UTF-8"?>
825
2
<beans xmlns="http://www.springframework.org/schema/beans"
2
<beans xmlns="http://www.springframework.org/schema/beans"
826
3
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
827
4
  xmlns:aop="http://www.springframework.org/schema/aop"
4
  xmlns:aop="http://www.springframework.org/schema/aop"
828
5
  xsi:schemaLocation="
5
  xsi:schemaLocation="
829
6
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
6
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
830
7
http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
7
http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
831
8
  
8
  
832
9
  <!-- Store definitions -->
9
  <!-- Store definitions -->
833
10
  
10
  
834
11
  <bean id="org.hisp.dhis.dataentryform.DataEntryFormAssociationStore"
11
  <bean id="org.hisp.dhis.dataentryform.DataEntryFormAssociationStore"
835
12
    class="org.hisp.dhis.dataentryform.hibernate.HibernateDataEntryFormAssociationStore">
12
    class="org.hisp.dhis.dataentryform.hibernate.HibernateDataEntryFormAssociationStore">
836
13
    <property name="sessionFactory" ref="sessionFactory"/>
13
    <property name="sessionFactory" ref="sessionFactory"/>
837
14
  </bean>
14
  </bean>
838
15
  
15
  
839
16
   <bean id="org.hisp.dhis.dataentryform.DataEntryFormStore"
16
   <bean id="org.hisp.dhis.dataentryform.DataEntryFormStore"
840
17
    class="org.hisp.dhis.dataentryform.hibernate.HibernateDataEntryFormStore">
17
    class="org.hisp.dhis.dataentryform.hibernate.HibernateDataEntryFormStore">
841
18
    <property name="sessionFactory" ref="sessionFactory"/>
18
    <property name="sessionFactory" ref="sessionFactory"/>
842
19
  </bean>
19
  </bean>
843
20
20
844
21
  <bean id="org.hisp.dhis.customvalue.CustomValueStore"
21
  <bean id="org.hisp.dhis.customvalue.CustomValueStore"
845
22
    class="org.hisp.dhis.customvalue.hibernate.HibernateCustomValueStore">
22
    class="org.hisp.dhis.customvalue.hibernate.HibernateCustomValueStore">
846
23
    <property name="clazz" value="org.hisp.dhis.customvalue.CustomValue"/>
23
    <property name="clazz" value="org.hisp.dhis.customvalue.CustomValue"/>
847
24
    <property name="sessionFactory" ref="sessionFactory"/>
24
    <property name="sessionFactory" ref="sessionFactory"/>
848
25
  </bean>
25
  </bean>
849
26
26
850
27
  <bean id="org.hisp.dhis.dataelement.DataElementStore"
27
  <bean id="org.hisp.dhis.dataelement.DataElementStore"
851
28
    class="org.hisp.dhis.dataelement.hibernate.HibernateDataElementStore">
28
    class="org.hisp.dhis.dataelement.hibernate.HibernateDataElementStore">
852
29
    <property name="sessionFactory" ref="sessionFactory"/>
29
    <property name="sessionFactory" ref="sessionFactory"/>
853
30
	<property name="statementManager" ref="statementManager"/>
30
	<property name="statementManager" ref="statementManager"/>
854
31
  </bean>
31
  </bean>
855
32
  
32
  
856
33
  <bean id="org.hisp.dhis.dataelement.DataElementGroupStore"
33
  <bean id="org.hisp.dhis.dataelement.DataElementGroupStore"
857
34
    class="org.hisp.dhis.hibernate.HibernateGenericStore">
34
    class="org.hisp.dhis.hibernate.HibernateGenericStore">
858
35
    <property name="clazz" value="org.hisp.dhis.dataelement.DataElementGroup"/>
35
    <property name="clazz" value="org.hisp.dhis.dataelement.DataElementGroup"/>
859
36
    <property name="sessionFactory" ref="sessionFactory"/>
36
    <property name="sessionFactory" ref="sessionFactory"/>
860
37
  </bean>
37
  </bean>
861
38
  
38
  
862
39
  <bean id="org.hisp.dhis.dataelement.DataElementGroupSetStore"
39
  <bean id="org.hisp.dhis.dataelement.DataElementGroupSetStore"
863
40
    class="org.hisp.dhis.hibernate.HibernateGenericStore">
40
    class="org.hisp.dhis.hibernate.HibernateGenericStore">
864
41
    <property name="clazz" value="org.hisp.dhis.dataelement.DataElementGroupSet"/>
41
    <property name="clazz" value="org.hisp.dhis.dataelement.DataElementGroupSet"/>
865
42
    <property name="sessionFactory" ref="sessionFactory"/>
42
    <property name="sessionFactory" ref="sessionFactory"/>
866
43
  </bean>
43
  </bean>
867
44
  
44
  
868
45
  <bean id="org.hisp.dhis.datadictionary.DataDictionaryStore"
45
  <bean id="org.hisp.dhis.datadictionary.DataDictionaryStore"
869
46
    class="org.hisp.dhis.hibernate.HibernateGenericStore">
46
    class="org.hisp.dhis.hibernate.HibernateGenericStore">
870
47
    <property name="clazz" value="org.hisp.dhis.datadictionary.DataDictionary"/>
47
    <property name="clazz" value="org.hisp.dhis.datadictionary.DataDictionary"/>
871
48
    <property name="sessionFactory" ref="sessionFactory"/>
48
    <property name="sessionFactory" ref="sessionFactory"/>
872
49
  </bean>
49
  </bean>
873
50
  
50
  
874
51
  <bean id="org.hisp.dhis.datavalue.DataValueStore"
51
  <bean id="org.hisp.dhis.datavalue.DataValueStore"
875
52
    class="org.hisp.dhis.datavalue.hibernate.HibernateDataValueStore">
52
    class="org.hisp.dhis.datavalue.hibernate.HibernateDataValueStore">
876
53
    <property name="sessionFactory" ref="sessionFactory"/>
53
    <property name="sessionFactory" ref="sessionFactory"/>
877
54
    <property name="statementManager" ref="statementManager"/>
54
    <property name="statementManager" ref="statementManager"/>
878
55
    <property name="periodStore" ref="org.hisp.dhis.period.PeriodStore"/>
55
    <property name="periodStore" ref="org.hisp.dhis.period.PeriodStore"/>
879
56
  </bean>
56
  </bean>
880
57
  
57
  
881
58
  <bean id="org.hisp.dhis.indicator.IndicatorStore"
58
  <bean id="org.hisp.dhis.indicator.IndicatorStore"
882
59
    class="org.hisp.dhis.indicator.hibernate.HibernateIndicatorStore">
59
    class="org.hisp.dhis.indicator.hibernate.HibernateIndicatorStore">
883
60
    <property name="sessionFactory" ref="sessionFactory"/>
60
    <property name="sessionFactory" ref="sessionFactory"/>
884
61
  </bean>
61
  </bean>
885
62
	
62
	
886
63
  <bean id="org.hisp.dhis.indicator.IndicatorTypeStore"
63
  <bean id="org.hisp.dhis.indicator.IndicatorTypeStore"
887
64
    class="org.hisp.dhis.hibernate.HibernateGenericStore">
64
    class="org.hisp.dhis.hibernate.HibernateGenericStore">
888
65
    <property name="clazz" value="org.hisp.dhis.indicator.IndicatorType"/>
65
    <property name="clazz" value="org.hisp.dhis.indicator.IndicatorType"/>
889
66
    <property name="sessionFactory" ref="sessionFactory"/>
66
    <property name="sessionFactory" ref="sessionFactory"/>
890
67
  </bean>
67
  </bean>
891
68
    
68
    
892
69
  <bean id="org.hisp.dhis.indicator.IndicatorGroupStore"
69
  <bean id="org.hisp.dhis.indicator.IndicatorGroupStore"
893
70
    class="org.hisp.dhis.hibernate.HibernateGenericStore">
70
    class="org.hisp.dhis.hibernate.HibernateGenericStore">
894
71
    <property name="clazz" value="org.hisp.dhis.indicator.IndicatorGroup"/>
71
    <property name="clazz" value="org.hisp.dhis.indicator.IndicatorGroup"/>
895
72
    <property name="sessionFactory" ref="sessionFactory"/>
72
    <property name="sessionFactory" ref="sessionFactory"/>
896
73
  </bean>
73
  </bean>
897
74
    
74
    
898
75
  <bean id="org.hisp.dhis.indicator.IndicatorGroupSetStore"
75
  <bean id="org.hisp.dhis.indicator.IndicatorGroupSetStore"
899
76
    class="org.hisp.dhis.hibernate.HibernateGenericStore">
76
    class="org.hisp.dhis.hibernate.HibernateGenericStore">
900
77
    <property name="clazz" value="org.hisp.dhis.indicator.IndicatorGroupSet"/>
77
    <property name="clazz" value="org.hisp.dhis.indicator.IndicatorGroupSet"/>
901
78
    <property name="sessionFactory" ref="sessionFactory"/>
78
    <property name="sessionFactory" ref="sessionFactory"/>
902
79
  </bean>
79
  </bean>
903
80
    
80
    
904
81
  <bean id="org.hisp.dhis.period.PeriodStore"
81
  <bean id="org.hisp.dhis.period.PeriodStore"
905
82
    class="org.hisp.dhis.period.hibernate.HibernatePeriodStore">
82
    class="org.hisp.dhis.period.hibernate.HibernatePeriodStore">
906
83
    <property name="sessionFactory" ref="sessionFactory"/>
83
    <property name="sessionFactory" ref="sessionFactory"/>
907
84
  </bean>
84
  </bean>
908
85
  
85
  
909
86
  <bean id="org.hisp.dhis.source.SourceStore"
86
  <bean id="org.hisp.dhis.source.SourceStore"
910
87
    class="org.hisp.dhis.source.hibernate.HibernateSourceStore">
87
    class="org.hisp.dhis.source.hibernate.HibernateSourceStore">
911
88
    <property name="sessionFactory" ref="sessionFactory"/>
88
    <property name="sessionFactory" ref="sessionFactory"/>
912
89
  </bean>
89
  </bean>
913
90
  
90
  
914
91
  <bean id="org.hisp.dhis.dataset.DataSetStore"
91
  <bean id="org.hisp.dhis.dataset.DataSetStore"
915
92
    class="org.hisp.dhis.dataset.hibernate.HibernateDataSetStore">
92
    class="org.hisp.dhis.dataset.hibernate.HibernateDataSetStore">
916
93
    <property name="sessionFactory" ref="sessionFactory"/>
93
    <property name="sessionFactory" ref="sessionFactory"/>
917
94
    <property name="periodStore"
94
    <property name="periodStore"
918
95
      ref="org.hisp.dhis.period.PeriodStore"/>
95
      ref="org.hisp.dhis.period.PeriodStore"/>
919
96
  </bean>
96
  </bean>
920
97
97
921
98
  <bean id="org.hisp.dhis.dataset.CompleteDataSetRegistrationStore"
98
  <bean id="org.hisp.dhis.dataset.CompleteDataSetRegistrationStore"
922
99
    class="org.hisp.dhis.dataset.hibernate.HibernateCompleteDataSetRegistrationStore"> 
99
    class="org.hisp.dhis.dataset.hibernate.HibernateCompleteDataSetRegistrationStore"> 
923
100
    <property name="sessionFactory" ref="sessionFactory"/>
100
    <property name="sessionFactory" ref="sessionFactory"/>
924
101
    <property name="periodService"
101
    <property name="periodService"
925
102
      ref="org.hisp.dhis.period.PeriodService"/>
102
      ref="org.hisp.dhis.period.PeriodService"/>
926
103
  </bean>
103
  </bean>
927
104
  
104
  
928
105
 <bean id="org.hisp.dhis.minmax.MinMaxDataElementStore"
105
 <bean id="org.hisp.dhis.minmax.MinMaxDataElementStore"
929
106
    class="org.hisp.dhis.minmax.hibernate.HibernateMinMaxDataElementStore">
106
    class="org.hisp.dhis.minmax.hibernate.HibernateMinMaxDataElementStore">
930
107
    <property name="clazz" value="org.hisp.dhis.minmax.MinMaxDataElement"/>
107
    <property name="clazz" value="org.hisp.dhis.minmax.MinMaxDataElement"/>
931
108
    <property name="sessionFactory" ref="sessionFactory"/>
108
    <property name="sessionFactory" ref="sessionFactory"/>
932
109
  </bean>
109
  </bean>
933
110
  
110
  
934
111
  <bean id="org.hisp.dhis.expression.ExpressionStore"
111
  <bean id="org.hisp.dhis.expression.ExpressionStore"
935
112
    class="org.hisp.dhis.hibernate.HibernateGenericStore">
112
    class="org.hisp.dhis.hibernate.HibernateGenericStore">
936
113
    <property name="clazz" value="org.hisp.dhis.expression.Expression"/>
113
    <property name="clazz" value="org.hisp.dhis.expression.Expression"/>
937
114
    <property name="sessionFactory" ref="sessionFactory"/>
114
    <property name="sessionFactory" ref="sessionFactory"/>
938
115
  </bean>
115
  </bean>
939
116
  
116
  
940
117
  <bean id="org.hisp.dhis.validation.ValidationRuleStore"
117
  <bean id="org.hisp.dhis.validation.ValidationRuleStore"
941
118
    class="org.hisp.dhis.hibernate.HibernateGenericStore">
118
    class="org.hisp.dhis.hibernate.HibernateGenericStore">
942
119
    <property name="clazz" value="org.hisp.dhis.validation.ValidationRule"/>
119
    <property name="clazz" value="org.hisp.dhis.validation.ValidationRule"/>
943
120
    <property name="sessionFactory" ref="sessionFactory"/>
120
    <property name="sessionFactory" ref="sessionFactory"/>
944
121
  </bean>
121
  </bean>
945
122
  
122
  
946
123
  <bean id="org.hisp.dhis.validation.ValidationRuleGroupStore"
123
  <bean id="org.hisp.dhis.validation.ValidationRuleGroupStore"
947
124
    class="org.hisp.dhis.hibernate.HibernateGenericStore">
124
    class="org.hisp.dhis.hibernate.HibernateGenericStore">
948
125
    <property name="clazz" value="org.hisp.dhis.validation.ValidationRuleGroup"/>
125
    <property name="clazz" value="org.hisp.dhis.validation.ValidationRuleGroup"/>
949
126
    <property name="sessionFactory" ref="sessionFactory"/>
126
    <property name="sessionFactory" ref="sessionFactory"/>
950
127
  </bean>
127
  </bean>
951
128
	
128
	
952
129
  <bean id="org.hisp.dhis.dataelement.DataElementCategoryStore"
129
  <bean id="org.hisp.dhis.dataelement.DataElementCategoryStore"
953
130
    class="org.hisp.dhis.hibernate.HibernateGenericStore">
130
    class="org.hisp.dhis.hibernate.HibernateGenericStore">
954
131
    <property name="clazz" value="org.hisp.dhis.dataelement.DataElementCategory"/>
131
    <property name="clazz" value="org.hisp.dhis.dataelement.DataElementCategory"/>
955
132
    <property name="sessionFactory" ref="sessionFactory"/>
132
    <property name="sessionFactory" ref="sessionFactory"/>
956
133
  </bean>  
133
  </bean>  
957
134
  
134
  
958
135
  <bean id="org.hisp.dhis.dataelement.DataElementCategoryOptionStore"
135
  <bean id="org.hisp.dhis.dataelement.DataElementCategoryOptionStore"
959
136
    class="org.hisp.dhis.hibernate.HibernateGenericStore">
136
    class="org.hisp.dhis.hibernate.HibernateGenericStore">
960
137
    <property name="clazz" value="org.hisp.dhis.dataelement.DataElementCategoryOption"/>
137
    <property name="clazz" value="org.hisp.dhis.dataelement.DataElementCategoryOption"/>
961
138
    <property name="sessionFactory" ref="sessionFactory"/>
138
    <property name="sessionFactory" ref="sessionFactory"/>
962
139
  </bean>
139
  </bean>
963
140
	
140
	
964
141
  <bean id="org.hisp.dhis.dataelement.DataElementCategoryComboStore"
141
  <bean id="org.hisp.dhis.dataelement.DataElementCategoryComboStore"
965
142
    class="org.hisp.dhis.hibernate.HibernateGenericStore">
142
    class="org.hisp.dhis.hibernate.HibernateGenericStore">
966
143
    <property name="clazz" value="org.hisp.dhis.dataelement.DataElementCategoryCombo"/>
143
    <property name="clazz" value="org.hisp.dhis.dataelement.DataElementCategoryCombo"/>
967
144
    <property name="sessionFactory" ref="sessionFactory"/>
144
    <property name="sessionFactory" ref="sessionFactory"/>
968
145
  </bean>
145
  </bean>
969
146
	
146
	
970
147
  <bean id="org.hisp.dhis.dataelement.DataElementCategoryOptionComboStore"
147
  <bean id="org.hisp.dhis.dataelement.DataElementCategoryOptionComboStore"
971
148
    class="org.hisp.dhis.hibernate.HibernateGenericStore">
148
    class="org.hisp.dhis.hibernate.HibernateGenericStore">
972
149
    <property name="clazz" value="org.hisp.dhis.dataelement.DataElementCategoryOptionCombo"/>
149
    <property name="clazz" value="org.hisp.dhis.dataelement.DataElementCategoryOptionCombo"/>
973
150
    <property name="sessionFactory" ref="sessionFactory"/>
150
    <property name="sessionFactory" ref="sessionFactory"/>
974
151
  </bean>
151
  </bean>
975
152
  
152
  
976
153
  <bean id="org.hisp.dhis.dataset.SectionStore"
153
  <bean id="org.hisp.dhis.dataset.SectionStore"
977
154
    class="org.hisp.dhis.dataset.hibernate.HibernateSectionStore">
154
    class="org.hisp.dhis.dataset.hibernate.HibernateSectionStore">
978
155
    <property name="sessionFactory" ref="sessionFactory"/>
155
    <property name="sessionFactory" ref="sessionFactory"/>
979
156
  </bean>
156
  </bean>
980
157
  
157
  
981
158
  <bean id="org.hisp.dhis.organisationunit.OrganisationUnitStore"
158
  <bean id="org.hisp.dhis.organisationunit.OrganisationUnitStore"
982
159
    class="org.hisp.dhis.organisationunit.hibernate.HibernateOrganisationUnitStore">
159
    class="org.hisp.dhis.organisationunit.hibernate.HibernateOrganisationUnitStore">
983
160
    <property name="sessionFactory" ref="sessionFactory"/>
160
    <property name="sessionFactory" ref="sessionFactory"/>
984
161
    <property name="statementManager" ref="statementManager"/>
161
    <property name="statementManager" ref="statementManager"/>
985
162
    <property name="jdbcTemplate" ref="jdbcTemplate"/>
162
    <property name="jdbcTemplate" ref="jdbcTemplate"/>
986
163
  </bean>
163
  </bean>
987
164
164
988
165
  <bean id="org.hisp.dhis.organisationunit.OrganisationUnitGroupStore"
165
  <bean id="org.hisp.dhis.organisationunit.OrganisationUnitGroupStore"
989
166
    class="org.hisp.dhis.hibernate.HibernateGenericStore">
166
    class="org.hisp.dhis.hibernate.HibernateGenericStore">
990
167
    <property name="clazz" value="org.hisp.dhis.organisationunit.OrganisationUnitGroup"/>
167
    <property name="clazz" value="org.hisp.dhis.organisationunit.OrganisationUnitGroup"/>
991
168
    <property name="sessionFactory" ref="sessionFactory"/>
168
    <property name="sessionFactory" ref="sessionFactory"/>
992
169
  </bean>
169
  </bean>
993
170
  
170
  
994
171
  <bean id="org.hisp.dhis.organisationunit.OrganisationUnitGroupSetStore"
171
  <bean id="org.hisp.dhis.organisationunit.OrganisationUnitGroupSetStore"
995
172
    class="org.hisp.dhis.hibernate.HibernateGenericStore">
172
    class="org.hisp.dhis.hibernate.HibernateGenericStore">
996
173
    <property name="clazz" value="org.hisp.dhis.organisationunit.OrganisationUnitGroupSet"/>
173
    <property name="clazz" value="org.hisp.dhis.organisationunit.OrganisationUnitGroupSet"/>
997
174
    <property name="sessionFactory" ref="sessionFactory"/>
174
    <property name="sessionFactory" ref="sessionFactory"/>
998
175
  </bean>
175
  </bean>
999
176
  
176
  
1000
177
  <bean id="org.hisp.dhis.dataanalysis.jdbc.DataAnalysisStore"
177
  <bean id="org.hisp.dhis.dataanalysis.jdbc.DataAnalysisStore"
1001
178
    class="org.hisp.dhis.dataanalysis.jdbc.JdbcDataAnalysisStore">
178
    class="org.hisp.dhis.dataanalysis.jdbc.JdbcDataAnalysisStore">
1002
179
    <property name="statementManager" ref="statementManager"/>
179
    <property name="statementManager" ref="statementManager"/>
1003
180
    <property name="statementBuilder" ref="statementBuilder"/>
180
    <property name="statementBuilder" ref="statementBuilder"/>
1004
181
  </bean>
181
  </bean>
1005
182
  
182
  
1006
183
  <bean id="org.hisp.dhis.datavalue.DataValueAuditStore"
183
  <bean id="org.hisp.dhis.datavalue.DataValueAuditStore"
1007
184
    class="org.hisp.dhis.datavalue.hibernate.HibernateDataValueAuditStore">
184
    class="org.hisp.dhis.datavalue.hibernate.HibernateDataValueAuditStore">
1008
185
    <property name="sessionFactory" ref="sessionFactory"/>
185
    <property name="sessionFactory" ref="sessionFactory"/>
1009
186
  </bean>
186
  </bean>
1010
187
  
187
  
1011
188
  <bean id="org.hisp.dhis.user.UserStore" 
188
  <bean id="org.hisp.dhis.user.UserStore" 
1012
189
    class="org.hisp.dhis.user.hibernate.HibernateUserStore">
189
    class="org.hisp.dhis.user.hibernate.HibernateUserStore">
1013
190
    <property name="sessionFactory" ref="sessionFactory"/>
190
    <property name="sessionFactory" ref="sessionFactory"/>
1014
191
     <property name="currentUserService"
191
     <property name="currentUserService"
1015
192
      ref="org.hisp.dhis.user.CurrentUserService"/>
192
      ref="org.hisp.dhis.user.CurrentUserService"/>
1016
193
  </bean>
193
  </bean>
1017
194
    
194
    
1018
195
  <!-- Service definitions -->
195
  <!-- Service definitions -->
1019
196
196
1020
197
  <bean id="org.hisp.dhis.customvalue.CustomValueService"
197
  <bean id="org.hisp.dhis.customvalue.CustomValueService"
1021
198
    class="org.hisp.dhis.customvalue.DefaultCustomValueService">
198
    class="org.hisp.dhis.customvalue.DefaultCustomValueService">
1022
199
    <property name="customValueStore"
199
    <property name="customValueStore"
1023
200
      ref="org.hisp.dhis.customvalue.CustomValueStore"/>
200
      ref="org.hisp.dhis.customvalue.CustomValueStore"/>
1024
201
  </bean>
201
  </bean>
1025
202
202
1026
203
  <bean id="org.hisp.dhis.datavalue.DataValueService"
203
  <bean id="org.hisp.dhis.datavalue.DataValueService"
1027
204
    class="org.hisp.dhis.datavalue.DefaultDataValueService">
204
    class="org.hisp.dhis.datavalue.DefaultDataValueService">
1028
205
    <property name="dataValueStore"
205
    <property name="dataValueStore"
1029
206
      ref="org.hisp.dhis.datavalue.DataValueStore"/>
206
      ref="org.hisp.dhis.datavalue.DataValueStore"/>
1030
207
	<property name="dataValueAuditService" ref="org.hisp.dhis.datavalue.DataValueAuditService"/>
207
	<property name="dataValueAuditService" ref="org.hisp.dhis.datavalue.DataValueAuditService"/>
1031
208
  </bean>
208
  </bean>
1032
209
209
1033
210
  <bean id="org.hisp.dhis.datavalue.DataValueAuditService"
210
  <bean id="org.hisp.dhis.datavalue.DataValueAuditService"
1034
211
    class="org.hisp.dhis.datavalue.DefaultDataValueAuditService">
211
    class="org.hisp.dhis.datavalue.DefaultDataValueAuditService">
1035
212
    <property name="dataValueAuditStore"
212
    <property name="dataValueAuditStore"
1036
213
      ref="org.hisp.dhis.datavalue.DataValueAuditStore"/>
213
      ref="org.hisp.dhis.datavalue.DataValueAuditStore"/>
1037
214
  </bean>
214
  </bean>
1038
215
  
215
  
1039
216
  <bean id="org.hisp.dhis.dataelement.DataElementService"
216
  <bean id="org.hisp.dhis.dataelement.DataElementService"
1040
217
    class="org.hisp.dhis.dataelement.DefaultDataElementService">
217
    class="org.hisp.dhis.dataelement.DefaultDataElementService">
1041
218
    <property name="dataElementStore"
218
    <property name="dataElementStore"
1042
219
      ref="org.hisp.dhis.dataelement.DataElementStore"/>
219
      ref="org.hisp.dhis.dataelement.DataElementStore"/>
1043
220
	<property name="dataElementGroupStore"
220
	<property name="dataElementGroupStore"
1044
221
	  ref="org.hisp.dhis.dataelement.DataElementGroupStore"/>
221
	  ref="org.hisp.dhis.dataelement.DataElementGroupStore"/>
1045
222
    <property name="dataElementGroupSetStore"
222
    <property name="dataElementGroupSetStore"
1046
223
      ref="org.hisp.dhis.dataelement.DataElementGroupSetStore"/>	
223
      ref="org.hisp.dhis.dataelement.DataElementGroupSetStore"/>	
1047
224
    <property name="i18nService"
224
    <property name="i18nService"
1048
225
      ref="org.hisp.dhis.i18n.I18nService"/>
225
      ref="org.hisp.dhis.i18n.I18nService"/>
1049
226
  </bean>
226
  </bean>
1050
227
  
227
  
1051
228
  <bean id="org.hisp.dhis.minmax.MinMaxDataElementService"
228
  <bean id="org.hisp.dhis.minmax.MinMaxDataElementService"
1052
229
    class="org.hisp.dhis.minmax.DefaultMinMaxDataElementService">
229
    class="org.hisp.dhis.minmax.DefaultMinMaxDataElementService">
1053
230
    <property name="minMaxDataElementStore"
230
    <property name="minMaxDataElementStore"
1054
231
      ref="org.hisp.dhis.minmax.MinMaxDataElementStore"/>
231
      ref="org.hisp.dhis.minmax.MinMaxDataElementStore"/>
1055
232
  </bean>
232
  </bean>
1056
233
  
233
  
1057
234
  <bean id="org.hisp.dhis.datadictionary.DataDictionaryService"
234
  <bean id="org.hisp.dhis.datadictionary.DataDictionaryService"
1058
235
    class="org.hisp.dhis.datadictionary.DefaultDataDictionaryService">
235
    class="org.hisp.dhis.datadictionary.DefaultDataDictionaryService">
1059
236
    <property name="dataDictionaryStore"
236
    <property name="dataDictionaryStore"
1060
237
      ref="org.hisp.dhis.datadictionary.DataDictionaryStore"/>
237
      ref="org.hisp.dhis.datadictionary.DataDictionaryStore"/>
1061
238
    <property name="i18nService"
238
    <property name="i18nService"
1062
239
      ref="org.hisp.dhis.i18n.I18nService"/>
239
      ref="org.hisp.dhis.i18n.I18nService"/>
1063
240
  </bean>
240
  </bean>
1064
241
 
241
 
1065
242
  <bean id="org.hisp.dhis.indicator.IndicatorService"
242
  <bean id="org.hisp.dhis.indicator.IndicatorService"
1066
243
	class="org.hisp.dhis.indicator.DefaultIndicatorService">
243
	class="org.hisp.dhis.indicator.DefaultIndicatorService">
1067
244
   <property name="indicatorStore"
244
   <property name="indicatorStore"
1068
245
     ref="org.hisp.dhis.indicator.IndicatorStore"/>
245
     ref="org.hisp.dhis.indicator.IndicatorStore"/>
1069
246
   <property name="indicatorTypeStore"
246
   <property name="indicatorTypeStore"
1070
247
	 ref="org.hisp.dhis.indicator.IndicatorTypeStore"/>
247
	 ref="org.hisp.dhis.indicator.IndicatorTypeStore"/>
1071
248
   <property name="indicatorGroupStore"
248
   <property name="indicatorGroupStore"
1072
249
	 ref="org.hisp.dhis.indicator.IndicatorGroupStore"/>
249
	 ref="org.hisp.dhis.indicator.IndicatorGroupStore"/>
1073
250
   <property name="indicatorGroupSetStore"
250
   <property name="indicatorGroupSetStore"
1074
251
	 ref="org.hisp.dhis.indicator.IndicatorGroupSetStore"/>
251
	 ref="org.hisp.dhis.indicator.IndicatorGroupSetStore"/>
1075
252
   <property name="i18nService"
252
   <property name="i18nService"
1076
253
     ref="org.hisp.dhis.i18n.I18nService"/>
253
     ref="org.hisp.dhis.i18n.I18nService"/>
1077
254
  </bean>
254
  </bean>
1078
255
255
1079
256
  <bean id="org.hisp.dhis.period.PeriodService"
256
  <bean id="org.hisp.dhis.period.PeriodService"
1080
257
    class="org.hisp.dhis.period.DefaultPeriodService">
257
    class="org.hisp.dhis.period.DefaultPeriodService">
1081
258
    <property name="periodStore"
258
    <property name="periodStore"
1082
259
      ref="org.hisp.dhis.period.PeriodStore"/>
259
      ref="org.hisp.dhis.period.PeriodStore"/>
1083
260
  </bean>
260
  </bean>
1084
261
	
261
	
1085
262
  <bean id="org.hisp.dhis.dataset.DataSetService"
262
  <bean id="org.hisp.dhis.dataset.DataSetService"
1086
263
    class="org.hisp.dhis.dataset.DefaultDataSetService">
263
    class="org.hisp.dhis.dataset.DefaultDataSetService">
1087
264
    <property name="dataSetStore"
264
    <property name="dataSetStore"
1088
265
      ref="org.hisp.dhis.dataset.DataSetStore"/>
265
      ref="org.hisp.dhis.dataset.DataSetStore"/>
1089
266
    <property name="dataEntryFormService"
266
    <property name="dataEntryFormService"
1090
267
      ref="org.hisp.dhis.dataentryform.DataEntryFormService"/>
267
      ref="org.hisp.dhis.dataentryform.DataEntryFormService"/>
1091
268
    <property name="i18nService"
268
    <property name="i18nService"
1092
269
      ref="org.hisp.dhis.i18n.I18nService"/>
269
      ref="org.hisp.dhis.i18n.I18nService"/>
1093
270
     <property name="currentUserService"
270
     <property name="currentUserService"
1094
271
      ref="org.hisp.dhis.user.CurrentUserService"/>
271
      ref="org.hisp.dhis.user.CurrentUserService"/>
1095
272
  </bean>
272
  </bean>
1096
273
273
1097
274
  <bean id="org.hisp.dhis.dataset.CompleteDataSetRegistrationService"
274
  <bean id="org.hisp.dhis.dataset.CompleteDataSetRegistrationService"
1098
275
    class="org.hisp.dhis.dataset.DefaultCompleteDataSetRegistrationService">    
275
    class="org.hisp.dhis.dataset.DefaultCompleteDataSetRegistrationService">    
1099
276
    <property name="completeDataSetRegistrationStore"
276
    <property name="completeDataSetRegistrationStore"
1100
277
      ref="org.hisp.dhis.dataset.CompleteDataSetRegistrationStore"/>
277
      ref="org.hisp.dhis.dataset.CompleteDataSetRegistrationStore"/>
1101
278
  </bean>
278
  </bean>
1102
279
  
279
  
1103
280
  <bean id="org.hisp.dhis.dataset.SectionService"
280
  <bean id="org.hisp.dhis.dataset.SectionService"
1104
281
    class="org.hisp.dhis.dataset.DefaultSectionService">
281
    class="org.hisp.dhis.dataset.DefaultSectionService">
1105
282
    <property name="sectionStore"
282
    <property name="sectionStore"
1106
283
      ref="org.hisp.dhis.dataset.SectionStore"/>
283
      ref="org.hisp.dhis.dataset.SectionStore"/>
1107
284
  </bean>
284
  </bean>
1108
285
  
285
  
1109
286
   <bean id="org.hisp.dhis.dataentryform.DataEntryFormService"
286
   <bean id="org.hisp.dhis.dataentryform.DataEntryFormService"
1110
287
    class="org.hisp.dhis.dataentryform.DefaultDataEntryFormService">
287
    class="org.hisp.dhis.dataentryform.DefaultDataEntryFormService">
1111
288
    <property name="dataEntryFormStore"
288
    <property name="dataEntryFormStore"
1112
289
      ref="org.hisp.dhis.dataentryform.DataEntryFormStore"/>
289
      ref="org.hisp.dhis.dataentryform.DataEntryFormStore"/>
1113
290
    <property name="dataEntryFormAssociationService"
290
    <property name="dataEntryFormAssociationService"
1114
291
      ref="org.hisp.dhis.dataentryform.DataEntryFormAssociationService"/>
291
      ref="org.hisp.dhis.dataentryform.DataEntryFormAssociationService"/>
1115
292
  </bean>
292
  </bean>
1116
293
  
293
  
1117
294
  <bean id="org.hisp.dhis.dataentryform.DataEntryFormAssociationService"
294
  <bean id="org.hisp.dhis.dataentryform.DataEntryFormAssociationService"
1118
295
    class="org.hisp.dhis.dataentryform.DefaultDataEntryFormAssociationService">
295
    class="org.hisp.dhis.dataentryform.DefaultDataEntryFormAssociationService">
1119
296
    <property name="dataEntryFormAssociationStore"
296
    <property name="dataEntryFormAssociationStore"
1120
297
      ref="org.hisp.dhis.dataentryform.DataEntryFormAssociationStore"/>
297
      ref="org.hisp.dhis.dataentryform.DataEntryFormAssociationStore"/>
1121
298
  </bean>
298
  </bean>
1122
299
    
299
    
1123
300
 <bean id="org.hisp.dhis.expression.ExpressionService"
300
 <bean id="org.hisp.dhis.expression.ExpressionService"
1124
301
    class="org.hisp.dhis.expression.DefaultExpressionService">
301
    class="org.hisp.dhis.expression.DefaultExpressionService">
1125
302
    <property name="expressionStore"
302
    <property name="expressionStore"
1126
303
      ref="org.hisp.dhis.expression.ExpressionStore"/>
303
      ref="org.hisp.dhis.expression.ExpressionStore"/>
1127
304
    <property name="dataElementService"
304
    <property name="dataElementService"
1128
305
      ref="org.hisp.dhis.dataelement.DataElementService"/>
305
      ref="org.hisp.dhis.dataelement.DataElementService"/>
1129
306
    <property name="dataValueService"
306
    <property name="dataValueService"
1130
307
      ref="org.hisp.dhis.datavalue.DataValueService"/>
307
      ref="org.hisp.dhis.datavalue.DataValueService"/>
1131
308
    <property name="categoryService"
308
    <property name="categoryService"
1132
309
      ref="org.hisp.dhis.dataelement.DataElementCategoryService"/>
309
      ref="org.hisp.dhis.dataelement.DataElementCategoryService"/>
1133
310
  </bean>
310
  </bean>
1134
311
311
1135
312
  <bean id="org.hisp.dhis.validation.ValidationRuleService"
312
  <bean id="org.hisp.dhis.validation.ValidationRuleService"
1136
313
    class="org.hisp.dhis.validation.DefaultValidationRuleService">
313
    class="org.hisp.dhis.validation.DefaultValidationRuleService">
1137
314
    <property name="validationRuleStore"
314
    <property name="validationRuleStore"
1138
315
      ref="org.hisp.dhis.validation.ValidationRuleStore"/>
315
      ref="org.hisp.dhis.validation.ValidationRuleStore"/>
1139
316
    <property name="validationRuleGroupStore"
316
    <property name="validationRuleGroupStore"
1140
317
      ref="org.hisp.dhis.validation.ValidationRuleGroupStore"/>
317
      ref="org.hisp.dhis.validation.ValidationRuleGroupStore"/>
1141
318
    <property name="expressionService"
318
    <property name="expressionService"
1142
319
      ref="org.hisp.dhis.expression.ExpressionService"/>
319
      ref="org.hisp.dhis.expression.ExpressionService"/>
1143
320
    <property name="periodService"
320
    <property name="periodService"
1144
321
      ref="org.hisp.dhis.period.PeriodService"/>
321
      ref="org.hisp.dhis.period.PeriodService"/>
1145
322
  </bean>
322
  </bean>
1146
323
	
323
	
1147
324
  <bean id="org.hisp.dhis.dataelement.DataElementCategoryService"
324
  <bean id="org.hisp.dhis.dataelement.DataElementCategoryService"
1148
325
    class="org.hisp.dhis.dataelement.DefaultDataElementCategoryService">
325
    class="org.hisp.dhis.dataelement.DefaultDataElementCategoryService">
1149
326
    <property name="dataElementCategoryStore"
326
    <property name="dataElementCategoryStore"
1150
327
      ref="org.hisp.dhis.dataelement.DataElementCategoryStore"/>
327
      ref="org.hisp.dhis.dataelement.DataElementCategoryStore"/>
1151
328
    <property name="dataElementCategoryOptionStore"
328
    <property name="dataElementCategoryOptionStore"
1152
329
      ref="org.hisp.dhis.dataelement.DataElementCategoryOptionStore"/>
329
      ref="org.hisp.dhis.dataelement.DataElementCategoryOptionStore"/>
1153
330
    <property name="dataElementCategoryComboStore"
330
    <property name="dataElementCategoryComboStore"
1154
331
      ref="org.hisp.dhis.dataelement.DataElementCategoryComboStore"/>
331
      ref="org.hisp.dhis.dataelement.DataElementCategoryComboStore"/>
1155
332
    <property name="dataElementCategoryOptionComboStore"
332
    <property name="dataElementCategoryOptionComboStore"
1156
333
      ref="org.hisp.dhis.dataelement.DataElementCategoryOptionComboStore"/>  
333
      ref="org.hisp.dhis.dataelement.DataElementCategoryOptionComboStore"/>  
1157
334
    <property name="dataElementService"
334
    <property name="dataElementService"
1158
335
      ref="org.hisp.dhis.dataelement.DataElementService"/>
335
      ref="org.hisp.dhis.dataelement.DataElementService"/>
1159
336
  </bean>
336
  </bean>
1160
337
  
337
  
1161
338
  <bean id="org.hisp.dhis.dimension.DimensionService"
338
  <bean id="org.hisp.dhis.dimension.DimensionService"
1162
339
	class="org.hisp.dhis.dimension.DefaultDimensionService">
339
	class="org.hisp.dhis.dimension.DefaultDimensionService">
1163
340
    <property name="dataElementService"
340
    <property name="dataElementService"
1164
341
      ref="org.hisp.dhis.dataelement.DataElementService"/>
341
      ref="org.hisp.dhis.dataelement.DataElementService"/>
1165
342
	<property name="categoryService"
342
	<property name="categoryService"
1166
343
      ref="org.hisp.dhis.dataelement.DataElementCategoryService"/>
343
      ref="org.hisp.dhis.dataelement.DataElementCategoryService"/>
1167
344
  </bean>
344
  </bean>
1168
345
    
345
    
1169
346
  <bean id="org.hisp.dhis.organisationunit.OrganisationUnitService"
346
  <bean id="org.hisp.dhis.organisationunit.OrganisationUnitService"
1170
347
    class="org.hisp.dhis.organisationunit.DefaultOrganisationUnitService">
347
    class="org.hisp.dhis.organisationunit.DefaultOrganisationUnitService">
1171
348
    <property name="sourceStore"
348
    <property name="sourceStore"
1172
349
      ref="org.hisp.dhis.source.SourceStore"/>
349
      ref="org.hisp.dhis.source.SourceStore"/>
1173
350
    <property name="organisationUnitStore"
350
    <property name="organisationUnitStore"
1174
351
      ref="org.hisp.dhis.organisationunit.OrganisationUnitStore"/>
351
      ref="org.hisp.dhis.organisationunit.OrganisationUnitStore"/>
1175
352
    <property name="currentUserService"
352
    <property name="currentUserService"
1176
353
      ref="org.hisp.dhis.user.CurrentUserService"/>
353
      ref="org.hisp.dhis.user.CurrentUserService"/>
1177
354
  </bean>
354
  </bean>
1178
355
355
1179
356
  <bean id="org.hisp.dhis.organisationunit.OrganisationUnitGroupService"
356
  <bean id="org.hisp.dhis.organisationunit.OrganisationUnitGroupService"
1180
357
    class="org.hisp.dhis.organisationunit.DefaultOrganisationUnitGroupService">
357
    class="org.hisp.dhis.organisationunit.DefaultOrganisationUnitGroupService">
1181
358
    <property name="organisationUnitGroupStore"
358
    <property name="organisationUnitGroupStore"
1182
359
      ref="org.hisp.dhis.organisationunit.OrganisationUnitGroupStore"/>
359
      ref="org.hisp.dhis.organisationunit.OrganisationUnitGroupStore"/>
1183
360
    <property name="organisationUnitGroupSetStore"
360
    <property name="organisationUnitGroupSetStore"
1184
361
      ref="org.hisp.dhis.organisationunit.OrganisationUnitGroupSetStore"/>
361
      ref="org.hisp.dhis.organisationunit.OrganisationUnitGroupSetStore"/>
1185
362
  </bean>
362
  </bean>
1186
363
   
363
   
1187
364
  <bean id="org.hisp.dhis.dataanalysis.StdDevOutlierAnalysisService" 
364
  <bean id="org.hisp.dhis.dataanalysis.StdDevOutlierAnalysisService" 
1188
365
    class="org.hisp.dhis.dataanalysis.StdDevOutlierAnalysisService">
365
    class="org.hisp.dhis.dataanalysis.StdDevOutlierAnalysisService">
1189
366
    <property name="organisationUnitService"
366
    <property name="organisationUnitService"
1190
367
      ref="org.hisp.dhis.organisationunit.OrganisationUnitService"/>
367
      ref="org.hisp.dhis.organisationunit.OrganisationUnitService"/>
1191
368
    <property name="dataAnalysisStore"
368
    <property name="dataAnalysisStore"
1192
369
      ref="org.hisp.dhis.dataanalysis.jdbc.DataAnalysisStore"/>
369
      ref="org.hisp.dhis.dataanalysis.jdbc.DataAnalysisStore"/>
1193
370
  </bean>
370
  </bean>
1194
371
371
1195
372
  <bean id="org.hisp.dhis.dataanalysis.MinMaxOutlierAnalysisService"
372
  <bean id="org.hisp.dhis.dataanalysis.MinMaxOutlierAnalysisService"
1196
373
    class="org.hisp.dhis.dataanalysis.MinMaxOutlierAnalysisService">
373
    class="org.hisp.dhis.dataanalysis.MinMaxOutlierAnalysisService">
1197
374
    <property name="organisationUnitService"
374
    <property name="organisationUnitService"
1198
375
      ref="org.hisp.dhis.organisationunit.OrganisationUnitService"/>
375
      ref="org.hisp.dhis.organisationunit.OrganisationUnitService"/>
1199
376
    <property name="minMaxDataElementService"
376
    <property name="minMaxDataElementService"
1200
377
      ref="org.hisp.dhis.minmax.MinMaxDataElementService" />
377
      ref="org.hisp.dhis.minmax.MinMaxDataElementService" />
1201
378
    <property name="dataAnalysisStore"
378
    <property name="dataAnalysisStore"
1202
379
      ref="org.hisp.dhis.dataanalysis.jdbc.DataAnalysisStore"/>  
379
      ref="org.hisp.dhis.dataanalysis.jdbc.DataAnalysisStore"/>  
1203
380
  </bean>
380
  </bean>
1204
381
  
381
  
1205
382
  <bean id="org.hisp.dhis.dataanalysis.GapAnalysisService"
382
  <bean id="org.hisp.dhis.dataanalysis.GapAnalysisService"
1206
383
    class="org.hisp.dhis.dataanalysis.GapAnalysisService">
383
    class="org.hisp.dhis.dataanalysis.GapAnalysisService">
1207
384
    <property name="organisationUnitService"
384
    <property name="organisationUnitService"
1208
385
      ref="org.hisp.dhis.organisationunit.OrganisationUnitService"/>
385
      ref="org.hisp.dhis.organisationunit.OrganisationUnitService"/>
1209
386
    <property name="dataAnalysisStore"
386
    <property name="dataAnalysisStore"
1210
387
      ref="org.hisp.dhis.dataanalysis.jdbc.DataAnalysisStore"/>  
387
      ref="org.hisp.dhis.dataanalysis.jdbc.DataAnalysisStore"/>  
1211
388
  </bean>
388
  </bean>
1212
389
  
389
  
1213
390
  <bean id="org.hisp.dhis.dataanalysis.FollowupAnalysisService"
390
  <bean id="org.hisp.dhis.dataanalysis.FollowupAnalysisService"
1214
391
    class="org.hisp.dhis.dataanalysis.FollowupAnalysisService">
391
    class="org.hisp.dhis.dataanalysis.FollowupAnalysisService">
1215
392
    <property name="dataAnalysisStore"
392
    <property name="dataAnalysisStore"
1216
393
      ref="org.hisp.dhis.dataanalysis.jdbc.DataAnalysisStore"/>  
393
      ref="org.hisp.dhis.dataanalysis.jdbc.DataAnalysisStore"/>  
1217
394
  </bean>
394
  </bean>
1218
395
  
395
  
1219
396
  <bean id="dataAnalysisServiceProvider"
396
  <bean id="dataAnalysisServiceProvider"
1220
397
	class="org.hisp.dhis.common.ServiceProvider">
397
	class="org.hisp.dhis.common.ServiceProvider">
1221
398
	<property name="services">
398
	<property name="services">
1222
399
		<map>
399
		<map>
1223
400
			<entry>
400
			<entry>
1224
401
				<key><value>stddevoutlier</value></key>
401
				<key><value>stddevoutlier</value></key>
1225
402
				<ref bean="org.hisp.dhis.dataanalysis.StdDevOutlierAnalysisService"/>
402
				<ref bean="org.hisp.dhis.dataanalysis.StdDevOutlierAnalysisService"/>
1226
403
			</entry>
403
			</entry>
1227
404
            <entry>
404
            <entry>
1228
405
                <key><value>minmaxoutlier</value></key>
405
                <key><value>minmaxoutlier</value></key>
1229
406
                <ref bean="org.hisp.dhis.dataanalysis.MinMaxOutlierAnalysisService"/>
406
                <ref bean="org.hisp.dhis.dataanalysis.MinMaxOutlierAnalysisService"/>
1230
407
            </entry>
407
            </entry>
1231
408
            <entry>
408
            <entry>
1232
409
                <key><value>gap</value></key>
409
                <key><value>gap</value></key>
1233
410
                <ref bean="org.hisp.dhis.dataanalysis.GapAnalysisService"/>
410
                <ref bean="org.hisp.dhis.dataanalysis.GapAnalysisService"/>
1234
411
            </entry>
411
            </entry>
1235
412
            <entry>
412
            <entry>
1236
413
                <key><value>followup</value></key>
413
                <key><value>followup</value></key>
1237
414
                <ref bean="org.hisp.dhis.dataanalysis.FollowupAnalysisService"/>
414
                <ref bean="org.hisp.dhis.dataanalysis.FollowupAnalysisService"/>
1238
415
            </entry>
415
            </entry>
1239
416
		</map>		
416
		</map>		
1661
417
	</property>
417
	</property>
1662
418
  </bean>
418
  </bean>
1663
419
  
419
  
1664
420
  <bean id="org.hisp.dhis.user.CurrentUserService"
420
  <bean id="org.hisp.dhis.user.CurrentUserService"
1665
421
    class="org.hisp.dhis.user.DefaultCurrentUserService">
421
    class="org.hisp.dhis.user.DefaultCurrentUserService">
1666
422
    <property name="userStore" ref="org.hisp.dhis.user.UserStore"/>
422
    <property name="userStore" ref="org.hisp.dhis.user.UserStore"/>
1667
423
  </bean>
423
  </bean>
1668
424
  
424
  
1669
425
  <bean id="org.hisp.dhis.user.UserSettingService"
425
  <bean id="org.hisp.dhis.user.UserSettingService"
1670
426
    class="org.hisp.dhis.user.DefaultUserSettingService">
426
    class="org.hisp.dhis.user.DefaultUserSettingService">
1671
427
    <property name="currentUserService" ref="org.hisp.dhis.user.CurrentUserService"/>
427
    <property name="currentUserService" ref="org.hisp.dhis.user.CurrentUserService"/>
1672
428
    <property name="userStore" ref="org.hisp.dhis.user.UserStore"/>
428
    <property name="userStore" ref="org.hisp.dhis.user.UserStore"/>
1673
429
  </bean>
429
  </bean>
1674
430
  
430
  
1675
431
  <bean id="org.hisp.dhis.user.UserService"
431
  <bean id="org.hisp.dhis.user.UserService"
1676
432
    class="org.hisp.dhis.user.DefaultUserService">
432
    class="org.hisp.dhis.user.DefaultUserService">
1677
433
    <property name="userStore" ref="org.hisp.dhis.user.UserStore"/>
433
    <property name="userStore" ref="org.hisp.dhis.user.UserStore"/>
1678
434
  </bean>
434
  </bean>
1679
435
  
435
  
1680
436
  <!-- Startup routine definitions -->
436
  <!-- Startup routine definitions -->
1681
437
	
437
	
1682
438
  <bean id="org.hisp.dhis.dataentryform.DataEntryFormPopulator"
438
  <bean id="org.hisp.dhis.dataentryform.DataEntryFormPopulator"
1683
439
    class="org.hisp.dhis.dataentryform.DataEntryFormPopulator">
439
    class="org.hisp.dhis.dataentryform.DataEntryFormPopulator">
1684
440
  	<property name="jdbcTemplate" ref="jdbcTemplate"/>
440
  	<property name="jdbcTemplate" ref="jdbcTemplate"/>
1685
441
  	<property name="statementBuilder" ref="statementBuilder"/>
441
  	<property name="statementBuilder" ref="statementBuilder"/>
1686
442
    <property name="runlevel" value="1"/>
442
    <property name="runlevel" value="1"/>
1687
443
  </bean>
443
  </bean>
1688
444
	
444
	
1689
445
  <bean id="org.hisp.dhis.period.PeriodTypePopulator"
445
  <bean id="org.hisp.dhis.period.PeriodTypePopulator"
1690
446
    class="org.hisp.dhis.period.PeriodTypePopulator">
446
    class="org.hisp.dhis.period.PeriodTypePopulator">
1691
447
    <property name="periodStore"
447
    <property name="periodStore"
1692
448
      ref="org.hisp.dhis.period.PeriodStore"/>
448
      ref="org.hisp.dhis.period.PeriodStore"/>
1693
449
    <property name="runlevel" value="1"/>
449
    <property name="runlevel" value="1"/>
1694
450
  </bean>
450
  </bean>
1695
451
  
451
  
1696
452
  <bean id="org.hisp.dhis.dataelement.DataElementDefaultDimensionPopulator"
452
  <bean id="org.hisp.dhis.dataelement.DataElementDefaultDimensionPopulator"
1697
453
    class="org.hisp.dhis.dataelement.DataElementDefaultDimensionPopulator">
453
    class="org.hisp.dhis.dataelement.DataElementDefaultDimensionPopulator">
1698
454
    <property name="dataElementService"
454
    <property name="dataElementService"
1699
455
      ref="org.hisp.dhis.dataelement.DataElementService"/>
455
      ref="org.hisp.dhis.dataelement.DataElementService"/>
1700
456
    <property name="categoryService"
456
    <property name="categoryService"
1701
457
      ref="org.hisp.dhis.dataelement.DataElementCategoryService"/>
457
      ref="org.hisp.dhis.dataelement.DataElementCategoryService"/>
1702
458
    <property name="runlevel" value="2"/>
458
    <property name="runlevel" value="2"/>
1703
459
  </bean>
459
  </bean>
1704
460
	  
460
	  
1705
461
  <bean id="org.hisp.dhis.dataelement.OptionsCategoriesDefaultSortOrderPopulator"
461
  <bean id="org.hisp.dhis.dataelement.OptionsCategoriesDefaultSortOrderPopulator"
1706
462
    class="org.hisp.dhis.dataelement.OptionsCategoriesDefaultSortOrderPopulator">
462
    class="org.hisp.dhis.dataelement.OptionsCategoriesDefaultSortOrderPopulator">
1707
463
    <property name="statementManager" ref="statementManager"/>
463
    <property name="statementManager" ref="statementManager"/>
1708
464
    <property name="runlevel" value="1"/>
464
    <property name="runlevel" value="1"/>
1709
465
	<property name="skipInTests" value="true"/>
465
	<property name="skipInTests" value="true"/>
1710
466
  </bean>
466
  </bean>
1711
467
	
467
	
1712
468
  <bean id="org.hisp.dhis.expression.MultiDimensionExpressionUpgrader"
468
  <bean id="org.hisp.dhis.expression.MultiDimensionExpressionUpgrader"
1713
469
    class="org.hisp.dhis.expression.MultiDimensionExpressionUpgrader">
469
    class="org.hisp.dhis.expression.MultiDimensionExpressionUpgrader">
1714
470
    <property name="expressionService"
470
    <property name="expressionService"
1715
471
      ref="org.hisp.dhis.expression.ExpressionService"/>
471
      ref="org.hisp.dhis.expression.ExpressionService"/>
1716
472
    <property name="indicatorService"
472
    <property name="indicatorService"
1717
473
      ref="org.hisp.dhis.indicator.IndicatorService"/>
473
      ref="org.hisp.dhis.indicator.IndicatorService"/>
1718
474
    <property name="categoryService"
474
    <property name="categoryService"
1719
475
      ref="org.hisp.dhis.dataelement.DataElementCategoryService"/> 
475
      ref="org.hisp.dhis.dataelement.DataElementCategoryService"/> 
1720
476
    <property name="runlevel" value="2"/>
476
    <property name="runlevel" value="2"/>
1721
477
    <property name="skipInTests" value="true"/>
477
    <property name="skipInTests" value="true"/>
1722
478
  </bean>
478
  </bean>
1723
479
  
479
  
1724
480
  <bean id="org.hisp.dhis.dataset.DataSetShortNamePopulator"
480
  <bean id="org.hisp.dhis.dataset.DataSetShortNamePopulator"
1725
481
    class="org.hisp.dhis.dataset.DataSetShortNamePopulator">
481
    class="org.hisp.dhis.dataset.DataSetShortNamePopulator">
1726
482
    <property name="dataSetService"
482
    <property name="dataSetService"
1727
483
      ref="org.hisp.dhis.dataset.DataSetService"/>    
483
      ref="org.hisp.dhis.dataset.DataSetService"/>    
1728
484
    <property name="skipInTests" value="true"/>
484
    <property name="skipInTests" value="true"/>
1729
485
  </bean>
485
  </bean>
1730
486
  
486
  
1731
487
  <bean id="org.hisp.dhis.dataelement.UuidPopulator"
487
  <bean id="org.hisp.dhis.dataelement.UuidPopulator"
1732
488
    class="org.hisp.dhis.dataelement.UuidPopulator">
488
    class="org.hisp.dhis.dataelement.UuidPopulator">
1733
489
    <property name="categoryService"
489
    <property name="categoryService"
1734
490
      ref="org.hisp.dhis.dataelement.DataElementCategoryService"/>
490
      ref="org.hisp.dhis.dataelement.DataElementCategoryService"/>
1735
491
    <property name="dataElementService"
491
    <property name="dataElementService"
1736
492
      ref="org.hisp.dhis.dataelement.DataElementService"/>
492
      ref="org.hisp.dhis.dataelement.DataElementService"/>
1737
493
    <property name="skipInTests" value="true"/>
493
    <property name="skipInTests" value="true"/>
1738
494
  </bean>
494
  </bean>
1739
495
  
495
  
1740
496
  <bean id="org.hisp.dhis.organisationunit.OrganisationUnitHierarchyVerifier"
496
  <bean id="org.hisp.dhis.organisationunit.OrganisationUnitHierarchyVerifier"
1741
497
    class="org.hisp.dhis.organisationunit.OrganisationUnitHierarchyVerifier">
497
    class="org.hisp.dhis.organisationunit.OrganisationUnitHierarchyVerifier">
1742
498
    <property name="organisationUnitService"
498
    <property name="organisationUnitService"
1743
499
      ref="org.hisp.dhis.organisationunit.OrganisationUnitService"/>
499
      ref="org.hisp.dhis.organisationunit.OrganisationUnitService"/>
1744
500
  </bean>
500
  </bean>
1745
501
  
501
  
1746
502
  <bean id="org.hisp.dhis.organisationunit.OrganisationUnitGroupSetPopulator"
502
  <bean id="org.hisp.dhis.organisationunit.OrganisationUnitGroupSetPopulator"
1747
503
    class="org.hisp.dhis.organisationunit.OrganisationUnitGroupSetPopulator">
503
    class="org.hisp.dhis.organisationunit.OrganisationUnitGroupSetPopulator">
1748
504
    <property name="organisationUnitGroupService"
504
    <property name="organisationUnitGroupService"
1749
505
      ref="org.hisp.dhis.organisationunit.OrganisationUnitGroupService"/>
505
      ref="org.hisp.dhis.organisationunit.OrganisationUnitGroupService"/>
1750
506
    <property name="skipInTests" value="true"/>
506
    <property name="skipInTests" value="true"/>
1751
507
  </bean>
507
  </bean>
1752
508
    
508
    
1753
509
  <bean class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
509
  <bean class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
1754
510
    <property name="targetObject"
510
    <property name="targetObject"
1755
511
      ref="org.hisp.dhis.system.startup.StartupRoutineExecutor"/>
511
      ref="org.hisp.dhis.system.startup.StartupRoutineExecutor"/>
1756
512
    <property name="targetMethod" value="addStartupRoutines"/>
512
    <property name="targetMethod" value="addStartupRoutines"/>
1757
513
    <property name="arguments">
513
    <property name="arguments">
1758
514
      <list>
514
      <list>
1759
515
        <list>
515
        <list>
1760
516
          <ref local="org.hisp.dhis.dataelement.OptionsCategoriesDefaultSortOrderPopulator"/>
516
          <ref local="org.hisp.dhis.dataelement.OptionsCategoriesDefaultSortOrderPopulator"/>
1761
517
          <ref local="org.hisp.dhis.period.PeriodTypePopulator"/>
517
          <ref local="org.hisp.dhis.period.PeriodTypePopulator"/>
1762
518
          <ref local="org.hisp.dhis.dataelement.DataElementDefaultDimensionPopulator"/>
518
          <ref local="org.hisp.dhis.dataelement.DataElementDefaultDimensionPopulator"/>
1763
519
          <ref local="org.hisp.dhis.expression.MultiDimensionExpressionUpgrader"/>
519
          <ref local="org.hisp.dhis.expression.MultiDimensionExpressionUpgrader"/>
1764
520
          <ref local="org.hisp.dhis.dataset.DataSetShortNamePopulator"/>
520
          <ref local="org.hisp.dhis.dataset.DataSetShortNamePopulator"/>
1765
521
          <ref local="org.hisp.dhis.dataelement.UuidPopulator"/>
521
          <ref local="org.hisp.dhis.dataelement.UuidPopulator"/>
1766
522
		  <ref local="org.hisp.dhis.organisationunit.OrganisationUnitHierarchyVerifier"/>
522
		  <ref local="org.hisp.dhis.organisationunit.OrganisationUnitHierarchyVerifier"/>
1767
523
          <ref local="org.hisp.dhis.organisationunit.OrganisationUnitGroupSetPopulator"/>
523
          <ref local="org.hisp.dhis.organisationunit.OrganisationUnitGroupSetPopulator"/>
1768
524
          <ref local="org.hisp.dhis.dataentryform.DataEntryFormPopulator"/>
524
          <ref local="org.hisp.dhis.dataentryform.DataEntryFormPopulator"/>
1769
525
        </list>
525
        </list>
1770
526
      </list>
526
      </list>
1771
527
    </property>
527
    </property>
1772
528
  </bean>
528
  </bean>
1773
529
529
1774
530
  <!-- DeletionHandlers -->
530
  <!-- DeletionHandlers -->
1775
531
  
531
  
1776
532
  <bean id="org.hisp.dhis.dataentryform.DataEntryFormDeletionHandler"
532
  <bean id="org.hisp.dhis.dataentryform.DataEntryFormDeletionHandler"
1777
533
    class="org.hisp.dhis.dataentryform.DataEntryFormDeletionHandler">
533
    class="org.hisp.dhis.dataentryform.DataEntryFormDeletionHandler">
1778
534
    <property name="dataEntryFormService"
534
    <property name="dataEntryFormService"
1779
535
      ref="org.hisp.dhis.dataentryform.DataEntryFormService"/>
535
      ref="org.hisp.dhis.dataentryform.DataEntryFormService"/>
1780
536
    <property name="deletionManager"
536
    <property name="deletionManager"
1781
537
      ref="org.hisp.dhis.system.deletion.DeletionManager"/>
537
      ref="org.hisp.dhis.system.deletion.DeletionManager"/>
1782
538
    <property name="dataEntryFormAssociationService"
538
    <property name="dataEntryFormAssociationService"
1783
539
      ref="org.hisp.dhis.dataentryform.DataEntryFormAssociationService"/>
539
      ref="org.hisp.dhis.dataentryform.DataEntryFormAssociationService"/>
1784
540
  </bean>
540
  </bean>
1785
541
    
541
    
1786
542
  <bean id="org.hisp.dhis.datadictionary.DataDictionaryDeletionHandler"
542
  <bean id="org.hisp.dhis.datadictionary.DataDictionaryDeletionHandler"
1787
543
    class="org.hisp.dhis.datadictionary.DataDictionaryDeletionHandler">
543
    class="org.hisp.dhis.datadictionary.DataDictionaryDeletionHandler">
1788
544
    <property name="dataDictionaryService"
544
    <property name="dataDictionaryService"
1789
545
      ref="org.hisp.dhis.datadictionary.DataDictionaryService"/>
545
      ref="org.hisp.dhis.datadictionary.DataDictionaryService"/>
1790
546
  </bean>
546
  </bean>
1791
547
	
547
	
1792
548
  <bean id="org.hisp.dhis.dataelement.DataElementDeletionHandler"
548
  <bean id="org.hisp.dhis.dataelement.DataElementDeletionHandler"
1793
549
    class="org.hisp.dhis.dataelement.DataElementDeletionHandler">
549
    class="org.hisp.dhis.dataelement.DataElementDeletionHandler">
1794
550
    <property name="dataElementService"
550
    <property name="dataElementService"
1795
551
      ref="org.hisp.dhis.dataelement.DataElementService"/>
551
      ref="org.hisp.dhis.dataelement.DataElementService"/>
1796
552
    <property name="categoryService"
552
    <property name="categoryService"
1797
553
      ref="org.hisp.dhis.dataelement.DataElementCategoryService"/>
553
      ref="org.hisp.dhis.dataelement.DataElementCategoryService"/>
1798
554
  </bean>
554
  </bean>
1799
555
	
555
	
1800
556
  <bean id="org.hisp.dhis.dataelement.DataElementGroupDeletionHandler"
556
  <bean id="org.hisp.dhis.dataelement.DataElementGroupDeletionHandler"
1801
557
    class="org.hisp.dhis.dataelement.DataElementGroupDeletionHandler">
557
    class="org.hisp.dhis.dataelement.DataElementGroupDeletionHandler">
1802
558
    <property name="dataElementService"
558
    <property name="dataElementService"
1803
559
      ref="org.hisp.dhis.dataelement.DataElementService"/>
559
      ref="org.hisp.dhis.dataelement.DataElementService"/>
1804
560
  </bean>  
560
  </bean>  
1805
561
  
561
  
1806
562
  <bean id="org.hisp.dhis.dataelement.DataElementCategoryOptionDeletionHandler"
562
  <bean id="org.hisp.dhis.dataelement.DataElementCategoryOptionDeletionHandler"
1807
563
    class="org.hisp.dhis.dataelement.DataElementCategoryOptionDeletionHandler">
563
    class="org.hisp.dhis.dataelement.DataElementCategoryOptionDeletionHandler">
1808
564
    <property name="categoryService"
564
    <property name="categoryService"
1809
565
      ref="org.hisp.dhis.dataelement.DataElementCategoryService"/>
565
      ref="org.hisp.dhis.dataelement.DataElementCategoryService"/>
1810
566
  </bean>
566
  </bean>
1811
567
  
567
  
1812
568
  <bean id="org.hisp.dhis.dataelement.DataElementCategoryOptionComboDeletionHandler"
568
  <bean id="org.hisp.dhis.dataelement.DataElementCategoryOptionComboDeletionHandler"
1813
569
    class="org.hisp.dhis.dataelement.DataElementCategoryOptionComboDeletionHandler">
569
    class="org.hisp.dhis.dataelement.DataElementCategoryOptionComboDeletionHandler">
1814
570
    <property name="categoryService"
570
    <property name="categoryService"
1815
571
      ref="org.hisp.dhis.dataelement.DataElementCategoryService"/>
571
      ref="org.hisp.dhis.dataelement.DataElementCategoryService"/>
1816
572
  </bean>
572
  </bean>
1817
573
  
573
  
1818
574
  <bean id="org.hisp.dhis.dataelement.DataElementCategoryComboDeletionHandler"
574
  <bean id="org.hisp.dhis.dataelement.DataElementCategoryComboDeletionHandler"
1819
575
    class="org.hisp.dhis.dataelement.DataElementCategoryComboDeletionHandler">
575
    class="org.hisp.dhis.dataelement.DataElementCategoryComboDeletionHandler">
1820
576
    <property name="categoryService"
576
    <property name="categoryService"
1821
577
      ref="org.hisp.dhis.dataelement.DataElementCategoryService"/>
577
      ref="org.hisp.dhis.dataelement.DataElementCategoryService"/>
1822
578
  </bean>
578
  </bean>
1823
579
  
579
  
1824
580
  <bean id="org.hisp.dhis.dataset.DataSetDeletionHandler"
580
  <bean id="org.hisp.dhis.dataset.DataSetDeletionHandler"
1825
581
    class="org.hisp.dhis.dataset.DataSetDeletionHandler">
581
    class="org.hisp.dhis.dataset.DataSetDeletionHandler">
1826
582
    <property name="dataSetService"
582
    <property name="dataSetService"
1827
583
      ref="org.hisp.dhis.dataset.DataSetService"/>
583
      ref="org.hisp.dhis.dataset.DataSetService"/>
1828
584
  </bean>
584
  </bean>
1829
585
  
585
  
1830
586
  <bean id="org.hisp.dhis.dataset.CompleteDataSetRegistrationDeletionHandler"
586
  <bean id="org.hisp.dhis.dataset.CompleteDataSetRegistrationDeletionHandler"
1831
587
    class="org.hisp.dhis.dataset.CompleteDataSetRegistrationDeletionHandler">
587
    class="org.hisp.dhis.dataset.CompleteDataSetRegistrationDeletionHandler">
1832
588
    <property name="completeDataSetRegistrationService"
588
    <property name="completeDataSetRegistrationService"
1833
589
      ref="org.hisp.dhis.dataset.CompleteDataSetRegistrationService"/>
589
      ref="org.hisp.dhis.dataset.CompleteDataSetRegistrationService"/>
1834
590
    <property name="jdbcTemplate" ref="jdbcTemplate"/>
590
    <property name="jdbcTemplate" ref="jdbcTemplate"/>
1835
591
  </bean>
591
  </bean>
1836
592
  
592
  
1837
593
  <bean id="org.hisp.dhis.dataset.SectionDeletionHandler"
593
  <bean id="org.hisp.dhis.dataset.SectionDeletionHandler"
1838
594
    class="org.hisp.dhis.dataset.SectionDeletionHandler">
594
    class="org.hisp.dhis.dataset.SectionDeletionHandler">
1839
595
    <property name="sectionService"
595
    <property name="sectionService"
1840
596
      ref="org.hisp.dhis.dataset.SectionService"/>
596
      ref="org.hisp.dhis.dataset.SectionService"/>
1841
597
    <property name="deletionManager"
597
    <property name="deletionManager"
1842
598
      ref="org.hisp.dhis.system.deletion.DeletionManager"/>
598
      ref="org.hisp.dhis.system.deletion.DeletionManager"/>
1843
599
  </bean>
599
  </bean>
1844
600
  
600
  
1845
601
  <bean id="org.hisp.dhis.dataset.FrequencyOverrideAssociationDeletionHandler"
601
  <bean id="org.hisp.dhis.dataset.FrequencyOverrideAssociationDeletionHandler"
1846
602
    class="org.hisp.dhis.dataset.FrequencyOverrideAssociationDeletionHandler">
602
    class="org.hisp.dhis.dataset.FrequencyOverrideAssociationDeletionHandler">
1847
603
    <property name="dataSetService"
603
    <property name="dataSetService"
1848
604
      ref="org.hisp.dhis.dataset.DataSetService"/>
604
      ref="org.hisp.dhis.dataset.DataSetService"/>
1849
605
    <property name="deletionManager"
605
    <property name="deletionManager"
1850
606
      ref="org.hisp.dhis.system.deletion.DeletionManager"/>
606
      ref="org.hisp.dhis.system.deletion.DeletionManager"/>
1851
607
  </bean>
607
  </bean>
1852
608
  
608
  
1853
609
  <bean id="org.hisp.dhis.expression.ExpressionDeletionHandler"
609
  <bean id="org.hisp.dhis.expression.ExpressionDeletionHandler"
1854
610
    class="org.hisp.dhis.expression.ExpressionDeletionHandler">
610
    class="org.hisp.dhis.expression.ExpressionDeletionHandler">
1855
611
    <property name="expressionService"
611
    <property name="expressionService"
1856
612
      ref="org.hisp.dhis.expression.ExpressionService"/>
612
      ref="org.hisp.dhis.expression.ExpressionService"/>
1857
613
  </bean>
613
  </bean>
1858
614
  
614
  
1859
615
  <bean id="org.hisp.dhis.indicator.IndicatorDeletionHandler"
615
  <bean id="org.hisp.dhis.indicator.IndicatorDeletionHandler"
1860
616
    class="org.hisp.dhis.indicator.IndicatorDeletionHandler">
616
    class="org.hisp.dhis.indicator.IndicatorDeletionHandler">
1861
617
    <property name="indicatorService"
617
    <property name="indicatorService"
1862
618
      ref="org.hisp.dhis.indicator.IndicatorService"/>
618
      ref="org.hisp.dhis.indicator.IndicatorService"/>
1863
619
    <property name="deletionManager"
619
    <property name="deletionManager"
1864
620
      ref="org.hisp.dhis.system.deletion.DeletionManager"/>
620
      ref="org.hisp.dhis.system.deletion.DeletionManager"/>
1865
621
  </bean>
621
  </bean>
1866
622
  
622
  
1867
623
  <bean id="org.hisp.dhis.indicator.IndicatorGroupDeletionHandler"
623
  <bean id="org.hisp.dhis.indicator.IndicatorGroupDeletionHandler"
1868
624
    class="org.hisp.dhis.indicator.IndicatorGroupDeletionHandler">
624
    class="org.hisp.dhis.indicator.IndicatorGroupDeletionHandler">
1869
625
    <property name="indicatorService"
625
    <property name="indicatorService"
1870
626
      ref="org.hisp.dhis.indicator.IndicatorService"/>
626
      ref="org.hisp.dhis.indicator.IndicatorService"/>
1871
627
  </bean>
627
  </bean>
1872
628
  
628
  
1873
629
  <bean id="org.hisp.dhis.minmax.MinMaxDataElementDeletionHandler"
629
  <bean id="org.hisp.dhis.minmax.MinMaxDataElementDeletionHandler"
1874
630
    class="org.hisp.dhis.minmax.MinMaxDataElementDeletionHandler">
630
    class="org.hisp.dhis.minmax.MinMaxDataElementDeletionHandler">
1875
631
    <property name="minMaxDataElementService"
631
    <property name="minMaxDataElementService"
1876
632
      ref="org.hisp.dhis.minmax.MinMaxDataElementService"/>
632
      ref="org.hisp.dhis.minmax.MinMaxDataElementService"/>
1877
633
    <property name="deletionManager"
633
    <property name="deletionManager"
1878
634
      ref="org.hisp.dhis.system.deletion.DeletionManager"/>
634
      ref="org.hisp.dhis.system.deletion.DeletionManager"/>
1879
635
  </bean>
635
  </bean>
1880
636
  
636
  
1881
637
  <bean id="org.hisp.dhis.validation.ValidationRuleDeletionHandler"
637
  <bean id="org.hisp.dhis.validation.ValidationRuleDeletionHandler"
1882
638
    class="org.hisp.dhis.validation.ValidationRuleDeletionHandler">
638
    class="org.hisp.dhis.validation.ValidationRuleDeletionHandler">
1883
639
    <property name="validationRuleService"
639
    <property name="validationRuleService"
1884
640
      ref="org.hisp.dhis.validation.ValidationRuleService"/>
640
      ref="org.hisp.dhis.validation.ValidationRuleService"/>
1885
641
    <property name="deletionManager"
641
    <property name="deletionManager"
1886
642
      ref="org.hisp.dhis.system.deletion.DeletionManager"/>
642
      ref="org.hisp.dhis.system.deletion.DeletionManager"/>
1887
643
  </bean>
643
  </bean>
1888
644
  
644
  
1889
645
  <bean id="org.hisp.dhis.validation.ValidationRuleGroupDeletionHandler"
645
  <bean id="org.hisp.dhis.validation.ValidationRuleGroupDeletionHandler"
1890
646
    class="org.hisp.dhis.validation.ValidationRuleGroupDeletionHandler">
646
    class="org.hisp.dhis.validation.ValidationRuleGroupDeletionHandler">
1891
647
    <property name="validationRuleService"
647
    <property name="validationRuleService"
1892
648
      ref="org.hisp.dhis.validation.ValidationRuleService"/>
648
      ref="org.hisp.dhis.validation.ValidationRuleService"/>
1893
649
  </bean>
649
  </bean>
1894
650
  
650
  
1895
651
  <bean id="org.hisp.dhis.datavalue.DataValueDeletionHandler"
651
  <bean id="org.hisp.dhis.datavalue.DataValueDeletionHandler"
1896
652
    class="org.hisp.dhis.datavalue.DataValueDeletionHandler">
652
    class="org.hisp.dhis.datavalue.DataValueDeletionHandler">
1897
653
    <property name="jdbcTemplate" ref="jdbcTemplate"/>
653
    <property name="jdbcTemplate" ref="jdbcTemplate"/>
1898
654
  </bean>
654
  </bean>
1899
655
  
655
  
1900
656
  <bean id="org.hisp.dhis.organisationunit.OrganisationUnitGroupDeletionHandler"
656
  <bean id="org.hisp.dhis.organisationunit.OrganisationUnitGroupDeletionHandler"
1901
657
    class="org.hisp.dhis.organisationunit.OrganisationUnitGroupDeletionHandler">
657
    class="org.hisp.dhis.organisationunit.OrganisationUnitGroupDeletionHandler">
1902
658
    <property name="organisationUnitGroupService"
658
    <property name="organisationUnitGroupService"
1903
659
      ref="org.hisp.dhis.organisationunit.OrganisationUnitGroupService"/>
659
      ref="org.hisp.dhis.organisationunit.OrganisationUnitGroupService"/>
1904
660
  </bean>
660
  </bean>
1905
661
  
661
  
1906
662
  <bean id="org.hisp.dhis.organisationunit.OrganisationUnitGroupSetDeletionHandler"
662
  <bean id="org.hisp.dhis.organisationunit.OrganisationUnitGroupSetDeletionHandler"
1907
663
    class="org.hisp.dhis.organisationunit.OrganisationUnitGroupSetDeletionHandler">
663
    class="org.hisp.dhis.organisationunit.OrganisationUnitGroupSetDeletionHandler">
1908
664
    <property name="organisationUnitGroupService"
664
    <property name="organisationUnitGroupService"
1909
665
      ref="org.hisp.dhis.organisationunit.OrganisationUnitGroupService"/>
665
      ref="org.hisp.dhis.organisationunit.OrganisationUnitGroupService"/>
1910
666
  </bean>
666
  </bean>
1911
667
  
667
  
1912
668
  <bean id="org.hisp.dhis.datavalue.DataValueAuditDeletionHandler"
668
  <bean id="org.hisp.dhis.datavalue.DataValueAuditDeletionHandler"
1913
669
    class="org.hisp.dhis.datavalue.DataValueAuditDeletionHandler">
669
    class="org.hisp.dhis.datavalue.DataValueAuditDeletionHandler">
1914
670
    <property name="dataValueAuditService"
670
    <property name="dataValueAuditService"
1915
671
      ref="org.hisp.dhis.datavalue.DataValueAuditService"/>
671
      ref="org.hisp.dhis.datavalue.DataValueAuditService"/>
1916
672
  </bean>
672
  </bean>
1917
673
673
1918
674
  <bean id="org.hisp.dhis.user.UserDeletionHandler"
674
  <bean id="org.hisp.dhis.user.UserDeletionHandler"
1919
675
    class="org.hisp.dhis.user.UserDeletionHandler">
675
    class="org.hisp.dhis.user.UserDeletionHandler">
1920
676
    <property name="userStore"
676
    <property name="userStore"
1921
677
      ref="org.hisp.dhis.user.UserStore"/>
677
      ref="org.hisp.dhis.user.UserStore"/>
1922
678
  </bean>
678
  </bean>
1923
679
  
679
  
1924
680
  <bean id="org.hisp.dhis.user.UserAuthorityGroupDeletionHandler"
680
  <bean id="org.hisp.dhis.user.UserAuthorityGroupDeletionHandler"
1925
681
    class="org.hisp.dhis.user.UserAuthorityGroupDeletionHandler">
681
    class="org.hisp.dhis.user.UserAuthorityGroupDeletionHandler">
1926
682
    <property name="userStore"
682
    <property name="userStore"
1927
683
      ref="org.hisp.dhis.user.UserStore"/>
683
      ref="org.hisp.dhis.user.UserStore"/>
1928
684
  </bean>
684
  </bean>
1929
685
  
685
  
1930
686
  <bean id="org.hisp.dhis.user.UserCredentialsDeletionHandler"
686
  <bean id="org.hisp.dhis.user.UserCredentialsDeletionHandler"
1931
687
    class="org.hisp.dhis.user.UserCredentialsDeletionHandler">
687
    class="org.hisp.dhis.user.UserCredentialsDeletionHandler">
1932
688
    <property name="userStore"
688
    <property name="userStore"
1933
689
      ref="org.hisp.dhis.user.UserStore"/>
689
      ref="org.hisp.dhis.user.UserStore"/>
1934
690
  </bean>
690
  </bean>
1935
691
  
691
  
1936
692
  <bean id="org.hisp.dhis.user.UserSettingDeletionHandler"
692
  <bean id="org.hisp.dhis.user.UserSettingDeletionHandler"
1937
693
    class="org.hisp.dhis.user.UserSettingDeletionHandler">
693
    class="org.hisp.dhis.user.UserSettingDeletionHandler">
1938
694
    <property name="userSettingService"
694
    <property name="userSettingService"
1939
695
      ref="org.hisp.dhis.user.UserSettingService"/>
695
      ref="org.hisp.dhis.user.UserSettingService"/>
1940
696
  </bean>
696
  </bean>
1941
697
  
697
  
1942
698
  <!-- Security -->
698
  <!-- Security -->
1943
699
  
699
  
1944
700
  <bean id="org.hisp.dhis.security.PasswordManager"
700
  <bean id="org.hisp.dhis.security.PasswordManager"
1945
701
    class="org.hisp.dhis.security.spring.SpringSecurityPasswordManager">
701
    class="org.hisp.dhis.security.spring.SpringSecurityPasswordManager">
1946
702
    <property name="passwordEncoder" ref="passwordEncoder"/>
702
    <property name="passwordEncoder" ref="passwordEncoder"/>
1947
703
    <property name="usernameSaltSource" ref="usernameSaltSource"/>
703
    <property name="usernameSaltSource" ref="usernameSaltSource"/>
1948
704
  </bean>
704
  </bean>
1949
705
  
705
  
1950
706
  <bean id="authenticationManager"
706
  <bean id="authenticationManager"
1951
707
    class="org.springframework.security.providers.ProviderManager">
707
    class="org.springframework.security.authentication.ProviderManager">
1952
708
    <property name="providers">
708
    <property name="providers">
1953
709
      <list>
709
      <list>
1954
710
        <ref local="daoAuthenticationProvider"/>
710
        <ref local="daoAuthenticationProvider"/>
1955
711
      </list>
711
      </list>
1956
712
    </property>
712
    </property>
1957
713
  </bean>
713
  </bean>
1958
714
  
714
  
1959
715
  <bean id="daoAuthenticationProvider"
715
  <bean id="daoAuthenticationProvider"
1960
716
    class="org.springframework.security.providers.dao.DaoAuthenticationProvider">
716
    class="org.springframework.security.authentication.dao.DaoAuthenticationProvider">
1961
717
    <property name="userDetailsService" ref="userDetailsService"/>
717
    <property name="userDetailsService" ref="userDetailsService"/>
1962
718
    <property name="passwordEncoder" ref="passwordEncoder"/>
718
    <property name="passwordEncoder" ref="passwordEncoder"/>
1963
719
    <property name="saltSource" ref="usernameSaltSource"/>
719
    <property name="saltSource" ref="usernameSaltSource"/>
1964
720
  </bean>
720
  </bean>
1965
721
  
721
  
1966
722
  <bean id="userDetailsService"
722
  <bean id="userDetailsService"
1967
723
    class="org.hisp.dhis.security.hibernate.HibernateUserDetailsService">
723
    class="org.hisp.dhis.security.hibernate.HibernateUserDetailsService">
1968
724
    <property name="sessionFactory" ref="sessionFactory"/>
724
    <property name="sessionFactory" ref="sessionFactory"/>
1969
725
  </bean>
725
  </bean>
1970
726
  
726
  
1971
727
  <bean id="passwordEncoder"
727
  <bean id="passwordEncoder"
1972
728
    class="org.springframework.security.providers.encoding.Md5PasswordEncoder"/>
728
    class="org.springframework.security.authentication.encoding.Md5PasswordEncoder"/>
1973
729
  
729
  
1974
730
  <bean id="usernameSaltSource"
730
  <bean id="usernameSaltSource"
1975
731
    class="org.hisp.dhis.security.DefaultUsernameSaltSource"/>
731
    class="org.hisp.dhis.security.DefaultUsernameSaltSource"/>
1976
732
732
1977
733
  <!-- DeletionManager -->
733
  <!-- DeletionManager -->
1978
734
  
734
  
1979
735
  <bean class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
735
  <bean class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
1980
736
    <property name="targetObject" ref="org.hisp.dhis.system.deletion.DeletionManager"/>
736
    <property name="targetObject" ref="org.hisp.dhis.system.deletion.DeletionManager"/>
1981
737
    <property name="targetMethod" value="addDeletionHandlers"/>
737
    <property name="targetMethod" value="addDeletionHandlers"/>
1982
738
    <property name="arguments">
738
    <property name="arguments">
1983
739
	  <list>
739
	  <list>
1984
740
        <list>
740
        <list>
1985
741
          <ref local="org.hisp.dhis.datadictionary.DataDictionaryDeletionHandler"/>
741
          <ref local="org.hisp.dhis.datadictionary.DataDictionaryDeletionHandler"/>
1986
742
          <ref local="org.hisp.dhis.dataelement.DataElementDeletionHandler"/>
742
          <ref local="org.hisp.dhis.dataelement.DataElementDeletionHandler"/>
1987
743
          <ref local="org.hisp.dhis.dataelement.DataElementGroupDeletionHandler"/>
743
          <ref local="org.hisp.dhis.dataelement.DataElementGroupDeletionHandler"/>
1988
744
          <ref local="org.hisp.dhis.dataelement.DataElementCategoryOptionDeletionHandler"/>        
744
          <ref local="org.hisp.dhis.dataelement.DataElementCategoryOptionDeletionHandler"/>        
1989
745
          <ref local="org.hisp.dhis.dataelement.DataElementCategoryOptionComboDeletionHandler"/>
745
          <ref local="org.hisp.dhis.dataelement.DataElementCategoryOptionComboDeletionHandler"/>
1990
746
          <ref local="org.hisp.dhis.dataelement.DataElementCategoryComboDeletionHandler"/>
746
          <ref local="org.hisp.dhis.dataelement.DataElementCategoryComboDeletionHandler"/>
1991
747
          <ref local="org.hisp.dhis.dataset.DataSetDeletionHandler"/>
747
          <ref local="org.hisp.dhis.dataset.DataSetDeletionHandler"/>
1992
748
          <ref local="org.hisp.dhis.dataset.CompleteDataSetRegistrationDeletionHandler"/>
748
          <ref local="org.hisp.dhis.dataset.CompleteDataSetRegistrationDeletionHandler"/>
1993
749
          <ref local="org.hisp.dhis.dataset.SectionDeletionHandler"/>
749
          <ref local="org.hisp.dhis.dataset.SectionDeletionHandler"/>
1994
750
          <ref local="org.hisp.dhis.dataentryform.DataEntryFormDeletionHandler"/>
750
          <ref local="org.hisp.dhis.dataentryform.DataEntryFormDeletionHandler"/>
1995
751
          <ref local="org.hisp.dhis.dataset.FrequencyOverrideAssociationDeletionHandler"/>
751
          <ref local="org.hisp.dhis.dataset.FrequencyOverrideAssociationDeletionHandler"/>
1996
752
          <ref local="org.hisp.dhis.expression.ExpressionDeletionHandler"/>
752
          <ref local="org.hisp.dhis.expression.ExpressionDeletionHandler"/>
1997
753
          <ref local="org.hisp.dhis.indicator.IndicatorDeletionHandler"/>
753
          <ref local="org.hisp.dhis.indicator.IndicatorDeletionHandler"/>
1998
754
          <ref local="org.hisp.dhis.indicator.IndicatorGroupDeletionHandler"/>
754
          <ref local="org.hisp.dhis.indicator.IndicatorGroupDeletionHandler"/>
1999
755
          <ref local="org.hisp.dhis.minmax.MinMaxDataElementDeletionHandler"/>
755
          <ref local="org.hisp.dhis.minmax.MinMaxDataElementDeletionHandler"/>
2000
756
          <ref local="org.hisp.dhis.validation.ValidationRuleDeletionHandler"/>
756
          <ref local="org.hisp.dhis.validation.ValidationRuleDeletionHandler"/>
2001
757
          <ref local="org.hisp.dhis.validation.ValidationRuleGroupDeletionHandler"/>
757
          <ref local="org.hisp.dhis.validation.ValidationRuleGroupDeletionHandler"/>
2002
758
          <ref local="org.hisp.dhis.datavalue.DataValueDeletionHandler"/>
758
          <ref local="org.hisp.dhis.datavalue.DataValueDeletionHandler"/>
2003
759
		  <ref local="org.hisp.dhis.datavalue.DataValueAuditDeletionHandler"/>
759
		  <ref local="org.hisp.dhis.datavalue.DataValueAuditDeletionHandler"/>
2004
760
          <ref local="org.hisp.dhis.organisationunit.OrganisationUnitGroupDeletionHandler"/>
760
          <ref local="org.hisp.dhis.organisationunit.OrganisationUnitGroupDeletionHandler"/>
2005
761
          <ref local="org.hisp.dhis.organisationunit.OrganisationUnitGroupSetDeletionHandler"/>
761
          <ref local="org.hisp.dhis.organisationunit.OrganisationUnitGroupSetDeletionHandler"/>
2006
762
		  <ref local="org.hisp.dhis.user.UserDeletionHandler"/>
762
		  <ref local="org.hisp.dhis.user.UserDeletionHandler"/>
2007
763
          <ref local="org.hisp.dhis.user.UserAuthorityGroupDeletionHandler"/>
763
          <ref local="org.hisp.dhis.user.UserAuthorityGroupDeletionHandler"/>
2008
764
          <ref local="org.hisp.dhis.user.UserCredentialsDeletionHandler"/>
764
          <ref local="org.hisp.dhis.user.UserCredentialsDeletionHandler"/>
2009
765
          <ref local="org.hisp.dhis.user.UserSettingDeletionHandler"/>
765
          <ref local="org.hisp.dhis.user.UserSettingDeletionHandler"/>
2010
766
        </list>
766
        </list>
2011
767
      </list>
767
      </list>
2012
768
    </property>
768
    </property>
2013
769
  </bean>
769
  </bean>
2014
770
  
770
  
2015
771
  <!-- Startup -->
771
  <!-- Startup -->
2016
772
  
772
  
2017
773
  <bean id="org.hisp.dhis.startup.TableCreator"
773
  <bean id="org.hisp.dhis.startup.TableCreator"
2018
774
    class="org.hisp.dhis.startup.TableCreator">
774
    class="org.hisp.dhis.startup.TableCreator">
2019
775
    <property name="runlevel" value="3"/>
775
    <property name="runlevel" value="3"/>
2020
776
    <property name="jdbcTemplate" ref="jdbcTemplate"/>
776
    <property name="jdbcTemplate" ref="jdbcTemplate"/>
2021
777
    <property name="statementBuilder" ref="statementBuilder"/>
777
    <property name="statementBuilder" ref="statementBuilder"/>
2022
778
  </bean>
778
  </bean>
2023
779
    
779
    
2024
780
  <bean class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
780
  <bean class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
2025
781
    <property name="targetObject"
781
    <property name="targetObject"
2026
782
      ref="org.hisp.dhis.system.startup.StartupRoutineExecutor"/>
782
      ref="org.hisp.dhis.system.startup.StartupRoutineExecutor"/>
2027
783
    <property name="targetMethod" value="addStartupRoutines"/>
783
    <property name="targetMethod" value="addStartupRoutines"/>
2028
784
    <property name="arguments">
784
    <property name="arguments">
2029
785
      <list>
785
      <list>
2030
786
        <ref local="org.hisp.dhis.startup.TableCreator"/>
786
        <ref local="org.hisp.dhis.startup.TableCreator"/>
2031
787
      </list>
787
      </list>
2032
788
    </property>
788
    </property>
2033
789
  </bean>
789
  </bean>
2034
790
  
790
  
2035
791
  <!-- Min/Max validation -->
791
  <!-- Min/Max validation -->
2036
792
  
792
  
2037
793
 <bean id="org.hisp.dhis.minmax.validation.MinMaxValuesGenerationService"
793
 <bean id="org.hisp.dhis.minmax.validation.MinMaxValuesGenerationService"
2038
794
    class="org.hisp.dhis.minmax.validation.DefaultMinMaxValuesGenerationService">
794
    class="org.hisp.dhis.minmax.validation.DefaultMinMaxValuesGenerationService">
2039
795
    <property name="dataAnalysisStore"
795
    <property name="dataAnalysisStore"
2040
796
      ref="org.hisp.dhis.dataanalysis.jdbc.DataAnalysisStore"/>
796
      ref="org.hisp.dhis.dataanalysis.jdbc.DataAnalysisStore"/>
2041
797
  </bean>
797
  </bean>
2042
798
  
798
  
2043
799
  <!-- AOP definitions -->
799
  <!-- AOP definitions -->
2044
800
  
800
  
2045
801
  <aop:config>
801
  <aop:config>
2046
802
  
802
  
2047
803
    <aop:aspect ref="deletionInterceptor">      
803
    <aop:aspect ref="deletionInterceptor">      
2048
804
      <aop:before pointcut="execution( * org.hisp.dhis.datadictionary.DataDictionaryService.delete*(..) )" method="intercept"/>
804
      <aop:before pointcut="execution( * org.hisp.dhis.datadictionary.DataDictionaryService.delete*(..) )" method="intercept"/>
2049
805
      <aop:before pointcut="execution( * org.hisp.dhis.dataelement.DataElementService.delete*(..) )" method="intercept"/>
805
      <aop:before pointcut="execution( * org.hisp.dhis.dataelement.DataElementService.delete*(..) )" method="intercept"/>
2050
806
      <aop:before pointcut="execution( * org.hisp.dhis.dataelement.DataElementCategoryService.delete*(..) )" method="intercept"/>
806
      <aop:before pointcut="execution( * org.hisp.dhis.dataelement.DataElementCategoryService.delete*(..) )" method="intercept"/>
2051
807
      <aop:before pointcut="execution( * org.hisp.dhis.dataset.DataSetService.delete*(..) )" method="intercept"/>
807
      <aop:before pointcut="execution( * org.hisp.dhis.dataset.DataSetService.delete*(..) )" method="intercept"/>
2052
808
      <aop:before pointcut="execution( * org.hisp.dhis.indicator.IndicatorService.delete*(..) )" method="intercept"/>
808
      <aop:before pointcut="execution( * org.hisp.dhis.indicator.IndicatorService.delete*(..) )" method="intercept"/>
2053
809
      <aop:before pointcut="execution( * org.hisp.dhis.expression.ExpressionService.delete*(..) )" method="intercept"/>
809
      <aop:before pointcut="execution( * org.hisp.dhis.expression.ExpressionService.delete*(..) )" method="intercept"/>
2054
810
      <aop:before pointcut="execution( * org.hisp.dhis.minmax.MinMaxDataElementService.delete*(..) )" method="intercept"/>
810
      <aop:before pointcut="execution( * org.hisp.dhis.minmax.MinMaxDataElementService.delete*(..) )" method="intercept"/>
2055
811
      <aop:before pointcut="execution( * org.hisp.dhis.validation.ValidationRuleService.delete*(..) )" method="intercept"/>
811
      <aop:before pointcut="execution( * org.hisp.dhis.validation.ValidationRuleService.delete*(..) )" method="intercept"/>
2056
812
      <aop:before pointcut="execution( * org.hisp.dhis.period.PeriodService.delete*(..) )" method="intercept"/>
812
      <aop:before pointcut="execution( * org.hisp.dhis.period.PeriodService.delete*(..) )" method="intercept"/>
2057
813
	  <aop:before pointcut="execution( * org.hisp.dhis.organisationunit.OrganisationUnitService.delete*(..) )" method="intercept"/>
813
	  <aop:before pointcut="execution( * org.hisp.dhis.organisationunit.OrganisationUnitService.delete*(..) )" method="intercept"/>
2058
814
      <aop:before pointcut="execution( * org.hisp.dhis.organisationunit.OrganisationUnitGroupService.delete*(..) )" method="intercept"/>
814
      <aop:before pointcut="execution( * org.hisp.dhis.organisationunit.OrganisationUnitGroupService.delete*(..) )" method="intercept"/>
2059
815
	  <aop:before pointcut="execution( * org.hisp.dhis.user.UserStore.delete*(..) )" method="intercept"/>
815
	  <aop:before pointcut="execution( * org.hisp.dhis.user.UserStore.delete*(..) )" method="intercept"/>
2060
816
    </aop:aspect>
816
    </aop:aspect>
2061
817
      
817
      
2062
818
    <aop:aspect ref="statementInterceptor">
818
    <aop:aspect ref="statementInterceptor">
2063
819
      <aop:around pointcut="execution( * org.hisp.dhis.validation.ValidationRuleService.validate(..) )" method="intercept"/>
819
      <aop:around pointcut="execution( * org.hisp.dhis.validation.ValidationRuleService.validate(..) )" method="intercept"/>
2064
820
	  <aop:around pointcut="execution( * org.hisp.dhis.dataanalysis.DataAnalysisService.analyse(..) )" method="intercept"/>
820
	  <aop:around pointcut="execution( * org.hisp.dhis.dataanalysis.DataAnalysisService.analyse(..) )" method="intercept"/>
2065
821
    </aop:aspect>
821
    </aop:aspect>
2066
822
    
822
    
2067
823
	<!--
823
	<!--
2068
824
    <aop:aspect ref="i18nTranslationInterceptor">
824
    <aop:aspect ref="i18nTranslationInterceptor">
2069
825
      <aop:after-returning pointcut="execution( * org.hisp.dhis.dataelement.DataElementService.get*(..) )" method="intercept" returning="object"/>
825
      <aop:after-returning pointcut="execution( * org.hisp.dhis.dataelement.DataElementService.get*(..) )" method="intercept" returning="object"/>
2070
826
      <aop:after-returning pointcut="execution( * org.hisp.dhis.dataelement.DataElementCategoryService.get*(..) )" method="intercept" returning="object"/>
826
      <aop:after-returning pointcut="execution( * org.hisp.dhis.dataelement.DataElementCategoryService.get*(..) )" method="intercept" returning="object"/>
2071
827
      <aop:after-returning pointcut="execution( * org.hisp.dhis.indicator.IndicatorService.get*(..) )" method="intercept" returning="object"/>
827
      <aop:after-returning pointcut="execution( * org.hisp.dhis.indicator.IndicatorService.get*(..) )" method="intercept" returning="object"/>
2072
828
      <aop:after-returning pointcut="execution( * org.hisp.dhis.datadictionary.DataDictionaryService.get*(..) )" method="intercept" returning="object"/>
828
      <aop:after-returning pointcut="execution( * org.hisp.dhis.datadictionary.DataDictionaryService.get*(..) )" method="intercept" returning="object"/>
2073
829
      <aop:after-returning pointcut="execution( * org.hisp.dhis.dataset.DataSetService.get*(..) )" method="intercept" returning="object"/>
829
      <aop:after-returning pointcut="execution( * org.hisp.dhis.dataset.DataSetService.get*(..) )" method="intercept" returning="object"/>
2074
830
      <aop:after-returning pointcut="execution( * org.hisp.dhis.organisationunit.OrganisationUnitService.get*(..) )" method="intercept" returning="object"/>
830
      <aop:after-returning pointcut="execution( * org.hisp.dhis.organisationunit.OrganisationUnitService.get*(..) )" method="intercept" returning="object"/>
2075
831
      <aop:after-returning pointcut="execution( * org.hisp.dhis.organisationunit.OrganisationUnitGroupService.get*(..) )" method="intercept" returning="object"/>
831
      <aop:after-returning pointcut="execution( * org.hisp.dhis.organisationunit.OrganisationUnitGroupService.get*(..) )" method="intercept" returning="object"/>
2076
832
    </aop:aspect>
832
    </aop:aspect>
2077
833
	-->
833
	-->
2078
834
	
834
	
2079
835
  </aop:config>
835
  </aop:config>
2080
836
  
836
  
2081
837
</beans>
837
</beans>
2082
838
838
2083
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/user/hibernate/User.hbm.xml'
2084
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/user/hibernate/User.hbm.xml	2010-04-21 19:45:12 +0000
2085
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/user/hibernate/User.hbm.xml	2010-05-07 11:16:36 +0000
2086
@@ -4,7 +4,7 @@
2087
4
  "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
4
  "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
2088
5
5
2089
6
<hibernate-mapping>
6
<hibernate-mapping>
2091
7
  <class name="org.hisp.dhis.user.User" table="userinfo">
7
  <class name="org.hisp.dhis.user.User" lazy="false" table="userinfo">
2092
8
8
2093
9
    <cache usage="read-write"/>
9
    <cache usage="read-write"/>
2094
10
10
2095
11
11
2096
=== modified file 'dhis-2/dhis-services/dhis-service-i18n/pom.xml'
2097
--- dhis-2/dhis-services/dhis-service-i18n/pom.xml	2010-04-22 14:06:28 +0000
2098
+++ dhis-2/dhis-services/dhis-service-i18n/pom.xml	2010-05-07 11:16:36 +0000
2099
@@ -1,36 +1,36 @@
2131
1
<project xmlns="http://maven.apache.org/POM/4.0.0"
1
<project xmlns="http://maven.apache.org/POM/4.0.0"
2132
2
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2133
3
  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
3
  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
2134
4
  <modelVersion>4.0.0</modelVersion>
4
  <modelVersion>4.0.0</modelVersion>
2135
5
  
5
  
2136
6
  <parent>
6
  <parent>
2137
7
    <groupId>org.hisp.dhis</groupId>
7
    <groupId>org.hisp.dhis</groupId>
2138
8
    <artifactId>dhis-services</artifactId>
8
    <artifactId>dhis-services</artifactId>
2139
9
    <version>2.0.5-SNAPSHOT</version>
9
    <version>2.0.5-SNAPSHOT</version>
2140
10
  </parent>
10
  </parent>
2141
11
  
11
  
2142
12
  <artifactId>dhis-service-i18n</artifactId>
12
  <artifactId>dhis-service-i18n</artifactId>
2143
13
  <packaging>jar</packaging>
13
  <packaging>jar</packaging>
2144
14
  <name>DHIS I18n Static</name>
14
  <name>DHIS I18n Static</name>
2145
15
  
15
  
2146
16
  <dependencies>
16
  <dependencies>
2147
17
    
17
    
2148
18
    <dependency>
18
    <dependency>
2149
19
      <groupId>org.hisp.dhis</groupId>
19
      <groupId>org.hisp.dhis</groupId>
2150
20
      <artifactId>dhis-api</artifactId>
20
      <artifactId>dhis-api</artifactId>
2151
21
    </dependency>
21
    </dependency>
2152
22
    <dependency>
22
    <dependency>
2153
23
      <groupId>org.hisp.dhis</groupId>
23
      <groupId>org.hisp.dhis</groupId>
2154
24
      <artifactId>dhis-service-core</artifactId>
24
      <artifactId>dhis-service-core</artifactId>
2155
25
    </dependency>
25
    </dependency>
2156
26
    <dependency>
26
    <dependency>
2157
27
      <groupId>commons-logging</groupId>
27
      <groupId>commons-logging</groupId>
2158
28
      <artifactId>commons-logging</artifactId>
28
      <artifactId>commons-logging</artifactId>
2159
29
    </dependency>
29
    </dependency>
2160
30
	
30
	
2161
31
  </dependencies>
31
  </dependencies>
2162
32
  <properties>
32
  <properties>
2163
33
    <rootDir>../../</rootDir>
33
    <rootDir>../../</rootDir>
2164
34
  </properties>
34
  </properties>
2167
35
</project>
35
</project>
2168
36
36
2169
37
37
2170
=== modified file 'dhis-2/dhis-services/dhis-service-patient/pom.xml'
2171
--- dhis-2/dhis-services/dhis-service-patient/pom.xml	2010-04-27 15:04:10 +0000
2172
+++ dhis-2/dhis-services/dhis-service-patient/pom.xml	2010-05-07 11:16:36 +0000
2173
@@ -1,33 +1,33 @@
2203
1
<project xmlns="http://maven.apache.org/POM/4.0.0"
1
<project xmlns="http://maven.apache.org/POM/4.0.0"
2204
2
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2205
3
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
3
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
2206
4
  <modelVersion>4.0.0</modelVersion>
4
  <modelVersion>4.0.0</modelVersion>
2207
5
5
2208
6
  <parent>
6
  <parent>
2209
7
    <groupId>org.hisp.dhis</groupId>
7
    <groupId>org.hisp.dhis</groupId>
2210
8
    <artifactId>dhis-services</artifactId>
8
    <artifactId>dhis-services</artifactId>
2211
9
    <version>2.0.5-SNAPSHOT</version>
9
    <version>2.0.5-SNAPSHOT</version>
2212
10
  </parent>
10
  </parent>
2213
11
11
2214
12
  <artifactId>dhis-service-patient</artifactId>
12
  <artifactId>dhis-service-patient</artifactId>
2215
13
  <packaging>jar</packaging>
13
  <packaging>jar</packaging>
2216
14
  <name>DHIS Patient API Implementations</name>
14
  <name>DHIS Patient API Implementations</name>
2217
15
15
2218
16
  <dependencies>
16
  <dependencies>
2219
17
    
17
    
2220
18
    <!-- DHIS -->
18
    <!-- DHIS -->
2221
19
    
19
    
2222
20
    <dependency>
20
    <dependency>
2223
21
      <groupId>org.hisp.dhis</groupId>
21
      <groupId>org.hisp.dhis</groupId>
2224
22
      <artifactId>dhis-api</artifactId>
22
      <artifactId>dhis-api</artifactId>
2225
23
    </dependency>
23
    </dependency>
2226
24
    <dependency>
24
    <dependency>
2227
25
      <groupId>org.hisp.dhis</groupId>
25
      <groupId>org.hisp.dhis</groupId>
2228
26
      <artifactId>dhis-service-core</artifactId>
26
      <artifactId>dhis-service-core</artifactId>
2229
27
    </dependency>
27
    </dependency>
2230
28
    
28
    
2231
29
  </dependencies>
29
  </dependencies>
2232
30
  <properties>
30
  <properties>
2233
31
    <rootDir>../../</rootDir>
31
    <rootDir>../../</rootDir>
2234
32
  </properties>
32
  </properties>
2236
33
</project>
33
</project>
2237
34
34
2238
=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/DefaultPatientIdentifierService.java'
2239
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/DefaultPatientIdentifierService.java	2010-04-05 12:41:21 +0000
2240
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/DefaultPatientIdentifierService.java	2010-05-07 11:16:36 +0000
2241
@@ -27,14 +27,15 @@
2242
27
27
2243
28
package org.hisp.dhis.patient;
28
package org.hisp.dhis.patient;
2244
29
29
2245
30
2246
30
import java.util.ArrayList;
31
import java.util.ArrayList;
2247
31
import java.util.Collection;
32
import java.util.Collection;
2248
33
import java.util.Collections;
2249
32
import java.util.List;
34
import java.util.List;
2250
33
35
2251
34
import org.hisp.dhis.organisationunit.OrganisationUnit;
36
import org.hisp.dhis.organisationunit.OrganisationUnit;
2252
35
import org.springframework.transaction.annotation.Transactional;
37
import org.springframework.transaction.annotation.Transactional;
2253
36
38
2254
37
import edu.emory.mathcs.backport.java.util.Collections;
2255
38
39
2256
39
/**
40
/**
2257
40
 * @author Abyot Asalefew Gizaw
41
 * @author Abyot Asalefew Gizaw
2258
41
42
2259
=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/DefaultPatientService.java'
2260
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/DefaultPatientService.java	2010-04-19 09:54:45 +0000
2261
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/DefaultPatientService.java	2010-05-07 11:16:36 +0000
2262
@@ -36,7 +36,6 @@
2263
36
import java.util.SortedMap;
36
import java.util.SortedMap;
2264
37
import java.util.TreeMap;
37
import java.util.TreeMap;
2265
38
38
2266
39
import org.apache.log4j.Logger;
2267
40
import org.hisp.dhis.organisationunit.OrganisationUnit;
39
import org.hisp.dhis.organisationunit.OrganisationUnit;
2268
41
import org.hisp.dhis.patientattributevalue.PatientAttributeValue;
40
import org.hisp.dhis.patientattributevalue.PatientAttributeValue;
2269
42
import org.hisp.dhis.patientattributevalue.PatientAttributeValueService;
41
import org.hisp.dhis.patientattributevalue.PatientAttributeValueService;
2270
@@ -44,7 +43,6 @@
2271
44
import org.hisp.dhis.relationship.RelationshipService;
43
import org.hisp.dhis.relationship.RelationshipService;
2272
45
import org.hisp.dhis.relationship.RelationshipType;
44
import org.hisp.dhis.relationship.RelationshipType;
2273
46
import org.hisp.dhis.relationship.RelationshipTypeService;
45
import org.hisp.dhis.relationship.RelationshipTypeService;
2274
47
import org.hisp.dhis.system.util.AuditLogLevel;
2275
48
import org.hisp.dhis.user.CurrentUserService;
46
import org.hisp.dhis.user.CurrentUserService;
2276
49
import org.springframework.transaction.annotation.Transactional;
47
import org.springframework.transaction.annotation.Transactional;
2277
50
48
2278
51
49
2279
=== modified file 'dhis-2/dhis-support/dhis-support-hibernate/pom.xml'
2280
--- dhis-2/dhis-support/dhis-support-hibernate/pom.xml	2010-04-08 16:55:35 +0000
2281
+++ dhis-2/dhis-support/dhis-support-hibernate/pom.xml	2010-05-07 11:16:36 +0000
2282
@@ -1,86 +1,104 @@
2317
1
<project xmlns="http://maven.apache.org/POM/4.0.0"
1
<project xmlns="http://maven.apache.org/POM/4.0.0"
2318
2
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2319
3
  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
3
  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
2320
4
  <modelVersion>4.0.0</modelVersion>
4
  <modelVersion>4.0.0</modelVersion>
2321
5
  
5
  
2322
6
  <parent>
6
  <parent>
2323
7
    <groupId>org.hisp.dhis</groupId>
7
    <groupId>org.hisp.dhis</groupId>
2324
8
    <artifactId>dhis-support</artifactId>
8
    <artifactId>dhis-support</artifactId>
2325
9
    <version>2.0.5-SNAPSHOT</version>
9
    <version>2.0.5-SNAPSHOT</version>
2326
10
  </parent>
10
  </parent>
2327
11
  
11
  
2328
12
  <artifactId>dhis-support-hibernate</artifactId>
12
  <artifactId>dhis-support-hibernate</artifactId>
2329
13
  <packaging>jar</packaging>
13
  <packaging>jar</packaging>
2330
14
  <name>DHIS Hibernate Support</name>
14
  <name>DHIS Hibernate Support</name>
2331
15
  
15
  
2332
16
  <dependencies>
16
  <dependencies>
2333
17
    
17
    
2334
18
    <!-- DHIS -->
18
    <!-- DHIS -->
2335
19
    
19
    
2336
20
    <dependency>
20
    <dependency>
2337
21
      <groupId>org.hisp.dhis</groupId>
21
      <groupId>org.hisp.dhis</groupId>
2338
22
      <artifactId>dhis-api</artifactId>
22
      <artifactId>dhis-api</artifactId>
2339
23
    </dependency>
23
    </dependency>
2340
24
    <dependency>
24
    <dependency>
2341
25
      <groupId>org.hisp.dhis</groupId>
25
      <groupId>org.hisp.dhis</groupId>
2342
26
      <artifactId>dhis-support-external</artifactId>
26
      <artifactId>dhis-support-external</artifactId>
2343
27
    </dependency>
27
    </dependency>
2344
28
    
28
    
2345
29
    <!-- Hibernate -->
29
    <!-- Hibernate -->
2346
30
    
30
    
2347
31
    <dependency>
31
2348
32
      <groupId>org.hibernate</groupId>
32
    <dependency>
2349
33
      <artifactId>hibernate</artifactId>
33
      <groupId>org.hibernate</groupId>
2350
34
    </dependency>
34
      <artifactId>hibernate-core</artifactId>
2351
35
    </dependency>
2352
36
    <dependency>
2353
37
      <groupId>org.hibernate</groupId>
2354
38
      <artifactId>hibernate-ehcache</artifactId>
2355
39
    </dependency>
2356
40
    <dependency>
2357
41
      <groupId>org.hibernate</groupId>
2358
42
      <artifactId>hibernate-entitymanager</artifactId>
2359
43
    </dependency>
2360
44
2361
45
    <!--dependency>
2362
46
      <groupId>org.hibernate</groupId>
2363
47
      <artifactId>hibernate</artifactId>
2364
48
    </dependency-->
2365
35
    <dependency>
49
    <dependency>
2366
36
      <groupId>geronimo-spec</groupId>
50
      <groupId>geronimo-spec</groupId>
2367
37
      <artifactId>geronimo-spec-jta</artifactId>
51
      <artifactId>geronimo-spec-jta</artifactId>
2368
38
    </dependency>
52
    </dependency>
2413
39
    <dependency>
53
    <dependency>
2414
40
      <groupId>net.sf.ehcache</groupId>
54
      <groupId>net.sf.ehcache</groupId>
2415
41
      <artifactId>ehcache</artifactId>
55
      <artifactId>ehcache-core</artifactId>
2416
42
    </dependency>
56
    </dependency>
2417
43
    <dependency>
57
    <dependency>
2418
44
      <groupId>c3p0</groupId>
58
      <groupId>net.sf.ehcache</groupId>
2419
45
      <artifactId>c3p0</artifactId>
59
      <artifactId>ehcache-terracotta</artifactId>
2420
46
    </dependency>
60
    </dependency>
2421
47
    
61
    <dependency>
2422
48
    <!-- Database connectors -->
62
      <groupId>c3p0</groupId>
2423
49
    
63
      <artifactId>c3p0</artifactId>
2424
50
    <dependency>
64
    </dependency>
2425
51
      <groupId>mysql</groupId>
65
    
2426
52
      <artifactId>mysql-connector-java</artifactId>
66
    <!-- Database connectors -->
2427
53
    </dependency>
67
    
2428
54
    <dependency>
68
    <dependency>
2429
55
	  <groupId>postgresql</groupId>
69
      <groupId>mysql</groupId>
2430
56
	  <artifactId>postgresql</artifactId>
70
      <artifactId>mysql-connector-java</artifactId>
2431
57
	</dependency>
71
    </dependency>
2432
58
    <dependency>
72
    <dependency>
2433
59
      <groupId>com.h2database</groupId>
73
	  <groupId>postgresql</groupId>
2434
60
      <artifactId>h2</artifactId>
74
	  <artifactId>postgresql</artifactId>
2435
61
    </dependency>
75
	</dependency>
2436
62
    
76
    <dependency>
2437
63
    <!-- Other -->
77
      <groupId>com.h2database</groupId>
2438
64
    
78
      <artifactId>h2</artifactId>
2439
65
    <dependency>
79
    </dependency>
2440
66
      <groupId>org.springframework</groupId>
80
    
2441
67
      <artifactId>spring</artifactId>
81
    <!-- Other -->
2442
68
    </dependency>
82
    
2443
69
    <dependency>
83
    <dependency>
2444
70
      <groupId>commons-logging</groupId>
84
      <groupId>org.springframework</groupId>
2445
71
      <artifactId>commons-logging</artifactId>
85
      <artifactId>spring-orm</artifactId>
2446
72
    </dependency> 
86
    </dependency>
2447
73
    
87
    <dependency>
2448
74
    <!-- Monitoring -->
88
      <groupId>commons-logging</groupId>
2449
75
    <!--
89
      <artifactId>commons-logging</artifactId>
2450
76
    <dependency>
90
    </dependency> 
2451
77
      <groupId>com.elvyx</groupId>
91
    
2452
78
      <artifactId>elvyx</artifactId>
92
    <!-- Monitoring -->
2453
79
      <version>1.0.24</version>
93
    <!--
2454
80
    </dependency> -->
94
    <dependency>
2455
81
    
95
      <groupId>com.elvyx</groupId>
2456
82
  </dependencies>
96
      <artifactId>elvyx</artifactId>
2457
97
      <version>1.0.24</version>
2458
98
    </dependency> -->
2459
99
    
2460
100
  </dependencies>
2461
83
  <properties>
101
  <properties>
2462
84
    <rootDir>../../</rootDir>
102
    <rootDir>../../</rootDir>
2463
85
  </properties>
103
  </properties>
2465
86
</project>
104
</project>
2466
87
105
2467
=== modified file 'dhis-2/dhis-support/dhis-support-hibernate/src/main/resources/hibernate-default.properties'
2468
--- dhis-2/dhis-support/dhis-support-hibernate/src/main/resources/hibernate-default.properties	2009-06-10 22:25:07 +0000
2469
+++ dhis-2/dhis-support/dhis-support-hibernate/src/main/resources/hibernate-default.properties	2010-05-07 11:16:36 +0000
2470
@@ -26,7 +26,8 @@
2471
26
26
2472
27
# Caching
27
# Caching
2473
28
28
2475
29
hibernate.cache.provider_class = org.hibernate.cache.EhCacheProvider
29
hibernate.cache.region.factory_class = net.sf.ehcache.hibernate.EhCacheRegionFactory
2476
30
#hibernate.cache.provider_class = org.hibernate.cache.EhCacheProvider
2477
30
hibernate.cache.use_second_level_cache = true
31
hibernate.cache.use_second_level_cache = true
2478
31
hibernate.cache.use_query_cache = true
32
hibernate.cache.use_query_cache = true
2479
32
33
2480
33
34
2481
=== modified file 'dhis-2/dhis-support/dhis-support-system/pom.xml'
2482
--- dhis-2/dhis-support/dhis-support-system/pom.xml	2010-04-08 16:55:35 +0000
2483
+++ dhis-2/dhis-support/dhis-support-system/pom.xml	2010-05-07 11:16:36 +0000
2484
@@ -1,95 +1,99 @@
2576
1
<project xmlns="http://maven.apache.org/POM/4.0.0"
1
<project xmlns="http://maven.apache.org/POM/4.0.0"
2577
2
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2578
3
  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
3
  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
2579
4
  <modelVersion>4.0.0</modelVersion>
4
  <modelVersion>4.0.0</modelVersion>
2580
5
  
5
  
2581
6
  <parent>
6
  <parent>
2582
7
    <groupId>org.hisp.dhis</groupId>
7
    <groupId>org.hisp.dhis</groupId>
2583
8
    <artifactId>dhis-support</artifactId>
8
    <artifactId>dhis-support</artifactId>
2584
9
    <version>2.0.5-SNAPSHOT</version>
9
    <version>2.0.5-SNAPSHOT</version>
2585
10
  </parent>
10
  </parent>
2586
11
  
11
  
2587
12
  <artifactId>dhis-support-system</artifactId>
12
  <artifactId>dhis-support-system</artifactId>
2588
13
  <packaging>jar</packaging>
13
  <packaging>jar</packaging>
2589
14
  <name>DHIS System Support</name>
14
  <name>DHIS System Support</name>
2590
15
  
15
  
2591
16
  <dependencies>
16
  <dependencies>
2592
17
    
17
    
2593
18
    <!-- DHIS -->
18
    <!-- DHIS -->
2594
19
        
19
        
2595
20
    <dependency>
20
    <dependency>
2596
21
      <groupId>org.hisp.dhis</groupId>
21
      <groupId>org.hisp.dhis</groupId>
2597
22
      <artifactId>dhis-api</artifactId>
22
      <artifactId>dhis-api</artifactId>
2598
23
    </dependency>
23
    </dependency>
2599
24
    <dependency>
24
    <dependency>
2600
25
      <groupId>org.hisp.dhis</groupId>
25
      <groupId>org.hisp.dhis</groupId>
2601
26
      <artifactId>dhis-support-hibernate</artifactId>
26
      <artifactId>dhis-support-hibernate</artifactId>
2602
27
    </dependency>
27
    </dependency>
2603
28
    <dependency>
28
    <dependency>
2604
29
      <groupId>org.hisp.dhis</groupId>
29
      <groupId>org.hisp.dhis</groupId>
2605
30
      <artifactId>dhis-support-test</artifactId>
30
      <artifactId>dhis-support-test</artifactId>
2606
31
    </dependency>
31
    </dependency>
2607
32
    
32
    
2608
33
    <!-- Other -->
33
    <!-- Other -->
2609
34
    
34
    
2610
35
    <dependency>
35
    <dependency>
2611
36
      <groupId>org.aspectj</groupId>
36
      <groupId>org.slf4j</groupId>
2612
37
      <artifactId>aspectjrt</artifactId>
37
      <artifactId>slf4j-log4j12</artifactId>
2613
38
    </dependency>
38
    </dependency>
2614
39
    <dependency>
39
    <dependency>
2615
40
      <groupId>org.aspectj</groupId>
40
      <groupId>org.aspectj</groupId>
2616
41
      <artifactId>aspectjweaver</artifactId>
41
      <artifactId>aspectjrt</artifactId>
2617
42
    </dependency>
42
    </dependency>
2618
43
    <dependency>
43
    <dependency>
2619
44
      <groupId>org.springframework</groupId>
44
      <groupId>org.aspectj</groupId>
2620
45
      <artifactId>spring</artifactId>
45
      <artifactId>aspectjweaver</artifactId>
2621
46
    </dependency>
46
    </dependency>
2622
47
    <dependency>
47
    <dependency>
2623
48
      <groupId>com.lowagie</groupId>
48
      <groupId>org.springframework</groupId>
2624
49
      <artifactId>itext</artifactId>
49
      <artifactId>spring-web</artifactId>
2625
50
    </dependency>
50
    </dependency>
2626
51
    <dependency>
51
    <dependency>
2627
52
      <groupId>commons-logging</groupId>
52
      <groupId>com.lowagie</groupId>
2628
53
      <artifactId>commons-logging</artifactId>
53
      <artifactId>itext</artifactId>
2629
54
    </dependency>
54
    </dependency>
2630
55
    <dependency>
55
    <dependency>
2631
56
      <groupId>commons-collections</groupId>
56
      <groupId>commons-logging</groupId>
2632
57
      <artifactId>commons-collections</artifactId>
57
      <artifactId>commons-logging</artifactId>
2633
58
    </dependency>
58
    </dependency>
2634
59
    <dependency>
59
    <dependency>
2635
60
      <groupId>commons-lang</groupId>
60
      <groupId>commons-collections</groupId>
2636
61
      <artifactId>commons-lang</artifactId>
61
      <artifactId>commons-collections</artifactId>
2637
62
    </dependency>
62
    </dependency>
2638
63
    <dependency>
63
    <dependency>
2639
64
      <groupId>commons-codec</groupId>
64
      <groupId>commons-lang</groupId>
2640
65
      <artifactId>commons-codec</artifactId>
65
      <artifactId>commons-lang</artifactId>
2641
66
    </dependency>
66
    </dependency>
2642
67
    <dependency>
67
    <dependency>
2643
68
      <groupId>commons-math</groupId>
68
      <groupId>commons-codec</groupId>
2644
69
      <artifactId>commons-math</artifactId>
69
      <artifactId>commons-codec</artifactId>
2645
70
    </dependency>
70
    </dependency>
2646
71
    <dependency>
71
    <dependency>
2647
72
      <groupId>commons-validator</groupId>
72
      <groupId>commons-math</groupId>
2648
73
      <artifactId>commons-validator</artifactId>
73
      <artifactId>commons-math</artifactId>
2649
74
    </dependency> 
74
    </dependency>
2650
75
    <dependency>
75
    <dependency>
2651
76
      <groupId>jep</groupId>
76
      <groupId>commons-validator</groupId>
2652
77
      <artifactId>jep</artifactId>
77
      <artifactId>commons-validator</artifactId>
2653
78
    </dependency>
78
    </dependency> 
2654
79
    <dependency>
79
    <dependency>
2655
80
      <groupId>joda-time</groupId>
80
      <groupId>jep</groupId>
2656
81
      <artifactId>joda-time</artifactId>
81
      <artifactId>jep</artifactId>
2657
82
    </dependency> 
82
    </dependency>
2658
83
    <dependency>
83
    <dependency>
2659
84
      <groupId>org.amplecode</groupId>
84
      <groupId>joda-time</groupId>
2660
85
      <artifactId>cave-process</artifactId>
85
      <artifactId>joda-time</artifactId>
2661
86
    </dependency>
86
    </dependency> 
2662
87
    <dependency>
87
    <dependency>
2663
88
      <groupId>org.amplecode</groupId>
88
      <groupId>org.amplecode</groupId>
2664
89
      <artifactId>quick</artifactId>
89
      <artifactId>cave-process</artifactId>
2665
90
    </dependency>
90
    </dependency>
2666
91
  </dependencies>
91
    <dependency>
2667
92
      <groupId>org.amplecode</groupId>
2668
93
      <artifactId>quick</artifactId>
2669
94
    </dependency>
2670
95
  </dependencies>
2671
92
  <properties>
96
  <properties>
2672
93
    <rootDir>../../</rootDir>
97
    <rootDir>../../</rootDir>
2673
94
  </properties>
98
  </properties>
2675
95
</project>
99
</project>
2676
96
100
2677
=== modified file 'dhis-2/dhis-support/dhis-support-test/pom.xml'
2678
--- dhis-2/dhis-support/dhis-support-test/pom.xml	2010-04-08 16:55:35 +0000
2679
+++ dhis-2/dhis-support/dhis-support-test/pom.xml	2010-05-07 11:16:36 +0000
2680
@@ -1,51 +1,59 @@
2728
1
<project xmlns="http://maven.apache.org/POM/4.0.0"
1
<project xmlns="http://maven.apache.org/POM/4.0.0"
2729
2
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2730
3
  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
3
  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
2731
4
  <modelVersion>4.0.0</modelVersion>
4
  <modelVersion>4.0.0</modelVersion>
2732
5
  
5
  
2733
6
  <parent>
6
  <parent>
2734
7
    <groupId>org.hisp.dhis</groupId>
7
    <groupId>org.hisp.dhis</groupId>
2735
8
    <artifactId>dhis-support</artifactId>
8
    <artifactId>dhis-support</artifactId>
2736
9
    <version>2.0.5-SNAPSHOT</version>
9
    <version>2.0.5-SNAPSHOT</version>
2737
10
  </parent>
10
  </parent>
2738
11
  
11
  
2739
12
  <artifactId>dhis-support-test</artifactId>
12
  <artifactId>dhis-support-test</artifactId>
2740
13
  <packaging>jar</packaging>
13
  <packaging>jar</packaging>
2741
14
  <name>DHIS Test Support</name>
14
  <name>DHIS Test Support</name>
2742
15
  
15
  
2743
16
  <dependencies>
16
  <dependencies>
2744
17
    
17
    
2745
18
    <!-- DHIS -->
18
    <!-- DHIS -->
2746
19
19
2747
20
    <dependency>
20
    <dependency>
2748
21
      <groupId>org.hisp.dhis</groupId>
21
      <groupId>org.hisp.dhis</groupId>
2749
22
      <artifactId>dhis-api</artifactId>
22
      <artifactId>dhis-api</artifactId>
2750
23
    </dependency>
23
    </dependency>
2751
24
		
24
		
2752
25
    <!-- Other -->
25
    <!-- Other -->
2753
26
    
26
    
2754
27
    <dependency>
27
    <dependency>
2755
28
      <groupId>org.springframework</groupId>
28
      <groupId>org.springframework</groupId>
2756
29
      <artifactId>spring</artifactId>
29
      <artifactId>spring-context</artifactId>
2757
30
    </dependency>
30
    </dependency>
2758
31
    <dependency>
31
    <dependency>
2759
32
      <groupId>commons-logging</groupId>
32
      <groupId>org.springframework</groupId>
2760
33
      <artifactId>commons-logging</artifactId>
33
      <artifactId>spring-orm</artifactId>
2761
34
    </dependency>
34
    </dependency>
2762
35
    <dependency>
35
    <dependency>
2763
36
      <groupId>junit</groupId>
36
      <groupId>commons-logging</groupId>
2764
37
      <artifactId>junit</artifactId>
37
      <artifactId>commons-logging</artifactId>
2765
38
    </dependency>
38
    </dependency>
2766
39
    <dependency>
39
    <dependency>
2767
40
      <groupId>org.hibernate</groupId>
40
      <groupId>junit</groupId>
2768
41
      <artifactId>hibernate</artifactId>
41
      <artifactId>junit</artifactId>
2769
42
    </dependency>
42
    </dependency>
2770
43
    <dependency>
43
    <!--dependency>
2771
44
      <groupId>org.springframework</groupId>
44
      <groupId>org.hibernate</groupId>
2772
45
      <artifactId>spring-test</artifactId>
45
      <artifactId>hibernate</artifactId>
2773
46
    </dependency>
46
    </dependency-->
2774
47
  </dependencies>
47
    <dependency>
2775
48
      <groupId>org.hibernate</groupId>
2776
49
      <artifactId>hibernate-core</artifactId>
2777
50
    </dependency>
2778
51
    <dependency>
2779
52
      <groupId>org.springframework</groupId>
2780
53
      <artifactId>spring-test</artifactId>
2781
54
    </dependency>
2782
55
  </dependencies>
2783
48
  <properties>
56
  <properties>
2784
49
    <rootDir>../../</rootDir>
57
    <rootDir>../../</rootDir>
2785
50
  </properties>
58
  </properties>
2787
51
</project>
59
</project>
2788
52
60
2789
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/pom.xml'
2790
--- dhis-2/dhis-web/dhis-web-caseentry/pom.xml	2010-04-21 19:45:12 +0000
2791
+++ dhis-2/dhis-web/dhis-web-caseentry/pom.xml	2010-05-07 11:16:36 +0000
2792
@@ -1,50 +1,50 @@
2839
1
<project xmlns="http://maven.apache.org/POM/4.0.0"
1
<project xmlns="http://maven.apache.org/POM/4.0.0"
2840
2
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2841
3
  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
3
  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
2842
4
  <modelVersion>4.0.0</modelVersion>
4
  <modelVersion>4.0.0</modelVersion>
2843
5
  
5
  
2844
6
  <parent>
6
  <parent>
2845
7
    <groupId>org.hisp.dhis</groupId>
7
    <groupId>org.hisp.dhis</groupId>
2846
8
    <artifactId>dhis-web</artifactId>
8
    <artifactId>dhis-web</artifactId>
2847
9
    <version>2.0.5-SNAPSHOT</version>
9
    <version>2.0.5-SNAPSHOT</version>
2848
10
  </parent>
10
  </parent>
2849
11
  
11
  
2850
12
  <artifactId>dhis-web-caseentry</artifactId>
12
  <artifactId>dhis-web-caseentry</artifactId>
2851
13
  <packaging>war</packaging>
13
  <packaging>war</packaging>
2852
14
  <name>DHIS Case Entry</name>
14
  <name>DHIS Case Entry</name>
2853
15
  
15
  
2854
16
  <build>
16
  <build>
2855
17
    <finalName>dhis-web-caseentry</finalName>
17
    <finalName>dhis-web-caseentry</finalName>
2856
18
  </build>
18
  </build>
2857
19
  
19
  
2858
20
  <dependencies>
20
  <dependencies>
2859
21
    
21
    
2860
22
    <!-- DHIS -->
22
    <!-- DHIS -->
2861
23
    
23
    
2862
24
    <dependency>
24
    <dependency>
2863
25
      <groupId>org.hisp.dhis</groupId>
25
      <groupId>org.hisp.dhis</groupId>
2864
26
      <artifactId>dhis-web-commons</artifactId>
26
      <artifactId>dhis-web-commons</artifactId>
2865
27
    </dependency>
27
    </dependency>
2866
28
    <dependency>
28
    <dependency>
2867
29
      <groupId>org.hisp.dhis</groupId>
29
      <groupId>org.hisp.dhis</groupId>
2868
30
      <artifactId>dhis-web-commons-resources</artifactId>
30
      <artifactId>dhis-web-commons-resources</artifactId>
2869
31
      <type>war</type>
31
      <type>war</type>
2870
32
    </dependency>
32
    </dependency>
2871
33
    <dependency>
33
    <dependency>
2872
34
      <groupId>org.hisp.dhis</groupId>
34
      <groupId>org.hisp.dhis</groupId>
2873
35
      <artifactId>dhis-service-core</artifactId>
35
      <artifactId>dhis-service-core</artifactId>
2874
36
    </dependency>
36
    </dependency>
2875
37
    <dependency>
37
    <dependency>
2876
38
      <groupId>org.hisp.dhis</groupId>
38
      <groupId>org.hisp.dhis</groupId>
2877
39
      <artifactId>dhis-service-patient</artifactId>
39
      <artifactId>dhis-service-patient</artifactId>
2878
40
    </dependency>
40
    </dependency>
2879
41
    <dependency>
41
    <dependency>
2880
42
      <groupId>org.hisp.dhis</groupId>
42
      <groupId>org.hisp.dhis</groupId>
2881
43
      <artifactId>dhis-service-options</artifactId>
43
      <artifactId>dhis-service-options</artifactId>
2882
44
    </dependency>      
44
    </dependency>      
2883
45
    
45
    
2884
46
  </dependencies>
46
  </dependencies>
2885
47
  <properties>
47
  <properties>
2886
48
    <rootDir>../../</rootDir>
48
    <rootDir>../../</rootDir>
2887
49
  </properties>
49
  </properties>
2889
50
</project>
50
</project>
2890
51
51
2891
=== modified file 'dhis-2/dhis-web/dhis-web-commons/pom.xml'
2892
--- dhis-2/dhis-web/dhis-web-commons/pom.xml	2010-04-22 14:06:28 +0000
2893
+++ dhis-2/dhis-web/dhis-web-commons/pom.xml	2010-05-07 11:16:36 +0000
2894
@@ -97,8 +97,8 @@
2895
97
    <!-- Other -->
97
    <!-- Other -->
2896
98
	
98
	
2897
99
    <dependency>
99
    <dependency>
2900
100
      <groupId>org.springframework</groupId>
100
      <groupId>org.springframework.security</groupId>
2901
101
      <artifactId>spring</artifactId>
101
      <artifactId>spring-security-config</artifactId>
2902
102
    </dependency>
102
    </dependency>
2903
103
    <dependency>
103
    <dependency>
2904
104
      <groupId>commons-logging</groupId>
104
      <groupId>commons-logging</groupId>
2905
105
105
2906
=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetOperandsAction.java'
2907
--- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetOperandsAction.java	2010-04-12 21:23:33 +0000
2908
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetOperandsAction.java	2010-05-07 11:16:36 +0000
2909
@@ -28,6 +28,7 @@
2910
28
 */
28
 */
2911
29
29
2912
30
import java.util.ArrayList;
30
import java.util.ArrayList;
2913
31
import java.util.Collections;
2914
31
import java.util.List;
32
import java.util.List;
2915
32
33
2916
33
import org.hisp.dhis.dataelement.DataElementOperand;
34
import org.hisp.dhis.dataelement.DataElementOperand;
2917
@@ -36,8 +37,6 @@
2918
36
37
2919
37
import com.opensymphony.xwork2.Action;
38
import com.opensymphony.xwork2.Action;
2920
38
39
2921
39
import edu.emory.mathcs.backport.java.util.Collections;
2922
40
2923
41
/**
40
/**
2924
42
 * @author Lars Helge Overland
41
 * @author Lars Helge Overland
2925
43
 */
42
 */
2926
44
43
2927
=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/encoding/velocity/EncoderVelocityContext.java'
2928
--- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/encoding/velocity/EncoderVelocityContext.java	2010-04-12 21:23:33 +0000
2929
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/encoding/velocity/EncoderVelocityContext.java	2010-05-07 11:16:36 +0000
2930
@@ -27,9 +27,10 @@
2931
27
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
27
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2932
28
 */
28
 */
2933
29
29
2934
30
2935
30
import org.apache.velocity.VelocityContext;
31
import org.apache.velocity.VelocityContext;
2936
31
32
2938
32
import com.opensymphony.xwork2.util.TextUtils;
33
import org.apache.commons.lang.StringEscapeUtils;
2939
33
34
2940
34
/**
35
/**
2941
35
 * @author Torgeir Lorange Ostby
36
 * @author Torgeir Lorange Ostby
2942
@@ -127,7 +128,7 @@
2943
127
128
2944
128
        private String defaultEncode( String string )
129
        private String defaultEncode( String string )
2945
129
        {
130
        {
2947
130
            return TextUtils.htmlEncode( string );
131
            return StringEscapeUtils.escapeHtml( string );
2948
131
        }
132
        }
2949
132
    }
133
    }
2950
133
}
134
}
2951
134
135
2952
=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/interceptor/ExceptionInterceptor.java'
2953
--- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/interceptor/ExceptionInterceptor.java	2010-04-12 21:23:33 +0000
2954
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/interceptor/ExceptionInterceptor.java	2010-05-07 11:16:36 +0000
2955
@@ -30,10 +30,10 @@
2956
30
import java.util.HashMap;
30
import java.util.HashMap;
2957
31
import java.util.Map;
31
import java.util.Map;
2958
32
32
2959
33
import org.springframework.security.AccessDeniedException;
2960
34
import org.springframework.security.InsufficientAuthenticationException;
2961
35
import org.apache.commons.logging.Log;
33
import org.apache.commons.logging.Log;
2962
36
import org.apache.commons.logging.LogFactory;
34
import org.apache.commons.logging.LogFactory;
2963
35
import org.springframework.security.access.AccessDeniedException;
2964
36
import org.springframework.security.authentication.InsufficientAuthenticationException;
2965
37
37
2966
38
import com.opensymphony.xwork2.ActionInvocation;
38
import com.opensymphony.xwork2.ActionInvocation;
2967
39
import com.opensymphony.xwork2.interceptor.Interceptor;
39
import com.opensymphony.xwork2.interceptor.Interceptor;
2968
40
40
2969
=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/AbstractAutomaticAccessProvider.java'
2970
--- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/AbstractAutomaticAccessProvider.java	2010-04-12 21:23:33 +0000
2971
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/AbstractAutomaticAccessProvider.java	2010-05-07 11:16:36 +0000
2972
@@ -31,8 +31,8 @@
2973
31
31
2974
32
import org.hisp.dhis.security.authority.SystemAuthoritiesProvider;
32
import org.hisp.dhis.security.authority.SystemAuthoritiesProvider;
2975
33
import org.hisp.dhis.user.UserStore;
33
import org.hisp.dhis.user.UserStore;
2978
34
import org.springframework.security.GrantedAuthority;
34
import org.springframework.security.core.GrantedAuthority;
2979
35
import org.springframework.security.GrantedAuthorityImpl;
35
import org.springframework.security.core.authority.GrantedAuthorityImpl;
2980
36
36
2981
37
/**
37
/**
2982
38
 * Abstract automatic access provider class. Delegates methods initialise() and 
38
 * Abstract automatic access provider class. Delegates methods initialise() and 
2983
39
39
2984
=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/GhostAutomaticAccessProvider.java'
2985
--- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/GhostAutomaticAccessProvider.java	2010-04-12 21:23:33 +0000
2986
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/GhostAutomaticAccessProvider.java	2010-05-07 11:16:36 +0000
2987
@@ -27,10 +27,10 @@
2988
27
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
27
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2989
28
 */
28
 */
2990
29
29
2995
30
import org.springframework.security.Authentication;
30
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
2996
31
import org.springframework.security.context.SecurityContextHolder;
31
import org.springframework.security.core.Authentication;
2997
32
import org.springframework.security.providers.UsernamePasswordAuthenticationToken;
32
import org.springframework.security.core.context.SecurityContextHolder;
2998
33
import org.springframework.security.userdetails.UserDetails;
33
import org.springframework.security.core.userdetails.UserDetails;
2999
34
34
3000
35
/**
35
/**
3001
36
 * This access provider will put an Authentication object with all GrantedAuthorities
36
 * This access provider will put an Authentication object with all GrantedAuthorities
3002
@@ -54,7 +54,7 @@
3003
54
        String username = "ghost_admin";
54
        String username = "ghost_admin";
3004
55
        String password = "";
55
        String password = "";
3005
56
56
3007
57
        UserDetails user = new org.springframework.security.userdetails.User( username, password, true, true, true, true,
57
        UserDetails user = new org.springframework.security.core.userdetails.User( username, password, true, true, true, true,
3008
58
            getGrantedAuthorities() );
58
            getGrantedAuthorities() );
3009
59
59
3010
60
        authentication = new UsernamePasswordAuthenticationToken( user, user.getPassword(), user.getAuthorities() );
60
        authentication = new UsernamePasswordAuthenticationToken( user, user.getPassword(), user.getAuthorities() );
3011
61
61
3012
=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/SpringSecurityActionAccessResolver.java'
3013
--- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/SpringSecurityActionAccessResolver.java	2010-04-12 21:23:33 +0000
3014
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/SpringSecurityActionAccessResolver.java	2010-05-07 11:16:36 +0000
3015
@@ -31,13 +31,14 @@
3016
31
import org.apache.commons.logging.LogFactory;
31
import org.apache.commons.logging.LogFactory;
3017
32
import org.apache.struts2.dispatcher.Dispatcher;
32
import org.apache.struts2.dispatcher.Dispatcher;
3018
33
import org.hisp.dhis.security.authority.RequiredAuthoritiesProvider;
33
import org.hisp.dhis.security.authority.RequiredAuthoritiesProvider;
3026
34
import org.springframework.security.AccessDecisionManager;
34
3027
35
import org.springframework.security.AccessDeniedException;
35
import org.springframework.security.access.AccessDecisionManager;
3028
36
import org.springframework.security.Authentication;
36
import org.springframework.security.access.AccessDeniedException;
3029
37
import org.springframework.security.InsufficientAuthenticationException;
37
import org.springframework.security.access.SecurityMetadataSource;
3030
38
import org.springframework.security.context.SecurityContext;
38
import org.springframework.security.authentication.InsufficientAuthenticationException;
3031
39
import org.springframework.security.context.SecurityContextHolder;
39
import org.springframework.security.core.Authentication;
3032
40
import org.springframework.security.intercept.ObjectDefinitionSource;
40
import org.springframework.security.core.context.SecurityContext;
3033
41
import org.springframework.security.core.context.SecurityContextHolder;
3034
41
42
3035
42
import com.opensymphony.xwork2.config.Configuration;
43
import com.opensymphony.xwork2.config.Configuration;
3036
43
import com.opensymphony.xwork2.config.entities.ActionConfig;
44
import com.opensymphony.xwork2.config.entities.ActionConfig;
3037
@@ -96,8 +97,8 @@
3038
96
            throw new IllegalArgumentException( "Module " + module + " doesn't have an action named: '" + name + "'" );
97
            throw new IllegalArgumentException( "Module " + module + " doesn't have an action named: '" + name + "'" );
3039
97
        }
98
        }
3040
98
99
3043
99
        ObjectDefinitionSource objectDefinitionSource = requiredAuthoritiesProvider
100
        SecurityMetadataSource securityMetadataSource = requiredAuthoritiesProvider
3044
100
            .createObjectDefinitionSource( actionConfig );
101
            .createSecurityMetadataSource( actionConfig );
3045
101
102
3046
102
        // ---------------------------------------------------------------------
103
        // ---------------------------------------------------------------------
3047
103
        // Test access
104
        // Test access
3048
@@ -109,14 +110,14 @@
3049
109
110
3050
110
        try
111
        try
3051
111
        {
112
        {
3053
112
            if ( objectDefinitionSource.getAttributes( actionConfig ) != null )
113
            if ( securityMetadataSource.getAttributes( actionConfig ) != null )
3054
113
            {
114
            {
3055
114
                if ( authentication == null || !authentication.isAuthenticated() )
115
                if ( authentication == null || !authentication.isAuthenticated() )
3056
115
                {
116
                {
3057
116
                    return false;
117
                    return false;
3058
117
                }
118
                }
3059
118
119
3061
119
                accessDecisionManager.decide( authentication, actionConfig, objectDefinitionSource
120
                accessDecisionManager.decide( authentication, actionConfig, securityMetadataSource
3062
120
                    .getAttributes( actionConfig ) );
121
                    .getAttributes( actionConfig ) );
3063
121
            }
122
            }
3064
122
123
3065
123
124
3066
=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/authority/DefaultRequiredAuthoritiesProvider.java'
3067
--- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/authority/DefaultRequiredAuthoritiesProvider.java	2010-04-12 21:23:33 +0000
3068
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/authority/DefaultRequiredAuthoritiesProvider.java	2010-05-07 11:16:36 +0000
3069
@@ -31,15 +31,14 @@
3070
31
import java.util.Collection;
31
import java.util.Collection;
3071
32
import java.util.Collections;
32
import java.util.Collections;
3072
33
import java.util.HashSet;
33
import java.util.HashSet;
3073
34
import java.util.List;
3074
35
import java.util.Map;
34
import java.util.Map;
3075
36
import java.util.Set;
35
import java.util.Set;
3076
37
import java.util.StringTokenizer;
36
import java.util.StringTokenizer;
3077
38
37
3082
39
import org.springframework.security.ConfigAttributeDefinition;
38
import org.hisp.dhis.security.intercept.SingleSecurityMetadataSource;
3083
40
import org.springframework.security.SecurityConfig;
39
import org.springframework.security.access.ConfigAttribute;
3084
41
import org.springframework.security.intercept.ObjectDefinitionSource;
40
import org.springframework.security.access.SecurityConfig;
3085
42
import org.hisp.dhis.security.intercept.SingleObjectDefinitionSource;
41
import org.springframework.security.access.SecurityMetadataSource;
3086
43
42
3087
44
import com.opensymphony.xwork2.config.entities.ActionConfig;
43
import com.opensymphony.xwork2.config.entities.ActionConfig;
3088
45
44
3089
@@ -72,29 +71,27 @@
3090
72
    // RequiredAuthoritiesProvider implementation
71
    // RequiredAuthoritiesProvider implementation
3091
73
    // -------------------------------------------------------------------------
72
    // -------------------------------------------------------------------------
3092
74
73
3094
75
    public ObjectDefinitionSource createObjectDefinitionSource( ActionConfig actionConfig )
74
    public SecurityMetadataSource createSecurityMetadataSource( ActionConfig actionConfig )
3095
76
    {
75
    {
3097
77
        return createObjectDefinitionSource( actionConfig, actionConfig );
76
        return createSecurityMetadataSource( actionConfig, actionConfig );
3098
78
    }
77
    }
3100
79
    public ObjectDefinitionSource createObjectDefinitionSource( ActionConfig actionConfig, Object object )
78
    public SecurityMetadataSource createSecurityMetadataSource( ActionConfig actionConfig, Object object )
3101
80
    {
79
    {
3102
81
        Collection<String> requiredAuthorities = getRequiredAuthorities( actionConfig );
80
        Collection<String> requiredAuthorities = getRequiredAuthorities( actionConfig );
3103
82
81
3105
83
        List<SecurityConfig> list = new ArrayList<SecurityConfig>();
82
        Collection<ConfigAttribute> attributes = new ArrayList<ConfigAttribute>();
3106
84
        
83
        
3107
85
        for ( String requiredAuthority : requiredAuthorities )
84
        for ( String requiredAuthority : requiredAuthorities )
3108
86
        {
85
        {
3110
87
            list.add( new SecurityConfig( requiredAuthority ) );
86
            attributes.add( new SecurityConfig( requiredAuthority ) );
3111
88
        }
87
        }
3112
89
88
3113
90
        for ( String globalAttribute : globalAttributes )
89
        for ( String globalAttribute : globalAttributes )
3114
91
        {
90
        {
3116
92
            list.add( new SecurityConfig( globalAttribute ) );
91
            attributes.add( new SecurityConfig( globalAttribute ) );
3117
93
        }
92
        }
3118
94
93
3122
95
        ConfigAttributeDefinition attributes = new ConfigAttributeDefinition(list);
94
        return new SingleSecurityMetadataSource( object, attributes );
3120
96
        
3121
97
        return new SingleObjectDefinitionSource( object, attributes );
3123
98
    }
95
    }
3124
99
    
96
    
3125
100
    public Collection<String> getRequiredAuthorities( ActionConfig actionConfig )
97
    public Collection<String> getRequiredAuthorities( ActionConfig actionConfig )
3126
101
98
3127
=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/authority/RequiredAuthoritiesProvider.java'
3128
--- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/authority/RequiredAuthoritiesProvider.java	2010-04-12 21:23:33 +0000
3129
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/authority/RequiredAuthoritiesProvider.java	2010-05-07 11:16:36 +0000
3130
@@ -29,7 +29,7 @@
3131
29
29
3132
30
import java.util.Collection;
30
import java.util.Collection;
3133
31
31
3135
32
import org.springframework.security.intercept.ObjectDefinitionSource;
32
import org.springframework.security.access.SecurityMetadataSource;
3136
33
33
3137
34
import com.opensymphony.xwork2.config.entities.ActionConfig;
34
import com.opensymphony.xwork2.config.entities.ActionConfig;
3138
35
35
3139
@@ -40,25 +40,25 @@
3140
40
public interface RequiredAuthoritiesProvider
40
public interface RequiredAuthoritiesProvider
3141
41
{
41
{
3142
42
    /**
42
    /**
3144
43
     * Creates an ObjectDefinitionSource based on the required authorities for
43
     * Creates an SecurityMetadataSource based on the required authorities for
3145
44
     * the action config. The specified action config is set as the secure
44
     * the action config. The specified action config is set as the secure
3147
45
     * object. The ObjectDefinitionSource may include additional attributes if
45
     * object. The SecurityMetadataSource may include additional attributes if
3148
46
     * needed.
46
     * needed.
3149
47
     * 
47
     * 
3150
48
     * @param actionConfig the secure actionConfig to get required authorities
48
     * @param actionConfig the secure actionConfig to get required authorities
3151
49
     *        from.
49
     *        from.
3152
50
     */
50
     */
3154
51
    public ObjectDefinitionSource createObjectDefinitionSource( ActionConfig actionConfig );
51
    public SecurityMetadataSource createSecurityMetadataSource( ActionConfig actionConfig );
3155
52
52
3156
53
    /**
53
    /**
3158
54
     * Creates an ObjectDefinitionSource for a specified secure object based on
54
     * Creates an SecurityMetadataSource for a specified secure object based on
3159
55
     * the required authorities for the action config. The
55
     * the required authorities for the action config. The
3161
56
     * ObjectDefinitionSource may include additional attributes if needed.
56
     * SecurityMetadataSource may include additional attributes if needed.
3162
57
     * 
57
     * 
3163
58
     * @param actionConfig the actionConfig to get required authorities from.
58
     * @param actionConfig the actionConfig to get required authorities from.
3164
59
     * @param object the secure object.
59
     * @param object the secure object.
3165
60
     */
60
     */
3167
61
    public ObjectDefinitionSource createObjectDefinitionSource( ActionConfig actionConfig, Object object );
61
    public SecurityMetadataSource createSecurityMetadataSource( ActionConfig actionConfig, Object object );
3168
62
62
3169
63
    /**
63
    /**
3170
64
     * Returns the required authorities of an action configuration.
64
     * Returns the required authorities of an action configuration.
3171
65
65
3172
=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/filter/UserAuditLogoutFilter.java'
3173
--- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/filter/UserAuditLogoutFilter.java	2010-04-12 21:23:33 +0000
3174
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/filter/UserAuditLogoutFilter.java	2010-05-07 11:16:36 +0000
3175
@@ -31,9 +31,9 @@
3176
31
import javax.servlet.http.HttpServletResponse;
31
import javax.servlet.http.HttpServletResponse;
3177
32
32
3178
33
import org.hisp.dhis.useraudit.UserAuditService;
33
import org.hisp.dhis.useraudit.UserAuditService;
3182
34
import org.springframework.security.Authentication;
34
import org.springframework.security.core.Authentication;
3183
35
import org.springframework.security.ui.logout.LogoutHandler;
35
import org.springframework.security.core.userdetails.UserDetails;
3184
36
import org.springframework.security.userdetails.UserDetails;
36
import org.springframework.security.web.authentication.logout.LogoutHandler;
3185
37
37
3186
38
/**
38
/**
3187
39
 * @author Lars Helge Overland
39
 * @author Lars Helge Overland
3188
40
40
3189
=== renamed file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/intercept/SingleObjectDefinitionSource.java' => 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/intercept/SingleSecurityMetadataSource.java'
3190
--- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/intercept/SingleObjectDefinitionSource.java	2010-04-12 21:23:33 +0000
3191
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/intercept/SingleSecurityMetadataSource.java	2010-05-07 11:16:36 +0000
3192
@@ -29,42 +29,41 @@
3193
29
29
3194
30
import java.util.Collection;
30
import java.util.Collection;
3195
31
31
3198
32
import org.springframework.security.ConfigAttributeDefinition;
32
import org.springframework.security.access.ConfigAttribute;
3199
33
import org.springframework.security.intercept.ObjectDefinitionSource;
33
import org.springframework.security.access.SecurityMetadataSource;
3200
34
34
3201
35
/**
35
/**
3203
36
 * Generic ObjectDefinitionSource for one single object.
36
 * Generic SecurityMetadataSource for one single object.
3204
37
 * 
37
 * 
3205
38
 * @author Torgeir Lorange Ostby
38
 * @author Torgeir Lorange Ostby
3206
39
 * @version $Id: SingleObjectDefinitionSource.java 6335 2008-11-20 11:11:26Z larshelg $
3207
40
 */
39
 */
3210
41
public class SingleObjectDefinitionSource
40
public class SingleSecurityMetadataSource
3211
42
    implements ObjectDefinitionSource
41
    implements SecurityMetadataSource
3212
43
{
42
{
3213
44
    private Object object;
43
    private Object object;
3214
45
44
3216
46
    private ConfigAttributeDefinition attributes;
45
    private Collection<ConfigAttribute> attributes;
3217
47
46
3218
48
    // -------------------------------------------------------------------------
47
    // -------------------------------------------------------------------------
3219
49
    // Constructors
48
    // Constructors
3220
50
    // -------------------------------------------------------------------------
49
    // -------------------------------------------------------------------------
3221
51
50
3223
52
    public SingleObjectDefinitionSource( Object object )
51
    public SingleSecurityMetadataSource( Object object )
3224
53
    {
52
    {
3225
54
        this.object = object;
53
        this.object = object;
3226
55
    }
54
    }
3227
56
55
3229
57
    public SingleObjectDefinitionSource( Object object, ConfigAttributeDefinition attributes )
56
    public SingleSecurityMetadataSource( Object object, Collection<ConfigAttribute> attributes )
3230
58
    {
57
    {
3231
59
        this.object = object;   
58
        this.object = object;   
3232
60
        this.attributes = attributes;        
59
        this.attributes = attributes;        
3233
61
    }
60
    }
3234
62
61
3235
63
    // -------------------------------------------------------------------------
62
    // -------------------------------------------------------------------------
3237
64
    // ObjectDefinitionSource implementation
63
    // SecurityMetadataSource implementation
3238
65
    // -------------------------------------------------------------------------
64
    // -------------------------------------------------------------------------
3239
66
65
3241
67
    public ConfigAttributeDefinition getAttributes( Object object )
66
    public Collection<ConfigAttribute> getAttributes( Object object )
3242
68
        throws IllegalArgumentException
67
        throws IllegalArgumentException
3243
69
    {
68
    {
3244
70
        if ( !supports( object.getClass() ) )
69
        if ( !supports( object.getClass() ) )
3245
@@ -80,14 +79,16 @@
3246
80
        return null;
79
        return null;
3247
81
    }
80
    }
3248
82
81
3256
83
    public Collection<?> getConfigAttributeDefinitions()
82
    @Override
3257
84
    {
83
    public boolean supports( Class<?> clazz )
3251
85
        return null;
3252
86
    }
3253
87
3254
88
    @SuppressWarnings( "unchecked" )
3255
89
    public boolean supports( Class clazz )
3258
90
    {
84
    {
3259
91
        return clazz.isAssignableFrom( object.getClass() );
85
        return clazz.isAssignableFrom( object.getClass() );
3260
92
    }
86
    }
3261
87
3262
88
    @Override
3263
89
    public Collection<ConfigAttribute> getAllConfigAttributes()
3264
90
    {
3265
91
        return this.attributes;
3266
92
    }
3267
93
3268
93
}
94
}
3269
94
95
3270
=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/intercept/XWorkSecurityInterceptor.java'
3271
--- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/intercept/XWorkSecurityInterceptor.java	2010-04-12 21:23:33 +0000
3272
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/intercept/XWorkSecurityInterceptor.java	2010-05-07 11:16:36 +0000
3273
@@ -30,11 +30,11 @@
3274
30
import java.util.HashMap;
30
import java.util.HashMap;
3275
31
import java.util.Map;
31
import java.util.Map;
3276
32
32
3277
33
import org.springframework.security.intercept.AbstractSecurityInterceptor;
3278
34
import org.springframework.security.intercept.InterceptorStatusToken;
3279
35
import org.springframework.security.intercept.ObjectDefinitionSource;
3280
36
import org.hisp.dhis.security.ActionAccessResolver;
33
import org.hisp.dhis.security.ActionAccessResolver;
3281
37
import org.hisp.dhis.security.authority.RequiredAuthoritiesProvider;
34
import org.hisp.dhis.security.authority.RequiredAuthoritiesProvider;
3282
35
import org.springframework.security.access.SecurityMetadataSource;
3283
36
import org.springframework.security.access.intercept.AbstractSecurityInterceptor;
3284
37
import org.springframework.security.access.intercept.InterceptorStatusToken;
3285
38
38
3286
39
import com.opensymphony.xwork2.ActionInvocation;
39
import com.opensymphony.xwork2.ActionInvocation;
3287
40
import com.opensymphony.xwork2.config.entities.ActionConfig;
40
import com.opensymphony.xwork2.config.entities.ActionConfig;
3288
@@ -50,7 +50,7 @@
3289
50
{
50
{
3290
51
    private static final String KEY_ACTION_ACCESS_RESOLVER = "auth";
51
    private static final String KEY_ACTION_ACCESS_RESOLVER = "auth";
3291
52
52
3293
53
    private ThreadLocal<ObjectDefinitionSource> definitionSourceTag = new ThreadLocal<ObjectDefinitionSource>();
53
    private ThreadLocal<SecurityMetadataSource> definitionSourceTag = new ThreadLocal<SecurityMetadataSource>();
3294
54
54
3295
55
    // -------------------------------------------------------------------------
55
    // -------------------------------------------------------------------------
3296
56
    // Dependencies
56
    // Dependencies
3297
@@ -85,14 +85,14 @@
3298
85
    public String intercept( ActionInvocation invocation )
85
    public String intercept( ActionInvocation invocation )
3299
86
        throws Exception
86
        throws Exception
3300
87
    {
87
    {
3301
88
        Object result = null;
3302
89
        ActionConfig actionConfig = invocation.getProxy().getConfig();
88
        ActionConfig actionConfig = invocation.getProxy().getConfig();
3304
90
        definitionSourceTag.set( requiredAuthoritiesProvider.createObjectDefinitionSource( actionConfig ) );
89
        definitionSourceTag.set( requiredAuthoritiesProvider.createSecurityMetadataSource( actionConfig ) );
3305
91
90
3306
92
        InterceptorStatusToken token = beforeInvocation( actionConfig );
91
        InterceptorStatusToken token = beforeInvocation( actionConfig );
3307
93
92
3308
94
        addActionAccessResolver( invocation );
93
        addActionAccessResolver( invocation );
3309
95
94
3310
95
        Object result = null;
3311
96
        try
96
        try
3312
97
        {
97
        {
3313
98
            result = invocation.invoke();
98
            result = invocation.invoke();
3314
@@ -123,9 +123,9 @@
3315
123
    }
123
    }
3316
124
124
3317
125
    @Override
125
    @Override
3319
126
    public ObjectDefinitionSource obtainObjectDefinitionSource()
126
    public SecurityMetadataSource obtainSecurityMetadataSource()
3320
127
    {
127
    {
3322
128
        ObjectDefinitionSource definitionSource = definitionSourceTag.get();
128
        SecurityMetadataSource definitionSource = definitionSourceTag.get();
3323
129
129
3324
130
        if ( definitionSource != null )
130
        if ( definitionSource != null )
3325
131
        {
131
        {
3326
@@ -137,7 +137,7 @@
3327
137
        // invocation. Returning an empty dummy.
137
        // invocation. Returning an empty dummy.
3328
138
        // ---------------------------------------------------------------------
138
        // ---------------------------------------------------------------------
3329
139
139
3331
140
        return new SingleObjectDefinitionSource( new ActionConfig.Builder( "", "", "" ).build() );
140
        return new SingleSecurityMetadataSource( new ActionConfig.Builder( "", "", "" ).build() );
3332
141
    }
141
    }
3333
142
142
3334
143
    // -------------------------------------------------------------------------
143
    // -------------------------------------------------------------------------
3335
144
144
3336
=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/listener/AuthenticationListener.java'
3337
--- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/listener/AuthenticationListener.java	2010-04-12 21:23:33 +0000
3338
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/listener/AuthenticationListener.java	2010-05-07 11:16:36 +0000
3339
@@ -30,9 +30,9 @@
3340
30
import org.hisp.dhis.useraudit.UserAuditService;
30
import org.hisp.dhis.useraudit.UserAuditService;
3341
31
import org.springframework.context.ApplicationEvent;
31
import org.springframework.context.ApplicationEvent;
3342
32
import org.springframework.context.ApplicationListener;
32
import org.springframework.context.ApplicationListener;
3346
33
import org.springframework.security.event.authentication.AbstractAuthenticationFailureEvent;
33
import org.springframework.security.authentication.event.AbstractAuthenticationFailureEvent;
3347
34
import org.springframework.security.event.authentication.AuthenticationSuccessEvent;
34
import org.springframework.security.authentication.event.AuthenticationSuccessEvent;
3348
35
import org.springframework.security.userdetails.UserDetails;
35
import org.springframework.security.core.userdetails.UserDetails;
3349
36
36
3350
37
/**
37
/**
3351
38
 * @author Lars Helge Overland
38
 * @author Lars Helge Overland
3352
39
39
3353
=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/vote/AbstractPrefixedAccessDecisionVoter.java'
3354
--- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/vote/AbstractPrefixedAccessDecisionVoter.java	2010-04-12 21:23:33 +0000
3355
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/vote/AbstractPrefixedAccessDecisionVoter.java	2010-05-07 11:16:36 +0000
3356
@@ -27,10 +27,10 @@
3357
27
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
27
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3358
28
 */
28
 */
3359
29
29
3360
30
import org.springframework.security.ConfigAttribute;
3361
31
import org.springframework.security.vote.AccessDecisionVoter;
3362
32
import org.apache.commons.logging.Log;
30
import org.apache.commons.logging.Log;
3363
33
import org.apache.commons.logging.LogFactory;
31
import org.apache.commons.logging.LogFactory;
3364
32
import org.springframework.security.access.AccessDecisionVoter;
3365
33
import org.springframework.security.access.ConfigAttribute;
3366
34
34
3367
35
/**
35
/**
3368
36
 * @author Torgeir Lorange Ostby
36
 * @author Torgeir Lorange Ostby
3369
37
37
3370
=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/vote/ActionAccessVoter.java'
3371
--- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/vote/ActionAccessVoter.java	2010-04-12 21:23:33 +0000
3372
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/vote/ActionAccessVoter.java	2010-05-07 11:16:36 +0000
3373
@@ -31,10 +31,9 @@
3374
31
31
3375
32
import org.apache.commons.logging.Log;
32
import org.apache.commons.logging.Log;
3376
33
import org.apache.commons.logging.LogFactory;
33
import org.apache.commons.logging.LogFactory;
3381
34
import org.springframework.security.Authentication;
34
import org.springframework.security.access.ConfigAttribute;
3382
35
import org.springframework.security.ConfigAttribute;
35
import org.springframework.security.core.Authentication;
3383
36
import org.springframework.security.ConfigAttributeDefinition;
36
import org.springframework.security.core.GrantedAuthority;
3380
37
import org.springframework.security.GrantedAuthority;
3384
38
37
3385
39
import com.opensymphony.xwork2.config.entities.ActionConfig;
38
import com.opensymphony.xwork2.config.entities.ActionConfig;
3386
40
39
3387
@@ -51,8 +50,8 @@
3388
51
    // AccessDecisionVoter implementation
50
    // AccessDecisionVoter implementation
3389
52
    // -------------------------------------------------------------------------
51
    // -------------------------------------------------------------------------
3390
53
52
3393
54
    @SuppressWarnings( "unchecked" )
53
    @Override
3394
55
    public boolean supports( Class clazz )
54
    public boolean supports( Class<?> clazz )
3395
56
    {
55
    {
3396
57
        boolean result = ActionConfig.class.equals( clazz );
56
        boolean result = ActionConfig.class.equals( clazz );
3397
58
57
3398
@@ -61,8 +60,8 @@
3399
61
        return result;
60
        return result;
3400
62
    }
61
    }
3401
63
62
3404
64
    @SuppressWarnings( "unchecked" )
63
    @Override
3405
65
    public int vote( Authentication authentication, Object object, ConfigAttributeDefinition definition )
64
    public int vote( Authentication authentication, Object object, Collection<ConfigAttribute> attributes )
3406
66
    {
65
    {
3407
67
        if ( !supports( object.getClass() ) )
66
        if ( !supports( object.getClass() ) )
3408
68
        {
67
        {
3409
@@ -73,8 +72,6 @@
3410
73
72
3411
74
        int supported = 0;
73
        int supported = 0;
3412
75
        
74
        
3413
76
        Collection<ConfigAttribute> attributes =  definition.getConfigAttributes();
3414
77
3415
78
        for ( ConfigAttribute attribute : attributes )
75
        for ( ConfigAttribute attribute : attributes )
3416
79
        {
76
        {
3417
80
            if ( supports( attribute ) )
77
            if ( supports( attribute ) )
3418
81
78
3419
=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/vote/LogicalOrAccessDecisionManager.java'
3420
--- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/vote/LogicalOrAccessDecisionManager.java	2010-04-12 21:23:33 +0000
3421
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/vote/LogicalOrAccessDecisionManager.java	2010-05-07 11:16:36 +0000
3422
@@ -27,17 +27,17 @@
3423
27
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
27
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3424
28
 */
28
 */
3425
29
29
3426
30
import java.util.Collection;
3427
30
import java.util.Collections;
31
import java.util.Collections;
3428
31
import java.util.List;
32
import java.util.List;
3429
32
33
3430
33
import org.springframework.security.AccessDecisionManager;
3431
34
import org.springframework.security.AccessDeniedException;
3432
35
import org.springframework.security.Authentication;
3433
36
import org.springframework.security.ConfigAttribute;
3434
37
import org.springframework.security.ConfigAttributeDefinition;
3435
38
import org.springframework.security.InsufficientAuthenticationException;
3436
39
import org.apache.commons.logging.Log;
34
import org.apache.commons.logging.Log;
3437
40
import org.apache.commons.logging.LogFactory;
35
import org.apache.commons.logging.LogFactory;
3438
36
import org.springframework.security.access.AccessDecisionManager;
3439
37
import org.springframework.security.access.AccessDeniedException;
3440
38
import org.springframework.security.access.ConfigAttribute;
3441
39
import org.springframework.security.authentication.InsufficientAuthenticationException;
3442
40
import org.springframework.security.core.Authentication;
3443
41
41
3444
42
/**
42
/**
3445
43
 * AccessDecisionManager which delegates to other AccessDecisionManagers in a
43
 * AccessDecisionManager which delegates to other AccessDecisionManagers in a
3446
@@ -65,7 +65,8 @@
3447
65
    // Interface implementation
65
    // Interface implementation
3448
66
    // -------------------------------------------------------------------------
66
    // -------------------------------------------------------------------------
3449
67
67
3451
68
    public void decide( Authentication authentication, Object object, ConfigAttributeDefinition definition )
68
    @Override
3452
69
    public void decide( Authentication authentication, Object object, Collection<ConfigAttribute> configAttributes )
3453
69
        throws AccessDeniedException, InsufficientAuthenticationException
70
        throws AccessDeniedException, InsufficientAuthenticationException
3454
70
    {
71
    {
3455
71
        AccessDeniedException ade = null;
72
        AccessDeniedException ade = null;
3456
@@ -75,7 +76,7 @@
3457
75
        {
76
        {
3458
76
            try
77
            try
3459
77
            {
78
            {
3461
78
                accessDecisionManager.decide( authentication, object, definition );
79
                accessDecisionManager.decide( authentication, object, configAttributes );
3462
79
80
3463
80
                LOG.debug( "ACCESS GRANTED [" + object.toString() + "]" );
81
                LOG.debug( "ACCESS GRANTED [" + object.toString() + "]" );
3464
81
82
3465
@@ -117,8 +118,8 @@
3466
117
        return false;
118
        return false;
3467
118
    }
119
    }
3468
119
120
3471
120
    @SuppressWarnings( "unchecked" )
121
    @Override
3472
121
    public boolean supports( Class clazz )
122
    public boolean supports( Class<?> clazz )
3473
122
    {
123
    {
3474
123
        for ( AccessDecisionManager accessDecisionManager : accessDecisionManagers )
124
        for ( AccessDecisionManager accessDecisionManager : accessDecisionManagers )
3475
124
        {
125
        {
3476
125
126
3477
=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/vote/ModuleAccessVoter.java'
3478
--- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/vote/ModuleAccessVoter.java	2010-04-12 21:23:33 +0000
3479
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/vote/ModuleAccessVoter.java	2010-05-07 11:16:36 +0000
3480
@@ -27,14 +27,15 @@
3481
27
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
27
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3482
28
 */
28
 */
3483
29
29
3484
30
import java.util.Collection;
3485
30
import java.util.Collections;
31
import java.util.Collections;
3486
31
import java.util.Set;
32
import java.util.Set;
3487
32
33
3488
33
import org.springframework.security.Authentication;
3489
34
import org.springframework.security.ConfigAttributeDefinition;
3490
35
import org.springframework.security.GrantedAuthority;
3491
36
import org.apache.commons.logging.Log;
34
import org.apache.commons.logging.Log;
3492
37
import org.apache.commons.logging.LogFactory;
35
import org.apache.commons.logging.LogFactory;
3493
36
import org.springframework.security.access.ConfigAttribute;
3494
37
import org.springframework.security.core.Authentication;
3495
38
import org.springframework.security.core.GrantedAuthority;
3496
38
39
3497
39
import com.opensymphony.xwork2.config.entities.ActionConfig;
40
import com.opensymphony.xwork2.config.entities.ActionConfig;
3498
40
41
3499
@@ -75,8 +76,8 @@
3500
75
     * <code>com.opensymphony.xwork.config.entities.ActionConfig</code>.
76
     * <code>com.opensymphony.xwork.config.entities.ActionConfig</code>.
3501
76
     * False otherwise.
77
     * False otherwise.
3502
77
     */
78
     */
3505
78
    @SuppressWarnings( "unchecked" )
79
    @Override
3506
79
    public boolean supports( Class clazz )
80
    public boolean supports( Class<?> clazz )
3507
80
    {
81
    {
3508
81
        boolean result = ActionConfig.class.equals( clazz );
82
        boolean result = ActionConfig.class.equals( clazz );
3509
82
83
3510
@@ -91,7 +92,7 @@
3511
91
     * prefix + module name, or the module name is in the always accessible set.
92
     * prefix + module name, or the module name is in the always accessible set.
3512
92
     * Otherwise votes ACCESS_DENIED.
93
     * Otherwise votes ACCESS_DENIED.
3513
93
     */
94
     */
3515
94
    public int vote( Authentication authentication, Object object, ConfigAttributeDefinition definition )
95
    public int vote( Authentication authentication, Object object, Collection<ConfigAttribute> attributes )
3516
95
    {
96
    {
3517
96
        if ( !supports( object.getClass() ) )
97
        if ( !supports( object.getClass() ) )
3518
97
        {
98
        {
3519
98
99
3520
=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/vote/SimpleAccessVoter.java'
3521
--- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/vote/SimpleAccessVoter.java	2010-04-12 21:23:33 +0000
3522
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/vote/SimpleAccessVoter.java	2010-05-07 11:16:36 +0000
3523
@@ -27,14 +27,16 @@
3524
27
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
27
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3525
28
 */
28
 */
3526
29
29
3532
30
import org.springframework.security.Authentication;
30
import java.util.Collection;
3533
31
import org.springframework.security.ConfigAttribute;
31
3529
32
import org.springframework.security.ConfigAttributeDefinition;
3530
33
import org.springframework.security.GrantedAuthority;
3531
34
import org.springframework.security.vote.AccessDecisionVoter;
3534
35
import org.apache.commons.logging.Log;
32
import org.apache.commons.logging.Log;
3535
36
import org.apache.commons.logging.LogFactory;
33
import org.apache.commons.logging.LogFactory;
3536
37
34
3537
35
import org.springframework.security.access.AccessDecisionVoter;
3538
36
import org.springframework.security.access.ConfigAttribute;
3539
37
import org.springframework.security.core.Authentication;
3540
38
import org.springframework.security.core.GrantedAuthority;
3541
39
3542
38
/**
40
/**
3543
39
 * Simple AccessDecisionVoter which grants access if a specified required
41
 * Simple AccessDecisionVoter which grants access if a specified required
3544
40
 * authority is among the configAttributes.
42
 * authority is among the configAttributes.
3545
@@ -64,13 +66,13 @@
3546
64
            && configAttribute.getAttribute().equals( requiredAuthority );
66
            && configAttribute.getAttribute().equals( requiredAuthority );
3547
65
    }
67
    }
3548
66
68
3551
67
    @SuppressWarnings( "unchecked" )
69
    @Override
3552
68
    public boolean supports( Class clazz )
70
    public boolean supports( Class<?> clazz )
3553
69
    {
71
    {
3554
70
        return true;
72
        return true;
3555
71
    }
73
    }
3556
72
74
3558
73
    public int vote( Authentication authentication, Object object, ConfigAttributeDefinition definition )
75
    public int vote( Authentication authentication, Object object, Collection<ConfigAttribute> attributes )
3559
74
    {
76
    {
3560
75
        for ( GrantedAuthority authority : authentication.getAuthorities() )
77
        for ( GrantedAuthority authority : authentication.getAuthorities() )
3561
76
        {
78
        {
3562
77
79
3563
=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/beans.xml'
3564
--- dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/beans.xml	2010-04-28 04:59:07 +0000
3565
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/beans.xml	2010-05-07 11:16:36 +0000
3566
@@ -5,7 +5,7 @@
3567
5
	xsi:schemaLocation="http://www.springframework.org/schema/beans 
5
	xsi:schemaLocation="http://www.springframework.org/schema/beans 
3568
6
						http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
6
						http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
3569
7
						http://www.springframework.org/schema/security
7
						http://www.springframework.org/schema/security
3571
8
						http://www.springframework.org/schema/security/spring-security-2.0.xsd">
8
						http://www.springframework.org/schema/security/spring-security-2.0.4.xsd">
3572
9
9
3573
10
	<!-- Web Portal -->
10
	<!-- Web Portal -->
3574
11
11
3575
@@ -21,7 +21,7 @@
3576
21
		</property>
21
		</property>
3577
22
	</bean>
22
	</bean>
3578
23
		
23
		
3580
24
    <bean id="filterChainProxy" class="org.springframework.security.util.FilterChainProxy">
24
    <bean id="filterChainProxy" class="org.springframework.security.web.FilterChainProxy">
3581
25
        <sec:filter-chain-map path-type="ant">
25
        <sec:filter-chain-map path-type="ant">
3582
26
        <sec:filter-chain pattern="/dhis-web-commons/security/**" filters="none"/>
26
        <sec:filter-chain pattern="/dhis-web-commons/security/**" filters="none"/>
3583
27
        <sec:filter-chain pattern="/dhis-web-commons/util/**" filters="none"/>
27
        <sec:filter-chain pattern="/dhis-web-commons/util/**" filters="none"/>
3584
@@ -281,23 +281,31 @@
3585
281
    <!-- Security : Filter -->
281
    <!-- Security : Filter -->
3586
282
	
282
	
3587
283
	<bean id="httpSessionContextIntegrationFilter"
283
	<bean id="httpSessionContextIntegrationFilter"
3589
284
		class="org.springframework.security.context.HttpSessionContextIntegrationFilter" />
284
		class="org.springframework.security.web.context.HttpSessionContextIntegrationFilter" />
3590
285
285
3591
286
	<bean id="authenticationProcessingFilter"
286
	<bean id="authenticationProcessingFilter"
3593
287
		class="org.springframework.security.ui.webapp.AuthenticationProcessingFilter">
287
		class="org.springframework.security.web.authentication.AuthenticationProcessingFilter">
3594
288
		<property name="authenticationManager" ref="authenticationManager" />
288
		<property name="authenticationManager" ref="authenticationManager" />
3597
289
		<property name="authenticationFailureUrl" value="/dhis-web-commons/security/loginfailed.jsp" />
289
                <property name="authenticationFailureHandler" ref="failureHandler" />
3598
290
		<property name="defaultTargetUrl" value="/dhis-web-commons-security/loggedIn.action" />
290
                <property name="authenticationSuccessHandler" ref="successHandler" />
3599
291
		<property name="filterProcessesUrl" value="/dhis-web-commons-security/login.action" />
291
		<property name="filterProcessesUrl" value="/dhis-web-commons-security/login.action" />
3600
292
		<property name="alwaysUseDefaultTargetUrl" value="true" />
3601
293
	</bean>
292
	</bean>
3602
294
293
3604
295
	<bean id="logoutFilter" class="org.springframework.security.ui.logout.LogoutFilter">
294
        <bean id="successHandler" class="org.springframework.security.web.authentication.SavedRequestAwareAuthenticationSuccessHandler" >
3605
295
          <property name="defaultTargetUrl" value="/dhis-web-commons-security/loggedIn.action" />
3606
296
          <property name="alwaysUseDefaultTargetUrl" value="true" />
3607
297
        </bean>
3608
298
        
3609
299
        <bean id="failureHandler" class="org.springframework.security.web.authentication.SimpleUrlAuthenticationFailureHandler" >
3610
300
          <property name="defaultFailureUrl" value="/dhis-web-commons/security/loginfailed.jsp" />
3611
301
        </bean>
3612
302
3613
303
	<bean id="logoutFilter" class="org.springframework.security.web.authentication.logout.LogoutFilter">
3614
296
		<constructor-arg value="/" />
304
		<constructor-arg value="/" />
3615
297
		<constructor-arg>
305
		<constructor-arg>
3616
298
			<list>
306
			<list>
3617
299
				<ref bean="userAuditLogoutFilter" />
307
				<ref bean="userAuditLogoutFilter" />
3619
300
				<bean class="org.springframework.security.ui.logout.SecurityContextLogoutHandler" />
308
				<bean class="org.springframework.security.web.authentication.logout.SecurityContextLogoutHandler" />
3620
301
			</list>
309
			</list>
3621
302
		</constructor-arg>
310
		</constructor-arg>
3622
303
		<property name="filterProcessesUrl" value="/dhis-web-commons-security/logout.action" />
311
		<property name="filterProcessesUrl" value="/dhis-web-commons-security/logout.action" />
3623
@@ -369,7 +377,7 @@
3624
369
		</property>
377
		</property>
3625
370
	</bean>
378
	</bean>
3626
371
379
3628
372
	<bean id="regularAccessDecisionVoting" class="org.springframework.security.vote.UnanimousBased">
380
	<bean id="regularAccessDecisionVoting" class="org.springframework.security.access.vote.UnanimousBased">
3629
373
		<property name="decisionVoters">
381
		<property name="decisionVoters">
3630
374
			<list>
382
			<list>
3631
375
				<ref local="actionAccessVoter" />
383
				<ref local="actionAccessVoter" />
3632
@@ -400,7 +408,7 @@
3633
400
		</property>
408
		</property>
3634
401
	</bean>
409
	</bean>
3635
402
410
3637
403
	<bean id="adminAccessDecisionVoting" class="org.springframework.security.vote.UnanimousBased">
411
	<bean id="adminAccessDecisionVoting" class="org.springframework.security.access.vote.UnanimousBased">
3638
404
		<property name="decisionVoters">
412
		<property name="decisionVoters">
3639
405
			<list>
413
			<list>
3640
406
				<ref local="adminAccessVoter" />
414
				<ref local="adminAccessVoter" />
3641
407
415
3642
=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/datasetcompleted/action/GetDataSetAndPeriodByPeriodTypeAction.java'
3643
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/datasetcompleted/action/GetDataSetAndPeriodByPeriodTypeAction.java	2010-04-12 21:23:33 +0000
3644
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/datasetcompleted/action/GetDataSetAndPeriodByPeriodTypeAction.java	2010-05-07 11:16:36 +0000
3645
@@ -28,6 +28,7 @@
3646
28
package org.hisp.dhis.reportexcel.datasetcompleted.action;
28
package org.hisp.dhis.reportexcel.datasetcompleted.action;
3647
29
29
3648
30
import java.util.ArrayList;
30
import java.util.ArrayList;
3649
31
import java.util.Collections;
3650
31
import java.util.List;
32
import java.util.List;
3651
32
33
3652
33
import org.hisp.dhis.dataset.DataSet;
34
import org.hisp.dhis.dataset.DataSet;
3653
@@ -45,8 +46,6 @@
3654
45
46
3655
46
import com.opensymphony.xwork2.Action;
47
import com.opensymphony.xwork2.Action;
3656
47
48
3657
48
import edu.emory.mathcs.backport.java.util.Collections;
3658
49
3659
50
/**
49
/**
3660
51
 * @author Tran Thanh Tri
50
 * @author Tran Thanh Tri
3661
52
 * @version $Id$
51
 * @version $Id$
3662
53
52
3663
=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/datasetcompleted/action/ViewDataSetCompletedAction.java'
3664
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/datasetcompleted/action/ViewDataSetCompletedAction.java	2010-04-12 21:23:33 +0000
3665
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/datasetcompleted/action/ViewDataSetCompletedAction.java	2010-05-07 11:16:36 +0000
3666
@@ -27,6 +27,7 @@
3667
27
package org.hisp.dhis.reportexcel.datasetcompleted.action;
27
package org.hisp.dhis.reportexcel.datasetcompleted.action;
3668
28
28
3669
29
import java.util.ArrayList;
29
import java.util.ArrayList;
3670
30
import java.util.Collections;
3671
30
import java.util.HashSet;
31
import java.util.HashSet;
3672
31
import java.util.List;
32
import java.util.List;
3673
32
import java.util.Set;
33
import java.util.Set;
3674
@@ -44,8 +45,6 @@
3675
44
import org.hisp.dhis.period.comparator.PeriodComparator;
45
import org.hisp.dhis.period.comparator.PeriodComparator;
3676
45
import org.hisp.dhis.reportexcel.action.ActionSupport;
46
import org.hisp.dhis.reportexcel.action.ActionSupport;
3677
46
47
3678
47
import edu.emory.mathcs.backport.java.util.Collections;
3679
48
3680
49
/**
48
/**
3681
50
 * @author Tran Thanh Tri
49
 * @author Tran Thanh Tri
3682
51
 * @version $Id$
50
 * @version $Id$
3683
52
51
3684
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/databrowser/SearchAction.java'
3685
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/databrowser/SearchAction.java	2010-04-27 03:25:54 +0000
3686
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/databrowser/SearchAction.java	2010-05-07 11:16:36 +0000
3687
@@ -29,6 +29,7 @@
3688
29
29
3689
30
import java.util.ArrayList;
30
import java.util.ArrayList;
3690
31
import java.util.Collection;
31
import java.util.Collection;
3691
32
import java.util.Collections;
3692
32
import java.util.Iterator;
33
import java.util.Iterator;
3693
33
import java.util.List;
34
import java.util.List;
3694
34
import java.util.Set;
35
import java.util.Set;
3695
@@ -53,8 +54,6 @@
3696
53
54
3697
54
import com.opensymphony.xwork2.Action;
55
import com.opensymphony.xwork2.Action;
3698
55
56
3699
56
import edu.emory.mathcs.backport.java.util.Collections;
3700
57
3701
58
/**
57
/**
3702
59
 * @author espenjac, joakibj, briane, eivinhb
58
 * @author espenjac, joakibj, briane, eivinhb
3703
60
 * @version $Id$
59
 * @version $Id$
3704
61
60
3705
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/META-INF/dhis/beans.xml'
3706
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/META-INF/dhis/beans.xml	2010-04-29 04:33:47 +0000
3707
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/META-INF/dhis/beans.xml	2010-05-07 11:16:36 +0000
3708
@@ -414,16 +414,13 @@
3709
414
		</property>
414
		</property>
3710
415
	</bean>
415
	</bean>
3711
416
416
3722
417
	<bean
417
	<bean id="org.hisp.dhis.dataadmin.action.minmaxvalidation.UnselectOrganisationUnitGroupAction"
3723
418
		id="org.hisp.dhis.dataadmin.action.minmaxvalidation.UnselectOrganisationUnitGroupAction"
418
              class="org.hisp.dhis.dataadmin.action.minmaxvalidation.UnselectOrganisationUnitGroupAction"
3724
419
		class="org.hisp.dhis.dataadmin.action.minmaxvalidation.UnselectOrganisationUnitGroupAction"
419
              scope="prototype">
3725
420
		scope="prototype">
420
          <property name="selectionTreeManager"
3726
421
		<property name="selectionTreeManager">
421
                    ref="org.hisp.dhis.oust.manager.SelectionTreeManager" />
3727
422
			<ref bean="org.hisp.dhis.oust.manager.SelectionTreeManager" />
422
          <property name="organisationUnitGroupService" 
3728
423
		</property>
423
                    ref="org.hisp.dhis.organisationunit.OrganisationUnitGroupService" />
3719
424
		<property name="organisationUnitGroupService">
3720
425
			<ref bean="org.hisp.dhis.organisationunit.OrganisationUnitGroupService" />
3721
426
		</property>
3729
427
	</bean>
424
	</bean>
3730
428
425
3731
429
</beans>
426
</beans>
3732
430
427
3733
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/GetDataElementAction.java'
3734
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/GetDataElementAction.java	2010-04-12 21:23:33 +0000
3735
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/GetDataElementAction.java	2010-05-07 11:16:36 +0000
3736
@@ -27,7 +27,9 @@
3737
27
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
27
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3738
28
 */
28
 */
3739
29
29
3740
30
3741
30
import java.util.ArrayList;
31
import java.util.ArrayList;
3742
32
import java.util.Collections;
3743
31
import java.util.List;
33
import java.util.List;
3744
32
34
3745
33
import org.hisp.dhis.dataelement.DataElement;
35
import org.hisp.dhis.dataelement.DataElement;
3746
@@ -37,8 +39,6 @@
3747
37
39
3748
38
import com.opensymphony.xwork2.ActionSupport;
40
import com.opensymphony.xwork2.ActionSupport;
3749
39
41
3750
40
import edu.emory.mathcs.backport.java.util.Collections;
3751
41
3752
42
/**
42
/**
3753
43
 * @author Torgeir Lorange Ostby
43
 * @author Torgeir Lorange Ostby
3754
44
 * @version $Id: GetDataElementAction.java 5789 2008-10-02 09:47:04Z larshelg $
44
 * @version $Id: GetDataElementAction.java 5789 2008-10-02 09:47:04Z larshelg $
3755
45
45
3756
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/ShowAddDataElementForm.java'
3757
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/ShowAddDataElementForm.java	2010-04-12 21:23:33 +0000
3758
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/ShowAddDataElementForm.java	2010-05-07 11:16:36 +0000
3759
@@ -29,6 +29,7 @@
3760
29
29
3761
30
import java.util.ArrayList;
30
import java.util.ArrayList;
3762
31
import java.util.Collection;
31
import java.util.Collection;
3763
32
import java.util.Collections;
3764
32
import java.util.List;
33
import java.util.List;
3765
33
34
3766
34
import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
35
import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
3767
@@ -43,8 +44,6 @@
3768
43
44
3769
44
import com.opensymphony.xwork2.Action;
45
import com.opensymphony.xwork2.Action;
3770
45
46
3771
46
import edu.emory.mathcs.backport.java.util.Collections;
3772
47
3773
48
/**
47
/**
3774
49
 * @author Hans S. Toemmerholt
48
 * @author Hans S. Toemmerholt
3775
50
 * @version $Id: GetDataElementAction.java 2869 2007-02-20 14:26:09Z andegje $
49
 * @version $Id: GetDataElementAction.java 2869 2007-02-20 14:26:09Z andegje $
3776
51
50
3777
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/ShowUpdateDataElementFormAction.java'
3778
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/ShowUpdateDataElementFormAction.java	2010-04-12 21:23:33 +0000
3779
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/ShowUpdateDataElementFormAction.java	2010-05-07 11:16:36 +0000
3780
@@ -31,6 +31,7 @@
3781
31
31
3782
32
import java.util.ArrayList;
32
import java.util.ArrayList;
3783
33
import java.util.Collection;
33
import java.util.Collection;
3784
34
import java.util.Collections;
3785
34
import java.util.List;
35
import java.util.List;
3786
35
import java.util.Map;
36
import java.util.Map;
3787
36
37
3788
@@ -49,8 +50,6 @@
3789
49
50
3790
50
import com.opensymphony.xwork2.ActionSupport;
51
import com.opensymphony.xwork2.ActionSupport;
3791
51
52
3792
52
import edu.emory.mathcs.backport.java.util.Collections;
3793
53
3794
54
/**
53
/**
3795
55
 * @author Hans S. Toemmerholt
54
 * @author Hans S. Toemmerholt
3796
56
 * @version $Id: GetDataElementAction.java 2869 2007-02-20 14:26:09Z andegje $
55
 * @version $Id: GetDataElementAction.java 2869 2007-02-20 14:26:09Z andegje $
3797
57
56
3798
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroup/GetAssignedIndicatorGroupsAction.java'
3799
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroup/GetAssignedIndicatorGroupsAction.java	2010-04-12 21:23:33 +0000
3800
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroup/GetAssignedIndicatorGroupsAction.java	2010-05-07 11:16:36 +0000
3801
@@ -28,6 +28,7 @@
3802
28
 */
28
 */
3803
29
29
3804
30
import java.util.ArrayList;
30
import java.util.ArrayList;
3805
31
import java.util.Collections;
3806
31
import java.util.List;
32
import java.util.List;
3807
32
33
3808
33
import org.hisp.dhis.indicator.Indicator;
34
import org.hisp.dhis.indicator.Indicator;
3809
@@ -37,7 +38,6 @@
3810
37
38
3811
38
import com.opensymphony.xwork2.Action;
39
import com.opensymphony.xwork2.Action;
3812
39
40
3813
40
import edu.emory.mathcs.backport.java.util.Collections;
3814
41
41
3815
42
/**
42
/**
3816
43
 * @author Tran Thanh Tri
43
 * @author Tran Thanh Tri
3817
44
44
3818
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patientattributegroup/GetPatientAttributeGroupAction.java'
3819
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patientattributegroup/GetPatientAttributeGroupAction.java	2010-03-04 13:42:32 +0000
3820
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patientattributegroup/GetPatientAttributeGroupAction.java	2010-05-07 11:16:36 +0000
3821
@@ -28,6 +28,7 @@
3822
28
package org.hisp.dhis.patient.action.patientattributegroup;
28
package org.hisp.dhis.patient.action.patientattributegroup;
3823
29
29
3824
30
import java.util.ArrayList;
30
import java.util.ArrayList;
3825
31
import java.util.Collections;
3826
31
import java.util.List;
32
import java.util.List;
3827
32
33
3828
33
import org.hisp.dhis.patient.PatientAttribute;
34
import org.hisp.dhis.patient.PatientAttribute;
3829
@@ -38,8 +39,6 @@
3830
38
39
3831
39
import com.opensymphony.xwork2.Action;
40
import com.opensymphony.xwork2.Action;
3832
40
41
3833
41
import edu.emory.mathcs.backport.java.util.Collections;
3834
42
3835
43
/**
42
/**
3836
44
 * @author Chau Thu Tran
43
 * @author Chau Thu Tran
3837
45
 * @version $Id$
44
 * @version $Id$
3838
46
45
3839
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patientattributegroup/GetPatientAttributeGroupListAction.java'
3840
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patientattributegroup/GetPatientAttributeGroupListAction.java	2010-01-29 03:08:45 +0000
3841
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patientattributegroup/GetPatientAttributeGroupListAction.java	2010-05-07 11:16:36 +0000
3842
@@ -28,6 +28,7 @@
3843
28
package org.hisp.dhis.patient.action.patientattributegroup;
28
package org.hisp.dhis.patient.action.patientattributegroup;
3844
29
29
3845
30
import java.util.ArrayList;
30
import java.util.ArrayList;
3846
31
import java.util.Collections;
3847
31
import java.util.List;
32
import java.util.List;
3848
32
33
3849
33
import org.hisp.dhis.patient.PatientAttributeGroup;
34
import org.hisp.dhis.patient.PatientAttributeGroup;
3850
@@ -36,7 +37,6 @@
3851
36
37
3852
37
import com.opensymphony.xwork2.Action;
38
import com.opensymphony.xwork2.Action;
3853
38
39
3854
39
import edu.emory.mathcs.backport.java.util.Collections;
3855
40
40
3856
41
/**
41
/**
3857
42
 * @author Chau Thu Tran
42
 * @author Chau Thu Tran
3858
43
43
3859
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patientidentifiertype/GetPatientIdentifierTypeListAction.java'
3860
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patientidentifiertype/GetPatientIdentifierTypeListAction.java	2010-04-03 09:35:43 +0000
3861
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patientidentifiertype/GetPatientIdentifierTypeListAction.java	2010-05-07 11:16:36 +0000
3862
@@ -28,6 +28,7 @@
3863
28
package org.hisp.dhis.patient.action.patientidentifiertype;
28
package org.hisp.dhis.patient.action.patientidentifiertype;
3864
29
29
3865
30
import java.util.ArrayList;
30
import java.util.ArrayList;
3866
31
import java.util.Collections;
3867
31
import java.util.List;
32
import java.util.List;
3868
32
33
3869
33
import org.hisp.dhis.patient.PatientIdentifierType;
34
import org.hisp.dhis.patient.PatientIdentifierType;
3870
@@ -36,8 +37,6 @@
3871
36
37
3872
37
import com.opensymphony.xwork2.Action;
38
import com.opensymphony.xwork2.Action;
3873
38
39
3874
39
import edu.emory.mathcs.backport.java.util.Collections;
3875
40
3876
41
/**
40
/**
3877
42
 * @author Viet 
41
 * @author Viet 
3878
43
 * @version $Id$
42
 * @version $Id$
3879
44
43
3880
=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetAllMapLegendsAction.java'
3881
--- dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetAllMapLegendsAction.java	2010-04-12 21:23:33 +0000
3882
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetAllMapLegendsAction.java	2010-05-07 11:16:36 +0000
3883
@@ -27,7 +27,9 @@
3884
27
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
27
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3885
28
 */
28
 */
3886
29
29
3887
30
3888
30
import java.util.ArrayList;
31
import java.util.ArrayList;
3889
32
import java.util.Collections;
3890
31
import java.util.List;
33
import java.util.List;
3891
32
34
3892
33
import org.hisp.dhis.mapping.MapLegend;
35
import org.hisp.dhis.mapping.MapLegend;
3893
@@ -36,8 +38,6 @@
3894
36
38
3895
37
import com.opensymphony.xwork2.Action;
39
import com.opensymphony.xwork2.Action;
3896
38
40
3897
39
import edu.emory.mathcs.backport.java.util.Collections;
3898
40
3899
41
/**
41
/**
3900
42
 * @author Jan Henrik Overland
42
 * @author Jan Henrik Overland
3901
43
 * @version $Id$
43
 * @version $Id$
3902
44
44
3903
=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetMapLegendsByMapLegendSetAction.java'
3904
--- dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetMapLegendsByMapLegendSetAction.java	2010-04-12 21:23:33 +0000
3905
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetMapLegendsByMapLegendSetAction.java	2010-05-07 11:16:36 +0000
3906
@@ -28,6 +28,7 @@
3907
28
 */
28
 */
3908
29
29
3909
30
import java.util.ArrayList;
30
import java.util.ArrayList;
3910
31
import java.util.Collections;
3911
31
import java.util.List;
32
import java.util.List;
3912
32
33
3913
33
import org.hisp.dhis.mapping.MapLegend;
34
import org.hisp.dhis.mapping.MapLegend;
3914
@@ -36,8 +37,6 @@
3915
36
37
3916
37
import com.opensymphony.xwork2.Action;
38
import com.opensymphony.xwork2.Action;
3917
38
39
3918
39
import edu.emory.mathcs.backport.java.util.Collections;
3919
40
3920
41
/**
40
/**
3921
42
 * @author Jan Henrik Overland
41
 * @author Jan Henrik Overland
3922
43
 * @version $Id$
42
 * @version $Id$
3923
44
43
3924
=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/chart/action/SaveChartAction.java'
3925
--- dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/chart/action/SaveChartAction.java	2010-04-12 21:23:33 +0000
3926
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/chart/action/SaveChartAction.java	2010-05-07 11:16:36 +0000
3927
@@ -30,6 +30,7 @@
3928
30
import static org.hisp.dhis.system.util.ConversionUtils.getIntegerCollection;
30
import static org.hisp.dhis.system.util.ConversionUtils.getIntegerCollection;
3929
31
31
3930
32
import java.util.ArrayList;
32
import java.util.ArrayList;
3931
33
import java.util.Collections;
3932
33
import java.util.List;
34
import java.util.List;
3933
34
35
3934
35
import org.hisp.dhis.chart.Chart;
36
import org.hisp.dhis.chart.Chart;
3935
@@ -45,8 +46,6 @@
3936
45
46
3937
46
import com.opensymphony.xwork2.Action;
47
import com.opensymphony.xwork2.Action;
3938
47
48
3939
48
import edu.emory.mathcs.backport.java.util.Collections;
3940
49
3941
50
/**
49
/**
3942
51
 * @author Lars Helge Overland
50
 * @author Lars Helge Overland
3943
52
 * @version $Id: UploadDesignAction.java 5207 2008-05-22 12:16:36Z larshelg $
51
 * @version $Id: UploadDesignAction.java 5207 2008-05-22 12:16:36Z larshelg $
3944
53
52
3945
=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/pivottable/action/GetPivotTableAction.java'
3946
--- dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/pivottable/action/GetPivotTableAction.java	2010-04-12 21:23:33 +0000
3947
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/pivottable/action/GetPivotTableAction.java	2010-05-07 11:16:36 +0000
3948
@@ -27,6 +27,7 @@
3949
27
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
27
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3950
28
 */
28
 */
3951
29
29
3952
30
import java.util.Collections;
3953
30
import java.util.Comparator;
31
import java.util.Comparator;
3954
31
32
3955
32
import org.hisp.dhis.i18n.I18nFormat;
33
import org.hisp.dhis.i18n.I18nFormat;
3956
@@ -37,8 +38,6 @@
3957
37
38
3958
38
import com.opensymphony.xwork2.Action;
39
import com.opensymphony.xwork2.Action;
3959
39
40
3960
40
import edu.emory.mathcs.backport.java.util.Collections;
3961
41
3962
42
/**
41
/**
3963
43
 * @author Lars Helge Overland
42
 * @author Lars Helge Overland
3964
44
 * @version $Id$
43
 * @version $Id$
3965
45
44
3966
=== modified file 'dhis-2/dhis-web/dhis-web-validationrule/pom.xml'
3967
--- dhis-2/dhis-web/dhis-web-validationrule/pom.xml	2010-04-08 16:55:35 +0000
3968
+++ dhis-2/dhis-web/dhis-web-validationrule/pom.xml	2010-05-07 11:16:36 +0000
3969
@@ -46,10 +46,6 @@
3970
46
    <!-- Other -->
46
    <!-- Other -->
3971
47
    
47
    
3972
48
    <dependency>
48
    <dependency>
3973
49
      <groupId>org.springframework</groupId>
3974
50
      <artifactId>spring</artifactId>
3975
51
    </dependency>
3976
52
    <dependency>
3977
53
      <groupId>net.sourceforge.jexcelapi</groupId>
49
      <groupId>net.sourceforge.jexcelapi</groupId>
3978
54
      <artifactId>jxl</artifactId>
50
      <artifactId>jxl</artifactId>
3979
55
    </dependency>
51
    </dependency>
3980
56
52
3981
=== modified file 'dhis-2/pom.xml'
3982
--- dhis-2/pom.xml	2010-05-07 10:41:45 +0000
3983
+++ dhis-2/pom.xml	2010-05-07 11:16:36 +0000
3984
@@ -4,8 +4,8 @@
3985
4
  <artifactId>dhis</artifactId>
4
  <artifactId>dhis</artifactId>
3986
5
  <version>2.0.5-SNAPSHOT</version>
5
  <version>2.0.5-SNAPSHOT</version>
3987
6
  <packaging>pom</packaging>
6
  <packaging>pom</packaging>
3990
7
  <name>DHIS 2 - District Health Information System</name>
7
  <name>DHIS 2</name>
3991
8
  <url>http://dhis2.com</url>
8
  <url>http://dhis2.org</url>
3992
9
  
9
  
3993
10
  <description>
10
  <description>
3994
11
    The District Health Information System deals with registering,
11
    The District Health Information System deals with registering,
3995
@@ -62,6 +62,10 @@
3996
62
      <name>Dhis2 External Dependencies Repository</name>
62
      <name>Dhis2 External Dependencies Repository</name>
3997
63
      <url>http://dhis.uio.no/maven/external</url>
63
      <url>http://dhis.uio.no/maven/external</url>
3998
64
    </repository>
64
    </repository>
3999
65
    <repository>
4000
66
      <id>JBoss</id>
4001
67
      <url>http://repository.jboss.org/maven2</url>
4002
68
    </repository>
4003
65
  </repositories>
69
  </repositories>
4004
66
  
70
  
4005
67
  <issueManagement>
71
  <issueManagement>
4006
@@ -240,12 +244,12 @@
4007
240
      <dependency>
244
      <dependency>
4008
241
        <groupId>org.apache.struts</groupId>
245
        <groupId>org.apache.struts</groupId>
4009
242
        <artifactId>struts2-core</artifactId>
246
        <artifactId>struts2-core</artifactId>
4011
243
        <version>2.1.6</version>
247
        <version>2.1.8.1</version>
4012
244
      </dependency>
248
      </dependency>
4013
245
      <dependency>
249
      <dependency>
4014
246
        <groupId>org.apache.struts</groupId>
250
        <groupId>org.apache.struts</groupId>
4015
247
        <artifactId>struts2-spring-plugin</artifactId>
251
        <artifactId>struts2-spring-plugin</artifactId>
4017
248
        <version>2.1.6</version>
252
        <version>2.1.8.1</version>
4018
249
        <exclusions>
253
        <exclusions>
4019
250
          <exclusion>
254
          <exclusion>
4020
251
            <groupId>org.springframework</groupId>
255
            <groupId>org.springframework</groupId>
4021
@@ -271,10 +275,17 @@
4022
271
        <artifactId>velocity-tools</artifactId>
275
        <artifactId>velocity-tools</artifactId>
4023
272
        <version>1.2</version>
276
        <version>1.2</version>
4024
273
      </dependency>
277
      </dependency>
4025
278
<!-- TODO: NEED TO DECIDE ON QUICK -->
4026
274
      <dependency>
279
      <dependency>
4027
275
        <groupId>org.amplecode</groupId>
280
        <groupId>org.amplecode</groupId>
4028
276
        <artifactId>quick</artifactId>
281
        <artifactId>quick</artifactId>
4029
277
        <version>1.1.6</version>
282
        <version>1.1.6</version>
4030
283
        <exclusions>
4031
284
          <exclusion>
4032
285
            <groupId>org.springframework</groupId>
4033
286
            <artifactId>spring</artifactId>
4034
287
          </exclusion>
4035
288
        </exclusions>        
4036
278
      </dependency>
289
      </dependency>
4037
279
      <dependency>
290
      <dependency>
4038
280
        <groupId>com.lowagie</groupId>
291
        <groupId>com.lowagie</groupId>
4039
@@ -283,34 +294,30 @@
4040
283
      </dependency>
294
      </dependency>
4041
284
      <dependency>
295
      <dependency>
4042
285
        <groupId>org.springframework</groupId>
296
        <groupId>org.springframework</groupId>
4043
286
        <artifactId>spring</artifactId>
4044
287
        <version>2.5.6</version>
4045
288
      </dependency>
4046
289
      <dependency>
4047
290
        <groupId>org.springframework</groupId>
4048
291
        <artifactId>spring-beans</artifactId>
4049
292
        <version>2.5.6</version>
4050
293
      </dependency>
4051
294
      <dependency>
4052
295
        <groupId>org.springframework</groupId>
4053
296
        <artifactId>spring-test</artifactId>
297
        <artifactId>spring-test</artifactId>
4055
297
        <version>2.5.6</version>
298
        <version>${spring.version}</version>
4056
298
      </dependency>
299
      </dependency>
4057
299
      <dependency>
300
      <dependency>
4058
300
        <groupId>org.springframework</groupId>
301
        <groupId>org.springframework</groupId>
4061
301
        <artifactId>spring-core</artifactId>
302
        <artifactId>spring-orm</artifactId>
4062
302
        <version>2.5.6</version>
303
        <version>${spring.version}</version>
4063
303
      </dependency>
304
      </dependency>
4064
304
      <dependency>
305
      <dependency>
4065
305
        <groupId>org.springframework</groupId>
306
        <groupId>org.springframework</groupId>
4066
306
        <artifactId>spring-context</artifactId>
307
        <artifactId>spring-context</artifactId>
4068
307
        <version>2.5.6</version>
308
        <version>${spring.version}</version>
4069
308
      </dependency>
309
      </dependency>
4070
309
      <dependency>
310
      <dependency>
4071
310
        <groupId>org.springframework</groupId>
311
        <groupId>org.springframework</groupId>
4072
311
        <artifactId>spring-web</artifactId>
312
        <artifactId>spring-web</artifactId>
4075
312
        <version>2.5.6</version>
313
        <version>${spring.version}</version>
4076
313
      </dependency>
314
      </dependency>
4077
315
      <dependency>
4078
316
        <groupId>org.springframework</groupId>
4079
317
        <artifactId>spring-tx</artifactId>
4080
318
        <version>${spring.version}</version>
4081
319
      </dependency>
4082
320
4083
314
      <dependency>
321
      <dependency>
4084
315
        <groupId>org.aspectj</groupId>
322
        <groupId>org.aspectj</groupId>
4085
316
        <artifactId>aspectjrt</artifactId>
323
        <artifactId>aspectjrt</artifactId>
4086
@@ -396,7 +403,7 @@
4087
396
      <dependency>
403
      <dependency>
4088
397
        <groupId>junit</groupId>
404
        <groupId>junit</groupId>
4089
398
        <artifactId>junit</artifactId>
405
        <artifactId>junit</artifactId>
4091
399
        <version>4.4</version>
406
        <version>4.8.1</version>
4092
400
      </dependency>
407
      </dependency>
4093
401
      <dependency>
408
      <dependency>
4094
402
        <groupId>org.amplecode</groupId>
409
        <groupId>org.amplecode</groupId>
4095
@@ -418,6 +425,7 @@
4096
418
        <groupId>javax.servlet</groupId>
425
        <groupId>javax.servlet</groupId>
4097
419
        <artifactId>servlet-api</artifactId>
426
        <artifactId>servlet-api</artifactId>
4098
420
        <version>2.4</version>
427
        <version>2.4</version>
4099
428
        <scope>provided</scope>
4100
421
      </dependency>
429
      </dependency>
4101
422
      <!--DBMS -->
430
      <!--DBMS -->
4102
423
      <dependency>
431
      <dependency>
4103
@@ -435,25 +443,43 @@
4104
435
        <artifactId>ibatis2-sqlmap</artifactId>
443
        <artifactId>ibatis2-sqlmap</artifactId>
4105
436
        <version>2.1.7.597</version>
444
        <version>2.1.7.597</version>
4106
437
      </dependency>
445
      </dependency>
4111
438
      <dependency>
446
4112
439
        <groupId>org.hibernate</groupId>
447
      <dependency>
4113
440
        <artifactId>hibernate</artifactId>
448
        <groupId>org.hibernate</groupId>
4114
441
        <version>3.2.6.ga</version>
449
        <artifactId>hibernate-core</artifactId>
4115
450
        <version>3.5.1-Final</version>
4116
451
      </dependency>
4117
452
      <dependency>
4118
453
        <groupId>org.hibernate</groupId>
4119
454
        <artifactId>hibernate-ehcache</artifactId>
4120
455
        <version>3.5.1-Final</version>
4121
442
        <exclusions>
456
        <exclusions>
4122
443
          <exclusion>
457
          <exclusion>
4129
444
            <groupId>javax.transaction</groupId>
458
            <groupId>net.sf.ehcache</groupId>
4130
445
            <artifactId>jta</artifactId>
459
            <artifactId>ehcache</artifactId>
4125
446
          </exclusion>
4126
447
          <exclusion>
4127
448
            <groupId>pull-parser</groupId>
4128
449
            <artifactId>pull-parser</artifactId>
4131
450
          </exclusion>
460
          </exclusion>
4132
451
        </exclusions>
461
        </exclusions>
4133
452
      </dependency>
462
      </dependency>
4134
453
      <dependency>
463
      <dependency>
4138
454
        <groupId>net.sf.ehcache</groupId>
464
        <groupId>org.hibernate</groupId>
4139
455
        <artifactId>ehcache</artifactId>
465
        <artifactId>hibernate-entitymanager</artifactId>
4140
456
        <version>1.5.0</version>
466
        <version>3.5.1-Final</version>
4141
467
      </dependency>
4142
468
      <dependency>
4143
469
        <groupId>org.slf4j</groupId>
4144
470
        <artifactId>slf4j-log4j12</artifactId>
4145
471
        <version>1.5.8</version>
4146
472
      </dependency>
4147
473
4148
474
      <dependency>
4149
475
        <groupId>net.sf.ehcache</groupId>
4150
476
        <artifactId>ehcache-core</artifactId>
4151
477
        <version>2.0.1</version>
4152
478
      </dependency>
4153
479
      <dependency>
4154
480
        <groupId>net.sf.ehcache</groupId>
4155
481
        <artifactId>ehcache-terracotta</artifactId>
4156
482
        <version>2.0.1</version>
4157
457
      </dependency>
483
      </dependency>
4158
458
      <dependency>
484
      <dependency>
4159
459
        <groupId>geronimo-spec</groupId>
485
        <groupId>geronimo-spec</groupId>
4160
@@ -479,7 +505,7 @@
4161
479
      <dependency>
505
      <dependency>
4162
480
        <groupId>org.springframework.security</groupId>
506
        <groupId>org.springframework.security</groupId>
4163
481
        <artifactId>spring-security-core</artifactId>
507
        <artifactId>spring-security-core</artifactId>
4165
482
        <version>2.0.5.RELEASE</version>
508
        <version>3.0.2.RELEASE</version>
4166
483
        <exclusions>
509
        <exclusions>
4167
484
          <exclusion>
510
          <exclusion>
4168
485
            <groupId>org.springframework</groupId>
511
            <groupId>org.springframework</groupId>
4169
@@ -501,8 +527,13 @@
4170
501
      </dependency>
527
      </dependency>
4171
502
      <dependency>
528
      <dependency>
4172
503
        <groupId>org.springframework.security</groupId>
529
        <groupId>org.springframework.security</groupId>
4175
504
        <artifactId>spring-security-core-tiger</artifactId>
530
        <artifactId>spring-security-web</artifactId>
4176
505
        <version>2.0.5.RELEASE</version>
531
        <version>3.0.2.RELEASE</version>
4177
532
      </dependency>
4178
533
      <dependency>
4179
534
        <groupId>org.springframework.security</groupId>
4180
535
        <artifactId>spring-security-config</artifactId>
4181
536
        <version>3.0.2.RELEASE</version>
4182
506
      </dependency>
537
      </dependency>
4183
507
      <!--Reporting -->
538
      <!--Reporting -->
4184
508
      <dependency>
539
      <dependency>
4185
@@ -619,5 +650,6 @@
4186
619
  <properties>
650
  <properties>
4187
620
    <rootDir></rootDir>
651
    <rootDir></rootDir>
4188
621
    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
652
    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
4189
653
    <spring.version>3.0.2.RELEASE</spring.version>  
4190
622
  </properties>
654
  </properties>
4191
623
</project>
655
</project>
Status:	Merged
Merged at revision:	1830
Proposed branch:	lp:~dhis2-devs-core/dhis2/spring-hibernate-struts-upgrade
Merge into:	lp:dhis2
Diff against target:	4191 lines (+1557/-1509) 56 files modified dhis-2/dhis-api/pom.xml (+23/-23) dhis-2/dhis-services/dhis-service-core/pom.xml (+80/-84) dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DefaultDataElementService.java (+2/-1) dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/DefaultUsernameSaltSource.java (+1/-1) dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/UsernameSaltSource.java (+1/-1) dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/hibernate/HibernateUserDetailsService.java (+7/-6) dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/spring/AbstractSpringSecurityCurrentUserService.java (+3/-3) dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/spring/SpringSecurityPasswordManager.java (+1/-1) dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/vote/AllRequiredRoleVoter.java (+12/-15) dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml (+836/-836) dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/user/hibernate/User.hbm.xml (+1/-1) dhis-2/dhis-services/dhis-service-i18n/pom.xml (+33/-33) dhis-2/dhis-services/dhis-service-patient/pom.xml (+30/-30) dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/DefaultPatientIdentifierService.java (+2/-1) dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/DefaultPatientService.java (+0/-2) dhis-2/dhis-support/dhis-support-hibernate/pom.xml (+97/-79) dhis-2/dhis-support/dhis-support-hibernate/src/main/resources/hibernate-default.properties (+2/-1) dhis-2/dhis-support/dhis-support-system/pom.xml (+96/-92) dhis-2/dhis-support/dhis-support-test/pom.xml (+56/-48) dhis-2/dhis-web/dhis-web-caseentry/pom.xml (+47/-47) dhis-2/dhis-web/dhis-web-commons/pom.xml (+2/-2) dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetOperandsAction.java (+1/-2) dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/encoding/velocity/EncoderVelocityContext.java (+3/-2) dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/interceptor/ExceptionInterceptor.java (+2/-2) dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/AbstractAutomaticAccessProvider.java (+2/-2) dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/GhostAutomaticAccessProvider.java (+5/-5) dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/SpringSecurityActionAccessResolver.java (+12/-11) dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/authority/DefaultRequiredAuthoritiesProvider.java (+11/-14) dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/authority/RequiredAuthoritiesProvider.java (+7/-7) dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/filter/UserAuditLogoutFilter.java (+3/-3) dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/intercept/SingleSecurityMetadataSource.java (+19/-18) dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/intercept/XWorkSecurityInterceptor.java (+9/-9) dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/listener/AuthenticationListener.java (+3/-3) dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/vote/AbstractPrefixedAccessDecisionVoter.java (+2/-2) dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/vote/ActionAccessVoter.java (+7/-10) dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/vote/LogicalOrAccessDecisionManager.java (+11/-10) dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/vote/ModuleAccessVoter.java (+7/-6) dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/vote/SimpleAccessVoter.java (+10/-8) dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/beans.xml (+19/-11) dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/datasetcompleted/action/GetDataSetAndPeriodByPeriodTypeAction.java (+1/-2) dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/datasetcompleted/action/ViewDataSetCompletedAction.java (+1/-2) dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/databrowser/SearchAction.java (+1/-2) dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/META-INF/dhis/beans.xml (+7/-10) dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/GetDataElementAction.java (+2/-2) dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/ShowAddDataElementForm.java (+1/-2) dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/ShowUpdateDataElementFormAction.java (+1/-2) dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroup/GetAssignedIndicatorGroupsAction.java (+1/-1) dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patientattributegroup/GetPatientAttributeGroupAction.java (+1/-2) dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patientattributegroup/GetPatientAttributeGroupListAction.java (+1/-1) dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patientidentifiertype/GetPatientIdentifierTypeListAction.java (+1/-2) dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetAllMapLegendsAction.java (+2/-2) dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetMapLegendsByMapLegendSetAction.java (+1/-2) dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/chart/action/SaveChartAction.java (+1/-2) dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/pivottable/action/GetPivotTableAction.java (+1/-2) dhis-2/dhis-web/dhis-web-validationrule/pom.xml (+0/-4) dhis-2/pom.xml (+69/-37)
To merge this branch:	bzr merge lp:~dhis2-devs-core/dhis2/spring-hibernate-struts-upgrade
Related bugs:	Link a bug report
Related blueprints:	Spring, Hibernate, Struts version upgrade (Undefined)
Reviewer	Review Type	Date Requested	Status
Lars Helge Øverland		2010-05-04	Pending
Review via email: mp+24665@code.launchpad.net