Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-marmotta
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/0825b682 Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/0825b682 Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/0825b682 Branch: refs/heads/master Commit: 0825b682872590bd65a46e2578ceaab3dd281e4f Parents: 1aa3a81 7b7869e Author: Sebastian Schaffert <[email protected]> Authored: Mon Apr 8 17:56:06 2013 +0200 Committer: Sebastian Schaffert <[email protected]> Committed: Mon Apr 8 17:56:06 2013 +0200 ---------------------------------------------------------------------- .../src/main/resources/logback.xml | 47 +- .../src/main/webapp/WEB-INF/jetty-web.xml | 48 +- .../src/main/webapp/search/test_luke.html | 44 - .../src/main/webapp/skosjs-extension/test.html | 35 - .../src/main/webapp/solr/admin/_info.jsp | 121 --- .../src/main/webapp/solr/admin/action.jsp | 90 -- .../src/main/webapp/solr/admin/analysis.jsp | 505 ----------- .../src/main/webapp/solr/admin/analysis.xsl | 179 ---- .../src/main/webapp/solr/admin/dataimport.jsp | 56 -- .../src/main/webapp/solr/admin/debug.jsp | 109 --- .../main/webapp/solr/admin/distributiondump.jsp | 156 ---- .../src/main/webapp/solr/admin/form.jsp | 140 --- .../src/main/webapp/solr/admin/get-file.jsp | 73 -- .../src/main/webapp/solr/admin/get-properties.jsp | 27 - .../src/main/webapp/solr/admin/header.jsp | 47 - .../src/main/webapp/solr/admin/index.jsp | 162 ---- .../src/main/webapp/solr/admin/meta.xsl | 34 - .../src/main/webapp/solr/admin/ping.jsp | 50 -- .../src/main/webapp/solr/admin/ping.xsl | 71 -- .../src/main/webapp/solr/admin/raw-schema.jsp | 39 - .../src/main/webapp/solr/admin/registry.jsp | 109 --- .../src/main/webapp/solr/admin/registry.xsl | 321 ------- .../main/webapp/solr/admin/replication/header.jsp | 92 -- .../main/webapp/solr/admin/replication/index.jsp | 382 -------- .../src/main/webapp/solr/admin/schema.jsp | 677 --------------- .../src/main/webapp/solr/admin/solr-admin.css | 214 ----- .../src/main/webapp/solr/admin/solr_small.png | Bin 7926 -> 0 bytes .../src/main/webapp/solr/admin/stats.jsp | 94 -- .../src/main/webapp/solr/admin/stats.xsl | 220 ----- .../src/main/webapp/solr/admin/tabular.xsl | 141 --- .../src/main/webapp/solr/admin/threaddump.jsp | 111 --- .../src/main/webapp/solr/admin/threaddump.xsl | 103 --- .../src/main/webapp/solr/index.jsp | 64 -- .../src/test/resources/META-INF/beans.xml | 30 +- .../test/resources/META-INF/test-persistence.xml | 30 +- .../src/test/resources/WEB-INF/test-web.xml | 30 +- .../src/test/resources/arquillian.xml | 30 +- .../src/test/resources/ehcache.xml | 32 +- .../src/test/resources/jndi.properties | 2 - .../src/test/resources/logback.xml | 30 +- .../src/test/resources/test-config.properties | 4 +- .../org/apache/marmotta/client/test/demo-data.foaf | 28 +- .../commons/sesame/model/LiteralCommonsTest.java | 15 - .../commons/sesame/model/ResourceUtilsTest.java | 15 - .../marmotta/commons/sesame/model/demo-data.foaf | 30 +- .../commons/sesame/rio/ical/TestICalParser.java | 21 +- .../commons/sesame/rio/rss/TestAtomParser.java | 21 +- .../commons/sesame/rio/rss/TestRSSParser.java | 21 +- .../commons/sesame/rio/vcard/TestVCardParser.java | 15 - .../Start Apache Marmotta.app/Contents/Info.plist | 29 +- .../Stop Apache Marmotta.app/Contents/Info.plist | 29 +- launchers/marmotta-webapp/pom.xml | 1 - .../src/test/resources/META-INF/beans.xml | 30 +- .../test/resources/META-INF/test-persistence.xml | 30 +- .../src/test/resources/WEB-INF/test-web.xml | 30 +- .../src/test/resources/arquillian.xml | 29 +- .../marmotta-webapp/src/test/resources/ehcache.xml | 32 +- .../src/test/resources/jndi.properties | 2 - .../marmotta-webapp/src/test/resources/logback.xml | 30 +- .../src/test/resources/test-config.properties | 4 +- .../org/apache/marmotta/kiwi/test/demo-data.foaf | 29 +- .../apache/marmotta/kiwi/test/srfg-ontology.rdf | 32 +- .../marmotta/kiwi/versioning/test/version-base.rdf | 31 +- .../kiwi/versioning/test/version-update1.rdf | 31 +- .../kiwi/versioning/test/version-update2.rdf | 31 +- .../marmotta/ldpath/backend/file/ParserTest.java | 15 - .../marmotta/ldpath/backend/file/PathTest.java | 15 - .../marmotta/ldpath/backend/file/demo-data.foaf | 30 +- parent/pom.xml | 9 +- .../src/test/resources/META-INF/beans.xml | 30 +- .../src/test/resources/ehcache-db.xml | 32 +- .../src/test/resources/ehcache-lmf.xml | 32 +- .../src/test/resources/logback-testing.xml | 30 +- .../marmotta-core/src/test/resources/logback.xml | 30 +- .../platform/core/test/sesame/demo-data.foaf | 30 +- .../marmotta-sparql/src/test/resources/foaf.rdf | 18 +- 76 files changed, 492 insertions(+), 5094 deletions(-) ----------------------------------------------------------------------
