You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by ja...@apache.org on 2014/03/17 12:04:50 UTC
[05/40] git commit: Merge branch 'develop' of
https://git-wip-us.apache.org/repos/asf/marmotta into develop
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/marmotta into develop
# By Jakob Frank (5) and Sebastian Schaffert (4)
# Via Sebastian Schaffert
* 'develop' of https://git-wip-us.apache.org/repos/asf/marmotta:
a bit of cache tuning
- loader: support for importing geonames data
MARMOTTA-434: fixed jrebel configuration
removed wrong license-headers in 3rd-party source files
MARMOTTA-434: fixed jrebel config in snorql-webjar
MARMOTTA-434: updated jrebel config
turned off jslint warnings for sgvizler
- add a test for incorrect date parsing
- loader supports now datasets contained in archives (ZIP, tar.gz, ...)
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/d44196c3
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/d44196c3
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/d44196c3
Branch: refs/heads/ldp
Commit: d44196c3056927fba45dfad18eba666dd4d1b614
Parents: d5bbec5 e796661
Author: Rupert Westenthaler <ru...@gmail.com>
Authored: Tue Feb 4 17:04:48 2014 +0100
Committer: Rupert Westenthaler <ru...@gmail.com>
Committed: Tue Feb 4 17:04:48 2014 +0100
----------------------------------------------------------------------
.../marmotta/commons/util/DateUtilsTest.java | 13 +-
.../marmotta-rio-api/pom.xml | 12 +
.../marmotta-rio-ical/pom.xml | 12 +
.../marmotta-rio-rss/pom.xml | 7 +
.../marmotta-rio-vcard/pom.xml | 12 +
.../marmotta-sail-contextaware/pom.xml | 12 +
.../marmotta-sail-transactions/pom.xml | 12 +
.../marmotta-util-facading/pom.xml | 12 +
.../marmotta-util-filter/pom.xml | 12 +
.../marmotta-util-tripletable/pom.xml | 12 +
extras/webjars/sgvizler/pom.xml | 8 +
.../webjars/sgvizler/0.5.1/lib/d3.v2.min.js | 1 -
.../0.5.1/lib/raphael-dracula.pack.min.js | 1 -
.../webjars/sgvizler/0.5.1/sgvizler.chart.css | 1 -
.../webjars/sgvizler/0.5.1/sgvizler.js | 1 -
extras/webjars/snorql/pom.xml | 9 +-
.../snorql/src/main/resources/namespaces.js | 24 +-
.../snorql/src/main/resources/prototype.js | 17 -
.../src/main/resources/scriptaculous/builder.js | 17 -
.../main/resources/scriptaculous/controls.js | 30 +-
.../main/resources/scriptaculous/dragdrop.js | 23 +-
.../src/main/resources/scriptaculous/effects.js | 28 +-
.../resources/scriptaculous/scriptaculous.js | 52 ++-
.../src/main/resources/scriptaculous/slider.js | 22 +-
.../src/main/resources/scriptaculous/sound.js | 24 +-
.../main/resources/scriptaculous/unittest.js | 24 +-
.../webjars/snorql/src/main/resources/snorql.js | 17 -
.../webjars/snorql/src/main/resources/sparql.js | 75 ++--
.../snorql/src/main/resources/xml-to-html.xsl | 366 +++++++++----------
extras/webjars/strftime/pom.xml | 7 +
.../kiwi/loader/generic/KiWiBatchHandler.java | 2 +-
.../kiwi/loader/generic/KiWiHandler.java | 4 +-
.../marmotta/kiwi/caching/KiWiCacheManager.java | 5 +-
libraries/ldclient/ldclient-api/pom.xml | 12 +
libraries/ldclient/ldclient-core/pom.xml | 7 +
.../ldclient/ldclient-provider-rdf/pom.xml | 12 +
loader/marmotta-loader-core/pom.xml | 4 +
.../marmotta/loader/api/LoaderOptions.java | 6 +
.../marmotta/loader/core/MarmottaLoader.java | 120 +++++-
.../marmotta/loader/rio/GeonamesFormat.java | 45 +++
.../marmotta/loader/rio/GeonamesParser.java | 238 ++++++++++++
.../loader/rio/GeonamesParserFactory.java | 46 +++
.../services/org.openrdf.rio.RDFParserFactory | 1 +
.../marmotta/loader/core/test/ArchiveTest.java | 59 +++
.../marmotta/loader/core/test/FilesTest.java | 43 +++
.../loader/core/test/GeonamesParserTest.java | 66 ++++
.../marmotta/loader/core/test/LoadTest.java | 150 --------
.../loader/core/test/LoaderTestBase.java | 139 +++++++
.../src/test/resources/demo-data.tar.gz | Bin 0 -> 1405 bytes
.../src/test/resources/demo-data.zip | Bin 0 -> 1457 bytes
.../src/test/resources/geonames-sample.txt | 4 +
parent/pom.xml | 9 +
platform/marmotta-versioning-common/pom.xml | 3 +-
53 files changed, 1253 insertions(+), 585 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/d44196c3/libraries/ldclient/ldclient-api/pom.xml
----------------------------------------------------------------------
diff --cc libraries/ldclient/ldclient-api/pom.xml
index 9dfd901,254a843..ae8a55e
--- a/libraries/ldclient/ldclient-api/pom.xml
+++ b/libraries/ldclient/ldclient-api/pom.xml
@@@ -27,30 -27,19 +27,42 @@@
<artifactId>ldclient-api</artifactId>
<name>LDClient: API</name>
+ <description>
+ Interfaces and Data Model for the Linked Data Client component.
+ </description>
+ <packaging>bundle</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Export-Package>
+ org.apache.marmotta.ldlient.api.*;version=${project.version},
+ org.apache.marmotta.ldcache.exception;version=${project.version},
+ org.apache.marmotta.ldcache.model;version=${project.version}
+ </Export-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.zeroturnaround</groupId>
+ <artifactId>jrebel-maven-plugin</artifactId>
+ <configuration>
+ <relativePath>../../../</relativePath>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
<dependencies>
<dependency>
<groupId>org.apache.marmotta</groupId>
http://git-wip-us.apache.org/repos/asf/marmotta/blob/d44196c3/parent/pom.xml
----------------------------------------------------------------------