See <DHIS2 App Hub;
Changes:
[Jan Henrik Overland] (GIS) Centroid layer implemented. Shows polygon values represented by an icon centered in the middle of the polygon. To use this layer create predefined legend sets with images instead of colors. Image export and map views currently not supported.
···
------------------------------------------
[...truncated 25 lines...]
M dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/MappingService.java
M dhis-2/dhis-services/dhis-service-mapping/src/main/java/org/hisp/dhis/mapping/DefaultMappingService.java
M dhis-2/dhis-services/dhis-service-mapping/src/main/resources/org/hisp/dhis/mapping/hibernate/MapLegend.hbm.xml
M dhis-2/dhis-services/dhis-service-mapping/src/main/resources/org/hisp/dhis/mapping/hibernate/MapLegendSet.hbm.xml
M dhis-2/dhis-services/dhis-service-mapping/src/test/java/org/hisp/dhis/mapping/MappingServiceTest.java
M dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/AddOrUpdateMapLegendAction.java
M dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/AddOrUpdateMapLegendSetAction.java
M dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetMapLegendSetsByTypeAction.java
M dhis-2/dhis-web/dhis-web-mapping/src/main/resources/org/hisp/dhis/mapping/i18n_module.properties
M dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/i18n.vm
M dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonMapLegendSet.vm
M dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonMapLegendSets.vm
M dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonMapLegends.vm
M dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/css/style.css
M dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/index.html
M dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/javascript/global.js
M dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/javascript/index.js
M dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/ext-ux.css
R dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/iconcombo/ux-ic-icon-0.png => dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/iconcombo/ux-ic-icon-groupset-type-0.png
R dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/iconcombo/ux-ic-icon-1.png => dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/iconcombo/ux-ic-icon-groupset-type-1.png
R dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/iconcombo/ux-ic-icon-10.png => dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/iconcombo/ux-ic-icon-groupset-type-10.png
R dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/iconcombo/ux-ic-icon-11.png => dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/iconcombo/ux-ic-icon-groupset-type-11.png
R dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/iconcombo/ux-ic-icon-12.png => dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/iconcombo/ux-ic-icon-groupset-type-12.png
R dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/iconcombo/ux-ic-icon-2.png => dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/iconcombo/ux-ic-icon-groupset-type-2.png
R dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/iconcombo/ux-ic-icon-3.png => dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/iconcombo/ux-ic-icon-groupset-type-3.png
R dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/iconcombo/ux-ic-icon-4.png => dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/iconcombo/ux-ic-icon-groupset-type-4.png
R dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/iconcombo/ux-ic-icon-5.png => dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/iconcombo/ux-ic-icon-groupset-type-5.png
R dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/iconcombo/ux-ic-icon-6.png => dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/iconcombo/ux-ic-icon-groupset-type-6.png
R dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/iconcombo/ux-ic-icon-7.png => dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/iconcombo/ux-ic-icon-groupset-type-7.png
R dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/iconcombo/ux-ic-icon-8.png => dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/iconcombo/ux-ic-icon-groupset-type-8.png
R dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/iconcombo/ux-ic-icon-9.png => dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/iconcombo/ux-ic-icon-groupset-type-9.png
M dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/MapFish.js
M dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/core/GeoStat.js
M dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/core/GeoStat/Choropleth.js
M dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/core/GeoStat/Point.js
M dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Choropleth.js
M dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Point.js
M dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Symbol.js
All changes applied successfully.
Now on revision 4134.
$ bzr revision-info -d "<DHIS2 App Hub;
info result: bzr revision-info -d <DHIS2 App Hub; returned 0. Command output: "4134 janhenrik.overland@gmail.com-20110713212200-9o4sp6iwjzosm6r2
" stderr: ""
[workspace] $ bzr log -v -r revid:larshelge@gmail.com-20110713181612-74zqvdl11cfzzlce..revid:janhenrik.overland@gmail.com-20110713212200-9o4sp6iwjzosm6r2 --long --show-ids
Getting local revision...
$ bzr revision-info -d "<DHIS2 App Hub;
info result: bzr revision-info -d <DHIS2 App Hub; returned 0. Command output: "4134 janhenrik.overland@gmail.com-20110713212200-9o4sp6iwjzosm6r2
" stderr: ""
RevisionState revno:4134 revid:janhenrik.overland@gmail.com-20110713212200-9o4sp6iwjzosm6r2
ERROR: Ignore Problem expanding maven opts macros org.jenkinsci.plugins.tokenmacro.TokenMacro
Parsing POMs
ERROR: Ignore Problem expanding maven opts macros org.jenkinsci.plugins.tokenmacro.TokenMacro
[dhis-2] $ /local/opt/j2sdk/bin/java -Xmx2048m -XX:MaxPermSize=512m -cp /llocal/dhis/jenkins_home/plugins/maven-plugin/WEB-INF/lib/maven-agent-1.2.jar:/llocal/dhis/jenkins_home/tools/2.2.1/boot/classworlds-1.1.jar hudson.maven.agent.Main /llocal/dhis/jenkins_home/tools/2.2.1 /ifi/utgard/p01/dhis/projects/dhis-1.ifi.uio.no/ci/tomcat/webapps/ci/WEB-INF/lib/remoting-1.417.jar /llocal/dhis/jenkins_home/plugins/maven-plugin/WEB-INF/lib/maven-interceptor-1.2.jar 40475 /llocal/dhis/jenkins_home/plugins/maven-plugin/WEB-INF/lib/maven2.1-interceptor-1.2.jar
<===[HUDSON REMOTING CAPACITY]===> channel started
Executing Maven: -B -f <DHIS2 App Hub; clean install findbugs:findbugs
[INFO] Scanning for projects...
[INFO] Reactor build order:
[INFO] DHIS 2
[INFO] DHIS API
[INFO] DHIS Support Parent Project
[INFO] DHIS Test Support
[INFO] DHIS External Support
[INFO] DHIS Hibernate Support
[INFO] DHIS System Support
[INFO] DHIS JDBC Service
[INFO] DHIS XML framework services
[INFO] DHIS Services Parent Project
[INFO] DHIS Core API Implementations
[INFO] DHIS I18n Static
[INFO] DHIS Options
[INFO] DHIS Administration Service
[INFO] DHIS DataMart Service - Default
[INFO] DHIS Aggregation Service - Default
[INFO] DHIS OrganisationUnit API Implementations
[INFO] DHIS Reporting Service
[INFO] DHIS Import-Export Service
[INFO] DHIS Patient API Implementations
[INFO] DHIS JDBC / External Test Project
[INFO] ------------------------------------------------------------------------
[INFO] Building DHIS 2
[INFO] task-segment: [clean, install, findbugs:findbugs]
[INFO] ------------------------------------------------------------------------
[INFO] [clean:clean {execution: default-clean}]
[INFO] [site:attach-descriptor {execution: default-attach-descriptor}]
[INFO] [install:install {execution: default-install}]
[INFO] Installing <DHIS2 App Hub; to /ifi/utgard/p01/dhis/.m2/repository/org/hisp/dhis/dhis/2.4-SNAPSHOT/dhis-2.4-SNAPSHOT.pom
[WARNING] DEPRECATED [findbugsXmlOutput]: No reason given
[INFO] [findbugs:findbugs {execution: default-cli}]
[INFO] ****** FindBugsMojo execute *******
[INFO] canGenerate is false
[FINDBUGS] Using set difference to compute new warnings
[FINDBUGS] Not changing build status, since no threshold has been exceeded
[JENKINS] Archiving <DHIS2 App Hub; to /llocal/dhis/jenkins_home/jobs/Dhis2 Service Trunk/modules/org.hisp.dhis$dhis/builds/2011-07-14_00-01-21/archive/org.hisp.dhis/dhis/2.4-SNAPSHOT/dhis-2.4-SNAPSHOT.pom
[INFO] ------------------------------------------------------------------------
[INFO] Building DHIS API
[INFO] task-segment: [clean, install, findbugs:findbugs]
[INFO] ------------------------------------------------------------------------
[INFO] [clean:clean {execution: default-clean}]
[INFO] Deleting directory <DHIS2 App Hub;
[debug] execute contextualize
[INFO] [resources:resources {execution: default-resources}]
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] Copying 0 resource
[INFO] [compiler:compile {execution: default-compile}]
[INFO] Compiling 349 source files to <DHIS2 App Hub;
[debug] execute contextualize
[INFO] [resources:testResources {execution: default-testResources}]
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] Copying 0 resource
[INFO] [compiler:testCompile {execution: default-testCompile}]
[INFO] Compiling 18 source files to <DHIS2 App Hub;
[WARNING] DEPRECATED [systemProperties]: Use systemPropertyVariables instead.
[INFO] [surefire:test {execution: default-test}]
[INFO] Surefire report directory: <DHIS2 App Hub;
-------------------------------------------------------
T E S T S
-------------------------------------------------------
Running org.hisp.dhis.dataentryform.DataEntryFormTest
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.065 sec
Running org.hisp.dhis.common.CombinationGeneratorTest
Tests run: 8, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.003 sec
Running org.hisp.dhis.patient.PatientTest
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0 sec
Running org.hisp.dhis.organisationunit.OrganisationUnitHierarchyTest
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0 sec
Running org.hisp.dhis.organisationunit.OrganisationUnitTest
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.013 sec
Running org.hisp.dhis.period.SixMonthlyPeriodTypeTest
Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.018 sec
Running org.hisp.dhis.period.RelativePeriodTest
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.033 sec
Running org.hisp.dhis.period.QuarterlyPeriodTypeTest
Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.009 sec
Running org.hisp.dhis.period.StringFormatTest
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.03 sec
Running org.hisp.dhis.period.FinancialJulyPeriodTypeTest
Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0 sec
Running org.hisp.dhis.period.WeeklyPeriodTypeTest
Tests run: 4, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0 sec
Running org.hisp.dhis.period.YearlyPeriodTypeTest
Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.003 sec
Running org.hisp.dhis.period.MonthlyPeriodTypeTest
Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.002 sec
Running org.hisp.dhis.period.FinancialOctoberPeriodTypeTest
Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.007 sec
Running org.hisp.dhis.period.FinancialAprilPeriodTypeTest
Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.008 sec
Running org.hisp.dhis.dataelement.OperandTest
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.002 sec
Running org.hisp.dhis.dataelement.DataElementTest
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.003 sec
Results :
Tests run: 53, Failures: 0, Errors: 0, Skipped: 1
[JENKINS] Recording test results
log4j:WARN No appenders could be found for logger (org.apache.commons.beanutils.converters.BooleanConverter).
log4j:WARN Please initialize the log4j system properly.
[INFO] [jar:jar {execution: default-jar}]
[INFO] Building jar: <DHIS2 App Hub;
[INFO] [install:install {execution: default-install}]
[INFO] Installing <DHIS2 App Hub; to /ifi/utgard/p01/dhis/.m2/repository/org/hisp/dhis/dhis-api/2.4-SNAPSHOT/dhis-api-2.4-SNAPSHOT.jar
[WARNING] DEPRECATED [findbugsXmlOutput]: No reason given
[INFO] [findbugs:findbugs {execution: default-cli}]
[INFO] ****** FindBugsMojo execute *******
[INFO] canGenerate is true
[INFO] ****** FindBugsMojo executeFindbugs *******
[INFO] Temp File is <DHIS2 App Hub;
[INFO] Fork Value is true
[java] Warnings generated: 79
[INFO] xmlOutput is true
FINDBUGSSuccessfully parsed file <DHIS2 App Hub; of module DHIS API with 79 warnings.
[FINDBUGS] Using set difference to compute new warnings
[FINDBUGS] Not changing build status, since no threshold has been exceeded
[JENKINS] Archiving <DHIS2 App Hub; to /llocal/dhis/jenkins_home/jobs/Dhis2 Service Trunk/modules/org.hisp.dhis$dhis-api/builds/2011-07-14_00-01-21/archive/org.hisp.dhis/dhis-api/2.4-SNAPSHOT/dhis-api-2.4-SNAPSHOT.pom
[JENKINS] Archiving <DHIS2 App Hub; to /llocal/dhis/jenkins_home/jobs/Dhis2 Service Trunk/modules/org.hisp.dhis$dhis-api/builds/2011-07-14_00-01-21/archive/org.hisp.dhis/dhis-api/2.4-SNAPSHOT/dhis-api-2.4-SNAPSHOT.jar
[INFO] ------------------------------------------------------------------------
[INFO] Building DHIS Support Parent Project
[INFO] task-segment: [clean, install, findbugs:findbugs]
[INFO] ------------------------------------------------------------------------
[INFO] [clean:clean {execution: default-clean}]
[INFO] [site:attach-descriptor {execution: default-attach-descriptor}]
[INFO] [install:install {execution: default-install}]
[INFO] Installing <DHIS2 App Hub; to /ifi/utgard/p01/dhis/.m2/repository/org/hisp/dhis/dhis-support/2.4-SNAPSHOT/dhis-support-2.4-SNAPSHOT.pom
[WARNING] DEPRECATED [findbugsXmlOutput]: No reason given
[INFO] [findbugs:findbugs {execution: default-cli}]
[INFO] ****** FindBugsMojo execute *******
[INFO] canGenerate is false
[FINDBUGS] Using set difference to compute new warnings
[FINDBUGS] Not changing build status, since no threshold has been exceeded
[JENKINS] Archiving <DHIS2 App Hub; to /llocal/dhis/jenkins_home/jobs/Dhis2 Service Trunk/modules/org.hisp.dhis$dhis-support/builds/2011-07-14_00-01-21/archive/org.hisp.dhis/dhis-support/2.4-SNAPSHOT/dhis-support-2.4-SNAPSHOT.pom
[INFO] ------------------------------------------------------------------------
[INFO] Building DHIS Test Support
[INFO] task-segment: [clean, install, findbugs:findbugs]
[INFO] ------------------------------------------------------------------------
[INFO] [clean:clean {execution: default-clean}]
[INFO] Deleting directory <DHIS2 App Hub;
[debug] execute contextualize
[INFO] [resources:resources {execution: default-resources}]
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] Copying 1 resource
[INFO] [compiler:compile {execution: default-compile}]
[INFO] Compiling 6 source files to <DHIS2 App Hub;
[INFO] -------------------------------------------------------------
[ERROR] COMPILATION ERROR :
[INFO] -------------------------------------------------------------
[ERROR] <DHIS2 App Hub cannot find symbol
symbol : method setColorLow(java.lang.String)
location: class org.hisp.dhis.mapping.MapLegendSet
[ERROR] <DHIS2 App Hub cannot find symbol
symbol : method setColorHigh(java.lang.String)
location: class org.hisp.dhis.mapping.MapLegendSet
[INFO] 2 errors
[INFO] -------------------------------------------------------------
[JENKINS] Archiving <DHIS2 App Hub; to /llocal/dhis/jenkins_home/jobs/Dhis2 Service Trunk/modules/org.hisp.dhis$dhis-support-test/builds/2011-07-14_00-01-21/archive/org.hisp.dhis/dhis-support-test/2.4-SNAPSHOT/dhis-support-test-2.4-SNAPSHOT.pom
[INFO] ------------------------------------------------------------------------
[ERROR] BUILD FAILURE
[INFO] ------------------------------------------------------------------------
[INFO] Compilation failure
<DHIS2 App Hub cannot find symbol
symbol : method setColorLow(java.lang.String)
location: class org.hisp.dhis.mapping.MapLegendSet
<DHIS2 App Hub cannot find symbol
symbol : method setColorHigh(java.lang.String)
location: class org.hisp.dhis.mapping.MapLegendSet
[INFO] ------------------------------------------------------------------------
[INFO] For more information, run Maven with the -e switch
[INFO] ------------------------------------------------------------------------
[INFO] Total time: 1 minute 11 seconds
[INFO] Finished at: Thu Jul 14 00:02:39 CEST 2011
[INFO] Final Memory: 75M/730M
[INFO] ------------------------------------------------------------------------
[FINDBUGS] Aggregating results of DHIS 2
[FINDBUGS] Using set difference to compute new warnings
[FINDBUGS] Not changing build status, since no threshold has been exceeded
[FINDBUGS] Aggregating results of DHIS API
[FINDBUGS] Using set difference to compute new warnings
[FINDBUGS] Not changing build status, since no threshold has been exceeded
[FINDBUGS] Aggregating results of DHIS Support Parent Project
[FINDBUGS] Using set difference to compute new warnings
[FINDBUGS] Not changing build status, since no threshold has been exceeded
Sending e-mails to: dhis2-devs@lists.launchpad.net
channel stopped
Archiving workspace
Deleting old workspace snapshot from #2985.