Updated Branches: refs/heads/develop f85163903 -> a8d1abea1
fixes bug in cors service (DELETE was not supported) Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/425e9a78 Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/425e9a78 Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/425e9a78 Branch: refs/heads/develop Commit: 425e9a78ee7f935f4846fa16b6694ec092ec415c Parents: 61f72cb 4dfdb52 Author: tkurz <[email protected]> Authored: Thu Apr 11 23:58:46 2013 +0200 Committer: tkurz <[email protected]> Committed: Thu Apr 11 23:58:46 2013 +0200 ---------------------------------------------------------------------- .../src/main/webapp/WEB-INF/web.xml | 9 +- build/plugins/refpack-maven-plugin/pom.xml | 15 ++ .../maven/plugins/refpack/RefPackMojo.java | 53 ++--- build/scripts/check_signatures_and_digests.sh | 4 +- .../src/test/resources/logback.xml | 27 +++ .../src/test/resources/logback.xml | 6 +- .../src/test/resources/logback.xml | 6 +- .../src/test/resources/logback.xml | 6 +- .../src/test/resources/logback.xml | 6 +- .../src/test/resources/logback.xml | 6 +- launchers/marmotta-installer/pom.xml | 6 +- .../src/main/webapp/WEB-INF/web.xml | 12 - .../apache/marmotta/kiwi/test/TransactionTest.java | 15 ++ .../src/test/resources/logback.xml | 2 +- .../src/test/resources/logback.xml | 2 +- .../kiwi/persistence/mysql/statements.properties | 6 +- .../versioning/test/SnapshotRepositoryTest.java | 19 ++ .../versioning/test/VersioningPersistenceTest.java | 18 ++ .../versioning/test/VersioningRepositoryTest.java | 20 ++ .../backend/file/test/LDCacheBackendTest.java | 18 ++ .../src/test/resources/logback.xml | 2 +- .../backend/kiwi/test/LDCacheBackendTest.java | 19 ++ .../backend/kiwi/test/LDCachePersistenceTest.java | 18 ++ .../src/test/resources/logback.xml | 2 +- .../ldcache-core/src/test/resources/logback.xml | 2 +- .../src/test/resources/logback.xml | 2 +- .../src/test/resources/logback.xml | 2 +- .../marmotta/ldclient/test/TestLDClientTest.java | 19 ++ .../ldclient-core/src/test/resources/logback.xml | 2 +- .../test/facebook/FacebookProviderTest.java | 16 ++ .../src/test/resources/logback.xml | 27 +++ .../src/test/resources/logback.xml | 6 +- .../test/mediawiki/TestMediawikiProvider.java | 17 ++ .../src/test/resources/logback.xml | 27 +++ .../src/test/resources/logback.xml | 27 +++ .../ldclient/test/vimeo/TestVimeoProvider.java | 17 ++ .../src/test/resources/logback.xml | 27 +++ .../ldclient/test/youtube/TestYoutubeProvider.java | 17 ++ .../src/test/resources/logback.xml | 27 +++ .../src/test/resources/logback.xml | 27 +++ .../marmotta/ldpath/test/AbstractTestBase.java | 20 ++ .../ldpath-core/src/test/resources/logback.xml | 6 +- .../src/test/resources/logback.xml | 6 +- .../src/test/resources/logback.xml | 6 +- .../src/test/resources/logback.xml | 6 +- .../src/test/resources/logback.xml | 6 +- .../src/test/resources/logback.xml | 6 +- .../src/test/resources/logback.xml | 6 +- .../src/test/resources/logback.xml | 6 +- .../platform/core/rio/RDFHtmlWriterImpl.java | 2 +- .../services/templating/TemplatingServiceImpl.java | 2 +- .../src/main/resources/META-INF/LICENSE | 166 +++++++++++++-- .../src/main/resources/META-INF/NOTICE | 31 ++- .../src/main/resources/META-INF/LICENSE | 160 ++++++++++++++- .../src/main/resources/META-INF/NOTICE | 32 +++- pom.xml | 27 ++- 56 files changed, 899 insertions(+), 148 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/425e9a78/libraries/kiwi/kiwi-versioning/src/test/java/org/apache/marmotta/kiwi/versioning/test/VersioningPersistenceTest.java ---------------------------------------------------------------------- diff --cc libraries/kiwi/kiwi-versioning/src/test/java/org/apache/marmotta/kiwi/versioning/test/VersioningPersistenceTest.java index 10ad516,e5335fa..9d723f3 --- a/libraries/kiwi/kiwi-versioning/src/test/java/org/apache/marmotta/kiwi/versioning/test/VersioningPersistenceTest.java +++ b/libraries/kiwi/kiwi-versioning/src/test/java/org/apache/marmotta/kiwi/versioning/test/VersioningPersistenceTest.java @@@ -34,10 -35,17 +34,15 @@@ import org.apache.marmotta.kiwi.version import org.junit.After; import org.junit.Assert; import org.junit.Before; + import org.junit.Rule; import org.junit.Test; + import org.junit.rules.TestWatcher; + import org.junit.runner.Description; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; + import org.slf4j.Logger; + import org.slf4j.LoggerFactory; -import java.sql.PreparedStatement; -import java.sql.ResultSet; import java.sql.SQLException; import java.util.ArrayList; import java.util.Date; http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/425e9a78/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/rio/RDFHtmlWriterImpl.java ---------------------------------------------------------------------- diff --cc platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/rio/RDFHtmlWriterImpl.java index 321dd22,321dd22..4562630 --- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/rio/RDFHtmlWriterImpl.java +++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/rio/RDFHtmlWriterImpl.java @@@ -221,7 -221,7 +221,7 @@@ public class RDFHtmlWriterImpl implemen data.put("LOGO", configurationService.getStringConfiguration("kiwi.pages.project."+project+".logo", project+".png")); data.put("CSS", configurationService.getStringConfiguration("kiwi.pages.project."+project+".css", "core/public/style/"+project+".css")); data.put("FOOTER", configurationService.getStringConfiguration("kiwi.pages.project."+project+".footer", "(footer not properly configured for project "+project+")")); -- data.put("DEFAULT_STYLE", configurationService.getStringConfiguration("kiwi.pages.style", "marmotta")); ++ data.put("DEFAULT_STYLE", configurationService.getStringConfiguration("kiwi.pages.style_path", "/")); //set timemap link if(configurationService.getBooleanConfiguration("versioning.enabled")) { http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/425e9a78/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/templating/TemplatingServiceImpl.java ---------------------------------------------------------------------- diff --cc platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/templating/TemplatingServiceImpl.java index 5e4fcb5,5e4fcb5..392455e --- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/templating/TemplatingServiceImpl.java +++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/templating/TemplatingServiceImpl.java @@@ -59,7 -59,7 +59,7 @@@ public class TemplatingServiceImpl impl private static final String TEMPLATE_STRING = "admin.ftl"; private static final String DEFAULT_REST_PATH = "/doc/rest/"; private static final String DEFAULT_REST_FILE = "overview-summary.html"; -- private static final String DEFAULT_STYLE = "blue"; ++ private static final String DEFAULT_STYLE = "/"; private static final String DEFAULT_TITLE_FOR_WEBSERVICES = "webservices"; private static final String DEFAULT_PROJECT = "marmotta";
