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 2013/11/29 16:15:04 UTC
[9/9] git commit: Merge remote-tracking branch 'origin/develop' into
develop
Merge remote-tracking branch 'origin/develop' into develop
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/1954841e
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/1954841e
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/1954841e
Branch: refs/heads/develop
Commit: 1954841e8aad8f7b8f31c778f7cc4d54fe5a56e0
Parents: 9c96799 5fca08c
Author: Jakob Frank <ja...@apache.org>
Authored: Fri Nov 29 16:14:08 2013 +0100
Committer: Jakob Frank <ja...@apache.org>
Committed: Fri Nov 29 16:14:08 2013 +0100
----------------------------------------------------------------------
.../src/main/resources/web/admin/about.html | 1 -
.../main/resources/web/admin/configuration.html | 31 +--
.../src/main/webapp/WEB-INF/web.xml | 76 ++++++-
.../src/main/webapp/WEB-INF/web.xml | 83 ++++++-
parent/pom.xml | 7 +-
platform/marmotta-core/pom.xml | 4 +
.../core/jndi/MarmottaJndiListener.java | 2 -
.../core/servlet/MarmottaH2ConsoleFilter.java | 7 +-
.../core/servlet/MarmottaOptionsFilter.java | 9 +-
.../core/servlet/MarmottaPostStartupFilter.java | 13 +-
.../core/servlet/MarmottaPreStartupFilter.java | 9 +-
.../servlet/MarmottaPreStartupListener.java | 8 +-
.../core/servlet/MarmottaResourceFilter.java | 4 -
.../webservices/logging/LoggingWebService.java | 219 +++++++++++++------
.../src/main/resources/web/admin/js/logging.js | 114 +++++++++-
.../src/main/resources/web/admin/logging.html | 137 +++++++-----
.../src/main/resources/web/admin/about.html | 2 -
.../src/main/resources/web/admin/configure.html | 1 -
.../src/main/resources/web/admin/sgvizler.html | 1 -
.../src/main/resources/web/admin/update.html | 2 +-
.../src/main/resources/web/admin/about.html | 1 -
.../main/resources/web/admin/configuration.html | 24 +-
.../src/main/resources/web/admin/about.html | 37 ++++
.../main/resources/web/admin/configuration.html | 51 +++++
24 files changed, 625 insertions(+), 218 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/1954841e/parent/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/1954841e/platform/marmotta-reasoner-kiwi/src/main/resources/web/admin/configure.html
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/1954841e/platform/marmotta-sparql/src/main/resources/web/admin/sgvizler.html
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/1954841e/platform/marmotta-sparql/src/main/resources/web/admin/update.html
----------------------------------------------------------------------
diff --cc platform/marmotta-sparql/src/main/resources/web/admin/update.html
index 6207cfc,1bea78d..ed443db
--- a/platform/marmotta-sparql/src/main/resources/web/admin/update.html
+++ b/platform/marmotta-sparql/src/main/resources/web/admin/update.html
@@@ -75,10 -75,8 +75,10 @@@
</form>
<script type="text/javascript" src="../../webjars/jquery/1.8.2/jquery.min.js"></script>
- <script type="text/javascript" src="../../webjars/jquery-ui/1.8.21/jquery-ui.min.js"></script>
+ <script type="text/javascript" src="../../webjars/jquery-ui/1.10.3/ui/minified/jquery-ui.min.js"></script>
-<script type="text/javascript" src="../../webjars/codemirror/3.16/codemirror.js"></script>
+<script type="text/javascript" src="../../webjars/codemirror/3.16/lib/codemirror.js"></script>
+<script type="text/javascript" src="../../webjars/codemirror/3.16/addon/hint/show-hint.js"></script>
+<script type="text/javascript" src="../../webjars/codemirror/3.16/mode/sparql/sparql.js"></script>
<script type="text/javascript">