Merge branch 'ldp' into develop

Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/e1f88ee4
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/e1f88ee4
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/e1f88ee4

Branch: refs/heads/master
Commit: e1f88ee416a90c7bc5059e753f06f6dc205c9a57
Parents: 7f8f6f2 efec6fd
Author: Jakob Frank <[email protected]>
Authored: Fri Apr 4 10:41:44 2014 +0200
Committer: Jakob Frank <[email protected]>
Committed: Fri Apr 4 10:41:44 2014 +0200

----------------------------------------------------------------------
 LICENSE.txt                                     |   82 +
 commons/marmotta-commons/pom.xml                |   11 +
 .../apache/marmotta/commons/util/HashUtils.java |    8 +-
 .../marmotta/commons/vocabulary/DCTERMS.java    |  618 --
 .../marmotta/commons/vocabulary/FOAF.java       |  486 --
 .../apache/marmotta/commons/vocabulary/GEO.java |   86 -
 .../apache/marmotta/commons/vocabulary/MA.java  |  567 --
 .../marmotta/commons/vocabulary/SCHEMA.java     | 5809 ------------------
 .../marmotta/commons/vocabulary/SIOC.java       |  582 --
 .../marmotta/commons/vocabulary/SKOS.java       |  228 -
 .../marmotta/commons/vocabulary/SPARQL_SD.java  |  361 --
 .../apache/marmotta/commons/vocabulary/XSD.java |  324 -
 .../marmotta-model-vocabs/pom.xml               |   54 +
 .../marmotta/commons/vocabulary/DCTERMS.java    |  618 ++
 .../marmotta/commons/vocabulary/FOAF.java       |  486 ++
 .../apache/marmotta/commons/vocabulary/GEO.java |   86 +
 .../apache/marmotta/commons/vocabulary/LDP.java |   72 +
 .../apache/marmotta/commons/vocabulary/MA.java  |  567 ++
 .../marmotta/commons/vocabulary/SCHEMA.java     | 5809 ++++++++++++++++++
 .../marmotta/commons/vocabulary/SIOC.java       |  582 ++
 .../marmotta/commons/vocabulary/SKOS.java       |  228 +
 .../marmotta/commons/vocabulary/SPARQL_SD.java  |  361 ++
 .../apache/marmotta/commons/vocabulary/XSD.java |  324 +
 .../marmotta-sesame-matchers/pom.xml            |   73 +
 .../commons/sesame/test/SesameMatchers.java     |  184 +
 .../AbstractRepositoryConnectionMatcher.java    |   43 +
 .../sesame/test/base/RdfStringMatcher.java      |   88 +
 .../sesame/test/base/RepositoryMatcher.java     |   74 +
 .../commons/sesame/test/base/SesameMatcher.java |   28 +
 .../test/connection/HasStatementMatcher.java    |   64 +
 .../sesame/test/sparql/SparqlAskMatcher.java    |   58 +
 .../test/sparql/SparqlGraphQueryMatcher.java    |   78 +
 .../sesame/test/sparql/SparqlMatcher.java       |   55 +
 .../test/sparql/SparqlTupleQueryMatcher.java    |   65 +
 .../marmotta-util-facading/pom.xml              |    4 +
 .../marmotta-util-rdfpatch/pom.xml              |  152 +
 .../patch/InvalidPatchDocumentException.java    |   41 +
 .../marmotta/platform/ldp/patch/RdfPatchIO.java |  166 +
 .../platform/ldp/patch/RdfPatchUtil.java        |  295 +
 .../platform/ldp/patch/model/PatchLine.java     |   87 +
 .../ldp/patch/model/WildcardStatement.java      |  108 +
 .../ldp/patch/parser/RdfPatchParser.java        |   52 +
 .../src/main/javacc/rdf-patch.jj                |  221 +
 .../platform/ldp/patch/RdfPatchIOTest.java      |   61 +
 .../platform/ldp/patch/RdfPatchUtilTest.java    |  158 +
 .../patch/parser/RdfPatchParserImplTest.java    |  100 +
 .../src/test/resources/illustrative.in.ttl      |   28 +
 .../src/test/resources/illustrative.rdfp        |   25 +
 .../src/test/resources/rdf-patch.rdfp           |   98 +
 commons/marmotta-sesame-tools/pom.xml           |    3 +
 launchers/marmotta-installer/pom.xml            |    1 -
 launchers/marmotta-webapp/pom.xml               |   11 +
 parent/pom.xml                                  |   21 +
 platform/marmotta-core/pom.xml                  |   11 +-
 .../core/api/triplestore/LdpService.java        |   86 -
 .../services/triplestore/LdpServiceImpl.java    |  357 --
 .../webservices/triplestore/LdpWebService.java  |  144 -
 .../src/main/resources/kiwi-module.properties   |    3 +-
 .../core/test/base/AbstractMarmotta.java        |    2 +-
 .../platform/core/test/base/JettyMarmotta.java  |   83 +-
 platform/marmotta-ldp/pom.xml                   |  295 +
 .../platform/ldp/api/LdpBinaryStoreService.java |   47 +
 .../marmotta/platform/ldp/api/LdpService.java   |  205 +
 .../InvalidInteractionModelException.java       |   48 +
 .../InvalidModificationException.java           |   45 +
 .../platform/ldp/logging/LdpLoggingModule.java  |   52 +
 .../ldp/services/LdpBinaryStoreServiceImpl.java |  148 +
 .../platform/ldp/services/LdpServiceImpl.java   |  508 ++
 .../platform/ldp/util/EntityTagUtils.java       |   53 +
 .../marmotta/platform/ldp/util/LdpUtils.java    |  134 +
 .../platform/ldp/webservices/LdpWebService.java |  578 ++
 .../platform/ldp/webservices/PATCH.java         |   36 +
 .../src/main/resources/META-INF/beans.xml       |   28 +
 .../main/resources/config-defaults.properties   |   21 +
 .../resources/config-descriptions.properties    |   22 +
 .../src/main/resources/kiwi-module.properties   |   37 +
 .../src/main/resources/web/admin/about.html     |   60 +
 .../main/resources/web/admin/configuration.html |   54 +
 .../src/main/resources/web/admin/img/ldp.png    |  Bin 0 -> 614 bytes
 .../src/main/resources/web/admin/style.css      |   22 +
 .../platform/ldp/testsuite/LdpManifestTest.java |   73 +
 .../platform/ldp/testsuite/LdpTestCase.java     |  185 +
 .../ldp/testsuite/LdpTestCaseRunner.java        |   61 +
 .../platform/ldp/testsuite/LdpTestCases.java    |   87 +
 .../ldp/testsuite/LdpTestCasesRunner.java       |  101 +
 .../ldp/testsuite/LdpTestCasesUtils.java        |  130 +
 .../ldp/webservices/LdpWebServiceTest.java      |  317 +
 .../ldp/webservices/util/HeaderMatchers.java    |   94 +
 .../marmotta-ldp/src/test/resources/test.png    |  Bin 0 -> 5063 bytes
 .../marmotta-ldp/src/test/resources/test.ttl    |   25 +
 .../resources/testsuite/namespaces.properties   |   26 +
 platform/marmotta-sparql/pom.xml                |   10 -
 platform/pom.xml                                |    9 +
 93 files changed, 15272 insertions(+), 9716 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/marmotta/blob/e1f88ee4/parent/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/marmotta/blob/e1f88ee4/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/base/JettyMarmotta.java
----------------------------------------------------------------------

Reply via email to