Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/marmotta into develop
# By Jakob Frank (3) and Sergio Fernández (3) # Via Sergio Fernández * 'develop' of https://git-wip-us.apache.org/repos/asf/marmotta: MARMOTTA-431: fixed version generation, both for snapshots and releases fixed naming of the ldpath-parser spec (and updated license header) MARMOTTA-431: changed package name to just 'marmotta' (replaces the other) Fixed marmotta-loader to cleanup the statistics db on shutdown (also moved the file to ${temp.dir}) - updated statistics to use nio.Path reformated rdfpath.jj and moved it to the right subdirectory updated maven-download-plugin Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/638dea35 Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/638dea35 Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/638dea35 Branch: refs/heads/ldp Commit: 638dea35be21de2749131e3ac220278a440d05cb Parents: 517f76e ef113cd Author: Rupert Westenthaler <[email protected]> Authored: Wed Feb 26 12:05:45 2014 +0100 Committer: Rupert Westenthaler <[email protected]> Committed: Wed Feb 26 12:05:45 2014 +0100 ---------------------------------------------------------------------- launchers/marmotta-installer/pom.xml | 2 +- launchers/marmotta-webapp/pom.xml | 25 +- .../marmotta-webapp/src/deb/control/control | 1 + .../at/newmedialab/ldpath/parser/rdfpath.jj | 1102 ----------------- .../org/apache/marmotta/ldpath/parser/ldpath.jj | 1106 ++++++++++++++++++ .../marmotta/loader/statistics/Statistics.java | 74 +- .../loader/core/test/LoaderTestBase.java | 7 +- .../core/test/dummy/DummyLoaderBackend.java | 4 +- .../core/test/dummy/DummyLoaderHandler.java | 17 +- parent/pom.xml | 5 + 10 files changed, 1195 insertions(+), 1148 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/marmotta/blob/638dea35/parent/pom.xml ----------------------------------------------------------------------
