You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2020/07/17 15:40:59 UTC
[jena] branch master updated (6c00ec4 -> 546e3c5)
This is an automated email from the ASF dual-hosted git repository.
andy pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/jena.git.
from 6c00ec4 [maven-release-plugin] prepare for next development iteration
new 8c00478 JENA-1937: SHACLC writer
new 918df10 JENA-1937: Move tests to src/test/files
new 5eca828 JENA-1937: More SHACLC writer; clearup
new aa61fb9 Code cleanup
new 807f06d JENA-1937: Fix comment in response to review
new 546e3c5 Merge pull request #775 from afs/shaclc-writer
The 8502 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../java/org/apache/jena/query/QueryFactory.java | 10 +-
.../jena/riot/adapters/AdapterFileManager.java | 91 ++-
.../org/apache/jena/sparql/graph/NodeConst.java | 7 +-
.../src/main/java/org/apache/jena/atlas/io/IO.java | 138 ++--
.../src/main/java/arq/cmdline/ModAlgebra.java | 18 +-
jena-cmds/src/main/java/arq/cmdline/ModItem.java | 18 +-
jena-cmds/src/main/java/shacl/shacl_parse.java | 107 ++-
.../apache/jena/datatypes/xsd/XSDhexBinary.java | 4 +-
.../dboe/storage/system/DatasetGraphStorage.java | 3 +-
.../apache/jena/dboe/transaction/TransInteger.java | 7 +-
jena-shacl/shaclc/shaclc-parser | 2 +-
jena-shacl/shaclc/shaclc.jj | 15 +-
.../main/java/org/apache/jena/shacl/Shapes.java | 115 ++-
.../java/org/apache/jena/shacl/compact/SHACLC.java | 83 ++-
.../apache/jena/shacl/compact/ShaclcParser.java | 80 +-
.../ShaclcWriter.java} | 37 +-
.../compact/{ => reader}/ReaderRIOTShaclc.java | 16 +-
.../compact/{ => reader}/ShaclCompactParser.java | 64 +-
.../{ => reader}/parser/ParseException.java | 4 +-
.../{ => reader}/parser/ShaclCompactParserJJ.java | 67 +-
.../parser/ShaclCompactParserJJConstants.java | 119 +--
.../parser/ShaclCompactParserJJTokenManager.java | 812 +++++++++++----------
.../{ => reader}/parser/SimpleCharStream.java | 4 +-
.../shacl/compact/{ => reader}/parser/Token.java | 4 +-
.../compact/{ => reader}/parser/TokenMgrError.java | 4 +-
.../jena/shacl/compact/writer/CompactWriter.java | 175 +++++
.../shacl/compact/writer/ShapeOutputVisitor.java | 156 ++++
.../org/apache/jena/shacl/engine/ShaclPaths.java | 18 +-
.../org/apache/jena/shacl/engine/TargetOps.java | 34 +-
.../org/apache/jena/shacl/engine/TargetType.java | 14 +-
.../shacl/engine/constraint/ClassConstraint.java | 21 +
.../shacl/engine/constraint/ClosedConstraint.java | 43 +-
.../jena/shacl/engine/constraint/CompactOut.java | 89 +++
.../shacl/engine/constraint/ConstraintBase.java | 37 -
.../constraint/ConstraintComponentSPARQL.java | 24 +
.../shacl/engine/constraint/ConstraintOp1.java | 11 +-
.../shacl/engine/constraint/ConstraintOpN.java | 16 +-
.../engine/constraint/ConstraintPairwise.java | 35 +-
.../engine/constraint/DatatypeConstraint.java | 30 +-
.../engine/constraint/DisjointConstraint.java | 19 +-
.../shacl/engine/constraint/EqualsConstraint.java | 18 +-
.../engine/constraint/HasValueConstraint.java | 8 +
.../jena/shacl/engine/constraint/InConstraint.java | 13 +-
.../engine/constraint/LessThanConstraint.java | 19 +-
.../constraint/LessThanOrEqualsConstraint.java | 19 +-
.../jena/shacl/engine/constraint/MaxCount.java | 11 +
.../jena/shacl/engine/constraint/MinCount.java | 26 +
.../engine/constraint/NodeKindConstraint.java | 11 +-
.../shacl/engine/constraint/PatternConstraint.java | 14 +
.../engine/constraint/QualifiedValueShape.java | 28 +
.../shacl/engine/constraint/ReportConstraint.java | 9 +
.../jena/shacl/engine/constraint/ShNode.java | 19 +
.../apache/jena/shacl/engine/constraint/ShNot.java | 14 +
.../apache/jena/shacl/engine/constraint/ShOr.java | 18 +
.../shacl/engine/constraint/SparqlConstraint.java | 27 +-
.../shacl/engine/constraint/StrLanguageIn.java | 20 +-
.../engine/constraint/StrMaxLengthConstraint.java | 11 +-
.../engine/constraint/StrMinLengthConstraint.java | 9 +
.../engine/constraint/UniqueLangConstraint.java | 9 +
.../engine/constraint/ValueRangeConstraint.java | 22 +-
.../jena/shacl/engine/exec/ValidationStream.java | 21 +-
.../src/main/java/org/apache/jena/shacl/lib/G.java | 97 ++-
.../main/java/org/apache/jena/shacl/lib/ShLib.java | 70 +-
.../org/apache/jena/shacl/parser/Constraint.java | 9 +-
.../org/apache/jena/shacl/parser/NodeShape.java | 8 +-
.../apache/jena/shacl/parser/PropertyShape.java | 12 +-
.../java/org/apache/jena/shacl/parser/Shape.java | 51 +-
.../org/apache/jena/shacl/parser/ShapesParser.java | 87 ++-
.../jena/shacl/validation/ValidationProc.java | 38 +-
.../local/additional/implicit-subclass-1.ttl | 0
.../local/additional/lang-simple-1.ttl | 0
.../local/additional/target-class-subclass-1.ttl | 0
.../local/additional/target-target-1.ttl | 24 +-
.../test/{resources => files}/local/manifest.ttl | 0
.../shaclc-valid/array-in.shaclc | 0
.../{resources => files}/shaclc-valid/array-in.ttl | 0
.../shaclc-valid/basic-shape-iri.shaclc | 0
.../shaclc-valid/basic-shape-iri.ttl | 0
.../shaclc-valid/basic-shape-with-target.shaclc | 0
.../shaclc-valid/basic-shape-with-target.ttl | 0
.../shaclc-valid/basic-shape-with-targets.shaclc | 0
.../shaclc-valid/basic-shape-with-targets.ttl | 0
.../shaclc-valid/basic-shape.shaclc | 0
.../shaclc-valid/basic-shape.ttl | 0
.../{resources => files}/shaclc-valid/class.shaclc | 0
.../{resources => files}/shaclc-valid/class.ttl | 0
.../shaclc-valid/comment.shaclc | 0
.../{resources => files}/shaclc-valid/comment.ttl | 0
.../shaclc-valid/complex1.shaclc | 0
.../{resources => files}/shaclc-valid/complex1.ttl | 0
.../shaclc-valid/complex2.shaclc | 0
.../{resources => files}/shaclc-valid/complex2.ttl | 0
.../shaclc-valid/count-0-1.shaclc | 0
.../shaclc-valid/count-0-1.ttl | 0
.../shaclc-valid/count-0-unlimited.shaclc | 0
.../shaclc-valid/count-0-unlimited.ttl | 0
.../shaclc-valid/count-1-2.shaclc | 0
.../shaclc-valid/count-1-2.ttl | 0
.../shaclc-valid/count-1-unlimited.shaclc | 0
.../shaclc-valid/count-1-unlimited.ttl | 0
.../shaclc-valid/datatype.shaclc | 0
.../{resources => files}/shaclc-valid/datatype.ttl | 0
.../shaclc-valid/directives.shaclc | 0
.../shaclc-valid/directives.ttl | 0
.../{resources => files}/shaclc-valid/empty.shaclc | 0
.../{resources => files}/shaclc-valid/empty.ttl | 0
.../shaclc-valid/nestedShape.shaclc | 0
.../shaclc-valid/nestedShape.ttl | 0
.../shaclc-valid/node-or-2.shaclc | 0
.../shaclc-valid/node-or-2.ttl | 0
.../shaclc-valid/node-or-3-not.shaclc | 0
.../shaclc-valid/node-or-3-not.ttl | 0
.../shaclc-valid/nodeKind.shaclc | 0
.../{resources => files}/shaclc-valid/nodeKind.ttl | 0
.../shaclc-valid/path-alternative.shaclc | 0
.../shaclc-valid/path-alternative.ttl | 0
.../shaclc-valid/path-complex.shaclc | 0
.../shaclc-valid/path-complex.ttl | 0
.../shaclc-valid/path-inverse.shaclc | 0
.../shaclc-valid/path-inverse.ttl | 0
.../shaclc-valid/path-oneOrMore.shaclc | 0
.../shaclc-valid/path-oneOrMore.ttl | 0
.../shaclc-valid/path-sequence.shaclc | 0
.../shaclc-valid/path-sequence.ttl | 0
.../shaclc-valid/path-zeroOrMore.shaclc | 0
.../shaclc-valid/path-zeroOrMore.ttl | 0
.../shaclc-valid/path-zeroOrOne.shaclc | 0
.../shaclc-valid/path-zeroOrOne.ttl | 0
.../shaclc-valid/property-empty.shaclc | 0
.../shaclc-valid/property-empty.ttl | 0
.../shaclc-valid/property-not.shaclc | 0
.../shaclc-valid/property-not.ttl | 0
.../shaclc-valid/property-or-2.shaclc | 0
.../shaclc-valid/property-or-2.ttl | 0
.../shaclc-valid/property-or-3.shaclc | 0
.../shaclc-valid/property-or-3.ttl | 0
.../shaclc-valid/shapeRef.shaclc | 0
.../{resources => files}/shaclc-valid/shapeRef.ttl | 0
.../src/test/{resources => files}/std/README | 0
.../std/core/complex/manifest.ttl | 0
.../std/core/complex/personexample.ttl | 0
.../std/core/complex/shacl-shacl-data-shapes.ttl | 0
.../std/core/complex/shacl-shacl.ttl | 0
.../{resources => files}/std/core/manifest.ttl | 0
.../std/core/misc/deactivated-001.ttl | 0
.../std/core/misc/deactivated-002.ttl | 0
.../std/core/misc/manifest.ttl | 0
.../std/core/misc/message-001.ttl | 0
.../std/core/misc/severity-001.ttl | 0
.../std/core/misc/severity-002.ttl | 0
.../{resources => files}/std/core/node/and-001.ttl | 0
.../{resources => files}/std/core/node/and-002.ttl | 0
.../std/core/node/class-001.ttl | 0
.../std/core/node/class-002.ttl | 0
.../std/core/node/class-003.ttl | 0
.../std/core/node/closed-001.ttl | 0
.../std/core/node/closed-002.ttl | 0
.../std/core/node/datatype-001.ttl | 0
.../std/core/node/datatype-002.ttl | 0
.../std/core/node/disjoint-001.ttl | 0
.../std/core/node/equals-001.ttl | 0
.../std/core/node/hasValue-001.ttl | 0
.../{resources => files}/std/core/node/in-001.ttl | 0
.../std/core/node/languageIn-001.ttl | 0
.../std/core/node/manifest.ttl | 0
.../std/core/node/maxExclusive-001.ttl | 0
.../std/core/node/maxInclusive-001.ttl | 0
.../std/core/node/maxLength-001.ttl | 0
.../std/core/node/minExclusive-001.ttl | 0
.../std/core/node/minInclusive-001.ttl | 0
.../std/core/node/minInclusive-002.ttl | 0
.../std/core/node/minInclusive-003.ttl | 0
.../std/core/node/minLength-001.ttl | 0
.../std/core/node/node-001.ttl | 0
.../std/core/node/nodeKind-001.ttl | 0
.../{resources => files}/std/core/node/not-001.ttl | 0
.../{resources => files}/std/core/node/not-002.ttl | 0
.../{resources => files}/std/core/node/or-001.ttl | 0
.../std/core/node/pattern-001.ttl | 0
.../std/core/node/pattern-002.ttl | 0
.../std/core/node/qualified-001-data.ttl | 0
.../std/core/node/qualified-001-shapes.ttl | 0
.../std/core/node/qualified-001.ttl | 0
.../std/core/node/xone-001.ttl | 0
.../std/core/node/xone-duplicate-data.ttl | 0
.../std/core/node/xone-duplicate-shapes.ttl | 0
.../std/core/node/xone-duplicate.ttl | 0
.../std/core/path/manifest.ttl | 0
.../std/core/path/path-alternative-001.ttl | 0
.../std/core/path/path-complex-001.ttl | 0
.../std/core/path/path-complex-002-data.ttl | 0
.../std/core/path/path-complex-002-shapes.ttl | 0
.../std/core/path/path-complex-002.ttl | 0
.../std/core/path/path-inverse-001.ttl | 0
.../std/core/path/path-oneOrMore-001.ttl | 0
.../std/core/path/path-sequence-001.ttl | 0
.../std/core/path/path-sequence-002.ttl | 0
.../std/core/path/path-sequence-duplicate-001.ttl | 0
.../std/core/path/path-strange-001.ttl | 0
.../std/core/path/path-strange-002.ttl | 0
.../std/core/path/path-unused-001-data.ttl | 0
.../std/core/path/path-unused-001-shapes.ttl | 0
.../std/core/path/path-unused-001.ttl | 0
.../std/core/path/path-zeroOrMore-001.ttl | 0
.../std/core/path/path-zeroOrOne-001.ttl | 0
.../std/core/property/and-001.ttl | 0
.../std/core/property/class-001.ttl | 0
.../std/core/property/datatype-001.ttl | 0
.../std/core/property/datatype-002.ttl | 0
.../std/core/property/datatype-003.ttl | 0
.../std/core/property/datatype-ill-formed-data.ttl | 0
.../core/property/datatype-ill-formed-shapes.ttl | 0
.../std/core/property/datatype-ill-formed.ttl | 0
.../std/core/property/disjoint-001.ttl | 0
.../std/core/property/equals-001.ttl | 0
.../std/core/property/hasValue-001.ttl | 0
.../std/core/property/in-001.ttl | 0
.../std/core/property/languageIn-001.ttl | 0
.../std/core/property/lessThan-001.ttl | 0
.../std/core/property/lessThan-002.ttl | 0
.../std/core/property/lessThanOrEquals-001.ttl | 0
.../std/core/property/manifest.ttl | 0
.../std/core/property/maxCount-001.ttl | 0
.../std/core/property/maxCount-002.ttl | 0
.../std/core/property/maxExclusive-001.ttl | 0
.../std/core/property/maxInclusive-001.ttl | 0
.../std/core/property/maxLength-001.ttl | 0
.../std/core/property/minCount-001.ttl | 0
.../std/core/property/minCount-002.ttl | 0
.../std/core/property/minExclusive-001.ttl | 0
.../std/core/property/minExclusive-002.ttl | 0
.../std/core/property/minLength-001.ttl | 0
.../std/core/property/node-001.ttl | 0
.../std/core/property/node-002.ttl | 0
.../std/core/property/nodeKind-001.ttl | 0
.../std/core/property/not-001.ttl | 0
.../std/core/property/or-001.ttl | 0
.../std/core/property/or-datatypes-001.ttl | 0
.../std/core/property/pattern-001.ttl | 0
.../std/core/property/pattern-002.ttl | 0
.../std/core/property/property-001.ttl | 0
.../property/qualifiedMinCountDisjoint-001.ttl | 0
.../std/core/property/qualifiedValueShape-001.ttl | 0
.../property/qualifiedValueShapesDisjoint-001.ttl | 0
.../std/core/property/uniqueLang-001.ttl | 0
.../std/core/property/uniqueLang-002-data.ttl | 0
.../std/core/property/uniqueLang-002-shapes.ttl | 0
.../std/core/property/uniqueLang-002.ttl | 0
.../std/core/targets/manifest.ttl | 0
.../std/core/targets/multipleTargets-001.ttl | 0
.../std/core/targets/targetClass-001.ttl | 0
.../std/core/targets/targetClassImplicit-001.ttl | 0
.../std/core/targets/targetNode-001.ttl | 0
.../std/core/targets/targetObjectsOf-001.ttl | 0
.../std/core/targets/targetSubjectsOf-001.ttl | 0
.../std/core/targets/targetSubjectsOf-002.ttl | 0
.../std/core/validation-reports/manifest.ttl | 0
.../std/core/validation-reports/shared-data.ttl | 0
.../std/core/validation-reports/shared-shapes.ttl | 0
.../std/core/validation-reports/shared.ttl | 0
.../src/test/{resources => files}/std/manifest.ttl | 0
.../std/sparql/component/manifest.ttl | 0
.../std/sparql/component/nodeValidator-001.ttl | 0
.../std/sparql/component/optional-001.ttl | 0
.../component/propertyValidator-select-001.ttl | 0
.../std/sparql/component/validator-001.ttl | 0
.../{resources => files}/std/sparql/manifest.ttl | 0
.../std/sparql/node/manifest.ttl | 0
.../std/sparql/node/prefixes-001.ttl | 0
.../std/sparql/node/sparql-001.ttl | 0
.../std/sparql/node/sparql-002.ttl | 0
.../std/sparql/node/sparql-003.ttl | 0
.../std/sparql/pre-binding/manifest.ttl | 0
.../std/sparql/pre-binding/manifest.ttl-orig | 0
.../std/sparql/pre-binding/pre-binding-001.ttl | 0
.../std/sparql/pre-binding/pre-binding-002.ttl | 0
.../std/sparql/pre-binding/pre-binding-003.ttl | 0
.../std/sparql/pre-binding/pre-binding-004.ttl | 0
.../std/sparql/pre-binding/pre-binding-005.ttl | 0
.../std/sparql/pre-binding/pre-binding-006.ttl | 0
.../std/sparql/pre-binding/pre-binding-007.ttl | 0
.../std/sparql/pre-binding/shapesGraph-001.ttl | 0
.../sparql/pre-binding/unsupported-sparql-001.ttl | 0
.../sparql/pre-binding/unsupported-sparql-002.ttl | 0
.../sparql/pre-binding/unsupported-sparql-003.ttl | 0
.../sparql/pre-binding/unsupported-sparql-004.ttl | 0
.../sparql/pre-binding/unsupported-sparql-005.ttl | 0
.../sparql/pre-binding/unsupported-sparql-006.ttl | 0
.../std/sparql/property/manifest.ttl | 0
.../std/sparql/property/sparql-001.ttl | 0
.../validation-reports/report1-conforms.ttl | 0
.../validation-reports/report2.ttl | 0
.../test/java/org/apache/jena/shacl/TC_SHACL.java | 4 +-
.../{TC_SHACL.java => compact/TS_Compact.java} | 16 +-
.../jena/shacl/compact/TestReadShaclCompact.java | 94 +++
.../jena/shacl/compact/TestShaclCompact.java | 95 ---
.../jena/shacl/compact/TestWriteShaclCompact.java | 141 ++++
.../org/apache/jena/shacl/testing/RunManifest.java | 24 +-
.../org/apache/jena/shacl/testing/ShaclTest.java | 25 +-
.../jena/shacl/tests/TestValidationReport.java | 4 +-
.../jena/shacl/tests/jena_shacl/TS_JenaShacl.java | 2 +-
.../jena/shacl/tests/std/TestShaclCoreWG.java | 2 +-
.../jena/shacl/tests/std/TestShaclSparqlWG.java | 14 +-
.../apache/jena/tdb/base/file/LocationLock.java | 33 +-
pom.xml | 7 +
305 files changed, 2535 insertions(+), 1219 deletions(-)
copy jena-shacl/src/main/java/org/apache/jena/shacl/{engine/constraint/ConstraintOpN.java => compact/ShaclcWriter.java} (54%)
rename jena-shacl/src/main/java/org/apache/jena/shacl/compact/{ => reader}/ReaderRIOTShaclc.java (79%)
rename jena-shacl/src/main/java/org/apache/jena/shacl/compact/{ => reader}/ShaclCompactParser.java (92%)
rename jena-shacl/src/main/java/org/apache/jena/shacl/compact/{ => reader}/parser/ParseException.java (98%)
rename jena-shacl/src/main/java/org/apache/jena/shacl/compact/{ => reader}/parser/ShaclCompactParserJJ.java (96%)
rename jena-shacl/src/main/java/org/apache/jena/shacl/compact/{ => reader}/parser/ShaclCompactParserJJConstants.java (79%)
rename jena-shacl/src/main/java/org/apache/jena/shacl/compact/{ => reader}/parser/ShaclCompactParserJJTokenManager.java (84%)
rename jena-shacl/src/main/java/org/apache/jena/shacl/compact/{ => reader}/parser/SimpleCharStream.java (99%)
rename jena-shacl/src/main/java/org/apache/jena/shacl/compact/{ => reader}/parser/Token.java (97%)
rename jena-shacl/src/main/java/org/apache/jena/shacl/compact/{ => reader}/parser/TokenMgrError.java (97%)
create mode 100644 jena-shacl/src/main/java/org/apache/jena/shacl/compact/writer/CompactWriter.java
create mode 100644 jena-shacl/src/main/java/org/apache/jena/shacl/compact/writer/ShapeOutputVisitor.java
create mode 100644 jena-shacl/src/main/java/org/apache/jena/shacl/engine/constraint/CompactOut.java
delete mode 100644 jena-shacl/src/main/java/org/apache/jena/shacl/engine/constraint/ConstraintBase.java
rename jena-shacl/src/test/{resources => files}/local/additional/implicit-subclass-1.ttl (100%)
rename jena-shacl/src/test/{resources => files}/local/additional/lang-simple-1.ttl (100%)
rename jena-shacl/src/test/{resources => files}/local/additional/target-class-subclass-1.ttl (100%)
rename jena-shacl/src/test/{resources => files}/local/additional/target-target-1.ttl (62%)
rename jena-shacl/src/test/{resources => files}/local/manifest.ttl (100%)
rename jena-shacl/src/test/{resources => files}/shaclc-valid/array-in.shaclc (100%)
rename jena-shacl/src/test/{resources => files}/shaclc-valid/array-in.ttl (100%)
rename jena-shacl/src/test/{resources => files}/shaclc-valid/basic-shape-iri.shaclc (100%)
rename jena-shacl/src/test/{resources => files}/shaclc-valid/basic-shape-iri.ttl (100%)
rename jena-shacl/src/test/{resources => files}/shaclc-valid/basic-shape-with-target.shaclc (100%)
rename jena-shacl/src/test/{resources => files}/shaclc-valid/basic-shape-with-target.ttl (100%)
rename jena-shacl/src/test/{resources => files}/shaclc-valid/basic-shape-with-targets.shaclc (100%)
rename jena-shacl/src/test/{resources => files}/shaclc-valid/basic-shape-with-targets.ttl (100%)
rename jena-shacl/src/test/{resources => files}/shaclc-valid/basic-shape.shaclc (100%)
rename jena-shacl/src/test/{resources => files}/shaclc-valid/basic-shape.ttl (100%)
rename jena-shacl/src/test/{resources => files}/shaclc-valid/class.shaclc (100%)
rename jena-shacl/src/test/{resources => files}/shaclc-valid/class.ttl (100%)
rename jena-shacl/src/test/{resources => files}/shaclc-valid/comment.shaclc (100%)
rename jena-shacl/src/test/{resources => files}/shaclc-valid/comment.ttl (100%)
rename jena-shacl/src/test/{resources => files}/shaclc-valid/complex1.shaclc (100%)
rename jena-shacl/src/test/{resources => files}/shaclc-valid/complex1.ttl (100%)
rename jena-shacl/src/test/{resources => files}/shaclc-valid/complex2.shaclc (100%)
rename jena-shacl/src/test/{resources => files}/shaclc-valid/complex2.ttl (100%)
rename jena-shacl/src/test/{resources => files}/shaclc-valid/count-0-1.shaclc (100%)
rename jena-shacl/src/test/{resources => files}/shaclc-valid/count-0-1.ttl (100%)
rename jena-shacl/src/test/{resources => files}/shaclc-valid/count-0-unlimited.shaclc (100%)
rename jena-shacl/src/test/{resources => files}/shaclc-valid/count-0-unlimited.ttl (100%)
rename jena-shacl/src/test/{resources => files}/shaclc-valid/count-1-2.shaclc (100%)
rename jena-shacl/src/test/{resources => files}/shaclc-valid/count-1-2.ttl (100%)
rename jena-shacl/src/test/{resources => files}/shaclc-valid/count-1-unlimited.shaclc (100%)
rename jena-shacl/src/test/{resources => files}/shaclc-valid/count-1-unlimited.ttl (100%)
rename jena-shacl/src/test/{resources => files}/shaclc-valid/datatype.shaclc (100%)
rename jena-shacl/src/test/{resources => files}/shaclc-valid/datatype.ttl (100%)
rename jena-shacl/src/test/{resources => files}/shaclc-valid/directives.shaclc (100%)
rename jena-shacl/src/test/{resources => files}/shaclc-valid/directives.ttl (100%)
rename jena-shacl/src/test/{resources => files}/shaclc-valid/empty.shaclc (100%)
rename jena-shacl/src/test/{resources => files}/shaclc-valid/empty.ttl (100%)
rename jena-shacl/src/test/{resources => files}/shaclc-valid/nestedShape.shaclc (100%)
rename jena-shacl/src/test/{resources => files}/shaclc-valid/nestedShape.ttl (100%)
rename jena-shacl/src/test/{resources => files}/shaclc-valid/node-or-2.shaclc (100%)
rename jena-shacl/src/test/{resources => files}/shaclc-valid/node-or-2.ttl (100%)
rename jena-shacl/src/test/{resources => files}/shaclc-valid/node-or-3-not.shaclc (100%)
rename jena-shacl/src/test/{resources => files}/shaclc-valid/node-or-3-not.ttl (100%)
rename jena-shacl/src/test/{resources => files}/shaclc-valid/nodeKind.shaclc (100%)
rename jena-shacl/src/test/{resources => files}/shaclc-valid/nodeKind.ttl (100%)
rename jena-shacl/src/test/{resources => files}/shaclc-valid/path-alternative.shaclc (100%)
rename jena-shacl/src/test/{resources => files}/shaclc-valid/path-alternative.ttl (100%)
rename jena-shacl/src/test/{resources => files}/shaclc-valid/path-complex.shaclc (100%)
rename jena-shacl/src/test/{resources => files}/shaclc-valid/path-complex.ttl (100%)
rename jena-shacl/src/test/{resources => files}/shaclc-valid/path-inverse.shaclc (100%)
rename jena-shacl/src/test/{resources => files}/shaclc-valid/path-inverse.ttl (100%)
rename jena-shacl/src/test/{resources => files}/shaclc-valid/path-oneOrMore.shaclc (100%)
rename jena-shacl/src/test/{resources => files}/shaclc-valid/path-oneOrMore.ttl (100%)
rename jena-shacl/src/test/{resources => files}/shaclc-valid/path-sequence.shaclc (100%)
rename jena-shacl/src/test/{resources => files}/shaclc-valid/path-sequence.ttl (100%)
rename jena-shacl/src/test/{resources => files}/shaclc-valid/path-zeroOrMore.shaclc (100%)
rename jena-shacl/src/test/{resources => files}/shaclc-valid/path-zeroOrMore.ttl (100%)
rename jena-shacl/src/test/{resources => files}/shaclc-valid/path-zeroOrOne.shaclc (100%)
rename jena-shacl/src/test/{resources => files}/shaclc-valid/path-zeroOrOne.ttl (100%)
rename jena-shacl/src/test/{resources => files}/shaclc-valid/property-empty.shaclc (100%)
rename jena-shacl/src/test/{resources => files}/shaclc-valid/property-empty.ttl (100%)
rename jena-shacl/src/test/{resources => files}/shaclc-valid/property-not.shaclc (100%)
rename jena-shacl/src/test/{resources => files}/shaclc-valid/property-not.ttl (100%)
rename jena-shacl/src/test/{resources => files}/shaclc-valid/property-or-2.shaclc (100%)
rename jena-shacl/src/test/{resources => files}/shaclc-valid/property-or-2.ttl (100%)
rename jena-shacl/src/test/{resources => files}/shaclc-valid/property-or-3.shaclc (100%)
rename jena-shacl/src/test/{resources => files}/shaclc-valid/property-or-3.ttl (100%)
rename jena-shacl/src/test/{resources => files}/shaclc-valid/shapeRef.shaclc (100%)
rename jena-shacl/src/test/{resources => files}/shaclc-valid/shapeRef.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/README (100%)
rename jena-shacl/src/test/{resources => files}/std/core/complex/manifest.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/complex/personexample.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/complex/shacl-shacl-data-shapes.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/complex/shacl-shacl.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/manifest.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/misc/deactivated-001.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/misc/deactivated-002.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/misc/manifest.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/misc/message-001.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/misc/severity-001.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/misc/severity-002.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/node/and-001.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/node/and-002.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/node/class-001.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/node/class-002.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/node/class-003.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/node/closed-001.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/node/closed-002.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/node/datatype-001.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/node/datatype-002.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/node/disjoint-001.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/node/equals-001.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/node/hasValue-001.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/node/in-001.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/node/languageIn-001.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/node/manifest.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/node/maxExclusive-001.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/node/maxInclusive-001.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/node/maxLength-001.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/node/minExclusive-001.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/node/minInclusive-001.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/node/minInclusive-002.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/node/minInclusive-003.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/node/minLength-001.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/node/node-001.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/node/nodeKind-001.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/node/not-001.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/node/not-002.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/node/or-001.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/node/pattern-001.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/node/pattern-002.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/node/qualified-001-data.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/node/qualified-001-shapes.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/node/qualified-001.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/node/xone-001.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/node/xone-duplicate-data.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/node/xone-duplicate-shapes.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/node/xone-duplicate.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/path/manifest.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/path/path-alternative-001.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/path/path-complex-001.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/path/path-complex-002-data.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/path/path-complex-002-shapes.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/path/path-complex-002.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/path/path-inverse-001.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/path/path-oneOrMore-001.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/path/path-sequence-001.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/path/path-sequence-002.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/path/path-sequence-duplicate-001.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/path/path-strange-001.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/path/path-strange-002.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/path/path-unused-001-data.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/path/path-unused-001-shapes.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/path/path-unused-001.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/path/path-zeroOrMore-001.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/path/path-zeroOrOne-001.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/property/and-001.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/property/class-001.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/property/datatype-001.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/property/datatype-002.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/property/datatype-003.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/property/datatype-ill-formed-data.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/property/datatype-ill-formed-shapes.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/property/datatype-ill-formed.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/property/disjoint-001.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/property/equals-001.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/property/hasValue-001.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/property/in-001.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/property/languageIn-001.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/property/lessThan-001.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/property/lessThan-002.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/property/lessThanOrEquals-001.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/property/manifest.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/property/maxCount-001.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/property/maxCount-002.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/property/maxExclusive-001.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/property/maxInclusive-001.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/property/maxLength-001.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/property/minCount-001.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/property/minCount-002.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/property/minExclusive-001.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/property/minExclusive-002.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/property/minLength-001.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/property/node-001.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/property/node-002.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/property/nodeKind-001.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/property/not-001.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/property/or-001.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/property/or-datatypes-001.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/property/pattern-001.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/property/pattern-002.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/property/property-001.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/property/qualifiedMinCountDisjoint-001.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/property/qualifiedValueShape-001.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/property/qualifiedValueShapesDisjoint-001.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/property/uniqueLang-001.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/property/uniqueLang-002-data.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/property/uniqueLang-002-shapes.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/property/uniqueLang-002.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/targets/manifest.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/targets/multipleTargets-001.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/targets/targetClass-001.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/targets/targetClassImplicit-001.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/targets/targetNode-001.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/targets/targetObjectsOf-001.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/targets/targetSubjectsOf-001.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/targets/targetSubjectsOf-002.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/validation-reports/manifest.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/validation-reports/shared-data.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/validation-reports/shared-shapes.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/core/validation-reports/shared.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/manifest.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/sparql/component/manifest.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/sparql/component/nodeValidator-001.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/sparql/component/optional-001.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/sparql/component/propertyValidator-select-001.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/sparql/component/validator-001.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/sparql/manifest.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/sparql/node/manifest.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/sparql/node/prefixes-001.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/sparql/node/sparql-001.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/sparql/node/sparql-002.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/sparql/node/sparql-003.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/sparql/pre-binding/manifest.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/sparql/pre-binding/manifest.ttl-orig (100%)
rename jena-shacl/src/test/{resources => files}/std/sparql/pre-binding/pre-binding-001.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/sparql/pre-binding/pre-binding-002.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/sparql/pre-binding/pre-binding-003.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/sparql/pre-binding/pre-binding-004.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/sparql/pre-binding/pre-binding-005.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/sparql/pre-binding/pre-binding-006.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/sparql/pre-binding/pre-binding-007.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/sparql/pre-binding/shapesGraph-001.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/sparql/pre-binding/unsupported-sparql-001.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/sparql/pre-binding/unsupported-sparql-002.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/sparql/pre-binding/unsupported-sparql-003.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/sparql/pre-binding/unsupported-sparql-004.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/sparql/pre-binding/unsupported-sparql-005.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/sparql/pre-binding/unsupported-sparql-006.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/sparql/property/manifest.ttl (100%)
rename jena-shacl/src/test/{resources => files}/std/sparql/property/sparql-001.ttl (100%)
rename jena-shacl/src/test/{resources => files}/validation-reports/report1-conforms.ttl (100%)
rename jena-shacl/src/test/{resources => files}/validation-reports/report2.ttl (100%)
copy jena-shacl/src/test/java/org/apache/jena/shacl/{TC_SHACL.java => compact/TS_Compact.java} (70%)
create mode 100644 jena-shacl/src/test/java/org/apache/jena/shacl/compact/TestReadShaclCompact.java
delete mode 100644 jena-shacl/src/test/java/org/apache/jena/shacl/compact/TestShaclCompact.java
create mode 100644 jena-shacl/src/test/java/org/apache/jena/shacl/compact/TestWriteShaclCompact.java