Commits

Anonymous committed 5f1b6ec

Moved digester config to digester

Comments (0)

Files changed (6)

jhove2-core/pom.xml

         <version>2.0.0-SNAPSHOT</version>
     </parent>
 
-    <groupId>org.jhove2</groupId>
+
     <artifactId>jhove2-core</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+
     <dependencies>
 
         <dependency>

jhove2-core/src/main/resources/module/core/jhove2-framework-config.xml

     <context:annotation-config/>
     <context:component-scan base-package="org.jhove2"/>
 
-    <util:properties id="persistence" location="classpath:module/persistens/persistence.properties"/>
+    <util:properties id="persistence" location="classpath:module/persistens/persistence.properties" scope="singleton"/>
 
     <import resource="jhove2-commands-config.xml"/>
     <import resource="jhove2-developers-config.xml"/>

jhove2-core/src/main/resources/module/jhove2-config.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:util="http://www.springframework.org/schema/util"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.0.xsd">
-
-
-    <import resource="classpath*:**/jhove2-*-config.xml"/>
-
-
-
-</beans>

jhove2-core/src/main/toOtherModules/digesters/jhove2-digest-config.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:util="http://www.springframework.org/schema/util"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans
-           http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-           http://www.springframework.org/schema/context
-           http://www.springframework.org/schema/context/spring-context-2.5.xsd
-		   http://www.springframework.org/schema/util 
-		   http://www.springframework.org/schema/util/spring-util-2.0.xsd">
-
-
-
-    <!--  Message digester module bean -->
-    <bean id="DigesterModule"
-          class="org.jhove2.module.digest.DigesterModule"
-          scope="prototype">
-        <constructor-arg ref="baseModuleAccessor"/>
-        <property name="arrayDigesters">
-            <list value-type="org.jhove2.module.digest.ArrayDigester">
-
-                <ref bean="CRC32Digester"/>
-            </list>
-        </property>
-        <property name="bufferDigesters">
-            <list value-type="org.jhove2.module.digest.BufferDigester">
-
-                <ref bean="MD5Digester"/>
-                <ref bean="SHA1Digester"/>
-                 <ref bean="SHA256Digester"/>
-                 <ref bean="SHA384Digester"/>
-                 <ref bean="SHA512Digester"/>
-            </list>
-        </property>
-        <property name="developers">
-            <list value-type="org.jhove2.core.Agent">
-                <ref bean="CDLAgent"/>
-                <ref bean="PorticoAgent"/>
-                <ref bean="StanfordAgent"/>
-            </list>
-        </property>
-    </bean>
-
-    <!-- Adler-32 message digester bean -->
-    <bean id="Adler32Digester" class="org.jhove2.module.digest.Adler32Digester"
-          scope="prototype"/>
-
-    <!-- CRC-32 message digester bean -->
-    <bean id="CRC32Digester" class="org.jhove2.module.digest.CRC32Digester"
-          scope="prototype"/>
-
-    <!-- MD2 message digester bean -->
-    <bean id="MD2Digester" class="org.jhove2.module.digest.MD2Digester"
-          scope="prototype"/>
-
-    <!-- MD5 message digester bean -->
-    <bean id="MD5Digester" class="org.jhove2.module.digest.MD5Digester"
-          scope="prototype"/>
-
-    <!-- SHA-1 message digester bean -->
-    <bean id="SHA1Digester" class="org.jhove2.module.digest.SHA1Digester"
-          scope="prototype"/>
-
-    <!-- SHA=256 message digester bean -->
-    <bean id="SHA256Digester" class="org.jhove2.module.digest.SHA256Digester"
-          scope="prototype"/>
-
-    <!-- SHA-384 message digester bean -->
-    <bean id="SHA384Digester" class="org.jhove2.module.digest.SHA384Digester"
-          scope="prototype"/>
-
-    <!-- SHA-512 message digester bean -->
-    <bean id="SHA512Digester" class="org.jhove2.module.digest.SHA512Digester"
-          scope="prototype"/>
-</beans>		   

jhove2-digesters/pom.xml

         <version>2.0.0-SNAPSHOT</version>
     </parent>
 
-    <groupId>org.jhove2</groupId>
     <artifactId>jhove2-digesters</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+
     <dependencies>
         <dependency>
             <groupId>org.jhove2</groupId>

jhove2-digesters/src/main/resources/module/digesters/jhove2-digest-config.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:util="http://www.springframework.org/schema/util"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:context="http://www.springframework.org/schema/context"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+           http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+           http://www.springframework.org/schema/context
+           http://www.springframework.org/schema/context/spring-context-2.5.xsd
+		   http://www.springframework.org/schema/util 
+		   http://www.springframework.org/schema/util/spring-util-2.0.xsd">
+
+
+
+    <!--  Message digester module bean -->
+    <bean id="DigesterModule"
+          class="org.jhove2.module.digest.DigesterModule"
+          scope="prototype">
+        <constructor-arg ref="baseModuleAccessor"/>
+        <property name="arrayDigesters">
+            <list value-type="org.jhove2.module.digest.ArrayDigester">
+
+                <ref bean="CRC32Digester"/>
+            </list>
+        </property>
+        <property name="bufferDigesters">
+            <list value-type="org.jhove2.module.digest.BufferDigester">
+
+                <ref bean="MD5Digester"/>
+                <ref bean="SHA1Digester"/>
+                 <ref bean="SHA256Digester"/>
+                 <ref bean="SHA384Digester"/>
+                 <ref bean="SHA512Digester"/>
+            </list>
+        </property>
+        <property name="developers">
+            <list value-type="org.jhove2.core.Agent">
+                <ref bean="CDLAgent"/>
+                <ref bean="PorticoAgent"/>
+                <ref bean="StanfordAgent"/>
+            </list>
+        </property>
+    </bean>
+
+    <!-- Adler-32 message digester bean -->
+    <bean id="Adler32Digester" class="org.jhove2.module.digest.Adler32Digester"
+          scope="prototype"/>
+
+    <!-- CRC-32 message digester bean -->
+    <bean id="CRC32Digester" class="org.jhove2.module.digest.CRC32Digester"
+          scope="prototype"/>
+
+    <!-- MD2 message digester bean -->
+    <bean id="MD2Digester" class="org.jhove2.module.digest.MD2Digester"
+          scope="prototype"/>
+
+    <!-- MD5 message digester bean -->
+    <bean id="MD5Digester" class="org.jhove2.module.digest.MD5Digester"
+          scope="prototype"/>
+
+    <!-- SHA-1 message digester bean -->
+    <bean id="SHA1Digester" class="org.jhove2.module.digest.SHA1Digester"
+          scope="prototype"/>
+
+    <!-- SHA=256 message digester bean -->
+    <bean id="SHA256Digester" class="org.jhove2.module.digest.SHA256Digester"
+          scope="prototype"/>
+
+    <!-- SHA-384 message digester bean -->
+    <bean id="SHA384Digester" class="org.jhove2.module.digest.SHA384Digester"
+          scope="prototype"/>
+
+    <!-- SHA-512 message digester bean -->
+    <bean id="SHA512Digester" class="org.jhove2.module.digest.SHA512Digester"
+          scope="prototype"/>
+</beans>