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 2017/08/26 11:42:44 UTC
[1/2] jena git commit: Delete unused, dubious code.
Repository: jena
Updated Branches:
refs/heads/master f6ced8217 -> beb39af72
Delete unused, dubious code.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/52aa9c57
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/52aa9c57
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/52aa9c57
Branch: refs/heads/master
Commit: 52aa9c570bdd3cdef77cc8f879617d3aec00a544
Parents: f6ced82
Author: Andy Seaborne <an...@apache.org>
Authored: Sat Aug 26 11:45:09 2017 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Sat Aug 26 11:45:09 2017 +0100
----------------------------------------------------------------------
.../fuseki/migrate/DatasetGraphSwitchable.java | 87 --------------------
1 file changed, 87 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/52aa9c57/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/migrate/DatasetGraphSwitchable.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/migrate/DatasetGraphSwitchable.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/migrate/DatasetGraphSwitchable.java
deleted file mode 100644
index 76178eb..0000000
--- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/migrate/DatasetGraphSwitchable.java
+++ /dev/null
@@ -1,87 +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.fuseki.migrate;
-
-import java.util.concurrent.atomic.AtomicReference ;
-
-import org.apache.jena.fuseki.FusekiException ;
-import org.apache.jena.sparql.core.DatasetGraph ;
-import org.apache.jena.sparql.core.DatasetGraphWrapper ;
-
-public class DatasetGraphSwitchable extends DatasetGraphWrapper {
- // **** Associated query engine factory - QueryEngineFactoryWrapper
- // which executes on the unwrapped DSG.
-
- // *** Modify DatasetGraphWrapper to use a get().
-
- // Time to have DatasetGraph.getQueryDataset
- private final DatasetGraph dsg1 ;
- private final DatasetGraph dsg2 ;
- private final AtomicReference<DatasetGraph> current = new AtomicReference<>() ;
-
- // Change DatasetGraphWrapper to use protected get()
-
- public DatasetGraphSwitchable(DatasetGraph dsg1, DatasetGraph dsg2) {
- super(null) ;
- if ( dsg1 == null )
- // Personally I think IllegalArgumentException is more
- // appropriate, with NPE for unexpected use of null
- // but convention says ....
- throw new NullPointerException("First argument is null") ;
- if ( dsg2 == null )
- throw new NullPointerException("Second argument is null") ;
- this.dsg1 = dsg1 ;
- this.dsg2 = dsg2 ;
- set(dsg1) ;
- }
-
- private void set(DatasetGraph dsg) { current.set(dsg) ; }
-
- /** Change to using the other dataset */
- public void flip() {
- // Don't worry about concurrent calls to flip()
- // The outcome will be that one call wins (the actual second caller)
- // and not corrupted data. Noet that get() is only called once per
- // redirection.
-
- // if dsg1 -- (expected, update)
- if ( current.compareAndSet(dsg1, dsg2) )
- return ;
- // if dsg2
- if ( current.compareAndSet(dsg2, dsg1) )
- return ;
- throw new FusekiException() ;
- }
-
- /** Current dataset of the switchable pair */
- public final DatasetGraph getCurrent() { return get() ; }
-
- /** Return dataset1 of the switchable pair */
- public final DatasetGraph getDataset1() { return dsg1 ; }
-
- /** Return dataset2 of the switchable pair */
- public final DatasetGraph getDataset2() { return dsg2 ; }
-
- /** Use dataset1 */
- public final void useDataset1() { set(dsg1) ; }
-
- /** Use dataset2 */
- public final void useDataset2() { set(dsg2) ; }
-}
-
[2/2] jena git commit: JENA-1386: Update jsonld-java depenednecy to
0.11.1
Posted by an...@apache.org.
JENA-1386: Update jsonld-java depenednecy to 0.11.1
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/beb39af7
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/beb39af7
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/beb39af7
Branch: refs/heads/master
Commit: beb39af722318c3c4574791d4c40208e13b0a13b
Parents: 52aa9c5
Author: Andy Seaborne <an...@apache.org>
Authored: Sat Aug 26 12:11:07 2017 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Sat Aug 26 12:11:07 2017 +0100
----------------------------------------------------------------------
jena-project/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/beb39af7/jena-project/pom.xml
----------------------------------------------------------------------
diff --git a/jena-project/pom.xml b/jena-project/pom.xml
index a9f244a..5d83779 100644
--- a/jena-project/pom.xml
+++ b/jena-project/pom.xml
@@ -57,8 +57,8 @@
artifacts so the versions must align. Consult jsonld-java's
POM for the correct dependency versions
-->
- <ver.jsonldjava>0.10.0</ver.jsonldjava>
- <ver.jackson>2.8.9</ver.jackson>
+ <ver.jsonldjava>0.11.1</ver.jsonldjava>
+ <ver.jackson>2.9.0</ver.jackson>
<ver.commonsio>2.5</ver.commonsio>
<ver.commonscli>1.4</ver.commonscli>