Upgrade droid6.5.2 sig109

.classpath

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="lib" path="lib/antlr-runtime-3.2.jar"/>
 	<classpathentry kind="lib" path="lib/aspectjrt-1.8.7.jar"/>
 	<classpathentry kind="lib" path="lib/byteseek-2.0.3.jar"/>
@@ -16,9 +15,6 @@
 	<classpathentry kind="lib" path="lib/commons-lang-2.6.jar"/>
 	<classpathentry kind="lib" path="lib/commons-logging-1.1.1.jar"/>
 	<classpathentry kind="lib" path="lib/dps-sdk-4.2.1.jar"/>
-	<classpathentry kind="lib" path="lib/droid-container-6.3.jar"/>
-	<classpathentry kind="lib" path="lib/droid-core-6.3.jar"/>
-	<classpathentry kind="lib" path="lib/droid-core-interfaces-6.3.jar"/>
 	<classpathentry kind="lib" path="lib/droid-lib-2.0.jar"/>
 	<classpathentry kind="lib" path="lib/javahelp-2.0.05.jar"/>
 	<classpathentry kind="lib" path="lib/joda-time-1.6.2.jar"/>
@@ -27,9 +23,16 @@
 	<classpathentry kind="lib" path="lib/jwat-gzip-1.0.3.jar"/>
 	<classpathentry kind="lib" path="lib/jwat-warc-1.0.2.jar"/>
 	<classpathentry kind="lib" path="lib/trove4j-3.0.3.jar"/>
-	<classpathentry kind="lib" path="lib/truezip-6.8.4.jar"/>
 	<classpathentry kind="lib" path="lib/xercesImpl-2.9.1.jar"/>
 	<classpathentry kind="lib" path="lib/xz-1.0.jar"/>
 	<classpathentry kind="lib" path="lib/poi-3.13.jar"/>
+	<classpathentry kind="lib" path="lib/droid-container-6.5.2.jar"/>
+	<classpathentry kind="lib" path="lib/droid-core-6.5.2.jar"/>
+	<classpathentry kind="lib" path="lib/droid-core-interfaces-6.5.2.jar"/>
+	<classpathentry kind="lib" path="lib/log4j-1.2.17.jar"/>
+	<classpathentry kind="lib" path="lib/truezip-driver-zip-7.7.10.jar"/>
+	<classpathentry kind="lib" path="lib/truezip-kernel-7.7.10.jar"/>
+	<classpathentry kind="lib" path="lib/truezip-swing-7.7.10.jar"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

.gitignore

@@ -0,0 +1 @@
+/bin/

.settings/org.eclipse.jdt.core.prefs

@@ -1,11 +1,15 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
 org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
 org.eclipse.jdt.core.compiler.source=1.8

README.md

@@ -1,7 +1,12 @@
 
 How to upgrade Droid:
 
-1) Under the lib folder, replace droid-container-6.3.jar, droid-core-6.3.jar and droid-core-interfaces-6.3.jar with newer version.
+1) Under the lib folder, replace droid-container-6.5.jar, droid-core-6.5.jar and droid-core-interfaces-6.5.jar with newer version.
 2) Edit FFDroidIdentificationPlugin.java- Change the AGENT_VERSION variable to the new version.
 3) Edit FFDroidIdentificationPlugin.java- Change the SIG_VERSION variable to the new version.
 4) Increase the pl:version in the src/PLUGIN-INF/metadata_FFDroidIdentificator.xml
+5) Under the conf folder, replace DROID_SignatureFile.xml with the related one from: https://www.nationalarchives.gov.uk/aboutapps/pronom/droid-signature-files.htm
+6) Under the conf folder, replace container-signature.xml with the related one from: https://www.nationalarchives.gov.uk/aboutapps/pronom/droid-signature-files.htm
+7) Build the plugin with command line: $ant
+
+6.5

build.xml

@@ -4,7 +4,7 @@
 	<path id="classpath">
 		<fileset dir="${lib.dir}" includes="**.jar" />
 	</path>
-	<target name="build-all" depends="clean, init, copy_jars, copy_conf, compile, build_jar" />
+	<target name="build-all" depends="clean, init, copy_jars, copy_conf, copy_de, compile, build_jar" />
 	<target name="clean">
 		<echo>Cleaning the ${build.dir} and ${target.dir} directories</echo>
 		<delete dir="${build.dir}" />
@@ -15,6 +15,7 @@
 		<mkdir dir="${build.dir}/classes" />
 		<mkdir dir="${build.dir}/lib" />
 		<mkdir dir="${build.dir}/conf" />
+		<mkdir dir="${build.dir}/de" />
 		<mkdir dir="${target.dir}" />
 	</target>
 	<target name="copy_jars">
@@ -26,9 +27,15 @@
 	<target name="copy_conf">
 			<echo>Copy conf files</echo>
 			<copy todir="${build.dir}/conf" overwrite="true">
-				<fileset dir="${conf.dir}" includes="**" />
+				<fileset dir="${conf.dir}" includes="*.xml" />
 			</copy>
-		</target>
+	</target>
+	<target name="copy_de">
+			<echo>Copy de files</echo>
+			<copy todir="${build.dir}/de" overwrite="true">
+				<fileset dir="${conf.dir}/de" includes="**" />
+			</copy>
+	</target>
 	<target name="compile" depends="init">
 		<echo>Compile the source files</echo>
 		<javac srcdir="${src.dir}" destdir="${build.dir}/classes" debug="true"
@@ -38,14 +45,12 @@
 	</target>
 	<target name="build_jar" depends="compile">
 		<echo> Build DriodIdentificationPlugin jar </echo>
-		<jar destfile="${target.dir}/FFDroidIdentifier.jar"
-			basedir="${build.dir}/classes">
+		<jar destfile="${target.dir}/FFDroidIdentifier.jar" basedir="${build.dir}/classes">
 			<fileset dir="${src.dir}" includes="**" excludes=" com/**" />
-			<fileset dir="${build.dir}" includes="*lib/*.jar, conf/**" excludes="classes/**" />
-			<manifest>
-				<attribute name="Main-Class"
-					value="com.exlibris.dps.repository.plugin.formatidentification.FFDroidIdentificationPlugin" />
-			</manifest>
+			<fileset dir="${build.dir}" includes="*lib/*.jar, conf/**, de/**" excludes="classes/**" />
+			<!--manifest>
+				<attribute name="Main-Class" value="com.exlibris.dps.repository.plugin.formatidentification.FFDroidIdentificationPlugin" />
+			</manifest-->
 		</jar>
 	</target>
 </project>