You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by wi...@apache.org on 2013/05/20 09:44:38 UTC
[1/3] git commit: MARMOTTA-238: added missing dependencies to import
javax.ws.rs.ext.ExceptionMapper
Updated Branches:
refs/heads/MARMOTTA-228 c3221e6ae -> 4d7c52228
MARMOTTA-238: added missing dependencies to import javax.ws.rs.ext.ExceptionMapper
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/89aee639
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/89aee639
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/89aee639
Branch: refs/heads/MARMOTTA-228
Commit: 89aee63937b9d076b05b92768a8b222394a0c654
Parents: c3221e6
Author: Sergio Fernández <wi...@apache.org>
Authored: Mon May 20 09:11:59 2013 +0200
Committer: Sergio Fernández <wi...@apache.org>
Committed: Mon May 20 09:11:59 2013 +0200
----------------------------------------------------------------------
parent/pom.xml | 15 +++++++++++++--
platform/marmotta-core/pom.xml | 4 ++++
2 files changed, 17 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/89aee639/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 0655580..3fac8b7 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -772,8 +772,19 @@
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
+ <artifactId>jaxrs-api</artifactId>
+ <version>2.3.6.Final</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-cdi</artifactId>
- <version>2.3.5.Final</version>
+ <version>2.3.6.Final</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
@@ -784,7 +795,7 @@
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-jackson-provider</artifactId>
- <version>2.3.5.Final</version>
+ <version>2.3.6.Final</version>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/89aee639/platform/marmotta-core/pom.xml
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/pom.xml b/platform/marmotta-core/pom.xml
index a7c7597..2318fb3 100644
--- a/platform/marmotta-core/pom.xml
+++ b/platform/marmotta-core/pom.xml
@@ -253,6 +253,10 @@
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
+ <artifactId>jaxrs-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-cdi</artifactId>
</dependency>
<dependency>
[3/3] git commit: MARMOTTA-228: adapted prefix widgets
Posted by wi...@apache.org.
MARMOTTA-228: adapted prefix widgets
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/4d7c5222
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/4d7c5222
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/4d7c5222
Branch: refs/heads/MARMOTTA-228
Commit: 4d7c52228c44daa3975ffd8d405b1ed82c1c1b77
Parents: 6b733d5
Author: Sergio Fernández <wi...@apache.org>
Authored: Mon May 20 09:42:56 2013 +0200
Committer: Sergio Fernández <wi...@apache.org>
Committed: Mon May 20 09:42:56 2013 +0200
----------------------------------------------------------------------
.../src/main/resources/web/admin/prefixes.html | 77 ++++++++++-----
1 files changed, 50 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4d7c5222/platform/marmotta-core/src/main/resources/web/admin/prefixes.html
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/resources/web/admin/prefixes.html b/platform/marmotta-core/src/main/resources/web/admin/prefixes.html
index 65ae361..42b86ec 100644
--- a/platform/marmotta-core/src/main/resources/web/admin/prefixes.html
+++ b/platform/marmotta-core/src/main/resources/web/admin/prefixes.html
@@ -27,32 +27,54 @@
<div id="main">
<div id="contents">
<!--###BEGIN_CONTENT###-->
- <h1>Prefixes</h1>
- <h2>Management</h2>
- <p>
- Here you can configure the prefix mappings for the RDF namespaces used in Marmotta:
- </p>
- <table id="prefixes" class="simple_table">
- <tr>
- <th>Prefix</th>
- <th>Namespace</th>
- </tr>
- </table>
-
- <h2 style="margin-top: 5em:">New prefix</h2>
- <table id="add-new-prefix" style="margin: 2em auto 0 auto; background-color:#eeeeee; padding:20px; border:1px solid gray;-webkit-border-radius: 3px; border-radius: 3px;">
- <tr>
- <td>Prefix:</td>
- <td><input type="text" size="10" name="prefix" id="new-prefix" /></td>
- </tr>
- <tr>
- <td>Namespace:</td>
- <td><input type="text" size="50" name="prefix" id="new-namespace" /></td>
- </tr>
- </table>
- <p style="width:100%; text-align:center; padding-top:10px; margin-bottom:30px;">
- <input type="submit" id="add-new-prefix-button" value="Add new prefix" />
- </p>
+
+ <div class="span12">
+ <div class="hero-unit">
+ <h2>Prefix mappings management</h2>
+ </div>
+ </div>
+
+ <div class="span12">
+ <div class="unit">
+ <p>
+ Here you can configure the prefix mappings for RDF namespaces used in Marmotta.
+ </p>
+ <table id="prefixes" class="table table-striped table-bordered table-condensed">
+ <tr>
+ <th>Prefix</th>
+ <th>Namespace</th>
+ </tr>
+ </table>
+ </div>
+ </div>
+
+ <div class="span12">
+ <div class="unit">
+ <form class="form-horizontal" id="add-new-prefix">
+ <fieldset style="background-color: #eee;">
+ <legend>Add new prefix:</legend>
+ <div class="control-group">
+ <label class="control-label" for="prefix">Prefix:</label>
+ <div class="controls">
+ <input id="new-prefix" type="text" placeholder="prefix" />
+ </div>
+ </div>
+ <div class="control-group">
+ <label class="control-label">Namespace:</label>
+ <div class="controls">
+ <input id="new-namespace" type="text" placeholder="namespace" />
+ </div>
+ </div>
+ <div class="control-group">
+ <label class="control-label">Submit</label>
+ <div class="controls">
+ <input type="submit" value="Add new prefix" />
+ </div>
+ </div>
+ </fieldset>
+ </form>
+ </div>
+ </div>
<script type="text/javascript" src="../../webjars/jquery/1.8.2/jquery.min.js"></script>
<script type="text/javascript">
@@ -68,7 +90,7 @@
});
});
- $("#add-new-prefix-button").click(function() {
+ $("#add-new-prefix").submit(function() {
var prefix = $("#new-prefix").val();
var namespace = $("#new-namespace").val();
var url = "../../prefix/" + prefix + "?uri=" + namespace;
@@ -90,6 +112,7 @@
},
dataType: "application/json"
});
+ return false;
});
});
[2/3] git commit: typo fixed
Posted by wi...@apache.org.
typo fixed
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/6b733d51
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/6b733d51
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/6b733d51
Branch: refs/heads/MARMOTTA-228
Commit: 6b733d518ea60cdf618d52272b30a7d0d3227e67
Parents: 89aee63
Author: Sergio Fernández <wi...@apache.org>
Authored: Mon May 20 09:15:37 2013 +0200
Committer: Sergio Fernández <wi...@apache.org>
Committed: Mon May 20 09:15:37 2013 +0200
----------------------------------------------------------------------
.../src/main/resources/templates/admin.ftl | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/6b733d51/platform/marmotta-core/src/main/resources/templates/admin.ftl
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/resources/templates/admin.ftl b/platform/marmotta-core/src/main/resources/templates/admin.ftl
index 682f574..9c25cd3 100644
--- a/platform/marmotta-core/src/main/resources/templates/admin.ftl
+++ b/platform/marmotta-core/src/main/resources/templates/admin.ftl
@@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8">
- <title>Aapche Marmotta</title>
+ <title>Apache Marmotta</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link href="${SERVER_URL}core/public/img/icon/lmf.ico" rel="SHORTCUT ICON">
<script src="${SERVER_URL}core/public/js/lib/jquery-1.7.2.js"></script>
@@ -190,4 +190,4 @@
<!-- Placed at the end of the document so the pages load faster -->
<script src="${SERVER_URL}ext/bootstrap/js/bootstrap.js"></script>
-</html>
\ No newline at end of file
+</html>