See http://www.bretth.com/hudson/job/Osmosis/27/changes
Changes: [bretth] Removed duplicate TileCalculator classes and put a single version in the common/util package. Large numbers of checkstyle cleanups. Unit tests are now all passing with apidb pointing at mysql. Updated all database unit test configurations with new database names to avoid confusion between api schemas and the osmosis postgis schema. [bretth] Removed the old apache bzip2 package. [bretth] Added the xml formatter for junit tests. Eventually this will be hooked into the Hudson continous integration build. ------------------------------------------ [...truncated 2 lines...] D home/hudson/jobs/Osmosis/workspace/trunk/test/org/openstreetmap/osmosis/core/apidb/common U home/hudson/jobs/Osmosis/workspace/trunk/test/org/openstreetmap/osmosis/core/apidb/v0_6/ApiDbTest.java U home/hudson/jobs/Osmosis/workspace/trunk/test/org/openstreetmap/osmosis/core/apidb/v0_6/impl/ChangesetManagerTest.java U home/hudson/jobs/Osmosis/workspace/trunk/test/org/openstreetmap/osmosis/core/mysql/common/TileCalculatorTest.java G home/hudson/jobs/Osmosis/workspace/trunk/test/data/template/v0_6/mysql-authfile.txt U home/hudson/jobs/Osmosis/workspace/trunk/test/data/template/v0_6/apidb-authfile.txt G home/hudson/jobs/Osmosis/workspace/trunk/test/data/template/v0_6/pgsql-authfile.txt D home/hudson/jobs/Osmosis/workspace/trunk/src/org/apache D home/hudson/jobs/Osmosis/workspace/trunk/src/org/openstreetmap/osmosis/core/apidb/common/TileCalculator.java U home/hudson/jobs/Osmosis/workspace/trunk/src/org/openstreetmap/osmosis/core/apidb/common/DatabaseContext.java U home/hudson/jobs/Osmosis/workspace/trunk/src/org/openstreetmap/osmosis/core/apidb/v0_6/ApidbTruncator.java U home/hudson/jobs/Osmosis/workspace/trunk/src/org/openstreetmap/osmosis/core/apidb/v0_6/impl/CurrentNodeTableReader.java U home/hudson/jobs/Osmosis/workspace/trunk/src/org/openstreetmap/osmosis/core/apidb/v0_6/impl/WayTableReader.java U home/hudson/jobs/Osmosis/workspace/trunk/src/org/openstreetmap/osmosis/core/apidb/v0_6/impl/RelationMemberTableReader.java U home/hudson/jobs/Osmosis/workspace/trunk/src/org/openstreetmap/osmosis/core/apidb/v0_6/impl/CurrentRelationMemberTableReader.java U home/hudson/jobs/Osmosis/workspace/trunk/src/org/openstreetmap/osmosis/core/apidb/v0_6/impl/WayHistoryReader.java U home/hudson/jobs/Osmosis/workspace/trunk/src/org/openstreetmap/osmosis/core/apidb/v0_6/impl/RelationTableReader.java U home/hudson/jobs/Osmosis/workspace/trunk/src/org/openstreetmap/osmosis/core/apidb/v0_6/impl/RelationMemberHistoryReader.java U home/hudson/jobs/Osmosis/workspace/trunk/src/org/openstreetmap/osmosis/core/apidb/v0_6/impl/CurrentRelationTableReader.java U home/hudson/jobs/Osmosis/workspace/trunk/src/org/openstreetmap/osmosis/core/apidb/v0_6/impl/RelationHistoryReader.java U home/hudson/jobs/Osmosis/workspace/trunk/src/org/openstreetmap/osmosis/core/apidb/v0_6/impl/ChangeWriter.java U home/hudson/jobs/Osmosis/workspace/trunk/src/org/openstreetmap/osmosis/core/apidb/v0_6/impl/CurrentWayTableReader.java U home/hudson/jobs/Osmosis/workspace/trunk/src/org/openstreetmap/osmosis/core/apidb/v0_6/ApidbWriter.java U home/hudson/jobs/Osmosis/workspace/trunk/src/org/openstreetmap/osmosis/core/customdb/v0_5/impl/DatasetStore.java U home/hudson/jobs/Osmosis/workspace/trunk/src/org/openstreetmap/osmosis/core/customdb/v0_6/impl/DatasetStore.java U home/hudson/jobs/Osmosis/workspace/trunk/src/org/openstreetmap/osmosis/core/customdb/v0_6/impl/BoundingBoxContext.java U home/hudson/jobs/Osmosis/workspace/trunk/src/org/openstreetmap/osmosis/core/filter/v0_5/impl/BoundingBoxContext.java U home/hudson/jobs/Osmosis/workspace/trunk/src/org/openstreetmap/osmosis/core/database/DatabaseType.java U home/hudson/jobs/Osmosis/workspace/trunk/src/org/openstreetmap/osmosis/core/database/DatabaseLoginCredentials.java D home/hudson/jobs/Osmosis/workspace/trunk/src/org/openstreetmap/osmosis/core/mysql/common/TileCalculator.java U home/hudson/jobs/Osmosis/workspace/trunk/src/org/openstreetmap/osmosis/core/mysql/v0_5/impl/ChangeWriter.java U home/hudson/jobs/Osmosis/workspace/trunk/src/org/openstreetmap/osmosis/core/mysql/v0_5/MysqlWriter.java U home/hudson/jobs/Osmosis/workspace/trunk/src/org/openstreetmap/osmosis/core/mysql/v0_6/impl/ChangeWriter.java U home/hudson/jobs/Osmosis/workspace/trunk/src/org/openstreetmap/osmosis/core/mysql/v0_6/MysqlWriter.java AU home/hudson/jobs/Osmosis/workspace/trunk/src/org/openstreetmap/osmosis/core/util/TileCalculator.java U home/hudson/jobs/Osmosis/workspace/trunk/src/org/openstreetmap/osmosis/extract/apidb/common/TimestampTracker.java U home/hudson/jobs/Osmosis/workspace/trunk/src/org/openstreetmap/osmosis/extract/apidb/common/Configuration.java U home/hudson/jobs/Osmosis/workspace/trunk/src/org/openstreetmap/osmosis/extract/apidb/v0_6/IntervalExtractor.java U home/hudson/jobs/Osmosis/workspace/trunk/src/org/openstreetmap/osmosis/extract/apidb/v0_6/OsmosisExtractApiDb.java U home/hudson/jobs/Osmosis/workspace/trunk/build.xml At revision 14552 [trunk] $ ant clean resolve Buildfile: build.xml clean: [delete] Deleting directory /home/hudson/jobs/Osmosis/workspace/trunk/build [delete] Deleting directory /home/hudson/jobs/Osmosis/workspace/trunk/dist [delete] Deleting directory /home/hudson/jobs/Osmosis/workspace/trunk/doc/api init-ivy: download-ivy: no settings file found, using default... [ivy:configure] :: Ivy 2.0.0-rc2 - 20081028224207 :: http://ant.apache.org/ivy/ :: :: loading settings :: url = jar:file:/home/hudson/jobs/Osmosis/workspace/trunk/ivy/ivy.jar!/org/apache/ivy/core/settings/ivysettings.xml resolve: [ivy:resolve] :: resolving dependencies :: bretth.com#osmosis;[email protected] [ivy:resolve] confs: [compile, default, test] [ivy:resolve] found postgresql#postgresql;8.3-603.jdbc4 in public [ivy:resolve] found net.sf.jpf#jpf;1.5 in public [ivy:resolve] [1.5] net.sf.jpf#jpf;latest.integration [ivy:resolve] found commons-logging#commons-logging;1.0.4 in public [ivy:resolve] found org.apache.tools#bzip2;0.1 in shared [ivy:resolve] found org.postgis#postgis;1.3.2 in shared [ivy:resolve] found org.codehaus.woodstox#woodstox-core-lgpl;4.0.3 in public [ivy:resolve] found org.codehaus.woodstox#stax2-api;3.0.1 in shared [ivy:resolve] found mysql#mysql-connector-java;5.1.6 in public [ivy:resolve] [5.1.6] mysql#mysql-connector-java;latest.integration [ivy:resolve] found junit#junit;4.4 in public [ivy:resolve] [4.4] junit#junit;latest.integration [ivy:resolve] found checkstyle#checkstyle;5.0-beta01 in public [ivy:resolve] found antlr#antlr;2.7.6 in public [ivy:resolve] found commons-beanutils#commons-beanutils-core;1.7.0 in public [ivy:resolve] found commons-collections#commons-collections;2.0 in public [ivy:resolve] found commons-cli#commons-cli;1.1 in public [ivy:resolve] found com.google.code.google-collections#google-collect;snapshot-20080321 in public [ivy:resolve] :: resolution report :: resolve 11588ms :: artifacts dl 54ms [ivy:resolve] :: evicted modules: [ivy:resolve] commons-logging#commons-logging;1.0 by [commons-logging#commons-logging;1.0.4] in [test] [ivy:resolve] commons-logging#commons-logging;1.0.3 by [commons-logging#commons-logging;1.0.4] in [test] --------------------------------------------------------------------- | | modules || artifacts | | conf | number| search|dwnlded|evicted|| number|dwnlded| --------------------------------------------------------------------- | compile | 5 | 1 | 0 | 0 || 5 | 0 | | default | 8 | 2 | 0 | 0 || 8 | 0 | | test | 17 | 3 | 0 | 2 || 15 | 0 | --------------------------------------------------------------------- [ivy:retrieve] :: retrieving :: bretth.com#osmosis [sync] [ivy:retrieve] confs: [compile, default, test] [ivy:retrieve] 0 artifacts copied, 28 already retrieved (0kB/43ms) BUILD SUCCESSFUL Total time: 15 seconds [trunk] $ ant all Buildfile: build.xml init: init-ivy: download-ivy: no settings file found, using default... [ivy:configure] :: Ivy 2.0.0-rc2 - 20081028224207 :: http://ant.apache.org/ivy/ :: :: loading settings :: url = jar:file:/home/hudson/jobs/Osmosis/workspace/trunk/ivy/ivy.jar!/org/apache/ivy/core/settings/ivysettings.xml conditional-resolve: init-ivy: download-ivy: no settings file found, using default... [ivy:configure] :: Ivy 2.0.0-rc2 - 20081028224207 :: http://ant.apache.org/ivy/ :: :: loading settings :: url = jar:file:/home/hudson/jobs/Osmosis/workspace/trunk/ivy/ivy.jar!/org/apache/ivy/core/settings/ivysettings.xml resolve: resolve-message: [echo] Java libraries are already available, to refresh them run "ant resolve". build_src: [mkdir] Created dir: /home/hudson/jobs/Osmosis/workspace/trunk/build [mkdir] Created dir: /home/hudson/jobs/Osmosis/workspace/trunk/build/src [javac] Compiling 781 source files to /home/hudson/jobs/Osmosis/workspace/trunk/build/src [javac] Note: Some input files use or override a deprecated API. [javac] Note: Recompile with -Xlint:deprecation for details. [copy] Copying 7 files to /home/hudson/jobs/Osmosis/workspace/trunk/build/src [touch] Creating /home/hudson/jobs/Osmosis/workspace/trunk/build/src/version-0.30.2 build_binary: [mkdir] Created dir: /home/hudson/jobs/Osmosis/workspace/trunk/build/binary [jar] Building jar: /home/hudson/jobs/Osmosis/workspace/trunk/build/binary/osmosis.jar [copy] Copying 1 file to /home/hudson/jobs/Osmosis/workspace/trunk javadoc: [javadoc] Generating Javadoc [javadoc] Javadoc execution [javadoc] Creating destination directory: "/home/hudson/jobs/Osmosis/workspace/trunk/doc/api/" [javadoc] Loading source files for package org.openstreetmap.osmosis.core... [javadoc] Loading source files for package org.openstreetmap.osmosis.core.apidb.common... [javadoc] Loading source files for package org.openstreetmap.osmosis.core.apidb.v0_6... [javadoc] Loading source files for package org.openstreetmap.osmosis.core.apidb.v0_6.impl... [javadoc] Loading source files for package org.openstreetmap.osmosis.core.buffer.v0_5... [javadoc] Loading source files for package org.openstreetmap.osmosis.core.buffer.v0_6... [javadoc] Loading source files for package org.openstreetmap.osmosis.core.change.v0_5... [javadoc] Loading source files for package org.openstreetmap.osmosis.core.change.v0_5.impl... [javadoc] Loading source files for package org.openstreetmap.osmosis.core.change.v0_6... [javadoc] Loading source files for package org.openstreetmap.osmosis.core.change.v0_6.impl... [javadoc] Loading source files for package org.openstreetmap.osmosis.core.cli... [javadoc] Loading source files for package org.openstreetmap.osmosis.core.container.v0_5... [javadoc] Loading source files for package org.openstreetmap.osmosis.core.container.v0_6... [javadoc] Loading source files for package org.openstreetmap.osmosis.core.customdb.v0_5... [javadoc] Loading source files for package org.openstreetmap.osmosis.core.customdb.v0_5.impl... [javadoc] Loading source files for package org.openstreetmap.osmosis.core.customdb.v0_6... [javadoc] Loading source files for package org.openstreetmap.osmosis.core.customdb.v0_6.impl... [javadoc] Loading source files for package org.openstreetmap.osmosis.core.database... [javadoc] Loading source files for package org.openstreetmap.osmosis.core.domain.common... [javadoc] Loading source files for package org.openstreetmap.osmosis.core.domain.v0_5... [javadoc] Loading source files for package org.openstreetmap.osmosis.core.domain.v0_6... [javadoc] Loading source files for package org.openstreetmap.osmosis.core.filter.common... [javadoc] Loading source files for package org.openstreetmap.osmosis.core.filter.v0_5... [javadoc] Loading source files for package org.openstreetmap.osmosis.core.filter.v0_5.impl... [javadoc] Loading source files for package org.openstreetmap.osmosis.core.filter.v0_6... [javadoc] Loading source files for package org.openstreetmap.osmosis.core.lifecycle... [javadoc] Loading source files for package org.openstreetmap.osmosis.core.merge.common... [javadoc] Loading source files for package org.openstreetmap.osmosis.core.merge.v0_5... [javadoc] Loading source files for package org.openstreetmap.osmosis.core.merge.v0_5.impl... [javadoc] Loading source files for package org.openstreetmap.osmosis.core.merge.v0_6... [javadoc] Loading source files for package org.openstreetmap.osmosis.core.merge.v0_6.impl... [javadoc] Loading source files for package org.openstreetmap.osmosis.core.migrate... [javadoc] Loading source files for package org.openstreetmap.osmosis.core.migrate.impl... [javadoc] Loading source files for package org.openstreetmap.osmosis.core.misc.v0_5... [javadoc] Loading source files for package org.openstreetmap.osmosis.core.misc.v0_6... [javadoc] Loading source files for package org.openstreetmap.osmosis.core.mysql.common... [javadoc] Loading source files for package org.openstreetmap.osmosis.core.mysql.v0_5... [javadoc] Loading source files for package org.openstreetmap.osmosis.core.mysql.v0_5.impl... [javadoc] Loading source files for package org.openstreetmap.osmosis.core.mysql.v0_6... [javadoc] Loading source files for package org.openstreetmap.osmosis.core.mysql.v0_6.impl... [javadoc] Loading source files for package org.openstreetmap.osmosis.core.pgsql.common... [javadoc] Loading source files for package org.openstreetmap.osmosis.core.pgsql.v0_5... [javadoc] Loading source files for package org.openstreetmap.osmosis.core.pgsql.v0_5.impl... [javadoc] Loading source files for package org.openstreetmap.osmosis.core.pgsql.v0_6... [javadoc] Loading source files for package org.openstreetmap.osmosis.core.pgsql.v0_6.impl... [javadoc] Loading source files for package org.openstreetmap.osmosis.core.pipeline.common... [javadoc] Loading source files for package org.openstreetmap.osmosis.core.pipeline.v0_5... [javadoc] Loading source files for package org.openstreetmap.osmosis.core.pipeline.v0_6... [javadoc] Loading source files for package org.openstreetmap.osmosis.core.plugin... [javadoc] Loading source files for package org.openstreetmap.osmosis.core.progress.v0_5... [javadoc] Loading source files for package org.openstreetmap.osmosis.core.progress.v0_6... [javadoc] Loading source files for package org.openstreetmap.osmosis.core.progress.v0_6.impl... [javadoc] Loading source files for package org.openstreetmap.osmosis.core.report.v0_5... [javadoc] Loading source files for package org.openstreetmap.osmosis.core.report.v0_6... [javadoc] Loading source files for package org.openstreetmap.osmosis.core.sort.common... [javadoc] Loading source files for package org.openstreetmap.osmosis.core.sort.v0_5... [javadoc] Loading source files for package org.openstreetmap.osmosis.core.sort.v0_6... [javadoc] Loading source files for package org.openstreetmap.osmosis.core.store... [javadoc] Loading source files for package org.openstreetmap.osmosis.core.tagremove.v0_6... [javadoc] Loading source files for package org.openstreetmap.osmosis.core.task.common... [javadoc] Loading source files for package org.openstreetmap.osmosis.core.task.v0_5... [javadoc] Loading source files for package org.openstreetmap.osmosis.core.task.v0_6... [javadoc] Loading source files for package org.openstreetmap.osmosis.core.tee.v0_5... [javadoc] Loading source files for package org.openstreetmap.osmosis.core.tee.v0_6... [javadoc] Loading source files for package org.openstreetmap.osmosis.core.util... [javadoc] Loading source files for package org.openstreetmap.osmosis.core.xml.common... [javadoc] Loading source files for package org.openstreetmap.osmosis.core.xml.v0_5... [javadoc] Loading source files for package org.openstreetmap.osmosis.core.xml.v0_5.impl... [javadoc] Loading source files for package org.openstreetmap.osmosis.core.xml.v0_6... [javadoc] Loading source files for package org.openstreetmap.osmosis.core.xml.v0_6.impl... [javadoc] Loading source files for package org.openstreetmap.osmosis.extract.apidb.common... [javadoc] Loading source files for package org.openstreetmap.osmosis.extract.apidb.v0_6... [javadoc] Loading source files for package org.openstreetmap.osmosis.extract.mysql.common... [javadoc] Loading source files for package org.openstreetmap.osmosis.extract.mysql.v0_5... [javadoc] Loading source files for package org.openstreetmap.osmosis.extract.mysql.v0_6... [javadoc] Loading source files for package org.openstreetmap.osmosis.util... [javadoc] Loading source files for package org.openstreetmap.osmosis.util.impl... [javadoc] Constructing Javadoc information... [javadoc] Standard Doclet version 1.6.0_0 [javadoc] Building tree for all the packages and classes... [javadoc] Building index for all the packages and classes... [javadoc] Building index for all classes... dist: [mkdir] Created dir: /home/hudson/jobs/Osmosis/workspace/trunk/dist [zip] Building zip: /home/hudson/jobs/Osmosis/workspace/trunk/dist/osmosis-0.30.2.zip [zip] Building zip: /home/hudson/jobs/Osmosis/workspace/trunk/dist/osmosis-0.30.2-bin.zip [tar] Building tar: /home/hudson/jobs/Osmosis/workspace/trunk/dist/osmosis-0.30.2.tar.gz [tar] Building tar: /home/hudson/jobs/Osmosis/workspace/trunk/dist/osmosis-0.30.2-bin.tar.gz checkstyle: [cs:checkstyle] log4j:WARN No appenders could be found for logger (org.apache.commons.beanutils.BeanUtils). [cs:checkstyle] log4j:WARN Please initialize the log4j system properly. [cs:checkstyle] Running Checkstyle 5.0-beta01 on 825 files build_test: [mkdir] Created dir: /home/hudson/jobs/Osmosis/workspace/trunk/build/test [copy] Copying 19 files to /home/hudson/jobs/Osmosis/workspace/trunk/test/data/input [javac] Compiling 44 source files to /home/hudson/jobs/Osmosis/workspace/trunk/build/test [copy] Copying 40 files to /home/hudson/jobs/Osmosis/workspace/trunk/build/test [copy] Copied 7 empty directories to 1 empty directory under /home/hudson/jobs/Osmosis/workspace/trunk/build/test test: [junit] Running org.openstreetmap.osmosis.core.apidb.v0_6.ApiDbTest [junit] Tests run: 5, Failures: 0, Errors: 5, Time elapsed: 1.579 sec BUILD FAILED /home/hudson/jobs/Osmosis/workspace/trunk/build.xml:192: Test org.openstreetmap.osmosis.core.apidb.v0_6.ApiDbTest failed Total time: 46 seconds _______________________________________________ osmosis-dev mailing list [email protected] http://lists.openstreetmap.org/listinfo/osmosis-dev
