remove dependency on fcrepo-mint module

Related to: https://jira.duraspace.org/browse/FCREPO-1696
fcrepo-exts · Nov 5, 2015 · e064b44 · e064b44
1 parent 755ee2b
commit e064b44
Show file tree

Hide file tree

Showing 8 changed files with 109 additions and 4 deletions.
diff --git a/pom.xml b/pom.xml
@@ -60,6 +60,11 @@
       <type>jar</type>
       <classifier>classes</classifier>
     </dependency>
+    <dependency>
+      <groupId>org.fcrepo</groupId>
+      <artifactId>fcrepo-mint</artifactId>
+      <version>4.4.1-SNAPSHOT</version>
+    </dependency>
     <dependency>
       <groupId>org.fcrepo.transform</groupId>
       <artifactId>fcrepo-transform</artifactId>

diff --git a/src/audit/auth-resources/spring/minter.xml b/src/audit/auth-resources/spring/minter.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:c="http://www.springframework.org/schema/c"
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+
+    <!-- Mints PIDs using random UUIDs -->
+    <bean class="org.fcrepo.mint.UUIDPathMinter"
+        c:length="${fcrepo.uuid.path.length:2}"
+        c:count="${fcrepo.uuid.path.count:4}"/>
+
+    <!-- Mints PIDs using external REST service
+    <bean class="org.fcrepo.mint.HttpPidMinter"
+        c:url="http://localhost/my/minter" c:method="POST"
+        c:username="${fcrepo.minter.username:minterUser}"
+        c:password="${fcrepo.minter.password:minterPass}"
+        c:regex="" c:xpath="/response/ids/value"/>
+    -->
+
+</beans>
diff --git a/src/audit/resources/spring/minter.xml b/src/audit/resources/spring/minter.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:c="http://www.springframework.org/schema/c"
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+
+    <!-- Mints PIDs using random UUIDs -->
+    <bean class="org.fcrepo.mint.UUIDPathMinter"
+        c:length="${fcrepo.uuid.path.length:2}"
+        c:count="${fcrepo.uuid.path.count:4}"/>
+
+    <!-- Mints PIDs using external REST service
+    <bean class="org.fcrepo.mint.HttpPidMinter"
+        c:url="http://localhost/my/minter" c:method="POST"
+        c:username="${fcrepo.minter.username:minterUser}"
+        c:password="${fcrepo.minter.password:minterPass}"
+        c:regex="" c:xpath="/response/ids/value"/>
+    -->
+
+</beans>
diff --git a/src/rbacl/webapp/WEB-INF/classes/spring/auth-master.xml b/src/rbacl/webapp/WEB-INF/classes/spring/auth-master.xml
@@ -3,7 +3,7 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="
     http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
-    
+
     <!-- Master context for fcrepo4. -->
 
     <import resource="${fcrepo.spring.repo.configuration:classpath:/spring/auth-repo.xml}"/>
@@ -12,5 +12,5 @@
     <import resource="${fcrepo.spring.eventing.configuration:classpath:/spring/eventing.xml}"/>
     <import resource="${fcrepo.spring.jms.configuration:classpath:/spring/jms.xml}"/>
     <import resource="${fcrepo.spring.transactions.configuration:classpath:/spring/transactions.xml}"/>
-    
+
 </beans>
diff --git a/src/rbacl/webapp/WEB-INF/classes/spring/minter.xml b/src/rbacl/webapp/WEB-INF/classes/spring/minter.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:c="http://www.springframework.org/schema/c"
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+
+    <!-- Mints PIDs using random UUIDs -->
+    <bean class="org.fcrepo.mint.UUIDPathMinter"
+        c:length="${fcrepo.uuid.path.length:2}"
+        c:count="${fcrepo.uuid.path.count:4}"/>
+
+    <!-- Mints PIDs using external REST service
+    <bean class="org.fcrepo.mint.HttpPidMinter"
+        c:url="http://localhost/my/minter" c:method="POST"
+        c:username="${fcrepo.minter.username:minterUser}"
+        c:password="${fcrepo.minter.password:minterPass}"
+        c:regex="" c:xpath="/response/ids/value"/>
+    -->
+
+</beans>
diff --git a/src/webac/webapp/WEB-INF/classes/spring/auth-master.xml b/src/webac/webapp/WEB-INF/classes/spring/auth-master.xml
@@ -3,7 +3,7 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="
     http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
-    
+
     <!-- Master context for fcrepo4. -->
 
     <import resource="${fcrepo.spring.repo.configuration:classpath:/spring/auth-repo.xml}"/>
@@ -12,5 +12,5 @@
     <import resource="${fcrepo.spring.eventing.configuration:classpath:/spring/eventing.xml}"/>
     <import resource="${fcrepo.spring.jms.configuration:classpath:/spring/jms.xml}"/>
     <import resource="${fcrepo.spring.transactions.configuration:classpath:/spring/transactions.xml}"/>
-    
+
 </beans>
diff --git a/src/webac/webapp/WEB-INF/classes/spring/minter.xml b/src/webac/webapp/WEB-INF/classes/spring/minter.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:c="http://www.springframework.org/schema/c"
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+
+    <!-- Mints PIDs using random UUIDs -->
+    <bean class="org.fcrepo.mint.UUIDPathMinter"
+        c:length="${fcrepo.uuid.path.length:2}"
+        c:count="${fcrepo.uuid.path.count:4}"/>
+
+    <!-- Mints PIDs using external REST service
+    <bean class="org.fcrepo.mint.HttpPidMinter"
+        c:url="http://localhost/my/minter" c:method="POST"
+        c:username="${fcrepo.minter.username:minterUser}"
+        c:password="${fcrepo.minter.password:minterPass}"
+        c:regex="" c:xpath="/response/ids/value"/>
+    -->
+
+</beans>
diff --git a/src/xacml/webapp/WEB-INF/classes/spring/minter.xml b/src/xacml/webapp/WEB-INF/classes/spring/minter.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:c="http://www.springframework.org/schema/c"
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+
+    <!-- Mints PIDs using random UUIDs -->
+    <bean class="org.fcrepo.mint.UUIDPathMinter"
+        c:length="${fcrepo.uuid.path.length:2}"
+        c:count="${fcrepo.uuid.path.count:4}"/>
+
+    <!-- Mints PIDs using external REST service
+    <bean class="org.fcrepo.mint.HttpPidMinter"
+        c:url="http://localhost/my/minter" c:method="POST"
+        c:username="${fcrepo.minter.username:minterUser}"
+        c:password="${fcrepo.minter.password:minterPass}"
+        c:regex="" c:xpath="/response/ids/value"/>
+    -->
+
+</beans>