You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by cl...@apache.org on 2014/10/03 20:48:58 UTC
[1/3] git commit: Changed TDBGraphTest to use in memory TDB Fixed a
bug in SecuredPrefixMappingTest Remvoed java 6 declaration in POM
Repository: jena
Updated Branches:
refs/heads/master e5838ac47 -> 84fdb96cc
Changed TDBGraphTest to use in memory TDB
Fixed a bug in SecuredPrefixMappingTest
Remvoed java 6 declaration in POM
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/b1baaa0a
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/b1baaa0a
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/b1baaa0a
Branch: refs/heads/master
Commit: b1baaa0a9e318944d58afd4adf42880600e7e02d
Parents: 913b225
Author: claude <cl...@xenei.com>
Authored: Fri Oct 3 18:58:02 2014 +0100
Committer: claude <cl...@xenei.com>
Committed: Fri Oct 3 18:58:02 2014 +0100
----------------------------------------------------------------------
jena-security/pom.xml | 7 -------
.../apache/jena/security/graph/SecuredPrefixMappingTest.java | 2 +-
.../java/org/apache/jena/security/graph/TDBGraphTest.java | 4 +---
3 files changed, 2 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/b1baaa0a/jena-security/pom.xml
----------------------------------------------------------------------
diff --git a/jena-security/pom.xml b/jena-security/pom.xml
index a12be26..3772f41 100644
--- a/jena-security/pom.xml
+++ b/jena-security/pom.xml
@@ -67,13 +67,6 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<!-- <version>2.9</version> -->
http://git-wip-us.apache.org/repos/asf/jena/blob/b1baaa0a/jena-security/src/test/java/org/apache/jena/security/graph/SecuredPrefixMappingTest.java
----------------------------------------------------------------------
diff --git a/jena-security/src/test/java/org/apache/jena/security/graph/SecuredPrefixMappingTest.java b/jena-security/src/test/java/org/apache/jena/security/graph/SecuredPrefixMappingTest.java
index 5e1c086..d354501 100644
--- a/jena-security/src/test/java/org/apache/jena/security/graph/SecuredPrefixMappingTest.java
+++ b/jena-security/src/test/java/org/apache/jena/security/graph/SecuredPrefixMappingTest.java
@@ -62,7 +62,7 @@ public class SecuredPrefixMappingTest
if (m.isAnnotationPresent(Test.class))
{
// lock test must come last
- if (!m.getName().equals("lockTest"))
+ if (m.getName().equals("testLock"))
{
lockTest = m;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/b1baaa0a/jena-security/src/test/java/org/apache/jena/security/graph/TDBGraphTest.java
----------------------------------------------------------------------
diff --git a/jena-security/src/test/java/org/apache/jena/security/graph/TDBGraphTest.java b/jena-security/src/test/java/org/apache/jena/security/graph/TDBGraphTest.java
index 6d4779a..13b8fba 100644
--- a/jena-security/src/test/java/org/apache/jena/security/graph/TDBGraphTest.java
+++ b/jena-security/src/test/java/org/apache/jena/security/graph/TDBGraphTest.java
@@ -44,8 +44,7 @@ public class TDBGraphTest extends MemGraphTest
protected Graph createGraph() throws IOException
{
TDB.init();
- f = new File(System.getProperty("java.io.tmpdir") + "/TDBTest");
- dsGraph = TDBFactory.createDatasetGraph(f.getCanonicalPath());
+ dsGraph = TDBFactory.createDataset().asDatasetGraph();
return dsGraph.getDefaultGraph();
}
@@ -54,7 +53,6 @@ public class TDBGraphTest extends MemGraphTest
{
TDB.sync(dsGraph);
dsGraph.close();
- f.delete();
TDB.closedown();
}
[3/3] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/jena
Posted by cl...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/jena
brought in other changes.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/84fdb96c
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/84fdb96c
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/84fdb96c
Branch: refs/heads/master
Commit: 84fdb96cc8dd3425f8c41f68f1eefc08cfd38adc
Parents: bbd9456 e5838ac
Author: claude <cl...@xenei.com>
Authored: Fri Oct 3 19:47:40 2014 +0100
Committer: claude <cl...@xenei.com>
Committed: Fri Oct 3 19:47:40 2014 +0100
----------------------------------------------------------------------
apache-jena-libs/pom.xml | 12 +-
apache-jena/pom.xml | 38 +-
jena-arq/.gitattributes | 17 +-
jena-arq/pom.xml | 14 +-
.../sparql/core/DatasetGraphCollection.java | 2 +-
.../java/com/hp/hpl/jena/sparql/core/Quad.java | 6 +-
.../engine/iterator/QueryIterNullIterator.java | 2 +-
.../com/hp/hpl/jena/sparql/expr/E_Scalar.java | 0
.../modify/request/UpdateWriterVisitor.java | 18 +
.../hpl/jena/sparql/util/NodeFactoryExtra.java | 73 +-
.../org/apache/jena/atlas/iterator/Iter.java | 18 +-
.../apache/jena/riot/out/JenaRDF2JSONLD.java | 14 +-
.../optimize/TestSemanticEquivalence.java | 16 +-
.../jena/sparql/negation/TestGraphDeltas.java | 18 +
.../hp/hpl/jena/sparql/util/TestFmtUtils.java | 18 +
.../jena/riot/lang/TestCollectorStream.java | 18 +
.../jena/riot/langsuite/UnitTestEval.java | 1 +
.../jena/riot/writer/TestRiotWriterGraph.java | 4 +-
jena-arq/testing/RIOT/Lang/.gitattributes | 1 -
jena-core/pom.xml | 12 +-
jena-fuseki/make_links | 3 +-
jena-fuseki/pom.xml | 22 +-
jena-fuseki/run_cp | 2 +-
jena-fuseki/s-delete | 714 ++++++++++++++++++-
jena-fuseki/s-get | 714 ++++++++++++++++++-
jena-fuseki/s-head | 714 ++++++++++++++++++-
jena-fuseki/s-post | 714 ++++++++++++++++++-
jena-fuseki/s-put | 714 ++++++++++++++++++-
jena-fuseki/s-query | 714 ++++++++++++++++++-
jena-fuseki/s-update | 714 ++++++++++++++++++-
jena-fuseki/s-update-form | 714 ++++++++++++++++++-
jena-fuseki/src-dev/dev/RunFuseki.java | 2 +-
.../java/org/apache/jena/fuseki/FusekiLib.java | 2 +-
.../jena/fuseki/servlets/SPARQL_REST_RW.java | 5 +
jena-fuseki2/.gitignore | 3 +
jena-fuseki2/dist/LICENSE-dist | 8 +
jena-fuseki2/pom.xml | 21 +-
.../java/org/apache/jena/fuseki/FusekiLib.java | 2 +-
.../jena/fuseki/servlets/SPARQL_GSP_RW.java | 7 +
jena-iri/pom.xml | 10 +-
jena-jdbc/jena-jdbc-core/pom.xml | 4 +-
jena-jdbc/jena-jdbc-driver-bundle/pom.xml | 20 +-
jena-jdbc/jena-jdbc-driver-mem/pom.xml | 6 +-
jena-jdbc/jena-jdbc-driver-remote/pom.xml | 10 +-
jena-jdbc/jena-jdbc-driver-tdb/pom.xml | 10 +-
jena-jdbc/pom.xml | 4 +-
jena-maven-tools/pom.xml | 11 +-
jena-parent/pom.xml | 11 +-
jena-sdb/pom.xml | 18 +-
jena-security/pom.xml | 9 +-
jena-spatial/pom.xml | 8 +-
jena-tdb/pom.xml | 18 +-
.../tdb/base/file/BufferAllocatorDirect.java | 18 +
.../jena/tdb/base/file/BufferAllocatorMem.java | 18 +
.../hpl/jena/tdb/setup/DatasetBuilderStd.java | 2 +-
.../com/hp/hpl/jena/tdb/solver/SolverLib.java | 65 +-
.../java/com/hp/hpl/jena/tdb/sys/SystemTDB.java | 2 +-
.../test/java/com/hp/hpl/jena/tdb/TC_TDB.java | 6 +-
.../jena/tdb/base/file/TestLocationLock.java | 18 +
.../jena/tdb/graph/AbstractTestGraphsTDB.java | 6 +-
.../java/com/hp/hpl/jena/tdb/junit/Base_TS.java | 8 +-
jena-text/pom.xml | 16 +-
.../assembler/AbstractTestTextAssembler.java | 2 +-
pom.xml | 14 +-
64 files changed, 6127 insertions(+), 278 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/84fdb96c/jena-security/pom.xml
----------------------------------------------------------------------
[2/3] git commit: partial fix for bug JENA-795 Added test for missing
test method
Posted by cl...@apache.org.
partial fix for bug JENA-795
Added test for missing test method
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/bbd9456f
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/bbd9456f
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/bbd9456f
Branch: refs/heads/master
Commit: bbd9456f3dafb19c6603bc38b957b542d786f91f
Parents: b1baaa0
Author: claude <cl...@xenei.com>
Authored: Fri Oct 3 19:38:32 2014 +0100
Committer: claude <cl...@xenei.com>
Committed: Fri Oct 3 19:38:32 2014 +0100
----------------------------------------------------------------------
.../org/apache/jena/security/graph/SecuredPrefixMappingTest.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/bbd9456f/jena-security/src/test/java/org/apache/jena/security/graph/SecuredPrefixMappingTest.java
----------------------------------------------------------------------
diff --git a/jena-security/src/test/java/org/apache/jena/security/graph/SecuredPrefixMappingTest.java b/jena-security/src/test/java/org/apache/jena/security/graph/SecuredPrefixMappingTest.java
index d354501..1bed4d7 100644
--- a/jena-security/src/test/java/org/apache/jena/security/graph/SecuredPrefixMappingTest.java
+++ b/jena-security/src/test/java/org/apache/jena/security/graph/SecuredPrefixMappingTest.java
@@ -74,6 +74,7 @@ public class SecuredPrefixMappingTest
}
}
+ Assert.assertNotNull( "Did not find 'testLock' method", lockTest );
pmTest.setup();
lockTest.invoke(pmTest);