marmotta-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tk...@apache.org
Subject [1/2] marmotta git commit: add new squebi dependency (currently snapshot but will be released after testing)
Date Wed, 12 Nov 2014 09:47:50 GMT
Repository: marmotta
Updated Branches:
  refs/heads/develop e0f279cbd -> d3f9ff540


add new squebi dependency (currently snapshot but will be released after testing)


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

Branch: refs/heads/develop
Commit: 03d13002d674ac867bed81f86a4e53ad890ea5f7
Parents: ec317f2
Author: tkurz <tkurz@apache.org>
Authored: Tue Nov 11 15:32:58 2014 +0100
Committer: tkurz <tkurz@apache.org>
Committed: Tue Nov 11 15:32:58 2014 +0100

----------------------------------------------------------------------
 parent/pom.xml                                    |  6 ++++++
 platform/marmotta-sparql/pom.xml                  | 17 ++++++++++++++++-
 .../src/main/resources/web/admin/squebi.html      | 18 +++++++++---------
 3 files changed, 31 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/marmotta/blob/03d13002/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index e5c9208..2927749 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -990,6 +990,12 @@
             </dependency>
             <dependency>
                 <groupId>org.webjars</groupId>
+                <artifactId>requirejs</artifactId>
+                <version>2.1.15</version>
+                <scope>runtime</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.webjars</groupId>
                 <artifactId>jquery-ui-themes</artifactId>
                 <version>1.10.3</version>
                 <scope>runtime</scope>

http://git-wip-us.apache.org/repos/asf/marmotta/blob/03d13002/platform/marmotta-sparql/pom.xml
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/pom.xml b/platform/marmotta-sparql/pom.xml
index 6fa236a..ea78c2e 100644
--- a/platform/marmotta-sparql/pom.xml
+++ b/platform/marmotta-sparql/pom.xml
@@ -34,6 +34,17 @@
         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>
@@ -178,7 +189,7 @@
         <dependency>
             <groupId>com.github.tkurz.webjars</groupId>
             <artifactId>squebi</artifactId>
-            <version>0.0.9</version>
+            <version>0.0.10-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.webjars</groupId>
@@ -186,6 +197,10 @@
         </dependency>
         <dependency>
             <groupId>org.webjars</groupId>
+            <artifactId>requirejs</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.webjars</groupId>
             <artifactId>sgvizler</artifactId>
             <version>0.6</version>
             <scope>runtime</scope>

http://git-wip-us.apache.org/repos/asf/marmotta/blob/03d13002/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 381dce3..ff7f59c 100644
--- a/platform/marmotta-sparql/src/main/resources/web/admin/squebi.html
+++ b/platform/marmotta-sparql/src/main/resources/web/admin/squebi.html
@@ -25,31 +25,31 @@
         SQUEBI = {
             selectService : "../select",
             updateService : "../update",
-            app : "../../webjars/squebi/0.0.9",
-            bower : ".",
+            home : "../../webjars/squebi/0.0.10-SNAPSHOT",
             hints : [],
             container : '#squebi_container',
             browse : {
                 showFlags : false
             },
             "samples": [
-                {"name":"Select first 10 triples", "value":"SELECT * WHERE {\n  ?subject
?property ?object\n} LIMIT 10","type":"browse"},
+                {"name":"Select first 10 triples", "value":"SELECT * WHERE {\n  ?subject
?property ?object\n}\nLIMIT 10","type":"browse"},
                 {"name":"List types", "value":"SELECT DISTINCT ?type WHERE {\n  [] a ?type\n}
ORDER BY ?type","type":"browse"},
-                {"name":"List properties", "value":"SELECT DISTINCT ?property WHERE {\n 
[] ?property []\n} ORDER BY ?property","type":"browse"},
-                {"name":"List classes and count their usage as pie chart", "value":"SELECT
?class (COUNT (?s) AS ?count) WHERE {\n  ?s a ?class\n}\nGROUP BY ?class\nORDER BY DESC(?count)","type":"piechart"},
+                {"name":"List properties", "value":"SELECT DISTINCT ?property WHERE {\n 
[] ?property []\n} ORDER BY ?property","type":"browse"}
+                //,{"name":"List classes and count their usage as pie chart", "value":"SELECT
?class (COUNT (?s) AS ?count) WHERE {\n  ?s a ?class\n}\nGROUP BY ?class\nORDER BY DESC(?count)","type":"piechart"},
             ],
             "writers": [
                 "browse","csv","json","pie","xml"
             ]
         };
     </script>
-    <script data-main="../../webjars/squebi/0.0.9/main" src="../../webjars/squebi/0.0.9/requirejs/require.js"></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">
     <!--###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.9/squebi/img/ajax-loader-big.gif">
+    <img src="../../webjars/squebi/0.0.10-SNAPSHOT/img/ajax-loader-big.gif">
 </div>
 <div style="display: none" id="squebi_container" class="container">
     <div ng-controller="SampleCtrl" class="header">
@@ -78,7 +78,7 @@
         <div id="query-container">
             <textarea id="input" ng-model="query" ui-codemirror="editorOptions"></textarea>
         </div>
-        <a class="btn btn-lg btn-success btn-query" ng-click="triggerQuery()">
+        <a class="btn btn-run btn-lg btn-success btn-query" ng-click="triggerQuery()">
             <i class="fa fa-play-circle"></i> Run
         </a>
     </div>
@@ -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.9/squebi/img/ajax-loader.gif">
+            <img src="../../webjars/squebi/0.0.10-SNAPSHOT/img/ajax-loader-big.gif">
         </div>
     </div>
 


Mime
View raw message