You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by rv...@apache.org on 2015/02/17 13:42:10 UTC
[01/50] [abbrv] jena git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/jena
Repository: jena
Updated Branches:
refs/heads/eliminate-assignments e1a835769 -> 57cf5dd9a
refs/heads/master 00ff87809 -> 2cf50f370
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/jena
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/387bc73e
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/387bc73e
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/387bc73e
Branch: refs/heads/eliminate-assignments
Commit: 387bc73e5017ee450aa8f83d048bfa97ab000adc
Parents: fd14ac1 6140aa1
Author: Andy Seaborne <an...@apache.org>
Authored: Fri Feb 6 12:50:56 2015 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Fri Feb 6 12:50:56 2015 +0000
----------------------------------------------------------------------
.../optimize/TestTransformConstantFolding.java | 18 +++++++++
jena-fuseki/fuseki | 15 +++++--
jena-fuseki2/apache-jena-fuseki/fuseki | 15 +++++--
.../src/main/webapp/dataset.html | 19 +++++----
jena-osgi/pom.xml | 42 ++++++++++++++++++++
5 files changed, 93 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/387bc73e/jena-fuseki/fuseki
----------------------------------------------------------------------
[45/50] [abbrv] jena git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/jena
Posted by rv...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/jena
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/6f427024
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/6f427024
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/6f427024
Branch: refs/heads/eliminate-assignments
Commit: 6f427024e24da295bfa993a86857012eb909d74f
Parents: 31dd899 beb73c4
Author: Andy Seaborne <an...@seaborne.org>
Authored: Sun Feb 15 18:26:41 2015 +0000
Committer: Andy Seaborne <an...@seaborne.org>
Committed: Sun Feb 15 18:26:41 2015 +0000
----------------------------------------------------------------------
.../security/example/ShiroExampleEvaluator.java | 86 +++++++++++++++++++-
.../jena/security/example/fuseki/config.ttl | 68 ++++++++++------
.../jena/security/example/fuseki/shiro.ini | 2 +-
3 files changed, 127 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
[40/50] [abbrv] jena git commit: Remove duplicate surefire plugin
Posted by rv...@apache.org.
Remove duplicate surefire plugin
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/3199dd10
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/3199dd10
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/3199dd10
Branch: refs/heads/eliminate-assignments
Commit: 3199dd1020e2f6ac06d49f2a230e5f9faad48382
Parents: 8388d25
Author: Andy Seaborne <an...@seaborne.org>
Authored: Wed Feb 11 12:09:27 2015 +0000
Committer: Andy Seaborne <an...@seaborne.org>
Committed: Wed Feb 11 12:09:27 2015 +0000
----------------------------------------------------------------------
apache-jena-osgi/jena-osgi-test/pom.xml | 29 +++-------------------------
1 file changed, 3 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/3199dd10/apache-jena-osgi/jena-osgi-test/pom.xml
----------------------------------------------------------------------
diff --git a/apache-jena-osgi/jena-osgi-test/pom.xml b/apache-jena-osgi/jena-osgi-test/pom.xml
index 499174b..3049d06 100644
--- a/apache-jena-osgi/jena-osgi-test/pom.xml
+++ b/apache-jena-osgi/jena-osgi-test/pom.xml
@@ -135,6 +135,7 @@ limitations under the License.
<build>
<plugins>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
@@ -150,6 +151,7 @@ limitations under the License.
</systemPropertyVariables>
</configuration>
</plugin>
+
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
@@ -185,33 +187,8 @@ limitations under the License.
</executions>
<configuration>
</configuration>
-
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <classpathDependencyExcludes>
- <classpathDependencyExclude>org.slf4j:slf4j-log4j12</classpathDependencyExclude>
- </classpathDependencyExcludes>
- <systemPropertyVariables>
- <!-- So the test can find the current version of jena-osgi -->
- <jena-osgi.version>${project.version}</jena-osgi.version>
- <!-- not so noisy OSGi logging -->
- <org.ops4j.pax.logging.DefaultServiceLog.level>WARN</org.ops4j.pax.logging.DefaultServiceLog.level>
- </systemPropertyVariables>
- </configuration>
- <executions>
- <execution>
- <id>default-test</id>
- <goals>
- <goal>test</goal>
- </goals>
- <!-- delay until integration-test phase -->
- <phase>integration-test</phase>
- </execution>
- </executions>
</plugin>
+
</plugins>
</build>
[11/50] [abbrv] jena git commit: JENA-879: No need for junit tests
interface JenaOSGITest under PAX
Posted by rv...@apache.org.
JENA-879: No need for junit tests interface JenaOSGITest under PAX
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/4d80d1f4
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/4d80d1f4
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/4d80d1f4
Branch: refs/heads/eliminate-assignments
Commit: 4d80d1f4ecdb396340138cbfd703ee11b8701920
Parents: ee787d2
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Mon Feb 2 23:45:45 2015 +0000
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Mon Feb 9 10:00:36 2015 +0000
----------------------------------------------------------------------
.../org/apache/jena/osgi/test/JenaOSGITest.java | 47 --------------------
.../apache/jena/osgi/test/JenaOSGITestImpl.java | 6 +--
2 files changed, 1 insertion(+), 52 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/4d80d1f4/apache-jena-osgi/jena-osgi-test/src/main/java/org/apache/jena/osgi/test/JenaOSGITest.java
----------------------------------------------------------------------
diff --git a/apache-jena-osgi/jena-osgi-test/src/main/java/org/apache/jena/osgi/test/JenaOSGITest.java b/apache-jena-osgi/jena-osgi-test/src/main/java/org/apache/jena/osgi/test/JenaOSGITest.java
deleted file mode 100644
index 79ffc72..0000000
--- a/apache-jena-osgi/jena-osgi-test/src/main/java/org/apache/jena/osgi/test/JenaOSGITest.java
+++ /dev/null
@@ -1,47 +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.osgi.test;
-
-import org.junit.Test;
-
-/**
- * OSGi service interface for test using osgi-testrunner-junit4
- * <p>
- * Junit annotations like @Test must be made here.
- * The implementation is in JenaOSGITestImpl, which is registered
- * with OSGi by JenaOSGIActiviator.
- *
- * @author stain
- *
- */
-public interface JenaOSGITest {
-
- @Test
- public void testJenaIRI() throws Exception;
-
- @Test
- public void testJenaCore() throws Exception;
-
- @Test
- public void testJenaArq() throws Exception;
-
- @Test
- public void testJenaTdb() throws Exception;
-
-}
http://git-wip-us.apache.org/repos/asf/jena/blob/4d80d1f4/apache-jena-osgi/jena-osgi-test/src/main/java/org/apache/jena/osgi/test/JenaOSGITestImpl.java
----------------------------------------------------------------------
diff --git a/apache-jena-osgi/jena-osgi-test/src/main/java/org/apache/jena/osgi/test/JenaOSGITestImpl.java b/apache-jena-osgi/jena-osgi-test/src/main/java/org/apache/jena/osgi/test/JenaOSGITestImpl.java
index 3674d53..cbdb324 100644
--- a/apache-jena-osgi/jena-osgi-test/src/main/java/org/apache/jena/osgi/test/JenaOSGITestImpl.java
+++ b/apache-jena-osgi/jena-osgi-test/src/main/java/org/apache/jena/osgi/test/JenaOSGITestImpl.java
@@ -60,7 +60,7 @@ import com.hp.hpl.jena.tdb.TDBFactory;
* -- otherwise it won't be picked up when testing inside OSGi
*
*/
-public class JenaOSGITestImpl implements JenaOSGITest {
+public class JenaOSGITestImpl {
private static final String EXAMPLE_COM_GRAPH = "http://example.com/graph";
private Resource alice;
@@ -68,7 +68,6 @@ public class JenaOSGITestImpl implements JenaOSGITest {
private Resource bob;
@Test
- @Override
public void testJenaCore() throws Exception {
Model model = makeModel();
@@ -108,7 +107,6 @@ public class JenaOSGITestImpl implements JenaOSGITest {
}
@Test
- @Override
public void testJenaArq() throws Exception {
Dataset dataset = DatasetFactory.createMem();
dataset.addNamedModel(EXAMPLE_COM_GRAPH, makeModel());
@@ -145,7 +143,6 @@ public class JenaOSGITestImpl implements JenaOSGITest {
}
@Test
- @Override
public void testJenaIRI() throws Exception {
IRIFactory iriFactory = IRIFactory.jenaImplementation();
IRI iri = iriFactory.create("http://example.com/");
@@ -153,7 +150,6 @@ public class JenaOSGITestImpl implements JenaOSGITest {
}
@Test
- @Override
public void testJenaTdb() throws Exception {
Path tdbDir = Files.createTempDirectory("jena-tdb-test");
Dataset dataset = TDBFactory.createDataset(tdbDir.toString());
[38/50] [abbrv] jena git commit: Another attempt to get the build
stable
Posted by rv...@apache.org.
Another attempt to get the build stable
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/ba7f141d
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/ba7f141d
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/ba7f141d
Branch: refs/heads/eliminate-assignments
Commit: ba7f141d927299baa37814e1313c6245f00ab126
Parents: aad04cf
Author: Andy Seaborne <an...@seaborne.org>
Authored: Wed Feb 11 11:48:14 2015 +0000
Committer: Andy Seaborne <an...@seaborne.org>
Committed: Wed Feb 11 11:48:14 2015 +0000
----------------------------------------------------------------------
apache-jena-osgi/jena-osgi-test/pom.xml | 19 +++++++++++++++----
1 file changed, 15 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/ba7f141d/apache-jena-osgi/jena-osgi-test/pom.xml
----------------------------------------------------------------------
diff --git a/apache-jena-osgi/jena-osgi-test/pom.xml b/apache-jena-osgi/jena-osgi-test/pom.xml
index 1777bab..e7e8bc1 100644
--- a/apache-jena-osgi/jena-osgi-test/pom.xml
+++ b/apache-jena-osgi/jena-osgi-test/pom.xml
@@ -21,10 +21,10 @@ limitations under the License.
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.jena</groupId>
- <artifactId>apache-jena-osgi</artifactId>
- <version>2.13.0-SNAPSHOT</version>
- <relativePath>..</relativePath>
- </parent>
+ <artifactId>jena-parent</artifactId>
+ <version>12-SNAPSHOT</version>
+ <relativePath>../../jena-parent</relativePath>
+ </parent>
<artifactId>jena-osgi-test</artifactId>
<version>2.13.0-SNAPSHOT</version>
@@ -39,6 +39,16 @@ limitations under the License.
<pax.logging.version>1.8.1</pax.logging.version>
</properties>
+ <repositories>
+ <repository>
+ <id>apache.snapshots</id>
+ <name>Apache Snapshot Repository</name>
+ <url>http://repository.apache.org/snapshots</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ </repository>
+ </repositories>
<dependencies>
<dependency>
@@ -201,6 +211,7 @@ limitations under the License.
<phase>integration-test</phase>
</execution>
</executions>
+ -->
</plugin>
</plugins>
</build>
[26/50] [abbrv] jena git commit: This closes #25
Posted by rv...@apache.org.
This closes #25
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/f76fb8df
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/f76fb8df
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/f76fb8df
Branch: refs/heads/eliminate-assignments
Commit: f76fb8dfdb1097f02e4a55f555cf918d0bdc45a9
Parents: 91507a8
Author: Andy Seaborne <an...@seaborne.org>
Authored: Mon Feb 9 22:07:34 2015 +0000
Committer: Andy Seaborne <an...@seaborne.org>
Committed: Mon Feb 9 22:07:34 2015 +0000
----------------------------------------------------------------------
----------------------------------------------------------------------
[30/50] [abbrv] jena git commit: Look up jena-osgi version through
system property
Posted by rv...@apache.org.
Look up jena-osgi version through system property
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/dc540f9f
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/dc540f9f
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/dc540f9f
Branch: refs/heads/eliminate-assignments
Commit: dc540f9fcac76c5af1c7b7e060f22a879c29285e
Parents: 7279de4
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Tue Feb 10 11:59:52 2015 +0000
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Tue Feb 10 11:59:52 2015 +0000
----------------------------------------------------------------------
.../org/apache/jena/osgi/test/JenaOSGITest.java | 22 ++++++--------------
1 file changed, 6 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/dc540f9f/apache-jena-osgi/jena-osgi-test/src/test/java/org/apache/jena/osgi/test/JenaOSGITest.java
----------------------------------------------------------------------
diff --git a/apache-jena-osgi/jena-osgi-test/src/test/java/org/apache/jena/osgi/test/JenaOSGITest.java b/apache-jena-osgi/jena-osgi-test/src/test/java/org/apache/jena/osgi/test/JenaOSGITest.java
index 4a8c1e2..86c03bc 100644
--- a/apache-jena-osgi/jena-osgi-test/src/test/java/org/apache/jena/osgi/test/JenaOSGITest.java
+++ b/apache-jena-osgi/jena-osgi-test/src/test/java/org/apache/jena/osgi/test/JenaOSGITest.java
@@ -80,25 +80,15 @@ public class JenaOSGITest {
@Configuration
public Option[] config() {
return options(
-// bootDelegationPackages("sun.*",
-// "com.sun.*",
-// "java.*",
-// "javax.*",
-// "javax.net.ssl"),
- // In PAX we have to list transitive dependencies
- // manually. See ../jena-osgi/pom.xml
- // for dependencies that are NOT in <scope>provided</scope>
- // (luckily the version numbers are picked up!)
- // Error starting bundle slf4j.log4j12. Fragment bundles can not be started.
- //linkBundle("slf4j.log4j12"),
- //linkBundle("slf4j.api"),
- // Not sure if this is a Felix problem or what..
- // Instead we'll use:
+ // bundle with org.slf4j implementation
linkBundle("org.ops4j.pax.logging.pax-logging-log4j2"),
linkBundle("org.ops4j.pax.logging.pax-logging-api"),
-
- mavenBundle("org.apache.jena", "jena-osgi"),
+ // jena-osgi
+ mavenBundle("org.apache.jena", "jena-osgi",
+ System.getProperty("jena-osgi.version", "LATEST")),
+
+ // dependencies of jena-osgi
linkBundle("org.apache.httpcomponents.httpclient"),
linkBundle("org.apache.httpcomponents.httpcore"),
linkBundle("com.github.jsonld-java"),
[17/50] [abbrv] jena git commit: Use forked configuration to avoid
classpath leakage
Posted by rv...@apache.org.
Use forked configuration to avoid classpath leakage
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/08229262
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/08229262
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/08229262
Branch: refs/heads/eliminate-assignments
Commit: 082292628552099b730abd7e183a90eb8c4dbb31
Parents: 778adac
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Tue Feb 3 00:09:53 2015 +0000
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Mon Feb 9 10:03:55 2015 +0000
----------------------------------------------------------------------
apache-jena-osgi/jena-osgi-test/pom.xml | 4 +++-
.../src/test/java/org/apache/jena/osgi/test/JenaOSGITest.java | 5 +++++
2 files changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/08229262/apache-jena-osgi/jena-osgi-test/pom.xml
----------------------------------------------------------------------
diff --git a/apache-jena-osgi/jena-osgi-test/pom.xml b/apache-jena-osgi/jena-osgi-test/pom.xml
index 2dc1214..4af90b7 100644
--- a/apache-jena-osgi/jena-osgi-test/pom.xml
+++ b/apache-jena-osgi/jena-osgi-test/pom.xml
@@ -52,11 +52,13 @@
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
- <artifactId>pax-exam-container-native</artifactId>
+ <!-- One of: -forked -native -paxrunner -->
+ <artifactId>pax-exam-container-forked</artifactId>
<version>${exam.version}</version>
<scope>test</scope>
</dependency>
+
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-junit4</artifactId>
http://git-wip-us.apache.org/repos/asf/jena/blob/08229262/apache-jena-osgi/jena-osgi-test/src/test/java/org/apache/jena/osgi/test/JenaOSGITest.java
----------------------------------------------------------------------
diff --git a/apache-jena-osgi/jena-osgi-test/src/test/java/org/apache/jena/osgi/test/JenaOSGITest.java b/apache-jena-osgi/jena-osgi-test/src/test/java/org/apache/jena/osgi/test/JenaOSGITest.java
index 3d93bf1..324463d 100644
--- a/apache-jena-osgi/jena-osgi-test/src/test/java/org/apache/jena/osgi/test/JenaOSGITest.java
+++ b/apache-jena-osgi/jena-osgi-test/src/test/java/org/apache/jena/osgi/test/JenaOSGITest.java
@@ -76,6 +76,11 @@ public class JenaOSGITest {
@Configuration
public Option[] config() {
return options(
+ bootDelegationPackages("sun.*",
+ "com.sun.*",
+ "java.*",
+ "javax.*",
+ "javax.net.ssl"),
mavenBundle("org.apache.jena", "jena-osgi"),
junitBundles());
}
[22/50] [abbrv] jena git commit: JENA-879: Optional way to test with
eclipse equinox
Posted by rv...@apache.org.
JENA-879: Optional way to test with eclipse equinox
(NOTE: testing with both at the same time
kindof works, but shows confusing errors
from equinox)
)
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/471b2876
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/471b2876
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/471b2876
Branch: refs/heads/eliminate-assignments
Commit: 471b287684092b642bbb8c54dbefec7b3730a76e
Parents: a7bf9cb
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Tue Feb 3 11:31:10 2015 +0000
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Mon Feb 9 10:03:57 2015 +0000
----------------------------------------------------------------------
apache-jena-osgi/jena-osgi-test/pom.xml | 10 ++++++++++
1 file changed, 10 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/471b2876/apache-jena-osgi/jena-osgi-test/pom.xml
----------------------------------------------------------------------
diff --git a/apache-jena-osgi/jena-osgi-test/pom.xml b/apache-jena-osgi/jena-osgi-test/pom.xml
index 5745179..faef3ac 100644
--- a/apache-jena-osgi/jena-osgi-test/pom.xml
+++ b/apache-jena-osgi/jena-osgi-test/pom.xml
@@ -99,12 +99,22 @@
<scope>test</scope>
</dependency>
+ <!-- OSGi Framework -->
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.framework</artifactId>
<version>${felix.version}</version>
<scope>test</scope>
</dependency>
+ <!-- or..
+ <dependency>
+ <groupId>org.eclipse</groupId>
+ <artifactId>osgi</artifactId>
+ <version>3.9.1-v20140110-1610</version>
+ <scope>test</scope>
+ </dependency>
+ -->
+
</dependencies>
[13/50] [abbrv] jena git commit: JENA-879: JenaOSGITestImpl renamed
to JenaOSGITest
Posted by rv...@apache.org.
JENA-879: JenaOSGITestImpl renamed to JenaOSGITest
javadoc updated
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/85354695
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/85354695
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/85354695
Branch: refs/heads/eliminate-assignments
Commit: 85354695ad87e949c1613a54529fff921451a7e9
Parents: 4d80d1f
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Mon Feb 2 23:47:19 2015 +0000
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Mon Feb 9 10:02:07 2015 +0000
----------------------------------------------------------------------
.../org/apache/jena/osgi/test/JenaOSGITest.java | 162 ++++++++++++++++++
.../apache/jena/osgi/test/JenaOSGITestImpl.java | 166 -------------------
2 files changed, 162 insertions(+), 166 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/85354695/apache-jena-osgi/jena-osgi-test/src/main/java/org/apache/jena/osgi/test/JenaOSGITest.java
----------------------------------------------------------------------
diff --git a/apache-jena-osgi/jena-osgi-test/src/main/java/org/apache/jena/osgi/test/JenaOSGITest.java b/apache-jena-osgi/jena-osgi-test/src/main/java/org/apache/jena/osgi/test/JenaOSGITest.java
new file mode 100644
index 0000000..fd179eb
--- /dev/null
+++ b/apache-jena-osgi/jena-osgi-test/src/main/java/org/apache/jena/osgi/test/JenaOSGITest.java
@@ -0,0 +1,162 @@
+/*
+ * 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.osgi.test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.io.OutputStream;
+import java.io.StringWriter;
+import java.io.Writer;
+import java.nio.file.Files;
+import java.nio.file.Path;
+
+import org.apache.jena.iri.IRI;
+import org.apache.jena.iri.IRIFactory;
+import org.apache.jena.riot.Lang;
+import org.apache.jena.riot.RDFDataMgr;
+import org.junit.Test;
+
+import com.hp.hpl.jena.ontology.Individual;
+import com.hp.hpl.jena.ontology.ObjectProperty;
+import com.hp.hpl.jena.ontology.OntModel;
+import com.hp.hpl.jena.ontology.OntModelSpec;
+import com.hp.hpl.jena.query.Dataset;
+import com.hp.hpl.jena.query.DatasetFactory;
+import com.hp.hpl.jena.query.Query;
+import com.hp.hpl.jena.query.QueryExecution;
+import com.hp.hpl.jena.query.QueryExecutionFactory;
+import com.hp.hpl.jena.query.QueryFactory;
+import com.hp.hpl.jena.query.QuerySolution;
+import com.hp.hpl.jena.query.ReadWrite;
+import com.hp.hpl.jena.query.ResultSet;
+import com.hp.hpl.jena.rdf.model.Model;
+import com.hp.hpl.jena.rdf.model.ModelFactory;
+import com.hp.hpl.jena.rdf.model.Property;
+import com.hp.hpl.jena.rdf.model.Resource;
+import com.hp.hpl.jena.tdb.TDBFactory;
+
+/**
+ * Brief tests of the Jena modules covered by jena-osgi
+ *
+ */
+public class JenaOSGITest {
+
+ private static final String EXAMPLE_COM_GRAPH = "http://example.com/graph";
+ private Resource alice;
+ private Property knows;
+ private Resource bob;
+
+ @Test
+ public void testJenaCore() throws Exception {
+ Model model = makeModel();
+
+ // Does Model's Class.forName() still work?
+ model.setWriterClassName("someWriter",
+ "com.hp.hpl.jena.rdf.model.impl.NTripleWriter");
+ Writer writer = new StringWriter();
+ model.write(writer, "someWriter");
+ // yes, but only as long as that classname is accessible within
+ // jena-osgi bundle
+ assertEquals(
+ "<http://example.com/alice> <http://xmlns.com/foaf/0.1/knows> <http://example.com/bob> .",
+ writer.toString().trim());
+
+ // Let's also test com.hp.hpl.jena.ontology
+ OntModel ontModel = ModelFactory
+ .createOntologyModel(OntModelSpec.OWL_DL_MEM_RULE_INF);
+ ObjectProperty knowsObjProp = ontModel.createObjectProperty(knows
+ .getURI());
+ ObjectProperty hasFriend = ontModel
+ .createObjectProperty("http://example.com/has_friend");
+ hasFriend.addSuperProperty(knowsObjProp);
+
+ Individual aliceIndividual = ontModel.createIndividual(alice);
+ Individual bobIndividiual = ontModel.createIndividual(bob);
+ ontModel.add(aliceIndividual, hasFriend, bobIndividiual);
+ assertTrue(aliceIndividual.hasProperty(knowsObjProp, bobIndividiual));
+ }
+
+ private Model makeModel() {
+ Model model = ModelFactory.createDefaultModel();
+ alice = model.createResource("http://example.com/alice");
+ knows = model.createProperty("http://xmlns.com/foaf/0.1/knows");
+ bob = model.createResource("http://example.com/bob");
+ model.add(model.createStatement(alice, knows, bob));
+ return model;
+ }
+
+ @Test
+ public void testJenaArq() throws Exception {
+ Dataset dataset = DatasetFactory.createMem();
+ dataset.addNamedModel(EXAMPLE_COM_GRAPH, makeModel());
+
+ Path path = Files.createTempFile("example", ".jsonld");
+ // System.out.println(path);
+ path.toFile().deleteOnExit();
+
+ try (OutputStream output = Files.newOutputStream(path)) {
+ RDFDataMgr.write(output, dataset, Lang.JSONLD);
+ }
+ // We test JSON-LD as it involves multiple other bundles
+
+ Dataset dataset2 = RDFDataMgr.loadDataset(path.toUri().toString());
+ assertTrue(dataset2.containsNamedModel(EXAMPLE_COM_GRAPH));
+
+ runQuery(dataset2);
+
+ }
+
+ private void runQuery(Dataset dataset) {
+ Query query = QueryFactory.create(""
+ + "PREFIX foaf: <http://xmlns.com/foaf/0.1/>"
+ + "SELECT ?bob WHERE { "
+ + " GRAPH <http://example.com/graph> { "
+ + " ?alice foaf:knows ?bob . " + " }" + "}");
+ try (QueryExecution qexec = QueryExecutionFactory.create(query,
+ dataset)) {
+ ResultSet results = qexec.execSelect();
+ assertTrue(results.hasNext());
+ QuerySolution r = results.next();
+ assertEquals(bob, r.get("bob").asResource());
+ }
+ }
+
+ @Test
+ public void testJenaIRI() throws Exception {
+ IRIFactory iriFactory = IRIFactory.jenaImplementation();
+ IRI iri = iriFactory.create("http://example.com/");
+ assertEquals("http://example.com/", iri.toASCIIString());
+ }
+
+ @Test
+ public void testJenaTdb() throws Exception {
+ Path tdbDir = Files.createTempDirectory("jena-tdb-test");
+ Dataset dataset = TDBFactory.createDataset(tdbDir.toString());
+
+ dataset.begin(ReadWrite.WRITE) ;
+ dataset.addNamedModel(EXAMPLE_COM_GRAPH, makeModel());
+ dataset.commit();
+ dataset.end();
+
+ dataset.begin(ReadWrite.READ);
+ runQuery(dataset);
+ dataset.end();
+ }
+}
http://git-wip-us.apache.org/repos/asf/jena/blob/85354695/apache-jena-osgi/jena-osgi-test/src/main/java/org/apache/jena/osgi/test/JenaOSGITestImpl.java
----------------------------------------------------------------------
diff --git a/apache-jena-osgi/jena-osgi-test/src/main/java/org/apache/jena/osgi/test/JenaOSGITestImpl.java b/apache-jena-osgi/jena-osgi-test/src/main/java/org/apache/jena/osgi/test/JenaOSGITestImpl.java
deleted file mode 100644
index cbdb324..0000000
--- a/apache-jena-osgi/jena-osgi-test/src/main/java/org/apache/jena/osgi/test/JenaOSGITestImpl.java
+++ /dev/null
@@ -1,166 +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.osgi.test;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import java.io.OutputStream;
-import java.io.StringWriter;
-import java.io.Writer;
-import java.nio.file.Files;
-import java.nio.file.Path;
-
-import org.apache.jena.iri.IRI;
-import org.apache.jena.iri.IRIFactory;
-import org.apache.jena.riot.Lang;
-import org.apache.jena.riot.RDFDataMgr;
-import org.junit.Test;
-
-import com.hp.hpl.jena.ontology.Individual;
-import com.hp.hpl.jena.ontology.ObjectProperty;
-import com.hp.hpl.jena.ontology.OntModel;
-import com.hp.hpl.jena.ontology.OntModelSpec;
-import com.hp.hpl.jena.query.Dataset;
-import com.hp.hpl.jena.query.DatasetFactory;
-import com.hp.hpl.jena.query.Query;
-import com.hp.hpl.jena.query.QueryExecution;
-import com.hp.hpl.jena.query.QueryExecutionFactory;
-import com.hp.hpl.jena.query.QueryFactory;
-import com.hp.hpl.jena.query.QuerySolution;
-import com.hp.hpl.jena.query.ReadWrite;
-import com.hp.hpl.jena.query.ResultSet;
-import com.hp.hpl.jena.rdf.model.Model;
-import com.hp.hpl.jena.rdf.model.ModelFactory;
-import com.hp.hpl.jena.rdf.model.Property;
-import com.hp.hpl.jena.rdf.model.Resource;
-import com.hp.hpl.jena.tdb.TDBFactory;
-
-/**
- * Brief tests of the Jena modules covered by jena-osgi
- * <p>
- * Do NOT add tests to this class without also adding a
- * \@Test-annotated method to the interface JenaOSGITest
- * -- otherwise it won't be picked up when testing inside OSGi
- *
- */
-public class JenaOSGITestImpl {
-
- private static final String EXAMPLE_COM_GRAPH = "http://example.com/graph";
- private Resource alice;
- private Property knows;
- private Resource bob;
-
- @Test
- public void testJenaCore() throws Exception {
- Model model = makeModel();
-
- // Does Model's Class.forName() still work?
- model.setWriterClassName("someWriter",
- "com.hp.hpl.jena.rdf.model.impl.NTripleWriter");
- Writer writer = new StringWriter();
- model.write(writer, "someWriter");
- // yes, but only as long as that classname is accessible within
- // jena-osgi bundle
- assertEquals(
- "<http://example.com/alice> <http://xmlns.com/foaf/0.1/knows> <http://example.com/bob> .",
- writer.toString().trim());
-
- // Let's also test com.hp.hpl.jena.ontology
- OntModel ontModel = ModelFactory
- .createOntologyModel(OntModelSpec.OWL_DL_MEM_RULE_INF);
- ObjectProperty knowsObjProp = ontModel.createObjectProperty(knows
- .getURI());
- ObjectProperty hasFriend = ontModel
- .createObjectProperty("http://example.com/has_friend");
- hasFriend.addSuperProperty(knowsObjProp);
-
- Individual aliceIndividual = ontModel.createIndividual(alice);
- Individual bobIndividiual = ontModel.createIndividual(bob);
- ontModel.add(aliceIndividual, hasFriend, bobIndividiual);
- assertTrue(aliceIndividual.hasProperty(knowsObjProp, bobIndividiual));
- }
-
- private Model makeModel() {
- Model model = ModelFactory.createDefaultModel();
- alice = model.createResource("http://example.com/alice");
- knows = model.createProperty("http://xmlns.com/foaf/0.1/knows");
- bob = model.createResource("http://example.com/bob");
- model.add(model.createStatement(alice, knows, bob));
- return model;
- }
-
- @Test
- public void testJenaArq() throws Exception {
- Dataset dataset = DatasetFactory.createMem();
- dataset.addNamedModel(EXAMPLE_COM_GRAPH, makeModel());
-
- Path path = Files.createTempFile("example", ".jsonld");
- // System.out.println(path);
- path.toFile().deleteOnExit();
-
- try (OutputStream output = Files.newOutputStream(path)) {
- RDFDataMgr.write(output, dataset, Lang.JSONLD);
- }
- // We test JSON-LD as it involves multiple other bundles
-
- Dataset dataset2 = RDFDataMgr.loadDataset(path.toUri().toString());
- assertTrue(dataset2.containsNamedModel(EXAMPLE_COM_GRAPH));
-
- runQuery(dataset2);
-
- }
-
- private void runQuery(Dataset dataset) {
- Query query = QueryFactory.create(""
- + "PREFIX foaf: <http://xmlns.com/foaf/0.1/>"
- + "SELECT ?bob WHERE { "
- + " GRAPH <http://example.com/graph> { "
- + " ?alice foaf:knows ?bob . " + " }" + "}");
- try (QueryExecution qexec = QueryExecutionFactory.create(query,
- dataset)) {
- ResultSet results = qexec.execSelect();
- assertTrue(results.hasNext());
- QuerySolution r = results.next();
- assertEquals(bob, r.get("bob").asResource());
- }
- }
-
- @Test
- public void testJenaIRI() throws Exception {
- IRIFactory iriFactory = IRIFactory.jenaImplementation();
- IRI iri = iriFactory.create("http://example.com/");
- assertEquals("http://example.com/", iri.toASCIIString());
- }
-
- @Test
- public void testJenaTdb() throws Exception {
- Path tdbDir = Files.createTempDirectory("jena-tdb-test");
- Dataset dataset = TDBFactory.createDataset(tdbDir.toString());
-
- dataset.begin(ReadWrite.WRITE) ;
- dataset.addNamedModel(EXAMPLE_COM_GRAPH, makeModel());
- dataset.commit();
- dataset.end();
-
- dataset.begin(ReadWrite.READ);
- runQuery(dataset);
- dataset.end();
- }
-}
[34/50] [abbrv] jena git commit: jena-osgi-test compile+test only in
integration phase
Posted by rv...@apache.org.
jena-osgi-test compile+test only in integration phase
.. avoids compile errors on "mvn clean test"
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/61ea8ee5
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/61ea8ee5
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/61ea8ee5
Branch: refs/heads/eliminate-assignments
Commit: 61ea8ee594f1ec117ec6b68872284d94deccc725
Parents: 1877833
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Tue Feb 10 13:15:50 2015 +0000
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Tue Feb 10 15:16:41 2015 +0000
----------------------------------------------------------------------
apache-jena-osgi/jena-osgi-test/pom.xml | 42 ++++++++++++++++++++++++++++
1 file changed, 42 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/61ea8ee5/apache-jena-osgi/jena-osgi-test/pom.xml
----------------------------------------------------------------------
diff --git a/apache-jena-osgi/jena-osgi-test/pom.xml b/apache-jena-osgi/jena-osgi-test/pom.xml
index c0bc922..80d2b63 100644
--- a/apache-jena-osgi/jena-osgi-test/pom.xml
+++ b/apache-jena-osgi/jena-osgi-test/pom.xml
@@ -160,6 +160,48 @@ limitations under the License.
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <executions>
+ <execution>
+ <!-- delay test compilation until pre-integration-test phase -->
+ <id>default-testCompile</id>
+ <goals>
+ <goal>testCompile</goal>
+ </goals>
+ <phase>pre-integration-test</phase>
+ </execution>
+ </executions>
+ <configuration>
+ </configuration>
+
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <classpathDependencyExcludes>
+ <classpathDependencyExclude>org.slf4j:slf4j-log4j12</classpathDependencyExclude>
+ </classpathDependencyExcludes>
+ <systemPropertyVariables>
+ <!-- So the test can find the current version of jena-osgi -->
+ <jena-osgi.version>${project.version}</jena-osgi.version>
+ <!-- not so noisy OSGi logging -->
+ <org.ops4j.pax.logging.DefaultServiceLog.level>WARN</org.ops4j.pax.logging.DefaultServiceLog.level>
+ </systemPropertyVariables>
+ </configuration>
+ <executions>
+ <execution>
+ <id>default-test</id>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <!-- delay until integration-test phase -->
+ <phase>integration-test</phase>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
[25/50] [abbrv] jena git commit: no bundle-activator anymore
Posted by rv...@apache.org.
no bundle-activator anymore
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/91507a8a
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/91507a8a
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/91507a8a
Branch: refs/heads/eliminate-assignments
Commit: 91507a8a18b2d3e96e7fd7afe62a1fa6dbf8edd6
Parents: 3915a93
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Mon Feb 9 10:05:55 2015 +0000
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Mon Feb 9 10:05:55 2015 +0000
----------------------------------------------------------------------
apache-jena-osgi/jena-osgi-test/pom.xml | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/91507a8a/apache-jena-osgi/jena-osgi-test/pom.xml
----------------------------------------------------------------------
diff --git a/apache-jena-osgi/jena-osgi-test/pom.xml b/apache-jena-osgi/jena-osgi-test/pom.xml
index ac7e2c4..5d46020 100644
--- a/apache-jena-osgi/jena-osgi-test/pom.xml
+++ b/apache-jena-osgi/jena-osgi-test/pom.xml
@@ -132,7 +132,6 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <Bundle-Activator>org.apache.jena.osgi.test.JenaOSGITestActivator</Bundle-Activator>
<!-- <Import-Package>com.hp.hpl.jena</Import-Package> -->
<!-- <Embed-Dependency>artifactId=jena-core;inline=true</Embed-Dependency> -->
</instructions>
[48/50] [abbrv] jena git commit: Few minor improvements to Elephas
stats demo
Posted by rv...@apache.org.
Few minor improvements to Elephas stats demo
- If zero arguments are passed show the usage summary
- Upgrade airline to latest version which gives improved built-in help
- Consistency corrections to long form options
- Minor typos in option descriptions
- Typo in command description
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/00ff8780
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/00ff8780
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/00ff8780
Branch: refs/heads/eliminate-assignments
Commit: 00ff87809c5dc0bfc61fe4993aceff628c75c3c0
Parents: 49fe906
Author: Rob Vesse <rv...@apache.org>
Authored: Tue Feb 17 12:17:47 2015 +0000
Committer: Rob Vesse <rv...@apache.org>
Committed: Tue Feb 17 12:17:47 2015 +0000
----------------------------------------------------------------------
.../java/org/apache/jena/hadoop/rdf/stats/RdfStats.java | 12 ++++++++----
jena-elephas/pom.xml | 2 +-
2 files changed, 9 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/00ff8780/jena-elephas/jena-elephas-stats/src/main/java/org/apache/jena/hadoop/rdf/stats/RdfStats.java
----------------------------------------------------------------------
diff --git a/jena-elephas/jena-elephas-stats/src/main/java/org/apache/jena/hadoop/rdf/stats/RdfStats.java b/jena-elephas/jena-elephas-stats/src/main/java/org/apache/jena/hadoop/rdf/stats/RdfStats.java
index e31c801..3c9e896 100644
--- a/jena-elephas/jena-elephas-stats/src/main/java/org/apache/jena/hadoop/rdf/stats/RdfStats.java
+++ b/jena-elephas/jena-elephas-stats/src/main/java/org/apache/jena/hadoop/rdf/stats/RdfStats.java
@@ -49,7 +49,7 @@ import org.apache.jena.hadoop.rdf.stats.jobs.JobFactory;
* Entry point for the Hadoop job, handles launching all the relevant Hadoop
* jobs
*/
-@Command(name = "bin/hadoop jar PATH_TO_JAR com.yarcdata.urika.hadoop.rdf.stats.RdfStats", description = "A command which computes statistics on RDF data using Hadoop")
+@Command(name = "hadoop jar PATH_TO_JAR org.apache.jena.hadoop.rdf.stats.RdfStats", description = "A command which computes statistics on RDF data using Hadoop")
public class RdfStats implements Tool {
static final String ANSI_RED = "\u001B[31m";
@@ -84,7 +84,7 @@ public class RdfStats implements Tool {
/**
* Gets/Sets whether type counts will be calculated
*/
- @Option(name = { "-t", "--type-counts" }, description = "Requests that rdf:type usage counts be calculated")
+ @Option(name = { "-t", "--type-count" }, description = "Requests that rdf:type usage counts be calculated")
public boolean typeCount = false;
/**
@@ -105,7 +105,7 @@ public class RdfStats implements Tool {
/**
* Gets/Sets the input data type used
*/
- @Option(name = { "--input-type" }, allowedValues = { DATA_TYPE_MIXED, DATA_TYPE_QUADS, DATA_TYPE_TRIPLES }, description = "Specifies whether the input data is a mixture of quads and triples, just quads or just triples. Using the most specific data type will yield the most accurrate statistics")
+ @Option(name = { "--input-type" }, allowedValues = { DATA_TYPE_MIXED, DATA_TYPE_QUADS, DATA_TYPE_TRIPLES }, description = "Specifies whether the input data is a mixture of quads and triples, just quads or just triples. Using the most specific data type will yield the most accurate statistics")
public String inputType = DATA_TYPE_MIXED;
/**
@@ -165,12 +165,16 @@ public class RdfStats implements Tool {
@Override
public int run(String[] args) throws Exception {
try {
+ if (args.length == 0) {
+ showUsage();
+ }
+
// Parse custom arguments
RdfStats cmd = SingleCommand.singleCommand(RdfStats.class).parse(args);
// Copy Hadoop configuration across
cmd.setConf(this.getConf());
-
+
// Show help if requested and exit with success
if (cmd.helpOption.showHelpIfRequested()) {
return 0;
http://git-wip-us.apache.org/repos/asf/jena/blob/00ff8780/jena-elephas/pom.xml
----------------------------------------------------------------------
diff --git a/jena-elephas/pom.xml b/jena-elephas/pom.xml
index 4d82b5f..eecaebc 100644
--- a/jena-elephas/pom.xml
+++ b/jena-elephas/pom.xml
@@ -38,7 +38,7 @@
<arq.version>2.13.0-SNAPSHOT</arq.version>
<junit.version>4.11</junit.version>
<mrunit.version>1.0.0</mrunit.version>
- <airline.version>0.8</airline.version>
+ <airline.version>0.9.1</airline.version>
</properties>
<!-- Profiles to allow building for different Hadoop versions -->
[02/50] [abbrv] jena git commit: JENA-881 : Don't leak filter
expressions into the unplaced list.
Posted by rv...@apache.org.
JENA-881 : Don't leak filter expressions into the unplaced list.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/4f5fd491
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/4f5fd491
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/4f5fd491
Branch: refs/heads/eliminate-assignments
Commit: 4f5fd491949127be1d4584df8444d1c4ac8772b5
Parents: 387bc73
Author: Andy Seaborne <an...@apache.org>
Authored: Sat Feb 7 12:37:02 2015 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Sat Feb 7 12:37:02 2015 +0000
----------------------------------------------------------------------
.../optimize/TransformFilterPlacement.java | 34 +++++++++++++-------
1 file changed, 23 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/4f5fd491/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/optimize/TransformFilterPlacement.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/optimize/TransformFilterPlacement.java b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/optimize/TransformFilterPlacement.java
index 023b03c..435d787 100644
--- a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/optimize/TransformFilterPlacement.java
+++ b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/optimize/TransformFilterPlacement.java
@@ -210,7 +210,6 @@ public class TransformFilterPlacement extends TransformCopy {
placement = placeAssign(exprs, (OpAssign)input) ;
// Modifiers
// else if ( input instanceof OpGroup ) {
-// // TODO
// placement = noChangePlacement ;
// }
// else if ( input instanceof OpSlice ) {
@@ -233,16 +232,29 @@ public class TransformFilterPlacement extends TransformCopy {
}
private Placement placeFilter(ExprList exprs, OpFilter input) {
- if ( exprs.size() == 0 )
- // Unpack the filter,
- return transform(input.getExprs(), input.getSubOp()) ;
-
- // Thrown the filter expressions into the general list to be placed.
- // Add to keep the application order (original filter then additional exprs)
- // Not important, but nice.
- ExprList exprs2 = ExprList.copy(input.getExprs()) ;
- exprs2.addAll(exprs);
- return transform(exprs2, input.getSubOp()) ;
+ // If input.getSubOp is itself a filter, it has already been
+ // processed because the Transform is applied bottom-up.
+
+ // We must not let the filter's expressions go back as "unplaced"
+ // as they are scoped to the input and if "unplaced" are available
+ // out of that scope.
+
+ Op op = input.getSubOp() ;
+ ExprList exprsInner = input.getExprs() ;
+ ExprList exprsOuter = exprs ;
+
+ // Outer
+ Placement p = transform(exprsOuter, input.getSubOp()) ;
+ if ( p != null ) {
+ op = p.op ;
+ exprsOuter = p.unplaced ;
+ }
+ // Put inner round the modified Op.
+ // If op is also a filter, a single filter is created with
+ // exprsInner now after placed filters.
+ // ("after" means later in the exprList of the filter).
+ Op f = OpFilter.filter(exprsInner, op) ;
+ return new Placement(f, exprsOuter) ;
}
private Placement placeOrWrapBGP(ExprList exprs, OpBGP x) {
[18/50] [abbrv] jena git commit: JENA-879: using linkBundle and newer
dependencies
Posted by rv...@apache.org.
JENA-879: using linkBundle and newer dependencies
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/f0d31e5d
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/f0d31e5d
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/f0d31e5d
Branch: refs/heads/eliminate-assignments
Commit: f0d31e5d1cdc3cc939dbbacf0826a4cf347619ad
Parents: 9f6e947
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Tue Feb 3 01:22:08 2015 +0000
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Mon Feb 9 10:03:56 2015 +0000
----------------------------------------------------------------------
apache-jena-osgi/jena-osgi-test/pom.xml | 26 ++++++++++++--
.../org/apache/jena/osgi/test/JenaOSGITest.java | 37 ++++++++++----------
2 files changed, 42 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/f0d31e5d/apache-jena-osgi/jena-osgi-test/pom.xml
----------------------------------------------------------------------
diff --git a/apache-jena-osgi/jena-osgi-test/pom.xml b/apache-jena-osgi/jena-osgi-test/pom.xml
index 127fc8d..e2dd66a 100644
--- a/apache-jena-osgi/jena-osgi-test/pom.xml
+++ b/apache-jena-osgi/jena-osgi-test/pom.xml
@@ -28,8 +28,9 @@
<properties>
<!-- https://ops4j1.jira.com/wiki/display/PAXEXAM4/OSGi+Containers -->
- <exam.version>3.4.0</exam.version>
+ <exam.version>4.4.0</exam.version>
<url.version>1.6.0</url.version>
+ <felix.version>4.6.0</felix.version>
</properties>
<dependencies>
@@ -38,6 +39,13 @@
<artifactId>jena-osgi</artifactId>
<version>${project.version}</version>
<type>bundle</type>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>5.0.0</version>
</dependency>
<dependency>
@@ -79,7 +87,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.framework</artifactId>
- <version>3.2.2</version>
+ <version>${felix.version}</version>
<scope>test</scope>
</dependency>
@@ -104,6 +112,20 @@
</instructions>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>exam-maven-plugin</artifactId>
+ <version>${exam.version}</version>
+ <executions>
+ <execution>
+ <id>generate-config</id>
+ <goals>
+ <goal>generate-link-files</goal>
+ </goals>
+ <phase>generate-test-resources</phase>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/jena/blob/f0d31e5d/apache-jena-osgi/jena-osgi-test/src/test/java/org/apache/jena/osgi/test/JenaOSGITest.java
----------------------------------------------------------------------
diff --git a/apache-jena-osgi/jena-osgi-test/src/test/java/org/apache/jena/osgi/test/JenaOSGITest.java b/apache-jena-osgi/jena-osgi-test/src/test/java/org/apache/jena/osgi/test/JenaOSGITest.java
index e20ecc5..4ce41b0 100644
--- a/apache-jena-osgi/jena-osgi-test/src/test/java/org/apache/jena/osgi/test/JenaOSGITest.java
+++ b/apache-jena-osgi/jena-osgi-test/src/test/java/org/apache/jena/osgi/test/JenaOSGITest.java
@@ -20,8 +20,8 @@ package org.apache.jena.osgi.test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-import static org.ops4j.pax.exam.CoreOptions.bootDelegationPackages;
import static org.ops4j.pax.exam.CoreOptions.junitBundles;
+import static org.ops4j.pax.exam.CoreOptions.linkBundle;
import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
import static org.ops4j.pax.exam.CoreOptions.options;
@@ -40,6 +40,7 @@ import org.apache.jena.riot.RDFDataMgr;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.CoreOptions;
import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
@@ -70,7 +71,6 @@ import com.hp.hpl.jena.tdb.TDBFactory;
*
*/
@RunWith(PaxExam.class)
-// Restart OSGi framework PerClass or PerMethod ?
@ExamReactorStrategy(PerClass.class)
public class JenaOSGITest {
@@ -80,27 +80,26 @@ public class JenaOSGITest {
@Configuration
public Option[] config() {
return options(
- bootDelegationPackages("sun.*",
- "com.sun.*",
- "java.*",
- "javax.*",
- "javax.net.ssl"),
-
+// bootDelegationPackages("sun.*",
+// "com.sun.*",
+// "java.*",
+// "javax.*",
+// "javax.net.ssl"),
// In PAX we have to list transitive dependencies
// manually. See ../jena-osgi/pom.xml
// for dependencies that are NOT in <scope>provided</scope>
// (luckily the version numbers are picked up!)
- junitBundles(),
- mavenBundle("org.apache.jena", "jena-osgi"),
- mavenBundle("org.apache.httpcomponents", "httpclient-osgi"),
- mavenBundle("org.apache.httpcomponents", "httpcore-osgi"),
- mavenBundle("com.github.jsonld-java", "jsonld-java"),
- mavenBundle("org.apache.commons", "commons-csv"),
- mavenBundle("org.apache.thrift", "libthrift"),
- mavenBundle("org.slf4j", "jcl-over-slf4j"),
- mavenBundle("org.slf4j", "slf4j-log4j12"),
- mavenBundle("org.slf4j", "slf4j-api"),
- mavenBundle("org.apache.commons", "commons-lang3")
+ mavenBundle("org.apache.jena", "jena-osgi", "2.13.0-SNAPSHOT"),
+ linkBundle("org.apache.httpcomponents.httpclient"),
+ linkBundle("org.apache.httpcomponents.httpcore"),
+ linkBundle("com.github.jsonld-java"),
+ linkBundle("org.apache.commons.csv"),
+ linkBundle("org.apache.thrift"),
+ linkBundle("jcl.over.slf4j"),
+ linkBundle("slf4j.api"),
+ linkBundle("slf4j.log4j12"),
+ linkBundle("org.apache.commons.lang3"),
+ junitBundles()
);
}
[50/50] [abbrv] jena git commit: Add Javadoc plugin to Elephas POMs
Posted by rv...@apache.org.
Add Javadoc plugin to Elephas POMs
Elephas API modules now all generate Javadocs
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/2cf50f37
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/2cf50f37
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/2cf50f37
Branch: refs/heads/master
Commit: 2cf50f3706e9edddc9fe44ad89a1111a1812ba6c
Parents: 00ff878
Author: Rob Vesse <rv...@apache.org>
Authored: Tue Feb 17 12:41:19 2015 +0000
Committer: Rob Vesse <rv...@apache.org>
Committed: Tue Feb 17 12:41:19 2015 +0000
----------------------------------------------------------------------
jena-elephas/jena-elephas-common/pom.xml | 74 ++++++++-----
jena-elephas/jena-elephas-io/pom.xml | 23 ++++
jena-elephas/jena-elephas-mapreduce/pom.xml | 135 +++++++++++++----------
3 files changed, 148 insertions(+), 84 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/2cf50f37/jena-elephas/jena-elephas-common/pom.xml
----------------------------------------------------------------------
diff --git a/jena-elephas/jena-elephas-common/pom.xml b/jena-elephas/jena-elephas-common/pom.xml
index 7dd68a0..79fb02a 100644
--- a/jena-elephas/jena-elephas-common/pom.xml
+++ b/jena-elephas/jena-elephas-common/pom.xml
@@ -16,39 +16,61 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.jena</groupId>
- <artifactId>jena-elephas</artifactId>
- <version>0.9.0-SNAPSHOT</version>
- </parent>
- <artifactId>jena-elephas-common</artifactId>
- <name>Apache Jena - Elephas - Common API</name>
- <description>Common code for RDF on Hadoop such as writable types for RDF primitives</description>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-elephas</artifactId>
+ <version>0.9.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>jena-elephas-common</artifactId>
+ <name>Apache Jena - Elephas - Common API</name>
+ <description>Common code for RDF on Hadoop such as writable types for RDF primitives</description>
<!-- Note that versions are managed by parent POMs -->
- <dependencies>
+ <dependencies>
<!-- Hadoop Dependencies -->
<!-- Note these will be provided on the Hadoop cluster hence the provided
scope -->
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-common</artifactId>
- <scope>provided</scope>
- </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-common</artifactId>
+ <scope>provided</scope>
+ </dependency>
<!-- Jena dependencies -->
- <dependency>
- <groupId>org.apache.jena</groupId>
- <artifactId>jena-arq</artifactId>
- </dependency>
+ <dependency>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-arq</artifactId>
+ </dependency>
<!-- Test Dependencies -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <version>true</version>
+ <show>public</show>
+ <quiet>true</quiet>
+ <encoding>UTF-8</encoding>
+ <windowtitle>Apache Jena Elephas - Common API</windowtitle>
+ <doctitle>Apache Jena Elephas - Common API ${project.version}</doctitle>
+ <bottom>Licenced under the Apache License, Version 2.0</bottom>
+ <links>
+ <link>http://jena.apache.org/documentation/javadoc/jena/</link>
+ <link>http://jena.apache.org/documentation/javadoc/arq/</link>
+ </links>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jena/blob/2cf50f37/jena-elephas/jena-elephas-io/pom.xml
----------------------------------------------------------------------
diff --git a/jena-elephas/jena-elephas-io/pom.xml b/jena-elephas/jena-elephas-io/pom.xml
index e5134d0..4491c0a 100644
--- a/jena-elephas/jena-elephas-io/pom.xml
+++ b/jena-elephas/jena-elephas-io/pom.xml
@@ -64,4 +64,27 @@
<scope>test</scope>
</dependency>
</dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <version>true</version>
+ <show>public</show>
+ <quiet>true</quiet>
+ <encoding>UTF-8</encoding>
+ <windowtitle>Apache Jena Elephas - IO API</windowtitle>
+ <doctitle>Apache Jena Elephas - IO API ${project.version}</doctitle>
+ <bottom>Licenced under the Apache License, Version 2.0</bottom>
+ <links>
+ <link>http://jena.apache.org/documentation/javadoc/jena/</link>
+ <link>http://jena.apache.org/documentation/javadoc/arq/</link>
+ <link>http://jena.apahce.org/documentation/javadoc/elephas/common/</link>
+ </links>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
http://git-wip-us.apache.org/repos/asf/jena/blob/2cf50f37/jena-elephas/jena-elephas-mapreduce/pom.xml
----------------------------------------------------------------------
diff --git a/jena-elephas/jena-elephas-mapreduce/pom.xml b/jena-elephas/jena-elephas-mapreduce/pom.xml
index aed59be..5b18cf4 100644
--- a/jena-elephas/jena-elephas-mapreduce/pom.xml
+++ b/jena-elephas/jena-elephas-mapreduce/pom.xml
@@ -15,73 +15,92 @@
limitations under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.jena</groupId>
- <artifactId>jena-elephas</artifactId>
- <version>0.9.0-SNAPSHOT</version>
- </parent>
- <artifactId>jena-elephas-mapreduce</artifactId>
- <name>Apache Jena - Elephas - Map/Reduce</name>
- <description>Contains some basic Map/Reduce implementations for working with RDF on Hadoop</description>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-elephas</artifactId>
+ <version>0.9.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>jena-elephas-mapreduce</artifactId>
+ <name>Apache Jena - Elephas - Map/Reduce</name>
+ <description>Contains some basic Map/Reduce implementations for working with RDF on Hadoop</description>
- <dependencies>
+ <dependencies>
<!-- Internal Project Dependencies -->
- <dependency>
- <groupId>org.apache.jena</groupId>
- <artifactId>jena-hadoop-rdf-common</artifactId>
- <version>${project.version}</version>
- </dependency>
+ <dependency>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-hadoop-rdf-common</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<!-- Hadoop Dependencies -->
<!-- Note these will be provided on the Hadoop cluster hence the provided
scope -->
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-common</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-mapreduce-client-common</artifactId>
- <scope>provided</scope>
- </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-common</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-mapreduce-client-common</artifactId>
+ <scope>provided</scope>
+ </dependency>
<!-- Jena dependencies -->
- <dependency>
- <groupId>org.apache.jena</groupId>
- <artifactId>jena-arq</artifactId>
- </dependency>
+ <dependency>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-arq</artifactId>
+ </dependency>
<!-- Test Dependencies -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.mrunit</groupId>
- <artifactId>mrunit</artifactId>
- <scope>test</scope>
- <classifier>hadoop2</classifier>
- </dependency>
- </dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.mrunit</groupId>
+ <artifactId>mrunit</artifactId>
+ <scope>test</scope>
+ <classifier>hadoop2</classifier>
+ </dependency>
+ </dependencies>
- <build>
- <plugins>
- <!-- JAR plugin to ensure tests jar is built -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ <build>
+ <plugins>
+ <!-- JAR plugin to ensure tests jar is built -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <version>true</version>
+ <show>public</show>
+ <quiet>true</quiet>
+ <encoding>UTF-8</encoding>
+ <windowtitle>Apache Jena Elephas - Map/Reduce API</windowtitle>
+ <doctitle>Apache Jena Elephas - Map/Reduce API
+ ${project.version}</doctitle>
+ <bottom>Licenced under the Apache License, Version 2.0</bottom>
+ <links>
+ <link>http://jena.apache.org/documentation/javadoc/jena/</link>
+ <link>http://jena.apache.org/documentation/javadoc/arq/</link>
+ <link>http://jena.apahce.org/documentation/javadoc/elephas/common/</link>
+ </links>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
\ No newline at end of file
[20/50] [abbrv] jena git commit: JENA-879: scope test
Posted by rv...@apache.org.
JENA-879: scope test
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/a7bf9cbf
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/a7bf9cbf
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/a7bf9cbf
Branch: refs/heads/eliminate-assignments
Commit: a7bf9cbfdb64255a01ddcf21eba4962b687f209f
Parents: 3c85fc1
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Tue Feb 3 02:05:07 2015 +0000
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Mon Feb 9 10:03:57 2015 +0000
----------------------------------------------------------------------
apache-jena-osgi/jena-osgi-test/pom.xml | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/a7bf9cbf/apache-jena-osgi/jena-osgi-test/pom.xml
----------------------------------------------------------------------
diff --git a/apache-jena-osgi/jena-osgi-test/pom.xml b/apache-jena-osgi/jena-osgi-test/pom.xml
index 4c671a1..5745179 100644
--- a/apache-jena-osgi/jena-osgi-test/pom.xml
+++ b/apache-jena-osgi/jena-osgi-test/pom.xml
@@ -46,6 +46,7 @@
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<version>5.0.0</version>
+ <scope>provided</scope>
</dependency>
<dependency>
@@ -58,6 +59,7 @@
<groupId>org.ops4j.pax.logging</groupId>
<artifactId>pax-logging-log4j2</artifactId>
<version>${pax.logging.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.logging</groupId>
[42/50] [abbrv] jena git commit: Typos
Posted by rv...@apache.org.
Typos
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/a8990a11
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/a8990a11
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/a8990a11
Branch: refs/heads/eliminate-assignments
Commit: a8990a11bd157f6caa66b1c24db60ebb753330ad
Parents: e0e8dba
Author: Andy Seaborne <an...@seaborne.org>
Authored: Fri Feb 13 10:20:08 2015 +0000
Committer: Andy Seaborne <an...@seaborne.org>
Committed: Fri Feb 13 10:20:08 2015 +0000
----------------------------------------------------------------------
.../src/main/java/com/hp/hpl/jena/sparql/util/DateTimeStruct.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/a8990a11/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/DateTimeStruct.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/DateTimeStruct.java b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/DateTimeStruct.java
index 29429f6..7c86d6a 100644
--- a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/DateTimeStruct.java
+++ b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/DateTimeStruct.java
@@ -18,7 +18,7 @@
package com.hp.hpl.jena.sparql.util;
-/** XDS date/time 7-compoent model.
+/** XSD date/time 7-component model.
* Includes parsing xsd:dateTime, xsd:date and xsd:g*
*/
[31/50] [abbrv] jena git commit: Some comments about logging
Posted by rv...@apache.org.
Some comments about logging
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/537b4fc3
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/537b4fc3
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/537b4fc3
Branch: refs/heads/eliminate-assignments
Commit: 537b4fc382acaa6e0209329244aa92c31cf05ab4
Parents: dc540f9
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Tue Feb 10 12:31:21 2015 +0000
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Tue Feb 10 12:31:21 2015 +0000
----------------------------------------------------------------------
apache-jena-osgi/jena-osgi-test/pom.xml | 19 ++++++++++++++++---
1 file changed, 16 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/537b4fc3/apache-jena-osgi/jena-osgi-test/pom.xml
----------------------------------------------------------------------
diff --git a/apache-jena-osgi/jena-osgi-test/pom.xml b/apache-jena-osgi/jena-osgi-test/pom.xml
index dad48a9..d04c918 100644
--- a/apache-jena-osgi/jena-osgi-test/pom.xml
+++ b/apache-jena-osgi/jena-osgi-test/pom.xml
@@ -39,8 +39,8 @@ limitations under the License.
<pax.logging.version>1.8.1</pax.logging.version>
</properties>
- <dependencies>
+ <dependencies>
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-osgi</artifactId>
@@ -62,7 +62,19 @@ limitations under the License.
<scope>test</scope>
</dependency>
- <!-- needed to get a org.slf4j bundle for PAX -->
+ <!-- needed to get a org.slf4j bundle for PAX
+ NOTE: As we also inherit slf4j-log4j from jena-parent, we will get this
+ warning at startup:
+
+SLF4J: Class path contains multiple SLF4J bindings.
+SLF4J: Found binding in [jar:file:/home/stain/.m2/repository/org/ops4j/pax/logging/pax-logging-api/1.8.1/pax-logging-api-1.8.1.jar!/org/slf4j/impl/StaticLoggerBinder.class]
+SLF4J: Found binding in [jar:file:/home/stain/.m2/repository/org/slf4j/slf4j-log4j12/1.7.6/slf4j-log4j12-1.7.6.jar!/org/slf4j/impl/StaticLoggerBinder.class]
+SLF4J: See http://www.slf4j.org/codes.html#multiple_bindings for an explanation.
+SLF4J: Actual binding is of type [org.ops4j.pax.logging.slf4j.Slf4jLoggerFactory]
+
+ As long as the actual binding is the org.ops4j binding, this can be ignored.
+
+ -->
<dependency>
<groupId>org.ops4j.pax.logging</groupId>
<artifactId>pax-logging-log4j2</artifactId>
@@ -74,6 +86,7 @@ limitations under the License.
<groupId>org.ops4j.pax.logging</groupId>
<artifactId>pax-logging-api</artifactId>
<version>${pax.logging.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
@@ -130,7 +143,7 @@ limitations under the License.
<systemPropertyVariables>
<!-- So the test can find the current version of jena-osgi -->
<jena-osgi.version>${project.version}</jena-osgi.version>
- <!-- not so noisy logging -->
+ <!-- not so noisy OSGi logging -->
<org.ops4j.pax.logging.DefaultServiceLog.level>WARN</org.ops4j.pax.logging.DefaultServiceLog.level>
</systemPropertyVariables>
</configuration>
[24/50] [abbrv] jena git commit: reformat apache header in pom.xml
Posted by rv...@apache.org.
reformat apache header in pom.xml
.. Eclipse reformat broke it :(
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/3915a939
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/3915a939
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/3915a939
Branch: refs/heads/eliminate-assignments
Commit: 3915a9396792e8539068c67658b7af55e20c1213
Parents: 29d2e2f
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Mon Feb 9 10:05:11 2015 +0000
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Mon Feb 9 10:05:11 2015 +0000
----------------------------------------------------------------------
apache-jena-osgi/jena-osgi-test/pom.xml | 26 ++++++++++++++++----------
1 file changed, 16 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/3915a939/apache-jena-osgi/jena-osgi-test/pom.xml
----------------------------------------------------------------------
diff --git a/apache-jena-osgi/jena-osgi-test/pom.xml b/apache-jena-osgi/jena-osgi-test/pom.xml
index 736e6aa..ac7e2c4 100644
--- a/apache-jena-osgi/jena-osgi-test/pom.xml
+++ b/apache-jena-osgi/jena-osgi-test/pom.xml
@@ -1,14 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- 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. -->
+<!--
+ 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.
+-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
[19/50] [abbrv] jena git commit: JENA-879: avoiding
.versionAsInProject which PAX didn't like
Posted by rv...@apache.org.
JENA-879: avoiding .versionAsInProject which PAX didn't like
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/9f6e9478
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/9f6e9478
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/9f6e9478
Branch: refs/heads/eliminate-assignments
Commit: 9f6e9478fb57a71bbc1d644bda38b292ca3bbe93
Parents: ee932a1
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Tue Feb 3 00:42:54 2015 +0000
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Mon Feb 9 10:03:56 2015 +0000
----------------------------------------------------------------------
.../org/apache/jena/osgi/test/JenaOSGITest.java | 33 +++++++++++---------
1 file changed, 19 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/9f6e9478/apache-jena-osgi/jena-osgi-test/src/test/java/org/apache/jena/osgi/test/JenaOSGITest.java
----------------------------------------------------------------------
diff --git a/apache-jena-osgi/jena-osgi-test/src/test/java/org/apache/jena/osgi/test/JenaOSGITest.java b/apache-jena-osgi/jena-osgi-test/src/test/java/org/apache/jena/osgi/test/JenaOSGITest.java
index 4775765..e20ecc5 100644
--- a/apache-jena-osgi/jena-osgi-test/src/test/java/org/apache/jena/osgi/test/JenaOSGITest.java
+++ b/apache-jena-osgi/jena-osgi-test/src/test/java/org/apache/jena/osgi/test/JenaOSGITest.java
@@ -20,6 +20,10 @@ package org.apache.jena.osgi.test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
+import static org.ops4j.pax.exam.CoreOptions.bootDelegationPackages;
+import static org.ops4j.pax.exam.CoreOptions.junitBundles;
+import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
+import static org.ops4j.pax.exam.CoreOptions.options;
import java.io.OutputStream;
import java.io.StringWriter;
@@ -39,7 +43,7 @@ import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
-import org.ops4j.pax.exam.spi.reactors.PerMethod;
+import org.ops4j.pax.exam.spi.reactors.PerClass;
import org.osgi.framework.BundleContext;
import com.hp.hpl.jena.ontology.Individual;
@@ -60,14 +64,14 @@ import com.hp.hpl.jena.rdf.model.ModelFactory;
import com.hp.hpl.jena.rdf.model.Property;
import com.hp.hpl.jena.rdf.model.Resource;
import com.hp.hpl.jena.tdb.TDBFactory;
-import static org.ops4j.pax.exam.CoreOptions.*;
/**
* Brief tests of the Jena modules covered by jena-osgi
*
*/
@RunWith(PaxExam.class)
-@ExamReactorStrategy(PerMethod.class)
+// Restart OSGi framework PerClass or PerMethod ?
+@ExamReactorStrategy(PerClass.class)
public class JenaOSGITest {
@Inject
@@ -86,17 +90,18 @@ public class JenaOSGITest {
// manually. See ../jena-osgi/pom.xml
// for dependencies that are NOT in <scope>provided</scope>
// (luckily the version numbers are picked up!)
- mavenBundle("org.apache.jena", "jena-osgi").versionAsInProject(),
- mavenBundle("org.apache.httpcomponents", "httpclient-osgi").versionAsInProject(),
- mavenBundle("org.apache.httpcomponents", "httpcore-osgi").versionAsInProject(),
- mavenBundle("com.github.jsonld-java", "jsonld-java").versionAsInProject(),
- mavenBundle("org.apache.commons", "commons-csv").versionAsInProject(),
- mavenBundle("org.apache.thrift", "libthrift").versionAsInProject(),
- mavenBundle("org.slf4j", "jcl-over-slf4j").versionAsInProject(),
- mavenBundle("org.slf4j", "slf4j-log4j").versionAsInProject(),
- mavenBundle("org.slf4j", "slf4j-api").versionAsInProject(),
- mavenBundle("org.apache.commons", "commons-lang3").versionAsInProject(),
- junitBundles());
+ junitBundles(),
+ mavenBundle("org.apache.jena", "jena-osgi"),
+ mavenBundle("org.apache.httpcomponents", "httpclient-osgi"),
+ mavenBundle("org.apache.httpcomponents", "httpcore-osgi"),
+ mavenBundle("com.github.jsonld-java", "jsonld-java"),
+ mavenBundle("org.apache.commons", "commons-csv"),
+ mavenBundle("org.apache.thrift", "libthrift"),
+ mavenBundle("org.slf4j", "jcl-over-slf4j"),
+ mavenBundle("org.slf4j", "slf4j-log4j12"),
+ mavenBundle("org.slf4j", "slf4j-api"),
+ mavenBundle("org.apache.commons", "commons-lang3")
+ );
}
private static final String EXAMPLE_COM_GRAPH = "http://example.com/graph";
[32/50] [abbrv] jena git commit: Exclude slfj4-log4j from testing
classpath
Posted by rv...@apache.org.
Exclude slfj4-log4j from testing classpath
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/4ea54028
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/4ea54028
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/4ea54028
Branch: refs/heads/eliminate-assignments
Commit: 4ea5402866e81483cdc2e67419e413f8fefcf290
Parents: 537b4fc
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Tue Feb 10 12:57:42 2015 +0000
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Tue Feb 10 12:57:42 2015 +0000
----------------------------------------------------------------------
apache-jena-osgi/jena-osgi-test/pom.xml | 18 +++++-------------
1 file changed, 5 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/4ea54028/apache-jena-osgi/jena-osgi-test/pom.xml
----------------------------------------------------------------------
diff --git a/apache-jena-osgi/jena-osgi-test/pom.xml b/apache-jena-osgi/jena-osgi-test/pom.xml
index d04c918..c0bc922 100644
--- a/apache-jena-osgi/jena-osgi-test/pom.xml
+++ b/apache-jena-osgi/jena-osgi-test/pom.xml
@@ -63,25 +63,14 @@ limitations under the License.
</dependency>
<!-- needed to get a org.slf4j bundle for PAX
- NOTE: As we also inherit slf4j-log4j from jena-parent, we will get this
- warning at startup:
-
-SLF4J: Class path contains multiple SLF4J bindings.
-SLF4J: Found binding in [jar:file:/home/stain/.m2/repository/org/ops4j/pax/logging/pax-logging-api/1.8.1/pax-logging-api-1.8.1.jar!/org/slf4j/impl/StaticLoggerBinder.class]
-SLF4J: Found binding in [jar:file:/home/stain/.m2/repository/org/slf4j/slf4j-log4j12/1.7.6/slf4j-log4j12-1.7.6.jar!/org/slf4j/impl/StaticLoggerBinder.class]
-SLF4J: See http://www.slf4j.org/codes.html#multiple_bindings for an explanation.
-SLF4J: Actual binding is of type [org.ops4j.pax.logging.slf4j.Slf4jLoggerFactory]
-
- As long as the actual binding is the org.ops4j binding, this can be ignored.
-
- -->
+ as we exclude slf4j-log4j due to
+ "Fragment bundle" warning -->
<dependency>
<groupId>org.ops4j.pax.logging</groupId>
<artifactId>pax-logging-log4j2</artifactId>
<version>${pax.logging.version}</version>
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>org.ops4j.pax.logging</groupId>
<artifactId>pax-logging-api</artifactId>
@@ -140,6 +129,9 @@ SLF4J: Actual binding is of type [org.ops4j.pax.logging.slf4j.Slf4jLoggerFactory
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
+ <classpathDependencyExcludes>
+ <classpathDependencyExclude>org.slf4j:slf4j-log4j12</classpathDependencyExclude>
+ </classpathDependencyExcludes>
<systemPropertyVariables>
<!-- So the test can find the current version of jena-osgi -->
<jena-osgi.version>${project.version}</jena-osgi.version>
[12/50] [abbrv] jena git commit: JENA-879: JenaOSGITest modified to
use PaxExam
Posted by rv...@apache.org.
JENA-879: JenaOSGITest modified to use PaxExam
https://ops4j1.jira.com/wiki/display/PAXEXAM4/Getting+Started+with+OSGi+Tests
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/46e1f24c
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/46e1f24c
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/46e1f24c
Branch: refs/heads/eliminate-assignments
Commit: 46e1f24c21b25557d4b6e77ad312d53510ce3ad6
Parents: 8535469
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Mon Feb 2 23:54:49 2015 +0000
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Mon Feb 9 10:02:07 2015 +0000
----------------------------------------------------------------------
.../org/apache/jena/osgi/test/JenaOSGITest.java | 34 ++++++++++++++++----
1 file changed, 28 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/46e1f24c/apache-jena-osgi/jena-osgi-test/src/main/java/org/apache/jena/osgi/test/JenaOSGITest.java
----------------------------------------------------------------------
diff --git a/apache-jena-osgi/jena-osgi-test/src/main/java/org/apache/jena/osgi/test/JenaOSGITest.java b/apache-jena-osgi/jena-osgi-test/src/main/java/org/apache/jena/osgi/test/JenaOSGITest.java
index fd179eb..3d93bf1 100644
--- a/apache-jena-osgi/jena-osgi-test/src/main/java/org/apache/jena/osgi/test/JenaOSGITest.java
+++ b/apache-jena-osgi/jena-osgi-test/src/main/java/org/apache/jena/osgi/test/JenaOSGITest.java
@@ -27,11 +27,20 @@ import java.io.Writer;
import java.nio.file.Files;
import java.nio.file.Path;
+import javax.inject.Inject;
+
import org.apache.jena.iri.IRI;
import org.apache.jena.iri.IRIFactory;
import org.apache.jena.riot.Lang;
import org.apache.jena.riot.RDFDataMgr;
import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.Option;
+import org.ops4j.pax.exam.junit.PaxExam;
+import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
+import org.ops4j.pax.exam.spi.reactors.PerMethod;
+import org.osgi.framework.BundleContext;
import com.hp.hpl.jena.ontology.Individual;
import com.hp.hpl.jena.ontology.ObjectProperty;
@@ -51,13 +60,26 @@ import com.hp.hpl.jena.rdf.model.ModelFactory;
import com.hp.hpl.jena.rdf.model.Property;
import com.hp.hpl.jena.rdf.model.Resource;
import com.hp.hpl.jena.tdb.TDBFactory;
+import static org.ops4j.pax.exam.CoreOptions.*;
/**
* Brief tests of the Jena modules covered by jena-osgi
- *
+ *
*/
+@RunWith(PaxExam.class)
+@ExamReactorStrategy(PerMethod.class)
public class JenaOSGITest {
+ @Inject
+ private BundleContext bc;
+
+ @Configuration
+ public Option[] config() {
+ return options(
+ mavenBundle("org.apache.jena", "jena-osgi"),
+ junitBundles());
+ }
+
private static final String EXAMPLE_COM_GRAPH = "http://example.com/graph";
private Resource alice;
private Property knows;
@@ -129,8 +151,8 @@ public class JenaOSGITest {
+ "SELECT ?bob WHERE { "
+ " GRAPH <http://example.com/graph> { "
+ " ?alice foaf:knows ?bob . " + " }" + "}");
- try (QueryExecution qexec = QueryExecutionFactory.create(query,
- dataset)) {
+ try (QueryExecution qexec = QueryExecutionFactory
+ .create(query, dataset)) {
ResultSet results = qexec.execSelect();
assertTrue(results.hasNext());
QuerySolution r = results.next();
@@ -149,12 +171,12 @@ public class JenaOSGITest {
public void testJenaTdb() throws Exception {
Path tdbDir = Files.createTempDirectory("jena-tdb-test");
Dataset dataset = TDBFactory.createDataset(tdbDir.toString());
-
- dataset.begin(ReadWrite.WRITE) ;
+
+ dataset.begin(ReadWrite.WRITE);
dataset.addNamedModel(EXAMPLE_COM_GRAPH, makeModel());
dataset.commit();
dataset.end();
-
+
dataset.begin(ReadWrite.READ);
runQuery(dataset);
dataset.end();
[05/50] [abbrv] jena git commit: Add module apache-jena-osgi as OSGi
area. Merge commit 'refs/pull/24/head' of github.com:apache/jena
Posted by rv...@apache.org.
Add module apache-jena-osgi as OSGi area.
Merge commit 'refs/pull/24/head' of github.com:apache/jena
This closes #24
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/9d4d8f3e
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/9d4d8f3e
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/9d4d8f3e
Branch: refs/heads/eliminate-assignments
Commit: 9d4d8f3ee50b8029f1c21102b5ecfaa978bd4c8a
Parents: da06f26 2e3a332
Author: Andy Seaborne <an...@seaborne.org>
Authored: Sat Feb 7 17:51:52 2015 +0000
Committer: Andy Seaborne <an...@seaborne.org>
Committed: Sat Feb 7 17:51:52 2015 +0000
----------------------------------------------------------------------
apache-jena-osgi/jena-osgi-test/pom.xml | 118 ++++++++++
.../org/apache/jena/osgi/test/JenaOSGITest.java | 47 ++++
.../jena/osgi/test/JenaOSGITestActivator.java | 42 ++++
.../apache/jena/osgi/test/JenaOSGITestImpl.java | 170 ++++++++++++++
apache-jena-osgi/jena-osgi/pom.xml | 230 ++++++++++++++++++
apache-jena-osgi/pom.xml | 51 ++++
jena-osgi-test/pom.xml | 121 ----------
.../org/apache/jena/osgi/test/JenaOSGITest.java | 47 ----
.../jena/osgi/test/JenaOSGITestActivator.java | 42 ----
.../apache/jena/osgi/test/JenaOSGITestImpl.java | 170 --------------
jena-osgi/pom.xml | 234 -------------------
pom.xml | 4 +-
12 files changed, 659 insertions(+), 617 deletions(-)
----------------------------------------------------------------------
[27/50] [abbrv] jena git commit: Remove tabs
Posted by rv...@apache.org.
Remove tabs
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/bfb35784
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/bfb35784
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/bfb35784
Branch: refs/heads/eliminate-assignments
Commit: bfb3578495feaa6d3a3813ea20474fdd9c719724
Parents: f76fb8d
Author: Andy Seaborne <an...@seaborne.org>
Authored: Mon Feb 9 22:28:08 2015 +0000
Committer: Andy Seaborne <an...@seaborne.org>
Committed: Mon Feb 9 22:28:08 2015 +0000
----------------------------------------------------------------------
apache-jena-osgi/jena-osgi-test/pom.xml | 278 +++++++++++++--------------
1 file changed, 137 insertions(+), 141 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/bfb35784/apache-jena-osgi/jena-osgi-test/pom.xml
----------------------------------------------------------------------
diff --git a/apache-jena-osgi/jena-osgi-test/pom.xml b/apache-jena-osgi/jena-osgi-test/pom.xml
index 5d46020..5f2e4d0 100644
--- a/apache-jena-osgi/jena-osgi-test/pom.xml
+++ b/apache-jena-osgi/jena-osgi-test/pom.xml
@@ -1,109 +1,107 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- 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.
+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.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.jena</groupId>
- <artifactId>jena-parent</artifactId>
- <version>12-SNAPSHOT</version>
- <relativePath>../jena-parent</relativePath>
- </parent>
-
- <artifactId>jena-osgi-test</artifactId>
- <version>2.13.0-SNAPSHOT</version>
- <name>Apache Jena - OSGi bundle tests</name>
- <description>Tests for jena-osgi as a bundle</description>
- <packaging>bundle</packaging>
-
- <properties>
- <felix.version>4.6.0</felix.version>
- <pax.exam.version>4.4.0</pax.exam.version>
- <pax.url.version>1.6.0</pax.url.version>
- <pax.logging.version>1.8.1</pax.logging.version>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.jena</groupId>
- <artifactId>jena-osgi</artifactId>
- <version>${project.version}</version>
- <type>bundle</type>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <version>5.0.0</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.ops4j.pax.logging</groupId>
- <artifactId>pax-logging-log4j2</artifactId>
- <version>${pax.logging.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.ops4j.pax.logging</groupId>
- <artifactId>pax-logging-api</artifactId>
- <version>${pax.logging.version}</version>
- </dependency>
-
-
-
-
- <dependency>
- <groupId>org.ops4j.pax.exam</groupId>
- <artifactId>pax-exam-container-native</artifactId>
- <version>${pax.exam.version}</version>
- <scope>test</scope>
- </dependency>
-
-
- <dependency>
- <groupId>org.ops4j.pax.exam</groupId>
- <artifactId>pax-exam-junit4</artifactId>
- <version>${pax.exam.version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.ops4j.pax.exam</groupId>
- <artifactId>pax-exam-link-mvn</artifactId>
- <version>${pax.exam.version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.ops4j.pax.url</groupId>
- <artifactId>pax-url-aether</artifactId>
- <version>${pax.url.version}</version>
- <scope>test</scope>
- </dependency>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-parent</artifactId>
+ <version>12-SNAPSHOT</version>
+ <relativePath>../jena-parent</relativePath>
+ </parent>
+
+ <artifactId>jena-osgi-test</artifactId>
+ <version>2.13.0-SNAPSHOT</version>
+ <name>Apache Jena - OSGi bundle tests</name>
+ <description>Tests for jena-osgi as a bundle</description>
+ <packaging>bundle</packaging>
+
+ <properties>
+ <felix.version>4.6.0</felix.version>
+ <pax.exam.version>4.4.0</pax.exam.version>
+ <pax.url.version>1.6.0</pax.url.version>
+ <pax.logging.version>1.8.1</pax.logging.version>
+ </properties>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-osgi</artifactId>
+ <version>${project.version}</version>
+ <type>bundle</type>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>5.0.0</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.ops4j.pax.logging</groupId>
+ <artifactId>pax-logging-log4j2</artifactId>
+ <version>${pax.logging.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.ops4j.pax.logging</groupId>
+ <artifactId>pax-logging-api</artifactId>
+ <version>${pax.logging.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>pax-exam-container-native</artifactId>
+ <version>${pax.exam.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>pax-exam-junit4</artifactId>
+ <version>${pax.exam.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>pax-exam-link-mvn</artifactId>
+ <version>${pax.exam.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.ops4j.pax.url</groupId>
+ <artifactId>pax-url-aether</artifactId>
+ <version>${pax.url.version}</version>
+ <scope>test</scope>
+ </dependency>
<!-- OSGi Frameworks -->
<dependency>
@@ -113,45 +111,43 @@
<scope>test</scope>
</dependency>
<!-- NOTE: Make sure eclipse-osgi (equinox) is first -->
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.framework</artifactId>
- <version>${felix.version}</version>
- <scope>test</scope>
- </dependency>
-
-
-
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <!-- <Import-Package>com.hp.hpl.jena</Import-Package> -->
- <!-- <Embed-Dependency>artifactId=jena-core;inline=true</Embed-Dependency> -->
- </instructions>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.ops4j.pax.exam</groupId>
- <artifactId>exam-maven-plugin</artifactId>
- <version>${pax.exam.version}</version>
- <executions>
- <execution>
- <id>generate-link-files</id>
- <goals>
- <goal>generate-link-files</goal>
- </goals>
- <phase>generate-test-resources</phase>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.framework</artifactId>
+ <version>${felix.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <!-- <Import-Package>com.hp.hpl.jena</Import-Package> -->
+ <!-- <Embed-Dependency>artifactId=jena-core;inline=true</Embed-Dependency> -->
+ </instructions>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>exam-maven-plugin</artifactId>
+ <version>${pax.exam.version}</version>
+ <executions>
+ <execution>
+ <id>generate-link-files</id>
+ <goals>
+ <goal>generate-link-files</goal>
+ </goals>
+ <phase>generate-test-resources</phase>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
[14/50] [abbrv] jena git commit: JENA-879: src/main/java ->
src/test/java
Posted by rv...@apache.org.
JENA-879: src/main/java -> src/test/java
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/778adacc
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/778adacc
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/778adacc
Branch: refs/heads/eliminate-assignments
Commit: 778adacc6d46a8345bec7a9b5ac11687319d957f
Parents: 46e1f24
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Mon Feb 2 23:55:06 2015 +0000
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Mon Feb 9 10:03:54 2015 +0000
----------------------------------------------------------------------
.../org/apache/jena/osgi/test/JenaOSGITest.java | 184 -------------------
.../org/apache/jena/osgi/test/JenaOSGITest.java | 184 +++++++++++++++++++
2 files changed, 184 insertions(+), 184 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/778adacc/apache-jena-osgi/jena-osgi-test/src/main/java/org/apache/jena/osgi/test/JenaOSGITest.java
----------------------------------------------------------------------
diff --git a/apache-jena-osgi/jena-osgi-test/src/main/java/org/apache/jena/osgi/test/JenaOSGITest.java b/apache-jena-osgi/jena-osgi-test/src/main/java/org/apache/jena/osgi/test/JenaOSGITest.java
deleted file mode 100644
index 3d93bf1..0000000
--- a/apache-jena-osgi/jena-osgi-test/src/main/java/org/apache/jena/osgi/test/JenaOSGITest.java
+++ /dev/null
@@ -1,184 +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.osgi.test;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import java.io.OutputStream;
-import java.io.StringWriter;
-import java.io.Writer;
-import java.nio.file.Files;
-import java.nio.file.Path;
-
-import javax.inject.Inject;
-
-import org.apache.jena.iri.IRI;
-import org.apache.jena.iri.IRIFactory;
-import org.apache.jena.riot.Lang;
-import org.apache.jena.riot.RDFDataMgr;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Configuration;
-import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.PaxExam;
-import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
-import org.ops4j.pax.exam.spi.reactors.PerMethod;
-import org.osgi.framework.BundleContext;
-
-import com.hp.hpl.jena.ontology.Individual;
-import com.hp.hpl.jena.ontology.ObjectProperty;
-import com.hp.hpl.jena.ontology.OntModel;
-import com.hp.hpl.jena.ontology.OntModelSpec;
-import com.hp.hpl.jena.query.Dataset;
-import com.hp.hpl.jena.query.DatasetFactory;
-import com.hp.hpl.jena.query.Query;
-import com.hp.hpl.jena.query.QueryExecution;
-import com.hp.hpl.jena.query.QueryExecutionFactory;
-import com.hp.hpl.jena.query.QueryFactory;
-import com.hp.hpl.jena.query.QuerySolution;
-import com.hp.hpl.jena.query.ReadWrite;
-import com.hp.hpl.jena.query.ResultSet;
-import com.hp.hpl.jena.rdf.model.Model;
-import com.hp.hpl.jena.rdf.model.ModelFactory;
-import com.hp.hpl.jena.rdf.model.Property;
-import com.hp.hpl.jena.rdf.model.Resource;
-import com.hp.hpl.jena.tdb.TDBFactory;
-import static org.ops4j.pax.exam.CoreOptions.*;
-
-/**
- * Brief tests of the Jena modules covered by jena-osgi
- *
- */
-@RunWith(PaxExam.class)
-@ExamReactorStrategy(PerMethod.class)
-public class JenaOSGITest {
-
- @Inject
- private BundleContext bc;
-
- @Configuration
- public Option[] config() {
- return options(
- mavenBundle("org.apache.jena", "jena-osgi"),
- junitBundles());
- }
-
- private static final String EXAMPLE_COM_GRAPH = "http://example.com/graph";
- private Resource alice;
- private Property knows;
- private Resource bob;
-
- @Test
- public void testJenaCore() throws Exception {
- Model model = makeModel();
-
- // Does Model's Class.forName() still work?
- model.setWriterClassName("someWriter",
- "com.hp.hpl.jena.rdf.model.impl.NTripleWriter");
- Writer writer = new StringWriter();
- model.write(writer, "someWriter");
- // yes, but only as long as that classname is accessible within
- // jena-osgi bundle
- assertEquals(
- "<http://example.com/alice> <http://xmlns.com/foaf/0.1/knows> <http://example.com/bob> .",
- writer.toString().trim());
-
- // Let's also test com.hp.hpl.jena.ontology
- OntModel ontModel = ModelFactory
- .createOntologyModel(OntModelSpec.OWL_DL_MEM_RULE_INF);
- ObjectProperty knowsObjProp = ontModel.createObjectProperty(knows
- .getURI());
- ObjectProperty hasFriend = ontModel
- .createObjectProperty("http://example.com/has_friend");
- hasFriend.addSuperProperty(knowsObjProp);
-
- Individual aliceIndividual = ontModel.createIndividual(alice);
- Individual bobIndividiual = ontModel.createIndividual(bob);
- ontModel.add(aliceIndividual, hasFriend, bobIndividiual);
- assertTrue(aliceIndividual.hasProperty(knowsObjProp, bobIndividiual));
- }
-
- private Model makeModel() {
- Model model = ModelFactory.createDefaultModel();
- alice = model.createResource("http://example.com/alice");
- knows = model.createProperty("http://xmlns.com/foaf/0.1/knows");
- bob = model.createResource("http://example.com/bob");
- model.add(model.createStatement(alice, knows, bob));
- return model;
- }
-
- @Test
- public void testJenaArq() throws Exception {
- Dataset dataset = DatasetFactory.createMem();
- dataset.addNamedModel(EXAMPLE_COM_GRAPH, makeModel());
-
- Path path = Files.createTempFile("example", ".jsonld");
- // System.out.println(path);
- path.toFile().deleteOnExit();
-
- try (OutputStream output = Files.newOutputStream(path)) {
- RDFDataMgr.write(output, dataset, Lang.JSONLD);
- }
- // We test JSON-LD as it involves multiple other bundles
-
- Dataset dataset2 = RDFDataMgr.loadDataset(path.toUri().toString());
- assertTrue(dataset2.containsNamedModel(EXAMPLE_COM_GRAPH));
-
- runQuery(dataset2);
-
- }
-
- private void runQuery(Dataset dataset) {
- Query query = QueryFactory.create(""
- + "PREFIX foaf: <http://xmlns.com/foaf/0.1/>"
- + "SELECT ?bob WHERE { "
- + " GRAPH <http://example.com/graph> { "
- + " ?alice foaf:knows ?bob . " + " }" + "}");
- try (QueryExecution qexec = QueryExecutionFactory
- .create(query, dataset)) {
- ResultSet results = qexec.execSelect();
- assertTrue(results.hasNext());
- QuerySolution r = results.next();
- assertEquals(bob, r.get("bob").asResource());
- }
- }
-
- @Test
- public void testJenaIRI() throws Exception {
- IRIFactory iriFactory = IRIFactory.jenaImplementation();
- IRI iri = iriFactory.create("http://example.com/");
- assertEquals("http://example.com/", iri.toASCIIString());
- }
-
- @Test
- public void testJenaTdb() throws Exception {
- Path tdbDir = Files.createTempDirectory("jena-tdb-test");
- Dataset dataset = TDBFactory.createDataset(tdbDir.toString());
-
- dataset.begin(ReadWrite.WRITE);
- dataset.addNamedModel(EXAMPLE_COM_GRAPH, makeModel());
- dataset.commit();
- dataset.end();
-
- dataset.begin(ReadWrite.READ);
- runQuery(dataset);
- dataset.end();
- }
-}
http://git-wip-us.apache.org/repos/asf/jena/blob/778adacc/apache-jena-osgi/jena-osgi-test/src/test/java/org/apache/jena/osgi/test/JenaOSGITest.java
----------------------------------------------------------------------
diff --git a/apache-jena-osgi/jena-osgi-test/src/test/java/org/apache/jena/osgi/test/JenaOSGITest.java b/apache-jena-osgi/jena-osgi-test/src/test/java/org/apache/jena/osgi/test/JenaOSGITest.java
new file mode 100644
index 0000000..3d93bf1
--- /dev/null
+++ b/apache-jena-osgi/jena-osgi-test/src/test/java/org/apache/jena/osgi/test/JenaOSGITest.java
@@ -0,0 +1,184 @@
+/*
+ * 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.osgi.test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.io.OutputStream;
+import java.io.StringWriter;
+import java.io.Writer;
+import java.nio.file.Files;
+import java.nio.file.Path;
+
+import javax.inject.Inject;
+
+import org.apache.jena.iri.IRI;
+import org.apache.jena.iri.IRIFactory;
+import org.apache.jena.riot.Lang;
+import org.apache.jena.riot.RDFDataMgr;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.Option;
+import org.ops4j.pax.exam.junit.PaxExam;
+import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
+import org.ops4j.pax.exam.spi.reactors.PerMethod;
+import org.osgi.framework.BundleContext;
+
+import com.hp.hpl.jena.ontology.Individual;
+import com.hp.hpl.jena.ontology.ObjectProperty;
+import com.hp.hpl.jena.ontology.OntModel;
+import com.hp.hpl.jena.ontology.OntModelSpec;
+import com.hp.hpl.jena.query.Dataset;
+import com.hp.hpl.jena.query.DatasetFactory;
+import com.hp.hpl.jena.query.Query;
+import com.hp.hpl.jena.query.QueryExecution;
+import com.hp.hpl.jena.query.QueryExecutionFactory;
+import com.hp.hpl.jena.query.QueryFactory;
+import com.hp.hpl.jena.query.QuerySolution;
+import com.hp.hpl.jena.query.ReadWrite;
+import com.hp.hpl.jena.query.ResultSet;
+import com.hp.hpl.jena.rdf.model.Model;
+import com.hp.hpl.jena.rdf.model.ModelFactory;
+import com.hp.hpl.jena.rdf.model.Property;
+import com.hp.hpl.jena.rdf.model.Resource;
+import com.hp.hpl.jena.tdb.TDBFactory;
+import static org.ops4j.pax.exam.CoreOptions.*;
+
+/**
+ * Brief tests of the Jena modules covered by jena-osgi
+ *
+ */
+@RunWith(PaxExam.class)
+@ExamReactorStrategy(PerMethod.class)
+public class JenaOSGITest {
+
+ @Inject
+ private BundleContext bc;
+
+ @Configuration
+ public Option[] config() {
+ return options(
+ mavenBundle("org.apache.jena", "jena-osgi"),
+ junitBundles());
+ }
+
+ private static final String EXAMPLE_COM_GRAPH = "http://example.com/graph";
+ private Resource alice;
+ private Property knows;
+ private Resource bob;
+
+ @Test
+ public void testJenaCore() throws Exception {
+ Model model = makeModel();
+
+ // Does Model's Class.forName() still work?
+ model.setWriterClassName("someWriter",
+ "com.hp.hpl.jena.rdf.model.impl.NTripleWriter");
+ Writer writer = new StringWriter();
+ model.write(writer, "someWriter");
+ // yes, but only as long as that classname is accessible within
+ // jena-osgi bundle
+ assertEquals(
+ "<http://example.com/alice> <http://xmlns.com/foaf/0.1/knows> <http://example.com/bob> .",
+ writer.toString().trim());
+
+ // Let's also test com.hp.hpl.jena.ontology
+ OntModel ontModel = ModelFactory
+ .createOntologyModel(OntModelSpec.OWL_DL_MEM_RULE_INF);
+ ObjectProperty knowsObjProp = ontModel.createObjectProperty(knows
+ .getURI());
+ ObjectProperty hasFriend = ontModel
+ .createObjectProperty("http://example.com/has_friend");
+ hasFriend.addSuperProperty(knowsObjProp);
+
+ Individual aliceIndividual = ontModel.createIndividual(alice);
+ Individual bobIndividiual = ontModel.createIndividual(bob);
+ ontModel.add(aliceIndividual, hasFriend, bobIndividiual);
+ assertTrue(aliceIndividual.hasProperty(knowsObjProp, bobIndividiual));
+ }
+
+ private Model makeModel() {
+ Model model = ModelFactory.createDefaultModel();
+ alice = model.createResource("http://example.com/alice");
+ knows = model.createProperty("http://xmlns.com/foaf/0.1/knows");
+ bob = model.createResource("http://example.com/bob");
+ model.add(model.createStatement(alice, knows, bob));
+ return model;
+ }
+
+ @Test
+ public void testJenaArq() throws Exception {
+ Dataset dataset = DatasetFactory.createMem();
+ dataset.addNamedModel(EXAMPLE_COM_GRAPH, makeModel());
+
+ Path path = Files.createTempFile("example", ".jsonld");
+ // System.out.println(path);
+ path.toFile().deleteOnExit();
+
+ try (OutputStream output = Files.newOutputStream(path)) {
+ RDFDataMgr.write(output, dataset, Lang.JSONLD);
+ }
+ // We test JSON-LD as it involves multiple other bundles
+
+ Dataset dataset2 = RDFDataMgr.loadDataset(path.toUri().toString());
+ assertTrue(dataset2.containsNamedModel(EXAMPLE_COM_GRAPH));
+
+ runQuery(dataset2);
+
+ }
+
+ private void runQuery(Dataset dataset) {
+ Query query = QueryFactory.create(""
+ + "PREFIX foaf: <http://xmlns.com/foaf/0.1/>"
+ + "SELECT ?bob WHERE { "
+ + " GRAPH <http://example.com/graph> { "
+ + " ?alice foaf:knows ?bob . " + " }" + "}");
+ try (QueryExecution qexec = QueryExecutionFactory
+ .create(query, dataset)) {
+ ResultSet results = qexec.execSelect();
+ assertTrue(results.hasNext());
+ QuerySolution r = results.next();
+ assertEquals(bob, r.get("bob").asResource());
+ }
+ }
+
+ @Test
+ public void testJenaIRI() throws Exception {
+ IRIFactory iriFactory = IRIFactory.jenaImplementation();
+ IRI iri = iriFactory.create("http://example.com/");
+ assertEquals("http://example.com/", iri.toASCIIString());
+ }
+
+ @Test
+ public void testJenaTdb() throws Exception {
+ Path tdbDir = Files.createTempDirectory("jena-tdb-test");
+ Dataset dataset = TDBFactory.createDataset(tdbDir.toString());
+
+ dataset.begin(ReadWrite.WRITE);
+ dataset.addNamedModel(EXAMPLE_COM_GRAPH, makeModel());
+ dataset.commit();
+ dataset.end();
+
+ dataset.begin(ReadWrite.READ);
+ runQuery(dataset);
+ dataset.end();
+ }
+}
[46/50] [abbrv] jena git commit: Include bin/ in apache-jena-fuseki
Posted by rv...@apache.org.
Include bin/ in apache-jena-fuseki
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/65ee9092
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/65ee9092
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/65ee9092
Branch: refs/heads/eliminate-assignments
Commit: 65ee9092623a936e6e64593962d2b4375ed4ec20
Parents: 6f42702
Author: Andy Seaborne <an...@seaborne.org>
Authored: Sun Feb 15 18:31:15 2015 +0000
Committer: Andy Seaborne <an...@seaborne.org>
Committed: Sun Feb 15 18:31:15 2015 +0000
----------------------------------------------------------------------
jena-fuseki2/apache-jena-fuseki/assembly-dist.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/65ee9092/jena-fuseki2/apache-jena-fuseki/assembly-dist.xml
----------------------------------------------------------------------
diff --git a/jena-fuseki2/apache-jena-fuseki/assembly-dist.xml b/jena-fuseki2/apache-jena-fuseki/assembly-dist.xml
index 3c6c66e..0afa6c4 100644
--- a/jena-fuseki2/apache-jena-fuseki/assembly-dist.xml
+++ b/jena-fuseki2/apache-jena-fuseki/assembly-dist.xml
@@ -86,7 +86,7 @@
<include>fuseki</include>
<include>fuseki-server</include>
<include>fuseki-server.bat</include>
- <!--<include>s-*</include>-->
+ <include>bin/*</include>
</includes>
</fileSet>
[33/50] [abbrv] jena git commit: This closes #28
Posted by rv...@apache.org.
This closes #28
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/18778339
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/18778339
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/18778339
Branch: refs/heads/eliminate-assignments
Commit: 1877833970d770805c4ac96f2027a3c45f35b58e
Parents: 4ea5402
Author: Andy Seaborne <an...@apache.org>
Authored: Tue Feb 10 15:06:13 2015 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Tue Feb 10 15:06:13 2015 +0000
----------------------------------------------------------------------
----------------------------------------------------------------------
[15/50] [abbrv] jena git commit: JENA-879: pax-exam-container-native
instead of -forked
Posted by rv...@apache.org.
JENA-879: pax-exam-container-native instead of -forked
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/ee932a15
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/ee932a15
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/ee932a15
Branch: refs/heads/eliminate-assignments
Commit: ee932a158c0ecb404432b40c89abd3f2772863ad
Parents: 761a81c
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Tue Feb 3 00:42:46 2015 +0000
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Mon Feb 9 10:03:55 2015 +0000
----------------------------------------------------------------------
apache-jena-osgi/jena-osgi-test/pom.xml | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/ee932a15/apache-jena-osgi/jena-osgi-test/pom.xml
----------------------------------------------------------------------
diff --git a/apache-jena-osgi/jena-osgi-test/pom.xml b/apache-jena-osgi/jena-osgi-test/pom.xml
index 4af90b7..127fc8d 100644
--- a/apache-jena-osgi/jena-osgi-test/pom.xml
+++ b/apache-jena-osgi/jena-osgi-test/pom.xml
@@ -43,17 +43,13 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <scope>compile</scope>
+ <scope>test</scope>
</dependency>
- <!-- <dependency> <groupId>org.osgi</groupId> <artifactId>org.osgi.core</artifactId>
- <version>4.3.1</version> <scope>provided</scope> </dependency> -->
-
-
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<!-- One of: -forked -native -paxrunner -->
- <artifactId>pax-exam-container-forked</artifactId>
+ <artifactId>pax-exam-container-native</artifactId>
<version>${exam.version}</version>
<scope>test</scope>
</dependency>
[41/50] [abbrv] jena git commit: Tidy comments and formatting of code.
Posted by rv...@apache.org.
Tidy comments and formatting of code.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/e0e8dba4
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/e0e8dba4
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/e0e8dba4
Branch: refs/heads/eliminate-assignments
Commit: e0e8dba47ec92a7fb2be38a277685b706d0f4f80
Parents: 3199dd1
Author: Andy Seaborne <an...@apache.org>
Authored: Thu Feb 12 11:50:44 2015 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Thu Feb 12 11:50:44 2015 +0000
----------------------------------------------------------------------
.../jena/atlas/iterator/IteratorWithBuffer.java | 117 +++++++++----------
.../atlas/iterator/IteratorWithHistory.java | 61 +++++-----
.../jena/atlas/iterator/PushbackIterator.java | 37 +++---
3 files changed, 103 insertions(+), 112 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/e0e8dba4/jena-arq/src/main/java/org/apache/jena/atlas/iterator/IteratorWithBuffer.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/atlas/iterator/IteratorWithBuffer.java b/jena-arq/src/main/java/org/apache/jena/atlas/iterator/IteratorWithBuffer.java
index 5397002..7af9ac8 100644
--- a/jena-arq/src/main/java/org/apache/jena/atlas/iterator/IteratorWithBuffer.java
+++ b/jena-arq/src/main/java/org/apache/jena/atlas/iterator/IteratorWithBuffer.java
@@ -16,126 +16,117 @@
* limitations under the License.
*/
-package org.apache.jena.atlas.iterator;
+package org.apache.jena.atlas.iterator ;
import java.util.ArrayList ;
import java.util.Iterator ;
import java.util.List ;
import java.util.NoSuchElementException ;
-/** Iterator that delays output by N slots so you can react to the output before it's yielded.
- * See also PeekIterator (which predates this code).
- * See also IteratorWithHistory for an iterator that remembers what it has yielded.
+/**
+ * Iterator that delays output by N slots so you can react to the output before
+ * it's yielded. See also {@link PeekIterator} (which predates this code). See also
+ * {@link IteratorWithHistory} for an iterator that remembers what it has yielded.
*
- * @see org.apache.jena.atlas.iterator.PeekIterator
- * @see org.apache.jena.atlas.iterator.PushbackIterator
+ * @see PeekIterator
+ * @see PushbackIterator
* @see IteratorWithHistory
*/
-public class IteratorWithBuffer<T> implements Iterator<T>
-{
- private List<T> lookahead ;
+public class IteratorWithBuffer<T> implements Iterator<T> {
+ private List<T> lookahead ;
private Iterator<T> iter ;
- private int capacity ;
- private boolean innerHasEnded = false ;
-
- public IteratorWithBuffer(Iterator<T> iter, int N)
- {
+ private int capacity ;
+ private boolean innerHasEnded = false ;
+
+ public IteratorWithBuffer(Iterator<T> iter, int N) {
if ( N < 0 )
throw new IllegalArgumentException("Buffering size < 0") ;
this.iter = iter ;
this.lookahead = new ArrayList<>(N) ;
this.capacity = N ;
// Fill the lookahead.
- for ( int i = 0 ; i < N ; i++ )
- {
- if ( ! iter.hasNext() )
- {
+ for ( int i = 0 ; i < N ; i++ ) {
+ if ( !iter.hasNext() ) {
atEndInner() ;
break ;
}
T nextItem = iter.next() ;
- //System.out.println("Fill: "+nextItem) ;
+ // System.out.println("Fill: "+nextItem) ;
lookahead.add(nextItem) ;
}
}
@Override
- public boolean hasNext()
- {
+ public boolean hasNext() {
return lookahead.size() > 0 ;
}
@Override
- public T next()
- {
+ public T next() {
if ( !hasNext() )
throw new NoSuchElementException(this.getClass().getName()) ;
- if ( ! iter.hasNext() )
+ if ( !iter.hasNext() )
atEndInner() ;
-
+
T item = lookahead.remove(0) ;
- //System.out.println("remove: "+item) ;
- if ( iter.hasNext() )
- {
+ // System.out.println("remove: "+item) ;
+ if ( iter.hasNext() ) {
// Should not throw NoSuchElementException.
T nextItem = iter.next() ;
- //System.out.println("add : "+nextItem) ;
+ // System.out.println("add : "+nextItem) ;
lookahead.add(nextItem) ;
}
return item ;
}
@Override
- public void remove()
- { throw new UnsupportedOperationException("remove") ; }
+ public void remove() {
+ throw new UnsupportedOperationException("remove") ;
+ }
- /** Look at elements that will be returned by a subsequnet call of .next().
- * The next element is index 0, then index 1 etc. This operation is valid immediately
- * after the constructor returns.
- * Returns null for no such element (underlying iterator didn't yeild enough elements).
- * Throws IndexOutOfBoundsException if an attempt i smade to go beyond
- * the buffering window.
+ /**
+ * Look at elements that will be returned by a subsequnet call of .next().
+ * The next element is index 0, then index 1 etc. This operation is valid
+ * immediately after the constructor returns. Returns null for no such
+ * element (underlying iterator didn't yeild enough elements). Throws
+ * IndexOutOfBoundsException if an attempt i smade to go beyond the
+ * buffering window.
*/
- public T peek(int idx)
- {
+ public T peek(int idx) {
if ( idx < 0 || idx >= capacity )
- throw new IndexOutOfBoundsException("Index: "+idx) ;
+ throw new IndexOutOfBoundsException("Index: " + idx) ;
if ( idx >= lookahead.size() )
return null ;
- return lookahead.get(idx) ;
+ return lookahead.get(idx) ;
}
-
+
/**
- * Return the current size of the lookahead. This can be used to tell the difference between
- * an iterator returning null and an iterator that is just short.
+ * Return the current size of the lookahead. This can be used to tell the
+ * difference between an iterator returning null and an iterator that is
+ * just short.
*/
- public int currentSize()
- {
+ public int currentSize() {
return lookahead.size() ;
}
-
- /** Set the element to be returned by a subsequent .next().
- * Use with care.
- * The original element to be returned at this position is lost.
+
+ /**
+ * Set the element to be returned by a subsequent .next(). Use with care.
+ * The original element to be returned at this position is lost.
*/
- public void set(int idx, T item)
- {
- lookahead.set(idx, item) ;
+ public void set(int idx, T item) {
+ lookahead.set(idx, item) ;
}
-
+
/** Called when the underlying iterator ends */
- private void atEndInner()
- {
- if (! innerHasEnded )
- {
+ private void atEndInner() {
+ if ( !innerHasEnded ) {
innerHasEnded = true ;
endReachedInner() ;
}
}
-
-
- /** Called, once, at the end of the wrapped iterator.*/
- protected void endReachedInner() { }
-
+
+ /** Called, once, at the end of the wrapped iterator. */
+ protected void endReachedInner() {}
+
}
http://git-wip-us.apache.org/repos/asf/jena/blob/e0e8dba4/jena-arq/src/main/java/org/apache/jena/atlas/iterator/IteratorWithHistory.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/atlas/iterator/IteratorWithHistory.java b/jena-arq/src/main/java/org/apache/jena/atlas/iterator/IteratorWithHistory.java
index 60c519d..b5b800a 100644
--- a/jena-arq/src/main/java/org/apache/jena/atlas/iterator/IteratorWithHistory.java
+++ b/jena-arq/src/main/java/org/apache/jena/atlas/iterator/IteratorWithHistory.java
@@ -24,10 +24,10 @@ import java.util.List ;
import java.util.NoSuchElementException ;
/** Remembers the last N yields.
- * See also IteratorWithBuffer, for an iterator that looks ahead to what it wil yield.
+ * See also {@link IteratorWithBuffer}, for an iterator that looks ahead to what it will yield.
* @see IteratorWithBuffer
- * @see org.apache.jena.atlas.iterator.PeekIterator
- * @see org.apache.jena.atlas.iterator.PushbackIterator
+ * @see PeekIterator
+ * @see PushbackIterator
*/
public class IteratorWithHistory<T> implements Iterator<T>
{
@@ -36,32 +36,33 @@ public class IteratorWithHistory<T> implements Iterator<T>
private int capacity ;
private boolean hasEnded = false ;
- public IteratorWithHistory(Iterator<T> iter, int N)
- {
+ public IteratorWithHistory(Iterator<T> iter, int N) {
this.iter = iter ;
this.history = new ArrayList<>(N) ;
this.capacity = N ;
}
@Override
- public boolean hasNext()
- {
+ public boolean hasNext() {
boolean b = iter.hasNext() ;
- if ( !b )
+ if ( !b )
atEnd() ;
return b ;
}
@Override
- public T next()
- {
+ public T next() {
T item = null ;
- try { item = iter.next() ; }
- catch (NoSuchElementException ex) { atEnd() ; }
+ try {
+ item = iter.next() ;
+ }
+ catch (NoSuchElementException ex) {
+ atEnd() ;
+ }
// Shuffle up, add at bottom.
if ( history.size() >= capacity )
- history.remove(history.size()-1) ;
- history.add(0,item) ;
+ history.remove(history.size() - 1) ;
+ history.add(0, item) ;
return item ;
}
@@ -69,35 +70,35 @@ public class IteratorWithHistory<T> implements Iterator<T>
public void remove()
{ throw new UnsupportedOperationException("remove") ; }
- /** return the previous i'th element returned by next(). 0 means last call of next.
- * History is retained after the end of iteration.
+ /**
+ * return the previous i'th element returned by next(). 0 means last call of
+ * next. History is retained after the end of iteration.
*
- * @return Element or null for no such element (that is for haven't yielded that many elements).
- * @throws IndexOutOfBoundsException if index is negative.
+ * @return Element or null for no such element (that is for haven't yielded
+ * that many elements).
+ * @throws IndexOutOfBoundsException
+ * if index is negative.
*/
- public T getPrevious(int idx)
- {
+ public T getPrevious(int idx) {
if ( idx >= capacity || idx < 0 )
- throw new IndexOutOfBoundsException("Index: "+idx) ;
+ throw new IndexOutOfBoundsException("Index: " + idx) ;
if ( idx >= history.size() )
return null ;
return history.get(idx) ;
}
/**
- * Return the current size of the histiory. This can be used to tell the difference between
- * an iterator returning null and an iterator that is just short.
+ * Return the current size of the histiory. This can be used to tell the
+ * difference between an iterator returning null and an iterator that is
+ * just short.
*/
- public int currentSize()
- {
+ public int currentSize() {
return history.size() ;
}
-
+
/** Called when the underlying iterator ends */
- protected void atEnd()
- {
- if (! hasEnded )
- {
+ protected void atEnd() {
+ if ( !hasEnded ) {
hasEnded = true ;
endReached() ;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/e0e8dba4/jena-arq/src/main/java/org/apache/jena/atlas/iterator/PushbackIterator.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/atlas/iterator/PushbackIterator.java b/jena-arq/src/main/java/org/apache/jena/atlas/iterator/PushbackIterator.java
index 343df8c..355c563 100644
--- a/jena-arq/src/main/java/org/apache/jena/atlas/iterator/PushbackIterator.java
+++ b/jena-arq/src/main/java/org/apache/jena/atlas/iterator/PushbackIterator.java
@@ -16,46 +16,45 @@
* limitations under the License.
*/
-package org.apache.jena.atlas.iterator;
+package org.apache.jena.atlas.iterator ;
import java.util.ArrayDeque ;
import java.util.Deque ;
import java.util.Iterator ;
-public class PushbackIterator<T> implements Iterator<T>
-{
- private Deque<T> items = new ArrayDeque<>() ;
+/** An iterator where you can push items backinto the iterator, to be yielded (LIFO) next time.
+ * @see PeekIterator
+ */
+public class PushbackIterator<T> implements Iterator<T> {
+ private Deque<T> items = new ArrayDeque<>() ;
private Iterator<T> iter ;
- public PushbackIterator(Iterator <T> iter)
- {
- if ( iter == null ) throw new IllegalArgumentException("Wrapped iterator can't be null") ;
+ public PushbackIterator(Iterator<T> iter) {
+ if ( iter == null )
+ throw new IllegalArgumentException("Wrapped iterator can't be null") ;
this.iter = iter ;
}
-
- public void pushback(T item)
- {
+
+ public void pushback(T item) {
items.push(item) ;
}
-
+
@Override
- public boolean hasNext()
- {
- if ( !items.isEmpty() ) return true ;
+ public boolean hasNext() {
+ if ( !items.isEmpty() )
+ return true ;
return iter.hasNext() ;
}
@Override
- public T next()
- {
- if ( !items.isEmpty() )
+ public T next() {
+ if ( !items.isEmpty() )
return items.pop() ;
return iter.next() ;
}
@Override
- public void remove()
- {
+ public void remove() {
// Need to track if last next() was from the stack or not.
throw new UnsupportedOperationException() ;
}
[36/50] [abbrv] jena git commit: This closes #29
Posted by rv...@apache.org.
This closes #29
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/d40c2fa7
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/d40c2fa7
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/d40c2fa7
Branch: refs/heads/eliminate-assignments
Commit: d40c2fa7cce0d1879b6c492839c6e4dd5866bb35
Parents: 5c3ea36
Author: Andy Seaborne <an...@seaborne.org>
Authored: Wed Feb 11 09:51:27 2015 +0000
Committer: Andy Seaborne <an...@seaborne.org>
Committed: Wed Feb 11 09:51:27 2015 +0000
----------------------------------------------------------------------
----------------------------------------------------------------------
[07/50] [abbrv] jena git commit: JENA-879: remove eosgi dependency
(LGPL)
Posted by rv...@apache.org.
JENA-879: remove eosgi dependency (LGPL)
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/d59103dd
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/d59103dd
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/d59103dd
Branch: refs/heads/eliminate-assignments
Commit: d59103dd93beedd4a697f891a7f2c170eb3bc2b3
Parents: 362a605
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Mon Feb 2 23:36:45 2015 +0000
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Mon Feb 9 09:55:23 2015 +0000
----------------------------------------------------------------------
apache-jena-osgi/jena-osgi-test/pom.xml | 47 +---------------------------
1 file changed, 1 insertion(+), 46 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/d59103dd/apache-jena-osgi/jena-osgi-test/pom.xml
----------------------------------------------------------------------
diff --git a/apache-jena-osgi/jena-osgi-test/pom.xml b/apache-jena-osgi/jena-osgi-test/pom.xml
index 9ea355c..77869ba 100644
--- a/apache-jena-osgi/jena-osgi-test/pom.xml
+++ b/apache-jena-osgi/jena-osgi-test/pom.xml
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
+<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -44,13 +44,6 @@
<artifactId>junit</artifactId>
<scope>compile</scope>
</dependency>
- <dependency>
- <groupId>org.everit.osgi.dev</groupId>
- <artifactId>org.everit.osgi.dev.testrunner.junit4</artifactId>
- <version>3.0.4</version>
- <scope>test</scope>
- </dependency>
- <!-- NOTE: LGPL -->
<dependency>
<groupId>org.osgi</groupId>
@@ -71,47 +64,9 @@
<Bundle-Activator>org.apache.jena.osgi.test.JenaOSGITestActivator</Bundle-Activator>
<!-- <Import-Package>com.hp.hpl.jena</Import-Package> -->
<!-- <Embed-Dependency>artifactId=jena-core;inline=true</Embed-Dependency> -->
-
- <!-- Update according to expected number of @Test methods -->
- <EOSGi-TestNum>4</EOSGi-TestNum>
</instructions>
</configuration>
</plugin>
- <plugin>
- <groupId>org.everit.osgi.dev</groupId>
- <artifactId>eosgi-maven-plugin</artifactId>
- <version>3.1.0</version>
- <executions>
- <execution>
- <id>integration-test</id>
- <phase>integration-test</phase>
- <goals>
- <goal>integration-test</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <environments>
- <environment>
- <id>felix</id>
- <framework>felix</framework>
- <timeout>15000</timeout><!-- = 15s -->
- <systemProperties>
- <!-- We don't care if there are any JNAs -->
- <jna.nosys>true</jna.nosys>
- </systemProperties>
- </environment>
- <environment>
- <id>equinox</id>
- <framework>equinox</framework>
- <timeout>15000</timeout> <!-- = 15s -->
- <systemProperties>
- <jna.nosys>true</jna.nosys>
- </systemProperties>
- </environment>
- </environments>
- </configuration>
- </plugin>
</plugins>
</build>
[37/50] [abbrv] jena git commit: Set jena-iosgi-test parent to
apache-jena-osgi
Posted by rv...@apache.org.
Set jena-iosgi-test parent to apache-jena-osgi
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/aad04cfd
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/aad04cfd
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/aad04cfd
Branch: refs/heads/eliminate-assignments
Commit: aad04cfd3d5045f5041934cbbaf72b18f22e6238
Parents: d40c2fa
Author: Andy Seaborne <an...@seaborne.org>
Authored: Wed Feb 11 11:00:30 2015 +0000
Committer: Andy Seaborne <an...@seaborne.org>
Committed: Wed Feb 11 11:00:30 2015 +0000
----------------------------------------------------------------------
apache-jena-osgi/jena-osgi-test/pom.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/aad04cfd/apache-jena-osgi/jena-osgi-test/pom.xml
----------------------------------------------------------------------
diff --git a/apache-jena-osgi/jena-osgi-test/pom.xml b/apache-jena-osgi/jena-osgi-test/pom.xml
index a0dc894..1777bab 100644
--- a/apache-jena-osgi/jena-osgi-test/pom.xml
+++ b/apache-jena-osgi/jena-osgi-test/pom.xml
@@ -21,9 +21,9 @@ limitations under the License.
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.jena</groupId>
- <artifactId>jena-parent</artifactId>
- <version>12-SNAPSHOT</version>
- <relativePath>../jena-parent</relativePath>
+ <artifactId>apache-jena-osgi</artifactId>
+ <version>2.13.0-SNAPSHOT</version>
+ <relativePath>..</relativePath>
</parent>
<artifactId>jena-osgi-test</artifactId>
[28/50] [abbrv] jena git commit: pom.xml tab/space tidy
Posted by rv...@apache.org.
pom.xml tab/space tidy
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/f4495f73
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/f4495f73
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/f4495f73
Branch: refs/heads/eliminate-assignments
Commit: f4495f7334a87cd3ff8b6577b05cb1d890b7aadb
Parents: bfb3578
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Tue Feb 10 11:04:58 2015 +0000
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Tue Feb 10 11:04:58 2015 +0000
----------------------------------------------------------------------
apache-jena-osgi/jena-osgi-test/pom.xml | 44 ++++++++++++++--------------
1 file changed, 22 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/f4495f73/apache-jena-osgi/jena-osgi-test/pom.xml
----------------------------------------------------------------------
diff --git a/apache-jena-osgi/jena-osgi-test/pom.xml b/apache-jena-osgi/jena-osgi-test/pom.xml
index 5f2e4d0..cc2a774 100644
--- a/apache-jena-osgi/jena-osgi-test/pom.xml
+++ b/apache-jena-osgi/jena-osgi-test/pom.xml
@@ -17,7 +17,7 @@ limitations under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.jena</groupId>
@@ -123,29 +123,29 @@ limitations under the License.
<build>
<plugins>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <!-- <Import-Package>com.hp.hpl.jena</Import-Package> -->
- <!-- <Embed-Dependency>artifactId=jena-core;inline=true</Embed-Dependency> -->
- </instructions>
- </configuration>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <!-- <Import-Package>com.hp.hpl.jena</Import-Package> -->
+ <!-- <Embed-Dependency>artifactId=jena-core;inline=true</Embed-Dependency> -->
+ </instructions>
+ </configuration>
</plugin>
<plugin>
- <groupId>org.ops4j.pax.exam</groupId>
- <artifactId>exam-maven-plugin</artifactId>
- <version>${pax.exam.version}</version>
- <executions>
- <execution>
- <id>generate-link-files</id>
- <goals>
- <goal>generate-link-files</goal>
- </goals>
- <phase>generate-test-resources</phase>
- </execution>
- </executions>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>exam-maven-plugin</artifactId>
+ <version>${pax.exam.version}</version>
+ <executions>
+ <execution>
+ <id>generate-link-files</id>
+ <goals>
+ <goal>generate-link-files</goal>
+ </goals>
+ <phase>generate-test-resources</phase>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
[04/50] [abbrv] jena git commit: JENA-881 : Tests related to the
original report.
Posted by rv...@apache.org.
JENA-881 : Tests related to the original report.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/da06f269
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/da06f269
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/da06f269
Branch: refs/heads/eliminate-assignments
Commit: da06f269a7b8c70dfe094fa79480773f0a6d4cfe
Parents: 491d0f9
Author: Andy Seaborne <an...@apache.org>
Authored: Sat Feb 7 13:02:05 2015 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Sat Feb 7 13:02:05 2015 +0000
----------------------------------------------------------------------
.../optimize/TestTransformFilterPlacement.java | 58 +++++++++++++++++++-
1 file changed, 56 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/da06f269/jena-arq/src/test/java/com/hp/hpl/jena/sparql/algebra/optimize/TestTransformFilterPlacement.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/com/hp/hpl/jena/sparql/algebra/optimize/TestTransformFilterPlacement.java b/jena-arq/src/test/java/com/hp/hpl/jena/sparql/algebra/optimize/TestTransformFilterPlacement.java
index 45cb1e1..52b56fd 100644
--- a/jena-arq/src/test/java/com/hp/hpl/jena/sparql/algebra/optimize/TestTransformFilterPlacement.java
+++ b/jena-arq/src/test/java/com/hp/hpl/jena/sparql/algebra/optimize/TestTransformFilterPlacement.java
@@ -549,8 +549,62 @@ public class TestTransformFilterPlacement extends BaseTest { //extends AbstractT
test("(filter (= ?x 123) (filter (= ?y 456) (bgp (?s ?p ?x) (?s ?p ?y) (?s ?p ?z) )))" ,
"(sequence (filter (= ?y 456) (sequence (filter (= ?x 123) (bgp (?s ?p ?x))) (bgp (?s ?p ?y)))) (bgp (?s ?p ?z)))") ;
}
-
- // XXX Table tests.
+
+ // JENA-881
+ @Test public void place_filter_03() {
+ String x1 = StrUtils.strjoinNL
+ ("(filter true"
+ ," (union"
+ ," (table empty)"
+ ," (filter (= ?z 3)"
+ ," (table unit))))"
+ ) ;
+ String x2 = StrUtils.strjoinNL
+ ("(union"
+ ," (filter true"
+ ," (table empty))"
+ ," (filter (exprlist true (= ?z 3))"
+ ," (table unit)))"
+ ) ;
+ test(x1, x2) ;
+ }
+ // JENA-881
+ @Test public void place_filter_04() {
+ String x1 = StrUtils.strjoinNL
+ ("(filter true"
+ ," (union"
+ ," (filter false"
+ ," (table unit))"
+ ," (filter (!= ?z 3)"
+ ," (table unit))))"
+ ) ;
+ String x2 = StrUtils.strjoinNL
+ ("(union"
+ ," (filter (exprlist true false)"
+ ," (table unit))"
+ ," (filter (exprlist true (!= ?z 3))"
+ ," (table unit)))"
+ ) ;
+ test(x1, x2) ;
+ }
+ // JENA-881
+ @Test public void place_filter_05() {
+ String x1 = StrUtils.strjoinNL
+ ("(filter (= ?z 3)"
+ ," (sequence"
+ ," (filter (= ?y 3)"
+ ," (table unit))"
+ ," (bgp (triple ?s ?p ?z))))"
+ ) ;
+ String x2 = StrUtils.strjoinNL
+ ("(sequence"
+ ," (filter (= ?y 3)"
+ ," (table unit))"
+ ," (filter (= ?z 3)"
+ ," (bgp (triple ?s ?p ?z))))"
+ ) ;
+ test(x1, x2) ;
+ }
@Test public void place_union_01() {
test("(filter (= ?x 123) (union (bgp (?s ?p ?x) (?s ?p ?y)) (bgp (?s ?p ?z) (?s1 ?p1 ?x)) ))",
[49/50] [abbrv] jena git commit: Merge branch 'master' into
eliminate-assignments
Posted by rv...@apache.org.
Merge branch 'master' into eliminate-assignments
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/57cf5dd9
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/57cf5dd9
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/57cf5dd9
Branch: refs/heads/eliminate-assignments
Commit: 57cf5dd9adf21262167e12d944af32bd2b70a3a0
Parents: e1a8357 00ff878
Author: Rob Vesse <rv...@apache.org>
Authored: Tue Feb 17 12:19:57 2015 +0000
Committer: Rob Vesse <rv...@apache.org>
Committed: Tue Feb 17 12:19:57 2015 +0000
----------------------------------------------------------------------
.gitignore | 3 +-
NOTICE | 2 +-
apache-jena-libs/pom.xml | 2 +-
apache-jena-osgi/jena-osgi-test/pom.xml | 195 +
.../org/apache/jena/osgi/test/JenaOSGITest.java | 209 +
apache-jena-osgi/jena-osgi/pom.xml | 230 +
apache-jena-osgi/pom.xml | 51 +
apache-jena/NOTICE | 2 +-
apache-jena/pom.xml | 14 +-
jena-arq/Grammar/arq.jj | 20 +-
jena-arq/Grammar/master.jj | 25 +-
jena-arq/Grammar/sparql_11.jj | 18 +-
jena-arq/NOTICE | 2 +-
jena-arq/ReleaseNotes.txt | 4 +
jena-arq/pom.xml | 20 +-
jena-arq/rdf10 | 12 +
jena-arq/rdf11 | 12 +
jena-arq/src-examples/arq/examples/ExProg1.java | 9 +-
jena-arq/src-examples/arq/examples/ExProg2.java | 9 +-
.../arq/examples/ExQuerySelect1.java | 22 +-
.../arq/examples/ExQuerySelect2.java | 11 +-
.../arq/examples/ExampleDBpedia1.java | 12 +-
.../arq/examples/ExampleDBpedia2.java | 6 +-
.../arq/examples/ExampleDBpedia3.java | 21 +-
.../examples/aggregates/CustomAggregate.java | 113 +
.../examples/propertyfunction/labelSearch.java | 10 +-
.../examples/propertyfunction/localname.java | 3 +-
.../arq/examples/riot/ExRIOT_2.java | 17 +-
.../arq/examples/riot/ExRIOT_5.java | 9 +
jena-arq/src/main/java/arq/cmdline/CmdLARQ.java | 29 -
.../java/arq/cmdline/ModDatasetGeneral.java | 3 -
.../main/java/arq/cmdline/ModLangOutput.java | 134 +-
jena-arq/src/main/java/arq/iri.java | 4 +-
.../main/java/com/hp/hpl/jena/query/ARQ.java | 5 +-
.../com/hp/hpl/jena/query/DatasetAccessor.java | 1 -
.../com/hp/hpl/jena/query/QueryExecution.java | 4 +-
.../java/com/hp/hpl/jena/sparql/SystemARQ.java | 6 +-
.../hp/hpl/jena/sparql/algebra/Transformer.java | 4 +-
.../hpl/jena/sparql/algebra/op/OpQuadBlock.java | 2 +-
.../jena/sparql/algebra/op/OpQuadPattern.java | 2 +-
.../optimize/TransformFilterEquality.java | 78 +-
.../optimize/TransformFilterPlacement.java | 224 +-
.../com/hp/hpl/jena/sparql/core/DataBlock.java | 25 -
.../com/hp/hpl/jena/sparql/core/DataFormat.java | 65 -
.../jena/sparql/core/DatasetChangesCapture.java | 2 +-
.../hp/hpl/jena/sparql/core/DatasetGraph.java | 4 +-
.../jena/sparql/core/DatasetGraphCaching.java | 93 +-
.../sparql/core/DatasetGraphCollection.java | 7 +-
.../jena/sparql/core/DatasetGraphMonitor.java | 2 +-
.../jena/sparql/core/DatasetGraphSimpleMem.java | 5 +-
.../sparql/core/DatasetGraphViewGraphs.java | 4 +-
.../com/hp/hpl/jena/sparql/core/GraphView.java | 3 +-
.../com/hp/hpl/jena/sparql/core/QuadAction.java | 2 +-
.../engine/binding/BindingProjectBase.java | 2 +-
.../hp/hpl/jena/sparql/expr/ExprAggregator.java | 7 +-
.../com/hp/hpl/jena/sparql/expr/ExprList.java | 20 +-
.../hpl/jena/sparql/expr/ExprTransformer.java | 9 +-
.../com/hp/hpl/jena/sparql/expr/NodeValue.java | 47 +-
.../expr/aggregate/AccumulatorFactory.java | 31 +
.../hpl/jena/sparql/expr/aggregate/AggAvg.java | 24 +-
.../sparql/expr/aggregate/AggAvgDistinct.java | 25 +-
.../jena/sparql/expr/aggregate/AggCount.java | 12 +-
.../sparql/expr/aggregate/AggCountDistinct.java | 8 +-
.../jena/sparql/expr/aggregate/AggCountVar.java | 21 +-
.../expr/aggregate/AggCountVarDistinct.java | 21 +-
.../jena/sparql/expr/aggregate/AggCustom.java | 102 +-
.../sparql/expr/aggregate/AggGroupConcat.java | 78 +-
.../expr/aggregate/AggGroupConcatDistinct.java | 45 +-
.../hpl/jena/sparql/expr/aggregate/AggMax.java | 18 +-
.../jena/sparql/expr/aggregate/AggMaxBase.java | 9 +-
.../sparql/expr/aggregate/AggMaxDistinct.java | 18 +-
.../hpl/jena/sparql/expr/aggregate/AggMin.java | 18 +-
.../jena/sparql/expr/aggregate/AggMinBase.java | 9 +-
.../sparql/expr/aggregate/AggMinDistinct.java | 19 +-
.../hpl/jena/sparql/expr/aggregate/AggNull.java | 14 +-
.../jena/sparql/expr/aggregate/AggSample.java | 26 +-
.../expr/aggregate/AggSampleDistinct.java | 21 +-
.../hpl/jena/sparql/expr/aggregate/AggSum.java | 23 +-
.../sparql/expr/aggregate/AggSumDistinct.java | 22 +-
.../expr/aggregate/AggregateRegistry.java | 70 +
.../jena/sparql/expr/aggregate/Aggregator.java | 14 +-
.../sparql/expr/aggregate/AggregatorBase.java | 70 +-
.../expr/aggregate/AggregatorFactory.java | 5 +-
.../sparql/expr/nodevalue/NodeFunctions.java | 91 +-
.../sparql/expr/nodevalue/NodeValueDecimal.java | 2 +-
.../sparql/expr/nodevalue/NodeValueDouble.java | 2 +-
.../expr/nodevalue/NodeValueDuration.java | 2 +-
.../sparql/expr/nodevalue/NodeValueFloat.java | 2 +-
.../sparql/expr/nodevalue/NodeValueInteger.java | 2 +-
.../jena/sparql/expr/nodevalue/XSDFuncOp.java | 21 +-
.../hp/hpl/jena/sparql/graph/GraphDataBag.java | 5 +-
.../hp/hpl/jena/sparql/graph/GraphMemPlain.java | 9 +-
.../hp/hpl/jena/sparql/graph/GraphSPARQL.java | 2 +-
.../jena/sparql/graph/GraphSPARQLService.java | 5 +-
.../hpl/jena/sparql/graph/GraphUnionRead.java | 3 +-
.../hp/hpl/jena/sparql/graph/GraphWrapper.java | 12 +-
.../com/hp/hpl/jena/sparql/graph/NodeConst.java | 20 +-
.../com/hp/hpl/jena/sparql/lang/ParserBase.java | 16 +-
.../hp/hpl/jena/sparql/lang/arq/ARQParser.java | 596 +-
.../sparql/lang/sparql_11/SPARQLParser11.java | 16 +-
.../com/hp/hpl/jena/sparql/lib/DatasetLib.java | 6 +-
.../hpl/jena/sparql/modify/GraphStoreNull.java | 22 +-
.../hp/hpl/jena/sparql/modify/UpdateEngine.java | 2 +-
.../hp/hpl/jena/sparql/modify/UpdateSink.java | 2 +-
.../sparql/resultset/JSONInputIterator.java | 2 +-
.../sparql/resultset/JSONOutputResultSet.java | 17 +-
.../hp/hpl/jena/sparql/resultset/RDFOutput.java | 6 +-
.../jena/sparql/resultset/ResultSetCompare.java | 4 +-
.../jena/sparql/serializer/FmtExprSPARQL.java | 2 +-
.../java/com/hp/hpl/jena/sparql/sse/SSE.java | 11 +-
.../java/com/hp/hpl/jena/sparql/sse/Tags.java | 3 +-
.../jena/sparql/sse/builders/BuilderExpr.java | 25 +-
.../jena/sparql/sse/lang/ParseHandlerPlain.java | 4 +-
.../hp/hpl/jena/sparql/util/DateTimeStruct.java | 2 +-
.../com/hp/hpl/jena/sparql/util/ExprUtils.java | 8 +
.../com/hp/hpl/jena/sparql/util/FmtUtils.java | 67 +-
.../hpl/jena/sparql/util/NodeFactoryExtra.java | 18 +-
.../com/hp/hpl/jena/sparql/util/NodeUtils.java | 281 +-
.../hp/hpl/jena/sparql/util/StringUtils.java | 5 +-
.../java/com/hp/hpl/jena/sparql/util/Timer.java | 48 +-
.../java/com/hp/hpl/jena/sparql/util/Utils.java | 220 +-
.../hpl/jena/sparql/util/graph/GraphSink.java | 3 +-
.../org/apache/jena/atlas/iterator/Iter.java | 27 +-
.../jena/atlas/iterator/IteratorConcat.java | 19 +-
.../jena/atlas/iterator/IteratorCons.java | 9 +-
.../jena/atlas/iterator/IteratorWithBuffer.java | 117 +-
.../atlas/iterator/IteratorWithHistory.java | 61 +-
.../jena/atlas/iterator/PushbackIterator.java | 37 +-
.../org/apache/jena/atlas/lib/AlarmClock.java | 2 +-
.../org/apache/jena/atlas/lib/MultiMap.java | 26 +-
.../org/apache/jena/atlas/lib/Registry.java | 39 +
.../java/org/apache/jena/atlas/lib/Tuple.java | 2 +-
.../apache/jena/atlas/lib/cache/CacheLRU.java | 2 +-
.../org/apache/jena/atlas/logging/FmtLog.java | 61 +-
.../org/apache/jena/atlas/logging/LogCtl.java | 1 -
.../main/java/org/apache/jena/riot/Lang.java | 6 +-
.../java/org/apache/jena/riot/RDFDataMgr.java | 4 +-
.../java/org/apache/jena/riot/RDFFormat.java | 2 +-
.../java/org/apache/jena/riot/RDFLanguages.java | 13 +-
.../org/apache/jena/riot/RDFWriterRegistry.java | 14 +-
.../java/org/apache/jena/riot/ResultSetMgr.java | 30 +-
.../java/org/apache/jena/riot/RiotReader.java | 8 +-
.../java/org/apache/jena/riot/RiotWriter.java | 30 +-
.../jena/riot/checker/CheckerLiterals.java | 164 +-
.../jena/riot/lang/BlankNodeAllocator.java | 4 +-
.../jena/riot/lang/BlankNodeAllocatorLabel.java | 2 +-
.../lang/BlankNodeAllocatorLabelEncoded.java | 2 +-
.../org/apache/jena/riot/lang/JsonLDReader.java | 2 +-
.../org/apache/jena/riot/lang/LangNQuads.java | 3 +-
.../org/apache/jena/riot/lang/LangNTriples.java | 5 +
.../org/apache/jena/riot/lang/LangRDFJSON.java | 4 +-
.../org/apache/jena/riot/lang/LangRDFXML.java | 8 +-
.../org/apache/jena/riot/lang/LangTriG.java | 5 +-
.../org/apache/jena/riot/lang/LangTurtle.java | 5 +-
.../apache/jena/riot/out/NodeFormatterBase.java | 24 +-
.../org/apache/jena/riot/out/RDFJSONWriter.java | 54 -
.../apache/jena/riot/out/SinkEntityOutput.java | 147 -
.../process/normalize/CanonicalizeLiteral.java | 27 +-
.../riot/process/normalize/NormalizeValue.java | 16 +-
.../riot/process/normalize/NormalizeValue2.java | 4 +-
.../jena/riot/resultset/ResultSetReader.java | 8 +-
.../riot/resultset/ResultSetReaderRegistry.java | 4 +-
.../jena/riot/resultset/ResultSetWriter.java | 7 +-
.../riot/resultset/ResultSetWriterRegistry.java | 40 +-
.../org/apache/jena/riot/system/IRILib.java | 54 +-
.../apache/jena/riot/system/IRIResolver.java | 29 +-
.../jena/riot/system/ParserProfileBase.java | 4 +-
.../jena/riot/system/ParserProfileChecker.java | 4 +-
.../jena/riot/system/PrefixMapFactory.java | 2 +-
.../org/apache/jena/riot/system/RiotLib.java | 2 +-
.../jena/riot/system/StreamRDFWriter.java | 6 +-
.../jena/riot/system/stream/LocatorFile.java | 2 +-
.../jena/riot/system/stream/StreamManager.java | 4 +-
.../org/apache/jena/riot/thrift/BinRDF.java | 44 +-
.../jena/riot/thrift/StreamRDF2Thrift.java | 2 +-
.../java/org/apache/jena/riot/thrift/TRDF.java | 8 +-
.../apache/jena/riot/thrift/ThriftConvert.java | 8 +-
.../java/org/apache/jena/riot/tokens/Token.java | 231 +-
.../apache/jena/riot/tokens/TokenizerText.java | 20 +-
.../java/org/apache/jena/riot/web/HttpOp.java | 2 +-
.../java/org/apache/jena/riot/web/LangTag.java | 3 +-
.../apache/jena/riot/writer/RDFJSONWriter.java | 114 +-
.../jena/riot/writer/SinkEntityOutput.java | 148 -
.../apache/jena/riot/writer/TurtleShell.java | 14 +-
.../jena/riot/writer/WriterStreamRDFPlain.java | 4 +-
.../org/apache/jena/riot/writer/WriterTriX.java | 2 +-
.../src/main/java/riotcmd/CmdLangParse.java | 54 +-
jena-arq/src/main/resources/META-INF/NOTICE | 2 +-
.../optimize/TestTransformConstantFolding.java | 18 +
.../optimize/TestTransformFilterPlacement.java | 101 +-
.../algebra/optimize/TestTransformFilters.java | 30 +-
.../engine/iterator/TestQueryIterSort.java | 2 +-
.../com/hp/hpl/jena/sparql/expr/TS_Expr.java | 1 +
.../jena/sparql/expr/TestCustomAggregates.java | 163 +
.../hp/hpl/jena/sparql/expr/TestFunctions.java | 4 +-
.../hpl/jena/sparql/expr/TestNodeFunctions.java | 67 +-
.../hp/hpl/jena/sparql/expr/TestNodeValue.java | 26 +-
.../hp/hpl/jena/sparql/expr/TestOrdering.java | 52 +-
.../hp/hpl/jena/sparql/expr/TestXSDFuncOp.java | 64 +-
.../hpl/jena/sparql/syntax/TestSSE_Basic.java | 8 +-
.../hpl/jena/sparql/syntax/TestSSE_Forms.java | 2 +-
.../com/hp/hpl/jena/sparql/util/TS_Util.java | 4 +-
.../hp/hpl/jena/sparql/util/TestFmtUtils.java | 13 +-
.../com/hp/hpl/jena/sparql/util/TestList.java | 10 +-
.../com/hp/hpl/jena/sparql/util/TestUtils.java | 84 +
.../jena/atlas/data/TestDistinctDataBag.java | 2 +-
.../jena/atlas/data/TestDistinctDataNet.java | 2 +-
.../jena/atlas/data/TestSortedDataBag.java | 2 +-
.../apache/jena/riot/ErrorHandlerTestLib.java | 15 +-
.../test/java/org/apache/jena/riot/TC_Riot.java | 4 +-
.../org/apache/jena/riot/out/TestNodeFmt.java | 16 +-
.../apache/jena/riot/system/TestChecker.java | 1 +
.../jena/riot/tokens/TestTokenForNode.java | 6 +-
.../apache/jena/riot/tokens/TestTokenizer.java | 91 +-
.../apache/jena/riot/writer/TestRDFJSON.java | 17 +-
.../ARQ/BasicPatterns/result-B-01-RDF_10.n3 | 19 +
.../ARQ/BasicPatterns/result-B-01-RDF_11.n3 | 24 +
.../ARQ/Distinct/distinct-all_RDF_10.srx | 111 +
.../ARQ/Distinct/distinct-all_RDF_11.srx | 93 +
.../ARQ/Distinct/distinct-str_RDF_10.srx | 56 +
.../ARQ/Distinct/distinct-str_RDF_11.srx | 38 +
jena-arq/testing/ARQ/GroupBy/agg-1.srj | 3 +-
jena-arq/testing/ARQ/GroupBy/agg-2.srj | 3 +-
jena-arq/testing/ARQ/SPARQL11_RDF11.txt | 24 +
jena-arq/testing/ARQ/Sort/sort-2.rq | 2 +-
jena-arq/testing/ARQ/Sort/sort-3.rq | 2 +-
.../testing/ARQ/Sort/sort-result-2_RDF_10.ttl | 169 +
.../testing/ARQ/Sort/sort-result-2_RDF_11.ttl | 169 +
.../testing/ARQ/Sort/sort-result-3_RDF_10.ttl | 169 +
.../testing/ARQ/Sort/sort-result-3_RDF_11.ttl | 169 +
jena-arq/testing/DAWG-Final/AFS.txt | 8 -
jena-arq/testing/DAWG-Final/SPARQL11_RDF11.txt | 15 +
.../DAWG-Final/distinct/distinct-all_RDF_10.srx | 111 +
.../DAWG-Final/distinct/distinct-all_RDF_11.srx | 93 +
.../DAWG-Final/distinct/distinct-str_RDF_10.srx | 56 +
.../DAWG-Final/distinct/distinct-str_RDF_11.srx | 38 +
jena-core/NOTICE | 2 +-
jena-core/pom.xml | 2 +-
.../main/java/com/hp/hpl/jena/JenaRuntime.java | 2 +-
.../assemblers/FileModelAssembler.java | 17 +-
.../assemblers/UnionModelAssembler.java | 24 +-
.../com/hp/hpl/jena/datatypes/TypeMapper.java | 4 +-
.../hp/hpl/jena/datatypes/xsd/XSDDatatype.java | 2 +-
.../jena/datatypes/xsd/impl/RDFLangString.java | 66 +
.../jena/datatypes/xsd/impl/XMLLiteralType.java | 4 +-
.../datatypes/xsd/impl/XSDBaseStringType.java | 24 +-
.../java/com/hp/hpl/jena/graph/Factory.java | 17 +-
.../main/java/com/hp/hpl/jena/graph/Graph.java | 18 +-
.../java/com/hp/hpl/jena/graph/GraphUtil.java | 129 +-
.../java/com/hp/hpl/jena/graph/NodeFactory.java | 146 +-
.../main/java/com/hp/hpl/jena/graph/Triple.java | 12 +-
.../java/com/hp/hpl/jena/graph/TripleMatch.java | 4 +
.../com/hp/hpl/jena/graph/compose/Delta.java | 4 +-
.../hp/hpl/jena/graph/compose/Difference.java | 2 +-
.../hpl/jena/graph/compose/DisjointUnion.java | 3 +-
.../com/hp/hpl/jena/graph/compose/Dyadic.java | 4 +-
.../hp/hpl/jena/graph/compose/Intersection.java | 2 +-
.../hp/hpl/jena/graph/compose/MultiUnion.java | 6 +-
.../com/hp/hpl/jena/graph/compose/Union.java | 11 +-
.../hp/hpl/jena/graph/impl/CollectionGraph.java | 33 +-
.../com/hp/hpl/jena/graph/impl/GraphBase.java | 28 +-
.../hp/hpl/jena/graph/impl/LiteralLabel.java | 4 +-
.../jena/graph/impl/LiteralLabelFactory.java | 86 +-
.../hpl/jena/graph/impl/LiteralLabelImpl.java | 188 +-
.../hpl/jena/graph/impl/SimpleEventManager.java | 243 +-
.../com/hp/hpl/jena/graph/impl/TripleStore.java | 2 +-
.../hp/hpl/jena/graph/impl/WrappedGraph.java | 8 +-
.../main/java/com/hp/hpl/jena/mem/GraphMem.java | 4 +-
.../hp/hpl/jena/mem/GraphTripleStoreBase.java | 4 +-
.../com/hp/hpl/jena/n3/N3JenaWriterCommon.java | 13 +-
.../java/com/hp/hpl/jena/ontology/OntModel.java | 8 +-
.../rdf/model/EmptyListUpdateException.java | 2 +-
.../hp/hpl/jena/rdf/model/ResourceFactory.java | 8 +-
.../hp/hpl/jena/rdf/model/SimpleSelector.java | 2 +-
.../com/hp/hpl/jena/rdf/model/Statement.java | 24 +-
.../com/hp/hpl/jena/rdf/model/impl/AltImpl.java | 2 +-
.../hpl/jena/rdf/model/impl/ContainerImpl.java | 2 +-
.../hp/hpl/jena/rdf/model/impl/LiteralImpl.java | 10 +-
.../hp/hpl/jena/rdf/model/impl/ModelCom.java | 12 +-
.../hp/hpl/jena/rdf/model/impl/ReifierStd.java | 28 +-
.../com/hp/hpl/jena/rdf/model/impl/SeqImpl.java | 2 +-
.../hpl/jena/rdf/model/impl/StatementBase.java | 9 +-
.../com/hp/hpl/jena/rdf/model/impl/Util.java | 77 +-
.../hp/hpl/jena/rdfxml/xmlinput/JenaReader.java | 4 +-
.../rdfxml/xmlinput/impl/AbsXMLContext.java | 71 +-
.../rdfxml/xmlinput/impl/ParserSupport.java | 16 +-
.../jena/rdfxml/xmlinput/impl/XMLContext.java | 9 +-
.../rdfxml/xmlinput/lang/IanaLanguageTag.java | 145 -
.../hpl/jena/rdfxml/xmlinput/lang/Iso3166.java | 308 -
.../hpl/jena/rdfxml/xmlinput/lang/Iso639.java | 619 -
.../jena/rdfxml/xmlinput/lang/LanguageTag.java | 222 -
.../rdfxml/xmlinput/lang/LanguageTagCodes.java | 88 -
.../lang/LanguageTagSyntaxException.java | 47 -
.../hpl/jena/rdfxml/xmlinput/lang/package.html | 27 -
.../hpl/jena/rdfxml/xmloutput/impl/Basic.java | 18 +-
.../jena/rdfxml/xmloutput/impl/Unparser.java | 49 +-
.../com/hp/hpl/jena/reasoner/BaseInfGraph.java | 6 +-
.../com/hp/hpl/jena/reasoner/TriplePattern.java | 16 +-
.../rulesys/BasicForwardRuleInfGraph.java | 2 +-
.../jena/reasoner/rulesys/FBRuleInfGraph.java | 2 +-
.../hp/hpl/jena/reasoner/rulesys/Functor.java | 2 +-
.../reasoner/rulesys/Node_RuleVariable.java | 2 +-
.../com/hp/hpl/jena/reasoner/rulesys/Rule.java | 10 +-
.../com/hp/hpl/jena/reasoner/rulesys/Util.java | 8 +-
.../hpl/jena/reasoner/rulesys/builtins/Now.java | 2 +-
.../jena/reasoner/rulesys/impl/SafeGraph.java | 19 +-
.../hp/hpl/jena/shared/RandomOrderGraph.java | 4 +-
.../java/com/hp/hpl/jena/util/FileManager.java | 4 +-
.../java/com/hp/hpl/jena/util/PrintUtil.java | 26 +-
.../jena/util/iterator/IteratorIterator.java | 2 +-
.../java/com/hp/hpl/jena/vocabulary/RDF.java | 18 +-
jena-core/src/main/java/jena/rdfcat.java | 61 +-
jena-core/src/main/resources/META-INF/NOTICE | 2 +-
.../assembler/test/TestFileModelAssembler.java | 62 +-
.../jena/graph/compose/test/TestDifference.java | 60 +-
.../hpl/jena/graph/compose/test/TestDyadic.java | 2 +-
.../graph/compose/test/TestUnionStatistics.java | 2 +-
.../hp/hpl/jena/graph/test/NodeCreateUtils.java | 4 +-
.../hpl/jena/graph/test/TestFindLiterals.java | 57 +-
.../jena/graph/test/TestGraphBaseToString.java | 2 +-
.../hp/hpl/jena/graph/test/TestGraphUtils.java | 3 +-
.../graph/test/TestLiteralLabelSameValueAs.java | 99 +
.../hpl/jena/graph/test/TestLiteralLabels.java | 19 +-
.../com/hp/hpl/jena/graph/test/TestNode.java | 555 +-
.../com/hp/hpl/jena/graph/test/TestPackage.java | 1 +
.../hpl/jena/graph/test/TestTypedLiterals.java | 62 +-
.../com/hp/hpl/jena/mem/test/TestGraphMem.java | 2 +-
.../hp/hpl/jena/rdfxml/xmlinput/MoreTests.java | 2 +-
.../rulesys/test/FRuleEngineIFactoryTest.java | 14 +-
.../jena/reasoner/rulesys/test/TestBasicLP.java | 12 +-
.../jena/reasoner/rulesys/test/TestBugs.java | 2 +-
.../rulesys/test/TestComparatorBuiltins.java | 20 +-
.../jena/reasoner/rulesys/test/TestFBRules.java | 58 +-
.../reasoner/rulesys/test/TestLPDerivation.java | 2 +-
jena-csv/NOTICE | 2 +-
jena-csv/pom.xml | 11 +-
.../propertytable/graph/GraphPropertyTable.java | 44 +-
.../impl/PropertyTableHashMapImpl.java | 59 +-
jena-csv/src/main/resources/META-INF/NOTICE | 5 +
.../jena/propertytable/graph/GraphCSVTest.java | 1 -
jena-elephas/LICENSE | 176 +
jena-elephas/NOTICE | 5 +
jena-elephas/jena-elephas-common/pom.xml | 54 +
.../rdf/types/AbstractNodeTupleWritable.java | 193 +
.../rdf/types/CharacteristicSetWritable.java | 298 +
.../rdf/types/CharacteristicWritable.java | 160 +
.../hadoop/rdf/types/NodeTupleWritable.java | 80 +
.../jena/hadoop/rdf/types/NodeWritable.java | 188 +
.../jena/hadoop/rdf/types/QuadWritable.java | 136 +
.../jena/hadoop/rdf/types/TripleWritable.java | 138 +
.../comparators/SimpleBinaryComparator.java | 34 +
.../rdf/types/converters/ThriftConverter.java | 147 +
.../rdf/io/types/CharacteristicTests.java | 210 +
.../jena/hadoop/rdf/io/types/RdfTypesTest.java | 406 +
.../src/test/resources/log4j.properties | 19 +
jena-elephas/jena-elephas-io/pom.xml | 67 +
.../jena/hadoop/rdf/io/HadoopIOConstants.java | 49 +
.../jena/hadoop/rdf/io/RdfIOConstants.java | 81 +
.../io/input/AbstractNLineFileInputFormat.java | 70 +
.../io/input/AbstractWholeFileInputFormat.java | 42 +
.../hadoop/rdf/io/input/QuadsInputFormat.java | 46 +
.../hadoop/rdf/io/input/TriplesInputFormat.java | 42 +
.../rdf/io/input/TriplesOrQuadsInputFormat.java | 47 +
.../io/input/jsonld/JsonLDQuadInputFormat.java | 39 +
.../input/jsonld/JsonLDTripleInputFormat.java | 39 +
.../input/nquads/BlockedNQuadsInputFormat.java | 53 +
.../rdf/io/input/nquads/NQuadsInputFormat.java | 46 +
.../nquads/WholeFileNQuadsInputFormat.java | 51 +
.../ntriples/BlockedNTriplesInputFormat.java | 53 +
.../io/input/ntriples/NTriplesInputFormat.java | 46 +
.../ntriples/WholeFileNTriplesInputFormat.java | 51 +
.../io/input/rdfjson/RdfJsonInputFormat.java | 46 +
.../rdf/io/input/rdfxml/RdfXmlInputFormat.java | 46 +
.../AbstractBlockBasedNodeTupleReader.java | 344 +
.../readers/AbstractBlockBasedQuadReader.java | 51 +
.../readers/AbstractBlockBasedTripleReader.java | 51 +
.../AbstractLineBasedNodeTupleReader.java | 265 +
.../readers/AbstractLineBasedQuadReader.java | 50 +
.../readers/AbstractLineBasedTripleReader.java | 51 +
.../rdf/io/input/readers/AbstractRdfReader.java | 108 +
.../AbstractWholeFileNodeTupleReader.java | 328 +
.../readers/AbstractWholeFileQuadReader.java | 51 +
.../readers/AbstractWholeFileTripleReader.java | 51 +
.../rdf/io/input/readers/QuadsReader.java | 49 +
.../io/input/readers/TriplesOrQuadsReader.java | 72 +
.../rdf/io/input/readers/TriplesReader.java | 49 +
.../io/input/readers/TriplesToQuadsReader.java | 102 +
.../input/readers/jsonld/JsonLDQuadReader.java | 32 +
.../readers/jsonld/JsonLDTripleReader.java | 30 +
.../readers/nquads/BlockedNQuadsReader.java | 45 +
.../io/input/readers/nquads/NQuadsReader.java | 49 +
.../readers/nquads/WholeFileNQuadsReader.java | 42 +
.../readers/ntriples/BlockedNTriplesReader.java | 45 +
.../input/readers/ntriples/NTriplesReader.java | 48 +
.../ntriples/WholeFileNTriplesReader.java | 42 +
.../io/input/readers/rdfjson/RdfJsonReader.java | 37 +
.../io/input/readers/rdfxml/RdfXmlReader.java | 37 +
.../input/readers/thrift/ThriftQuadReader.java | 32 +
.../readers/thrift/ThriftTripleReader.java | 30 +
.../rdf/io/input/readers/trig/TriGReader.java | 37 +
.../rdf/io/input/readers/trix/TriXReader.java | 37 +
.../io/input/readers/turtle/TurtleReader.java | 37 +
.../io/input/thrift/ThriftQuadInputFormat.java | 39 +
.../input/thrift/ThriftTripleInputFormat.java | 39 +
.../rdf/io/input/trig/TriGInputFormat.java | 46 +
.../rdf/io/input/trix/TriXInputFormat.java | 42 +
.../rdf/io/input/turtle/TurtleInputFormat.java | 46 +
.../rdf/io/input/util/BlockInputStream.java | 94 +
.../hadoop/rdf/io/input/util/RdfIOUtils.java | 101 +
.../rdf/io/input/util/TrackableInputStream.java | 38 +
.../rdf/io/input/util/TrackedInputStream.java | 124 +
.../io/input/util/TrackedPipedQuadsStream.java | 55 +
.../io/input/util/TrackedPipedRDFStream.java | 64 +
.../input/util/TrackedPipedTriplesStream.java | 56 +
.../AbstractBatchedNodeTupleOutputFormat.java | 55 +
.../rdf/io/output/AbstractNodeOutputFormat.java | 94 +
.../output/AbstractNodeTupleOutputFormat.java | 109 +
.../AbstractStreamRdfNodeTupleOutputFormat.java | 73 +
.../hadoop/rdf/io/output/QuadsOutputFormat.java | 64 +
.../io/output/TriplesOrQuadsOutputFormat.java | 74 +
.../rdf/io/output/TriplesOutputFormat.java | 61 +
.../output/jsonld/JsonLDQuadOutputFormat.java | 44 +
.../output/jsonld/JsonLDTripleOutputFormat.java | 44 +
.../io/output/nquads/NQuadsOutputFormat.java | 52 +
.../ntriples/NTriplesNodeOutputFormat.java | 45 +
.../output/ntriples/NTriplesOutputFormat.java | 52 +
.../io/output/rdfjson/RdfJsonOutputFormat.java | 52 +
.../io/output/rdfxml/RdfXmlOutputFormat.java | 52 +
.../output/thrift/ThriftQuadOutputFormat.java | 51 +
.../output/thrift/ThriftTripleOutputFormat.java | 52 +
.../io/output/trig/BatchedTriGOutputFormat.java | 54 +
.../rdf/io/output/trig/TriGOutputFormat.java | 58 +
.../rdf/io/output/trix/TriXOutputFormat.java | 57 +
.../turtle/BatchedTurtleOutputFormat.java | 50 +
.../io/output/turtle/TurtleOutputFormat.java | 56 +
.../writers/AbstractBatchedNodeTupleWriter.java | 113 +
.../writers/AbstractBatchedQuadWriter.java | 80 +
.../writers/AbstractBatchedTripleWriter.java | 68 +
.../AbstractLineBasedNodeTupleWriter.java | 152 +
.../writers/AbstractLineBasedQuadWriter.java | 71 +
.../writers/AbstractLineBasedTripleWriter.java | 68 +
.../io/output/writers/AbstractNodeWriter.java | 192 +
.../AbstractStreamRdfNodeTupleWriter.java | 71 +
.../AbstractWholeFileNodeTupleWriter.java | 96 +
.../writers/AbstractWholeFileQuadWriter.java | 66 +
.../writers/AbstractWholeFileTripleWriter.java | 65 +
.../io/output/writers/QuadsToTriplesWriter.java | 59 +
.../io/output/writers/StreamRdfQuadWriter.java | 45 +
.../output/writers/StreamRdfTripleWriter.java | 44 +
.../output/writers/jsonld/JsonLDQuadWriter.java | 38 +
.../writers/jsonld/JsonLDTripleWriter.java | 38 +
.../io/output/writers/nquads/NQuadsWriter.java | 57 +
.../writers/ntriples/NTriplesNodeWriter.java | 59 +
.../output/writers/ntriples/NTriplesWriter.java | 58 +
.../output/writers/rdfjson/RdfJsonWriter.java | 51 +
.../io/output/writers/rdfxml/RdfXmlWriter.java | 51 +
.../output/writers/thrift/ThriftQuadWriter.java | 38 +
.../writers/thrift/ThriftTripleWriter.java | 38 +
.../output/writers/trig/BatchedTriGWriter.java | 52 +
.../writers/turtle/BatchedTurtleWriter.java | 54 +
.../rdf/io/registry/HadoopRdfIORegistry.java | 310 +
.../hadoop/rdf/io/registry/ReaderFactory.java | 83 +
.../hadoop/rdf/io/registry/WriterFactory.java | 96 +
.../readers/AbstractQuadsOnlyReaderFactory.java | 83 +
.../registry/readers/AbstractReaderFactory.java | 80 +
.../AbstractTriplesOnlyReaderFactory.java | 83 +
.../registry/readers/JsonLDReaderFactory.java | 49 +
.../registry/readers/NQuadsReaderFactory.java | 42 +
.../registry/readers/NTriplesReaderFactory.java | 38 +
.../registry/readers/RdfJsonReaderFactory.java | 41 +
.../registry/readers/RdfXmlReaderFactory.java | 40 +
.../registry/readers/ThriftReaderFactory.java | 49 +
.../io/registry/readers/TriGReaderFactory.java | 42 +
.../io/registry/readers/TriXReaderFactory.java | 41 +
.../registry/readers/TurtleReaderFactory.java | 40 +
.../writers/AbstractQuadsOnlyWriterFactory.java | 86 +
.../AbstractTriplesOnlyWriterFactory.java | 85 +
.../registry/writers/AbstractWriterFactory.java | 82 +
.../registry/writers/JsonLDWriterFactory.java | 52 +
.../registry/writers/NQuadsWriterFactory.java | 44 +
.../registry/writers/NTriplesWriterFactory.java | 44 +
.../registry/writers/RdfJsonWriterFactory.java | 43 +
.../registry/writers/RdfXmlWriterFactory.java | 44 +
.../registry/writers/ThriftWriterFactory.java | 57 +
.../io/registry/writers/TriGWriterFactory.java | 45 +
.../io/registry/writers/TriXWriterFactory.java | 47 +
.../registry/writers/TurtleWriterFactory.java | 45 +
...he.jena.hadoop.rdf.io.registry.ReaderFactory | 10 +
...he.jena.hadoop.rdf.io.registry.WriterFactory | 10 +
.../rdf/io/RdfTriplesInputTestMapper.java | 47 +
.../AbstractBlockedQuadInputFormatTests.java | 33 +
.../AbstractBlockedTripleInputFormatTests.java | 33 +
.../AbstractNodeTupleInputFormatTests.java | 612 +
.../io/input/AbstractQuadsInputFormatTests.java | 70 +
.../input/AbstractTriplesInputFormatTests.java | 72 +
.../AbstractWholeFileQuadInputFormatTests.java | 115 +
...AbstractWholeFileTripleInputFormatTests.java | 108 +
.../io/input/bnodes/AbstractBlankNodeTests.java | 636 +
.../bnodes/AbstractTripleBlankNodeTests.java | 65 +
.../input/bnodes/JsonLdTripleBlankNodeTest.java | 63 +
.../io/input/bnodes/NTriplesBlankNodeTest.java | 58 +
.../io/input/bnodes/RdfJsonBlankNodeTest.java | 58 +
.../io/input/bnodes/RdfThriftBlankNodeTest.java | 68 +
.../io/input/bnodes/RdfXmlBlankNodeTest.java | 62 +
.../io/input/bnodes/TurtleBlankNodeTest.java | 58 +
...ractCompressedNodeTupleInputFormatTests.java | 74 +
...AbstractCompressedQuadsInputFormatTests.java | 71 +
...stractCompressedTriplesInputFormatTests.java | 71 +
...CompressedWholeFileQuadInputFormatTests.java | 150 +
...mpressedWholeFileTripleInputFormatTests.java | 144 +
...actCompressedJsonLDQuadInputFormatTests.java | 74 +
...tCompressedJsonLDTripleInputFormatTests.java | 74 +
.../jsonld/BZippedJsonLDQuadInputTest.java | 34 +
.../jsonld/BZippedJsonLDTripleInputTest.java | 34 +
.../jsonld/DeflatedJsonLDQuadInputTest.java | 34 +
.../jsonld/DeflatedJsonLDTripleInputTest.java | 34 +
.../jsonld/GZippedJsonLDQuadInputTest.java | 34 +
.../jsonld/GZippedJsonLDTripleInputTest.java | 34 +
...bstractCompressedNQuadsInputFormatTests.java | 68 +
...mpressedWholeFileNQuadsInputFormatTests.java | 75 +
.../nquads/BZipppedNQuadsInputTest.java | 38 +
.../BZipppedWholeFileNQuadsInputTest.java | 37 +
.../nquads/DeflatedNQuadsInputTest.java | 37 +
.../DeflatedWholeFileNQuadsInputTest.java | 37 +
.../nquads/GZippedNQuadsInputTest.java | 38 +
.../nquads/GZippedWholeFileNQuadsInputTest.java | 38 +
...mpressedBlockedNTriplesInputFormatTests.java | 53 +
...tractCompressedNTriplesInputFormatTests.java | 68 +
...ressedWholeFileNTriplesInputFormatTests.java | 75 +
.../ntriples/BZippedBlockedNTriplesInput.java | 37 +
.../ntriples/BZippedNTriplesInputTest.java | 38 +
.../BZippedWholeFileNTriplesInputTest.java | 38 +
.../ntriples/DeflatedBlockedNTriplesInput.java | 37 +
.../ntriples/DeflatedNTriplesInputTest.java | 38 +
.../DeflatedWholeFileNTriplesInputTest.java | 38 +
.../ntriples/GZippedBlockedNTriplesInput.java | 37 +
.../ntriples/GZippedNTriplesInputTest.java | 41 +
.../GZippedWholeFileNTriplesInputTest.java | 38 +
...stractCompressedRdfJsonInputFormatTests.java | 74 +
.../rdfjson/BZippedRdfJsonInputTest.java | 37 +
.../rdfjson/DeflatedRdfJsonInputTest.java | 37 +
.../rdfjson/GZippedRdfJsonInputTest.java | 37 +
...bstractCompressedRdfXmlInputFormatTests.java | 75 +
.../rdfxml/BZippedRdfXmlInputTest.java | 37 +
.../rdfxml/DeflatedRdfXmlInputTest.java | 37 +
.../rdfxml/GZippedRdfXmlInputTest.java | 37 +
...actCompressedThriftQuadInputFormatTests.java | 72 +
...tCompressedThriftTripleInputFormatTests.java | 72 +
.../thrift/BZippedThriftQuadInputTest.java | 34 +
.../thrift/BZippedThriftTripleInputTest.java | 34 +
.../thrift/DeflatedThriftQuadInputTest.java | 34 +
.../thrift/DeflatedThriftTripleInputTest.java | 34 +
.../thrift/GZippedThriftQuadInputTest.java | 34 +
.../thrift/GZippedThriftTripleInputTest.java | 34 +
.../AbstractCompressedTriGInputFormatTests.java | 72 +
.../compressed/trig/BZippedTriGInputTest.java | 37 +
.../compressed/trig/DeflatedTriGInputTest.java | 37 +
.../compressed/trig/GZippedTriGInputTest.java | 37 +
.../AbstractCompressedTriXInputFormatTests.java | 72 +
.../compressed/trix/BZippedTriXInputTest.java | 35 +
.../compressed/trix/DeflatedTriXInputTest.java | 35 +
.../compressed/trix/GZippedTriXInputTest.java | 35 +
...bstractCompressedTurtleInputFormatTests.java | 75 +
.../turtle/BZippedTurtleInputTest.java | 37 +
.../turtle/DeflatedTurtleInputTest.java | 37 +
.../turtle/GZippedTurtleInputTest.java | 37 +
.../io/input/jsonld/JsonLDQuadInputTest.java | 50 +
.../io/input/jsonld/JsonLDTripleInputTest.java | 50 +
.../io/input/nquads/BlockedNQuadsInputTest.java | 51 +
.../rdf/io/input/nquads/NQuadsInputTest.java | 44 +
.../input/nquads/WholeFileNQuadsInputTest.java | 51 +
.../ntriples/BlockedNTriplesInputTest.java | 50 +
.../io/input/ntriples/NTriplesInputTest.java | 44 +
.../ntriples/WholeFileNTriplesInputTest.java | 52 +
.../rdf/io/input/rdfjson/RdfJsonInputTest.java | 51 +
.../rdf/io/input/rdfxml/RdfXmlInputTest.java | 51 +
.../io/input/thrift/ThriftQuadInputTest.java | 51 +
.../io/input/thrift/ThriftTripleInputTest.java | 51 +
.../hadoop/rdf/io/input/trig/TriGInputTest.java | 50 +
.../hadoop/rdf/io/input/trix/TriXInputTest.java | 50 +
.../rdf/io/input/turtle/TurtleInputTest.java | 50 +
.../util/AbstractTrackableInputStreamTests.java | 701 +
.../rdf/io/input/util/BlockInputStreamTest.java | 240 +
.../io/input/util/TrackedInputStreamTest.java | 39 +
.../AbstractNodeTupleOutputFormatTests.java | 255 +
.../output/AbstractQuadOutputFormatTests.java | 51 +
.../output/AbstractTripleOutputFormatTests.java | 47 +
.../io/output/jsonld/JsonLdQuadOutputTest.java | 47 +
.../output/jsonld/JsonLdTripleOutputTest.java | 47 +
.../rdf/io/output/nquads/NQuadsOutputTest.java | 51 +
.../io/output/ntriples/NTriplesOutputTest.java | 51 +
.../io/output/rdfjson/RdfJsonOutputTest.java | 51 +
.../rdf/io/output/rdfxml/RdfXmlOutputTest.java | 51 +
.../io/output/thrift/ThriftQuadOutputTest.java | 48 +
.../output/thrift/ThriftTripleOutputTest.java | 48 +
.../io/output/trig/BatchedTriGOutputTest.java | 92 +
.../io/output/trig/StreamedTriGOutputTest.java | 92 +
.../output/trig/TriGBlankNodeOutputTests.java | 120 +
.../rdf/io/output/trix/TriXOutputTest.java | 47 +
.../output/turtle/BatchedTurtleOutputTest.java | 92 +
.../output/turtle/StreamedTurtleOutputTest.java | 92 +
.../turtle/TurtleBlankNodeOutputTests.java | 118 +
.../io/registry/TestHadoopRdfIORegistry.java | 186 +
.../src/test/resources/log4j.properties | 12 +
jena-elephas/jena-elephas-mapreduce/pom.xml | 87 +
.../jena/hadoop/rdf/mapreduce/KeyMapper.java | 54 +
.../hadoop/rdf/mapreduce/KeyPlusNullMapper.java | 55 +
.../jena/hadoop/rdf/mapreduce/KeyReducer.java | 39 +
.../hadoop/rdf/mapreduce/NullPlusKeyMapper.java | 55 +
.../rdf/mapreduce/NullPlusKeyReducer.java | 59 +
.../rdf/mapreduce/NullPlusValueMapper.java | 55 +
.../rdf/mapreduce/NullPlusValueReducer.java | 64 +
.../rdf/mapreduce/RdfMapReduceConstants.java | 67 +
.../jena/hadoop/rdf/mapreduce/SwapMapper.java | 55 +
.../jena/hadoop/rdf/mapreduce/SwapReducer.java | 43 +
.../hadoop/rdf/mapreduce/TextCountReducer.java | 49 +
.../jena/hadoop/rdf/mapreduce/ValueMapper.java | 54 +
.../rdf/mapreduce/ValuePlusNullMapper.java | 55 +
.../jena/hadoop/rdf/mapreduce/ValueReducer.java | 44 +
...tractCharacteristicSetGeneratingReducer.java | 179 +
.../CharacteristicSetReducer.java | 68 +
.../QuadCharacteristicSetGeneratingReducer.java | 39 +
...ripleCharacteristicSetGeneratingReducer.java | 40 +
.../count/AbstractNodeTupleNodeCountMapper.java | 66 +
.../rdf/mapreduce/count/NodeCountReducer.java | 50 +
.../mapreduce/count/QuadNodeCountMapper.java | 44 +
.../mapreduce/count/TripleNodeCountMapper.java | 42 +
.../datatypes/QuadDataTypeCountMapper.java | 56 +
.../datatypes/TripleDataTypeCountMapper.java | 56 +
.../AbstractNodeTupleNamespaceCountMapper.java | 135 +
.../namespaces/QuadNamespaceCountMapper.java | 44 +
.../namespaces/TripleNamespaceCountMapper.java | 44 +
.../count/positional/QuadGraphCountMapper.java | 42 +
.../count/positional/QuadObjectCountMapper.java | 42 +
.../positional/QuadPredicateCountMapper.java | 42 +
.../positional/QuadSubjectCountMapper.java | 41 +
.../positional/TripleObjectCountMapper.java | 41 +
.../positional/TriplePredicateCountMapper.java | 42 +
.../positional/TripleSubjectCountMapper.java | 41 +
.../filter/AbstractNodeTupleFilterMapper.java | 76 +
.../filter/AbstractQuadFilterMapper.java | 35 +
.../filter/AbstractTripleFilterMapper.java | 35 +
.../filter/GroundQuadFilterMapper.java | 47 +
.../filter/GroundTripleFilterMapper.java | 47 +
.../mapreduce/filter/ValidQuadFilterMapper.java | 48 +
.../filter/ValidTripleFilterMapper.java | 47 +
.../AbstractQuadFilterByPositionMapper.java | 171 +
.../AbstractTripleFilterByPositionMapper.java | 141 +
.../positional/QuadFilterByGraphUriMapper.java | 76 +
.../positional/QuadFilterByObjectUriMapper.java | 76 +
.../positional/QuadFilterByPredicateMapper.java | 76 +
.../QuadFilterBySubjectUriMapper.java | 76 +
.../TripleFilterByObjectUriMapper.java | 71 +
.../TripleFilterByPredicateUriMapper.java | 71 +
.../TripleFilterBySubjectUriMapper.java | 71 +
.../group/AbstractNodeTupleGroupingMapper.java | 60 +
.../group/AbstractQuadGroupingMapper.java | 50 +
.../group/AbstractTripleGroupingMapper.java | 44 +
.../mapreduce/group/QuadGroupByGraphMapper.java | 39 +
.../group/QuadGroupByObjectMapper.java | 39 +
.../group/QuadGroupByPredicateMapper.java | 39 +
.../group/QuadGroupBySubjectMapper.java | 39 +
.../group/TripleGroupByObjectMapper.java | 41 +
.../group/TripleGroupByPredicateMapper.java | 41 +
.../group/TripleGroupBySubjectMapper.java | 41 +
.../AbstractNodeTupleSplitToNodesMapper.java | 60 +
.../AbstractNodeTupleSplitWithNodesMapper.java | 60 +
.../mapreduce/split/QuadSplitToNodesMapper.java | 43 +
.../split/QuadSplitWithNodesMapper.java | 43 +
.../split/TripleSplitToNodesMapper.java | 41 +
.../split/TripleSplitWithNodesMapper.java | 41 +
.../transform/AbstractTriplesToQuadsMapper.java | 60 +
.../transform/QuadsToTriplesMapper.java | 46 +
.../TriplesToQuadsBySubjectMapper.java | 40 +
.../TriplesToQuadsConstantGraphMapper.java | 75 +
.../rdf/mapreduce/AbstractMapReduceTests.java | 69 +
.../rdf/mapreduce/AbstractMapperTests.java | 69 +
.../rdf/mapreduce/TestDistinctTriples.java | 129 +
...CharacteristicSetGeneratingReducerTests.java | 185 +
.../CharacteristicSetReducerTest.java | 192 +
...eCharacteristicSetGeneratingReducerTest.java | 59 +
.../AbstractNodeTupleNodeCountReducedTests.java | 149 +
.../count/AbstractNodeTupleNodeCountTests.java | 138 +
.../count/QuadNodeCountMapReduceTest.java | 67 +
.../count/QuadNodeCountMapperTest.java | 59 +
.../count/TripleNodeCountMapReduceTest.java | 66 +
.../count/TripleNodeCountMapperTest.java | 58 +
.../filter/AbstractNodeTupleFilterTests.java | 146 +
.../filter/AbstractQuadValidityFilterTests.java | 86 +
.../AbstractTripleValidityFilterTests.java | 73 +
.../TripleFilterByNoPredicateMapperTest.java | 49 +
.../TripleFilterByPredicateMapperTest.java | 80 +
...leInvertedFilterByNoPredicateMapperTest.java | 54 +
...ipleInvertedFilterByPredicateMapperTest.java | 87 +
.../filter/ValidQuadFilterMapperTest.java | 40 +
.../filter/ValidTripleFilterMapperTest.java | 40 +
.../group/AbstractNodeTupleGroupingTests.java | 114 +
.../group/AbstractQuadGroupingTests.java | 43 +
.../group/AbstractTripleGroupingTests.java | 41 +
.../group/QuadGroupByGraphMapperTest.java | 46 +
.../group/QuadGroupByObjectMapperTest.java | 46 +
.../group/QuadGroupByPredicateMapperTest.java | 46 +
.../group/QuadGroupBySubjectMapperTest.java | 46 +
.../group/TripleGroupByObjectMapperTest.java | 46 +
.../group/TripleGroupByPredicateMapperTest.java | 46 +
.../group/TripleGroupBySubjectMapperTest.java | 46 +
.../AbstractNodeTupleSplitToNodesTests.java | 116 +
.../AbstractNodeTupleSplitWithNodesTests.java | 116 +
.../split/AbstractQuadSplitToNodesTests.java | 53 +
.../split/AbstractQuadSplitWithNodesTests.java | 53 +
.../split/AbstractTripleSplitToNodesTests.java | 52 +
.../AbstractTripleSplitWithNodesTests.java | 52 +
.../split/QuadSplitToNodesMapperTest.java | 41 +
.../split/QuadSplitWithNodesMapperTest.java | 41 +
.../split/TripleSplitToNodesMapperTest.java | 41 +
.../split/TripleSplitWithNodesMapperTest.java | 42 +
.../transform/QuadsToTriplesMapperTest.java | 113 +
.../TriplesToQuadsBySubjectMapperTest.java | 113 +
.../TriplesToQuadsConstantGraphMapperTest.java | 113 +
.../src/test/resources/log4j.properties | 12 +
jena-elephas/jena-elephas-stats/hadoop-job.xml | 46 +
jena-elephas/jena-elephas-stats/pom.xml | 102 +
.../apache/jena/hadoop/rdf/stats/RdfStats.java | 425 +
.../jena/hadoop/rdf/stats/jobs/JobFactory.java | 821 +
jena-elephas/pom.xml | 110 +
jena-extras/jena-querybuilder/pom.xml | 2 +-
.../arq/querybuilder/AbstractQueryBuilder.java | 2 +-
.../jena/arq/AbstractRegexpBasedTest.java | 14 +-
.../querybuilder/AbstractQueryBuilderTest.java | 2 +-
.../arq/querybuilder/SelectBuilderTest.java | 3 +-
.../querybuilder/clauses/WhereClauseTest.java | 79 +-
.../handlers/SolutionModifierHandlerTest.java | 2 +-
.../querybuilder/handlers/WhereHandlerTest.java | 2 +-
jena-extras/pom.xml | 2 +-
jena-fuseki/.gitignore | 1 +
jena-fuseki/NOTICE | 2 +-
jena-fuseki/dist/NOTICE | 2 +-
jena-fuseki/fuseki | 19 +-
jena-fuseki/pages/xml-to-html-links.xsl | 47 +-
jena-fuseki/pom.xml | 6 +-
jena-fuseki/run-fuseki | 4 +-
jena-fuseki/run_cp | 25 -
.../org/apache/jena/fuseki/conneg/ConNeg.java | 88 +-
.../jena/fuseki/servlets/SPARQL_Query.java | 18 +-
jena-fuseki/src/main/resources/META-INF/NOTICE | 2 +-
jena-fuseki2/D.trig | 20 -
jena-fuseki2/D.ttl | 19 -
jena-fuseki2/Data/books.ttl | 62 -
jena-fuseki2/Data/test_abox.ttl | 21 -
jena-fuseki2/Data/test_data_rdfs.ttl | 28 -
jena-fuseki2/Data/test_tbox.ttl | 25 -
jena-fuseki2/LICENSE | 17 +-
jena-fuseki2/NOTICE | 2 +-
.../apache-jena-fuseki/assembly-dist.xml | 99 +
jena-fuseki2/apache-jena-fuseki/backup | 22 +
jena-fuseki2/apache-jena-fuseki/bin/s-delete | 707 +
jena-fuseki2/apache-jena-fuseki/bin/s-get | 707 +
jena-fuseki2/apache-jena-fuseki/bin/s-head | 707 +
jena-fuseki2/apache-jena-fuseki/bin/s-post | 707 +
jena-fuseki2/apache-jena-fuseki/bin/s-put | 707 +
jena-fuseki2/apache-jena-fuseki/bin/s-query | 707 +
jena-fuseki2/apache-jena-fuseki/bin/s-update | 707 +
.../apache-jena-fuseki/bin/s-update-form | 707 +
jena-fuseki2/apache-jena-fuseki/bin/soh | 707 +
jena-fuseki2/apache-jena-fuseki/dist/ABOUT | 1 +
jena-fuseki2/apache-jena-fuseki/dist/LICENSE | 617 +
jena-fuseki2/apache-jena-fuseki/dist/NOTICE | 216 +
jena-fuseki2/apache-jena-fuseki/fuseki | 486 +
jena-fuseki2/apache-jena-fuseki/fuseki-server | 80 +
.../apache-jena-fuseki/fuseki-server.bat | 28 +
jena-fuseki2/apache-jena-fuseki/pom.xml | 95 +
jena-fuseki2/assembly-dist.xml | 88 -
jena-fuseki2/backup | 22 -
jena-fuseki2/bin/s-delete | 707 -
jena-fuseki2/bin/s-get | 707 -
jena-fuseki2/bin/s-head | 707 -
jena-fuseki2/bin/s-post | 707 -
jena-fuseki2/bin/s-put | 707 -
jena-fuseki2/bin/s-query | 707 -
jena-fuseki2/bin/s-update | 707 -
jena-fuseki2/bin/s-update-form | 707 -
jena-fuseki2/bin/soh | 707 -
jena-fuseki2/dist/ABOUT | 1 -
jena-fuseki2/dist/LICENSE | 608 -
jena-fuseki2/dist/NOTICE | 216 -
jena-fuseki2/dwim | 19 -
jena-fuseki2/dwim-upload | 48 -
jena-fuseki2/fuseki | 477 -
jena-fuseki2/fuseki-server | 64 -
jena-fuseki2/fuseki-server.bat | 19 -
jena-fuseki2/jena-fuseki-core/fuseki-dev | 77 +
jena-fuseki2/jena-fuseki-core/make_cp_mvn | 50 +
jena-fuseki2/jena-fuseki-core/pom.xml | 314 +
.../main/java/org/apache/jena/fuseki/DEF.java | 79 +
.../java/org/apache/jena/fuseki/Fuseki.java | 227 +
.../java/org/apache/jena/fuseki/FusekiCmd.java | 49 +
.../jena/fuseki/FusekiConfigException.java | 28 +
.../org/apache/jena/fuseki/FusekiException.java | 29 +
.../java/org/apache/jena/fuseki/FusekiLib.java | 258 +
.../org/apache/jena/fuseki/FusekiLogging.java | 171 +
.../jena/fuseki/FusekiNotFoundException.java | 26 +
.../jena/fuseki/FusekiRequestException.java | 57 +
.../org/apache/jena/fuseki/async/AsyncPool.java | 97 +
.../org/apache/jena/fuseki/async/AsyncTask.java | 114 +
.../fuseki/authz/AuthorizationFilter403.java | 59 +
.../apache/jena/fuseki/authz/DenyFilter.java | 33 +
.../jena/fuseki/authz/LocalhostFilter.java | 62 +
.../org/apache/jena/fuseki/build/Builder.java | 149 +
.../jena/fuseki/build/DataServiceDesc.java | 107 +
.../apache/jena/fuseki/build/FusekiConfig.java | 261 +
.../org/apache/jena/fuseki/build/Template.java | 52 +
.../jena/fuseki/build/TemplateFunctions.java | 87 +
.../org/apache/jena/fuseki/cmd/FusekiCmd.java | 341 +
.../org/apache/jena/fuseki/conneg/ConNeg.java | 206 +
.../org/apache/jena/fuseki/conneg/WebLib.java | 60 +
.../jena/fuseki/jetty/FusekiErrorHandler.java | 95 +
.../apache/jena/fuseki/jetty/JettyFuseki.java | 310 +
.../jena/fuseki/jetty/JettyServerConfig.java | 51 +
.../apache/jena/fuseki/mgt/ActionAsyncTask.java | 70 +
.../apache/jena/fuseki/mgt/ActionBackup.java | 84 +
.../jena/fuseki/mgt/ActionContainerItem.java | 94 +
.../org/apache/jena/fuseki/mgt/ActionCtl.java | 97 +
.../apache/jena/fuseki/mgt/ActionDatasets.java | 404 +
.../org/apache/jena/fuseki/mgt/ActionItem.java | 45 +
.../org/apache/jena/fuseki/mgt/ActionLogs.java | 59 +
.../org/apache/jena/fuseki/mgt/ActionPing.java | 78 +
.../jena/fuseki/mgt/ActionServerStatus.java | 114 +
.../org/apache/jena/fuseki/mgt/ActionSleep.java | 98 +
.../org/apache/jena/fuseki/mgt/ActionStats.java | 214 +
.../org/apache/jena/fuseki/mgt/ActionTasks.java | 125 +
.../java/org/apache/jena/fuseki/mgt/Async.java | 68 +
.../java/org/apache/jena/fuseki/mgt/Backup.java | 102 +
.../org/apache/jena/fuseki/mgt/DumpServlet.java | 312 +
.../org/apache/jena/fuseki/mgt/JsonConst.java | 52 +
.../apache/jena/fuseki/mgt/JsonDescription.java | 73 +
.../org/apache/jena/fuseki/mgt/MgtConst.java | 30 +
.../java/org/apache/jena/fuseki/mgt/MgtJMX.java | 61 +
.../fuseki/migrate/DatasetGraphSwitchable.java | 88 +
.../jena/fuseki/migrate/GraphLoadUtils.java | 76 +
.../jena/fuseki/migrate/StreamRDFLimited.java | 63 +
.../org/apache/jena/fuseki/server/Counter.java | 34 +
.../jena/fuseki/server/CounterMXBean.java | 25 +
.../apache/jena/fuseki/server/CounterName.java | 84 +
.../apache/jena/fuseki/server/CounterSet.java | 70 +
.../org/apache/jena/fuseki/server/Counters.java | 25 +
.../jena/fuseki/server/DataAccessPoint.java | 75 +
.../fuseki/server/DataAccessPointRegistry.java | 37 +
.../apache/jena/fuseki/server/DataService.java | 199 +
.../jena/fuseki/server/DatasetMXBean.java | 35 +
.../jena/fuseki/server/DatasetStatus.java | 40 +
.../org/apache/jena/fuseki/server/Endpoint.java | 68 +
.../apache/jena/fuseki/server/FusekiEnv.java | 164 +
.../apache/jena/fuseki/server/FusekiServer.java | 395 +
.../server/FusekiServerEnvironmentInit.java | 41 +
.../fuseki/server/FusekiServerListener.java | 81 +
.../apache/jena/fuseki/server/FusekiVocab.java | 77 +
.../jena/fuseki/server/OperationName.java | 37 +
.../apache/jena/fuseki/server/RequestLog.java | 148 +
.../jena/fuseki/server/ServerInitialConfig.java | 39 +
.../jena/fuseki/server/ServiceMXBean.java | 32 +
.../fuseki/server/ShiroEnvironmentLoader.java | 164 +
.../apache/jena/fuseki/server/SystemState.java | 108 +
.../apache/jena/fuseki/servlets/ActionBase.java | 265 +
.../fuseki/servlets/ActionErrorException.java | 32 +
.../apache/jena/fuseki/servlets/ActionLib.java | 180 +
.../apache/jena/fuseki/servlets/ActionREST.java | 161 +
.../jena/fuseki/servlets/ActionSPARQL.java | 207 +
.../fuseki/servlets/ConcurrencyPolicyMRSW.java | 113 +
.../jena/fuseki/servlets/FusekiFilter.java | 87 +
.../apache/jena/fuseki/servlets/HttpAction.java | 387 +
.../servlets/HttpServletResponseTracker.java | 140 +
.../jena/fuseki/servlets/NullOutputStream.java | 53 +
.../apache/jena/fuseki/servlets/REST_Quads.java | 68 +
.../jena/fuseki/servlets/REST_Quads_R.java | 99 +
.../jena/fuseki/servlets/REST_Quads_RW.java | 136 +
.../jena/fuseki/servlets/ResponseCallback.java | 24 +
.../jena/fuseki/servlets/ResponseModel.java | 136 +
.../jena/fuseki/servlets/ResponseOps.java | 94 +
.../jena/fuseki/servlets/ResponseResultSet.java | 322 +
.../apache/jena/fuseki/servlets/SPARQL_GSP.java | 214 +
.../jena/fuseki/servlets/SPARQL_GSP_R.java | 123 +
.../jena/fuseki/servlets/SPARQL_GSP_RW.java | 208 +
.../jena/fuseki/servlets/SPARQL_Protocol.java | 101 +
.../jena/fuseki/servlets/SPARQL_Query.java | 396 +
.../fuseki/servlets/SPARQL_QueryDataset.java | 60 +
.../fuseki/servlets/SPARQL_QueryGeneral.java | 142 +
.../fuseki/servlets/SPARQL_UberServlet.java | 359 +
.../jena/fuseki/servlets/SPARQL_Update.java | 286 +
.../jena/fuseki/servlets/SPARQL_Upload.java | 291 +
.../jena/fuseki/servlets/ServletBase.java | 98 +
.../apache/jena/fuseki/servlets/ServletOps.java | 209 +
.../org/apache/jena/fuseki/servlets/Upload.java | 164 +
.../jena/fuseki/servlets/UploadDetails.java | 86 +
.../jena/fuseki/validation/DataValidator.java | 131 +
.../jena/fuseki/validation/IRIValidator.java | 168 +
.../jena/fuseki/validation/QueryValidator.java | 154 +
.../jena/fuseki/validation/UpdateValidator.java | 91 +
.../fuseki/validation/ValidationAction.java | 95 +
.../jena/fuseki/validation/ValidationError.java | 24 +
.../fuseki/validation/ValidatorBaseJson.java | 201 +
.../src/main/resources/META-INF/DEPENDENCIES | 24 +
.../src/main/resources/META-INF/LICENSE | 253 +
.../src/main/resources/META-INF/NOTICE | 16 +
.../apache/jena/fuseki/fuseki-properties.xml | 8 +
.../org/apache/jena/fuseki/log4j.properties | 42 +
.../org/apache/jena/fuseki/server/config.ttl | 30 +
.../org/apache/jena/fuseki/server/shiro.ini | 37 +
.../jena/fuseki/server/templates/config-mem | 27 +
.../jena/fuseki/server/templates/config-service | 23 +
.../jena/fuseki/server/templates/config-tdb | 36 +
.../jena/fuseki/server/templates/config-tdb-dir | 35 +
.../jena/fuseki/server/templates/config-tdb-mem | 36 +
.../src/main/webapp/WEB-INF/web.xml | 269 +
.../src/main/webapp/admin-logs.html | 72 +
.../main/webapp/css/bootstrap-select.min.css | 7 +
.../src/main/webapp/css/bootstrap-theme.css.map | 1 +
.../src/main/webapp/css/bootstrap-theme.min.css | 7 +
.../src/main/webapp/css/bootstrap.css.map | 1 +
.../src/main/webapp/css/bootstrap.min.css | 7 +
.../src/main/webapp/css/codemirror.min.css | 1 +
.../src/main/webapp/css/font-awesome.min.css | 4 +
.../src/main/webapp/css/fui.css | 191 +
.../webapp/css/jquery.fileupload-noscript.css | 22 +
.../css/jquery.fileupload-ui-noscript.css | 17 +
.../main/webapp/css/jquery.fileupload-ui.css | 57 +
.../src/main/webapp/css/jquery.fileupload.css | 36 +
.../src/main/webapp/css/pivot.min.css | 1 +
.../src/main/webapp/css/qonsole.css | 172 +
.../src/main/webapp/css/yasqe.min.css | 1 +
.../src/main/webapp/css/yasr.min.css | 1 +
.../src/main/webapp/dataset.html | 244 +
.../src/main/webapp/documentation.html | 80 +
.../src/main/webapp/fonts/FontAwesome.otf | Bin 0 -> 75188 bytes
.../main/webapp/fonts/fontawesome-webfont.eot | Bin 0 -> 72449 bytes
.../main/webapp/fonts/fontawesome-webfont.svg | 504 +
.../main/webapp/fonts/fontawesome-webfont.ttf | Bin 0 -> 141564 bytes
.../main/webapp/fonts/fontawesome-webfont.woff | Bin 0 -> 83760 bytes
.../fonts/glyphicons-halflings-regular.eot | Bin 0 -> 20335 bytes
.../fonts/glyphicons-halflings-regular.svg | 229 +
.../fonts/glyphicons-halflings-regular.ttf | Bin 0 -> 41280 bytes
.../fonts/glyphicons-halflings-regular.woff | Bin 0 -> 23320 bytes
.../src/main/webapp/images/back_disabled.png | Bin 0 -> 1361 bytes
.../src/main/webapp/images/back_enabled.png | Bin 0 -> 1379 bytes
.../main/webapp/images/back_enabled_hover.png | Bin 0 -> 1375 bytes
.../src/main/webapp/images/favicon.ico | Bin 0 -> 1085 bytes
.../src/main/webapp/images/forward_disabled.png | Bin 0 -> 1363 bytes
.../src/main/webapp/images/forward_enabled.png | Bin 0 -> 1380 bytes
.../webapp/images/forward_enabled_hover.png | Bin 0 -> 1379 bytes
.../webapp/images/jena-logo-notext-small.png | Bin 0 -> 2469 bytes
.../src/main/webapp/images/sort_asc.png | Bin 0 -> 1118 bytes
.../main/webapp/images/sort_asc_disabled.png | Bin 0 -> 1050 bytes
.../src/main/webapp/images/sort_both.png | Bin 0 -> 1136 bytes
.../src/main/webapp/images/sort_desc.png | Bin 0 -> 1127 bytes
.../main/webapp/images/sort_desc_disabled.png | Bin 0 -> 1045 bytes
.../src/main/webapp/images/wait30.gif | Bin 0 -> 6337 bytes
.../jena-fuseki-core/src/main/webapp/index.html | 103 +
.../src/main/webapp/js/app/controllers/.svnkeep | 0
.../js/app/controllers/dataset-controller.js | 69 +
.../js/app/controllers/index-controller.js | 50 +
.../js/app/controllers/manage-controller.js | 39 +
.../js/app/controllers/query-controller.js | 72 +
.../js/app/controllers/upload-controller.js | 42 +
.../js/app/controllers/validation-controller.js | 38 +
.../src/main/webapp/js/app/fui.js | 33 +
.../src/main/webapp/js/app/layouts/.svnkeep | 0
.../src/main/webapp/js/app/main.dataset.js | 31 +
.../src/main/webapp/js/app/main.index.js | 24 +
.../src/main/webapp/js/app/main.manage.js | 27 +
.../src/main/webapp/js/app/main.validation.js | 24 +
.../main/webapp/js/app/models/dataset-stats.js | 102 +
.../src/main/webapp/js/app/models/dataset.js | 251 +
.../main/webapp/js/app/models/fuseki-server.js | 155 +
.../src/main/webapp/js/app/models/task.js | 105 +
.../webapp/js/app/models/validation-options.js | 85 +
.../src/main/webapp/js/app/qonsole-config.js | 26 +
.../src/main/webapp/js/app/routers/.svnkeep | 0
.../main/webapp/js/app/services/ping-service.js | 54 +
.../js/app/services/validation-service.js | 98 +
.../webapp/js/app/templates/dataset-edit.tpl | 58 +
.../webapp/js/app/templates/dataset-info.tpl | 40 +
.../js/app/templates/dataset-management.tpl | 53 +
.../js/app/templates/dataset-selection-list.tpl | 22 +
.../js/app/templates/dataset-selector.tpl | 15 +
.../js/app/templates/dataset-simple-create.tpl | 79 +
.../webapp/js/app/templates/dataset-stats.tpl | 14 +
.../webapp/js/app/templates/file-upload.tpl | 46 +
.../webapp/js/app/templates/uploadable-file.tpl | 23 +
.../src/main/webapp/js/app/util/page-utils.js | 33 +
.../src/main/webapp/js/app/views/.svnkeep | 0
.../main/webapp/js/app/views/dataset-edit.js | 205 +
.../main/webapp/js/app/views/dataset-info.js | 76 +
.../webapp/js/app/views/dataset-management.js | 163 +
.../js/app/views/dataset-selection-list.js | 58 +
.../webapp/js/app/views/dataset-selector.js | 84 +
.../js/app/views/dataset-simple-create.js | 100 +
.../main/webapp/js/app/views/dataset-stats.js | 41 +
.../js/app/views/datasets-dropdown-list.js | 43 +
.../src/main/webapp/js/app/views/file-upload.js | 225 +
.../webapp/js/app/views/tabbed-view-manager.js | 63 +
.../main/webapp/js/app/views/uploadable-file.js | 39 +
.../webapp/js/app/views/validation-options.js | 54 +
.../src/main/webapp/js/common-config.js | 93 +
.../main/webapp/js/lib/addon/fold/brace-fold.js | 105 +
.../webapp/js/lib/addon/fold/comment-fold.js | 57 +
.../main/webapp/js/lib/addon/fold/foldcode.js | 145 +
.../main/webapp/js/lib/addon/fold/foldgutter.js | 134 +
.../main/webapp/js/lib/addon/fold/xml-fold.js | 181 +
.../src/main/webapp/js/lib/backbone-min.js | 2 +
.../src/main/webapp/js/lib/backbone.js | 1581 ++
.../main/webapp/js/lib/backbone.marionette.js | 2385 +++
.../main/webapp/js/lib/bootstrap-select.min.js | 8 +
.../src/main/webapp/js/lib/bootstrap.min.js | 6 +
.../src/main/webapp/js/lib/html5shiv.js | 8 +
.../src/main/webapp/js/lib/jquery-1.10.2.js | 9789 +++++++++
.../src/main/webapp/js/lib/jquery-1.10.2.min.js | 6 +
.../src/main/webapp/js/lib/jquery-ui.min.js | 7 +
.../main/webapp/js/lib/jquery.dataTables.min.js | 157 +
.../src/main/webapp/js/lib/jquery.fileupload.js | 1426 ++
.../webapp/js/lib/jquery.fileupload.local.js | 1428 ++
.../src/main/webapp/js/lib/jquery.form.js | 1278 ++
.../webapp/js/lib/jquery.iframe-transport.js | 214 +
.../src/main/webapp/js/lib/jquery.ui.widget.js | 530 +
.../main/webapp/js/lib/jquery.xdomainrequest.js | 90 +
.../src/main/webapp/js/lib/lib/codemirror.js | 7638 +++++++
.../webapp/js/lib/mode/javascript/javascript.js | 683 +
.../main/webapp/js/lib/mode/sparql/sparql.js | 160 +
.../main/webapp/js/lib/mode/turtle/turtle.js | 160 +
.../src/main/webapp/js/lib/mode/xml/xml.js | 384 +
.../src/main/webapp/js/lib/pivot.js | 1363 ++
.../src/main/webapp/js/lib/pivot.min.js | 2 +
.../src/main/webapp/js/lib/pivot.min.js.map | 1 +
.../src/main/webapp/js/lib/plugins/text.js | 386 +
.../src/main/webapp/js/lib/qonsole.js | 570 +
.../src/main/webapp/js/lib/refresh.sh | 21 +
.../src/main/webapp/js/lib/require.js | 2076 ++
.../src/main/webapp/js/lib/require.min.js | 36 +
.../src/main/webapp/js/lib/respond.min.js | 6 +
.../src/main/webapp/js/lib/sprintf-0.7-beta1.js | 183 +
.../src/main/webapp/js/lib/underscore.js | 1276 ++
.../src/main/webapp/js/lib/yasqe.min.js | 5 +
.../src/main/webapp/js/lib/yasqe.min.js.map | 1 +
.../src/main/webapp/js/lib/yasr.min.js | 5 +
.../src/main/webapp/js/lib/yasr.min.js.map | 1 +
.../src/main/webapp/manage.html | 107 +
.../src/main/webapp/services.html | 75 +
.../src/main/webapp/test/test-fuseki-config.ttl | 27 +
.../src/main/webapp/validate.html | 146 +
.../apache/jena/fuseki/AbstractFusekiTest.java | 47 +
.../java/org/apache/jena/fuseki/FileSender.java | 87 +
.../java/org/apache/jena/fuseki/ServerTest.java | 157 +
.../java/org/apache/jena/fuseki/TS_Fuseki.java | 75 +
.../java/org/apache/jena/fuseki/TestAdmin.java | 538 +
.../java/org/apache/jena/fuseki/TestAuth.java | 405 +
.../org/apache/jena/fuseki/TestDatasetOps.java | 154 +
.../org/apache/jena/fuseki/TestFileUpload.java | 128 +
.../java/org/apache/jena/fuseki/TestQuery.java | 115 +
.../apache/jena/fuseki/TestSPARQLProtocol.java | 95 +
.../fuseki/http/TestDatasetAccessorHTTP.java | 261 +
.../http/TestDatasetGraphAccessorHTTP.java | 43 +
.../org/apache/jena/fuseki/http/TestHttpOp.java | 233 +
.../jena-fuseki-core/testing/config-ds-1.ttl | 15 +
jena-fuseki2/jena-fuseki-server/.gitignore | 1 +
jena-fuseki2/jena-fuseki-server/pom.xml | 127 +
jena-fuseki2/jena-fuseki-war/pom.xml | 109 +
jena-fuseki2/make-html | 29 -
jena-fuseki2/make_cp_mvn | 50 -
jena-fuseki2/pom.xml | 381 +-
jena-fuseki2/run-fuseki | 77 -
.../main/java/org/apache/jena/fuseki/DEF.java | 79 -
.../java/org/apache/jena/fuseki/Fuseki.java | 226 -
.../java/org/apache/jena/fuseki/FusekiCmd.java | 334 -
.../jena/fuseki/FusekiConfigException.java | 28 -
.../org/apache/jena/fuseki/FusekiException.java | 29 -
.../java/org/apache/jena/fuseki/FusekiLib.java | 260 -
.../org/apache/jena/fuseki/FusekiLogging.java | 140 -
.../jena/fuseki/FusekiNotFoundException.java | 26 -
.../jena/fuseki/FusekiRequestException.java | 57 -
.../org/apache/jena/fuseki/async/AsyncPool.java | 97 -
.../org/apache/jena/fuseki/async/AsyncTask.java | 114 -
.../fuseki/authz/AuthorizationFilter403.java | 59 -
.../apache/jena/fuseki/authz/DenyFilter.java | 33 -
.../jena/fuseki/authz/LocalhostFilter.java | 62 -
.../org/apache/jena/fuseki/build/Builder.java | 149 -
.../jena/fuseki/build/DataServiceDesc.java | 107 -
.../apache/jena/fuseki/build/FusekiConfig.java | 261 -
.../org/apache/jena/fuseki/build/Template.java | 52 -
.../jena/fuseki/build/TemplateFunctions.java | 68 -
.../org/apache/jena/fuseki/conneg/ConNeg.java | 123 -
.../org/apache/jena/fuseki/conneg/WebLib.java | 60 -
.../jena/fuseki/jetty/FusekiErrorHandler.java | 95 -
.../apache/jena/fuseki/jetty/JettyFuseki.java | 265 -
.../jena/fuseki/jetty/JettyServerConfig.java | 51 -
.../apache/jena/fuseki/mgt/ActionAsyncTask.java | 70 -
.../apache/jena/fuseki/mgt/ActionBackup.java | 84 -
.../jena/fuseki/mgt/ActionContainerItem.java | 94 -
.../org/apache/jena/fuseki/mgt/ActionCtl.java | 97 -
.../apache/jena/fuseki/mgt/ActionDatasets.java | 400 -
.../org/apache/jena/fuseki/mgt/ActionItem.java | 45 -
.../org/apache/jena/fuseki/mgt/ActionLogs.java | 59 -
.../org/apache/jena/fuseki/mgt/ActionPing.java | 78 -
.../jena/fuseki/mgt/ActionServerStatus.java | 114 -
.../org/apache/jena/fuseki/mgt/ActionSleep.java | 98 -
.../org/apache/jena/fuseki/mgt/ActionStats.java | 214 -
.../org/apache/jena/fuseki/mgt/ActionTasks.java | 125 -
.../java/org/apache/jena/fuseki/mgt/Async.java | 68 -
.../java/org/apache/jena/fuseki/mgt/Backup.java | 102 -
.../org/apache/jena/fuseki/mgt/DumpServlet.java | 312 -
.../org/apache/jena/fuseki/mgt/JsonConst.java | 52 -
.../apache/jena/fuseki/mgt/JsonDescription.java | 73 -
.../org/apache/jena/fuseki/mgt/MgtConst.java | 30 -
.../java/org/apache/jena/fuseki/mgt/MgtJMX.java | 61 -
.../fuseki/migrate/DatasetGraphSwitchable.java | 88 -
.../jena/fuseki/migrate/GraphLoadUtils.java | 76 -
.../apache/jena/fuseki/migrate/Registry.java | 42 -
.../jena/fuseki/migrate/StreamRDFLimited.java | 63 -
.../org/apache/jena/fuseki/server/Counter.java | 34 -
.../jena/fuseki/server/CounterMXBean.java | 25 -
.../apache/jena/fuseki/server/CounterName.java | 84 -
.../apache/jena/fuseki/server/CounterSet.java | 70 -
.../org/apache/jena/fuseki/server/Counters.java | 25 -
.../jena/fuseki/server/DataAccessPoint.java | 75 -
.../fuseki/server/DataAccessPointRegistry.java | 37 -
.../apache/jena/fuseki/server/DataService.java | 199 -
.../jena/fuseki/server/DatasetMXBean.java | 35 -
.../jena/fuseki/server/DatasetStatus.java | 40 -
.../org/apache/jena/fuseki/server/Endpoint.java | 68 -
.../apache/jena/fuseki/server/FusekiServer.java | 416 -
.../server/FusekiServletContextListener.java | 94 -
.../apache/jena/fuseki/server/FusekiVocab.java | 77 -
.../jena/fuseki/server/OperationName.java | 37 -
.../apache/jena/fuseki/server/RequestLog.java | 148 -
.../jena/fuseki/server/ServerInitialConfig.java | 40 -
.../jena/fuseki/server/ServiceMXBean.java | 32 -
.../fuseki/server/ShiroEnvironmentLoader.java | 164 -
.../apache/jena/fuseki/server/SystemState.java | 84 -
.../apache/jena/fuseki/servlets/ActionBase.java | 265 -
.../fuseki/servlets/ActionErrorException.java | 32 -
.../apache/jena/fuseki/servlets/ActionLib.java | 180 -
.../apache/jena/fuseki/servlets/ActionREST.java | 161 -
.../jena/fuseki/servlets/ActionSPARQL.java | 207 -
.../fuseki/servlets/ConcurrencyPolicyMRSW.java | 113 -
.../jena/fuseki/servlets/FusekiFilter.java | 87 -
.../apache/jena/fuseki/servlets/HttpAction.java | 387 -
.../servlets/HttpServletResponseTracker.java | 140 -
.../jena/fuseki/servlets/NullOutputStream.java | 53 -
.../apache/jena/fuseki/servlets/REST_Quads.java | 68 -
.../jena/fuseki/servlets/REST_Quads_R.java | 99 -
.../jena/fuseki/servlets/REST_Quads_RW.java | 136 -
.../jena/fuseki/servlets/ResponseCallback.java | 24 -
.../jena/fuseki/servlets/ResponseModel.java | 136 -
.../jena/fuseki/servlets/ResponseOps.java | 94 -
.../jena/fuseki/servlets/ResponseResultSet.java | 322 -
.../apache/jena/fuseki/servlets/SPARQL_GSP.java | 214 -
.../jena/fuseki/servlets/SPARQL_GSP_R.java | 123 -
.../jena/fuseki/servlets/SPARQL_GSP_RW.java | 208 -
.../jena/fuseki/servlets/SPARQL_Protocol.java | 101 -
.../jena/fuseki/servlets/SPARQL_Query.java | 393 -
.../fuseki/servlets/SPARQL_QueryDataset.java | 60 -
.../fuseki/servlets/SPARQL_QueryGeneral.java | 142 -
.../fuseki/servlets/SPARQL_UberServlet.java | 358 -
.../jena/fuseki/servlets/SPARQL_Update.java | 286 -
.../jena/fuseki/servlets/SPARQL_Upload.java | 291 -
.../jena/fuseki/servlets/ServletBase.java | 98 -
.../apache/jena/fuseki/servlets/ServletOps.java | 209 -
.../org/apache/jena/fuseki/servlets/Upload.java | 164 -
.../jena/fuseki/servlets/UploadDetails.java | 86 -
.../jena/fuseki/validation/DataValidator.java | 131 -
.../jena/fuseki/validation/IRIValidator.java | 168 -
.../jena/fuseki/validation/QueryValidator.java | 154 -
.../jena/fuseki/validation/UpdateValidator.java | 91 -
.../fuseki/validation/ValidationAction.java | 95 -
.../jena/fuseki/validation/ValidationError.java | 24 -
.../fuseki/validation/ValidatorBaseJson.java | 201 -
.../src/main/resources/META-INF/DEPENDENCIES | 24 -
.../src/main/resources/META-INF/LICENSE | 253 -
jena-fuseki2/src/main/resources/META-INF/NOTICE | 16 -
.../src/main/resources/log4j.properties | 50 -
.../apache/jena/fuseki/fuseki-properties.xml | 8 -
.../org/apache/jena/fuseki/server/config.ttl | 30 -
.../org/apache/jena/fuseki/server/shiro.ini | 36 -
.../jena/fuseki/server/templates/config-mem | 27 -
.../jena/fuseki/server/templates/config-service | 23 -
.../jena/fuseki/server/templates/config-tdb | 36 -
.../jena/fuseki/server/templates/config-tdb-dir | 35 -
.../jena/fuseki/server/templates/config-tdb-mem | 36 -
jena-fuseki2/src/main/webapp/WEB-INF/web.xml | 264 -
jena-fuseki2/src/main/webapp/admin-logs.html | 72 -
.../main/webapp/css/bootstrap-select.min.css | 7 -
.../src/main/webapp/css/bootstrap-theme.css.map | 1 -
.../src/main/webapp/css/bootstrap-theme.min.css | 7 -
.../src/main/webapp/css/bootstrap.css.map | 1 -
.../src/main/webapp/css/bootstrap.min.css | 7 -
jena-fuseki2/src/main/webapp/css/codemirror.css | 301 -
jena-fuseki2/src/main/webapp/css/foldgutter.css | 20 -
.../src/main/webapp/css/font-awesome.min.css | 4 -
jena-fuseki2/src/main/webapp/css/fui.css | 191 -
.../src/main/webapp/css/jquery.dataTables.css | 220 -
.../webapp/css/jquery.fileupload-noscript.css | 22 -
.../css/jquery.fileupload-ui-noscript.css | 17 -
.../main/webapp/css/jquery.fileupload-ui.css | 57 -
.../src/main/webapp/css/jquery.fileupload.css | 36 -
jena-fuseki2/src/main/webapp/css/qonsole.css | 172 -
jena-fuseki2/src/main/webapp/dataset.html | 244 -
jena-fuseki2/src/main/webapp/documentation.html | 80 -
.../src/main/webapp/fonts/FontAwesome.otf | Bin 75188 -> 0 bytes
.../main/webapp/fonts/fontawesome-webfont.eot | Bin 72449 -> 0 bytes
.../main/webapp/fonts/fontawesome-webfont.svg | 504 -
.../main/webapp/fonts/fontawesome-webfont.ttf | Bin 141564 -> 0 bytes
.../main/webapp/fonts/fontawesome-webfont.woff | Bin 83760 -> 0 bytes
.../fonts/glyphicons-halflings-regular.eot | Bin 20335 -> 0 bytes
.../fonts/glyphicons-halflings-regular.svg | 229 -
.../fonts/glyphicons-halflings-regular.ttf | Bin 41280 -> 0 bytes
.../fonts/glyphicons-halflings-regular.woff | Bin 23320 -> 0 bytes
.../src/main/webapp/images/back_disabled.png | Bin 1361 -> 0 bytes
.../src/main/webapp/images/back_enabled.png | Bin 1379 -> 0 bytes
.../main/webapp/images/back_enabled_hover.png | Bin 1375 -> 0 bytes
jena-fuseki2/src/main/webapp/images/favicon.ico | Bin 1085 -> 0 bytes
.../src/main/webapp/images/forward_disabled.png | Bin 1363 -> 0 bytes
.../src/main/webapp/images/forward_enabled.png | Bin 1380 -> 0 bytes
.../webapp/images/forward_enabled_hover.png | Bin 1379 -> 0 bytes
.../webapp/images/jena-logo-notext-small.png | Bin 2469 -> 0 bytes
.../src/main/webapp/images/sort_asc.png | Bin 1118 -> 0 bytes
.../main/webapp/images/sort_asc_disabled.png | Bin 1050 -> 0 bytes
.../src/main/webapp/images/sort_both.png | Bin 1136 -> 0 bytes
.../src/main/webapp/images/sort_desc.png | Bin 1127 -> 0 bytes
.../main/webapp/images/sort_desc_disabled.png | Bin 1045 -> 0 bytes
jena-fuseki2/src/main/webapp/images/wait30.gif | Bin 6337 -> 0 bytes
jena-fuseki2/src/main/webapp/index.html | 103 -
.../src/main/webapp/js/app/controllers/.svnkeep | 0
.../js/app/controllers/dataset-controller.js | 69 -
.../js/app/controllers/index-controller.js | 50 -
.../js/app/controllers/manage-controller.js | 39 -
.../js/app/controllers/query-controller.js | 72 -
.../js/app/controllers/upload-controller.js | 42 -
.../js/app/controllers/validation-controller.js | 38 -
jena-fuseki2/src/main/webapp/js/app/fui.js | 33 -
.../src/main/webapp/js/app/layouts/.svnkeep | 0
.../src/main/webapp/js/app/main.dataset.js | 31 -
.../src/main/webapp/js/app/main.index.js | 24 -
.../src/main/webapp/js/app/main.manage.js | 27 -
.../src/main/webapp/js/app/main.validation.js | 24 -
.../main/webapp/js/app/models/dataset-stats.js | 102 -
.../src/main/webapp/js/app/models/dataset.js | 251 -
.../main/webapp/js/app/models/fuseki-server.js | 155 -
.../src/main/webapp/js/app/models/task.js | 105 -
.../webapp/js/app/models/validation-options.js | 85 -
.../src/main/webapp/js/app/qonsole-config.js | 26 -
.../src/main/webapp/js/app/routers/.svnkeep | 0
.../main/webapp/js/app/services/ping-service.js | 54 -
.../js/app/services/validation-service.js | 98 -
.../webapp/js/app/templates/dataset-edit.tpl | 58 -
.../webapp/js/app/templates/dataset-info.tpl | 40 -
.../js/app/templates/dataset-management.tpl | 53 -
.../js/app/templates/dataset-selection-list.tpl | 22 -
.../js/app/templates/dataset-selector.tpl | 15 -
.../js/app/templates/dataset-simple-create.tpl | 79 -
.../webapp/js/app/templates/dataset-stats.tpl | 14 -
.../webapp/js/app/templates/file-upload.tpl | 46 -
.../webapp/js/app/templates/uploadable-file.tpl | 23 -
.../src/main/webapp/js/app/util/page-utils.js | 33 -
.../src/main/webapp/js/app/views/.svnkeep | 0
.../main/webapp/js/app/views/dataset-edit.js | 205 -
.../main/webapp/js/app/views/dataset-info.js | 76 -
.../webapp/js/app/views/dataset-management.js | 160 -
.../js/app/views/dataset-selection-list.js | 58 -
.../webapp/js/app/views/dataset-selector.js | 84 -
.../js/app/views/dataset-simple-create.js | 100 -
.../main/webapp/js/app/views/dataset-stats.js | 41 -
.../js/app/views/datasets-dropdown-list.js | 43 -
.../src/main/webapp/js/app/views/file-upload.js | 225 -
.../webapp/js/app/views/tabbed-view-manager.js | 63 -
.../main/webapp/js/app/views/uploadable-file.js | 39 -
.../webapp/js/app/views/validation-options.js | 54 -
.../src/main/webapp/js/common-config.js | 72 -
.../main/webapp/js/lib/addon/fold/brace-fold.js | 105 -
.../webapp/js/lib/addon/fold/comment-fold.js | 57 -
.../main/webapp/js/lib/addon/fold/foldcode.js | 145 -
.../main/webapp/js/lib/addon/fold/foldgutter.js | 134 -
.../main/webapp/js/lib/addon/fold/xml-fold.js | 181 -
.../src/main/webapp/js/lib/backbone-min.js | 2 -
jena-fuseki2/src/main/webapp/js/lib/backbone.js | 1581 --
.../main/webapp/js/lib/backbone.marionette.js | 2385 ---
.../main/webapp/js/lib/bootstrap-select.min.js | 8 -
.../src/main/webapp/js/lib/bootstrap.min.js | 6 -
.../src/main/webapp/js/lib/html5shiv.js | 8 -
.../src/main/webapp/js/lib/jquery-1.10.2.js | 9789 ---------
.../src/main/webapp/js/lib/jquery-1.10.2.min.js | 6 -
.../main/webapp/js/lib/jquery.dataTables.min.js | 155 -
.../src/main/webapp/js/lib/jquery.fileupload.js | 1426 --
.../webapp/js/lib/jquery.fileupload.local.js | 1428 --
.../src/main/webapp/js/lib/jquery.form.js | 1278 --
.../webapp/js/lib/jquery.iframe-transport.js | 214 -
.../src/main/webapp/js/lib/jquery.ui.widget.js | 530 -
.../main/webapp/js/lib/jquery.xdomainrequest.js | 90 -
.../src/main/webapp/js/lib/lib/codemirror.js | 7638 -------
.../webapp/js/lib/mode/javascript/javascript.js | 683 -
.../main/webapp/js/lib/mode/sparql/sparql.js | 160 -
.../main/webapp/js/lib/mode/turtle/turtle.js | 160 -
.../src/main/webapp/js/lib/mode/xml/xml.js | 384 -
.../src/main/webapp/js/lib/plugins/text.js | 386 -
jena-fuseki2/src/main/webapp/js/lib/qonsole.js | 582 -
jena-fuseki2/src/main/webapp/js/lib/refresh.sh | 21 -
.../main/webapp/js/lib/remote-sparql-service.js | 180 -
jena-fuseki2/src/main/webapp/js/lib/require.js | 2054 --
.../src/main/webapp/js/lib/require.min.js | 36 -
.../src/main/webapp/js/lib/respond.min.js | 6 -
.../src/main/webapp/js/lib/sprintf-0.7-beta1.js | 183 -
.../src/main/webapp/js/lib/underscore.js | 1276 --
jena-fuseki2/src/main/webapp/manage.html | 107 -
jena-fuseki2/src/main/webapp/services.html | 75 -
.../src/main/webapp/test/test-fuseki-config.ttl | 27 -
jena-fuseki2/src/main/webapp/validate.html | 146 -
.../apache/jena/fuseki/AbstractFusekiTest.java | 47 -
.../java/org/apache/jena/fuseki/FileSender.java | 87 -
.../java/org/apache/jena/fuseki/ServerTest.java | 156 -
.../java/org/apache/jena/fuseki/TS_Fuseki.java | 58 -
.../java/org/apache/jena/fuseki/TestAdmin.java | 538 -
.../java/org/apache/jena/fuseki/TestAuth.java | 405 -
.../org/apache/jena/fuseki/TestDatasetOps.java | 154 -
.../org/apache/jena/fuseki/TestFileUpload.java | 128 -
.../java/org/apache/jena/fuseki/TestQuery.java | 115 -
.../apache/jena/fuseki/TestSPARQLProtocol.java | 95 -
.../fuseki/http/TestDatasetAccessorHTTP.java | 261 -
.../http/TestDatasetGraphAccessorHTTP.java | 43 -
.../org/apache/jena/fuseki/http/TestHttpOp.java | 233 -
jena-fuseki2/testing/config-ds-1.ttl | 15 -
jena-iri/NOTICE | 2 +-
.../src/main/java/org/apache/jena/iri/IRI.java | 16 +-
.../java/org/apache/jena/iri/IRIFactoryI.java | 152 +-
.../org/apache/jena/iri/ViolationCodes.java | 4 +-
.../apache/jena/iri/impl/AbsIRIFactoryImpl.java | 26 +-
.../org/apache/jena/iri/impl/AbsIRIImpl.java | 43 +-
jena-iri/src/main/resources/META-INF/NOTICE | 2 +-
.../test/java/org/apache/jena/iri/TS_IRI.java | 2 +
.../java/org/apache/jena/iri/TestExample.java | 9 +-
.../org/apache/jena/iri/TestIRIFactory.java | 73 +
.../org/apache/jena/iri/TestMoreExamples.java | 7 +-
.../org/apache/jena/iri/test/Additional.java | 61 -
.../org/apache/jena/iri/test/MoreTests.java | 98 -
.../org/apache/jena/iri/test/TestCreator.java | 254 -
.../apache/jena/iri/test/TestErrorMessages.java | 144 -
.../org/apache/jena/iri/test/TestExample.java | 279 -
.../org/apache/jena/iri/test/TestMEIri.java | 39 -
.../apache/jena/iri/test/TestMERelativize.java | 50 -
.../org/apache/jena/iri/test/TestMEResolve.java | 42 -
.../org/apache/jena/iri/test/TestMEResult.java | 46 -
.../apache/jena/iri/test/TestMoreExamples.java | 264 -
.../org/apache/jena/iri/test/TestPackage.java | 36 -
.../test/resources/org/apache/jena/iri/test.xml | 18422 ++++++++---------
.../resources/org/apache/jena/iri/test/test.xml | 9217 ---------
.../resources/org/apache/jena/iri/test/uris.xml | 463 -
jena-jdbc/NOTICE | 2 +-
jena-jdbc/jena-jdbc-core/NOTICE | 2 +-
jena-jdbc/jena-jdbc-core/pom.xml | 2 +-
.../statements/AbstractJenaStatementTests.java | 74 +-
jena-jdbc/jena-jdbc-driver-bundle/NOTICE | 2 +-
jena-jdbc/jena-jdbc-driver-bundle/pom.xml | 2 +-
jena-jdbc/jena-jdbc-driver-mem/NOTICE | 2 +-
jena-jdbc/jena-jdbc-driver-remote/NOTICE | 2 +-
jena-jdbc/jena-jdbc-driver-tdb/NOTICE | 2 +-
jena-jdbc/pom.xml | 12 +-
jena-maven-tools/pom.xml | 2 +-
jena-parent/NOTICE | 2 +-
jena-parent/pom.xml | 146 +-
jena-sdb/NOTICE | 2 +-
jena-sdb/dist/NOTICE | 2 +-
jena-sdb/pom.xml | 8 +-
.../hp/hpl/jena/sdb/graph/EventManagerSDB.java | 19 +-
.../com/hp/hpl/jena/sdb/graph/GraphSDB.java | 7 +-
.../hp/hpl/jena/sdb/layout2/NodeLayout2.java | 6 +-
.../com/hp/hpl/jena/sdb/layout2/SQLBridge2.java | 14 +-
.../hpl/jena/sdb/layout2/TupleLoaderBase.java | 3 +-
.../com/hp/hpl/jena/sdb/layout2/ValueType.java | 5 +
.../jena/sdb/layout2/hash/StoreBaseHash.java | 4 +-
.../sdb/layout2/hash/TupleLoaderOneHash.java | 4 +-
.../jena/sdb/layout2/index/StoreBaseIndex.java | 4 +-
jena-sdb/src/main/resources/META-INF/NOTICE | 2 +-
jena-security/NOTICE | 2 +-
jena-security/pom.xml | 84 +-
.../jena/security/example/ExampleEvaluator.java | 147 +
.../jena/security/example/SecurityExample.java | 93 +
.../security/example/ShiroExampleEvaluator.java | 235 +
.../jena/security/example/ExampleEvaluator.java | 147 -
.../jena/security/example/SecurityExample.java | 93 -
.../apache/jena/security/example/example.ttl | 49 -
.../apache/jena/security/example/example.ttl | 49 +
.../jena/security/example/fuseki/config.ttl | 98 +
.../jena/security/example/fuseki/shiro.ini | 47 +
.../jena/security/AssemblerConstants.java | 62 +
.../apache/jena/security/SecuredAssembler.java | 157 +-
.../apache/jena/security/SecurityEvaluator.java | 517 +-
.../security/SecurityEvaluatorAssembler.java | 186 +
.../security/graph/SecuredCapabilities.java | 18 +-
.../jena/security/graph/SecuredGraph.java | 38 +-
.../graph/SecuredGraphEventManager.java | 533 +-
.../security/graph/impl/SecuredGraphImpl.java | 64 +-
.../security/impl/CachedSecurityEvaluator.java | 120 +-
.../apache/jena/security/impl/ItemHolder.java | 2 +-
.../jena/security/impl/SecuredItemImpl.java | 22 +-
.../jena/security/impl/SecuredItemInvoker.java | 5 +-
.../security/model/impl/SecuredModelImpl.java | 5 +-
.../security/model/impl/SecuredRDFListImpl.java | 2 +-
.../security/model/impl/SecuredRSIterator.java | 2 +-
.../jena/security/query/SecuredQueryEngine.java | 14 +-
.../security/query/rewriter/OpRewriter.java | 39 +-
.../query/rewriter/SecuredFunction.java | 3 +-
.../security/utils/PermStatementFilter.java | 9 +-
.../jena/security/utils/PermTripleFilter.java | 9 +-
.../jena/security/utils/RDFListSecFilter.java | 9 +-
.../jena/security/MockSecurityEvaluator.java | 16 +-
.../security/ModelBasedSecurityEvaluator.java | 76 +
.../jena/security/SecuredAssemblerTest.java | 28 +-
.../jena/security/StaticSecurityEvaluator.java | 78 +
.../graph/CachedSecurityEvaluatorTest.java | 45 +
.../graph/SecuredTDBGraphContractTests.java | 52 +
.../security/graph/BulkUpdateHandlerTest.java | 57 +-
.../graph/CrossIDGraphEventManagerTest.java | 78 +
.../security/graph/GraphEventManagerTest.java | 127 +-
.../security/graph/RecordingGraphListener.java | 124 +
.../graph/SecuredPrefixMappingTest.java | 68 +-
.../jena/security/model/SecuredLiteralTest.java | 47 +-
.../security/model/SecuredModelDetailTest.java | 20 +-
.../apache/jena/security/query/DataSetTest.java | 250 +
.../jena/security/query/QueryEngineTest.java | 161 +-
.../jena/security/SecuredAssemblerTest.ttl | 31 +
jena-spatial/NOTICE | 2 +-
jena-spatial/pom.xml | 7 +-
.../jena/query/spatial/SpatialIndexContext.java | 9 +-
.../jena/query/spatial/SpatialIndexLucene.java | 26 +-
.../jena/query/spatial/SpatialValueUtil.java | 32 +-
.../assembler/SpatialIndexLuceneAssembler.java | 1 +
.../pfunction/DirectionWithPointPFBase.java | 4 +-
.../SpatialOperationWithBoxPFBase.java | 8 +-
.../SpatialOperationWithCircleBase.java | 6 +-
jena-spatial/src/main/resources/META-INF/NOTICE | 5 +
.../AbstractTestDatasetWithSpatialIndex.java | 9 +-
.../jena/query/spatial/SpatialSearchUtil.java | 1 +
jena-tdb/NOTICE | 2 +-
jena-tdb/ReleaseNotes.txt | 4 +
jena-tdb/pom.xml | 8 +-
.../hp/hpl/jena/tdb/base/file/BlockAccess.java | 2 +-
.../com/hp/hpl/jena/tdb/base/file/Location.java | 5 +-
.../jena/tdb/base/objectfile/ObjectFile.java | 8 +-
.../tdb/base/objectfile/ObjectFileStorage.java | 5 +-
.../com/hp/hpl/jena/tdb/index/SetupIndex.java | 173 +
.../java/com/hp/hpl/jena/tdb/lib/NodeLib.java | 13 +-
.../java/com/hp/hpl/jena/tdb/setup/Build.java | 24 +-
.../hpl/jena/tdb/setup/DatasetBuilderStd.java | 4 +-
.../hpl/jena/tdb/setup/StoreParamsBuilder.java | 2 +-
.../hp/hpl/jena/tdb/setup/StoreParamsCodec.java | 2 +-
.../hp/hpl/jena/tdb/solver/StageMatchTuple.java | 11 +-
.../hp/hpl/jena/tdb/store/DatasetGraphTDB.java | 13 +-
.../com/hp/hpl/jena/tdb/store/GraphTDB.java | 6 +-
.../java/com/hp/hpl/jena/tdb/store/Hash.java | 2 +-
.../java/com/hp/hpl/jena/tdb/store/NodeId.java | 51 +-
.../com/hp/hpl/jena/tdb/store/NodeType.java | 1 +
.../hpl/jena/tdb/store/nodetable/NodecSSE.java | 17 +-
.../java/com/hp/hpl/jena/tdb/sys/FileRef.java | 6 +-
.../java/com/hp/hpl/jena/tdb/sys/SetupTDB.java | 162 +-
jena-tdb/src/main/java/tdb/CmdRewriteIndex.java | 4 +-
jena-tdb/src/main/resources/META-INF/NOTICE | 2 +-
.../jena/tdb/base/file/TestLocationLock.java | 47 -
.../hp/hpl/jena/tdb/extra/T_TransSystem.java | 2 +-
.../tdb/extra/T_TransSystemMultiDatasets.java | 2 +-
.../jena/tdb/index/AbstractTestTupleIndex.java | 271 -
.../index/bplustree/TestBPlusTreeRewriter.java | 4 +-
.../com/hp/hpl/jena/tdb/store/TS_Store.java | 1 +
.../store/TestLocationLockStoreConnection.java | 98 +
.../com/hp/hpl/jena/tdb/store/TestNodeId.java | 16 +-
.../store/nodetable/AbstractTestNodeTable.java | 2 +-
.../tupletable/AbstractTestTupleIndex.java | 271 +
.../store/tupletable/TestTupleIndexRecord.java | 1 -
jena-tdb/tdb-default.cfg | 20 +
jena-text/NOTICE | 2 +-
jena-text/ReleaseNotes.txt | 8 +
jena-text/pom.xml | 4 +-
jena-text/src/main/java/jena/textindexer.java | 4 +-
.../jena/query/text/DatasetGraphText.java | 136 +-
.../jena/query/text/TextDatasetFactory.java | 29 +-
.../query/text/TextDocProducerEntities.java | 13 +-
.../jena/query/text/TextDocProducerTriples.java | 22 +-
.../org/apache/jena/query/text/TextIndex.java | 20 +-
.../apache/jena/query/text/TextIndexLucene.java | 123 +-
.../apache/jena/query/text/TextIndexSolr.java | 47 +-
.../text/assembler/TextDatasetAssembler.java | 2 +-
.../assembler/TextIndexLuceneAssembler.java | 14 +-
jena-text/src/main/resources/LICENSE | 202 -
jena-text/src/main/resources/META-INF/LICENSE | 202 +
jena-text/src/main/resources/META-INF/NOTICE | 2 +-
.../AbstractTestDatasetWithGraphTextIndex.java | 24 +-
...ractTestDatasetWithLuceneGraphTextIndex.java | 22 +-
.../AbstractTestDatasetWithLuceneTextIndex.java | 103 -
.../text/AbstractTestDatasetWithTextIndex.java | 6 +-
.../AbstractTestDatasetWithTextIndexBase.java | 10 +-
.../org/apache/jena/query/text/TS_Text.java | 2 +-
.../TestDatasetWithEmbeddedSolrTextIndex.java | 15 +-
.../text/TestDatasetWithKeywordAnalyzer.java | 53 +-
...TestDatasetWithLowerCaseKeywordAnalyzer.java | 19 +-
.../TestDatasetWithLuceneGraphTextIndex.java | 5 +-
.../text/TestDatasetWithLuceneTextIndex.java | 100 +-
.../text/TestDatasetWithSimpleAnalyzer.java | 45 +-
.../text/TestDatasetWithStandardAnalyzer.java | 45 +-
.../text/TestLuceneWithMultipleThreads.java | 252 +
...BeforeWriteOnDatasetWithLuceneTextIndex.java | 49 -
.../assembler/AbstractTestTextAssembler.java | 82 +-
.../assembler/TestTextDatasetAssembler.java | 4 +-
.../assembler/TestTextIndexLuceneAssembler.java | 83 +-
pom.xml | 23 +-
1508 files changed, 114948 insertions(+), 92217 deletions(-)
----------------------------------------------------------------------
[39/50] [abbrv] jena git commit: Fix POM mistake
Posted by rv...@apache.org.
Fix POM mistake
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/8388d25c
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/8388d25c
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/8388d25c
Branch: refs/heads/eliminate-assignments
Commit: 8388d25cd1951fe91c1b75b9097bb2f29ffc8a5e
Parents: ba7f141
Author: Andy Seaborne <an...@seaborne.org>
Authored: Wed Feb 11 12:02:26 2015 +0000
Committer: Andy Seaborne <an...@seaborne.org>
Committed: Wed Feb 11 12:02:26 2015 +0000
----------------------------------------------------------------------
apache-jena-osgi/jena-osgi-test/pom.xml | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/8388d25c/apache-jena-osgi/jena-osgi-test/pom.xml
----------------------------------------------------------------------
diff --git a/apache-jena-osgi/jena-osgi-test/pom.xml b/apache-jena-osgi/jena-osgi-test/pom.xml
index e7e8bc1..499174b 100644
--- a/apache-jena-osgi/jena-osgi-test/pom.xml
+++ b/apache-jena-osgi/jena-osgi-test/pom.xml
@@ -211,7 +211,6 @@ limitations under the License.
<phase>integration-test</phase>
</execution>
</executions>
- -->
</plugin>
</plugins>
</build>
[21/50] [abbrv] jena git commit: JENA-879: PAX logging dependencies
solved it!
Posted by rv...@apache.org.
JENA-879: PAX logging dependencies solved it!
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/3c85fc15
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/3c85fc15
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/3c85fc15
Branch: refs/heads/eliminate-assignments
Commit: 3c85fc157ca9528c371162ae1c2ed8d437b13f34
Parents: f0d31e5
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Tue Feb 3 01:46:39 2015 +0000
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Mon Feb 9 10:03:57 2015 +0000
----------------------------------------------------------------------
apache-jena-osgi/jena-osgi-test/pom.xml | 40 ++++++++++++--------
.../org/apache/jena/osgi/test/JenaOSGITest.java | 18 +++++++--
2 files changed, 39 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/3c85fc15/apache-jena-osgi/jena-osgi-test/pom.xml
----------------------------------------------------------------------
diff --git a/apache-jena-osgi/jena-osgi-test/pom.xml b/apache-jena-osgi/jena-osgi-test/pom.xml
index e2dd66a..4c671a1 100644
--- a/apache-jena-osgi/jena-osgi-test/pom.xml
+++ b/apache-jena-osgi/jena-osgi-test/pom.xml
@@ -27,10 +27,10 @@
<packaging>bundle</packaging>
<properties>
- <!-- https://ops4j1.jira.com/wiki/display/PAXEXAM4/OSGi+Containers -->
- <exam.version>4.4.0</exam.version>
- <url.version>1.6.0</url.version>
<felix.version>4.6.0</felix.version>
+ <pax.exam.version>4.4.0</pax.exam.version>
+ <pax.url.version>1.6.0</pax.url.version>
+ <pax.logging.version>1.8.1</pax.logging.version>
</properties>
<dependencies>
@@ -55,10 +55,23 @@
</dependency>
<dependency>
+ <groupId>org.ops4j.pax.logging</groupId>
+ <artifactId>pax-logging-log4j2</artifactId>
+ <version>${pax.logging.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.logging</groupId>
+ <artifactId>pax-logging-api</artifactId>
+ <version>${pax.logging.version}</version>
+ </dependency>
+
+
+
+
+ <dependency>
<groupId>org.ops4j.pax.exam</groupId>
- <!-- One of: -forked -native -paxrunner -->
<artifactId>pax-exam-container-native</artifactId>
- <version>${exam.version}</version>
+ <version>${pax.exam.version}</version>
<scope>test</scope>
</dependency>
@@ -66,21 +79,21 @@
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-junit4</artifactId>
- <version>${exam.version}</version>
+ <version>${pax.exam.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-link-mvn</artifactId>
- <version>${exam.version}</version>
+ <version>${pax.exam.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.url</groupId>
<artifactId>pax-url-aether</artifactId>
- <version>${url.version}</version>
+ <version>${pax.url.version}</version>
<scope>test</scope>
</dependency>
@@ -90,12 +103,7 @@
<version>${felix.version}</version>
<scope>test</scope>
</dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>test</scope>
- </dependency>
+
</dependencies>
<build>
@@ -115,10 +123,10 @@
<plugin>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>exam-maven-plugin</artifactId>
- <version>${exam.version}</version>
+ <version>${pax.exam.version}</version>
<executions>
<execution>
- <id>generate-config</id>
+ <id>generate-link-files</id>
<goals>
<goal>generate-link-files</goal>
</goals>
http://git-wip-us.apache.org/repos/asf/jena/blob/3c85fc15/apache-jena-osgi/jena-osgi-test/src/test/java/org/apache/jena/osgi/test/JenaOSGITest.java
----------------------------------------------------------------------
diff --git a/apache-jena-osgi/jena-osgi-test/src/test/java/org/apache/jena/osgi/test/JenaOSGITest.java b/apache-jena-osgi/jena-osgi-test/src/test/java/org/apache/jena/osgi/test/JenaOSGITest.java
index 4ce41b0..4a8c1e2 100644
--- a/apache-jena-osgi/jena-osgi-test/src/test/java/org/apache/jena/osgi/test/JenaOSGITest.java
+++ b/apache-jena-osgi/jena-osgi-test/src/test/java/org/apache/jena/osgi/test/JenaOSGITest.java
@@ -89,16 +89,28 @@ public class JenaOSGITest {
// manually. See ../jena-osgi/pom.xml
// for dependencies that are NOT in <scope>provided</scope>
// (luckily the version numbers are picked up!)
- mavenBundle("org.apache.jena", "jena-osgi", "2.13.0-SNAPSHOT"),
+ // Error starting bundle slf4j.log4j12. Fragment bundles can not be started.
+ //linkBundle("slf4j.log4j12"),
+ //linkBundle("slf4j.api"),
+ // Not sure if this is a Felix problem or what..
+ // Instead we'll use:
+ linkBundle("org.ops4j.pax.logging.pax-logging-log4j2"),
+ linkBundle("org.ops4j.pax.logging.pax-logging-api"),
+
+
+ mavenBundle("org.apache.jena", "jena-osgi"),
linkBundle("org.apache.httpcomponents.httpclient"),
linkBundle("org.apache.httpcomponents.httpcore"),
linkBundle("com.github.jsonld-java"),
linkBundle("org.apache.commons.csv"),
linkBundle("org.apache.thrift"),
linkBundle("jcl.over.slf4j"),
- linkBundle("slf4j.api"),
- linkBundle("slf4j.log4j12"),
+
+ linkBundle("com.fasterxml.jackson.core.jackson-core"),
+ linkBundle("com.fasterxml.jackson.core.jackson-databind"),
+ linkBundle("com.fasterxml.jackson.core.jackson-annotations"),
linkBundle("org.apache.commons.lang3"),
+
junitBundles()
);
}
[29/50] [abbrv] jena git commit: Reduce PAX logging
Posted by rv...@apache.org.
Reduce PAX logging
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/7279de49
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/7279de49
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/7279de49
Branch: refs/heads/eliminate-assignments
Commit: 7279de49878669c60255d2f32553364940fe8659
Parents: f4495f7
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Tue Feb 10 11:58:43 2015 +0000
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Tue Feb 10 11:58:43 2015 +0000
----------------------------------------------------------------------
apache-jena-osgi/jena-osgi-test/pom.xml | 20 ++++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/7279de49/apache-jena-osgi/jena-osgi-test/pom.xml
----------------------------------------------------------------------
diff --git a/apache-jena-osgi/jena-osgi-test/pom.xml b/apache-jena-osgi/jena-osgi-test/pom.xml
index cc2a774..dad48a9 100644
--- a/apache-jena-osgi/jena-osgi-test/pom.xml
+++ b/apache-jena-osgi/jena-osgi-test/pom.xml
@@ -62,6 +62,7 @@ limitations under the License.
<scope>test</scope>
</dependency>
+ <!-- needed to get a org.slf4j bundle for PAX -->
<dependency>
<groupId>org.ops4j.pax.logging</groupId>
<artifactId>pax-logging-log4j2</artifactId>
@@ -123,17 +124,24 @@ limitations under the License.
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemPropertyVariables>
+ <!-- So the test can find the current version of jena-osgi -->
+ <jena-osgi.version>${project.version}</jena-osgi.version>
+ <!-- not so noisy logging -->
+ <org.ops4j.pax.logging.DefaultServiceLog.level>WARN</org.ops4j.pax.logging.DefaultServiceLog.level>
+ </systemPropertyVariables>
+ </configuration>
+ </plugin>
+ <plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
- <configuration>
- <instructions>
- <!-- <Import-Package>com.hp.hpl.jena</Import-Package> -->
- <!-- <Embed-Dependency>artifactId=jena-core;inline=true</Embed-Dependency> -->
- </instructions>
- </configuration>
</plugin>
<plugin>
+ <!-- generate target/pax-exam-links -->
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>exam-maven-plugin</artifactId>
<version>${pax.exam.version}</version>
[43/50] [abbrv] jena git commit: Update javadoc.
Posted by rv...@apache.org.
Update javadoc.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/31dd8997
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/31dd8997
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/31dd8997
Branch: refs/heads/eliminate-assignments
Commit: 31dd899700b8aea84c57989c422cc9744fa6719e
Parents: a8990a1
Author: Andy Seaborne <an...@seaborne.org>
Authored: Fri Feb 13 15:38:25 2015 +0000
Committer: Andy Seaborne <an...@seaborne.org>
Committed: Fri Feb 13 15:38:25 2015 +0000
----------------------------------------------------------------------
jena-core/src/main/java/com/hp/hpl/jena/util/FileManager.java | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/31dd8997/jena-core/src/main/java/com/hp/hpl/jena/util/FileManager.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/com/hp/hpl/jena/util/FileManager.java b/jena-core/src/main/java/com/hp/hpl/jena/util/FileManager.java
index 1581854..db62441 100644
--- a/jena-core/src/main/java/com/hp/hpl/jena/util/FileManager.java
+++ b/jena-core/src/main/java/com/hp/hpl/jena/util/FileManager.java
@@ -245,8 +245,7 @@ public class FileManager
// -------- Cache operations (end)
/** Load a model from a file (local or remote).
- * Guesses the syntax of the file based on filename extension,
- * defaulting to RDF/XML.
+ * This operation may attempt content negotiation for http URLs.
* @param filenameOrURI The filename or a URI (file:, http:)
* @return a new model
* @exception JenaException if there is syntax error in file.
@@ -260,7 +259,6 @@ public class FileManager
return loadModelWorker(filenameOrURI, null, null) ;
}
-
/** Load a model from a file (local or remote).
* URI is the base for reading the model.
*
[03/50] [abbrv] jena git commit: JENA-881: Change test results -
order in exprlists has changed.
Posted by rv...@apache.org.
JENA-881: Change test results - order in exprlists has changed.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/491d0f96
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/491d0f96
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/491d0f96
Branch: refs/heads/eliminate-assignments
Commit: 491d0f9647ab215434c74e7145859d02542deeec
Parents: 4f5fd49
Author: Andy Seaborne <an...@apache.org>
Authored: Sat Feb 7 12:37:34 2015 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Sat Feb 7 12:37:34 2015 +0000
----------------------------------------------------------------------
.../optimize/TestTransformFilterPlacement.java | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/491d0f96/jena-arq/src/test/java/com/hp/hpl/jena/sparql/algebra/optimize/TestTransformFilterPlacement.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/com/hp/hpl/jena/sparql/algebra/optimize/TestTransformFilterPlacement.java b/jena-arq/src/test/java/com/hp/hpl/jena/sparql/algebra/optimize/TestTransformFilterPlacement.java
index f1b26eb..45cb1e1 100644
--- a/jena-arq/src/test/java/com/hp/hpl/jena/sparql/algebra/optimize/TestTransformFilterPlacement.java
+++ b/jena-arq/src/test/java/com/hp/hpl/jena/sparql/algebra/optimize/TestTransformFilterPlacement.java
@@ -377,7 +377,7 @@ public class TestTransformFilterPlacement extends BaseTest { //extends AbstractT
@Test public void place_extend_04() {
test("(filter (= ?x 123) (extend ((?x1 123)) (filter (< ?x 456) (bgp (?s ?p ?x) (?s ?p ?z))) ))",
- "(extend (?x1 123) (sequence (filter ((< ?x 456) (= ?x 123)) (bgp (?s ?p ?x))) (bgp (?s ?p ?z))) )") ;
+ "(extend (?x1 123) (sequence (filter ((= ?x 123) (< ?x 456)) (bgp (?s ?p ?x))) (bgp (?s ?p ?z))) )") ;
}
@Test public void place_extend_05() {
@@ -466,7 +466,7 @@ public class TestTransformFilterPlacement extends BaseTest { //extends AbstractT
@Test public void place_assign_04() {
// Caution - OpFilter equality is sensitive to the order of expressions
test("(filter (= ?x 123) (assign ((?x1 123)) (filter (< ?x 456) (bgp (?s ?p ?x) (?s ?p ?z))) ))",
- "(assign (?x1 123) (sequence (filter ((< ?x 456) (= ?x 123)) (bgp (?s ?p ?x))) (bgp (?s ?p ?z))) )") ;
+ "(assign (?x1 123) (sequence (filter ((= ?x 123) (< ?x 456)) (bgp (?s ?p ?x))) (bgp (?s ?p ?z))) )") ;
}
@Test public void place_assign_05() {
@@ -571,7 +571,7 @@ public class TestTransformFilterPlacement extends BaseTest { //extends AbstractT
," (sequence"
," (filter 1 (table unit))"
, " (bgp (triple ?s ?p ?o)))"
- ," (filter (exprlist 0 1) (table unit))"
+ ," (filter (exprlist 1 0) (table unit))"
,")"
);
test(in, out) ;
@@ -588,7 +588,7 @@ public class TestTransformFilterPlacement extends BaseTest { //extends AbstractT
String out = StrUtils.strjoinNL
("(union"
," (filter 1 (bgp (triple ?s ?p ?o)))"
- ," (filter (exprlist 0 1) (table unit))"
+ ," (filter (exprlist 1 0) (table unit))"
,")"
);
testNoBGP(in, out) ;
@@ -612,7 +612,7 @@ public class TestTransformFilterPlacement extends BaseTest { //extends AbstractT
," (sequence"
," (filter 1 (table unit))"
," (bgp (?s ?p ?o)))"
- ," (filter (exprlist 0 1)"
+ ," (filter (exprlist 1 0)"
," (table unit))"
, ")"
,"))");
@@ -635,7 +635,7 @@ public class TestTransformFilterPlacement extends BaseTest { //extends AbstractT
," (project (?s ?p ?o)"
," (union"
," (filter 1 (bgp (?s ?p ?o)))"
- ," (filter (exprlist 0 1) (table unit))"
+ ," (filter (exprlist 1 0) (table unit))"
, ")"
,"))");
testNoBGP(in, out) ;
@@ -656,7 +656,7 @@ public class TestTransformFilterPlacement extends BaseTest { //extends AbstractT
," (filter (= 1 1)"
," (table unit))"
," (bgp (triple ?s ?p ?o)))"
- ," (filter (exprlist (!= 0 0) (= 1 1))"
+ ," (filter (exprlist (= 1 1) (!= 0 0))"
," (table unit)))"
) ;
test ( in, out ) ;
@@ -674,7 +674,7 @@ public class TestTransformFilterPlacement extends BaseTest { //extends AbstractT
("(union"
," (filter (= 1 1)"
," (bgp (triple ?s ?p ?o)))"
- ," (filter (exprlist (!= 0 0) (= 1 1))"
+ ," (filter (exprlist (= 1 1) (!= 0 0))"
," (table unit)))"
) ;
testNoBGP ( in, out ) ;
[08/50] [abbrv] jena git commit: JENA-879: Reformat pom.xml
Posted by rv...@apache.org.
JENA-879: Reformat pom.xml
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/e33160b4
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/e33160b4
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/e33160b4
Branch: refs/heads/eliminate-assignments
Commit: e33160b44b4fd8bb97b9a3c75ca351fd3d0d5025
Parents: d59103d
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Mon Feb 2 23:38:34 2015 +0000
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Mon Feb 9 09:56:08 2015 +0000
----------------------------------------------------------------------
apache-jena-osgi/jena-osgi-test/pom.xml | 122 +++++++++++++--------------
1 file changed, 59 insertions(+), 63 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/e33160b4/apache-jena-osgi/jena-osgi-test/pom.xml
----------------------------------------------------------------------
diff --git a/apache-jena-osgi/jena-osgi-test/pom.xml b/apache-jena-osgi/jena-osgi-test/pom.xml
index 77869ba..0ce0e8f 100644
--- a/apache-jena-osgi/jena-osgi-test/pom.xml
+++ b/apache-jena-osgi/jena-osgi-test/pom.xml
@@ -1,73 +1,69 @@
<?xml version="1.0" encoding="utf-8"?>
-<!--
- 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
+<!-- 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. -->
- http://www.apache.org/licenses/LICENSE-2.0
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-parent</artifactId>
+ <version>12-SNAPSHOT</version>
+ <relativePath>../jena-parent</relativePath>
+ </parent>
- 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.
--->
+ <artifactId>jena-osgi-test</artifactId>
+ <version>2.13.0-SNAPSHOT</version>
+ <name>Apache Jena - OSGi bundle tests</name>
+ <description>Tests for jena-osgi as a bundle</description>
+ <packaging>bundle</packaging>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.jena</groupId>
- <artifactId>apache-jena-osgi</artifactId>
- <version>2.13.0-SNAPSHOT</version>
- </parent>
- <artifactId>jena-osgi-test</artifactId>
- <name>Apache Jena - OSGi bundle tests</name>
- <description>Tests for jena-osgi as a bundle</description>
- <packaging>bundle</packaging>
- <dependencies>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-osgi</artifactId>
+ <version>${project.version}</version>
+ <type>bundle</type>
+ </dependency>
- <dependency>
- <groupId>org.apache.jena</groupId>
- <artifactId>jena-osgi</artifactId>
- <version>${project.version}</version>
- <type>bundle</type>
- </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>compile</scope>
+ </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>compile</scope>
- </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>4.3.1</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <version>4.3.1</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Bundle-Activator>org.apache.jena.osgi.test.JenaOSGITestActivator</Bundle-Activator>
- <!-- <Import-Package>com.hp.hpl.jena</Import-Package> -->
- <!-- <Embed-Dependency>artifactId=jena-core;inline=true</Embed-Dependency> -->
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Bundle-Activator>org.apache.jena.osgi.test.JenaOSGITestActivator</Bundle-Activator>
+ <!-- <Import-Package>com.hp.hpl.jena</Import-Package> -->
+ <!-- <Embed-Dependency>artifactId=jena-core;inline=true</Embed-Dependency> -->
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
[44/50] [abbrv] jena git commit: Updated fuseki example files added
documentation to example code.
Posted by rv...@apache.org.
Updated fuseki example files
added documentation to example code.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/beb73c4a
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/beb73c4a
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/beb73c4a
Branch: refs/heads/eliminate-assignments
Commit: beb73c4a777c69dceb3317900476710399aa6bf0
Parents: e0e8dba
Author: Claude Warren <cl...@apache.org>
Authored: Sun Feb 15 16:52:52 2015 +0000
Committer: Claude Warren <cl...@apache.org>
Committed: Sun Feb 15 16:52:52 2015 +0000
----------------------------------------------------------------------
.../security/example/ShiroExampleEvaluator.java | 86 +++++++++++++++++++-
.../jena/security/example/fuseki/config.ttl | 68 ++++++++++------
.../jena/security/example/fuseki/shiro.ini | 2 +-
3 files changed, 127 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/beb73c4a/jena-security/src/example/java/org/apache/jena/security/example/ShiroExampleEvaluator.java
----------------------------------------------------------------------
diff --git a/jena-security/src/example/java/org/apache/jena/security/example/ShiroExampleEvaluator.java b/jena-security/src/example/java/org/apache/jena/security/example/ShiroExampleEvaluator.java
index 87fca4e..1df5678 100644
--- a/jena-security/src/example/java/org/apache/jena/security/example/ShiroExampleEvaluator.java
+++ b/jena-security/src/example/java/org/apache/jena/security/example/ShiroExampleEvaluator.java
@@ -36,12 +36,15 @@ import com.hp.hpl.jena.vocabulary.RDF;
/**
* Class to use Shiro to provide credentials.
- * Used for same example as ExampleEvaluator
+ *
+ * An example evaluator that only provides access to messages in the graph that
+ * are from or to the principal.
*
*/
public class ShiroExampleEvaluator implements SecurityEvaluator {
private static final Logger LOG = LoggerFactory.getLogger(ShiroExampleEvaluator.class);
+ // the model that contains the messages.
private Model model;
private RDFNode msgType = ResourceFactory.createResource( "http://example.com/msg" );
private Property pTo = ResourceFactory.createProperty( "http://example.com/to" );
@@ -56,14 +59,29 @@ public class ShiroExampleEvaluator implements SecurityEvaluator {
this.model = model;
}
+ /**
+ * We allow any action on the graph itself, so this is always true.
+ */
@Override
public boolean evaluate(Object principal, Action action, SecNode graphIRI) {
// we allow any action on a graph.
return true;
}
+ /**
+ * This is our internal check to see if the user may access the resource.
+ * This method is called from the evauate(Object,SecNode) method.
+ * A user may only access the resource if they are authenticated, and are either the
+ * sender or the recipient.
+ * Additionally the admin can always see the messages.
+ * @param principalObj
+ * @param r
+ * @return
+ */
private boolean evaluate( Object principalObj, Resource r )
{
+ // cast to the Subject because we know that it comes from Shiro and that
+ // our getPrincipal() method returns a Subject.
Subject subject = (Subject)principalObj;
if (! subject.isAuthenticated())
{
@@ -73,32 +91,49 @@ public class ShiroExampleEvaluator implements SecurityEvaluator {
// a message is only available to sender or recipient
LOG.debug( "checking {}", subject.getPrincipal());
Object principal = subject.getPrincipal();
+
+ // We put the admin check here but it could have been done much earlier.
if ("admin".equals(principal.toString()))
{
return true;
}
+ // if we are looking at a message object then check the restrictions.
if (r.hasProperty( RDF.type, msgType ))
{
return r.hasProperty( pTo, subject.getPrincipal().toString() ) ||
r.hasProperty( pFrom, subject.getPrincipal().toString());
}
+ // otherwise user can see the object.
return true;
}
+ /**
+ * Check that the user can see a specific node.
+ * @param principal
+ * @param node
+ * @return
+ */
private boolean evaluate( Object principal, SecNode node )
{
+ // Access to wild card is false -- this forces checks to the acutal nodes
+ // to be returned.
+ // we could have checked for admin access here and returned true since the admin
+ // can see any node.
if (node.equals( SecNode.ANY )) {
- return false; // all wild cards are false
+ return false;
}
+ // URI nodes are retrieved from the model and evaluated
if (node.getType().equals( SecNode.Type.URI)) {
Resource r = model.createResource( node.getValue() );
return evaluate( principal, r );
}
+ // anonymous nodes have to be retrieved from the model as anonymous nodes.
else if (node.getType().equals( SecNode.Type.Anonymous)) {
Resource r = model.getRDFNode( NodeFactory.createAnon( new AnonId( node.getValue()) ) ).asResource();
return evaluate( principal, r );
}
+ // anything else (literals) can be seen.
else
{
return true;
@@ -106,44 +141,91 @@ public class ShiroExampleEvaluator implements SecurityEvaluator {
}
+ /**
+ * Evaluate if the user can see the triple.
+ * @param principal
+ * @param triple
+ * @return
+ */
private boolean evaluate( Object principal, SecTriple triple ) {
+ // we could have checked here to see if the principal was the admin and
+ // just returned true since the admin can perform any operation on any triple.
return evaluate( principal, triple.getSubject()) &&
evaluate( principal, triple.getObject()) &&
evaluate( principal, triple.getPredicate());
}
+ /**
+ * As per our design, users can do anything with triples they have access to, so we just
+ * ignore the action parameter. If we were to implement rules restricted access based
+ * upon action this method would sort those out appropriately.
+ */
@Override
public boolean evaluate(Object principal, Action action, SecNode graphIRI, SecTriple triple) {
+ // we could have checked here to see if the principal was the admin and
+ // just returned true since the admin can perform any operation on any triple.
return evaluate( principal, triple );
}
+ /**
+ * As per our design, users can access any graph. If we were to implement rules that
+ * restricted user access to specific graphs, those checks would be here and we would
+ * return <code>false</code> if they were not allowed to access the graph. Note that this
+ * method is checking to see that the user may perform ALL the actions in the set on the
+ * graph.
+ */
@Override
public boolean evaluate(Object principal, Set<Action> actions, SecNode graphIRI) {
return true;
}
+ /**
+ * As per our design, users can access any triple from a message that is from or to them.
+ * Since we don't have restrictions on actions this is no different then checking access
+ * for a single action.
+ */
@Override
public boolean evaluate(Object principal, Set<Action> actions, SecNode graphIRI,
SecTriple triple) {
return evaluate( principal, triple );
}
+ /**
+ * As per our design, users can access any graph. If we were to implement rules that
+ * restricted user access to specific graphs, those checks would be here and we would
+ * return <code>false</code> if they were not allowed to access the graph. Note that this
+ * method is checking to see that the user may perform ANY of the actions in the set on the
+ * graph.
+ */
@Override
public boolean evaluateAny(Object principal, Set<Action> actions, SecNode graphIRI) {
return true;
}
+ /**
+ * As per our design, users can access any triple from a message that is from or to them.
+ * Since we don't have restrictions on actions this is no different then checking access
+ * for a single action.
+ */
@Override
public boolean evaluateAny(Object principal, Set<Action> actions, SecNode graphIRI,
SecTriple triple) {
return evaluate( principal, triple );
}
+ /**
+ * As per our design, users can access any triple from a message that is from or to them.
+ * So for an update they can only change triples they have access to into other triples
+ * they have access to. (e.g. they can not remvoe themself from the messsage).
+ */
@Override
public boolean evaluateUpdate(Object principal, SecNode graphIRI, SecTriple from, SecTriple to) {
return evaluate( principal, from ) && evaluate( principal, to );
}
+ /**
+ * Return the Shiro subject. This is the subject that Shiro currently has logged in.
+ */
@Override
public Object getPrincipal() {
return SecurityUtils.getSubject();
http://git-wip-us.apache.org/repos/asf/jena/blob/beb73c4a/jena-security/src/example/resources/org/apache/jena/security/example/fuseki/config.ttl
----------------------------------------------------------------------
diff --git a/jena-security/src/example/resources/org/apache/jena/security/example/fuseki/config.ttl b/jena-security/src/example/resources/org/apache/jena/security/example/fuseki/config.ttl
index 6f4a3af..a748f01 100644
--- a/jena-security/src/example/resources/org/apache/jena/security/example/fuseki/config.ttl
+++ b/jena-security/src/example/resources/org/apache/jena/security/example/fuseki/config.ttl
@@ -14,62 +14,77 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+##
+## Define all the prefixes
+##
+
@prefix fuseki: <http://jena.apache.org/fuseki#> .
-@prefix tdb: <http://jena.hpl.hp.com/2008/tdb#> .
@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
@prefix ja: <http://jena.hpl.hp.com/2005/11/Assembler#> .
@prefix sec: <http://apache.org/jena/security/Assembler#> .
@prefix my: <http://example.org/#> .
-#[] ja:loadClass "com.hp.hpl.jena.tdb.TDB" .
+##
+## Load the SecuredAssembler class from the security library and define
+## the sec:Model as a subclass of ja:NamedModel.
+##
[] ja:loadClass "org.apache.jena.security.SecuredAssembler" .
-
-tdb:DatasetTDB rdfs:subClassOf ja:RDFDataset .
-tdb:GraphTDB rdfs:subClassOf ja:Model .
sec:Model rdfs:subClassOf ja:NamedModel .
-my:dataset rdf:type tdb:DatasetTDB;
- tdb:location "/tmp/myApp" ;
- tdb:unionDefaultGraph true ;
- .
-
-my:baseModel rdf:type tdb:GraphTDB ;
- tdb:dataset my:dataset .
+##
+## Define the base model that contains the unsecured data.
+##
+my:baseModel rdf:type ja:MemoryModel;
+ ja:content [ja:externalContent <file:./example.ttl>]
+ .
+##
+## Define the secured model. This is where permissions is applied to the
+## my:baseModel to create a model that has permission restrictions. Note
+## that it is using the security evaluator implementation (sec:evaluatorImpl)
+## called my:secEvaluator which we will define next.
+##
my:securedModel rdf:type sec:Model ;
sec:baseModel my:baseModel ;
ja:modelName "https://example.org/securedModel" ;
sec:evaluatorImpl my:secEvaluator .
+##
+## Define the security evaluator. This is where we use the example
+## ShiroExampleEvaluator. For your production environment you will replace
+## "org.apache.jena.security.example.ShiroExampleEvaluator" with your
+## SecurityEvaluator implementation. Note that ShiroExampleEvaluator constructor
+## takes a Model argument. We pass in the unsecured baseModel so that the evaluator
+## can read it unencumbered. Your implementation of SecurityEvaluator may have different
+## parameters to meet your specific needs.
+##
my:secEvaluator rdf:type sec:Evaluator ;
sec:args [
rdf:_1 my:baseModel ;
] ;
sec:evaluatorClass "org.apache.jena.security.example.ShiroExampleEvaluator" .
+##
+## Define the dataset that we will use for in the server.
+##
my:securedDataset rdf:type ja:RDFDataset ;
ja:defaultGraph my:securedModel .
-my:fuseki rdf:type fuseki:Server ;
- # Server-wide context parameters can be given here.
- # For example, to set query timeouts: on a server-wide basis:
- # Format 1: "1000" -- 1 second timeout
- # Format 2: "10000,60000" -- 10s timeout to first result, then 60s timeout to for rest of query.
- # See java doc for ARQ.queryTimeout
- # ja:context [ ja:cxtName "arq:queryTimeout" ; ja:cxtValue "10000" ] ;
-
- # Load custom code (rarely needed)
- # ja:loadClass "your.code.Class" ;
-
- # Services available. Only explicitly listed services are configured.
- # If there is a service description not linked from this list, it is ignored.
+##
+## Define the fuseki:Server.
+##
+my:fuskei rdf:type fuseki:Server ;
fuseki:services (
my:service1
) .
-
+##
+## Define the service for the fuseki:Service. Note that the fuseki:dataset served by
+## this server is the secured dataset defined above.
+##
my:service1 rdf:type fuseki:Service ;
+ rdfs:label "My Secured Data Service" ;
fuseki:name "myAppFuseki" ; # http://host:port/myAppFuseki
fuseki:serviceQuery "query" ; # SPARQL query service
fuseki:serviceQuery "sparql" ; # SPARQL query service
@@ -80,3 +95,4 @@ my:service1 rdf:type fuseki:Service ;
fuseki:serviceReadGraphStore "get" ; # SPARQL Graph store protocol (read only)
fuseki:dataset my:securedDataset ;
.
+
http://git-wip-us.apache.org/repos/asf/jena/blob/beb73c4a/jena-security/src/example/resources/org/apache/jena/security/example/fuseki/shiro.ini
----------------------------------------------------------------------
diff --git a/jena-security/src/example/resources/org/apache/jena/security/example/fuseki/shiro.ini b/jena-security/src/example/resources/org/apache/jena/security/example/fuseki/shiro.ini
index d0ce2c3..a9fbf71 100644
--- a/jena-security/src/example/resources/org/apache/jena/security/example/fuseki/shiro.ini
+++ b/jena-security/src/example/resources/org/apache/jena/security/example/fuseki/shiro.ini
@@ -40,7 +40,7 @@ darla=darla
/$/ping = anon
## restrict access. Must log in with above.
-/$/** = authcBasic,user[admin]
+/$/** = authcBasic,user
# Everything else
[06/50] [abbrv] jena git commit: The NOTICE and LICENSE need sortng
out together. This closes #22
Posted by rv...@apache.org.
The NOTICE and LICENSE need sortng out together.
This closes #22
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/362a6053
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/362a6053
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/362a6053
Branch: refs/heads/eliminate-assignments
Commit: 362a60532cf99b68596646d17c7687759be6255b
Parents: 9d4d8f3
Author: Andy Seaborne <an...@seaborne.org>
Authored: Sat Feb 7 17:58:29 2015 +0000
Committer: Andy Seaborne <an...@seaborne.org>
Committed: Sat Feb 7 17:58:29 2015 +0000
----------------------------------------------------------------------
----------------------------------------------------------------------
[10/50] [abbrv] jena git commit: JENA-879: Removed Activator
Posted by rv...@apache.org.
JENA-879: Removed Activator
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/2cb3899e
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/2cb3899e
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/2cb3899e
Branch: refs/heads/eliminate-assignments
Commit: 2cb3899e923a4934f83665628d0f4b81c35880a9
Parents: e33160b
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Mon Feb 2 23:43:16 2015 +0000
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Mon Feb 9 09:57:03 2015 +0000
----------------------------------------------------------------------
.../jena/osgi/test/JenaOSGITestActivator.java | 42 --------------------
1 file changed, 42 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/2cb3899e/apache-jena-osgi/jena-osgi-test/src/main/java/org/apache/jena/osgi/test/JenaOSGITestActivator.java
----------------------------------------------------------------------
diff --git a/apache-jena-osgi/jena-osgi-test/src/main/java/org/apache/jena/osgi/test/JenaOSGITestActivator.java b/apache-jena-osgi/jena-osgi-test/src/main/java/org/apache/jena/osgi/test/JenaOSGITestActivator.java
deleted file mode 100644
index 1349114..0000000
--- a/apache-jena-osgi/jena-osgi-test/src/main/java/org/apache/jena/osgi/test/JenaOSGITestActivator.java
+++ /dev/null
@@ -1,42 +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.osgi.test;
-
-import java.util.Dictionary;
-import java.util.Hashtable;
-
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-
-public class JenaOSGITestActivator implements BundleActivator {
-
- @Override
- public void start(BundleContext context) throws Exception {
- System.out.println("Starting ");
- Dictionary<String, String> properties = new Hashtable<>();
- properties.put("eosgi.testId", "JenaOSGITest");
- properties.put("eosgi.testEngine", "junit4");
- context.registerService(JenaOSGITest.class, new JenaOSGITestImpl(), properties);
- }
-
- @Override
- public void stop(BundleContext context) throws Exception {
- }
-
-}
[23/50] [abbrv] jena git commit: JENA-879: Also test with equinox
Posted by rv...@apache.org.
JENA-879: Also test with equinox
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/29d2e2f0
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/29d2e2f0
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/29d2e2f0
Branch: refs/heads/eliminate-assignments
Commit: 29d2e2f03fd54e651ce9668ab1ffad4c516c8438
Parents: 471b287
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Tue Feb 3 11:37:22 2015 +0000
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Mon Feb 9 10:03:58 2015 +0000
----------------------------------------------------------------------
apache-jena-osgi/jena-osgi-test/pom.xml | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/29d2e2f0/apache-jena-osgi/jena-osgi-test/pom.xml
----------------------------------------------------------------------
diff --git a/apache-jena-osgi/jena-osgi-test/pom.xml b/apache-jena-osgi/jena-osgi-test/pom.xml
index faef3ac..736e6aa 100644
--- a/apache-jena-osgi/jena-osgi-test/pom.xml
+++ b/apache-jena-osgi/jena-osgi-test/pom.xml
@@ -99,21 +99,21 @@
<scope>test</scope>
</dependency>
- <!-- OSGi Framework -->
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.framework</artifactId>
- <version>${felix.version}</version>
- <scope>test</scope>
- </dependency>
- <!-- or..
+ <!-- OSGi Frameworks -->
<dependency>
<groupId>org.eclipse</groupId>
<artifactId>osgi</artifactId>
<version>3.9.1-v20140110-1610</version>
<scope>test</scope>
</dependency>
- -->
+ <!-- NOTE: Make sure eclipse-osgi (equinox) is first -->
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.framework</artifactId>
+ <version>${felix.version}</version>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
[47/50] [abbrv] jena git commit: Migrate simple registry from Fuseki2
to Atlas
Posted by rv...@apache.org.
Migrate simple registry from Fuseki2 to Atlas
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/49fe906b
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/49fe906b
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/49fe906b
Branch: refs/heads/eliminate-assignments
Commit: 49fe906bf8913fb6cdbf0c1cc5e72dc3181b3ac0
Parents: 65ee909
Author: Andy Seaborne <an...@apache.org>
Authored: Tue Feb 17 10:54:45 2015 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Tue Feb 17 10:54:45 2015 +0000
----------------------------------------------------------------------
.../org/apache/jena/atlas/lib/Registry.java | 39 ++++++++++++++++++++
.../apache/jena/fuseki/migrate/Registry.java | 39 --------------------
.../fuseki/server/DataAccessPointRegistry.java | 2 +-
3 files changed, 40 insertions(+), 40 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/49fe906b/jena-arq/src/main/java/org/apache/jena/atlas/lib/Registry.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/atlas/lib/Registry.java b/jena-arq/src/main/java/org/apache/jena/atlas/lib/Registry.java
new file mode 100644
index 0000000..b1e0d74
--- /dev/null
+++ b/jena-arq/src/main/java/org/apache/jena/atlas/lib/Registry.java
@@ -0,0 +1,39 @@
+/*
+ * 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.atlas.lib;
+
+import java.util.Collection ;
+import java.util.Map ;
+import java.util.concurrent.ConcurrentHashMap ;
+
+public class Registry<K,T>
+{
+ protected Map<K, T> registry = new ConcurrentHashMap<>() ;
+
+ public Registry() {}
+
+ public void put(K key, T value) { registry.put(key, value) ; }
+ public T get(K key) { return registry.get(key) ; }
+ public boolean isRegistered(K key) { return registry.containsKey(key) ; }
+ public void remove(K key) { registry.remove(key) ; }
+ public Collection<K> keys() { return registry.keySet() ; }
+ //public Iterator<String> keys() { return registry.keySet().iterator() ; }
+ public int size() { return registry.size() ; }
+ public boolean isEmpty() { return registry.isEmpty() ; }
+}
http://git-wip-us.apache.org/repos/asf/jena/blob/49fe906b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/migrate/Registry.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/migrate/Registry.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/migrate/Registry.java
deleted file mode 100644
index 9e7f729..0000000
--- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/migrate/Registry.java
+++ /dev/null
@@ -1,39 +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.Collection ;
-import java.util.Map ;
-import java.util.concurrent.ConcurrentHashMap ;
-
-public class Registry<K,T>
-{
- protected Map<K, T> registry = new ConcurrentHashMap<>() ;
-
- public Registry() {}
-
- public void put(K key, T value) { registry.put(key, value) ; }
- public T get(K key) { return registry.get(key) ; }
- public boolean isRegistered(K key) { return registry.containsKey(key) ; }
- public void remove(K key) { registry.remove(key) ; }
- public Collection<K> keys() { return registry.keySet() ; }
- //public Iterator<String> keys() { return registry.keySet().iterator() ; }
- public int size() { return registry.size() ; }
- public boolean isEmpty() { return registry.isEmpty() ; }
-}
http://git-wip-us.apache.org/repos/asf/jena/blob/49fe906b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/DataAccessPointRegistry.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/DataAccessPointRegistry.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/DataAccessPointRegistry.java
index 19119a9..acd3e93 100644
--- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/DataAccessPointRegistry.java
+++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/DataAccessPointRegistry.java
@@ -18,8 +18,8 @@
package org.apache.jena.fuseki.server;
+import org.apache.jena.atlas.lib.Registry ;
import org.apache.jena.fuseki.FusekiException ;
-import org.apache.jena.fuseki.migrate.Registry ;
public class DataAccessPointRegistry extends Registry<String, DataAccessPoint>
{
[35/50] [abbrv] jena git commit: name changed to "Apache Jena OSGi
integration tests"
Posted by rv...@apache.org.
name changed to "Apache Jena OSGi integration tests"
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/5c3ea365
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/5c3ea365
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/5c3ea365
Branch: refs/heads/eliminate-assignments
Commit: 5c3ea36593bd2fe8dbcba403a80ebc09f68a9789
Parents: 61ea8ee
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Tue Feb 10 13:18:43 2015 +0000
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Tue Feb 10 15:16:41 2015 +0000
----------------------------------------------------------------------
apache-jena-osgi/jena-osgi-test/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/5c3ea365/apache-jena-osgi/jena-osgi-test/pom.xml
----------------------------------------------------------------------
diff --git a/apache-jena-osgi/jena-osgi-test/pom.xml b/apache-jena-osgi/jena-osgi-test/pom.xml
index 80d2b63..a0dc894 100644
--- a/apache-jena-osgi/jena-osgi-test/pom.xml
+++ b/apache-jena-osgi/jena-osgi-test/pom.xml
@@ -28,7 +28,7 @@ limitations under the License.
<artifactId>jena-osgi-test</artifactId>
<version>2.13.0-SNAPSHOT</version>
- <name>Apache Jena - OSGi bundle tests</name>
+ <name>Apache Jena - OSGi integration tests</name>
<description>Tests for jena-osgi as a bundle</description>
<packaging>bundle</packaging>
[16/50] [abbrv] jena git commit: JENA-879: Manually list transitive
OSGi bundle dependencies for PAX
Posted by rv...@apache.org.
JENA-879: Manually list transitive OSGi bundle dependencies for PAX
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/761a81c0
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/761a81c0
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/761a81c0
Branch: refs/heads/eliminate-assignments
Commit: 761a81c0e649706b1c4860acc68ff8ad85474697
Parents: 0822926
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Tue Feb 3 00:28:26 2015 +0000
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Mon Feb 9 10:03:55 2015 +0000
----------------------------------------------------------------------
.../org/apache/jena/osgi/test/JenaOSGITest.java | 16 +++++++++++++++-
1 file changed, 15 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/761a81c0/apache-jena-osgi/jena-osgi-test/src/test/java/org/apache/jena/osgi/test/JenaOSGITest.java
----------------------------------------------------------------------
diff --git a/apache-jena-osgi/jena-osgi-test/src/test/java/org/apache/jena/osgi/test/JenaOSGITest.java b/apache-jena-osgi/jena-osgi-test/src/test/java/org/apache/jena/osgi/test/JenaOSGITest.java
index 324463d..4775765 100644
--- a/apache-jena-osgi/jena-osgi-test/src/test/java/org/apache/jena/osgi/test/JenaOSGITest.java
+++ b/apache-jena-osgi/jena-osgi-test/src/test/java/org/apache/jena/osgi/test/JenaOSGITest.java
@@ -81,7 +81,21 @@ public class JenaOSGITest {
"java.*",
"javax.*",
"javax.net.ssl"),
- mavenBundle("org.apache.jena", "jena-osgi"),
+
+ // In PAX we have to list transitive dependencies
+ // manually. See ../jena-osgi/pom.xml
+ // for dependencies that are NOT in <scope>provided</scope>
+ // (luckily the version numbers are picked up!)
+ mavenBundle("org.apache.jena", "jena-osgi").versionAsInProject(),
+ mavenBundle("org.apache.httpcomponents", "httpclient-osgi").versionAsInProject(),
+ mavenBundle("org.apache.httpcomponents", "httpcore-osgi").versionAsInProject(),
+ mavenBundle("com.github.jsonld-java", "jsonld-java").versionAsInProject(),
+ mavenBundle("org.apache.commons", "commons-csv").versionAsInProject(),
+ mavenBundle("org.apache.thrift", "libthrift").versionAsInProject(),
+ mavenBundle("org.slf4j", "jcl-over-slf4j").versionAsInProject(),
+ mavenBundle("org.slf4j", "slf4j-log4j").versionAsInProject(),
+ mavenBundle("org.slf4j", "slf4j-api").versionAsInProject(),
+ mavenBundle("org.apache.commons", "commons-lang3").versionAsInProject(),
junitBundles());
}
[09/50] [abbrv] jena git commit: JENA-879: PAX dependencies
Posted by rv...@apache.org.
JENA-879: PAX dependencies
..according to
https://ops4j1.jira.com/wiki/display/PAXEXAM4/OSGi+Containers
but with slf4j-log4j instead of logback to be license safe.
(logback 0.9.18 or later should be ASF-OK though, as it's
now both LGPL and EPL
http://logback.qos.ch/license.html )
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/ee787d2c
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/ee787d2c
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/ee787d2c
Branch: refs/heads/eliminate-assignments
Commit: ee787d2c60b88cf3db309a1d11a35c3c35db01a5
Parents: 2cb3899
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Mon Feb 2 23:43:26 2015 +0000
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Mon Feb 9 09:57:03 2015 +0000
----------------------------------------------------------------------
apache-jena-osgi/jena-osgi-test/pom.xml | 51 +++++++++++++++++++++++++---
1 file changed, 47 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/ee787d2c/apache-jena-osgi/jena-osgi-test/pom.xml
----------------------------------------------------------------------
diff --git a/apache-jena-osgi/jena-osgi-test/pom.xml b/apache-jena-osgi/jena-osgi-test/pom.xml
index 0ce0e8f..2dc1214 100644
--- a/apache-jena-osgi/jena-osgi-test/pom.xml
+++ b/apache-jena-osgi/jena-osgi-test/pom.xml
@@ -26,6 +26,11 @@
<description>Tests for jena-osgi as a bundle</description>
<packaging>bundle</packaging>
+ <properties>
+ <!-- https://ops4j1.jira.com/wiki/display/PAXEXAM4/OSGi+Containers -->
+ <exam.version>3.4.0</exam.version>
+ <url.version>1.6.0</url.version>
+ </properties>
<dependencies>
<dependency>
@@ -41,11 +46,49 @@
<scope>compile</scope>
</dependency>
+ <!-- <dependency> <groupId>org.osgi</groupId> <artifactId>org.osgi.core</artifactId>
+ <version>4.3.1</version> <scope>provided</scope> </dependency> -->
+
+
+ <dependency>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>pax-exam-container-native</artifactId>
+ <version>${exam.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>pax-exam-junit4</artifactId>
+ <version>${exam.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>pax-exam-link-mvn</artifactId>
+ <version>${exam.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.ops4j.pax.url</groupId>
+ <artifactId>pax-url-aether</artifactId>
+ <version>${url.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.framework</artifactId>
+ <version>3.2.2</version>
+ <scope>test</scope>
+ </dependency>
+
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <version>4.3.1</version>
- <scope>provided</scope>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
</dependency>
</dependencies>