Adding configuration for PostgreSQL and generic JDBC databases

fcrepo-configs/src/main/resources/config/infinispan/jdbc-mysql/infinispan.xml

@@ -31,6 +31,10 @@
                                  fetch-state="true"
                                  read-only="false"
                                  purge="false">
+          <!-- JDNI datasource:
+            <jdbc:data-source jndi-url="jndi:jdbc/ispn"/>
+          -->
+          <!-- custom database connection pool -->
           <jdbc:connection-pool connection-url="jdbc:mysql://${fcrepo.ispn.mysql.host:localhost}:${fcrepo.ispn.mysql.port:3306}/ispn?createDatabaseIfNotExist=true"
                                 driver="com.mysql.jdbc.Driver"
                                 username="${fcrepo.ispn.mysql.username}"

fcrepo-configs/src/main/resources/config/infinispan/jdbc-postgresql/infinispan.xml

@@ -0,0 +1,56 @@
+<infinispan xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xmlns="urn:infinispan:config:7.2"
+            xmlns:jdbc="urn:infinispan:config:store:jdbc:7.2"
+            xsi:schemaLocation="urn:infinispan:config:7.2 http://www.infinispan.org/schemas/infinispan-config-7.2.xsd urn:infinispan:config:store:jdbc:7.2 http://infinispan.org/schemas/infinispan-cachestore-jdbc-config-7.2.xsd">
+
+  <cache-container default-cache="FedoraRepository">
+
+    <jmx duplicate-domains="true"/>
+
+    <local-cache name="FedoraRepository" statistics="true">
+
+      <transaction transaction-manager-lookup="org.infinispan.transaction.lookup.GenericTransactionManagerLookup"
+                   mode="NON_XA"
+                   locking="PESSIMISTIC"/>
+
+      <eviction max-entries="500" strategy="LIRS" thread-policy="DEFAULT"/>
+
+      <!--
+          Define the cache loaders (i.e., cache stores). Passivation is false because we want *all*
+          data to be persisted, not just what doesn't fit into memory. Shared is false because there
+          are no other caches sharing this jdbc store. We set preload to false for lazy loading;
+          may be improved by preloading and configuring eviction.
+
+          We can have multiple cache loaders, which get chained. But we'll define just one.
+
+          See: https://docs.jboss.org/infinispan/7.2/configdocs/infinispan-cachestore-jdbc-config-7.2.html
+       -->
+      <persistence passivation="false">
+        <jdbc:string-keyed-jdbc-store shared="false"
+                                 preload="false"
+                                 fetch-state="true"
+                                 read-only="false"
+                                 purge="false">
+          <!-- JDNI datasource:
+            <jdbc:data-source jndi-url="jndi:jdbc/ispn"/>
+          -->
+          <!-- custom database connection pool -->
+          <jdbc:connection-pool connection-url="jdbc:postgresql://${fcrepo.ispn.postgresql.host:localhost}:${fcrepo.ispn.postgresql.port:5432}/ispn"
+                                driver="org.postgresql.Driver"
+                                username="${fcrepo.ispn.postgresql.username}"
+                                password="${fcrepo.ispn.postgresql.password}"/>
+          <jdbc:string-keyed-table prefix="ispn_entry"
+                                   create-on-start="true"
+                                   drop-on-exit="false">
+            <jdbc:id-column name="id" type="VARCHAR(255)"/>
+            <jdbc:data-column name="datum" type="BYTEA"/>
+            <jdbc:timestamp-column name="version" type="BIGINT"/>
+          </jdbc:string-keyed-table>
+
+        </jdbc:string-keyed-jdbc-store>
+
+      </persistence>
+    </local-cache>
+  </cache-container>
+
+</infinispan>

fcrepo-configs/src/main/resources/config/jdbc-postgresql/repository.json

@@ -0,0 +1,28 @@
+{
+    "name" : "repo",
+    "jndiName" : "",
+    "workspaces" : {
+        "predefined" : ["default"],
+        "default" : "default",
+        "allowCreation" : true
+    },
+    "storage" : {
+        "cacheName" : "FedoraRepository",
+        "cacheConfiguration" : "${fcrepo.ispn.configuration:config/infinispan/jdbc-postgresql/infinispan.xml}",
+        "binaryStorage" : {
+            "type" : "file",
+            "directory" : "${fcrepo.binary.directory:target/binaries}",
+            "minimumBinarySizeInBytes" : 4096
+        }
+    },
+    "security" : {
+        "anonymous" : {
+            "roles" : ["readonly","readwrite","admin"],
+            "useOnFailedLogin" : false
+        },
+        "providers" : [
+            { "classname" : "org.fcrepo.auth.common.BypassSecurityServletAuthenticationProvider" }
+        ]
+    },
+    "node-types" : ["fedora-node-types.cnd"]
+}

fcrepo-webapp/pom.xml

@@ -129,7 +129,7 @@
       <version>1.4.01</version>
     </dependency>
 
-    <!--MySQL dependencies-->
+    <!-- JDBC dependencies-->
     <dependency>
       <groupId>com.mchange</groupId>
       <artifactId>c3p0</artifactId>
@@ -139,6 +139,11 @@
       <artifactId>mysql-connector-java</artifactId>
       <version>5.1.38</version>
     </dependency>
+    <dependency>
+	  <groupId>postgresql</groupId>
+	  <artifactId>postgresql</artifactId>
+	  <version>9.1-901-1.jdbc4</version>
+    </dependency>
     <dependency>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-cachestore-jdbc</artifactId>