Update to latest spec, moved to latest Jena 3.1 snapshot, test cases …

…aligned with TopBraid

.classpath

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" output="target/classes" path="src/main/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>

.gitignore

@@ -0,0 +1 @@
+/target/

.project

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>shacl</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+	</natures>
+</projectDescription>

.settings/org.eclipse.core.resources.prefs

@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+encoding//src/main/java=UTF-8
+encoding//src/main/resources=UTF-8
+encoding//src/test/java=UTF-8
+encoding//src/test/resources=UTF-8
+encoding/<project>=UTF-8

.settings/org.eclipse.jdt.core.prefs

@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning

.settings/org.eclipse.m2e.core.prefs

@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1

README.md

@@ -1,21 +1,21 @@
-# TopBraid SHACL API
-
-**An open source implementation of the evolving W3C Shapes Constraint Language (SHACL) based on the Jena API.**
-
-Contact: Holger Knublauch ([email protected])
-
-Can be used to perform SHACL constraint checking in any Jena-based Java application.
-This API also serves as a reference implementation developed in parallel to the SHACL spec.
-**The code is totally not optimized for performance, just for correctness. And there are unfinished gaps!**
-
-The same code is used in the TopBraid products (currently ahead of the release cycle, TopBraid 5.2 will catch up).
-For interoperability with TopBraid, and during the transition period from SPIN to SHACL, this library
-uses code from org.topbraid.spin packages. These will eventually be refactored.
-Meanwhile, please don't rely on any class from the org.topbraid.spin packages directly. 
-
-Feedback and questions should go to TopBraid Users mailing list:
-https://groups.google.com/forum/#!forum/topbraid-users
-Please prefix your messages with [SHACL API]
-
-To get started, look at the classes ModelConstraintValidator and ResourceConstraintValidator in
-the package org.topbraid.shacl.constraints. There is also an [Example Test Case](../master/src/test/java/org/topbraid/shacl/ValidateSquareExampleTest.java)
+# TopBraid SHACL API
+
+**An open source implementation of the evolving W3C Shapes Constraint Language (SHACL) based on the Jena API.**
+
+Contact: Holger Knublauch ([email protected])
+
+Can be used to perform SHACL constraint checking in any Jena-based Java application.
+This API also serves as a reference implementation developed in parallel to the SHACL spec.
+**The code is totally not optimized for performance, just for correctness. And there are unfinished gaps!**
+
+The same code is used in the TopBraid products (currently ahead of the release cycle, TopBraid 5.2 will catch up).
+For interoperability with TopBraid, and during the transition period from SPIN to SHACL, this library
+uses code from org.topbraid.spin packages. These will eventually be refactored.
+Meanwhile, please don't rely on any class from the org.topbraid.spin packages directly. 
+
+Feedback and questions should go to TopBraid Users mailing list:
+https://groups.google.com/forum/#!forum/topbraid-users
+Please prefix your messages with [SHACL API]
+
+To get started, look at the classes ModelConstraintValidator and ResourceConstraintValidator in
+the package org.topbraid.shacl.constraints. There is also an [Example Test Case](../master/src/test/java/org/topbraid/shacl/ValidationExample.java)

pom.xml

@@ -1,5 +1,8 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<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>
 
 	<groupId>org.topbraid</groupId>
@@ -25,12 +28,30 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>
-
+
+	<build>
+    	<plugins>
+      		<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<source>1.8</source>
+					<target>1.8</target>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+
 	<dependencies>
 		<dependency>
 			<groupId>org.apache.jena</groupId>
 			<artifactId>jena-arq</artifactId>
-			<version>3.0.0</version>
+			<version>3.1.0-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+			<groupId>log4j</groupId>
+			<artifactId>log4j</artifactId>
+			<version>1.2.17</version>
 		</dependency>
 		<dependency>
 			<groupId>junit</groupId>
@@ -39,4 +60,17 @@
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
+
+	<repositories>
+		<repository>
+			<id>apache-repo-snapshots</id>
+			<url>https://repository.apache.org/content/repositories/snapshots/</url>
+			<releases>
+				<enabled>false</enabled>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+		</repository>
+	</repositories>
 </project>