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 2016/10/23 17:16:16 UTC

[1/4] jena git commit: JENA-1243: Clean up POMs for jena-jdbc

Repository: jena
Updated Branches:
  refs/heads/master 52fa6e920 -> bcd80b118


JENA-1243: Clean up POMs for jena-jdbc


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

Branch: refs/heads/master
Commit: d6879fc0943a247a8d58976aee89776406110020
Parents: 52fa6e9
Author: Andy Seaborne <an...@apache.org>
Authored: Fri Oct 21 19:08:33 2016 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Fri Oct 21 19:08:33 2016 +0100

----------------------------------------------------------------------
 jena-jdbc/jena-jdbc-driver-bundle/pom.xml |  2 -
 jena-jdbc/jena-jdbc-driver-mem/pom.xml    |  3 --
 jena-jdbc/jena-jdbc-driver-tdb/pom.xml    |  4 --
 jena-jdbc/license-header.txt              | 15 ------
 jena-jdbc/pom.xml                         | 70 --------------------------
 5 files changed, 94 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/d6879fc0/jena-jdbc/jena-jdbc-driver-bundle/pom.xml
----------------------------------------------------------------------
diff --git a/jena-jdbc/jena-jdbc-driver-bundle/pom.xml b/jena-jdbc/jena-jdbc-driver-bundle/pom.xml
index e34763f..4612aa2 100644
--- a/jena-jdbc/jena-jdbc-driver-bundle/pom.xml
+++ b/jena-jdbc/jena-jdbc-driver-bundle/pom.xml
@@ -56,7 +56,6 @@
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
-			<version>4.11</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -132,7 +131,6 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>2.9</version>
 				<configuration>
 					<quiet>true</quiet>
 					<encoding>UTF-8</encoding>

http://git-wip-us.apache.org/repos/asf/jena/blob/d6879fc0/jena-jdbc/jena-jdbc-driver-mem/pom.xml
----------------------------------------------------------------------
diff --git a/jena-jdbc/jena-jdbc-driver-mem/pom.xml b/jena-jdbc/jena-jdbc-driver-mem/pom.xml
index 313f560..b791b1a 100644
--- a/jena-jdbc/jena-jdbc-driver-mem/pom.xml
+++ b/jena-jdbc/jena-jdbc-driver-mem/pom.xml
@@ -50,7 +50,6 @@
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
-			<version>4.11</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
@@ -60,7 +59,6 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jar-plugin</artifactId>
-				<version>2.4</version>
 				<executions>
 					<execution>
 						<goals>
@@ -74,7 +72,6 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>2.9</version>
 				<configuration>
 					<quiet>true</quiet>
 					<encoding>UTF-8</encoding>

http://git-wip-us.apache.org/repos/asf/jena/blob/d6879fc0/jena-jdbc/jena-jdbc-driver-tdb/pom.xml
----------------------------------------------------------------------
diff --git a/jena-jdbc/jena-jdbc-driver-tdb/pom.xml b/jena-jdbc/jena-jdbc-driver-tdb/pom.xml
index 5927123..8289d97 100644
--- a/jena-jdbc/jena-jdbc-driver-tdb/pom.xml
+++ b/jena-jdbc/jena-jdbc-driver-tdb/pom.xml
@@ -48,7 +48,6 @@
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
-			<version>4.11</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -74,7 +73,6 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
-				<version>2.14</version>
 				<configuration>
 					<argLine>-Xmx2G</argLine>
 					<systemProperties>
@@ -86,7 +84,6 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jar-plugin</artifactId>
-				<version>2.4</version>
 				<executions>
 					<execution>
 						<goals>
@@ -100,7 +97,6 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>2.9</version>
 				<configuration>
 					<quiet>true</quiet>
 					<encoding>UTF-8</encoding>

http://git-wip-us.apache.org/repos/asf/jena/blob/d6879fc0/jena-jdbc/license-header.txt
----------------------------------------------------------------------
diff --git a/jena-jdbc/license-header.txt b/jena-jdbc/license-header.txt
deleted file mode 100644
index 2114391..0000000
--- a/jena-jdbc/license-header.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-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.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jena/blob/d6879fc0/jena-jdbc/pom.xml
----------------------------------------------------------------------
diff --git a/jena-jdbc/pom.xml b/jena-jdbc/pom.xml
index 738d3ce..3001bb0 100644
--- a/jena-jdbc/pom.xml
+++ b/jena-jdbc/pom.xml
@@ -53,19 +53,6 @@
 		<module>jena-jdbc-driver-bundle</module>
 	</modules>
 
-	<properties>
-		<plugin.license.version>1.9.0</plugin.license.version>
-		<plugin.license.headerPath>${project.basedir}</plugin.license.headerPath>
-	</properties>
-
-	<dependencies>
-		<dependency>
-			<groupId>org.aspectj</groupId>
-			<artifactId>aspectjrt</artifactId>
-			<version>1.6.12</version>
-		</dependency>
-	</dependencies>
-
 	<build>
 		<plugins>
 			<!-- Compiler Plugin -->
@@ -73,34 +60,6 @@
 			  <groupId>org.apache.maven.plugins</groupId>
 			  <artifactId>maven-compiler-plugin</artifactId>
 			</plugin>
-			<!-- License Plugin -->
-			<plugin>
-				<groupId>com.mycila.maven-license-plugin</groupId>
-				<artifactId>maven-license-plugin</artifactId>
-				<version>${plugin.license.version}</version>
-				<executions>
-					<execution>
-						<phase>package</phase>
-						<goals>
-							<goal>check</goal>
-						</goals>
-					</execution>
-				</executions>
-				<configuration>
-					<header>${plugin.license.headerPath}/license-header.txt</header>
-					<failIfMissing>true</failIfMissing>
-					<aggregate>true</aggregate>
-					<excludes>
-						<exclude>**/*.xml</exclude>
-						<exclude>**/*.properties</exclude>
-						<exclude>**/LICENSE</exclude>
-						<exclude>**/NOTICE</exclude>
-					</excludes>
-					<useDefaultMapping>true</useDefaultMapping>
-					<strictCheck>true</strictCheck>
-				</configuration>
-			</plugin>
-
 			<!-- Sources Plugin -->
 			<plugin>
 				<artifactId>maven-source-plugin</artifactId>
@@ -116,35 +75,6 @@
 					</execution>
 				</executions>
 			</plugin>
-
-			<!-- AspectJ Plugin - Used to support method entry and exit trace logging 
-				for debugging purposes - ->
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>aspectj-maven-plugin</artifactId>
-				<version>1.4</version>
-				<configuration>
-					<source>1.7</source>
-				</configuration>
-				<executions>
-					<execution>
-						<goals>
-							<goal>compile</goal> <!- - use this goal to weave all your main classes - ->
-							<goal>test-compile</goal> <!- - use this goal to weave all your test classes - ->
-						</goals>
-					</execution>
-				</executions>
-				<dependencies>
-					<!- - Ensure aspectj tools version used by compiler is the same version 
-						used as dependency. Avoids warning. https://bugs.eclipse.org/bugs/show_bug.cgi?id=368190 - ->
-					<dependency>
-						<groupId>org.aspectj</groupId>
-						<artifactId>aspectjtools</artifactId>
-						<version>1.6.12</version>
-					</dependency>
-				</dependencies>
-			</plugin>
-        --> 
 		</plugins>
 	</build>
 </project>
\ No newline at end of file


[2/4] jena git commit: Code, not active, to write "[ :p obj ] ." as [] :p obj .

Posted by an...@apache.org.
Code, not active, to write "[ :p obj ] ." as [] :p obj .

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

Branch: refs/heads/master
Commit: 26fcbc51417db49a7c2c08fe007b6635b1f373fb
Parents: 52fa6e9
Author: Andy Seaborne <an...@apache.org>
Authored: Sun Oct 23 15:47:50 2016 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Sun Oct 23 15:47:50 2016 +0100

----------------------------------------------------------------------
 .../apache/jena/riot/writer/TurtleShell.java    | 32 +++++++++++++++-----
 1 file changed, 24 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/26fcbc51/jena-arq/src/main/java/org/apache/jena/riot/writer/TurtleShell.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/writer/TurtleShell.java b/jena-arq/src/main/java/org/apache/jena/riot/writer/TurtleShell.java
index 041386f..a40cf6d 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/writer/TurtleShell.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/writer/TurtleShell.java
@@ -586,9 +586,8 @@ public abstract class TurtleShell {
                     out.println() ;
                 first = false ;
                 if ( freeBnodes.contains(subj) ) {
-                    // Write in "[....]" form.
-                    writeNestedObject(subj) ;
-                    out.println(" .") ;
+                    // Top level: write in "[....]" on "[] :p" form.
+                    writeNestedObjectTopLevel(subj) ;
                     continue ;
                 }
 
@@ -598,18 +597,22 @@ public abstract class TurtleShell {
             return !first ;
         }
 
-        // Common subject
-        // Used by the blocks writer as well.
+        // A Cluster is a collection of triples with the same subject.
         private void writeCluster(Node subject, Collection<Triple> cluster) {
             if ( cluster.isEmpty() )
                 return ;
             writeNode(subject) ;
+            writeClusterPredicateObjectList(INDENT_PREDICATE, cluster) ;
+        }
+
+        // Write the PredicateObjectList fora subject already output.
+        // The subject may have been a "[]" or a URI - the indentation is passed in.
+        private void writeClusterPredicateObjectList(int indent, Collection<Triple> cluster) {
             write_S_P_Gap() ;
-            out.incIndent(INDENT_PREDICATE) ;
+            out.incIndent(indent) ;
             out.pad() ;
             writePredicateObjectList(cluster) ;
-            out.decIndent(INDENT_PREDICATE) ;
-            // End of cluster.
+            out.decIndent(indent) ;
             print(" .") ;
             println() ;
         }
@@ -753,6 +756,19 @@ public abstract class TurtleShell {
             return x.size() ;
         }
 
+        // [ :p "abc" ] .  or    [] : "abc" .
+        private void writeNestedObjectTopLevel(Node subject) {
+            if ( true ) {
+                writeNestedObject(subject) ;
+                out.println(" .") ;
+            } else {
+                // Alternative.
+                Collection<Triple> cluster = triplesOfSubject(subject) ;
+                print("[]") ;
+                writeClusterPredicateObjectList(0, cluster) ;
+            }
+        }
+        
         private void writeNestedObject(Node node) {
             Collection<Triple> x = triplesOfSubject(node) ;
 


[3/4] jena git commit: Record needed code to enable more general symbolic link handling.

Posted by an...@apache.org.
Record needed code to enable more general symbolic link handling.

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

Branch: refs/heads/master
Commit: ffdb8d36a820d9172d2d18e47106d4f8e64e357d
Parents: 26fcbc5
Author: Andy Seaborne <an...@apache.org>
Authored: Sun Oct 23 15:52:46 2016 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Sun Oct 23 15:52:46 2016 +0100

----------------------------------------------------------------------
 .../java/org/apache/jena/fuseki/jetty/JettyFuseki.java    | 10 ++++++++++
 1 file changed, 10 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/ffdb8d36/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/jetty/JettyFuseki.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/jetty/JettyFuseki.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/jetty/JettyFuseki.java
index 7e8f405..00b6658 100644
--- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/jetty/JettyFuseki.java
+++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/jetty/JettyFuseki.java
@@ -37,6 +37,8 @@ import org.eclipse.jetty.security.authentication.BasicAuthenticator ;
 import org.eclipse.jetty.server.HttpConnectionFactory ;
 import org.eclipse.jetty.server.Server ;
 import org.eclipse.jetty.server.ServerConnector ;
+import org.eclipse.jetty.server.handler.AllowSymLinkAliasChecker ;
+import org.eclipse.jetty.server.handler.ContextHandler ;
 import org.eclipse.jetty.server.handler.gzip.GzipHandler ;
 import org.eclipse.jetty.servlet.ServletContextHandler ;
 import org.eclipse.jetty.util.security.Constraint ;
@@ -245,6 +247,14 @@ public class JettyFuseki {
             defaultServerConfig(serverConfig.port, serverConfig.loopback) ;
 
         WebAppContext webapp = createWebApp(contextPath) ;
+        if ( false /*enable symbolic links */ ) {
+            // See http://www.eclipse.org/jetty/documentation/current/serving-aliased-files.html
+            // Record what would be needed:
+            // 1 - Allow all symbolic links without checking
+            webapp.addAliasCheck(new ContextHandler.ApproveAliases());
+            // 2 - Check links are to valid resources. But default for Unix?
+            webapp.addAliasCheck(new AllowSymLinkAliasChecker()) ;
+        }
         servletContext = webapp.getServletContext() ;
         server.setHandler(webapp) ;
         // Replaced by Shiro.


[4/4] jena git commit: JENA-1243: Merge commit 'refs/pull/182/head' of github.com:apache/jena

Posted by an...@apache.org.
JENA-1243: Merge commit 'refs/pull/182/head' of github.com:apache/jena

This closes #182.


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

Branch: refs/heads/master
Commit: bcd80b1189f6658a4f85a61b8d07fdab12ed5a25
Parents: ffdb8d3 d6879fc
Author: Andy Seaborne <an...@apache.org>
Authored: Sun Oct 23 17:20:49 2016 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Sun Oct 23 17:20:49 2016 +0100

----------------------------------------------------------------------
 jena-jdbc/jena-jdbc-driver-bundle/pom.xml |  2 -
 jena-jdbc/jena-jdbc-driver-mem/pom.xml    |  3 --
 jena-jdbc/jena-jdbc-driver-tdb/pom.xml    |  4 --
 jena-jdbc/license-header.txt              | 15 ------
 jena-jdbc/pom.xml                         | 70 --------------------------
 5 files changed, 94 deletions(-)
----------------------------------------------------------------------