You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2018/09/21 10:16:12 UTC

[61/70] [abbrv] jena git commit: JENA-1597: Modules jena-fuseki-main and jena-fuseki-server

JENA-1597: Modules jena-fuseki-main and jena-fuseki-server


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

Branch: refs/heads/master
Commit: 7e6d03af8091549e049c256c102959fa5fb6d6d0
Parents: fd9d360
Author: Andy Seaborne <an...@apache.org>
Authored: Fri Sep 14 13:43:42 2018 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Fri Sep 14 13:43:42 2018 +0100

----------------------------------------------------------------------
 jena-fuseki2/jena-fuseki-access/pom.xml         |    2 +-
 .../jena/fuseki/access/DataAccessCtl.java       |    2 +-
 .../access/AbstractTestSecurityAssembler.java   |    4 +-
 .../fuseki/access/TestSecurityFilterFuseki.java |    7 +-
 jena-fuseki2/jena-fuseki-basic/pom.xml          |  221 -
 jena-fuseki2/jena-fuseki-basic/run-sparqler     |    8 -
 .../jena-fuseki-basic/sparqler/data/books.ttl   |   48 -
 .../jena-fuseki-basic/sparqler/data/empty.nt    |    2 -
 .../sparqler/data/sparql-data.ttl               |  102 -
 .../sparqler/data/underground.ttl               | 8996 ------------------
 .../sparqler/log4j-foreground.properties        |   44 -
 .../sparqler/log4j-server.properties            |   44 -
 .../jena-fuseki-basic/sparqler/pages/D.nt       |    0
 .../jena-fuseki-basic/sparqler/pages/D.rdf      |    8 -
 .../jena-fuseki-basic/sparqler/pages/D.ttl      |    3 -
 .../sparqler/pages/crossdomain.xml              |    3 -
 .../sparqler/pages/data-validator.html          |   48 -
 .../jena-fuseki-basic/sparqler/pages/doc.css    |  127 -
 .../jena-fuseki-basic/sparqler/pages/fuseki.css |  148 -
 .../jena-fuseki-basic/sparqler/pages/index.html |   73 -
 .../sparqler/pages/iri-validator.html           |   22 -
 .../sparqler/pages/query-validator.html         |   71 -
 .../jena-fuseki-basic/sparqler/pages/query.html |   63 -
 .../jena-fuseki-basic/sparqler/pages/robots.txt |    2 -
 .../sparqler/pages/sparql.html                  |   51 -
 .../sparqler/pages/update-validator.html        |   46 -
 .../sparqler/pages/update.html                  |   27 -
 .../sparqler/pages/validator.html               |   35 -
 .../sparqler/pages/xml-to-html-links.xsl        |  183 -
 .../sparqler/pages/xml-to-html-plain.xsl        |  187 -
 .../sparqler/pages/xml-to-html.xsl              |  187 -
 .../jena-fuseki-basic/sparqler/run-sparqler     |   64 -
 .../apache/jena/fuseki/cmds/FusekiBasicCmd.java |   46 -
 .../jena/fuseki/cmds/FusekiBasicMain.java       |  498 -
 .../apache/jena/fuseki/cmds/PlatformInfo.java   |  135 -
 .../apache/jena/fuseki/cmds/ServerConfig.java   |   51 -
 jena-fuseki2/jena-fuseki-core/pom.xml           |    2 +-
 jena-fuseki2/jena-fuseki-embedded/pom.xml       |  163 -
 .../jena/fuseki/embedded/FusekiServer.java      |  597 --
 .../jena/fuseki/embedded/JettyServer.java       |  369 -
 .../jena/fuseki/embedded/CustomService.java     |   81 -
 .../jena/fuseki/embedded/FusekiTestAuth.java    |  178 -
 .../jena/fuseki/embedded/FusekiTestServer.java  |  261 -
 .../jena/fuseki/embedded/TS_EmbeddedFuseki.java |   51 -
 .../fuseki/embedded/TestEmbeddedFuseki.java     |  321 -
 .../embedded/TestFusekiCustomOperation.java     |  188 -
 .../fuseki/embedded/TestFusekiTestAuth.java     |   98 -
 .../fuseki/embedded/TestFusekiTestServer.java   |   60 -
 .../fuseki/embedded/TestMultipleEmbedded.java   |  170 -
 .../examples/ExtendFuseki_AddService_1.java     |  158 -
 .../examples/ExtendFuseki_AddService_2.java     |  123 -
 .../examples/ExtendFuseki_AddService_3.java     |  107 -
 .../embedded/examples/SpecialService.java       |   81 -
 .../src/test/resources/log4j.properties         |   40 -
 .../testing/FusekiEmbedded/config.ttl           |   18 -
 .../testing/FusekiEmbedded/test.txt             |    1 -
 jena-fuseki2/jena-fuseki-main/pom.xml           |  159 +
 .../apache/jena/fuseki/main/FusekiServer.java   |  597 ++
 .../apache/jena/fuseki/main/JettyServer.java    |  369 +
 .../jena/fuseki/main/cmds/FusekiMain.java       |  498 +
 .../jena/fuseki/main/cmds/FusekiMainCmd.java    |   46 +
 .../jena/fuseki/main/cmds/PlatformInfo.java     |  135 +
 .../jena/fuseki/main/cmds/ServerConfig.java     |   51 +
 .../apache/jena/fuseki/main/CustomService.java  |   81 +
 .../apache/jena/fuseki/main/FusekiTestAuth.java |  178 +
 .../jena/fuseki/main/FusekiTestServer.java      |  261 +
 .../jena/fuseki/main/TS_EmbeddedFuseki.java     |   51 +
 .../jena/fuseki/main/TestEmbeddedFuseki.java    |  321 +
 .../fuseki/main/TestFusekiCustomOperation.java  |  188 +
 .../jena/fuseki/main/TestFusekiTestAuth.java    |   98 +
 .../jena/fuseki/main/TestFusekiTestServer.java  |   60 +
 .../jena/fuseki/main/TestMultipleEmbedded.java  |  170 +
 .../examples/ExtendFuseki_AddService_1.java     |  158 +
 .../examples/ExtendFuseki_AddService_2.java     |  123 +
 .../examples/ExtendFuseki_AddService_3.java     |  107 +
 .../fuseki/main/examples/SpecialService.java    |   81 +
 .../src/test/resources/log4j.properties         |   40 +
 .../testing/FusekiEmbedded/config.ttl           |   18 +
 .../testing/FusekiEmbedded/test.txt             |    1 +
 jena-fuseki2/jena-fuseki-server/pom.xml         |  113 +
 jena-fuseki2/pom.xml                            |    5 +-
 jena-integration-tests/pom.xml                  |    2 +-
 .../TestRDFConnectionFusekiBinary.java          |    2 +-
 .../rdfconnection/TestRDFConnectionRemote.java  |    2 +-
 84 files changed, 3920 insertions(+), 14620 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/7e6d03af/jena-fuseki2/jena-fuseki-access/pom.xml
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-access/pom.xml b/jena-fuseki2/jena-fuseki-access/pom.xml
index 6bc5b94..3208085 100644
--- a/jena-fuseki2/jena-fuseki-access/pom.xml
+++ b/jena-fuseki2/jena-fuseki-access/pom.xml
@@ -37,7 +37,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.jena</groupId>
-      <artifactId>jena-fuseki-embedded</artifactId>
+      <artifactId>jena-fuseki-main</artifactId>
       <version>3.9.0-SNAPSHOT</version>
     </dependency>
 

http://git-wip-us.apache.org/repos/asf/jena/blob/7e6d03af/jena-fuseki2/jena-fuseki-access/src/main/java/org/apache/jena/fuseki/access/DataAccessCtl.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-access/src/main/java/org/apache/jena/fuseki/access/DataAccessCtl.java b/jena-fuseki2/jena-fuseki-access/src/main/java/org/apache/jena/fuseki/access/DataAccessCtl.java
index f1399f2..625f282 100644
--- a/jena-fuseki2/jena-fuseki-access/src/main/java/org/apache/jena/fuseki/access/DataAccessCtl.java
+++ b/jena-fuseki2/jena-fuseki-access/src/main/java/org/apache/jena/fuseki/access/DataAccessCtl.java
@@ -23,7 +23,7 @@ import java.util.function.Function;
 import javax.servlet.ServletContext;
 import javax.servlet.http.HttpServletRequest;
 
-import org.apache.jena.fuseki.embedded.FusekiServer;
+import org.apache.jena.fuseki.main.FusekiServer;
 import org.apache.jena.fuseki.server.Operation;
 import org.apache.jena.fuseki.servlets.ActionService;
 import org.apache.jena.fuseki.servlets.HttpAction;

http://git-wip-us.apache.org/repos/asf/jena/blob/7e6d03af/jena-fuseki2/jena-fuseki-access/src/test/java/org/apache/jena/fuseki/access/AbstractTestSecurityAssembler.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-access/src/test/java/org/apache/jena/fuseki/access/AbstractTestSecurityAssembler.java b/jena-fuseki2/jena-fuseki-access/src/test/java/org/apache/jena/fuseki/access/AbstractTestSecurityAssembler.java
index 9c62c28..562e3e8 100644
--- a/jena-fuseki2/jena-fuseki-access/src/test/java/org/apache/jena/fuseki/access/AbstractTestSecurityAssembler.java
+++ b/jena-fuseki2/jena-fuseki-access/src/test/java/org/apache/jena/fuseki/access/AbstractTestSecurityAssembler.java
@@ -18,9 +18,9 @@
 
 package org.apache.jena.fuseki.access;
 
+import static org.apache.jena.fuseki.access.AccessTestLib.assertSeen;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
-import static org.apache.jena.fuseki.access.AccessTestLib.assertSeen;
 
 import java.util.HashSet;
 import java.util.List;
@@ -33,7 +33,7 @@ import org.apache.jena.atlas.lib.SetUtils;
 import org.apache.jena.atlas.lib.StrUtils;
 import org.apache.jena.atlas.web.HttpException;
 import org.apache.jena.fuseki.FusekiLib;
-import org.apache.jena.fuseki.embedded.FusekiServer;
+import org.apache.jena.fuseki.main.FusekiServer;
 import org.apache.jena.graph.Node;
 import org.apache.jena.query.Dataset;
 import org.apache.jena.query.QuerySolution;

http://git-wip-us.apache.org/repos/asf/jena/blob/7e6d03af/jena-fuseki2/jena-fuseki-access/src/test/java/org/apache/jena/fuseki/access/TestSecurityFilterFuseki.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-access/src/test/java/org/apache/jena/fuseki/access/TestSecurityFilterFuseki.java b/jena-fuseki2/jena-fuseki-access/src/test/java/org/apache/jena/fuseki/access/TestSecurityFilterFuseki.java
index bbbd87c..844b67e 100644
--- a/jena-fuseki2/jena-fuseki-access/src/test/java/org/apache/jena/fuseki/access/TestSecurityFilterFuseki.java
+++ b/jena-fuseki2/jena-fuseki-access/src/test/java/org/apache/jena/fuseki/access/TestSecurityFilterFuseki.java
@@ -18,7 +18,10 @@
 
 package org.apache.jena.fuseki.access;
 
-import static org.apache.jena.fuseki.access.AccessTestLib.*;
+import static org.apache.jena.fuseki.access.AccessTestLib.addTestData;
+import static org.apache.jena.fuseki.access.AccessTestLib.assertSeen;
+import static org.apache.jena.fuseki.access.AccessTestLib.s0;
+import static org.apache.jena.fuseki.access.AccessTestLib.s1;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
 
@@ -32,8 +35,8 @@ import org.apache.jena.atlas.iterator.Iter;
 import org.apache.jena.atlas.lib.SetUtils;
 import org.apache.jena.atlas.web.HttpException;
 import org.apache.jena.fuseki.FusekiLib;
-import org.apache.jena.fuseki.embedded.FusekiServer;
 import org.apache.jena.fuseki.jetty.JettyLib;
+import org.apache.jena.fuseki.main.FusekiServer;
 import org.apache.jena.graph.Node;
 import org.apache.jena.query.QuerySolution;
 import org.apache.jena.rdf.model.Model;

http://git-wip-us.apache.org/repos/asf/jena/blob/7e6d03af/jena-fuseki2/jena-fuseki-basic/pom.xml
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-basic/pom.xml b/jena-fuseki2/jena-fuseki-basic/pom.xml
deleted file mode 100644
index 86b8302..0000000
--- a/jena-fuseki2/jena-fuseki-basic/pom.xml
+++ /dev/null
@@ -1,221 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-  <name>Apache Jena - Fuseki Basic Server</name>
-  <artifactId>jena-fuseki-basic</artifactId>
-
-  <parent>
-    <groupId>org.apache.jena</groupId>
-    <artifactId>jena-fuseki</artifactId>
-    <version>3.9.0-SNAPSHOT</version>
-  </parent> 
-
-  <packaging>jar</packaging>
-
-  <properties>
-    <automatic.module.name>org.apache.jena.jena-fuseki-basic</automatic.module.name>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.jena</groupId>
-      <artifactId>jena-cmds</artifactId>
-      <version>3.9.0-SNAPSHOT</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.jena</groupId>
-      <artifactId>jena-text</artifactId>
-      <version>3.9.0-SNAPSHOT</version>
-    </dependency>
-
-    <!-- Add logging -->
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
-      <optional>true</optional>
-    </dependency>
-
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <optional>true</optional>
-    </dependency>
-
-    <!-- This depends on jena-fuseki-core -->
-    <dependency>
-      <groupId>org.apache.jena</groupId>
-      <artifactId>jena-fuseki-embedded</artifactId>
-      <version>3.9.0-SNAPSHOT</version>
-
-      <!-- No specific logging - leave to the application -->
-      <exclusions>
-         <exclusion>
-           <groupId>org.apache.shiro</groupId>
-           <artifactId>shiro-core</artifactId>
-         </exclusion>
-         <exclusion>
-           <groupId>org.apache.shiro</groupId>
-           <artifactId>shiro-web</artifactId>
-         </exclusion>
-      </exclusions>
-    </dependency>
-
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-      </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <configuration>
-          <archive>
-            <manifestEntries>
-              <Automatic-Module-Name>${automatic.module.name}</Automatic-Module-Name>
-            </manifestEntries>
-          </archive>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-source-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>attach-sources</id>
-            <phase>package</phase>
-            <goals>
-              <goal>jar-no-fork</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <includes>
-            <include>**/TS_*.java</include>
-          </includes>
-        </configuration>
-      </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <configuration>
-          <overWriteReleases>false</overWriteReleases>
-          <overWriteIfNewer>true</overWriteIfNewer>
-        </configuration>
-      </plugin>
-
-      <!-- Use <build><finalName> for chnage of artifact produced. -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-shade-plugin</artifactId>
-        <configuration>
-          <!--
-          <finalName>fuseki-basic</finalName>
-          <shadedArtifactAttached>false</shadedArtifactAttached>
-          -->
-          
-          <shadedArtifactAttached>true</shadedArtifactAttached>
-          <!-- Does not deploy? - ->
-          <shadedArtifactId></shadedArtifactId>
-          -->
-          <shadedClassifierName>server</shadedClassifierName>
-
-
-          <transformers>
-            <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-              <mainClass>org.apache.jena.fuseki.cmds.FusekiBasicCmd</mainClass>
-            </transformer>
-            <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
-            <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer" />
-            <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer">
-              <addHeader>false</addHeader>
-            </transformer>
-          </transformers>
-          <filters>
-            <filter>
-              <artifact>*:*</artifact>
-              <excludes>
-                <!-- Some jars are signed but shading breaks that.
-                     Don't include signing files.
-                -->
-                <exclude>META-INF/*.SF</exclude>
-                <exclude>META-INF/*.DSA</exclude>
-                <exclude>META-INF/*.RSA</exclude>
-              </excludes>
-            </filter>
-          </filters>
-        </configuration>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <!--<phase /><!- - Switch off -->
-            <goals>
-              <goal>shade</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      
-      <plugin>
-       <groupId>org.apache.rat</groupId>
-       <artifactId>apache-rat-plugin</artifactId>
-       <executions>
-         <execution>
-           <id>rat-checks</id>
-           <phase>validate</phase>
-           <goals>
-             <goal>check</goal>
-           </goals>
-         </execution>
-       </executions>
-       <configuration>
-         <excludeSubProjects>true</excludeSubProjects>
-         <excludes>
-           <exclude>**/fuseki.classpath</exclude>
-           <exclude>**/sparqler/**</exclude>
-           <exclude>**/dependency-reduced-pom.xml</exclude>
-         </excludes>
-       </configuration>
-     </plugin>
-
-   </plugins>
-
-  </build>
-
-</project>

http://git-wip-us.apache.org/repos/asf/jena/blob/7e6d03af/jena-fuseki2/jena-fuseki-basic/run-sparqler
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-basic/run-sparqler b/jena-fuseki2/jena-fuseki-basic/run-sparqler
deleted file mode 100755
index 89c38bd..0000000
--- a/jena-fuseki2/jena-fuseki-basic/run-sparqler
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-## Licensed under the terms of http://www.apache.org/licenses/LICENSE-2.0
-
-(
-    #echo "cd sparqler"
-    cd sparqler
-    env BACKGROUND=0 ./run-sparqler "$@"
-)

http://git-wip-us.apache.org/repos/asf/jena/blob/7e6d03af/jena-fuseki2/jena-fuseki-basic/sparqler/data/books.ttl
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-basic/sparqler/data/books.ttl b/jena-fuseki2/jena-fuseki-basic/sparqler/data/books.ttl
deleted file mode 100644
index ed8882b..0000000
--- a/jena-fuseki2/jena-fuseki-basic/sparqler/data/books.ttl
+++ /dev/null
@@ -1,48 +0,0 @@
-## Licensed under the terms of http://www.apache.org/licenses/LICENSE-2.0
-
-@prefix dc:        <http://purl.org/dc/elements/1.1/> .
-@prefix vcard:     <http://www.w3.org/2001/vcard-rdf/3.0#> .
-@prefix ns:        <http://example.org/ns#> .
-
-@prefix :          <http://example.org/book/> .
-
-# A small dataset for usage examples of Joseki
-# This data is intentionaly irregular (e.g. different ways to
-# record the book creator) as if the information is either an
-# aggregation or was created at different times.
-
-:book1
-    dc:title    "Harry Potter and the Philosopher's Stone" ;
-    dc:creator  "J.K. Rowling" ;
-    .
-    
-:book2
-    dc:title    "Harry Potter and the Chamber of Secrets" ;
-    dc:creator  _:a .
-    
-:book3
-    dc:title    "Harry Potter and the Prisoner Of Azkaban" ;
-    dc:creator  _:a .
-    
-:book4
-    dc:title    "Harry Potter and the Goblet of Fire" .
-    
-:book5
-    dc:title    "Harry Potter and the Order of the Phoenix";
-    dc:creator  "J.K. Rowling" ;
-    .
-
-:book6
-    dc:title    "Harry Potter and the Half-Blood Prince";
-    dc:creator  "J.K. Rowling" .
-
-:book7
-    dc:title    "Harry Potter and the Deathly Hallows" ;
-    dc:creator  "J.K. Rowling" .
-_:a
-    vcard:FN "J.K. Rowling" ;
-    vcard:N
-        [ vcard:Family "Rowling" ;
-          vcard:Given "Joanna" 
-        ]
-    .

http://git-wip-us.apache.org/repos/asf/jena/blob/7e6d03af/jena-fuseki2/jena-fuseki-basic/sparqler/data/empty.nt
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-basic/sparqler/data/empty.nt b/jena-fuseki2/jena-fuseki-basic/sparqler/data/empty.nt
deleted file mode 100644
index f07e71e..0000000
--- a/jena-fuseki2/jena-fuseki-basic/sparqler/data/empty.nt
+++ /dev/null
@@ -1,2 +0,0 @@
-## Licensed under the terms of http://www.apache.org/licenses/LICENSE-2.0
-# This is empty

http://git-wip-us.apache.org/repos/asf/jena/blob/7e6d03af/jena-fuseki2/jena-fuseki-basic/sparqler/data/sparql-data.ttl
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-basic/sparqler/data/sparql-data.ttl b/jena-fuseki2/jena-fuseki-basic/sparqler/data/sparql-data.ttl
deleted file mode 100755
index a3631d0..0000000
--- a/jena-fuseki2/jena-fuseki-basic/sparqler/data/sparql-data.ttl
+++ /dev/null
@@ -1,102 +0,0 @@
-## Licensed under the terms of http://www.apache.org/licenses/LICENSE-2.0
-## People
-## Books + Prices
-## Reviews
-
-@prefix xsd:     <http://www.w3.org/2001/XMLSchema#> .
-@prefix rdf:     <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix rdfs:    <http://www.w3.org/2000/01/rdf-schema#> .
-@prefix fn:      <http://www.w3.org/2005/xpath-functions#> .
-@prefix foaf: 	 <http://xmlns.com/foaf/0.1/> .
-@prefix skos:    <http://www.w3.org/2008/05/skos#> .
-@prefix dc10:    <http://purl.org/dc/elements/1.0/> .
-@prefix dc11:    <http://purl.org/dc/elements/1.1/> .
-@prefix dc:      <http://purl.org/dc/elements/1.1/> .
-@prefix :        <http://example/> .
-
-:A  a           foaf:Person ;
-    foaf:mbox <ma...@example.net> ;
-    foaf:name   "Alice" ;
-    foaf:birthday "20-05" ;
-    foaf:knows  :B ;
-    foaf:knows  :C .
-
-:B  a          foaf:Person ;
-    foaf:name   "Bob" ;
-    foaf:birthday "13-06" ;
-    foaf:knows  :A ;
-    foaf:knows  :C .
-
-
-:C  a           foaf:Person ;
-    foaf:name   "Charlie"  ;
-    foaf:knows  :A ;
-    foaf:knows  :B .
-
-
-:D  a           foaf:Person ;
-    foaf:name   "Dave" ;
-    foaf:knows  :B .
-
-:E  a           foaf:Person ;
-    foaf:name   "EveBot" .
-
-
-@prefix stock: <http://example.org/stock#> .
-@prefix inv: <http://example.org/inventory#> .
-
-stock:book1 dc:title "SPARQL Query Language Tutorial" ;
-            inv:price 10 ;
-            inv:quantity 3 .
-
-stock:book2 dc:title "SPARQL Query Language (2nd ed)" ;
-            inv:price 20 ;
-            inv:quantity 5 .
-
-stock:book3 dc:title "Moving from SQL to SPARQL" ;
-            inv:price 5 ;
-            inv:quantity 0 .
-
-stock:book4 dc:title "Applying XQuery" ;
-            inv:price 20 ;
-            inv:quantity 8 .
-
-## Reviews
-## Record some rating as 1 (low) to 5 (high)
-
-:review1
-    dc:creator  :A ;
-    :about      stock:book1 ;
-    :rating     4 .
-
-:review2
-    dc:creator  :B ;
-    :about      stock:book1 ;
-    :rating     5 .
-
-:review3
-    dc:creator  :B ;
-    :about      stock:book2 ;
-    :rating     4 .
-
-:review4
-    dc:creator  :B ;
-    :about      stock:book3 ;
-    :rating     3 .
-
-:review5
-    dc:creator  :B ;
-    :about      stock:book3 ;
-    :rating     1 .
-
-:review5
-    dc:creator  :B ;
-    :about      stock:book3 ;
-    :rating     1 .
-
-:review6
-    dc:creator  :E ;
-    :about      stock:book3 ;
-    :rating     4 .
-
-