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/02/19 14:30:38 UTC
[1/2] jena git commit: JENA-583: Add dependency for log4j
Repository: jena
Updated Branches:
refs/heads/master 1d12a1edc -> 11edc56e5
JENA-583: Add dependency for log4j
JenaDriver calls org.apache.log4j.PropertyConfigurator
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/b5b57c2a
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/b5b57c2a
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/b5b57c2a
Branch: refs/heads/master
Commit: b5b57c2abe969e9e600afd0389e0e03bfdde045d
Parents: 1d12a1e
Author: Andy Seaborne <an...@apache.org>
Authored: Thu Feb 18 16:45:10 2016 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Thu Feb 18 16:45:14 2016 +0000
----------------------------------------------------------------------
jena-jdbc/jena-jdbc-core/pom.xml | 13 +++++++++++++
1 file changed, 13 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/b5b57c2a/jena-jdbc/jena-jdbc-core/pom.xml
----------------------------------------------------------------------
diff --git a/jena-jdbc/jena-jdbc-core/pom.xml b/jena-jdbc/jena-jdbc-core/pom.xml
index 025b4bd..372fa16 100644
--- a/jena-jdbc/jena-jdbc-core/pom.xml
+++ b/jena-jdbc/jena-jdbc-core/pom.xml
@@ -39,6 +39,19 @@
<version>3.1.0-SNAPSHOT</version>
</dependency>
+ <!-- Jena Driver configures Log4j directly -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>${ver.slf4j}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>${ver.log4j}</version>
+ </dependency>
+
<!-- Test Dependencies -->
<dependency>
<groupId>junit</groupId>
[2/2] jena git commit: Delete unused deprecated class.
Posted by an...@apache.org.
Delete unused deprecated class.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/11edc56e
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/11edc56e
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/11edc56e
Branch: refs/heads/master
Commit: 11edc56e53950a0826a89b143f965abb762ac027
Parents: b5b57c2
Author: Andy Seaborne <an...@apache.org>
Authored: Thu Feb 18 18:37:42 2016 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Thu Feb 18 18:37:42 2016 +0000
----------------------------------------------------------------------
.../jena/sparql/resultset/SortedResultSet.java | 147 -------------------
1 file changed, 147 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/11edc56e/jena-arq/src/main/java/org/apache/jena/sparql/resultset/SortedResultSet.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/resultset/SortedResultSet.java b/jena-arq/src/main/java/org/apache/jena/sparql/resultset/SortedResultSet.java
deleted file mode 100644
index 16beddf..0000000
--- a/jena-arq/src/main/java/org/apache/jena/sparql/resultset/SortedResultSet.java
+++ /dev/null
@@ -1,147 +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.
- */
-
-package org.apache.jena.sparql.resultset;
-
-import java.util.Comparator ;
-import java.util.Iterator ;
-import java.util.List ;
-import java.util.SortedSet ;
-import java.util.TreeSet ;
-
-import org.apache.jena.query.QuerySolution ;
-import org.apache.jena.query.ResultSet ;
-import org.apache.jena.query.SortCondition ;
-import org.apache.jena.rdf.model.Model ;
-import org.apache.jena.rdf.model.RDFNode ;
-import org.apache.jena.sparql.core.ResultBinding ;
-import org.apache.jena.sparql.core.Var ;
-import org.apache.jena.sparql.engine.QueryIterator ;
-import org.apache.jena.sparql.engine.binding.Binding ;
-import org.apache.jena.sparql.engine.binding.BindingComparator ;
-import org.apache.jena.sparql.engine.binding.BindingFactory ;
-import org.apache.jena.sparql.engine.binding.BindingMap ;
-import org.apache.jena.sparql.engine.iterator.QueryIterPlainWrapper ;
-
-
-/** Sort a result set.
- * @deprecated Unused - will be deleted.
- */
-@Deprecated
-/*package*/ abstract class SortedResultSet implements ResultSet
-{
- // See also QueryIterSort
- // This class processes ResultSet's (which may not come from a query)
- // QueryIterSort processes QueryIterators.
- // As we need to unwrap the ResultSet into bindings, we might as well sort at that point,
- // otherwise get two copies - one for downcasting, one for QueryIterSort.
-
- QueryIterator qIter ;
- int rowNumber = 0 ;
- List<String> resultVars = null ;
- Model model ;
-
- // Caution: this does not have the ful context available so soem conditions
- private SortedResultSet(ResultSet rs, List<SortCondition> conditions)
- {
- // Caution: this does not have the ful context available so some conditions may get upset.
- this(rs, new BindingComparator(conditions)) ;
- }
-
- private SortedResultSet(ResultSet rs, Comparator<Binding> comparator)
- {
- model = rs.getResourceModel() ;
- // Put straight into a sorted structure
- SortedSet<Binding> sorted = new TreeSet<>(comparator) ;
-
- for ( ; rs.hasNext() ; )
- {
- Binding b = rs.nextBinding() ;
- sorted.add(b) ;
- }
-
- qIter = new QueryIterPlainWrapper(sorted.iterator()) ;
- resultVars = rs.getResultVars() ;
- //resultSet = new ResultSetStream(rs.getResultVars(), null, qIter) ;
- }
-
- @Override
- public boolean hasNext()
- {
- return qIter.hasNext() ;
- }
-
- @Override
- public QuerySolution next()
- {
- return new ResultBinding(model, nextBinding()) ;
- }
-
- @Override
- public Binding nextBinding()
- {
- rowNumber++ ;
- return qIter.nextBinding() ;
- }
-
- @Override
- public QuerySolution nextSolution()
- {
- return new ResultBinding(null, nextBinding()) ;
- }
-
- @Override
- public int getRowNumber()
- {
- return rowNumber ;
- }
-
- @Override
- public List<String> getResultVars()
- {
- return resultVars ;
- }
-
- public boolean isOrdered() { return true ; }
-
- @Override
- public Model getResourceModel()
- {
- return model ;
- }
-
- @Override
- public void remove()
- {
- throw new UnsupportedOperationException(SortedResultSet.class.getName()+".remove") ;
- }
-
-
- private Binding copyToBinding(QuerySolution qs)
- {
- BindingMap b = BindingFactory.create() ;
- for ( Iterator<String> iter = qs.varNames() ; iter.hasNext() ; )
- {
- String varName = iter.next() ;
- RDFNode rn = qs.get(varName) ;
- b.add(Var.alloc(varName), rn.asNode()) ;
- }
- return b ;
- }
-
-}