You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by tk...@apache.org on 2014/11/12 19:07:56 UTC
[1/2] marmotta git commit: switch to squebi version 1.0.0
Repository: marmotta
Updated Branches:
refs/heads/develop 4f5394857 -> 1711fca29
switch to squebi version 1.0.0
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/93340d88
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/93340d88
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/93340d88
Branch: refs/heads/develop
Commit: 93340d8883f216cec5329b287999ef004276fcea
Parents: d3f9ff5
Author: tkurz <tk...@apache.org>
Authored: Wed Nov 12 16:01:10 2014 +0100
Committer: tkurz <tk...@apache.org>
Committed: Wed Nov 12 16:01:10 2014 +0100
----------------------------------------------------------------------
platform/marmotta-sparql/pom.xml | 13 +------------
.../src/main/resources/web/admin/squebi.html | 10 +++++-----
2 files changed, 6 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/93340d88/platform/marmotta-sparql/pom.xml
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/pom.xml b/platform/marmotta-sparql/pom.xml
index ea78c2e..dce04a9 100644
--- a/platform/marmotta-sparql/pom.xml
+++ b/platform/marmotta-sparql/pom.xml
@@ -34,17 +34,6 @@
UIs for exploring SPARQL results.
</description>
- <repositories>
- <repository>
- <id>oss-sonatype</id>
- <name>oss-sonatype</name>
- <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- </repositories>
-
<build>
<pluginManagement>
<plugins>
@@ -189,7 +178,7 @@
<dependency>
<groupId>com.github.tkurz.webjars</groupId>
<artifactId>squebi</artifactId>
- <version>0.0.10-SNAPSHOT</version>
+ <version>1.0.0</version>
</dependency>
<dependency>
<groupId>org.webjars</groupId>
http://git-wip-us.apache.org/repos/asf/marmotta/blob/93340d88/platform/marmotta-sparql/src/main/resources/web/admin/squebi.html
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/src/main/resources/web/admin/squebi.html b/platform/marmotta-sparql/src/main/resources/web/admin/squebi.html
index ff7f59c..5e94cfa 100644
--- a/platform/marmotta-sparql/src/main/resources/web/admin/squebi.html
+++ b/platform/marmotta-sparql/src/main/resources/web/admin/squebi.html
@@ -25,7 +25,7 @@
SQUEBI = {
selectService : "../select",
updateService : "../update",
- home : "../../webjars/squebi/0.0.10-SNAPSHOT",
+ home : "../../webjars/squebi/1.0.0",
hints : [],
container : '#squebi_container',
browse : {
@@ -42,14 +42,14 @@
]
};
</script>
- <script data-main="../../webjars/squebi/0.0.10-SNAPSHOT/squebi" src="../../webjars/requirejs/2.1.15/require.js"></script>
- <link href="../../webjars/squebi/0.0.10-SNAPSHOT/squebi.css" rel="stylesheet" type="text/css">
+ <script data-main="../../webjars/squebi/1.0.0/squebi" src="../../webjars/requirejs/2.1.15/require.js"></script>
+ <link href="../../webjars/squebi/1.0.0/squebi.css" rel="stylesheet" type="text/css">
<!--###END_HEAD###-->
</head>
<body>
<!--###BEGIN_CONTENT###-->
<div id="appLoader" style="margin-top: 100px; text-align: center; margin-bottom: 100px">
- <img src="../../webjars/squebi/0.0.10-SNAPSHOT/img/ajax-loader-big.gif">
+ <img src="../../webjars/squebi/1.0.0/img/ajax-loader-big.gif">
</div>
<div style="display: none" id="squebi_container" class="container">
<div ng-controller="SampleCtrl" class="header">
@@ -102,7 +102,7 @@
<div ng-show="showResults" ng-controller="ResultCtrl" class="row result">
<div ng-show="!loader" ng-include src="template"></div>
<div class="loader" ng-show="loader">
- <img src="../../webjars/squebi/0.0.10-SNAPSHOT/img/ajax-loader-big.gif">
+ <img src="../../webjars/squebi/1.0.0/img/ajax-loader-big.gif">
</div>
</div>
[2/2] marmotta git commit: Merge branch 'develop' of
https://git-wip-us.apache.org/repos/asf/marmotta into develop
Posted by tk...@apache.org.
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/marmotta into develop
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/1711fca2
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/1711fca2
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/1711fca2
Branch: refs/heads/develop
Commit: 1711fca292a7295dbd5fdae810c8105071d51fda
Parents: 93340d8 4f53948
Author: tkurz <tk...@apache.org>
Authored: Wed Nov 12 19:06:10 2014 +0100
Committer: tkurz <tk...@apache.org>
Committed: Wed Nov 12 19:06:10 2014 +0100
----------------------------------------------------------------------
.../org/apache/marmotta/platform/ldp/util/LdpUtils.java | 10 ++++++----
.../marmotta/platform/ldp/webservices/LdpWebService.java | 2 +-
2 files changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------