Merge pull request #143 from whikloj/FCREPO-2787

Changes to work with Fedora-Camel 5.0.0
fcrepo-exts · Mar 15, 2019 · 6beb0ef · 6beb0ef
2 parents fa26755 + 8114d9b
commit 6beb0ef
Show file tree

Hide file tree

Showing 65 changed files with 1,659 additions and 422 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,6 +3,12 @@ fcrepo4-data/
 *transaction.log
 *~
 
+# Eclipse files
+**/.settings
+**/.classpath
+**/.checkstyle
+**/.project
+
 # Mobile Tools for Java (J2ME)
 .mtj.tmp/
 

diff --git a/.travis.yml b/.travis.yml
@@ -18,7 +18,7 @@ script:
  - sudo service resolvconf stop
  - sudo service sshguard stop
  - sudo service ssh stop
- - mvn install -B -V
+ - mvn install -B -V -q
 
 notifications:
   irc: "irc.freenode.org#fcrepo"

diff --git a/blueprint/fcrepo-audit-triplestore-blueprint/pom.xml b/blueprint/fcrepo-audit-triplestore-blueprint/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <artifactId>fcrepo-camel-toolbox-blueprint</artifactId>
     <groupId>org.fcrepo.camel</groupId>
-    <version>4.8.1-SNAPSHOT</version>
+    <version>5.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>fcrepo-audit-triplestore-blueprint</artifactId>

diff --git a/blueprint/fcrepo-fixity-blueprint/pom.xml b/blueprint/fcrepo-fixity-blueprint/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <artifactId>fcrepo-camel-toolbox-blueprint</artifactId>
     <groupId>org.fcrepo.camel</groupId>
-    <version>4.8.1-SNAPSHOT</version>
+    <version>5.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>fcrepo-fixity-blueprint</artifactId>

diff --git a/blueprint/fcrepo-indexing-solr-blueprint/pom.xml b/blueprint/fcrepo-indexing-solr-blueprint/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <artifactId>fcrepo-camel-toolbox-blueprint</artifactId>
     <groupId>org.fcrepo.camel</groupId>
-    <version>4.8.1-SNAPSHOT</version>
+    <version>5.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>fcrepo-indexing-solr-blueprint</artifactId>

diff --git a/blueprint/fcrepo-indexing-triplestore-blueprint/pom.xml b/blueprint/fcrepo-indexing-triplestore-blueprint/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <artifactId>fcrepo-camel-toolbox-blueprint</artifactId>
     <groupId>org.fcrepo.camel</groupId>
-    <version>4.8.1-SNAPSHOT</version>
+    <version>5.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>fcrepo-indexing-triplestore-blueprint</artifactId>

diff --git a/blueprint/fcrepo-ldpath-blueprint/pom.xml b/blueprint/fcrepo-ldpath-blueprint/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <artifactId>fcrepo-camel-toolbox-blueprint</artifactId>
     <groupId>org.fcrepo.camel</groupId>
-    <version>4.8.1-SNAPSHOT</version>
+    <version>5.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>fcrepo-ldpath-blueprint</artifactId>

diff --git a/blueprint/fcrepo-reindexing-blueprint/pom.xml b/blueprint/fcrepo-reindexing-blueprint/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <artifactId>fcrepo-camel-toolbox-blueprint</artifactId>
     <groupId>org.fcrepo.camel</groupId>
-    <version>4.8.1-SNAPSHOT</version>
+    <version>5.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>fcrepo-reindexing-blueprint</artifactId>

diff --git a/blueprint/fcrepo-serialization-blueprint/pom.xml b/blueprint/fcrepo-serialization-blueprint/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <artifactId>fcrepo-camel-toolbox-blueprint</artifactId>
     <groupId>org.fcrepo.camel</groupId>
-    <version>4.8.1-SNAPSHOT</version>
+    <version>5.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>fcrepo-serialization-blueprint</artifactId>

diff --git a/blueprint/pom.xml b/blueprint/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <artifactId>fcrepo-camel-toolbox</artifactId>
     <groupId>org.fcrepo.camel</groupId>
-    <version>4.8.1-SNAPSHOT</version>
+    <version>5.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>fcrepo-camel-toolbox-blueprint</artifactId>

diff --git a/fcrepo-audit-triplestore/pom.xml b/fcrepo-audit-triplestore/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.fcrepo.camel</groupId>
     <artifactId>fcrepo-camel-toolbox</artifactId>
-    <version>4.8.1-SNAPSHOT</version>
+    <version>5.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>fcrepo-audit-triplestore</artifactId>

diff --git a/fcrepo-audit-triplestore/src/test/resources/event_audit_resource.json b/fcrepo-audit-triplestore/src/test/resources/event_audit_resource.json
@@ -1,36 +1,38 @@
 {
-  "@context" : {
-    "prov" : "http://www.w3.org/ns/prov#" ,
-    "foaf" : "http://xmlns.com/foaf/0.1/" ,
-    "dcterms" : "http://purl.org/dc/terms/" ,
-    "xsd" : "http://www.w3.org/2001/XMLSchema#" ,
-
-    "type" : "@type" ,
-    "id" : "@id" ,
-
-    "atTime" : { "@id" : "prov:atTime", "@type" : "xsd:dateTime" } ,
-    "identifier" : { "@id" : "dcterms:identifier" , "@type" : "@id" } ,
-    "isPartOf" : { "@id" : "dcterms:isPartOf", "@type" : "@id" } ,
-    "name" : { "@id" : "foaf:name", "@type" : "xsd:string" } ,
-    "wasAttributedTo" : { "@id" : "prov:wasAttributedTo", "@type" : "@id" } ,
-    "wasGeneratedBy" : { "@id" : "prov:wasGeneratedBy", "@type" : "@id" }
-  } ,
-
-  "id" : "http://localhost/rest/audit/1234" ,
+  "id": "urn:uuid:3c834a8f-5638-4412-aa4b-35ea80416a11",
   "type" : [
-    "http://www.w3.org/ns/prov#Entity" ,
-    "http://fedora.info/definitions/v4/repository#Resource" ,
-    "http://fedora.info/definitions/v4/repository#Container" ] ,
-  "isPartOf" : "http://localhost/rest" ,
-  "wasGeneratedBy" : {
+    "http://www.w3.org/ns/prov#Activity" ,
+    "https://www.w3.org/ns/activitystreams#Create" ],
+  "name": "create resource",
+  "published": "2016-05-19T17:17:40-04:00Z",
+  "actor": [{
+    "type": ["Person"],
+    "id": "info:fedora/fedoraAdmin"
+  }, {
+    "type": ["Application"],
+    "name": "CLAW client/1.0"
+  }],
+
+  "object" : {
+    "id" : "http://localhost/rest/audit/1234" ,
     "type" : [
-      "http://www.w3.org/ns/prov#Activity" ,
-      "http://fedora.info/definitions/v4/event#ResourceCreation" ] ,
-    "identifier" : "urn:uuid:3c834a8f-5638-4412-aa4b-35ea80416a18" ,
-    "atTime" : "2016-05-19T17:17:39-04:00Z" } ,
-  "wasAttributedTo" : [
-    { "type" : "http://www.w3.org/ns/prov#Person" ,
-      "name" : "fedo raAdmin" },
-    { "type" : "http://www.w3.org/ns/prov#SoftwareAgent" ,
-      "name" : "CLAW client/1.0" } ]
+      "http://www.w3.org/ns/prov#Entity" ,
+      "http://fedora.info/definitions/v4/repository#Resource" ,
+      "http://fedora.info/definitions/v4/repository#Container" ,
+      "http://www.w3.org/ns/ldp#RDFSource",
+      "http://www.w3.org/ns/ldp#BasicContainer" ],
+    "isPartOf" : "http://localhost/rest"
+  },
+
+  "@context": ["https://www.w3.org/ns/activitystreams", {
+    "prov": "http://www.w3.org/ns/prov#",
+    "dcterms": "http://purl.org/dc/terms/",
+    "type": "@type",
+    "id": "@id",
+    "isPartOf": {
+      "@id": "dcterms:isPartOf",
+      "@type": "@id"
+    }
+  }]
 }
+
diff --git a/fcrepo-audit-triplestore/src/test/resources/event_audit_update.json b/fcrepo-audit-triplestore/src/test/resources/event_audit_update.json
@@ -1,36 +1,37 @@
 {
-  "@context" : {
-    "prov" : "http://www.w3.org/ns/prov#" ,
-    "foaf" : "http://xmlns.com/foaf/0.1/" ,
-    "dcterms" : "http://purl.org/dc/terms/" ,
-    "xsd" : "http://www.w3.org/2001/XMLSchema#" ,
-
-    "type" : "@type" ,
-    "id" : "@id" ,
-
-    "atTime" : { "@id" : "prov:atTime", "@type" : "xsd:dateTime" } ,
-    "identifier" : { "@id" : "dcterms:identifier" , "@type" : "@id" } ,
-    "isPartOf" : { "@id" : "dcterms:isPartOf", "@type" : "@id" } ,
-    "name" : { "@id" : "foaf:name", "@type" : "xsd:string" } ,
-    "wasAttributedTo" : { "@id" : "prov:wasAttributedTo", "@type" : "@id" } ,
-    "wasGeneratedBy" : { "@id" : "prov:wasGeneratedBy", "@type" : "@id" }
-  } ,
-
-  "id" : "http://localhost/rest/audit" ,
+  "id": "urn:uuid:3c834a8f-5638-4412-aa4b-35ea80416a12",
   "type" : [
-    "http://www.w3.org/ns/prov#Entity" ,
-    "http://fedora.info/definitions/v4/repository#Resource" ,
-    "http://fedora.info/definitions/v4/repository#Container" ] ,
-  "isPartOf" : "http://localhost/rest" ,
-  "wasGeneratedBy" : {
+    "http://www.w3.org/ns/prov#Activity" ,
+    "https://www.w3.org/ns/activitystreams#Update" ],
+  "name": "update resource",
+  "published": "2016-05-19T17:17:41-04:00Z",
+  "actor": [{
+    "type": ["Person"],
+    "id": "info:fedora/fedoraAdmin"
+  }, {
+    "type": ["Application"],
+    "name": "CLAW client/1.0"
+  }],
+
+  "object" : {
+    "id" : "http://localhost/rest/audit" ,
     "type" : [
-      "http://www.w3.org/ns/prov#Activity" ,
-      "http://fedora.info/definitions/v4/event#ResourceModification" ] ,
-    "identifier" : "urn:uuid:3c834a8f-5638-4412-aa4b-35ea80416a18" ,
-    "atTime" : "2016-05-19T17:17:39-04:00Z" } ,
-  "wasAttributedTo" : [
-    { "type" : "http://www.w3.org/ns/prov#Person" ,
-      "name" : "fedo raAdmin" },
-    { "type" : "http://www.w3.org/ns/prov#SoftwareAgent" ,
-      "name" : "CLAW client/1.0" } ]
-}
+      "http://www.w3.org/ns/prov#Entity" ,
+      "http://fedora.info/definitions/v4/repository#Resource" ,
+      "http://fedora.info/definitions/v4/repository#Container" ,
+      "http://www.w3.org/ns/ldp#RDFSource",
+      "http://www.w3.org/ns/ldp#BasicContainer" ],
+    "isPartOf" : "http://localhost/rest"
+  },
+
+  "@context": ["https://www.w3.org/ns/activitystreams", {
+    "prov": "http://www.w3.org/ns/prov#",
+    "dcterms": "http://purl.org/dc/terms/",
+    "type": "@type",
+    "id": "@id",
+    "isPartOf": {
+      "@id": "dcterms:isPartOf",
+      "@type": "@id"
+    }
+  }]
+}
diff --git a/fcrepo-audit-triplestore/src/test/resources/event_delete_binary.json b/fcrepo-audit-triplestore/src/test/resources/event_delete_binary.json
@@ -1,36 +1,36 @@
 {
-  "@context" : {
-    "prov" : "http://www.w3.org/ns/prov#" ,
-    "foaf" : "http://xmlns.com/foaf/0.1/" ,
-    "dcterms" : "http://purl.org/dc/terms/" ,
-    "xsd" : "http://www.w3.org/2001/XMLSchema#" ,
-
-    "type" : "@type" ,
-    "id" : "@id" ,
-
-    "atTime" : { "@id" : "prov:atTime", "@type" : "xsd:dateTime" } ,
-    "identifier" : { "@id" : "dcterms:identifier" , "@type" : "@id" } ,
-    "isPartOf" : { "@id" : "dcterms:isPartOf", "@type" : "@id" } ,
-    "name" : { "@id" : "foaf:name", "@type" : "xsd:string" } ,
-    "wasAttributedTo" : { "@id" : "prov:wasAttributedTo", "@type" : "@id" } ,
-    "wasGeneratedBy" : { "@id" : "prov:wasGeneratedBy", "@type" : "@id" }
-  } ,
-
-  "id" : "http://localhost/rest/file1" ,
+  "id": "urn:uuid:3c834a8f-5638-4412-aa4b-35ea80416a13",
   "type" : [
-    "http://www.w3.org/ns/prov#Entity" ,
-    "http://fedora.info/definitions/v4/repository#Resource" ,
-    "http://fedora.info/definitions/v4/repository#Binary" ] ,
-  "isPartOf" : "http://localhost/rest" ,
-  "wasGeneratedBy" : {
+    "http://www.w3.org/ns/prov#Activity" ,
+    "https://www.w3.org/ns/activitystreams#Delete" ],
+  "name": "delete resource",
+  "published": "2016-05-19T17:17:42-04:00Z",
+  "actor": [{
+    "type": ["Person"],
+    "id": "info:fedora/fedoraAdmin"
+  }, {
+    "type": ["Application"],
+    "name": "CLAW client/1.0"
+  }],
+
+  "object" : {
+    "id" : "http://localhost/rest/file1" ,
     "type" : [
-      "http://www.w3.org/ns/prov#Activity" ,
-      "https://www.w3.org/ns/activitystreams#Delete" ] ,
-    "identifier" : "urn:uuid:3c834a8f-5638-4412-aa4b-35ea80416a18" ,
-    "atTime" : "2016-05-19T17:17:39-04:00Z" } ,
-  "wasAttributedTo" : [
-    { "type" : "http://www.w3.org/ns/prov#Person" ,
-      "name" : "fedo raAdmin" },
-    { "type" : "http://www.w3.org/ns/prov#SoftwareAgent" ,
-      "name" : "CLAW client/1.0" } ]
-}
+      "http://www.w3.org/ns/prov#Entity" ,
+      "http://fedora.info/definitions/v4/repository#Resource" ,
+      "http://fedora.info/definitions/v4/repository#Binary" ,
+      "http://www.w3.org/ns/ldp#NonRDFSource" ],
+    "isPartOf" : "http://localhost/rest"
+  },
+
+  "@context": ["https://www.w3.org/ns/activitystreams", {
+    "prov": "http://www.w3.org/ns/prov#",
+    "dcterms": "http://purl.org/dc/terms/",
+    "type": "@type",
+    "id": "@id",
+    "isPartOf": {
+      "@id": "dcterms:isPartOf",
+      "@type": "@id"
+    }
+  }]
+}
diff --git a/fcrepo-audit-triplestore/src/test/resources/event_delete_resource.json b/fcrepo-audit-triplestore/src/test/resources/event_delete_resource.json
@@ -1,37 +1,37 @@
 {
-  "@context" : {
-    "prov" : "http://www.w3.org/ns/prov#" ,
-    "foaf" : "http://xmlns.com/foaf/0.1/" ,
-    "dcterms" : "http://purl.org/dc/terms/" ,
-    "xsd" : "http://www.w3.org/2001/XMLSchema#" ,
-
-    "type" : "@type" ,
-    "id" : "@id" ,
-
-    "atTime" : { "@id" : "prov:atTime", "@type" : "xsd:dateTime" } ,
-    "identifier" : { "@id" : "dcterms:identifier" , "@type" : "@id" } ,
-    "isPartOf" : { "@id" : "dcterms:isPartOf", "@type" : "@id" } ,
-    "name" : { "@id" : "foaf:name", "@type" : "xsd:string" } ,
-    "wasAttributedTo" : { "@id" : "prov:wasAttributedTo", "@type" : "@id" } ,
-    "wasGeneratedBy" : { "@id" : "prov:wasGeneratedBy", "@type" : "@id" }
-  } ,
-
-  "id" : "http://localhost/rest/auditions/1234" ,
+  "id": "urn:uuid:3c834a8f-5638-4412-aa4b-35ea80416a14",
   "type" : [
-    "http://www.w3.org/ns/prov#Entity" ,
-    "http://fedora.info/definitions/v4/repository#Resource" ,
-    "http://fedora.info/definitions/v4/repository#Container" ,
-    "http://example.org/CustomType" ] ,
-  "isPartOf" : "http://localhost/rest" ,
-  "wasGeneratedBy" : {
+    "http://www.w3.org/ns/prov#Activity" ,
+    "https://www.w3.org/ns/activitystreams#Delete" ],
+  "name": "delete resource",
+  "published": "2016-05-19T17:17:43-04:00Z",
+  "actor": [{
+    "type": ["Person"],
+    "id": "info:fedora/fedoraAdmin"
+  }, {
+    "type": ["Application"],
+    "name": "CLAW client/1.0"
+  }],
+
+  "object" : {
+    "id" : "http://localhost/rest/auditions/1234" ,
     "type" : [
-      "http://www.w3.org/ns/prov#Activity" ,
-      "https://www.w3.org/ns/activitystreams#Delete" ] ,
-    "identifier" : "urn:uuid:3c834a8f-5638-4412-aa4b-35ea80416a18" ,
-    "atTime" : "2016-05-19T17:17:39-04:00Z" } ,
-  "wasAttributedTo" : [
-    { "type" : "http://www.w3.org/ns/prov#Person" ,
-      "name" : "fedo raAdmin" },
-    { "type" : "http://www.w3.org/ns/prov#SoftwareAgent" ,
-      "name" : "CLAW client/1.0" } ]
-}
+      "http://www.w3.org/ns/prov#Entity" ,
+      "http://fedora.info/definitions/v4/repository#Resource" ,
+      "http://fedora.info/definitions/v4/repository#Container" ,
+      "http://www.w3.org/ns/ldp#RDFSource",
+      "http://www.w3.org/ns/ldp#BasicContainer" ],
+    "isPartOf" : "http://localhost/rest"
+  },
+
+  "@context": ["https://www.w3.org/ns/activitystreams", {
+    "prov": "http://www.w3.org/ns/prov#",
+    "dcterms": "http://purl.org/dc/terms/",
+    "type": "@type",
+    "id": "@id",
+    "isPartOf": {
+      "@id": "dcterms:isPartOf",
+      "@type": "@id"
+    }
+  }]
+}