Upgrade to Modeshape5 (#1085)

* Upgrade to ModeShape 5.0.0.Final

Related to: https://jira.duraspace.org/browse/FCREPO-1994

* Remove references to Infinispan, and default Modeshape configuration

Related to: https://jira.duraspace.org/browse/FCREPO-1994

* Only create one-click if Maven profile is used: -Pone-click

* This enables a default ModeShape config for the one-click

Related to: https://jira.duraspace.org/browse/FCREPO-1994

* Remove servlet-auth configuration

* It does not work and examples are in fcrepo-webapp-plus

Related to: https://jira.duraspace.org/browse/FCREPO-1994

* use correct postgres JDBC connector (#1042)

* Enable clustering in Modeshape5

* Updates versions for httpcomponent dependencies (httpclient, httpmime… (#1049)

FCREPO-2049: Updates versions for httpcomponent dependencies (httpclient, httpmime, httpcore) to the most recent.

* Updates htmlunit version to support new httpcomponents version.

* Moves httpcomponent versions back down to 4.4.x, which is sufficient for the S3 connector, and allows htmlunit to remain at the original version.

* Upgrade to Modeshape-5.1.0-FINAL (#1058)

Resolves: https://jira.duraspace.org/browse/FCREPO-2062

* Update test repository configuration to enable FileSystemConnector refreshing

.gitignore

@@ -18,3 +18,4 @@ fcrepo4-data/
 fcrepo-integration-ldp/report-*
 fcrepo-integration-ldp/report
 fcrepo-integration-ldp/test-output
+.idea/

fcrepo-auth-common/src/test/resources/config/basic-authn/repository.json

@@ -7,12 +7,9 @@
         "allowCreation" : true
     },
     "storage" : {
-        "cacheName" : "FedoraRepository",
-        "cacheConfiguration" : "${fcrepo.ispn.configuration:config/testing/infinispan-basic.xml}",
-        "binaryStorage" : {
-            "type" : "cache",
-            "dataCacheName" : "FedoraRepositoryBinaryData",
-            "metadataCacheName" : "FedoraRepositoryMetaData"
+        "persistence" : {
+            "type" : "file",
+            "path" : "target/fedora_repository/store"
         }
     },
     "security" : {

fcrepo-auth-common/src/test/resources/repository.json

@@ -7,12 +7,9 @@
         "allowCreation" : true
     },
     "storage" : {
-        "cacheName" : "FedoraRepository",
-        "cacheConfiguration" : "${fcrepo.ispn.configuration:config/testing/infinispan-basic.xml}",
-        "binaryStorage" : {
-            "type" : "cache",
-            "dataCacheName" : "FedoraRepositoryBinaryData",
-            "metadataCacheName" : "FedoraRepositoryMetaData"
+        "persistence" : {
+            "type" : "file",
+            "path" : "target/fedora_repository/store"
         }
     },
     "security" : {

fcrepo-boms/fcrepo-jcr-bom/pom.xml

@@ -56,24 +56,6 @@
         <artifactId>jbossjta</artifactId>
         <version>4.16.6.Final</version>
       </dependency>
-      <dependency>
-        <groupId>org.infinispan</groupId>
-        <artifactId>infinispan-cachestore-leveldb</artifactId>
-        <version>${infinispan.version}</version>
-        <exclusions>
-          <!-- leveldbjni platform-specific builds pull in different versions of this dep; we'll pull in the latest below. -->
-          <exclusion>
-            <groupId>org.fusesource.leveldbjni</groupId>
-            <artifactId>leveldbjni</artifactId>
-          </exclusion>
-        </exclusions>
-      </dependency>
-      <!-- pulling in the latest version of the dependency to make DependencyConvergence happy -->
-      <dependency>
-        <groupId>org.fusesource.leveldbjni</groupId>
-        <artifactId>leveldbjni</artifactId>
-        <version>1.7</version>
-      </dependency>
       <dependency>
         <groupId>org.xerial.snappy</groupId>
         <artifactId>snappy-java</artifactId>

fcrepo-configs/src/main/resources/config/clustered-mysql/repository.json

@@ -0,0 +1,39 @@
+{
+    "name" : "repo",
+    "jndiName" : "",
+    "workspaces" : {
+        "predefined" : ["default"],
+        "default" : "default",
+        "allowCreation" : true
+    },
+    "clustering" : {
+        "clusterName" : "fcrepo-cluster",
+        "configuration" : "${fcrepo.jgroups.configuration:config/jgroups-fcrepo-tcp.xml}"
+    },
+    "storage" : {
+        "persistence": {
+            "type" : "db",
+            "connectionUrl": "jdbc:mysql://${fcrepo.mysql.host:localhost}:${fcrepo.mysql.port:3306}/fcrepo?createDatabaseIfNotExist=true",
+            "driver" : "com.mysql.jdbc.Driver",
+            "username" : "${fcrepo.mysql.username}",
+            "password" : "${fcrepo.mysql.password}"
+        },
+        "binaryStorage" : {
+            "type"  : "database",
+            "url": "jdbc:mysql://${fcrepo.mysql.host:localhost}:${fcrepo.mysql.port:3306}/fcrepo?createDatabaseIfNotExist=true",
+            "driverClass" : "com.mysql.jdbc.Driver",
+            "username" : "${fcrepo.mysql.username}",
+            "password" : "${fcrepo.mysql.password}"
+        }
+    },
+    "security" : {
+        "anonymous" : {
+            "roles" : ["readonly","readwrite","admin"],
+            "useOnFailedLogin" : false
+        },
+        "providers" : [
+            { "classname" : "org.fcrepo.auth.common.BypassSecurityServletAuthenticationProvider" }
+        ]
+    },
+    "node-types" : ["fedora-node-types.cnd"]
+}

fcrepo-configs/src/main/resources/config/minimal-default/repository.json → fcrepo-configs/src/main/resources/config/file-simple/repository.json

@@ -7,8 +7,10 @@
         "allowCreation" : true
     },
     "storage" : {
-        "cacheName" : "FedoraRepository",
-        "cacheConfiguration" : "${fcrepo.ispn.configuration:config/infinispan/leveldb-default/infinispan.xml}",
+        "persistence": {
+            "type": "file",
+            "path" : "${fcrepo.object.directory:target/objects}"
+        },
         "binaryStorage" : {
             "type" : "file",
             "directory" : "${fcrepo.binary.directory:target/binaries}",