Build failed in Jenkins: Jena_Development_Test_Windows #452
See https://builds.apache.org/job/Jena_Development_Test_Windows/452/changes
Changes:
[andy] Scale then convert to int.
[andy] jena-parent snapshot version
--
Started by an SCM change
Building remotely on windows1 (Windows) in workspace
https://builds.apache.org/job/Jena_Development_Test_Windows/ws/
git rev-parse --is-inside-work-tree
Fetching changes from the remote Git repository
git config remote.origin.url git://git.apache.org/jena.git
Fetching upstream changes from git://git.apache.org/jena.git
git --version
git fetch --tags --progress git://git.apache.org/jena.git
+refs/heads/*:refs/remotes/origin/*
git rev-parse origin/master^{commit}
Checking out Revision ec0d19cc7f9345d8acbef59110083c54d9055a8b (origin/master)
git config core.sparsecheckout
git checkout -f ec0d19cc7f9345d8acbef59110083c54d9055a8b
git rev-list c737fc2cad897cfce931d2e51863a585083f25fc
Parsing POMs
Failed to transfer Could not find metadata
org.apache.jena:jena-parent:11-SNAPSHOT/maven-metadata.xml in Nexus
(http://repository.apache.org/snapshots)
Failed to transfer Could not find artifact
org.apache.jena:jena-parent:pom:11-SNAPSHOT in Nexus
(http://repository.apache.org/snapshots)
ERROR: Failed to parse POMs
java.io.IOException: remote file operation failed:
https://builds.apache.org/job/Jena_Development_Test_Windows/ws/ at
hudson.remoting.Channel@6f62bea8:windows1
at hudson.FilePath.act(FilePath.java:910)
at hudson.FilePath.act(FilePath.java:887)
at
hudson.maven.MavenModuleSetBuild$MavenModuleSetBuildExecution.parsePoms(MavenModuleSetBuild.java:953)
at
hudson.maven.MavenModuleSetBuild$MavenModuleSetBuildExecution.doRun(MavenModuleSetBuild.java:681)
at
hudson.model.AbstractBuild$AbstractBuildExecution.run(AbstractBuild.java:585)
at hudson.model.Run.execute(Run.java:1676)
at hudson.maven.MavenModuleSetBuild.run(MavenModuleSetBuild.java:529)
at hudson.model.ResourceController.execute(ResourceController.java:88)
at hudson.model.Executor.run(Executor.java:231)
Caused by: hudson.remoting.ProxyException:
hudson.maven.MavenModuleSetBuild$MavenExecutionException:
org.apache.maven.project.ProjectBuildingException: Some problems were
encountered while processing the POMs:
[FATAL] Non-resolvable parent POM: Could not find artifact
org.apache.jena:jena-parent:pom:11-SNAPSHOT in Nexus
(http://repository.apache.org/snapshots) and 'parent.relativePath' points at no
local POM @ line 26, column 11
at
hudson.maven.MavenModuleSetBuild$PomParser.invoke(MavenModuleSetBuild.java:1357)
at
hudson.maven.MavenModuleSetBuild$PomParser.invoke(MavenModuleSetBuild.java:1091)
at hudson.FilePath$FileCallableWrapper.call(FilePath.java:2462)
at hudson.remoting.UserRequest.perform(UserRequest.java:118)
at hudson.remoting.UserRequest.perform(UserRequest.java:48)
at hudson.remoting.Request$2.run(Request.java:328)
at
hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:72)
at java.util.concurrent.FutureTask$Sync.innerRun(Unknown Source)
at java.util.concurrent.FutureTask.run(Unknown Source)
at java.util.concurrent.ThreadPoolExecutor.runWorker(Unknown Source)
at java.util.concurrent.ThreadPoolExecutor$Worker.run(Unknown Source)
at hudson.remoting.Engine$1$1.run(Engine.java:63)
at java.lang.Thread.run(Unknown Source)
Caused by: hudson.remoting.ProxyException:
org.apache.maven.project.ProjectBuildingException: Some problems were
encountered while processing the POMs:
[FATAL] Non-resolvable parent POM: Could not find artifact
org.apache.jena:jena-parent:pom:11-SNAPSHOT in Nexus
(http://repository.apache.org/snapshots) and 'parent.relativePath' points at no
local POM @ line 26, column 11
at
org.apache.maven.project.DefaultProjectBuilder.build(DefaultProjectBuilder.java:364)
at hudson.maven.MavenEmbedder.buildProjects(MavenEmbedder.java:361)
at hudson.maven.MavenEmbedder.readProjects(MavenEmbedder.java:331)
at
hudson.maven.MavenModuleSetBuild$PomParser.invoke(MavenModuleSetBuild.java:1294)
... 12 more
[3/4] Get remaining modules to pass RAT checks
http://git-wip-us.apache.org/repos/asf/jena/blob/cb46780b/jena-fuseki/dist/NOTICE -- diff --git a/jena-fuseki/dist/NOTICE b/jena-fuseki/dist/NOTICE new file mode 100644 index 000..be02354 --- /dev/null +++ b/jena-fuseki/dist/NOTICE @@ -0,0 +1,216 @@ +Apache Jena - module Fuseki +Copyright 2011, 2012, 2013, 2014 The Apache Software Foundation + +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). + +Portions of this software were originally based on the following: + - Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Hewlett-Packard Development Company, LP + - Copyright 2010, 2011 Epimorphics Ltd. + - Copyright 2010, 2011 Talis Systems Ltd. +These have been licensed to the Apache Software Foundation under a software grant. + +- - - - - - - - - - - - - - - - - - - - - - - + +slf4j: + Copyright (c) 2004-2011 QOS.ch + All rights reserved. + +- - - - - - - - - - - - - - - - - - - - - - - + +(c) Copyright 2003, Plugged In Software +This product includes software developed by +PluggedIn Software under a BSD license. + +- - - - - - - - - - - - - - - - - - - - - - - + + Jetty Web Container + Copyright 1995-2012 Mort Bay Consulting Pty Ltd. + +under the Apache 2.0 License. + +The Jetty Web Container includes: + +UnixCrypt.java +Copyright 1996 Aki Yoshida, +modified April 2001 by Iris Van den Broeke, Daniel Deville. + +- - - - - - - - - - - - - - - - - - - - - - - + +From Apache HttpComponents Client: + +This project contains annotations derived from JCIP-ANNOTATIONS +Copyright (c) 2005 Brian Goetz and Tim Peierls. See http://www.jcip.net + +- - - - - - - - - - - - - - - - - - - - - - - + + Apache Xerces Java + Copyright 1999-2013 The Apache Software Foundation + + This product includes software developed at + The Apache Software Foundation (http://www.apache.org/). + + Portions of this software were originally based on the following: + - software copyright (c) 1999, IBM Corporation., http://www.ibm.com. + - software copyright (c) 1999, Sun Microsystems., http://www.sun.com. + - voluntary contributions made by Paul Eng on behalf of the + Apache Software Foundation that were originally developed at iClick, Inc., + software copyright (c) 1999. + +- - - - - - - - - - - - - - - - - - - - - - - + +From Apache Lucene: + +ICU4J, (under analysis/icu) is licensed under an MIT styles license +and Copyright (c) 1995-2008 International Business Machines Corporation and others + +Some data files (under analysis/icu/src/data) are derived from Unicode data such +as the Unicode Character Database. See http://unicode.org/copyright.html for more +details. + +Brics Automaton (under core/src/java/org/apache/lucene/util/automaton) is +BSD-licensed, created by Anders Møller. See http://www.brics.dk/automaton/ + +The levenshtein automata tables (under core/src/java/org/apache/lucene/util/automaton) were +automatically generated with the moman/finenight FSA library, created by +Jean-Philippe Barrette-LaPierre. This library is available under an MIT license, +see http://sites.google.com/site/rrettesite/moman and +http://bitbucket.org/jpbarrette/moman/overview/ + +This product includes code (JaspellTernarySearchTrie) from Java Spelling +Checking Package (jaspell): http://jaspell.sourceforge.net/ +License: The BSD License (http://www.opensource.org/licenses/bsd-license.php) + +The snowball stemmers in + analysis/common/src/java/net/sf/snowball +were developed by Martin Porter and Richard Boulton. +The snowball stopword lists in + analysis/common/src/resources/org/apache/lucene/analysis/snowball +were developed by Martin Porter and Richard Boulton. +The full snowball package is available from + http://snowball.tartarus.org/ + +The KStem stemmer in + analysis/common/src/org/apache/lucene/analysis/en +was developed by Bob Krovetz and Sergio Guzman-Lara (CIIR-UMass Amherst) +under the BSD-license. + +The Arabic,Persian,Romanian,Bulgarian, and Hindi analyzers (common) come with a default +stopword list that is BSD-licensed created by Jacques Savoy. +See http://members.unine.ch/jacques.savoy/clef/index.html. + +The German,Spanish,Finnish,French,Hungarian,Italian,Portuguese,Russian and Swedish light stemmers +(common) are based on BSD-licensed reference implementations created by Jacques Savoy and +Ljiljana Dolamic. + +The Stempel analyzer (stempel) includes BSD-licensed software developed +by the Egothor project http://egothor.sf.net/, created by Leo Galambos, Martin Kvapil, +and Edmond Nolan. + +The Polish analyzer (stempel) comes with a default +stopword list that is BSD-licensed created by the Carrot2 project. The file resides +in stempel/src/resources/org/apache/lucene/analysis/pl/stopwords.txt. +See http://project.carrot2.org/license.html. + +The SmartChineseAnalyzer source code (smartcn) was +provided by Xiaoping Gao and copyright 2009 by
[1/4] git commit: RAT checks passing for Jena Core
Repository: jena Updated Branches: refs/heads/rat-checks 43d133d34 - cb46780bd RAT checks passing for Jena Core Adds appropriate excludes and missing license headers Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/79e5fd2a Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/79e5fd2a Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/79e5fd2a Branch: refs/heads/rat-checks Commit: 79e5fd2ae3b48d2cfd9afdea1b0d6759dd3f2bcd Parents: 43d133d Author: Rob Vesse rve...@apache.org Authored: Tue Oct 21 12:47:37 2014 +0100 Committer: Rob Vesse rve...@apache.org Committed: Tue Oct 21 12:47:37 2014 +0100 -- jena-core/src/main/java/link2readme.html | 16 jena-parent/pom.xml | 10 -- 2 files changed, 24 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/jena/blob/79e5fd2a/jena-core/src/main/java/link2readme.html -- diff --git a/jena-core/src/main/java/link2readme.html b/jena-core/src/main/java/link2readme.html index 0025c9d..d8eefef 100644 --- a/jena-core/src/main/java/link2readme.html +++ b/jena-core/src/main/java/link2readme.html @@ -1,6 +1,22 @@ ?xml version=1.0 encoding=iso-8859-1? !DOCTYPE html PUBLIC -//W3C//DTD XHTML 1.0 Transitional//EN http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd; +!-- + 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. +-- html xmlns=http://www.w3.org/1999/xhtml; head titleJena README/title http://git-wip-us.apache.org/repos/asf/jena/blob/79e5fd2a/jena-parent/pom.xml -- diff --git a/jena-parent/pom.xml b/jena-parent/pom.xml index 1ff14ca..15e8c43 100644 --- a/jena-parent/pom.xml +++ b/jena-parent/pom.xml @@ -330,8 +330,14 @@ exclude**/DEPENDENCIES/exclude exclude**/*.txt/exclude - !-- These might be too extreme an excludes -- - !-- + !-- + jena-core exclusions + -- + exclude**/src-examples/data/*/exclude + exclude**/vocabularies/*/exclude + exclude**/Grammar/turtle/exclude + + !-- Unfortunately Jena historically has large numbers of small test files with no license headers. Since Jena was donated to the ASF under a Software Grant it is assumed that all rights for the
[2/4] Get remaining modules to pass RAT checks
http://git-wip-us.apache.org/repos/asf/jena/blob/cb46780b/jena-sdb/src-dev/resources/etc/owl-fb-old.rules -- diff --git a/jena-sdb/src-dev/resources/etc/owl-fb-old.rules b/jena-sdb/src-dev/resources/etc/owl-fb-old.rules index c04bfd6..c87316b 100644 --- a/jena-sdb/src-dev/resources/etc/owl-fb-old.rules +++ b/jena-sdb/src-dev/resources/etc/owl-fb-old.rules @@ -1,3 +1,19 @@ +# 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. + #-- # OWL rule set v0.2 # This rule set is designed to implement owl(f)lite using the hybrid http://git-wip-us.apache.org/repos/asf/jena/blob/cb46780b/jena-sdb/src-dev/resources/etc/owl-fb.rules -- diff --git a/jena-sdb/src-dev/resources/etc/owl-fb.rules b/jena-sdb/src-dev/resources/etc/owl-fb.rules index dd756a6..deb6297 100644 --- a/jena-sdb/src-dev/resources/etc/owl-fb.rules +++ b/jena-sdb/src-dev/resources/etc/owl-fb.rules @@ -1,3 +1,19 @@ +# 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. + #-- # OWL rule set v0.3 # This rule set is designed to implement owl(f)lite using the hybrid http://git-wip-us.apache.org/repos/asf/jena/blob/cb46780b/jena-sdb/src-dev/resources/etc/owl.rules -- diff --git a/jena-sdb/src-dev/resources/etc/owl.rules b/jena-sdb/src-dev/resources/etc/owl.rules index 31897c2..2eb3282 100644 --- a/jena-sdb/src-dev/resources/etc/owl.rules +++ b/jena-sdb/src-dev/resources/etc/owl.rules @@ -1,3 +1,19 @@ +# 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. + #-- # OWL rule set v0.1 # This rule set is design to implement owl(f)lite using pure http://git-wip-us.apache.org/repos/asf/jena/blob/cb46780b/jena-sdb/src-dev/resources/etc/rdfs-b-tuned.rules -- diff --git a/jena-sdb/src-dev/resources/etc/rdfs-b-tuned.rules b/jena-sdb/src-dev/resources/etc/rdfs-b-tuned.rules index 9d55177..1dbc4a9 100644 --- a/jena-sdb/src-dev/resources/etc/rdfs-b-tuned.rules +++ b/jena-sdb/src-dev/resources/etc/rdfs-b-tuned.rules @@ -1,3 +1,19 @@ +# 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
[2/5] git commit: Add license headers
Add license headers Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/2d8b550a Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/2d8b550a Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/2d8b550a Branch: refs/heads/rat-checks Commit: 2d8b550a71fdfd91ee495d7377dd9ea4f34b6e33 Parents: 06339ad Author: Andy Seaborne a...@apache.org Authored: Tue Oct 21 16:41:29 2014 +0100 Committer: Andy Seaborne a...@apache.org Committed: Tue Oct 21 16:41:29 2014 +0100 -- jena-arq/Grammar/BinaryRDF.thrift | 18 +++ jena-arq/Grammar/Final/jj2html_11 | 16 +++ jena-arq/Grammar/JSON/json| 16 +++ jena-arq/Grammar/Notes| 2 + jena-arq/Grammar/XMLchars.txt | 56 -- jena-arq/Grammar/gen-thrift | 1 + jena-arq/Grammar/grammarExtracts | 16 +++ jena-arq/Grammar/jj2html | 16 +++ jena-arq/Grammar/jj2tokens| 2 + jena-arq/Grammar/sparql2html | 1 + jena-arq/Grammar/tokens2bnf | 88 +- 11 files changed, 133 insertions(+), 99 deletions(-) -- http://git-wip-us.apache.org/repos/asf/jena/blob/2d8b550a/jena-arq/Grammar/BinaryRDF.thrift -- diff --git a/jena-arq/Grammar/BinaryRDF.thrift b/jena-arq/Grammar/BinaryRDF.thrift index 2b87266..841d7e7 100644 --- a/jena-arq/Grammar/BinaryRDF.thrift +++ b/jena-arq/Grammar/BinaryRDF.thrift @@ -1,3 +1,21 @@ +/** + * 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. + */ + // Encoding in Thrift iof RDF terms and other items // for Graph, Datasets, Result Set and Patches http://git-wip-us.apache.org/repos/asf/jena/blob/2d8b550a/jena-arq/Grammar/Final/jj2html_11 -- diff --git a/jena-arq/Grammar/Final/jj2html_11 b/jena-arq/Grammar/Final/jj2html_11 index db29beb..f8d7282 100755 --- a/jena-arq/Grammar/Final/jj2html_11 +++ b/jena-arq/Grammar/Final/jj2html_11 @@ -1,4 +1,20 @@ #!/usr/bin/perl +## 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. + # Grammar into HTML # Read in sparql.txt and the tokens.txt file http://git-wip-us.apache.org/repos/asf/jena/blob/2d8b550a/jena-arq/Grammar/JSON/json -- diff --git a/jena-arq/Grammar/JSON/json b/jena-arq/Grammar/JSON/json index 254e646..ac77ed0 100755 --- a/jena-arq/Grammar/JSON/json +++ b/jena-arq/Grammar/JSON/json @@ -1,4 +1,20 @@ #!/bin/bash +## 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
[5/5] git commit: Remove exclusions that no longer need excluding
Remove exclusions that no longer need excluding Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/52598831 Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/52598831 Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/52598831 Branch: refs/heads/rat-checks Commit: 525988312f6420bb3b565b4a99d710613fac2d35 Parents: c750074 Author: Andy Seaborne a...@apache.org Authored: Tue Oct 21 16:44:48 2014 +0100 Committer: Andy Seaborne a...@apache.org Committed: Tue Oct 21 16:44:48 2014 +0100 -- jena-parent/pom.xml | 11 +-- 1 file changed, 1 insertion(+), 10 deletions(-) -- http://git-wip-us.apache.org/repos/asf/jena/blob/52598831/jena-parent/pom.xml -- diff --git a/jena-parent/pom.xml b/jena-parent/pom.xml index ef63b32..838c538 100644 --- a/jena-parent/pom.xml +++ b/jena-parent/pom.xml @@ -333,11 +333,6 @@ exclude**/src-examples/data/*/exclude !-- - jena-sdb exclusions - -- - exclude**/Old/*/exclude - - !-- jena-fuseki exclusions -- exclude**/dist/ABOUT/exclude @@ -349,11 +344,7 @@ -- exclude**/vocabularies/*/exclude exclude**/Vocabularies/*/exclude - !-- - Grammars are typically based directly off the BNF published in - relevant standards - -- - exclude**/Grammar/**/*/exclude + !-- Javadoc add-ons files are required to be simple and our javadoc configuration will ensure appropriate license and copyright statements are inserted
[4/5] git commit: Remove old stuff
Remove old stuff
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/c750074e
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/c750074e
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/c750074e
Branch: refs/heads/rat-checks
Commit: c750074edd2f7a26310741d5b167cedc1a5bbe2d
Parents: a9e5926
Author: Andy Seaborne a...@apache.org
Authored: Tue Oct 21 16:44:11 2014 +0100
Committer: Andy Seaborne a...@apache.org
Committed: Tue Oct 21 16:44:11 2014 +0100
--
jena-sdb/Old/PG_GRANT | 10 ---
jena-sdb/Old/ToDo-AFS | 67 --
2 files changed, 77 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/jena/blob/c750074e/jena-sdb/Old/PG_GRANT
--
diff --git a/jena-sdb/Old/PG_GRANT b/jena-sdb/Old/PG_GRANT
deleted file mode 100644
index 63df4a4..000
--- a/jena-sdb/Old/PG_GRANT
+++ /dev/null
@@ -1,10 +0,0 @@
--- sdbsql this file
--- GRANT ALL ON TABLE nodes TO public;
--- GRANT ALL ON TABLE prefixes TO public;
--- GRANT ALL ON TABLE triples TO public;
-
-GRANT SELECT ON TABLE nodes TO public;
-GRANT SELECT ON TABLE prefixes TO public;
-GRANT SELECT ON TABLE triples TO public;
-
-
http://git-wip-us.apache.org/repos/asf/jena/blob/c750074e/jena-sdb/Old/ToDo-AFS
--
diff --git a/jena-sdb/Old/ToDo-AFS b/jena-sdb/Old/ToDo-AFS
deleted file mode 100644
index 4e0964c..000
--- a/jena-sdb/Old/ToDo-AFS
+++ /dev/null
@@ -1,67 +0,0 @@
-SDB ToDo list (and general notes)
-=
-
-** Graph management
-And OpDatasetNames
-** prefixes per model (related)
-
-
-** OpQuadPattern == Track OpGraph and OpBGP (common visitor/transform base
pattern?)
-** OpDatasetNames (and check GRAPH ?g {})
-
-** SELECT DISTINCT ?p { ?s ?p ?o }
- Can push in DISTINCT through the project if the SelectBlock has the project
- else just put on the project?
- TransformSDB
-
-** Tidy the assembler descriptions on wiki.
- Currently two pages: make reference and tutorial.
-
-** Check update tests - why is fork needed in ant for Pg and MS-SQL, but not
MySQL?
-
-** Connection pooling (Apache DBCP) which will also cope with MySQL timeouts
-
-** Store .isClosed, isFormatted
-
- Wiki
-** StoreFormatter.isFormatted()
-
-+ Break out the merge query section into a separate wiki page.
-
- Tests
-
-?? Restruct as run-per-store
-?? Run-per-store for all non-Q tests.
- May need to hack JUnit 4 to get naming to work.
- TestEnv.getStore() - Store
- For load-general?
-+ Test: Dataset description + JDBC connection for pooling.
-
-== Major
-
-+ Graph management:
-Graphs loaded
-Delete graph (can we make this anymore efficient?)
- Delete by quad pattern
-Add new graph (and load of unknown graph fails?)
-Replace graph
- Delete model, Clear model, Create model
- Only load is model exists?
- Check in GraphSDB
-Need a graph ids table
-
-== Minor
-
-+ StoreLoader = StoreLoaderPlus.
-+ LoaderTuplesNodes uses reflection on constructors. OneTuple loader broken
by this.
- Each loader has many TupleLoader instances - per table to be loaded.
- == TupleLoaderFactory
-
-+ Tests with SDB.getContext().setTrue(SDB.unionDefaultGraph) ;
- --set in manifest?
-
-+ OpUnion
-
- Notes
-
-+ QueryEngineSDB has duplication with QueryEngineMain - eliminate!
[1/5] git commit: Add license
Repository: jena
Updated Branches:
refs/heads/rat-checks cb46780bd - 525988312
Add license
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/06339ad3
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/06339ad3
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/06339ad3
Branch: refs/heads/rat-checks
Commit: 06339ad30ce682cb5d123c5369eae396901e4954
Parents: cb46780
Author: Andy Seaborne a...@apache.org
Authored: Tue Oct 21 16:39:10 2014 +0100
Committer: Andy Seaborne a...@apache.org
Committed: Tue Oct 21 16:39:10 2014 +0100
--
jena-arq/Grammar/sse/grammar-sse | 16 +
jena-arq/Grammar/sse/jj2html | 922 +-
jena-arq/Grammar/sse/sse.jj | 490 +-
jena-arq/Grammar/sse/tokens.inc | 334 ++--
4 files changed, 906 insertions(+), 856 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/jena/blob/06339ad3/jena-arq/Grammar/sse/grammar-sse
--
diff --git a/jena-arq/Grammar/sse/grammar-sse b/jena-arq/Grammar/sse/grammar-sse
index 3502d78..a675f70 100644
--- a/jena-arq/Grammar/sse/grammar-sse
+++ b/jena-arq/Grammar/sse/grammar-sse
@@ -1,4 +1,20 @@
#!/bin/bash
+## 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.
+
# Parser builder
GRAMMAR=${GRAMMAR:-sse.jj}
http://git-wip-us.apache.org/repos/asf/jena/blob/06339ad3/jena-arq/Grammar/sse/jj2html
--
diff --git a/jena-arq/Grammar/sse/jj2html b/jena-arq/Grammar/sse/jj2html
index 9451deb..0f83ee7 100644
--- a/jena-arq/Grammar/sse/jj2html
+++ b/jena-arq/Grammar/sse/jj2html
@@ -1,453 +1,469 @@
-#!/bin/perl
-# Grammar into HTML
-# Read in sparql.txt and the tokens.txt file
-
-## ToDo:
-## Check tokens exist and are used
-## Validate
-
-
-if ( $#ARGV != 1 )
-{
-print STDERR Usage: grammar.txt tokens.txt\n ;
-exit 1 ;
-}
-
-
-
-$/ = undef ;
-# Just table or full page.
-$TABLE = 1 ;
-
-$grammarFile = $ARGV[0] ;
-$tokensFile = $ARGV[1] ;
-
-## $grammarFile = 's.txt' ;
-## $tokensFile = 't.txt' ;
-
-
-$grammar = readFile($grammarFile) ;
-$tokens = readFile($tokensFile) ;
-
-$grammar =~ s!DOCUMENT START!! ;
-$grammar =~ s!NON-TERMINALS!! ;
-$grammar =~ s!DOCUMENT END!! ;
-
-$grammar =~ s!//.*!!g ;
-$grammar =~ s!\r!!g ;
-
-# remove leading whitespace
-$grammar =~ s!^[\n\s]*!\n! ;
-
-# Merge alts
-$grammar =~ s!\n\s*\|!\ |!g ;
-
-$tokens =~ s!//.*!!g ;
-$tokens =~ s!\r!!g ;
-
-
-## Grammar
-#print GRAMMAR\n ;
-
-@g = split(/\n\s*/, $grammar) ;
-
-@rules = () ;
-%ruleMap = () ;
-%tokenMap = () ;
-%inline = () ;
-
-# Grammar rules
-# Direct from jjdoc -TEXT=true
-
-for $g (@g)
-{
-($rulename, $rulebody) = split(/:=/,$g) ;
-
-$rulename =~ s!^\s*!! ;
-$rulename =~ s!\s*$!! ;
-
-$rulebody =~ s!^\s*!! ;
-$rulebody =~ s!\s*$!! ;
-
-# Remove outer brackets
-#$rulebody =~ s!^\((.*)\)$!$1! ;
-
-# Remove around tokens in grammar.
-## Now done very late (as lt;gt;) in fixups.
-## $rulebody =~ s/\(\w+)\/$1/g ;
-# Leave in - so tokens distinguished from rules
-
-next if $rulename eq '' ;
-#next if $rulebody eq '' ;
-
-# Skip the root rule.
-next if ( $rulename eq 'CompilationUnit' ) ;
-
-$rulebody = 'Perl 5 regular expression'
- if ( $rulename eq 'PatternLiteral' ) ;
-
-push @rules, $rulename ;
-warn Duplicate rule (grammar): $rulename\n if
defined($ruleMap{$rulename}) ;
-$ruleMap{$rulename} = $rulebody ;
-
-## print --\n ;
-## print $rulename,\n ;
-## print $rulebody,\n ;
-
-}
-
-
-# Tokens
-# Produced by jj2tokens
-# Hand edited to indicate the inlines
-
-$tokens =~ s/\n+/\n/g ;
-$tokens =~ s/^\n// ;
-
-@t = split(/\n(?=\|\[)/, $tokens) ;
-
-for $t (@t)
-{
-($tokenname,$tokenbody) = split(/::=/, $t) ;
-$tokenname =~ s!^\s*!! ;
-$tokenname =~ s!\s*$!! ;
-
-## # remove around tokens
-## Do very late as a formatting fix up.
-## $tokenname =~ s/^\// ;
-## $tokenname =~ s/\$// ;
-
-$tokenname =~
git commit: Clarift position of 'testing' files
Repository: jena Updated Branches: refs/heads/rat-checks 525988312 - c4fa17b4d Clarift position of 'testing' files Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/c4fa17b4 Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/c4fa17b4 Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/c4fa17b4 Branch: refs/heads/rat-checks Commit: c4fa17b4d8646bbb291213c755574b6ec2d82299 Parents: 5259883 Author: Andy Seaborne a...@apache.org Authored: Tue Oct 21 16:49:15 2014 +0100 Committer: Andy Seaborne a...@apache.org Committed: Tue Oct 21 16:49:15 2014 +0100 -- jena-parent/pom.xml | 16 +--- 1 file changed, 9 insertions(+), 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/jena/blob/c4fa17b4/jena-parent/pom.xml -- diff --git a/jena-parent/pom.xml b/jena-parent/pom.xml index 838c538..8fb13db 100644 --- a/jena-parent/pom.xml +++ b/jena-parent/pom.xml @@ -369,13 +369,15 @@ -- exclude**/META-INF/services/*/exclude - !-- - Unfortunately Jena historically has large numbers of small - test files with no license headers. Since Jena was donated to the - ASF under a Software Grant it is assumed that all rights for these - are correct or they are included under other appropriate licenses - e.g. W3C Test Case license - -- + !-- +Jena historically has large numbers of small test files +with no license headers. Such small files are not required +to have headers. + +In addition, there are files with different Licenses +(e.g. W3C Software Licence, W3C Test Suite License) as +noted in the code tree. + -- exclude**/src/test/resources/**/*/exclude exclude**/testing/**/*/exclude
git commit: JENA-802 : Handle blank nodes in the same way that jena-text does
Repository: jena
Updated Branches:
refs/heads/master ec0d19cc7 - 17a2537bb
JENA-802 : Handle blank nodes in the same way that jena-text does
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/17a2537b
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/17a2537b
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/17a2537b
Branch: refs/heads/master
Commit: 17a2537bbe5fe7858e1d854c690e72a0108bd532
Parents: ec0d19c
Author: Andy Seaborne a...@apache.org
Authored: Tue Oct 21 19:43:21 2014 +0100
Committer: Andy Seaborne a...@apache.org
Committed: Tue Oct 21 19:43:21 2014 +0100
--
.../jena/query/spatial/SpatialIndexContext.java | 5 +-
.../jena/query/spatial/SpatialIndexLucene.java | 8 +--
.../jena/query/spatial/SpatialIndexSolr.java| 49
.../jena/query/spatial/SpatialQueryFuncs.java | 61
.../apache/jena/query/text/TextQueryFuncs.java | 2 +-
5 files changed, 91 insertions(+), 34 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/jena/blob/17a2537b/jena-spatial/src/main/java/org/apache/jena/query/spatial/SpatialIndexContext.java
--
diff --git
a/jena-spatial/src/main/java/org/apache/jena/query/spatial/SpatialIndexContext.java
b/jena-spatial/src/main/java/org/apache/jena/query/spatial/SpatialIndexContext.java
index 63b9b7e..42c8b76 100644
---
a/jena-spatial/src/main/java/org/apache/jena/query/spatial/SpatialIndexContext.java
+++
b/jena-spatial/src/main/java/org/apache/jena/query/spatial/SpatialIndexContext.java
@@ -24,6 +24,8 @@ import java.util.Iterator;
import java.util.Map;
import java.util.Set;
+import org.apache.jena.atlas.logging.Log ;
+
import com.hp.hpl.jena.graph.Node;
import com.spatial4j.core.shape.Shape;
@@ -46,7 +48,8 @@ public class SpatialIndexContext {
return;
}
- String x = (s.isURI()) ? s.getURI() : s.getBlankNodeLabel();
+ String x = SpatialQueryFuncs.subjectToString(s) ;
+ Log.info(getClass(), Subject: +x) ;
if (defn.isSpatialPredicate(p)
SpatialValueUtil.isDecimal(o.getLiteral())) {
http://git-wip-us.apache.org/repos/asf/jena/blob/17a2537b/jena-spatial/src/main/java/org/apache/jena/query/spatial/SpatialIndexLucene.java
--
diff --git
a/jena-spatial/src/main/java/org/apache/jena/query/spatial/SpatialIndexLucene.java
b/jena-spatial/src/main/java/org/apache/jena/query/spatial/SpatialIndexLucene.java
index cbaf99d..f515d6e 100644
---
a/jena-spatial/src/main/java/org/apache/jena/query/spatial/SpatialIndexLucene.java
+++
b/jena-spatial/src/main/java/org/apache/jena/query/spatial/SpatialIndexLucene.java
@@ -42,8 +42,6 @@ import org.slf4j.Logger ;
import org.slf4j.LoggerFactory ;
import com.hp.hpl.jena.graph.Node ;
-import com.hp.hpl.jena.graph.NodeFactory ;
-import com.hp.hpl.jena.sparql.util.NodeFactoryExtra ;
import com.spatial4j.core.shape.Point ;
import com.spatial4j.core.shape.Shape ;
@@ -219,7 +217,7 @@ public class SpatialIndexLucene implements SpatialIndex {
Document doc = indexSearcher.doc(sd.doc);
String[] values =
doc.getValues(docDef.getEntityField());
for (String v : values) {
- Node n = NodeFactory.createURI(v);
+ Node n = SpatialQueryFuncs.stringToNode(v) ;
results.add(n);
}
}
@@ -231,10 +229,6 @@ public class SpatialIndexLucene implements SpatialIndex {
return docDef;
}
- private Node entryToNode(String v) {
- // TEMP
- return NodeFactoryExtra.createLiteralNode(v, null, null);
- }
private static void exception(Exception ex) {
throw new SpatialIndexException(ex);
http://git-wip-us.apache.org/repos/asf/jena/blob/17a2537b/jena-spatial/src/main/java/org/apache/jena/query/spatial/SpatialIndexSolr.java
--
diff --git
a/jena-spatial/src/main/java/org/apache/jena/query/spatial/SpatialIndexSolr.java
b/jena-spatial/src/main/java/org/apache/jena/query/spatial/SpatialIndexSolr.java
index 50f1b61..7363a3d 100644
---
a/jena-spatial/src/main/java/org/apache/jena/query/spatial/SpatialIndexSolr.java
+++
b/jena-spatial/src/main/java/org/apache/jena/query/spatial/SpatialIndexSolr.java
@@ -18,28 +18,27 @@
package org.apache.jena.query.spatial;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.lucene.spatial.SpatialStrategy;
-import
