Re: [Dhis2-devs] Getting problem while building a local module

[Murodullo Latifov]

Hi,

Error message clearly says one dependency is missing and it is transitive 
dependency of com.lowagie:itext:jar:1.4.8. Look at jasperreport and itext 
dependencies.

murod





From: Brajesh Murari 
To: DHIS 2 developers 
Sent: Tuesday, September 1, 2009 12:21:58 PM
Subject: [Dhis2-devs] Getting problem while building a local module

Hi,

I need a help.
i am trying to build "dhis-web-reports-national", a local copy on my PC, and i 
am getting following message on my console window,

--Message
 detail 
---

D:\scm\dhis2svn\local\in\dhis-web-reports-national>mvn clean install
Listening for transport dt_socket at address: 8000
[INFO] Scanning for projects...
[INFO] 

[INFO] Building DHIS National Reports
[INFO]task-segment: [clean, install]
[INFO] 

[INFO] Ignoring available plugin update: 2.3 as it requires Maven version 2.0.6
[INFO] Ignoring available plugin update: 2.4.3 as it requires Maven version 
2.0.6
[INFO] [clean:clean]
[INFO] [resources:resources]
[INFO] Using encoding: 'UTF-8' to copy filtered resources.
Downloading: 
http://repo1.maven.org/maven2/bouncycastle/bctsp-jdk14/138/bctsp-jdk14-138.pom
[WARNING] Unable to get resource 'bouncycastle:bctsp-jdk14:pom:138' from 
repository central (http://repo1.maven.org/maven2)
Downloading: 
http://repo1.maven.org/maven2/bouncycastle/bctsp-jdk14/138/bctsp-jdk14-138.jar
[WARNING] Unable to get resource 'bouncycastle:bctsp-jdk14:jar:138' from 
repository central (http://repo1.maven.org/maven2)
[INFO] 
[ERROR] BUILD ERROR
[INFO] 
[INFO] Failed to resolve artifact.

Missing:
--
1) bouncycastle:bctsp-jdk14:jar:138

  Try downloading the file manually from the project website.

  Then, install it using the command:
  mvn install:install-file -DgroupId=bouncycastle -DartifactId=bctsp-jdk14 \
  -Dversion=138 -Dpackaging=jar -Dfile=/path/to/file

  Path to dependency:
1) org.hisp.dhis:dhis-web-reports-national:war:2.0.1-SNAPSHOT
2) jasperreports:jasperreports:jar:2.0.2
3) com.lowagie:itext:jar:1.4.8
4) bouncycastle:bctsp-jdk14:jar:138

--
1 required artifact is missing.

for artifact:
  org.hisp.dhis:dhis-web-reports-national:war:2.0.1-SNAPSHOT

from the specified remote repositories:
  central (http://repo1.maven.org/maven2)


[INFO] 
[INFO] For more information, run Maven with the -e switch
[INFO] 
[INFO] Total time: 5 seconds
[INFO] Finished at: Tue Sep 01 12:03:36 IST 2009
[INFO] Final Memory: 11M/20M
[INFO] 

D:\scm\dhis2svn\local\in\dhis-web-reports-national>

---end
 of message on my 
console---

I need help, can any body tell me how to solve this problem, if really it 
exists..

-- 
Best Regards,
Brajesh Murari


  ___
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help   : https://help.launchpad.net/ListHelp

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 537: Removed dhis-web-dataentry-chr

[noreply]

revno: 537
committer: Lars Helge Oeverland larshe...@gmail.com
branch nick: trunk
timestamp: Tue 2009-09-01 10:43:58 +0200
message:
  Removed dhis-web-dataentry-chr
removed:
  local/vn/dhis-web-dataentry-chr/
  local/vn/dhis-web-dataentry-chr/pom.xml
  local/vn/dhis-web-dataentry-chr/src/
  local/vn/dhis-web-dataentry-chr/src/main/
  local/vn/dhis-web-dataentry-chr/src/main/java/
  local/vn/dhis-web-dataentry-chr/src/main/java/org/
  local/vn/dhis-web-dataentry-chr/src/main/java/org/hisp/
  local/vn/dhis-web-dataentry-chr/src/main/java/org/hisp/dhis/
  local/vn/dhis-web-dataentry-chr/src/main/java/org/hisp/dhis/de/
  local/vn/dhis-web-dataentry-chr/src/main/java/org/hisp/dhis/de/action/
  
local/vn/dhis-web-dataentry-chr/src/main/java/org/hisp/dhis/de/action/CalculateCDEsAction.java
  
local/vn/dhis-web-dataentry-chr/src/main/java/org/hisp/dhis/de/action/EmptyAction.java
  
local/vn/dhis-web-dataentry-chr/src/main/java/org/hisp/dhis/de/action/ExportDataAction.java
  
local/vn/dhis-web-dataentry-chr/src/main/java/org/hisp/dhis/de/action/FormAction.java
  
local/vn/dhis-web-dataentry-chr/src/main/java/org/hisp/dhis/de/action/HistoryAction.java
  
local/vn/dhis-web-dataentry-chr/src/main/java/org/hisp/dhis/de/action/MinMaxGeneratingAction.java
  
local/vn/dhis-web-dataentry-chr/src/main/java/org/hisp/dhis/de/action/NextPeriodsAction.java
  
local/vn/dhis-web-dataentry-chr/src/main/java/org/hisp/dhis/de/action/PreviousPeriodsAction.java
  
local/vn/dhis-web-dataentry-chr/src/main/java/org/hisp/dhis/de/action/RegisterCompleteDataSetAction.java
  
local/vn/dhis-web-dataentry-chr/src/main/java/org/hisp/dhis/de/action/RemoveMinMaxLimitsAction.java
  
local/vn/dhis-web-dataentry-chr/src/main/java/org/hisp/dhis/de/action/SaveCommentAction.java
  
local/vn/dhis-web-dataentry-chr/src/main/java/org/hisp/dhis/de/action/SaveMinMaxLimitsAction.java
  
local/vn/dhis-web-dataentry-chr/src/main/java/org/hisp/dhis/de/action/SaveValueAction.java
  
local/vn/dhis-web-dataentry-chr/src/main/java/org/hisp/dhis/de/action/SectionFormAction.java
  
local/vn/dhis-web-dataentry-chr/src/main/java/org/hisp/dhis/de/action/SelectAction.java
  
local/vn/dhis-web-dataentry-chr/src/main/java/org/hisp/dhis/de/action/UndoCompleteDataSetAction.java
  
local/vn/dhis-web-dataentry-chr/src/main/java/org/hisp/dhis/de/action/ValidationAction.java
  
local/vn/dhis-web-dataentry-chr/src/main/java/org/hisp/dhis/de/action/multidimensional/
  
local/vn/dhis-web-dataentry-chr/src/main/java/org/hisp/dhis/de/action/multidimensional/FormAction.java
  
local/vn/dhis-web-dataentry-chr/src/main/java/org/hisp/dhis/de/action/multidimensional/SaveValueAction.java
  local/vn/dhis-web-dataentry-chr/src/main/java/org/hisp/dhis/de/action/order/
  
local/vn/dhis-web-dataentry-chr/src/main/java/org/hisp/dhis/de/action/order/GetDataElementOrderAction.java
  
local/vn/dhis-web-dataentry-chr/src/main/java/org/hisp/dhis/de/action/order/MoveDataElementDownAction.java
  
local/vn/dhis-web-dataentry-chr/src/main/java/org/hisp/dhis/de/action/order/MoveDataElementUpAction.java
  
local/vn/dhis-web-dataentry-chr/src/main/java/org/hisp/dhis/de/action/order/OrderDataElementsByCodeAction.java
  
local/vn/dhis-web-dataentry-chr/src/main/java/org/hisp/dhis/de/action/order/OrderDataElementsByEntryAction.java
  
local/vn/dhis-web-dataentry-chr/src/main/java/org/hisp/dhis/de/action/order/OrderDataElementsByNameAction.java
  
local/vn/dhis-web-dataentry-chr/src/main/java/org/hisp/dhis/de/action/order/ResetDataElementOrderAction.java
  local/vn/dhis-web-dataentry-chr/src/main/java/org/hisp/dhis/de/comments/
  
local/vn/dhis-web-dataentry-chr/src/main/java/org/hisp/dhis/de/comments/DefaultStandardCommentsManager.java
  
local/vn/dhis-web-dataentry-chr/src/main/java/org/hisp/dhis/de/comments/StandardCommentsManager.java
  
local/vn/dhis-web-dataentry-chr/src/main/java/org/hisp/dhis/de/comments/StandardCommentsManagerException.java
  local/vn/dhis-web-dataentry-chr/src/main/java/org/hisp/dhis/de/history/
  
local/vn/dhis-web-dataentry-chr/src/main/java/org/hisp/dhis/de/history/DataElementHistory.java
  
local/vn/dhis-web-dataentry-chr/src/main/java/org/hisp/dhis/de/history/DataElementHistoryPoint.java
  
local/vn/dhis-web-dataentry-chr/src/main/java/org/hisp/dhis/de/history/DefaultHistoryRetriever.java
  
local/vn/dhis-web-dataentry-chr/src/main/java/org/hisp/dhis/de/history/HistoryRetriever.java
  
local/vn/dhis-web-dataentry-chr/src/main/java/org/hisp/dhis/de/history/HistoryRetrieverException.java
  local/vn/dhis-web-dataentry-chr/src/main/java/org/hisp/dhis/de/screen/
  
local/vn/dhis-web-dataentry-chr/src/main/java/org/hisp/dhis/de/screen/DataEntryScreenManager.java
  
local/vn/dhis-web-dataentry-chr/src/main/java/org/hisp/dhis/de/screen/DefaultDataEntryScreenManager.java
  local/vn/dhis-web-dataentry-chr/src/main/java/org/hisp/dhis/de/state/
  
local/vn/dhis-web-dataentry-chr/src/main/java/org/hisp/dhis/de/state/DefaultSelected

[Dhis2-devs] [Bug 422440] [NEW] Tally sheet generator reports errors during generation

[jason.p.pickering]

Public bug reported:

During the generation of a tally sheet, the following exception was
encoutered.

Platform: Tomcat 6, Postgresql

org.hibernate.exception.SQLGrammarException: could not execute query

org.hibernate.exception.SQLStateConverter.convert(SQLStateConverter.java:67)

org.hibernate.exception.JDBCExceptionHelper.convert(JDBCExceptionHelper.java:43)
org.hibernate.loader.Loader.doList(Loader.java:2216)
org.hibernate.loader.Loader.listIgnoreQueryCache(Loader.java:2104)
org.hibernate.loader.Loader.list(Loader.java:2099)

org.hibernate.loader.criteria.CriteriaLoader.list(CriteriaLoader.java:94)
org.hibernate.impl.SessionImpl.list(SessionImpl.java:1569)
org.hibernate.impl.CriteriaImpl.list(CriteriaImpl.java:283)

org.hisp.dhis.datavalue.hibernate.HibernateDataValueStore.getDataValues(HibernateDataValueStore.java:282)

org.hisp.dhis.datavalue.DefaultDataValueService.getDataValues(DefaultDataValueService.java:134)
sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)

sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)

sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
java.lang.reflect.Method.invoke(Method.java:597)

org.springframework.aop.support.AopUtils.invokeJoinpointUsingReflection(AopUtils.java:307)

org.springframework.aop.framework.ReflectiveMethodInvocation.invokeJoinpoint(ReflectiveMethodInvocation.java:182)

org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:149)

org.springframework.transaction.interceptor.TransactionInterceptor.invoke(TransactionInterceptor.java:106)

org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:171)

org.springframework.aop.framework.JdkDynamicAopProxy.invoke(JdkDynamicAopProxy.java:204)
$Proxy65.getDataValues(Unknown Source)

org.hisp.dhis.tallysheet.DefaultTallySheetService.createTallySheet(DefaultTallySheetService.java:84)

org.hisp.dhis.reporting.tallysheet.action.TallySheetEditAction.execute(TallySheetEditAction.java:192)
sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)

sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)

sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
java.lang.reflect.Method.invoke(Method.java:597)

com.opensymphony.xwork2.DefaultActionInvocation.invokeAction(DefaultActionInvocation.java:440)

com.opensymphony.xwork2.DefaultActionInvocation.invokeActionOnly(DefaultActionInvocation.java:279)

com.opensymphony.xwork2.DefaultActionInvocation.invoke(DefaultActionInvocation.java:242)

org.hisp.dhis.webportal.interceptor.WebWorkPortalUserInterceptor.intercept(WebWorkPortalUserInterceptor.java:82)

com.opensymphony.xwork2.DefaultActionInvocation.invoke(DefaultActionInvocation.java:236)

org.hisp.dhis.webportal.interceptor.WebWorkPortalModuleInterceptor.intercept(WebWorkPortalModuleInterceptor.java:85)

com.opensymphony.xwork2.DefaultActionInvocation.invoke(DefaultActionInvocation.java:236)

org.hisp.dhis.webportal.interceptor.WebWorkPortalMenuInterceptor.intercept(WebWorkPortalMenuInterceptor.java:91)

com.opensymphony.xwork2.DefaultActionInvocation.invoke(DefaultActionInvocation.java:236)

org.hisp.dhis.webportal.interceptor.WebWorkPortalParamsInterceptor.intercept(WebWorkPortalParamsInterceptor.java:117)

com.opensymphony.xwork2.DefaultActionInvocation.invoke(DefaultActionInvocation.java:236)

org.hisp.dhis.interceptor.StyleInterceptor.intercept(StyleInterceptor.java:89)

com.opensymphony.xwork2.DefaultActionInvocation.invoke(DefaultActionInvocation.java:236)

org.hisp.dhis.interceptor.SystemSettingInterceptor.intercept(SystemSettingInterceptor.java:89)

com.opensymphony.xwork2.DefaultActionInvocation.invoke(DefaultActionInvocation.java:236)

org.hisp.dhis.interceptor.DataDictionaryModeInterceptor.intercept(DataDictionaryModeInterceptor.java:109)

com.opensymphony.xwork2.DefaultActionInvocation.invoke(DefaultActionInvocation.java:236)

org.hisp.dhis.interceptor.DisplayPropertyInterceptor.intercept(DisplayPropertyInterceptor.java:90)

com.opensymphony.xwork2.DefaultActionInvocation.invoke(DefaultActionInvocation.java:236)

org.hisp.dhis.interceptor.SortOrderInterceptor.intercept(SortOrderInterceptor.java:124)

com.opensymphony.xwork2.DefaultActionInvocation.invoke(DefaultActionInvocation.java:236)

org.hisp.dhis.security.intercept.WebWorkSecurityInterceptor.intercept(WebWorkSecurityInterceptor.java:98)

com.opensymphony.xwork2.DefaultActionInvocation.invoke(DefaultActionInvocation.java:236)

org.hisp.dhis.

[Dhis2-devs] [Bug 422440] Re: Tally sheet generator reports errors during generation

[jason.p.pickering]

Note. This only affects one particular dataset on the Zambia national
database (Disease Reports HIA Page 1)

-- 
Tally sheet generator reports errors during generation
https://bugs.launchpad.net/bugs/422440
You received this bug notification because you are a member of DHIS 2
developers, which is subscribed to DHIS.

Status in DHIS 2: New

Bug description:
During the generation of a tally sheet, the following exception was encoutered.

Platform: Tomcat 6, Postgresql

org.hibernate.exception.SQLGrammarException: could not execute query

org.hibernate.exception.SQLStateConverter.convert(SQLStateConverter.java:67)

org.hibernate.exception.JDBCExceptionHelper.convert(JDBCExceptionHelper.java:43)
org.hibernate.loader.Loader.doList(Loader.java:2216)
org.hibernate.loader.Loader.listIgnoreQueryCache(Loader.java:2104)
org.hibernate.loader.Loader.list(Loader.java:2099)

org.hibernate.loader.criteria.CriteriaLoader.list(CriteriaLoader.java:94)
org.hibernate.impl.SessionImpl.list(SessionImpl.java:1569)
org.hibernate.impl.CriteriaImpl.list(CriteriaImpl.java:283)

org.hisp.dhis.datavalue.hibernate.HibernateDataValueStore.getDataValues(HibernateDataValueStore.java:282)

org.hisp.dhis.datavalue.DefaultDataValueService.getDataValues(DefaultDataValueService.java:134)
sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)

sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)

sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
java.lang.reflect.Method.invoke(Method.java:597)

org.springframework.aop.support.AopUtils.invokeJoinpointUsingReflection(AopUtils.java:307)

org.springframework.aop.framework.ReflectiveMethodInvocation.invokeJoinpoint(ReflectiveMethodInvocation.java:182)

org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:149)

org.springframework.transaction.interceptor.TransactionInterceptor.invoke(TransactionInterceptor.java:106)

org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:171)

org.springframework.aop.framework.JdkDynamicAopProxy.invoke(JdkDynamicAopProxy.java:204)
$Proxy65.getDataValues(Unknown Source)

org.hisp.dhis.tallysheet.DefaultTallySheetService.createTallySheet(DefaultTallySheetService.java:84)

org.hisp.dhis.reporting.tallysheet.action.TallySheetEditAction.execute(TallySheetEditAction.java:192)
sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)

sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)

sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
java.lang.reflect.Method.invoke(Method.java:597)

com.opensymphony.xwork2.DefaultActionInvocation.invokeAction(DefaultActionInvocation.java:440)

com.opensymphony.xwork2.DefaultActionInvocation.invokeActionOnly(DefaultActionInvocation.java:279)

com.opensymphony.xwork2.DefaultActionInvocation.invoke(DefaultActionInvocation.java:242)

org.hisp.dhis.webportal.interceptor.WebWorkPortalUserInterceptor.intercept(WebWorkPortalUserInterceptor.java:82)

com.opensymphony.xwork2.DefaultActionInvocation.invoke(DefaultActionInvocation.java:236)

org.hisp.dhis.webportal.interceptor.WebWorkPortalModuleInterceptor.intercept(WebWorkPortalModuleInterceptor.java:85)

com.opensymphony.xwork2.DefaultActionInvocation.invoke(DefaultActionInvocation.java:236)

org.hisp.dhis.webportal.interceptor.WebWorkPortalMenuInterceptor.intercept(WebWorkPortalMenuInterceptor.java:91)

com.opensymphony.xwork2.DefaultActionInvocation.invoke(DefaultActionInvocation.java:236)

org.hisp.dhis.webportal.interceptor.WebWorkPortalParamsInterceptor.intercept(WebWorkPortalParamsInterceptor.java:117)

com.opensymphony.xwork2.DefaultActionInvocation.invoke(DefaultActionInvocation.java:236)

org.hisp.dhis.interceptor.StyleInterceptor.intercept(StyleInterceptor.java:89)

com.opensymphony.xwork2.DefaultActionInvocation.invoke(DefaultActionInvocation.java:236)

org.hisp.dhis.interceptor.SystemSettingInterceptor.intercept(SystemSettingInterceptor.java:89)

com.opensymphony.xwork2.DefaultActionInvocation.invoke(DefaultActionInvocation.java:236)

org.hisp.dhis.interceptor.DataDictionaryModeInterceptor.intercept(DataDictionaryModeInterceptor.java:109)

com.opensymphony.xwork2.DefaultActionInvocation.invoke(DefaultActionInvocation.java:236)

org.hisp.dhis.interceptor.DisplayPropertyInterceptor.intercept(DisplayPropertyInterceptor.java:90)

com.opensymphony.xwork2.DefaultActionInvocation.invoke(DefaultActionInvocation.java:236)

org.hisp.dhis.interceptor.SortOrderInterceptor.intercept(SortOrderInterceptor.java:12

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 538: Added updated dhis-web-dataentry-chr.

[noreply]

revno: 538
committer: Lars Helge Oeverland larshe...@gmail.com
branch nick: trunk
timestamp: Tue 2009-09-01 11:07:06 +0200
message:
  Added updated dhis-web-dataentry-chr.
added:
  local/vn/dhis-web-dataentry-chr/
  local/vn/dhis-web-dataentry-chr/pom.xml
  local/vn/dhis-web-dataentry-chr/src/
  local/vn/dhis-web-dataentry-chr/src/main/
  local/vn/dhis-web-dataentry-chr/src/main/java/
  local/vn/dhis-web-dataentry-chr/src/main/java/org/
  local/vn/dhis-web-dataentry-chr/src/main/java/org/hisp/
  local/vn/dhis-web-dataentry-chr/src/main/java/org/hisp/dhis/
  local/vn/dhis-web-dataentry-chr/src/main/java/org/hisp/dhis/de/
  local/vn/dhis-web-dataentry-chr/src/main/java/org/hisp/dhis/de/action/
  
local/vn/dhis-web-dataentry-chr/src/main/java/org/hisp/dhis/de/action/ActionSupport.java
  
local/vn/dhis-web-dataentry-chr/src/main/java/org/hisp/dhis/de/action/CalculateCDEsAction.java
  
local/vn/dhis-web-dataentry-chr/src/main/java/org/hisp/dhis/de/action/EmptyAction.java
  
local/vn/dhis-web-dataentry-chr/src/main/java/org/hisp/dhis/de/action/ExportDataAction.java
  
local/vn/dhis-web-dataentry-chr/src/main/java/org/hisp/dhis/de/action/FormAction.java
  
local/vn/dhis-web-dataentry-chr/src/main/java/org/hisp/dhis/de/action/HistoryAction.java
  
local/vn/dhis-web-dataentry-chr/src/main/java/org/hisp/dhis/de/action/MinMaxGeneratingAction.java
  
local/vn/dhis-web-dataentry-chr/src/main/java/org/hisp/dhis/de/action/NextPeriodsAction.java
  
local/vn/dhis-web-dataentry-chr/src/main/java/org/hisp/dhis/de/action/PreviousPeriodsAction.java
  
local/vn/dhis-web-dataentry-chr/src/main/java/org/hisp/dhis/de/action/RegisterCompleteDataSetAction.java
  
local/vn/dhis-web-dataentry-chr/src/main/java/org/hisp/dhis/de/action/RemoveMinMaxLimitsAction.java
  
local/vn/dhis-web-dataentry-chr/src/main/java/org/hisp/dhis/de/action/SaveCommentAction.java
  
local/vn/dhis-web-dataentry-chr/src/main/java/org/hisp/dhis/de/action/SaveMinMaxLimitsAction.java
  
local/vn/dhis-web-dataentry-chr/src/main/java/org/hisp/dhis/de/action/SaveValueAction.java
  
local/vn/dhis-web-dataentry-chr/src/main/java/org/hisp/dhis/de/action/SectionFormAction.java
  
local/vn/dhis-web-dataentry-chr/src/main/java/org/hisp/dhis/de/action/SelectAction.java
  
local/vn/dhis-web-dataentry-chr/src/main/java/org/hisp/dhis/de/action/UndoCompleteDataSetAction.java
  
local/vn/dhis-web-dataentry-chr/src/main/java/org/hisp/dhis/de/action/ValidationAction.java
  
local/vn/dhis-web-dataentry-chr/src/main/java/org/hisp/dhis/de/action/ViewDataValueAuditPopupAction.java
  
local/vn/dhis-web-dataentry-chr/src/main/java/org/hisp/dhis/de/action/multidimensional/
  
local/vn/dhis-web-dataentry-chr/src/main/java/org/hisp/dhis/de/action/multidimensional/FormAction.java
  
local/vn/dhis-web-dataentry-chr/src/main/java/org/hisp/dhis/de/action/multidimensional/SaveValueAction.java
  local/vn/dhis-web-dataentry-chr/src/main/java/org/hisp/dhis/de/action/order/
  
local/vn/dhis-web-dataentry-chr/src/main/java/org/hisp/dhis/de/action/order/GetDataElementOrderAction.java
  
local/vn/dhis-web-dataentry-chr/src/main/java/org/hisp/dhis/de/action/order/MoveDataElementDownAction.java
  
local/vn/dhis-web-dataentry-chr/src/main/java/org/hisp/dhis/de/action/order/MoveDataElementUpAction.java
  
local/vn/dhis-web-dataentry-chr/src/main/java/org/hisp/dhis/de/action/order/OrderDataElementsByCodeAction.java
  
local/vn/dhis-web-dataentry-chr/src/main/java/org/hisp/dhis/de/action/order/OrderDataElementsByEntryAction.java
  
local/vn/dhis-web-dataentry-chr/src/main/java/org/hisp/dhis/de/action/order/OrderDataElementsByNameAction.java
  
local/vn/dhis-web-dataentry-chr/src/main/java/org/hisp/dhis/de/action/order/ResetDataElementOrderAction.java
  local/vn/dhis-web-dataentry-chr/src/main/java/org/hisp/dhis/de/comments/
  
local/vn/dhis-web-dataentry-chr/src/main/java/org/hisp/dhis/de/comments/DefaultStandardCommentsManager.java
  
local/vn/dhis-web-dataentry-chr/src/main/java/org/hisp/dhis/de/comments/StandardCommentsManager.java
  
local/vn/dhis-web-dataentry-chr/src/main/java/org/hisp/dhis/de/comments/StandardCommentsManagerException.java
  local/vn/dhis-web-dataentry-chr/src/main/java/org/hisp/dhis/de/history/
  
local/vn/dhis-web-dataentry-chr/src/main/java/org/hisp/dhis/de/history/DataElementHistory.java
  
local/vn/dhis-web-dataentry-chr/src/main/java/org/hisp/dhis/de/history/DataElementHistoryPoint.java
  
local/vn/dhis-web-dataentry-chr/src/main/java/org/hisp/dhis/de/history/DefaultHistoryRetriever.java
  
local/vn/dhis-web-dataentry-chr/src/main/java/org/hisp/dhis/de/history/HistoryRetriever.java
  
local/vn/dhis-web-dataentry-chr/src/main/java/org/hisp/dhis/de/history/HistoryRetrieverException.java
  local/vn/dhis-web-dataentry-chr/src/main/java/org/hisp/dhis/de/screen/
  
local/vn/dhis-web-dataentry-chr/src/main/java/org/hisp/dhis/de/screen/DataEntryScreenManager.java
  
local/vn/dhis-web-dataentry-chr/src/main/java/org/hisp/dhis

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 539: (GIS, major)

[noreply]

revno: 539
committer: Jan Henrik Overland janhenrik.overl...@gmail.com
branch nick: trunk
timestamp: Tue 2009-09-01 16:29:11 +0700
message:
  (GIS, major)
  - Auto-assigning organisation units performance improved. 
  - Auto-assign organisation units grid bug fixed.
  - Assign organisation units panel visibility bug fixed.
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/MappingService.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/MappingStore.java
  
dhis-2/dhis-services/dhis-service-mapping/src/main/java/org/hisp/dhis/mapping/DefaultMappingService.java
  
dhis-2/dhis-services/dhis-service-mapping/src/main/java/org/hisp/dhis/mapping/hibernate/HibernateMappingStore.java
  
gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/DeleteMapOrganisationUnitRelationAction.java
  gis/dhis-web-mapping/src/main/resources/META-INF/dhis/beans.xml
  gis/dhis-web-mapping/src/main/resources/struts.xml
  gis/dhis-web-mapping/src/main/webapp/mapping/geostat/geostat.js
  gis/dhis-web-mapping/src/main/webapp/mfbase/mapfish/widgets/geostat/Mapping.js


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

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to 
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription.
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/MappingService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/MappingService.java	2009-08-26 18:57:37 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/MappingService.java	2009-09-01 09:29:11 +
@@ -190,6 +190,8 @@
  * @return a generated unique id of the added MapOrganisationUnitRelation.
  */
 int addMapOrganisationUnitRelation( String mapLayerPath, int organisationUnitId, String featureId );
+
+void addOrUpdateMapOrganisationUnitRelations( String mapLayerPath, String relations );
 
 /**
  * Adds a MapOrganisationUnitRelation. If it already exists, it will be
@@ -228,15 +230,15 @@
 MapOrganisationUnitRelation getMapOrganisationUnitRelation( int id );
 
 /**
- * Returns a MapOrganisationUnitRelation.
+ * Returns a Collection .
  * 
  * @param map, the foreign Map in the MapOrganisationUnitRelation.
  * @param map, the foreign OrganisationUnit in the
  *MapOrganisationUnitRelation.
- * @return the MapOrganisationUnitRelation which contains the given Map and
+ * @return a Collection which contains the given Map and
  * OrganisationUnit.
  */
-MapOrganisationUnitRelation getMapOrganisationUnitRelation( Map map, OrganisationUnit organisationUnit );
+Collection getMapOrganisationUnitRelation( Map map, OrganisationUnit organisationUnit );
 
 /**
  * Returns a Collection of MapOrganisationUnitRelations.

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/MappingStore.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/MappingStore.java	2009-08-20 18:52:55 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/MappingStore.java	2009-09-01 09:29:11 +
@@ -144,15 +144,15 @@
 MapOrganisationUnitRelation getMapOrganisationUnitRelation( int id );
 
 /**
- * Returns a MapOrganisationUnitRelation.
+ * Returns a Collection.
  * 
  * @param map, the foreign Map in the MapOrganisationUnitRelation.
  * @param map, the foreign OrganisationUnit in the
  *MapOrganisationUnitRelation.
- * @return the MapOrganisationUnitRelation which contains the given Map and
+ * @return a Collection which contains the given Map and
  * OrganisationUnit.
  */
-MapOrganisationUnitRelation getMapOrganisationUnitRelation( Map map, OrganisationUnit organisationUnit );
+Collection getMapOrganisationUnitRelation( Map map, OrganisationUnit organisationUnit );
 
 /**
  * Returns a Collection of MapOrganisationUnitRelations.

=== modified file 'dhis-2/dhis-services/dhis-service-mapping/src/main/java/org/hisp/dhis/mapping/DefaultMappingService.java'
--- dhis-2/dhis-services/dhis-service-mapping/src/main/java/org/hisp/dhis/mapping/DefaultMappingService.java	2009-08-26 18:57:37 +
+++ dhis-2/dhis-services/dhis-service-mapping/src/main/java/org/hisp/dhis/mapping/DefaultMappingService.java	2009-09-01 09:29:11 +
@@ -53,6 +53,10 @@
 public class DefaultMappingService
 implements MappingService
 {
+private static final String PAIR_SEPARATOR = "-";
+
+private static final String RELATION_SEPARATOR = ",";
+
 // -
 // Dependencies
 // -
@@ -239,16 +243,30 @@
 return addMapOrganisationUnitRelation( mapOrganisationUnitRelation );
 }
 
+public void addOrUpdateMapOrganisationUnitRelatio

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 540: (GIS, minor) Files and folders moved and renamed.

[noreply]

revno: 540
committer: Jan Henrik Overland janhenrik.overl...@gmail.com
branch nick: trunk
timestamp: Tue 2009-09-01 16:44:10 +0700
message:
  (GIS, minor) Files and folders moved and renamed.
removed:
  gis/dhis-web-mapping/src/main/webapp/mapping/geostat/
added:
  gis/dhis-web-mapping/src/main/webapp/mapping/script/
renamed:
  gis/dhis-web-mapping/src/main/webapp/mapping/geostat/config.js => 
gis/dhis-web-mapping/src/main/webapp/mapping/script/config.js
  gis/dhis-web-mapping/src/main/webapp/mapping/geostat/geojson/ => 
gis/dhis-web-mapping/src/main/webapp/mapping/geojson/
  gis/dhis-web-mapping/src/main/webapp/mapping/geostat/geostat.js => 
gis/dhis-web-mapping/src/main/webapp/mapping/script/mapping.js
  gis/dhis-web-mapping/src/main/webapp/mapping/geostat/index.html => 
gis/dhis-web-mapping/src/main/webapp/mapping/index.html
  gis/dhis-web-mapping/src/main/webapp/mfbase/ => 
gis/dhis-web-mapping/src/main/webapp/resources/
modified:
  gis/dhis-web-mapping/src/main/resources/struts.xml
  gis/dhis-web-mapping/src/main/webapp/mapping/script/config.js
  gis/dhis-web-mapping/src/main/webapp/mapping/index.html


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

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to 
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription.
=== modified file 'gis/dhis-web-mapping/src/main/resources/struts.xml'
--- gis/dhis-web-mapping/src/main/resources/struts.xml	2009-09-01 09:29:11 +
+++ gis/dhis-web-mapping/src/main/resources/struts.xml	2009-09-01 09:44:10 +
@@ -12,7 +12,7 @@
 
   
 
-  ../mapping/geostat/index.html
+  ../mapping/index.html
 
 
 

=== renamed directory 'gis/dhis-web-mapping/src/main/webapp/mapping/geostat/geojson' => 'gis/dhis-web-mapping/src/main/webapp/mapping/geojson'
=== removed directory 'gis/dhis-web-mapping/src/main/webapp/mapping/geostat'
=== renamed file 'gis/dhis-web-mapping/src/main/webapp/mapping/geostat/index.html' => 'gis/dhis-web-mapping/src/main/webapp/mapping/index.html'
--- gis/dhis-web-mapping/src/main/webapp/mapping/geostat/index.html	2009-08-26 02:00:57 +
+++ gis/dhis-web-mapping/src/main/webapp/mapping/index.html	2009-09-01 09:44:10 +
@@ -7,48 +7,49 @@
 
 
 
-
+
 
 
-
-
-
-
-
+
+
+
+
+
 
 
 
 
-
-
+
+
 
 
-
+
 
 
-
-
+
+
 
 
-
-
-
-
-
+
+
+
+
+
 
 
-
+

 
-
+
 
 
-
-
+
+
 
 
 .assigned-row {background-color: #72FF63}
 .not-assigned-row {background-color: #FF}
+.hidden-row {visibility: hidden; opacity: 0;}
 
 
 
@@ -57,7 +58,7 @@
 
 
 
-
+
 DHIS2 Geostat
 Loading MapFish...
 

=== added directory 'gis/dhis-web-mapping/src/main/webapp/mapping/script'
=== renamed file 'gis/dhis-web-mapping/src/main/webapp/mapping/geostat/config.js' => 'gis/dhis-web-mapping/src/main/webapp/mapping/script/config.js'
--- gis/dhis-web-mapping/src/main/webapp/mapping/geostat/config.js	2009-08-25 19:31:23 +
+++ gis/dhis-web-mapping/src/main/webapp/mapping/script/config.js	2009-09-01 09:44:10 +
@@ -2,9 +2,6 @@
 
 PHU_LEVEL = 4;
 
-STATIC1_LAYERNAME = 'Main roads';
-STATIC1_URL = 'geojson/sl_mainroads';
-
 COUNTRY_LONGITUDE = -11.8;
 COUNTRY_LATITUDE = 8.5;
 COUNTRY_ZOOM = 8;
@@ -23,11 +20,11 @@
 
 //  MapFish print module
 
-printConfigUrl = '../../../print-servlet-1.2-SNAPSHOT/pdf/info.json';
+printConfigUrl = '../../print-servlet-1.2-SNAPSHOT/pdf/info.json';
 
 //  Ajax requests
 
-path = '../../dhis-web-mapping/';
+path = '../dhis-web-mapping/';
 type = '.action';
 
 //  Layout

=== renamed file 'gis/dhis-web-mapping/src/main/webapp/mapping/geostat/geostat.js' => 'gis/dhis-web-mapping/src/main/webapp/mapping/script/mapping.js'
=== renamed directory 'gis/dhis-web-mapping/src/main/webapp/mfbase' => 'gis/dhis-web-mapping/src/main/webapp/resources'
___
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help   : https://help.launchpad.net/ListHelp

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 541: (GIS, minor) File reference corrected.

[noreply]

revno: 541
committer: Jan Henrik Overland janhenrik.overl...@gmail.com
branch nick: trunk
timestamp: Tue 2009-09-01 17:01:23 +0700
message:
  (GIS, minor) File reference corrected.
modified:
  gis/dhis-web-mapping/src/main/webapp/mapping/index.html
  gis/dhis-web-mapping/src/main/webapp/mapping/script/mapping.js


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

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to 
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription.
=== modified file 'gis/dhis-web-mapping/src/main/webapp/mapping/index.html'
--- gis/dhis-web-mapping/src/main/webapp/mapping/index.html	2009-09-01 09:44:10 +
+++ gis/dhis-web-mapping/src/main/webapp/mapping/index.html	2009-09-01 10:01:23 +
@@ -49,7 +49,6 @@
 
 .assigned-row {background-color: #72FF63}
 .not-assigned-row {background-color: #FF}
-.hidden-row {visibility: hidden; opacity: 0;}
 
 
 

=== modified file 'gis/dhis-web-mapping/src/main/webapp/mapping/script/mapping.js'
--- gis/dhis-web-mapping/src/main/webapp/mapping/script/mapping.js	2009-09-01 09:44:10 +
+++ gis/dhis-web-mapping/src/main/webapp/mapping/script/mapping.js	2009-09-01 10:01:23 +
@@ -1,6 +1,5 @@
 /*reference local blank image*/
-Ext.BLANK_IMAGE_URL = '../../mfbase/ext/resources/images/default/s.gif';
-Ext.BLANK_IMAGE_URL = '../../mfbase/ext/resources/images/default/s.gif';
+Ext.BLANK_IMAGE_URL = '../resources/ext/resources/images/default/s.gif';
 
 Ext.onReady(function()
 {

___
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help   : https://help.launchpad.net/ListHelp

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 542: update dhis-vn-report

[noreply]

revno: 542
committer: Tran Thanh Tri 
branch nick: trunk
timestamp: Tue 2009-09-01 17:22:24 +0700
message:
  update dhis-vn-report
modified:
  local/vn/dhis-service-vn/pom.xml
  
local/vn/dhis-service-vn/src/main/java/org/hisp/dhis/vn/report/hibernate/HibernateReportExcelStore.java
  local/vn/dhis-service-vn/src/main/resources/META-INF/dhis/beans.xml
  local/vn/dhis-web-vn-report/pom.xml
  
local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/categorycombo/action/GetFilteredCategoryListAction.java
  
local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/categorycombo/action/GetOptionCombosAction.java
  
local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/dataelement/action/GetDataElementGroupMembersAction.java
  
local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/dataelement/action/GetDataElementGroupsAndCateCombosListAction.java
  
local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/dataelement/action/GetFilteredDataElementListAction.java
  
local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/dataelement/action/ValidateAddDataElementAndCateComboInCategoryReportAction.java
  
local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/action/ActionSupport.java
  
local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/action/AddReportExcelAction.java
  
local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/action/AddReportExcelListingAction.java
  
local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/action/DeleteReportAction.java
  
local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/action/GetNumberOfLevelsAction.java
  
local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/action/GetOrganisationUnitGroupAction.java
  
local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/action/GetReportAction.java
  
local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/action/ListReportAction.java
  
local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/action/OpenReportExcelAssociationAction.java
  
local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/action/SelectLevelAction.java
  
local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/action/UnselectAllAction.java
  
local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/action/UnselectLevelAction.java
  
local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/action/UpdateElementMembersAndCateComboReportCategoryAction.java
  
local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/action/UpdateReportAssociationAction.java
  
local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/action/UpdateReportExcelAction.java
  
local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/action/UpdateReportExcelGroupListingAction.java
  
local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/action/ValidateReportAction.java
  
local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/completed/action/CustomDataSetReportGenerator.java
  
local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/completed/action/GetDataSetAndPeriodByPeriodTypeAction.java
  
local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/completed/action/SelectParamsAction.java
  
local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/completed/action/ViewCustomDataSetReportAction.java
  
local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/export/action/GenerateReportAction.java
  
local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/export/action/GetOrganisationUnitAction.java
  
local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/export/action/GetPeriodAction.java
  
local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/export/action/SelectFormAction.java
  
local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/formula/action/GetFilteredDataElementsAction.java
  
local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/formula/action/GetFormulaTextAction.java
  
local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/formula/action/ValidateDenumAction.java
  
local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/formula/action/ValidateFormulaForReportCategoryAction.java
  
local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/state/ReportLocationManager.java
  
local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/state/SelectionManager.java
  
local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/utils/DateUtils.java
  
local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/reportitem/action/AddReportItemAction.java
  
local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/reportitem/action/DeleteReportItemAction.java
  
local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/reportitem/action/GetReportItemAction.java
  
local/vn/dhis-web-vn

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 543: (GIS, minor) AddMapOrganisationUnitRelationAction and AddOrUpdateMapOrganisationUnitRelationsActi...

[noreply]

revno: 543
committer: Jan Henrik Overland janhenrik.overl...@gmail.com
branch nick: trunk
timestamp: Tue 2009-09-01 17:40:53 +0700
message:
  (GIS, minor) AddMapOrganisationUnitRelationAction and 
AddOrUpdateMapOrganisationUnitRelationsAction added.
added:
  
gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/AddMapOrganisationUnitRelationAction.java
  
gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/AddOrUpdateMapOrganisationUnitRelationsAction.java


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

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to 
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription.
=== added file 'gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/AddMapOrganisationUnitRelationAction.java'
--- gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/AddMapOrganisationUnitRelationAction.java	1970-01-01 00:00:00 +
+++ gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/AddMapOrganisationUnitRelationAction.java	2009-09-01 10:40:53 +
@@ -0,0 +1,88 @@
+package org.hisp.dhis.mapping.action;
+
+/*
+ * Copyright (c) 2004-2007, University of Oslo
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ * * Neither the name of the HISP project nor the names of its contributors may
+ *   be used to endorse or promote products derived from this software without
+ *   specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+import org.hisp.dhis.mapping.MappingService;
+
+import com.opensymphony.xwork2.Action;
+
+/**
+ * @author Jan Henrik Overland
+ * @version $Id$
+ */
+public class AddMapOrganisationUnitRelationAction
+implements Action
+{
+// -
+// Dependencies
+// -
+
+private MappingService mappingService;
+
+public void setMappingService( MappingService mappingService )
+{
+this.mappingService = mappingService;
+}
+
+// -
+// Input
+// -
+
+private String mapLayerPath;
+
+public void setMapLayerPath( String mapLayerPath )
+{
+this.mapLayerPath = mapLayerPath;
+}
+
+private int organisationUnitId;
+
+public void setOrganisationUnitId( int organisationUnitId )
+{
+this.organisationUnitId = organisationUnitId;
+}
+
+private String featureId;
+
+public void setFeatureId( String featureId )
+{
+this.featureId = featureId;
+}
+
+// -
+// Action implementation
+// -
+
+public String execute()
+throws Exception
+{
+mappingService.addMapOrganisationUnitRelation( mapLayerPath, organisationUnitId, featureId );
+
+return SUCCESS;
+}
+}
\ No newline at end of file

=== added file 'gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/AddOrUpdateMapOrganisationUnitRelationsAction.java'
--- gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/AddOrUpdateMapOrganisationUnitRelationsAction.java	1970-01-01 00:00:00 +
+++ gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/AddOrUpdateMapOrganisationUnitRelationsAction.java	2009-09-01 10:40:53 +
@@ -0,0 +1,81 @@
+package org.hisp.dhis.mapping.action;
+
+/*

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 544: (GIS, minor) 4 mb stripped from GIS module.

[noreply]

revno: 544
committer: Jan Henrik Overland janhenrik.overl...@gmail.com
branch nick: trunk
timestamp: Tue 2009-09-01 17:44:16 +0700
message:
  (GIS, minor) 4 mb stripped from GIS module.
removed:
  gis/dhis-web-mapping/src/main/webapp/resources/ext/air/
  gis/dhis-web-mapping/src/main/webapp/resources/ext/air/README.txt
  gis/dhis-web-mapping/src/main/webapp/resources/ext/air/ext-air.js
  gis/dhis-web-mapping/src/main/webapp/resources/ext/air/resources/
  gis/dhis-web-mapping/src/main/webapp/resources/ext/air/resources/ext-air.css
  gis/dhis-web-mapping/src/main/webapp/resources/ext/air/resources/icons/
  
gis/dhis-web-mapping/src/main/webapp/resources/ext/air/resources/icons/extlogo128.png
  
gis/dhis-web-mapping/src/main/webapp/resources/ext/air/resources/icons/extlogo16.png
  
gis/dhis-web-mapping/src/main/webapp/resources/ext/air/resources/icons/extlogo32.png
  
gis/dhis-web-mapping/src/main/webapp/resources/ext/air/resources/icons/extlogo48.png
  
gis/dhis-web-mapping/src/main/webapp/resources/ext/air/resources/icons/extlogo64.png
  gis/dhis-web-mapping/src/main/webapp/resources/ext/air/resources/images/
  
gis/dhis-web-mapping/src/main/webapp/resources/ext/air/resources/images/left-corners.png
  
gis/dhis-web-mapping/src/main/webapp/resources/ext/air/resources/images/left-right.png
  
gis/dhis-web-mapping/src/main/webapp/resources/ext/air/resources/images/right-corners.png
  
gis/dhis-web-mapping/src/main/webapp/resources/ext/air/resources/images/top-bottom.png
  gis/dhis-web-mapping/src/main/webapp/resources/ext/air/src/
  gis/dhis-web-mapping/src/main/webapp/resources/ext/air/src/FileProvider.js
  gis/dhis-web-mapping/src/main/webapp/resources/ext/air/src/NativeDD.js
  gis/dhis-web-mapping/src/main/webapp/resources/ext/air/src/NativeObservable.js
  gis/dhis-web-mapping/src/main/webapp/resources/ext/air/src/NativeWindow.js
  gis/dhis-web-mapping/src/main/webapp/resources/ext/air/src/Sound.js
  gis/dhis-web-mapping/src/main/webapp/resources/ext/air/src/SystemMenu.js
  gis/dhis-web-mapping/src/main/webapp/resources/ext/air/src/SystemTray.js
  gis/dhis-web-mapping/src/main/webapp/resources/ext/air/src/ext-air-adapter.js
  gis/dhis-web-mapping/src/main/webapp/resources/ext/air/src/sql/
  
gis/dhis-web-mapping/src/main/webapp/resources/ext/air/src/sql/AirConnection.js
  gis/dhis-web-mapping/src/main/webapp/resources/ext/air/src/sql/Connection.js
  gis/dhis-web-mapping/src/main/webapp/resources/ext/air/src/sql/Proxy.js
  gis/dhis-web-mapping/src/main/webapp/resources/ext/air/src/sql/Table.js
  
gis/dhis-web-mapping/src/main/webapp/resources/mapfish/widgets/geostat/Static.js
added:
  gis/dhis-web-mapping/src/main/webapp/resources/ext/INCLUDE_ORDER.txt
  
gis/dhis-web-mapping/src/main/webapp/resources/ext/source/locale/ext-lang-en_GB.js
  
gis/dhis-web-mapping/src/main/webapp/resources/ext/source/locale/ext-lang-fi.js
  
gis/dhis-web-mapping/src/main/webapp/resources/ext/source/locale/ext-lang-pt_PT.js
The size of the diff (3684 lines) is larger than your specified limit of 1000 
lines

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

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

___
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help   : https://help.launchpad.net/ListHelp

Re: [Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 544: (GIS, minor) 4 mb stripped from GIS module.

[Knut Staring]

This is probably a good decision for now. However, Adobe Air is quite
interesting technology for creating "offline applications", a  bit like
Google Gears and HTML 5, may be worth exploring more in the future.
k

On Tue, Sep 1, 2009 at 12:47 PM,  wrote:

> 
> revno: 544
> committer: Jan Henrik Overland janhenrik.overl...@gmail.com
> branch nick: trunk
> timestamp: Tue 2009-09-01 17:44:16 +0700
> message:
>  (GIS, minor) 4 mb stripped from GIS module.
> removed:
>  gis/dhis-web-mapping/src/main/webapp/resources/ext/air/
>  gis/dhis-web-mapping/src/main/webapp/resources/ext/air/README.txt
>  gis/dhis-web-mapping/src/main/webapp/resources/ext/air/ext-air.js
>  gis/dhis-web-mapping/src/main/webapp/resources/ext/air/resources/
>
>  gis/dhis-web-mapping/src/main/webapp/resources/ext/air/resources/ext-air.css
>  gis/dhis-web-mapping/src/main/webapp/resources/ext/air/resources/icons/
>
>  
> gis/dhis-web-mapping/src/main/webapp/resources/ext/air/resources/icons/extlogo128.png
>
>  
> gis/dhis-web-mapping/src/main/webapp/resources/ext/air/resources/icons/extlogo16.png
>
>  
> gis/dhis-web-mapping/src/main/webapp/resources/ext/air/resources/icons/extlogo32.png
>
>  
> gis/dhis-web-mapping/src/main/webapp/resources/ext/air/resources/icons/extlogo48.png
>
>  
> gis/dhis-web-mapping/src/main/webapp/resources/ext/air/resources/icons/extlogo64.png
>  gis/dhis-web-mapping/src/main/webapp/resources/ext/air/resources/images/
>
>  
> gis/dhis-web-mapping/src/main/webapp/resources/ext/air/resources/images/left-corners.png
>
>  
> gis/dhis-web-mapping/src/main/webapp/resources/ext/air/resources/images/left-right.png
>
>  
> gis/dhis-web-mapping/src/main/webapp/resources/ext/air/resources/images/right-corners.png
>
>  
> gis/dhis-web-mapping/src/main/webapp/resources/ext/air/resources/images/top-bottom.png
>  gis/dhis-web-mapping/src/main/webapp/resources/ext/air/src/
>  gis/dhis-web-mapping/src/main/webapp/resources/ext/air/src/FileProvider.js
>  gis/dhis-web-mapping/src/main/webapp/resources/ext/air/src/NativeDD.js
>
>  
> gis/dhis-web-mapping/src/main/webapp/resources/ext/air/src/NativeObservable.js
>  gis/dhis-web-mapping/src/main/webapp/resources/ext/air/src/NativeWindow.js
>  gis/dhis-web-mapping/src/main/webapp/resources/ext/air/src/Sound.js
>  gis/dhis-web-mapping/src/main/webapp/resources/ext/air/src/SystemMenu.js
>  gis/dhis-web-mapping/src/main/webapp/resources/ext/air/src/SystemTray.js
>
>  gis/dhis-web-mapping/src/main/webapp/resources/ext/air/src/ext-air-adapter.js
>  gis/dhis-web-mapping/src/main/webapp/resources/ext/air/src/sql/
>
>  
> gis/dhis-web-mapping/src/main/webapp/resources/ext/air/src/sql/AirConnection.js
>
>  gis/dhis-web-mapping/src/main/webapp/resources/ext/air/src/sql/Connection.js
>  gis/dhis-web-mapping/src/main/webapp/resources/ext/air/src/sql/Proxy.js
>  gis/dhis-web-mapping/src/main/webapp/resources/ext/air/src/sql/Table.js
>
>  
> gis/dhis-web-mapping/src/main/webapp/resources/mapfish/widgets/geostat/Static.js
> added:
>  gis/dhis-web-mapping/src/main/webapp/resources/ext/INCLUDE_ORDER.txt
>
>  
> gis/dhis-web-mapping/src/main/webapp/resources/ext/source/locale/ext-lang-en_GB.js
>
>  
> gis/dhis-web-mapping/src/main/webapp/resources/ext/source/locale/ext-lang-fi.js
>
>  
> gis/dhis-web-mapping/src/main/webapp/resources/ext/source/locale/ext-lang-pt_PT.js
> The size of the diff (3684 lines) is larger than your specified limit of
> 1000 lines
>
> --
> lp:dhis2
> https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
>
> Your team DHIS 2 developers is subscribed to branch lp:dhis2.
> To unsubscribe from this branch go to
> https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
> .
>
> ___
> Mailing list: https://launchpad.net/~dhis2-devs
> Post to : dhis2-devs@lists.launchpad.net
> Unsubscribe : https://launchpad.net/~dhis2-devs
> More help   : https://help.launchpad.net/ListHelp
>



-- 
Cheers,
Knut Staring
___
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help   : https://help.launchpad.net/ListHelp

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 545: update dhis-vn-report

[noreply]

revno: 545
committer: Tran Thanh Tri 
branch nick: trunk
timestamp: Tue 2009-09-01 17:56:13 +0700
message:
  update dhis-vn-report
modified:
  local/vn/dhis-api-vn/pom.xml
  local/vn/dhis-api-vn/src/main/java/org/hisp/dhis/vn/report/ReportExcel.java
  
local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/imports/action/DeleteExcelFileAction.java
  
local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/imports/action/GetListExcelFileByOrganisationAction.java
  
local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/imports/action/UploadExcelFileAction.java
  
local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/configuration/action/GetReportConfigurationAction.java
  
local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/configuration/action/SetReportConfigurationAction.java
  
local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/reportitem/action/CopyReportItemsAction.java


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

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to 
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription.
=== modified file 'local/vn/dhis-api-vn/pom.xml'
--- local/vn/dhis-api-vn/pom.xml	2009-07-13 13:07:48 +
+++ local/vn/dhis-api-vn/pom.xml	2009-09-01 10:56:13 +
@@ -6,7 +6,7 @@
   
 org.hisp.dhis
 dhis
-2.0.2-SNAPSHOT
+2.0.1-SNAPSHOT
   
   
   dhis-api-vn

=== modified file 'local/vn/dhis-api-vn/src/main/java/org/hisp/dhis/vn/report/ReportExcel.java'
--- local/vn/dhis-api-vn/src/main/java/org/hisp/dhis/vn/report/ReportExcel.java	2009-09-01 05:41:31 +
+++ local/vn/dhis-api-vn/src/main/java/org/hisp/dhis/vn/report/ReportExcel.java	2009-09-01 10:56:13 +
@@ -63,7 +63,6 @@
 organisationAssocitions.add( organisationUnit );
 
 }
-
 public ReportExcel( String name, String excelTemplateFile, int periodRow, int periodColumn, int organisationRow,
 int organisationColumn )
 {
@@ -87,9 +86,8 @@
 this.name = name;
 this.excelTemplateFile = excelTemplateFile;
 }
-
-public void addReportItem( ReportItem reportItem )
-{
+
+public void addReportItem(ReportItem reportItem){
 this.reportItems.add( reportItem );
 }
 

=== modified file 'local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/imports/action/DeleteExcelFileAction.java'
--- local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/imports/action/DeleteExcelFileAction.java	2009-08-21 10:34:49 +
+++ local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/imports/action/DeleteExcelFileAction.java	2009-09-01 10:56:13 +
@@ -6,7 +6,7 @@
 import org.hisp.dhis.ouwt.manager.OrganisationUnitSelectionManager;
 import org.hisp.dhis.vn.report.state.ReportLocationManager;
 
-import com.opensymphony.xwork2.Action;
+import com.opensymphony.xwork.Action;
 
 public class DeleteExcelFileAction implements Action
 {

=== modified file 'local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/imports/action/GetListExcelFileByOrganisationAction.java'
--- local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/imports/action/GetListExcelFileByOrganisationAction.java	2009-08-21 10:34:49 +
+++ local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/imports/action/GetListExcelFileByOrganisationAction.java	2009-09-01 10:56:13 +
@@ -1,32 +1,5 @@
 package org.hisp.dhis.vn.imports.action;
 
-/*
- * Copyright (c) 2004-2007, University of Oslo
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- * * Neither the name of the HISP project nor the names of its contributors may
- *   be used to endorse or promote products derived from this software without
- *   specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERW

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 546: update missing code

[noreply]

revno: 546
committer: Tran Thanh Tri 
branch nick: trunk
timestamp: Tue 2009-09-01 18:25:50 +0700
message:
  update missing code
added:
  local/vn/dhis-api-vn/src/main/java/org/hisp/dhis/status/
  local/vn/dhis-api-vn/src/main/java/org/hisp/dhis/status/DataStatus.java
  local/vn/dhis-api-vn/src/main/java/org/hisp/dhis/status/DataStatusService.java
  local/vn/dhis-api-vn/src/main/java/org/hisp/dhis/status/DataStatusStore.java
  local/vn/dhis-service-vn/src/main/java/org/hisp/dhis/status/
  
local/vn/dhis-service-vn/src/main/java/org/hisp/dhis/status/DefaultDataStatusService.java
  local/vn/dhis-service-vn/src/main/java/org/hisp/dhis/status/hibernate/
  
local/vn/dhis-service-vn/src/main/java/org/hisp/dhis/status/hibernate/HibernateDataStatusStore.java
  local/vn/dhis-service-vn/src/main/resources/org/hisp/dhis/status/
  local/vn/dhis-service-vn/src/main/resources/org/hisp/dhis/status/hibernate/
  
local/vn/dhis-service-vn/src/main/resources/org/hisp/dhis/status/hibernate/ReportExcel.hbm.xml
  local/vn/dhis-web-vn-report/src/main/resources/xwork.xml
  
local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/javascript/imports.js
  
local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/listExcelFile.vm
  
local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/responseListReport.vm
The size of the diff (1173 lines) is larger than your specified limit of 1000 
lines

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

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

___
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help   : https://help.launchpad.net/ListHelp

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 547: Updated dhis-service-vn to new Hibernate setup.

[noreply]

revno: 547
committer: Lars Helge Oeverland larshe...@gmail.com
branch nick: trunk
timestamp: Tue 2009-09-01 14:22:47 +0200
message:
  Updated dhis-service-vn to new Hibernate setup.
modified:
  
local/vn/dhis-service-vn/src/main/java/org/hisp/dhis/status/DefaultDataStatusService.java
  
local/vn/dhis-service-vn/src/main/java/org/hisp/dhis/status/hibernate/HibernateDataStatusStore.java
  
local/vn/dhis-service-vn/src/main/java/org/hisp/dhis/vn/report/DefaultReportExcelService.java
  
local/vn/dhis-service-vn/src/main/java/org/hisp/dhis/vn/report/hibernate/HibernateReportExcelStore.java
  local/vn/dhis-service-vn/src/main/resources/META-INF/dhis/beans.xml


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

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to 
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription.
=== modified file 'local/vn/dhis-service-vn/src/main/java/org/hisp/dhis/status/DefaultDataStatusService.java'
--- local/vn/dhis-service-vn/src/main/java/org/hisp/dhis/status/DefaultDataStatusService.java	2009-09-01 11:25:50 +
+++ local/vn/dhis-service-vn/src/main/java/org/hisp/dhis/status/DefaultDataStatusService.java	2009-09-01 12:22:47 +
@@ -3,6 +3,7 @@
 import java.util.Collection;
 
 import org.hisp.dhis.dataset.DataSet;
+import org.springframework.transaction.annotation.Transactional;
 
 /*
  * Copyright (c) 2004-2007, University of Oslo
@@ -35,6 +36,7 @@
  * @author Tran Thanh Tri
  * @version $Id$
  */
+...@transactional
 public class DefaultDataStatusService
 implements DataStatusService
 {

=== modified file 'local/vn/dhis-service-vn/src/main/java/org/hisp/dhis/status/hibernate/HibernateDataStatusStore.java'
--- local/vn/dhis-service-vn/src/main/java/org/hisp/dhis/status/hibernate/HibernateDataStatusStore.java	2009-09-01 11:25:50 +
+++ local/vn/dhis-service-vn/src/main/java/org/hisp/dhis/status/hibernate/HibernateDataStatusStore.java	2009-09-01 12:22:47 +
@@ -1,15 +1,13 @@
 package org.hisp.dhis.status.hibernate;
 
 import java.util.Collection;
-import java.util.Collections;
 import java.util.HashSet;
 
 import org.hibernate.Criteria;
 import org.hibernate.Session;
-import org.hibernate.criterion.Disjunction;
+import org.hibernate.SessionFactory;
 import org.hibernate.criterion.Restrictions;
 import org.hisp.dhis.dataset.DataSet;
-import org.hisp.dhis.hibernate.HibernateSessionManager;
 import org.hisp.dhis.status.DataStatus;
 import org.hisp.dhis.status.DataStatusStore;
 
@@ -51,11 +49,11 @@
 // Dependency
 // -
 
-private HibernateSessionManager hibernateSessionManager;
+private SessionFactory sessionFactory;
 
-public void setHibernateSessionManager( HibernateSessionManager hibernateSessionManager )
+public void setSessionFactory( SessionFactory sessionFactory )
 {
-this.hibernateSessionManager = hibernateSessionManager;
+this.sessionFactory = sessionFactory;
 }
 
 // -
@@ -64,7 +62,7 @@
 
 public void delete( int id )
 {
-Session session = hibernateSessionManager.getCurrentSession();
+Session session = sessionFactory.getCurrentSession();
 
 session.delete( session.get( DataStatus.class, id ) );
 
@@ -72,14 +70,14 @@
 
 public DataStatus get( int id )
 {
-Session session = hibernateSessionManager.getCurrentSession();
+Session session = sessionFactory.getCurrentSession();
 
 return (DataStatus) session.get( DataStatus.class, id );
 }
 
 public void save( DataStatus dataStatus )
 {
-Session session = hibernateSessionManager.getCurrentSession();
+Session session = sessionFactory.getCurrentSession();
 
 session.save( dataStatus );
 
@@ -87,7 +85,7 @@
 
 public void update( DataStatus dataStatus )
 {
-Session session = hibernateSessionManager.getCurrentSession();
+Session session = sessionFactory.getCurrentSession();
 
 session.update( dataStatus );
 }
@@ -95,7 +93,7 @@
 @SuppressWarnings( "unchecked" )
 public Collection getALL()
 {
-Session session = hibernateSessionManager.getCurrentSession();
+Session session = sessionFactory.getCurrentSession();
 
 Criteria criteria = session.createCriteria( DataStatus.class );
 
@@ -105,7 +103,7 @@
 @SuppressWarnings( "unchecked" )
 public Collection getDataStatusDefault()
 {
-Session session = hibernateSessionManager.getCurrentSession();
+Session session = sessionFactory.getCurrentSession();
 
 Criteria criteria = session.createCriteria( DataStatus.class );
 criteria.add( Restrictions.eq( "frontPage", true ) );
@@ -118,7 +116,7 @@
 Collection result = new HashSet();
 if ( !dataSets.isEmpty() )
 {
- 

Re: [Dhis2-devs] Getting problem while building a local module

[bharath kumar]

We checked in .m2 folder, there we found itext.jar file.

Please look into content of pom.xml file, tell us if there is any wrong.




 
  org.hisp.dhis
  dhis-api


  org.hisp.dhis
  dhis-service-core


  org.hisp.dhis
  dhis-service-jdbc

  
  org.hisp.dhis
  dhis-service-organisationunit


  org.hisp.dhis
  dhis-web-commons


  org.hisp.dhis
  dhis-web-commons-resources
  war


  org.hisp.dhis
  dhis-service-reporting


  org.hisp.dhis
  dhis-service-datamart-default


  org.hisp.dhis
  dhis-service-jdbc


  org.hisp.dhis
  dhis-service-user-hibernate


  org.hisp.dhis
  dhis-service-aggregationengine-default



  net.sourceforge.jexcelapi
  jxl


  org.hisp.dhis
  dhis-support-external


  org.hisp.dhis
  dhis-in-api
  ${version}


  org.hisp.dhis
  dhis-in-service-survey
  ${version}





  com.opensymphony
  webwork

 
  commons-fileupload
  commons-fileupload





  jasperreports
  jasperreports


  poi
  poi


  jfree
  jfreechart


  eclipse
  jdtcore






  org.springframework
  spring


  commons-logging
  commons-logging


  org.amplecode
  cave-process

  


-- 

Regards,
Bharath Kumar. Ch
___
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help   : https://help.launchpad.net/ListHelp

Re: [Dhis2-devs] Getting problem while building a local module

[Lars Helge Øverland]

The problem here is that a transitive dependency does not exist in the
central maven repo:

bouncycastle:bctsp-jdk14:jar:

Use mvnrepository.com to find a itext version which does not rely on this
dependency. This is an error on maven's side.
___
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help   : https://help.launchpad.net/ListHelp

Re: [Dhis2-devs] Getting problem while building a local module

[Brajesh Murari]

I have updated my pom.xml about these dependencies like


  jasperreports
  jasperreports
 2.0.2


  jfree
  jfreechart
  1.0.11
  

  gnujaxp
  gnujaxp

  


  jfree
  jcommon
  1.0.14
  

  gnujaxp
  gnujaxp

  


  net.sourceforge.jexcelapi
  jxl
  2.6


and now its working fine...

Thanks Lars...
:)
Thanks Murud..
:)

2009/9/1 Lars Helge Øverland 

>
>
>
> The problem here is that a transitive dependency does not exist in the
> central maven repo:
>
> bouncycastle:bctsp-jdk14:jar:
>
> Use mvnrepository.com to find a itext version which does not rely on this
> dependency. This is an error on maven's side.
>
>
> ___
> Mailing list: 
> https://launchpad.net/~dhis2-devs
> Post to : dhis2-devs@lists.launchpad.net
> Unsubscribe : 
> https://launchpad.net/~dhis2-devs
> More help   : https://help.launchpad.net/ListHelp
>
>


-- 
Best Regards,
Brajesh Murari
___
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help   : https://help.launchpad.net/ListHelp

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 548: Improved consistency in package naming. Added unit tests.

[noreply]

revno: 548
committer: Lars Helge Oeverland larshe...@gmail.com
branch nick: trunk
timestamp: Tue 2009-09-01 15:08:49 +0200
message:
  Improved consistency in package naming. Added unit tests.
removed:
  local/vn/dhis-api-vn/src/main/java/META-INF/
  local/vn/dhis-api-vn/src/main/java/META-INF/MANIFEST.MF
  local/vn/dhis-api-vn/src/main/java/org/hisp/dhis/status/
  local/vn/dhis-service-vn/src/main/java/META-INF/
  local/vn/dhis-service-vn/src/main/java/META-INF/MANIFEST.MF
  local/vn/dhis-service-vn/src/main/java/org/hisp/dhis/status/
  local/vn/dhis-service-vn/src/main/java/org/hisp/dhis/status/hibernate/
added:
  local/vn/dhis-api-vn/src/main/java/org/hisp/dhis/vn/status/
  local/vn/dhis-service-vn/src/main/java/org/hisp/dhis/vn/status/
  local/vn/dhis-service-vn/src/main/java/org/hisp/dhis/vn/status/hibernate/
  
local/vn/dhis-service-vn/src/test/java/org/hisp/dhis/vn/report/DataStatusStoreTest.java
  
local/vn/dhis-service-vn/src/test/java/org/hisp/dhis/vn/report/ReportExcelStoreTest.java
renamed:
  local/vn/dhis-api-vn/src/main/java/org/hisp/dhis/status/DataStatus.java => 
local/vn/dhis-api-vn/src/main/java/org/hisp/dhis/vn/status/DataStatus.java
  
local/vn/dhis-api-vn/src/main/java/org/hisp/dhis/status/DataStatusService.java 
=> 
local/vn/dhis-api-vn/src/main/java/org/hisp/dhis/vn/status/DataStatusService.java
  local/vn/dhis-api-vn/src/main/java/org/hisp/dhis/status/DataStatusStore.java 
=> 
local/vn/dhis-api-vn/src/main/java/org/hisp/dhis/vn/status/DataStatusStore.java
  
local/vn/dhis-service-vn/src/main/java/org/hisp/dhis/status/DefaultDataStatusService.java
 => 
local/vn/dhis-service-vn/src/main/java/org/hisp/dhis/vn/status/DefaultDataStatusService.java
  
local/vn/dhis-service-vn/src/main/java/org/hisp/dhis/status/hibernate/HibernateDataStatusStore.java
 => 
local/vn/dhis-service-vn/src/main/java/org/hisp/dhis/vn/status/hibernate/HibernateDataStatusStore.java
  
local/vn/dhis-service-vn/src/main/resources/org/hisp/dhis/status/hibernate/ReportExcel.hbm.xml
 => 
local/vn/dhis-service-vn/src/main/resources/org/hisp/dhis/status/hibernate/DataStatus.hbm.xml
modified:
  local/vn/dhis-api-vn/pom.xml
  
local/vn/dhis-api-vn/src/main/java/org/hisp/dhis/vn/report/ReportExcelService.java
  
local/vn/dhis-api-vn/src/main/java/org/hisp/dhis/vn/report/ReportExcelStore.java
  local/vn/dhis-service-vn/pom.xml
  
local/vn/dhis-service-vn/src/main/java/org/hisp/dhis/vn/report/DefaultReportExcelService.java
  
local/vn/dhis-service-vn/src/main/java/org/hisp/dhis/vn/report/hibernate/HibernateReportExcelStore.java
  local/vn/dhis-service-vn/src/main/resources/META-INF/dhis/beans.xml
  
local/vn/dhis-service-vn/src/main/resources/org/hisp/dhis/vn/report/hibernate/ReportItem.hbm.xml
  local/vn/dhis-api-vn/src/main/java/org/hisp/dhis/vn/status/DataStatus.java
  
local/vn/dhis-api-vn/src/main/java/org/hisp/dhis/vn/status/DataStatusService.java
  
local/vn/dhis-api-vn/src/main/java/org/hisp/dhis/vn/status/DataStatusStore.java
  
local/vn/dhis-service-vn/src/main/java/org/hisp/dhis/vn/status/DefaultDataStatusService.java
  
local/vn/dhis-service-vn/src/main/java/org/hisp/dhis/vn/status/hibernate/HibernateDataStatusStore.java
  
local/vn/dhis-service-vn/src/main/resources/org/hisp/dhis/status/hibernate/DataStatus.hbm.xml


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

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to 
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription.
=== modified file 'local/vn/dhis-api-vn/pom.xml'
--- local/vn/dhis-api-vn/pom.xml	2009-09-01 10:56:13 +
+++ local/vn/dhis-api-vn/pom.xml	2009-09-01 13:08:49 +
@@ -6,7 +6,7 @@
   
 org.hisp.dhis
 dhis
-2.0.1-SNAPSHOT
+2.0.2-SNAPSHOT
   
   
   dhis-api-vn

=== removed directory 'local/vn/dhis-api-vn/src/main/java/META-INF'
=== removed file 'local/vn/dhis-api-vn/src/main/java/META-INF/MANIFEST.MF'
--- local/vn/dhis-api-vn/src/main/java/META-INF/MANIFEST.MF	2009-07-13 00:23:50 +
+++ local/vn/dhis-api-vn/src/main/java/META-INF/MANIFEST.MF	1970-01-01 00:00:00 +
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Class-Path: 
-

=== removed directory 'local/vn/dhis-api-vn/src/main/java/org/hisp/dhis/status'
=== modified file 'local/vn/dhis-api-vn/src/main/java/org/hisp/dhis/vn/report/ReportExcelService.java'
--- local/vn/dhis-api-vn/src/main/java/org/hisp/dhis/vn/report/ReportExcelService.java	2009-07-13 00:23:50 +
+++ local/vn/dhis-api-vn/src/main/java/org/hisp/dhis/vn/report/ReportExcelService.java	2009-09-01 13:08:49 +
@@ -41,7 +41,7 @@
 // Service of Report
 // --
 
-public void addReport( ReportExcelInterface report );
+public int addReport( ReportExcelInterface report );
 
 public void updateReport( ReportExcelInterface report );
 

=== modified file 'local/vn/dhis-api-vn/src/main/java/org/hisp/dhis/vn/report/ReportExc

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 550: Removed unused files.

[noreply]

revno: 550
committer: Lars Helge Oeverland larshe...@gmail.com
branch nick: trunk
timestamp: Tue 2009-09-01 15:30:48 +0200
message:
  Removed unused files.
removed:
  local/vn/dhis-web-vn-report/src/main/resources/struts.xml
  local/vn/dhis-web-vn-report/src/main/webapp/META-INF/
  local/vn/dhis-web-vn-report/src/main/webapp/META-INF/MANIFEST.MF
  local/vn/dhis-web-vn-report/src/main/webapp/WEB-INF/lib/
renamed:
  local/vn/dhis-web-vn-report/src/main/resources/xwork.xml => 
local/vn/dhis-web-vn-report/src/main/resources/struts.xml
modified:
  
local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/categorycombo/action/GetOptionCombosAction.java
  
local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/dataelement/action/GetDataElementGroupMembersAction.java
  
local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/dataelement/action/GetDataElementGroupsAndCateCombosListAction.java
  
local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/dataelement/action/GetFilteredDataElementListAction.java
  
local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/imports/action/DeleteExcelFileAction.java
  
local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/imports/action/UploadExcelFileAction.java
  local/vn/dhis-web-vn-report/src/main/webapp/WEB-INF/web.xml
  local/vn/dhis-web-vn-report/src/main/resources/struts.xml


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

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to 
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription.
=== modified file 'local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/categorycombo/action/GetOptionCombosAction.java'
--- local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/categorycombo/action/GetOptionCombosAction.java	2009-09-01 10:22:24 +
+++ local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/categorycombo/action/GetOptionCombosAction.java	2009-09-01 13:30:48 +
@@ -36,7 +36,7 @@
 import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo;
 import org.hisp.dhis.dataelement.DataElementCategoryOptionComboService;
 
-import com.opensymphony.xwork.Action;
+import com.opensymphony.xwork2.Action;
 
 /**
  * @author Bharath Kumar

=== modified file 'local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/dataelement/action/GetDataElementGroupMembersAction.java'
--- local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/dataelement/action/GetDataElementGroupMembersAction.java	2009-09-01 10:22:24 +
+++ local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/dataelement/action/GetDataElementGroupMembersAction.java	2009-09-01 13:30:48 +
@@ -28,7 +28,6 @@
  */
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 
@@ -38,8 +37,7 @@
 import org.hisp.dhis.vn.report.ReportExcelCategory;
 import org.hisp.dhis.vn.report.ReportExcelInterface;
 
-import com.opensymphony.xwork.Action;
-
+import com.opensymphony.xwork2.Action;
 
 /**
  */
@@ -53,14 +51,15 @@
 /**
 	 * 
 	 */
-	private static final long serialVersionUID = 1L;
-	private DataElementService dataElementService;
+private static final long serialVersionUID = 1L;
+
+private DataElementService dataElementService;
 
 public void setDataElementService( DataElementService dataElementService )
 {
 this.dataElementService = dataElementService;
-} 
-
+}
+
 // -
 // Comparator
 // -
@@ -103,11 +102,11 @@
 // Output
 // -
 
-private List selectedDataElements  = new ArrayList();
+private List selectedDataElements = new ArrayList();
 
-public List getselectedDataElements ()
+public List getselectedDataElements()
 {
-return selectedDataElements ;
+return selectedDataElements;
 }
 
 private List availableDataElements = new ArrayList();
@@ -129,15 +128,16 @@
 
 if ( report != null )
 {
-selectedDataElements  = new ArrayList( ((ReportExcelCategory)report).getDataElements() );
-
-//Collections.sort( selectedDataElements, dataElementComparator );
-
+selectedDataElements = new ArrayList( ((ReportExcelCategory) report).getDataElements() );
+
+// Collections.sort( selectedDataElements, dataElementComparator );
+
 displayPropertyHandler.handle( selectedDataElements );
-System.out.println("report.name - report.id: " + report.getName() + " - " + report.getId());
+System.out.println( "report.name - report.id: " + report.getName() + " - " + report.getId() );
 }
-else {
-	return ERRO

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 549: Upgraded dhis-web-vn-report to Struts2.

[noreply]

revno: 549
committer: Lars Helge Oeverland larshe...@gmail.com
branch nick: trunk
timestamp: Tue 2009-09-01 15:19:47 +0200
message:
  Upgraded dhis-web-vn-report to Struts2.
modified:
  
local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/action/ActionSupport.java
  
local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/action/AddReportExcelAction.java
  
local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/action/AddReportExcelListingAction.java
  
local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/action/DeleteReportAction.java
  
local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/action/GetNumberOfLevelsAction.java
  
local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/action/GetOrganisationUnitGroupAction.java
  
local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/action/GetReportAction.java
  
local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/action/ListReportAction.java
  
local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/action/OpenReportExcelAssociationAction.java
  
local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/action/SelectLevelAction.java
  
local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/action/UnselectAllAction.java
  
local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/action/UnselectLevelAction.java
  
local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/action/UpdateElementMembersAndCateComboReportCategoryAction.java
  
local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/action/UpdateReportAssociationAction.java
  
local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/action/UpdateReportExcelAction.java
  
local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/action/UpdateReportExcelGroupListingAction.java
  
local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/action/ValidateReportAction.java
  
local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/completed/action/GetDataSetAndPeriodByPeriodTypeAction.java
  
local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/completed/action/SelectParamsAction.java
  
local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/completed/action/ViewCustomDataSetReportAction.java
  
local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/configuration/action/GetReportConfigurationAction.java
  
local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/configuration/action/SetReportConfigurationAction.java
  
local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/export/action/GenerateReportAction.java
  
local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/export/action/GetOrganisationUnitAction.java
  
local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/export/action/GetPeriodAction.java
  
local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/export/action/SelectFormAction.java
  
local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/formula/action/GetFilteredDataElementsAction.java
  
local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/formula/action/GetFormulaTextAction.java
  
local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/formula/action/ValidateDenumAction.java
  
local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/formula/action/ValidateFormulaForReportCategoryAction.java
  
local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/state/ReportLocationManager.java
  
local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/state/SelectionManager.java
  
local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/reportitem/action/AddReportItemAction.java
  
local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/reportitem/action/CopyReportItemsAction.java
  
local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/reportitem/action/DeleteReportItemAction.java
  
local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/reportitem/action/GetReportItemAction.java
  
local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/reportitem/action/ListReportItemAction.java
  
local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/reportitem/action/UpdateReportItemAction.java
  local/vn/dhis-web-vn-report/src/main/resources/META-INF/dhis/beans.xml
The size of the diff (1244 lines) is larger than your specified limit of 1000 
lines

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

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

___
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help   : h

Re: [Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 522: - Fixed bug related to DHIS 1.4 import of datavalues. - Codestyle fix.

[Lars Helge Øverland]

On Mon, Aug 31, 2009 at 6:06 PM, Saptarshi Purkayastha wrote:

> Are we sure want to continue this non-standard code formatting? Any
> specific historic reason that we use this code style?
>

Its been there from the beginning. Personally I find it more comprehensible
than Sun's.

We do have a code style template for eclipse and idea available on the wiki.
___
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help   : https://help.launchpad.net/ListHelp

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 551: Fixed errors in VN web modules.

[noreply]

revno: 551
committer: Lars Helge Oeverland larshe...@gmail.com
branch nick: trunk
timestamp: Tue 2009-09-01 15:50:25 +0200
message:
  Fixed errors in VN web modules.
removed:
  local/vn/dhis-web-chr-form/src/main/resources/webwork.properties
  local/vn/dhis-web-chr-form/src/main/webapp/META-INF/
  local/vn/dhis-web-chr-form/src/main/webapp/META-INF/MANIFEST.MF
  local/vn/dhis-web-chr-form/src/main/webapp/WEB-INF/lib/
modified:
  
local/vn/dhis-service-chr/src/main/resources/org/hisp/dhis/vn/chr/hibernate/FormReport.hbm.xml
  local/vn/dhis-web-chr-form/pom.xml
  local/vn/dhis-web-chr-form/src/main/resources/struts.xml
  local/vn/dhis-web-chr-form/src/main/webapp/WEB-INF/web.xml
  local/vn/dhis-web-dataentry-chr/src/main/webapp/WEB-INF/web.xml
  local/vn/dhis-web-vn-report/pom.xml
  
local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/action/ListReportAction.java
  
local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/export/action/SelectFormAction.java
  local/vn/dhis-web-vn-report/src/main/resources/struts.xml
  local/vn/dhis-web-vn-report/src/main/webapp/WEB-INF/web.xml


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

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to 
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription.
=== modified file 'local/vn/dhis-service-chr/src/main/resources/org/hisp/dhis/vn/chr/hibernate/FormReport.hbm.xml'
--- local/vn/dhis-service-chr/src/main/resources/org/hisp/dhis/vn/chr/hibernate/FormReport.hbm.xml	2009-09-01 03:49:33 +
+++ local/vn/dhis-service-chr/src/main/resources/org/hisp/dhis/vn/chr/hibernate/FormReport.hbm.xml	2009-09-01 13:50:25 +
@@ -33,11 +33,6 @@
 			
 			
 		
-		
-
 		
 
 

=== modified file 'local/vn/dhis-web-chr-form/pom.xml'
--- local/vn/dhis-web-chr-form/pom.xml	2009-09-01 05:24:32 +
+++ local/vn/dhis-web-chr-form/pom.xml	2009-09-01 13:50:25 +
@@ -10,7 +10,7 @@
   
   
   dhis-web-chr-form
-  jar
+  war
   DHIS Childreport Form
   
   

=== modified file 'local/vn/dhis-web-chr-form/src/main/resources/struts.xml'
--- local/vn/dhis-web-chr-form/src/main/resources/struts.xml	2009-09-01 06:41:06 +
+++ local/vn/dhis-web-chr-form/src/main/resources/struts.xml	2009-09-01 13:50:25 +
@@ -29,7 +29,6 @@
 		
 			getVisibleForms
 			/dhis-web-chr-form/forms.vm
-			
   		F_LIST_FORM_CHR
 		
 			
@@ -179,7 +178,6 @@
 			/dhis-web-chr-form/configuration.vm
 			/dhis-web-chr-form/menu.vm
 			javascripts/forms.js
-	  	
 			F_FORM_CONFIGURATION_CHR
 		
 		
@@ -204,7 +202,6 @@
 			/dhis-web-chr-form/menu.vm
 			javascripts/forms.js
 	  	styles/dhtmlgoodies_calendar.css
-	  	
 		
 		
 			
@@ -261,7 +258,6 @@
 			/dhis-web-chr-form/listForm.vm
 			../dhis-web-commons/oust/oust.js,javascript/dataElementsList.js,javascript/associations.js,javascripts/forms.js
 			/dhis-web-chr-form/menu.vm
-	  	
 	  	/dhis-web-chr-form/responseError.vm
 		
 		
@@ -269,7 +265,6 @@
 		
 			getVisibleForms
 			/dhis-web-chr-form/createForm.vm
-			
 			F_CREATE_FORM_CHR
 			
 		
@@ -322,7 +317,6 @@
 			/dhis-web-chr-form/createFormReport.vm
 			../dhis-web-commons/oust/oust.js,javascript/dataElementsList.js,javascript/associations.js,javascripts/forms.js
 			/dhis-web-chr-form/menu.vm
-	  	
 	  	/dhis-web-chr-form/responseError.vm 
 		
 		
@@ -342,9 +336,7 @@
 			../dhis-web-commons/oust/oust.js,javascript/dataElementsList.js,javascript/associations.js,javascripts/forms.js
 			/dhis-web-chr-form/menu.vm
 	  	/dhis-web-chr-form/responseError.vm
-	  	
 			F_LIST_FORMULA_CHR 
-	  	
 		
 		
 		

=== removed file 'local/vn/dhis-web-chr-form/src/main/resources/webwork.properties'
--- local/vn/dhis-web-chr-form/src/main/resources/webwork.properties	2009-09-01 03:49:33 +
+++ local/vn/dhis-web-chr-form/src/main/resources/webwork.properties	1970-01-01 00:00:00 +
@@ -1,17 +0,0 @@
-
-# Comma separated list of VelocityContext classnames to chain to the WebWorkVelocityContext
-webwork.velocity.contexts = org.hisp.dhis.webwork.encoding.velocity.EncoderVelocityContext
-
-# Set template encoding
-webwork.i18n.encoding = UTF-8
-
-# Use Jakarta (commons-fileupload) as multipart parser
-webwork.multipart.parser = jakarta
-webwork.multipart.maxSize = 1073741824
-
-# Use html, not xhtml
-webwork.ui.theme = html
-
-# Set webwork to use spring
-webwork.objectFactory = spring
-

=== removed directory 'local/vn/dhis-web-chr-form/src/main/webapp/META-INF'
=== removed file 'local/vn/dhis-web-chr-form/src/main/webapp/META-INF/MANIFEST.MF'
--- local/vn/dhis-web-chr-form/src/main/webapp/META-INF/MANIFEST.MF	2009-09-01 03:49:33 +
+++ local/vn/dhis-web-chr-form/src/main/webapp/META-INF/MANIFEST.MF	1970-01-01 00:00:00 +
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Class-Path: 
-

=== removed directory 'local/vn/dhis-web-chr-form/src/main/webapp/WEB-INF/lib'
=== m

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 552: replaced encoded spaces in directory name with space characters

[noreply]

revno: 552
committer: Bob Jolliffe 
branch nick: trunk
timestamp: Tue 2009-09-01 21:41:26 +0100
message:
  replaced encoded spaces in directory name with space characters
modified:
  lite-package/src/main/java/org/hisp/dhis/TrayApp.java


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

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to 
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription.
=== modified file 'lite-package/src/main/java/org/hisp/dhis/TrayApp.java'
--- lite-package/src/main/java/org/hisp/dhis/TrayApp.java	2009-08-25 11:37:39 +
+++ lite-package/src/main/java/org/hisp/dhis/TrayApp.java	2009-09-01 20:41:26 +
@@ -231,7 +231,6 @@
 throws Exception
   {
 log.info("Environment variable DHIS2_HOME: "+System.getenv("DHIS2_HOME"));
-log.info("System property user.dir: "+System.getProperty("user.dir"));
 if(!SystemTray.isSupported()) {
   String message = "SystemTray not supported on this platform";
   JOptionPane.showMessageDialog((JFrame)null, message);
@@ -242,7 +241,16 @@
 new TrayApp();
   }
 
-  public static String getInstallDir() {
+
+/**
+ *  The getInstallDir method is a hack to determine the current
+ *  directory the dhis2 lite package is installed in.  It does this by finding
+ *  the file URL of a resource within the executable jar and extracting the 
+ *  installation path from that. 
+ *
+ * @return a String value representing the installation directory
+ */
+public static String getInstallDir() {
 // find a resource
 String resourceString = TrayApp.class.getResource("/icons/").toString();
 // we expect to see something of the form:
@@ -253,8 +261,10 @@
 }
 // find the last "/" just before the "!"
 int endIndex = resourceString.lastIndexOf("/", resourceString.lastIndexOf("!"));
-// make a URI of type file
-return "file://" + resourceString.substring(9, endIndex);
-  }
-
+String result = resourceString.substring(9, endIndex); 
+// replace encoded spaces
+result = result.replaceAll("%20"," ");
+return result;
+}
+
 }

___
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help   : https://help.launchpad.net/ListHelp

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 553: Minor fix

[noreply]

revno: 553
committer: Lars Helge Oeverland larshe...@gmail.com
branch nick: trunk
timestamp: Wed 2009-09-02 05:16:47 +0200
message:
  Minor fix
modified:
  
local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/action/ListReportAction.java
  
local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/export/action/SelectFormAction.java


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

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to 
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription.
=== modified file 'local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/action/ListReportAction.java'
--- local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/action/ListReportAction.java	2009-09-01 13:50:25 +
+++ local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/action/ListReportAction.java	2009-09-02 03:16:47 +
@@ -112,7 +112,7 @@
 
 for ( UserAuthorityGroup group : credentials.getUserAuthorityGroups() )
 {
-//reports.addAll( group.getReportExcels() );
+reports.addAll( group.getReportExcels() );
 }
 
 }

=== modified file 'local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/export/action/SelectFormAction.java'
--- local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/export/action/SelectFormAction.java	2009-09-01 13:50:25 +
+++ local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/export/action/SelectFormAction.java	2009-09-02 03:16:47 +
@@ -157,7 +157,7 @@
 
 for ( UserAuthorityGroup group : credentials.getUserAuthorityGroups() )
 {
-//reports.addAll( group.getReportExcels() );
+reports.addAll( group.getReportExcels() );
 }
 
 }

___
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help   : https://help.launchpad.net/ListHelp

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 554: Modify Hibernate configuration file in Vietnam.

[noreply]

revno: 554
committer: Tran Chau 
branch nick: trunk
timestamp: Wed 2009-09-02 10:33:51 +0700
message:
  Modify Hibernate configuration file in Vietnam.
modified:
  
local/vn/dhis-service-chr/src/main/resources/org/hisp/dhis/vn/chr/hibernate/FormReport.hbm.xml


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

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to 
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription.
=== modified file 'local/vn/dhis-service-chr/src/main/resources/org/hisp/dhis/vn/chr/hibernate/FormReport.hbm.xml'
--- local/vn/dhis-service-chr/src/main/resources/org/hisp/dhis/vn/chr/hibernate/FormReport.hbm.xml	2009-09-01 13:50:25 +
+++ local/vn/dhis-service-chr/src/main/resources/org/hisp/dhis/vn/chr/hibernate/FormReport.hbm.xml	2009-09-02 03:33:51 +
@@ -29,9 +29,9 @@
 
 
 
-			
+			
 			
-			
+			
 		
 		
 

___
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help   : https://help.launchpad.net/ListHelp

[Dhis2-devs] Evaluation the formulae in POI

[Hieu Dang Duy]

Dear Murod,

May I disturb you about the old issue (recalculated value from excel formula
by POI's Evaluation).

I think it is fine until now but maybe not. The problem's happened while
testing.

For example, in excel file, I've got 5 cells (A, B, C, D, E) and 1, 2, 3, 4,
5 which is data value on each corresponding cell. If used POI's Evaluation
you wouldn't see the problem at all. But one of them (cells) which is a
empty or blank cell so the evaluation of POI will does not working. I meant
the result that you could receive is zero.

Do you have any opinion for this one? By the way, I think that I should
update POI library to latest version.

Thank you !

-- 
Hieu.HISPVietnam
Good Health !
___
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help   : https://help.launchpad.net/ListHelp