Browse Source

format XML.

root 3 years ago
parent
commit
27299caf8e
13 changed files with 783 additions and 817 deletions
  1. 1 0
      .gitignore
  2. 1 1
      README.md
  3. 57 69
      asmblefiles.xml
  4. 65 80
      build.xml
  5. 45 62
      build_for_Raspberry3.xml
  6. 33 43
      dedup/build.xml
  7. 29 38
      dedup/jalbum.xml
  8. 33 43
      dedup/log4j.xml
  9. 61 63
      dedup/pom.xml
  10. 38 49
      photoweb/build.xml
  11. 334 335
      photoweb/pom.xml
  12. 30 34
      pom.xml
  13. 56 0
      pom_for_Raspberry3.xml

+ 1 - 0
.gitignore

@@ -3,3 +3,4 @@ distribute
 /dedup/dedup.iml
 /photoweb/photomweb.iml
 /jAlbum_release.zip
+/jAlbum.iml

+ 1 - 1
README.md

@@ -10,7 +10,7 @@ This is a local photo management system written with the Java language. Using B/
 >### For ARM platform, such as Raspberry3 ubuntu-mate system, compile jdbcsqlite native so first. Other platform may not need this.
 ```shell
 cd jAlbum
-ant -f build_for_Raspberry3.xml
+mvn clean compile package install -f pom_for_Raspberry3.xml
 ```
 For other platforms, such as Windows, X86 Linux etc. just run the command like:
 ```shell

+ 57 - 69
asmblefiles.xml

@@ -1,73 +1,61 @@
-<?xml version="1.0" encoding="utf-8"?> 
-
+<?xml version="1.0" encoding="utf-8"?>
 <project name="jAlbum" basedir="." default="all">
-
-    <property name="dedup.dir" location="dedup" />
-    <property name="photoweb.dir" location="photoweb" />
-    <property name="distribute.dir" location="distribute" />
-    <property name="scripts.dir" location="scripts" />
-    <target name="test" depends="release"/>
-    <target name="all" >
-        <mkdir dir="${distribute.dir}" />
-        <mkdir dir="${distribute.dir}/lib" />
-        <mkdir dir="${distribute.dir}/lib/extra" />
-        <mkdir dir="${distribute.dir}/log" />
-        
-        <move todir="${distribute.dir}" overwrite="true">
-            <fileset dir="${dedup.dir}/target">
-                <include name="start.jar" />
-            </fileset>
-            <fileset dir="${photoweb.dir}/target">
-                <include name="root.war" />
-            </fileset>          
-        </move>
-        
-        <copy todir="${distribute.dir}" overwrite="false">
-            <fileset dir="${dedup.dir}">
-                <include name="dedup.db" />
-                <include name="favicon.ico" />
-                <include name="jalbum.xml" />
-                <include name="log4j.xml" /> 
-            </fileset> 
-            <fileset dir="${scripts.dir}">
-                <include name="start.sh" />
-                <include name="start.bat" />
-                <include name="readme.txt" />
-            </fileset> 
-        </copy>
-        
-        <!--copy todir="${distribute.dir}/lib" overwrite="true">
+  <property name="dedup.dir" location="dedup"/>
+  <property name="photoweb.dir" location="photoweb"/>
+  <property name="distribute.dir" location="distribute"/>
+  <property name="scripts.dir" location="scripts"/>
+  <target name="test" depends="release"/>
+  <target name="all">
+    <mkdir dir="${distribute.dir}"/>
+    <mkdir dir="${distribute.dir}/lib"/>
+    <mkdir dir="${distribute.dir}/lib/extra"/>
+    <mkdir dir="${distribute.dir}/log"/>
+    <move todir="${distribute.dir}" overwrite="true">
+      <fileset dir="${dedup.dir}/target">
+        <include name="start.jar"/>
+      </fileset>
+      <fileset dir="${photoweb.dir}/target">
+        <include name="root.war"/>
+      </fileset>
+    </move>
+    <copy todir="${distribute.dir}" overwrite="false">
+      <fileset dir="${dedup.dir}">
+        <include name="dedup.db"/>
+        <include name="favicon.ico"/>
+        <include name="jalbum.xml"/>
+        <include name="log4j.xml"/>
+      </fileset>
+      <fileset dir="${scripts.dir}">
+        <include name="start.sh"/>
+        <include name="start.bat"/>
+        <include name="readme.txt"/>
+      </fileset>
+    </copy>
+    <!--copy todir="${distribute.dir}/lib" overwrite="true">
             <fileset dir="${dedup.dir}/lib" />
         </copy-->
-        
-        <copy todir="${distribute.dir}/lib/extra" overwrite="true">
-            <fileset dir="${photoweb.dir}/target/dependency" >
-            </fileset>    
-        </copy>        
-
-        <copy todir="${distribute.dir}/js" overwrite="true">
-            <fileset dir="${dedup.dir}/js" />
-        </copy>
-    </target>
-    
-    <target name="release" depends="all">
-        <mkdir dir="${distribute.dir}/relase_tmp" />
-        <copy todir="${distribute.dir}/relase_tmp" overwrite="true">
-            <fileset dir="${dedup.dir}" >
-                <include name="jalbum.xml" />
-                <include name="log4j.xml" /> 
-            </fileset> 
-        </copy> 
-        
-        <fixcrlf srcdir="${distribute.dir}/relase_tmp" includes="**/*.xml" eol="crlf" />
-        
-        <zip destfile="jAlbum_release.zip" >
-            <zipfileset dir="${distribute.dir}" excludes=".svn/**, thumbnail/**, log/**, relase_tmp/**, dedup.db, log4j.xml, jalbum.xml"/>
-            <zipfileset dir="${dedup.dir}" includes="dedup.db"/>
-            <zipfileset dir="${distribute.dir}/relase_tmp" includes="log4j.xml, jalbum.xml" />
-        </zip>
-
-        <delete dir="${distribute.dir}/relase_tmp" />        
-    </target>
-    
+    <copy todir="${distribute.dir}/lib/extra" overwrite="true">
+      <fileset dir="${photoweb.dir}/target/dependency">
+            </fileset>
+    </copy>
+    <copy todir="${distribute.dir}/js" overwrite="true">
+      <fileset dir="${dedup.dir}/js"/>
+    </copy>
+  </target>
+  <target name="release" depends="all">
+    <mkdir dir="${distribute.dir}/relase_tmp"/>
+    <copy todir="${distribute.dir}/relase_tmp" overwrite="true">
+      <fileset dir="${dedup.dir}">
+        <include name="jalbum.xml"/>
+        <include name="log4j.xml"/>
+      </fileset>
+    </copy>
+    <fixcrlf srcdir="${distribute.dir}/relase_tmp" includes="**/*.xml" eol="crlf"/>
+    <zip destfile="jAlbum_release.zip">
+      <zipfileset dir="${distribute.dir}" excludes=".svn/**, thumbnail/**, log/**, relase_tmp/**, dedup.db, log4j.xml, jalbum.xml"/>
+      <zipfileset dir="${dedup.dir}" includes="dedup.db"/>
+      <zipfileset dir="${distribute.dir}/relase_tmp" includes="log4j.xml, jalbum.xml"/>
+    </zip>
+    <delete dir="${distribute.dir}/relase_tmp"/>
+  </target>
 </project>

+ 65 - 80
build.xml

@@ -1,82 +1,67 @@
-<?xml version="1.0" encoding="utf-8"?> 
-
+<?xml version="1.0" encoding="utf-8"?>
 <project name="jAlbum" basedir="." default="all">
-
-    <property name="dedup.dir" location="dedup" />
-    <property name="photoweb.dir" location="photoweb" />
-    <property name="distribute.dir" location="distribute" />
-    <property name="scripts.dir" location="scripts" />
-    <target name="test" depends="release"/>
-    <target name="all" >
-        <ant antfile="build.xml" dir="${dedup.dir}" target="jar"/>  
-        <ant antfile="build.xml" dir="${photoweb.dir}" target="war"/>  
-        
-        <mkdir dir="${distribute.dir}" />
-        <mkdir dir="${distribute.dir}/lib" />
-        <mkdir dir="${distribute.dir}/lib/extra" />
-        <mkdir dir="${distribute.dir}/log" />
-        
-        <move todir="${distribute.dir}" overwrite="true">
-            <fileset dir="${dedup.dir}">
-                <include name="start.jar" />
-            </fileset>
-            <fileset dir="${photoweb.dir}/dist">
-                <include name="root.war" />
-            </fileset>          
-        </move>
-        
-        <copy todir="${distribute.dir}" overwrite="false">
-            <fileset dir="${dedup.dir}">
-                <include name="dedup.db" />
-                <include name="favicon.ico" />
-                <include name="jalbum.xml" />
-                <include name="log4j.xml" /> 
-            </fileset> 
-            <fileset dir="${scripts.dir}">
-                <include name="start.sh" />
-                <include name="start.bat" />
-                <include name="readme.txt" />
-            </fileset> 
-        </copy>
-        
-        <copy todir="${distribute.dir}/lib" overwrite="true">
-            <fileset dir="${dedup.dir}/lib" />
-        </copy>
-        
-        <copy todir="${distribute.dir}/lib/extra" overwrite="true">
-            <fileset dir="${photoweb.dir}/lib" >
-                <exclude name="jetty-io-8.0.0.M2.jar" />
-		<exclude name="jetty-server-8.0.0.M2.jar" />
-            </fileset>    
-        </copy>        
-
-        <copy todir="${distribute.dir}/js" overwrite="true">
-            <fileset dir="${dedup.dir}/js" />
-        </copy>
-
-        <ant antfile="build.xml" dir="${dedup.dir}" target="clean"/>  
-        <ant antfile="build.xml" dir="${photoweb.dir}" target="clean"/>  
-    
-    </target>
-    
-    <target name="release" depends="all">
-        <mkdir dir="${distribute.dir}/relase_tmp" />
-        <copy todir="${distribute.dir}/relase_tmp" overwrite="true">
-            <fileset dir="${dedup.dir}" >
-                <include name="jalbum.xml" />
-                <include name="log4j.xml" /> 
-            </fileset> 
-        </copy> 
-        
-        <fixcrlf srcdir="${distribute.dir}/relase_tmp" includes="**/*.xml" eol="crlf" />
-        
-        <zip destfile="jAlbum_release.zip" >
-            <zipfileset dir="${distribute.dir}" excludes=".svn/**, thumbnail/**, log/**, relase_tmp/**, dedup.db, log4j.xml, jalbum.xml"/>
-            <zipfileset dir="${dedup.dir}" includes="dedup.db"/>
-            <zipfileset dir="${distribute.dir}/relase_tmp" includes="log4j.xml, jalbum.xml" />
-        </zip>
-
-        <delete dir="${distribute.dir}/relase_tmp" />        
-    </target>
-    
+  <property name="dedup.dir" location="dedup"/>
+  <property name="photoweb.dir" location="photoweb"/>
+  <property name="distribute.dir" location="distribute"/>
+  <property name="scripts.dir" location="scripts"/>
+  <target name="test" depends="release"/>
+  <target name="all">
+    <ant antfile="build.xml" dir="${dedup.dir}" target="jar"/>
+    <ant antfile="build.xml" dir="${photoweb.dir}" target="war"/>
+    <mkdir dir="${distribute.dir}"/>
+    <mkdir dir="${distribute.dir}/lib"/>
+    <mkdir dir="${distribute.dir}/lib/extra"/>
+    <mkdir dir="${distribute.dir}/log"/>
+    <move todir="${distribute.dir}" overwrite="true">
+      <fileset dir="${dedup.dir}">
+        <include name="start.jar"/>
+      </fileset>
+      <fileset dir="${photoweb.dir}/dist">
+        <include name="root.war"/>
+      </fileset>
+    </move>
+    <copy todir="${distribute.dir}" overwrite="false">
+      <fileset dir="${dedup.dir}">
+        <include name="dedup.db"/>
+        <include name="favicon.ico"/>
+        <include name="jalbum.xml"/>
+        <include name="log4j.xml"/>
+      </fileset>
+      <fileset dir="${scripts.dir}">
+        <include name="start.sh"/>
+        <include name="start.bat"/>
+        <include name="readme.txt"/>
+      </fileset>
+    </copy>
+    <copy todir="${distribute.dir}/lib" overwrite="true">
+      <fileset dir="${dedup.dir}/lib"/>
+    </copy>
+    <copy todir="${distribute.dir}/lib/extra" overwrite="true">
+      <fileset dir="${photoweb.dir}/lib">
+        <exclude name="jetty-io-8.0.0.M2.jar"/>
+        <exclude name="jetty-server-8.0.0.M2.jar"/>
+      </fileset>
+    </copy>
+    <copy todir="${distribute.dir}/js" overwrite="true">
+      <fileset dir="${dedup.dir}/js"/>
+    </copy>
+    <ant antfile="build.xml" dir="${dedup.dir}" target="clean"/>
+    <ant antfile="build.xml" dir="${photoweb.dir}" target="clean"/>
+  </target>
+  <target name="release" depends="all">
+    <mkdir dir="${distribute.dir}/relase_tmp"/>
+    <copy todir="${distribute.dir}/relase_tmp" overwrite="true">
+      <fileset dir="${dedup.dir}">
+        <include name="jalbum.xml"/>
+        <include name="log4j.xml"/>
+      </fileset>
+    </copy>
+    <fixcrlf srcdir="${distribute.dir}/relase_tmp" includes="**/*.xml" eol="crlf"/>
+    <zip destfile="jAlbum_release.zip">
+      <zipfileset dir="${distribute.dir}" excludes=".svn/**, thumbnail/**, log/**, relase_tmp/**, dedup.db, log4j.xml, jalbum.xml"/>
+      <zipfileset dir="${dedup.dir}" includes="dedup.db"/>
+      <zipfileset dir="${distribute.dir}/relase_tmp" includes="log4j.xml, jalbum.xml"/>
+    </zip>
+    <delete dir="${distribute.dir}/relase_tmp"/>
+  </target>
 </project>

+ 45 - 62
build_for_Raspberry3.xml

@@ -1,63 +1,46 @@
-<?xml version="1.0" encoding="utf-8"?> 
-
+<?xml version="1.0" encoding="utf-8"?>
 <project name="jAlbum" basedir="." default="all">
-	<property name="dedup.dir" location="dedup" />
-	<property name="photoweb.dir" location="photoweb" />
-    <property name="distribute.dir" location="distribute" />
-    <property name="scripts.dir" location="scripts" />
-    <property name="jdbc.dir" location="jdbcsqlitenative" />
-    
-    <target name="all" >
-        <ant antfile="build.xml" dir="${dedup.dir}" target="jar"/>  
-        <ant antfile="build.xml" dir="${photoweb.dir}" target="war"/>  
-        <exec dir="${jdbc.dir}" executable="make" os="Linux"  failonerror="true" />
-        
-        <mkdir dir="${distribute.dir}" />
-        <mkdir dir="${distribute.dir}/lib" />
-        <mkdir dir="${distribute.dir}/lib/extra" />
-        <mkdir dir="${distribute.dir}/log" />
-        
-        <move todir="${distribute.dir}" overwrite="true">
-            <fileset dir="${dedup.dir}">
-                <include name="start.jar" />
-            </fileset>
-            <fileset dir="${photoweb.dir}/dist">
-                <include name="root.war" />
-            </fileset>  
-            <fileset dir="${jdbc.dir}">
-                <include name="libsqlite.so" />
-            </fileset>  
-        </move>
-        
-        <copy todir="${distribute.dir}" overwrite="false">
-            <fileset dir="${dedup.dir}">
-                <include name="dedup.db" />
-                <include name="favicon.ico" />
-                <include name="jalbum.xml" />
-                <include name="log4j.xml" /> 
-            </fileset> 
-            <fileset dir="${scripts.dir}">
-                <include name="jalbum_for_Raspberry3.sh" />
-                <include name="readme.txt">
-            </fileset>  			
-        </copy>
-        
-        <copy todir="${distribute.dir}/lib" overwrite="true">
-            <fileset dir="${dedup.dir}/lib" />
-        </copy>
-        
-        <copy todir="${distribute.dir}/lib/extra" overwrite="true">
-            <fileset dir="${photoweb.dir}/lib" >
-                <exclude name="jetty-io-8.0.0.M2.jar" />
-		<exclude name="jetty-server-8.0.0.M2.jar" />
-            </fileset>    
-        </copy>        
-
-        <copy todir="${distribute.dir}/js" overwrite="true">
-            <fileset dir="${dedup.dir}/js" />
-        </copy>
-        
-        <ant antfile="build.xml" dir="${dedup.dir}" target="clean"/>  
-        <ant antfile="build.xml" dir="${photoweb.dir}" target="clean"/>
-	</target>
-</project>
+  <property name="dedup.dir" location="dedup"/>
+  <property name="photoweb.dir" location="photoweb"/>
+  <property name="distribute.dir" location="distribute"/>
+  <property name="scripts.dir" location="scripts"/>
+  <property name="jdbc.dir" location="jdbcsqlitenative"/>
+  <target name="jdbc">
+    <exec dir="${jdbc.dir}" executable="make" os="Linux" failonerror="true"/>
+  </target>
+  <target name="cpfiles">
+    <mkdir dir="${distribute.dir}"/>
+    <mkdir dir="${distribute.dir}/lib"/>
+    <mkdir dir="${distribute.dir}/lib/extra"/>
+    <mkdir dir="${distribute.dir}/log"/>
+    <move todir="${distribute.dir}" overwrite="true">
+      <fileset dir="${dedup.dir}/target">
+        <include name="start.jar"/>
+      </fileset>
+      <fileset dir="${photoweb.dir}/target">
+        <include name="root.war"/>
+      </fileset>
+      <fileset dir="${jdbc.dir}">
+        <include name="libsqlite.so"/>
+      </fileset>
+    </move>
+    <copy todir="${distribute.dir}" overwrite="false">
+      <fileset dir="${dedup.dir}">
+        <include name="dedup.db"/>
+        <include name="favicon.ico"/>
+        <include name="jalbum.xml"/>
+        <include name="log4j.xml"/>
+      </fileset>
+      <fileset dir="${scripts.dir}">
+        <include name="jalbum_for_Raspberry3.sh"/>
+        <include name="readme.txt"/>
+      </fileset>
+    </copy>
+    <copy todir="${distribute.dir}/lib/extra" overwrite="true">
+      <fileset dir="${photoweb.dir}/target/dependency"/>
+    </copy>
+    <copy todir="${distribute.dir}/js" overwrite="true">
+      <fileset dir="${dedup.dir}/js"/>
+    </copy>
+  </target>
+</project>

+ 33 - 43
dedup/build.xml

@@ -1,45 +1,35 @@
-<?xml version="1.0" encoding="utf-8"?> 
-
+<?xml version="1.0" encoding="utf-8"?>
 <project name="resttest" basedir="." default="jar">
-	<property name="dist.dir" location="dist" />
-	<property name="lib.dir" location="lib" />
-	<property name="bin.dir" location="classes" />
-	<property name="src.dir" location="src" />
-
-	<path id="master-classpath">
-		<fileset dir="${lib.dir}">
-			<include name="*.jar" />
-		</fileset>
-
-		<fileset dir="${lib.dir}">
-			<include name="*.jar" />
-		</fileset>
-	</path>
-
-	<target name="build" depends="clean" description="Compile main source tree
-		java files into class files, generate jar files">
-		<mkdir dir="${bin.dir}" />
-		<javac destdir="${bin.dir}" debug="true" deprecation="false" optimize="false" failonerror="true" includeantruntime="true">
-			<compilerarg line="-encoding UTF-8 "/>   
-            <src path="${src.dir}" />
-			<classpath refid="master-classpath" />
-		</javac>
-	</target>
-
-	<target name="jar" depends="build">
-		<jar jarfile="start.jar" basedir="${bin.dir}" includes="**/*.*">
-			<manifest>
-                <attribute name="Main-Class" value="com.shentar.frontend.FrontMain"/>
-                <attribute name="Class-Path" value=". lib/jetty-all.jar"/>
-             </manifest>
-		</jar>
-	</target>
-
-	<target name="clean">
-		<delete dir="${bin.dir}" />
-		<delete dir="${dist.dir}" />
-	</target>
-
-
-
+  <property name="dist.dir" location="dist"/>
+  <property name="lib.dir" location="lib"/>
+  <property name="bin.dir" location="classes"/>
+  <property name="src.dir" location="src"/>
+  <path id="master-classpath">
+    <fileset dir="${lib.dir}">
+      <include name="*.jar"/>
+    </fileset>
+    <fileset dir="${lib.dir}">
+      <include name="*.jar"/>
+    </fileset>
+  </path>
+  <target name="build" depends="clean" description="Compile main source tree   java files into class files, generate jar files">
+    <mkdir dir="${bin.dir}"/>
+    <javac destdir="${bin.dir}" debug="true" deprecation="false" optimize="false" failonerror="true" includeantruntime="true">
+      <compilerarg line="-encoding UTF-8 "/>
+      <src path="${src.dir}"/>
+      <classpath refid="master-classpath"/>
+    </javac>
+  </target>
+  <target name="jar" depends="build">
+    <jar jarfile="start.jar" basedir="${bin.dir}" includes="**/*.*">
+      <manifest>
+        <attribute name="Main-Class" value="com.shentar.frontend.FrontMain"/>
+        <attribute name="Class-Path" value=". lib/jetty-all.jar"/>
+      </manifest>
+    </jar>
+  </target>
+  <target name="clean">
+    <delete dir="${bin.dir}"/>
+    <delete dir="${dist.dir}"/>
+  </target>
 </project>

+ 29 - 38
dedup/jalbum.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8" ?>  
-
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 picfilesuffix the file type with the suffix that can be scaned by the tool. It is ignorecase. 
 inputdir specify the folder which nedd to scan.
@@ -10,52 +9,44 @@ hashalog specify the file HASH fingerprint Algorithm. The common algorithms are:
 excludedir specify the folder which you do not like the tool scan and display the content of it.
 thumbnaildir specify the folder which to store the thumbnail to. 
 -->
-
 <config>
-    <picfilesuffix>
-        <suffix>jpg</suffix>
-        <suffix>jpeg</suffix>
-        <suffix>png</suffix>
-    </picfilesuffix>   
-    
-    <minfilesize>51200</minfilesize>
-    <maxfilesize>512000000</maxfilesize>
-    <threadcount>20</threadcount>
-    <maxpicsperonepage>25</maxpicsperonepage>
-    <hashalog>MD5</hashalog>
-    <accessAuth>true</accessAuth>
-    
-    <inputdir>
-        <dir>D:\\</dir>
-        <dir>C:\\</dir>
-    </inputdir>
-    
-    <excludedir>
-        <dir>C:\\windows\\</dir>
-        <dir>C:\\Program Files\\</dir>
-        <dir>./</dir>        
-    </excludedir>
-    
-    <thumbnaildir>
+  <picfilesuffix>
+    <suffix>jpg</suffix>
+    <suffix>jpeg</suffix>
+    <suffix>png</suffix>
+  </picfilesuffix>
+  <minfilesize>51200</minfilesize>
+  <maxfilesize>512000000</maxfilesize>
+  <threadcount>20</threadcount>
+  <maxpicsperonepage>25</maxpicsperonepage>
+  <hashalog>MD5</hashalog>
+  <accessAuth>true</accessAuth>
+  <inputdir>
+    <dir>D:\\</dir>
+    <dir>C:\\</dir>
+  </inputdir>
+  <excludedir>
+    <dir>C:\\windows\\</dir>
+    <dir>C:\\Program Files\\</dir>
+    <dir>./</dir>
+  </excludedir>
+  <thumbnaildir>
         ./thumbnail
     </thumbnaildir>
-
-    <Proxy>
+  <Proxy>
         <host></host>
         <port></port>
         <user></user>
         <password></password>
-    </Proxy>
-
-    <s3>
+  </Proxy>
+  <s3>
         <bucketname></bucketname>
         <ak></ak>
         <sk></sk>
-        <useHttps>false</useHttps>
-    </s3>
-
-    <Facer>
+    <useHttps>false</useHttps>
+  </s3>
+  <Facer>
         <ak></ak>
         <sk></sk>
-    </Facer>
+  </Facer>
 </config>

+ 33 - 43
dedup/log4j.xml

@@ -1,44 +1,34 @@
-<?xml version="1.0" encoding="UTF-8"?>     
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">    
-        
-<log4j:configuration xmlns:log4j='http://jakarta.apache.org/log4j/' >     
-        
-    <appender name="activexAppender" class="org.apache.log4j.DailyRollingFileAppender">     
-        <param name="File" value="./log/dedup.log" />       
-        <param name="DatePattern" value="'.'yyyy-MM-dd'.log'" />       
-        <layout class="org.apache.log4j.PatternLayout">     
-         <param name="ConversionPattern"       
-            value="[%d{yyyy-MM-dd HH:mm:ss.SSS\} %-5p] [%t %X{requestid} %c{3\}:%L] - %m%n" />     
-        </layout>       
-    </appender>     
-        
-    <appender name="accesslog" class="org.apache.log4j.DailyRollingFileAppender">     
-        <param name="File" value="./log/jAlbum_access.log" />       
-        <param name="DatePattern" value="'.'yyyy-MM-dd'.log'" />       
-        <layout class="org.apache.log4j.PatternLayout">     
-         <param name="ConversionPattern"       
-            value="[%d{yyyy-MM-dd HH:mm:ss.SSS\}] [%t %X{requestid} %X{http-status} %X{is_mobile} %X{user_login_status} %X{consumed-time} %X{remote-addr} %X{http-uri} %X{filename} %X{range} %X{user-agent}]%n" />     
-        </layout>       
-    </appender>   
-    
-    <logger name="com.utils.web.AccessLogger" additivity="false">     
-        <level value ="warn"/>       
-        <appender-ref ref="accesslog" />       
-    </logger>
-    
-    <logger name="com" additivity="false">     
-        <level value ="warn"/>       
-        <appender-ref ref="activexAppender" />       
-    </logger>
-     
-    <logger name="org" additivity="false">     
-        <level value ="warn"/>       
-        <appender-ref ref="activexAppender" />       
-    </logger>
-     
-    <root>     
-        <level value ="warn"/>     
-        <appender-ref ref="activexAppender"/>        
-    </root>     
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
+  <appender name="activexAppender" class="org.apache.log4j.DailyRollingFileAppender">
+    <param name="File" value="./log/dedup.log"/>
+    <param name="DatePattern" value="'.'yyyy-MM-dd'.log'"/>
+    <layout class="org.apache.log4j.PatternLayout">
+      <param name="ConversionPattern" value="[%d{yyyy-MM-dd HH:mm:ss.SSS\} %-5p] [%t %X{requestid} %c{3\}:%L] - %m%n"/>
+    </layout>
+  </appender>
+  <appender name="accesslog" class="org.apache.log4j.DailyRollingFileAppender">
+    <param name="File" value="./log/jAlbum_access.log"/>
+    <param name="DatePattern" value="'.'yyyy-MM-dd'.log'"/>
+    <layout class="org.apache.log4j.PatternLayout">
+      <param name="ConversionPattern" value="[%d{yyyy-MM-dd HH:mm:ss.SSS\}] [%t %X{requestid} %X{http-status} %X{is_mobile} %X{user_login_status} %X{consumed-time} %X{remote-addr} %X{http-uri} %X{filename} %X{range} %X{user-agent}]%n"/>
+    </layout>
+  </appender>
+  <logger name="com.utils.web.AccessLogger" additivity="false">
+    <level value="warn"/>
+    <appender-ref ref="accesslog"/>
+  </logger>
+  <logger name="com" additivity="false">
+    <level value="warn"/>
+    <appender-ref ref="activexAppender"/>
+  </logger>
+  <logger name="org" additivity="false">
+    <level value="warn"/>
+    <appender-ref ref="activexAppender"/>
+  </logger>
+  <root>
+    <level value="warn"/>
+    <appender-ref ref="activexAppender"/>
+  </root>
 </log4j:configuration>
-   

+ 61 - 63
dedup/pom.xml

@@ -1,65 +1,63 @@
 <?xml version="1.0" encoding="utf-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>com</groupId>
-	<artifactId>dedup</artifactId>
-	<version>2.6</version>
-	<name>dedup</name>
-	<url>http://maven.apache.org</url>
-	<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-	</properties>
-	<dependencies>
-		<dependency>
-			<groupId>org.eclipse.jetty</groupId>
-			<artifactId>jetty-server</artifactId>
-			<version>9.4.6.v20170531</version>
-		</dependency>
-		<dependency>
-			<groupId>org.eclipse.jetty</groupId>
-			<artifactId>jetty-webapp</artifactId>
-			<version>9.4.6.v20170531</version>
-		</dependency>
-
-	</dependencies>
-	<build>
-		<pluginManagement>
-			<plugins>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-eclipse-plugin</artifactId>
-					<configuration>
-						<downloadSources>true</downloadSources>
-					</configuration>
-				</plugin>
-			</plugins>
-		</pluginManagement>
-		<plugins>
-			<plugin>
-				<artifactId>maven-assembly-plugin</artifactId>
-				<configuration>
-					<finalName>start</finalName>
-					<appendAssemblyId>false</appendAssemblyId>
-					<descriptorRefs>
-						<descriptorRef>jar-with-dependencies</descriptorRef>
-					</descriptorRefs>
-					<archive>
-						<manifest>
-							<mainClass>com.shentar.frontend.FrontMain</mainClass>
-						</manifest>
-					</archive>
-				</configuration>
-				<executions>
-					<execution>
-						<id>make-assembly</id>
-						<phase>package</phase>
-						<goals>
-							<goal>assembly</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com</groupId>
+  <artifactId>dedup</artifactId>
+  <version>2.6</version>
+  <name>dedup</name>
+  <url>http://maven.apache.org</url>
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+  <dependencies>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-server</artifactId>
+      <version>9.4.6.v20170531</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-webapp</artifactId>
+      <version>9.4.6.v20170531</version>
+    </dependency>
+  </dependencies>
+  <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-eclipse-plugin</artifactId>
+          <configuration>
+            <downloadSources>true</downloadSources>
+          </configuration>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+    <plugins>
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <configuration>
+          <finalName>start</finalName>
+          <appendAssemblyId>false</appendAssemblyId>
+          <descriptorRefs>
+            <descriptorRef>jar-with-dependencies</descriptorRef>
+          </descriptorRefs>
+          <archive>
+            <manifest>
+              <mainClass>com.shentar.frontend.FrontMain</mainClass>
+            </manifest>
+          </archive>
+        </configuration>
+        <executions>
+          <execution>
+            <id>make-assembly</id>
+            <phase>package</phase>
+            <goals>
+              <goal>assembly</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
 </project>

+ 38 - 49
photoweb/build.xml

@@ -1,56 +1,45 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <project name="jAlbum" basedir="." default="war">
-    <property name="dist.dir" location="dist"/>
-    <property name="lib.dir" location="lib"/>
-    <property name="bin.dir" location="classes"/>
-    <property name="src.dir" location="src/main/java"/>
-
-    <path id="master-classpath">
-        <fileset dir="${lib.dir}">
-            <include name="*.jar"/>
-        </fileset>
-
-        <fileset dir="${lib.dir}">
-            <include name="*.jar"/>
-        </fileset>
-    </path>
-
-    <target name="build" depends="clean" description="Compile main source tree
-		java files into class files, generate jar files">
-        <mkdir dir="${bin.dir}"/>
-        <javac destdir="${bin.dir}" debug="true" deprecation="false" optimize="false" failonerror="true"
-               includeantruntime="true">
-            <compilerarg line="-encoding UTF-8 "/>
-            <src path="${src.dir}"/>
-            <classpath refid="master-classpath"/>
-        </javac>
-    </target>
-
-    <target name="jar" depends="build">
-        <jar jarfile="${dist.dir}/jAlbum.jar" basedir="${bin.dir}" includes="**/*.*">
+  <property name="dist.dir" location="dist"/>
+  <property name="lib.dir" location="lib"/>
+  <property name="bin.dir" location="classes"/>
+  <property name="src.dir" location="src/main/java"/>
+  <path id="master-classpath">
+    <fileset dir="${lib.dir}">
+      <include name="*.jar"/>
+    </fileset>
+    <fileset dir="${lib.dir}">
+      <include name="*.jar"/>
+    </fileset>
+  </path>
+  <target name="build" depends="clean" description="Compile main source tree   java files into class files, generate jar files">
+    <mkdir dir="${bin.dir}"/>
+    <javac destdir="${bin.dir}" debug="true" deprecation="false" optimize="false" failonerror="true" includeantruntime="true">
+      <compilerarg line="-encoding UTF-8 "/>
+      <src path="${src.dir}"/>
+      <classpath refid="master-classpath"/>
+    </javac>
+  </target>
+  <target name="jar" depends="build">
+    <jar jarfile="${dist.dir}/jAlbum.jar" basedir="${bin.dir}" includes="**/*.*">
         </jar>
-    </target>
-
-    <target name="war" depends="jar">
-        <war warfile="${dist.dir}/root.war" webxml="WEB-INF/web.xml">
-            <!--lib dir="${lib.dir}">
+  </target>
+  <target name="war" depends="jar">
+    <war warfile="${dist.dir}/root.war" webxml="WEB-INF/web.xml">
+      <!--lib dir="${lib.dir}">
                 <exclude name="jetty-io-8.0.0.M2.jar" />
                 <exclude name="jetty-server-8.0.0.M2.jar" />
             </lib-->
-            <lib dir="${dist.dir}">
-                <include name="jAlbum.jar"/>
-            </lib>
-            <webinf dir="WEB-INF">
-                <exclude name="web.xml"/>
-            </webinf>
-        </war>
-    </target>
-
-    <target name="clean">
-        <delete dir="${bin.dir}"/>
-        <delete dir="${dist.dir}"/>
-    </target>
-
-
+      <lib dir="${dist.dir}">
+        <include name="jAlbum.jar"/>
+      </lib>
+      <webinf dir="WEB-INF">
+        <exclude name="web.xml"/>
+      </webinf>
+    </war>
+  </target>
+  <target name="clean">
+    <delete dir="${bin.dir}"/>
+    <delete dir="${dist.dir}"/>
+  </target>
 </project>

+ 334 - 335
photoweb/pom.xml

@@ -1,337 +1,336 @@
 <?xml version="1.0" encoding="utf-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>com</groupId>
-	<artifactId>photoweb</artifactId>
-	<version>2.6</version>
-	<packaging>war</packaging>
-	<name>photoweb</name>
-	<url>http://maven.apache.org</url>
-	<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-	</properties>
-	<dependencies>
-		<dependency>
-			<groupId>com.google.code.gson</groupId>
-			<artifactId>gson</artifactId>
-			<version>2.8.1</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.httpcomponents</groupId>
-			<artifactId>httpclient</artifactId>
-			<version>4.5.3</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.httpcomponents</groupId>
-			<artifactId>httpcore</artifactId>
-			<version>4.4.6</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.httpcomponents</groupId>
-			<artifactId>httpmime</artifactId>
-			<version>4.5.3</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.xerial</groupId>
-			<artifactId>sqlite-jdbc</artifactId>
-			<version>3.8.11.2</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>javax.servlet-api</artifactId>
-			<version>4.0.0-b07</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>log4j</groupId>
-			<artifactId>log4j</artifactId>
-			<version>1.2.17</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-api</artifactId>
-			<version>1.7.25</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-log4j12</artifactId>
-			<version>1.7.21</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.cxf</groupId>
-			<artifactId>cxf-rt-frontend-jaxws</artifactId>
-			<version>2.4.1</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.cxf</groupId>
-			<artifactId>cxf-rt-transports-http</artifactId>
-			<version>2.4.1</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.cxf</groupId>
-			<artifactId>cxf-rt-frontend-jaxrs</artifactId>
-			<version>2.4.1</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.cxf</groupId>
-			<artifactId>cxf-rt-ws-security</artifactId>
-			<version>2.4.1</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.cxf</groupId>
-			<artifactId>cxf-api</artifactId>
-			<version>2.4.1</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.cxf</groupId>
-			<artifactId>cxf-rt-core</artifactId>
-			<version>2.4.1</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.codehaus.jettison</groupId>
-			<artifactId>jettison</artifactId>
-			<version>1.3.8</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>net.java.dev.jets3t</groupId>
-			<artifactId>jets3t</artifactId>
-			<version>0.9.4</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>com.drewnoakes</groupId>
-			<artifactId>metadata-extractor</artifactId>
-			<version>2.10.1</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>javax.ws.rs</groupId>
-			<artifactId>jsr311-api</artifactId>
-			<version>1.1.1</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-aop</artifactId>
-			<version>3.0.5.RELEASE</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-asm</artifactId>
-			<version>3.0.5.RELEASE</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-beans</artifactId>
-			<version>3.0.5.RELEASE</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-core</artifactId>
-			<version>3.0.5.RELEASE</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-context</artifactId>
-			<version>3.0.5.RELEASE</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-expression</artifactId>
-			<version>3.0.5.RELEASE</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-jms</artifactId>
-			<version>3.0.5.RELEASE</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-web</artifactId>
-			<version>3.0.5.RELEASE</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-tx</artifactId>
-			<version>3.0.5.RELEASE</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-jdbc</artifactId>
-			<version>3.0.5.RELEASE</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>commons-lang3</artifactId>
-			<version>3.5</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>commons-lang</groupId>
-			<artifactId>commons-lang</artifactId>
-			<version>2.6</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>commons-io</groupId>
-			<artifactId>commons-io</artifactId>
-			<version>2.5</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>commons-logging</groupId>
-			<artifactId>commons-logging</artifactId>
-			<version>1.2</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>commons-codec</groupId>
-			<artifactId>commons-codec</artifactId>
-			<version>1.10</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>commons-pool</groupId>
-			<artifactId>commons-pool</artifactId>
-			<version>1.6</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>commons-cli</groupId>
-			<artifactId>commons-cli</artifactId>
-			<version>1.4</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>commons-configuration</groupId>
-			<artifactId>commons-configuration</artifactId>
-			<version>1.10</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>commons-collections</groupId>
-			<artifactId>commons-collections</artifactId>
-			<version>3.2.2</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>com.google.guava</groupId>
-			<artifactId>guava</artifactId>
-			<version>21.0</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>mediautil</groupId>
-			<artifactId>mediautil</artifactId>
-			<version>1.0</version>
-			<scope>system</scope>
-			<systemPath>${project.basedir}/lib/mediautil.jar</systemPath>
-		</dependency>
-		<dependency>
-			<groupId>photoorganizer</groupId>
-			<artifactId>MediaChest</artifactId>
-			<version>1.0</version>
-			<scope>system</scope>
-			<systemPath>${project.basedir}/lib/MediaChest.jar</systemPath>
-		</dependency>
-		<dependency>
-			<groupId>net.bramp</groupId>
-			<artifactId>ffmpeg</artifactId>
-			<version>0.6.1</version>
-			<scope>system</scope>
-			<systemPath>${project.basedir}/lib/ffmpeg-0.6.1.jar</systemPath>
-		</dependency>
-	</dependencies>
-	<build>
-		<pluginManagement>
-			<plugins>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-eclipse-plugin</artifactId>
-					<configuration>
-						<downloadSources>true</downloadSources>
-					</configuration>
-				</plugin>
-			</plugins>
-		</pluginManagement>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<configuration>
-					<source>1.7</source>
-					<target>1.7</target>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-				<version>3.5</version>
-				<inherited>true</inherited>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-dependency-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>copy-dependencies</id>
-						<phase>package</phase>
-						<goals>
-							<goal>copy-dependencies</goal>
-						</goals>
-						<configuration>
-							<excludeArtifactIds>junit,jasper-runtime,ant</excludeArtifactIds>
-							<includeTypes>jar</includeTypes>
-							<overWriteSnapshots>true</overWriteSnapshots>
-							<type>jar</type>
-							<outputDirectory>${project.build.directory}/dependency</outputDirectory>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-war-plugin</artifactId>
-				<configuration>
-					<warName>root</warName>
-					<archiveClasses>true</archiveClasses>
-					<webResources>
-						<resource>
-							<directory>${project.basedir}/WEB-INF/</directory>
-							<targetPath>WEB-INF/</targetPath>
-							<includes>
-								<include>**</include>
-							</includes>
-						</resource>
-					</webResources>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com</groupId>
+  <artifactId>photoweb</artifactId>
+  <version>2.6</version>
+  <packaging>war</packaging>
+  <name>photoweb</name>
+  <url>http://maven.apache.org</url>
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+  <dependencies>
+    <dependency>
+      <groupId>com.google.code.gson</groupId>
+      <artifactId>gson</artifactId>
+      <version>2.8.1</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.httpcomponents</groupId>
+      <artifactId>httpclient</artifactId>
+      <version>4.5.3</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.httpcomponents</groupId>
+      <artifactId>httpcore</artifactId>
+      <version>4.4.6</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.httpcomponents</groupId>
+      <artifactId>httpmime</artifactId>
+      <version>4.5.3</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.xerial</groupId>
+      <artifactId>sqlite-jdbc</artifactId>
+      <version>3.8.11.2</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>javax.servlet-api</artifactId>
+      <version>4.0.0-b07</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <version>1.2.17</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>1.7.25</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+      <version>1.7.21</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.cxf</groupId>
+      <artifactId>cxf-rt-frontend-jaxws</artifactId>
+      <version>2.4.1</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.cxf</groupId>
+      <artifactId>cxf-rt-transports-http</artifactId>
+      <version>2.4.1</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.cxf</groupId>
+      <artifactId>cxf-rt-frontend-jaxrs</artifactId>
+      <version>2.4.1</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.cxf</groupId>
+      <artifactId>cxf-rt-ws-security</artifactId>
+      <version>2.4.1</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.cxf</groupId>
+      <artifactId>cxf-api</artifactId>
+      <version>2.4.1</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.cxf</groupId>
+      <artifactId>cxf-rt-core</artifactId>
+      <version>2.4.1</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.jettison</groupId>
+      <artifactId>jettison</artifactId>
+      <version>1.3.8</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>net.java.dev.jets3t</groupId>
+      <artifactId>jets3t</artifactId>
+      <version>0.9.4</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.drewnoakes</groupId>
+      <artifactId>metadata-extractor</artifactId>
+      <version>2.10.1</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.ws.rs</groupId>
+      <artifactId>jsr311-api</artifactId>
+      <version>1.1.1</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-aop</artifactId>
+      <version>3.0.5.RELEASE</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-asm</artifactId>
+      <version>3.0.5.RELEASE</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-beans</artifactId>
+      <version>3.0.5.RELEASE</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-core</artifactId>
+      <version>3.0.5.RELEASE</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context</artifactId>
+      <version>3.0.5.RELEASE</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-expression</artifactId>
+      <version>3.0.5.RELEASE</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-jms</artifactId>
+      <version>3.0.5.RELEASE</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-web</artifactId>
+      <version>3.0.5.RELEASE</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-tx</artifactId>
+      <version>3.0.5.RELEASE</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-jdbc</artifactId>
+      <version>3.0.5.RELEASE</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+      <version>3.5</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+      <version>2.6</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+      <version>2.5</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>1.2</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-codec</groupId>
+      <artifactId>commons-codec</artifactId>
+      <version>1.10</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-pool</groupId>
+      <artifactId>commons-pool</artifactId>
+      <version>1.6</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-cli</groupId>
+      <artifactId>commons-cli</artifactId>
+      <version>1.4</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-configuration</groupId>
+      <artifactId>commons-configuration</artifactId>
+      <version>1.10</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-collections</groupId>
+      <artifactId>commons-collections</artifactId>
+      <version>3.2.2</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+      <version>21.0</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>mediautil</groupId>
+      <artifactId>mediautil</artifactId>
+      <version>1.0</version>
+      <scope>system</scope>
+      <systemPath>${project.basedir}/lib/mediautil.jar</systemPath>
+    </dependency>
+    <dependency>
+      <groupId>photoorganizer</groupId>
+      <artifactId>MediaChest</artifactId>
+      <version>1.0</version>
+      <scope>system</scope>
+      <systemPath>${project.basedir}/lib/MediaChest.jar</systemPath>
+    </dependency>
+    <dependency>
+      <groupId>net.bramp</groupId>
+      <artifactId>ffmpeg</artifactId>
+      <version>0.6.1</version>
+      <scope>system</scope>
+      <systemPath>${project.basedir}/lib/ffmpeg-0.6.1.jar</systemPath>
+    </dependency>
+  </dependencies>
+  <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-eclipse-plugin</artifactId>
+          <configuration>
+            <downloadSources>true</downloadSources>
+          </configuration>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.7</source>
+          <target>1.7</target>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>3.5</version>
+        <inherited>true</inherited>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>copy-dependencies</id>
+            <phase>package</phase>
+            <goals>
+              <goal>copy-dependencies</goal>
+            </goals>
+            <configuration>
+              <excludeArtifactIds>junit,jasper-runtime,ant</excludeArtifactIds>
+              <includeTypes>jar</includeTypes>
+              <overWriteSnapshots>true</overWriteSnapshots>
+              <type>jar</type>
+              <outputDirectory>${project.build.directory}/dependency</outputDirectory>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-war-plugin</artifactId>
+        <configuration>
+          <warName>root</warName>
+          <archiveClasses>true</archiveClasses>
+          <webResources>
+            <resource>
+              <directory>${project.basedir}/WEB-INF/</directory>
+              <targetPath>WEB-INF/</targetPath>
+              <includes>
+                <include>**</include>
+              </includes>
+            </resource>
+          </webResources>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>

+ 30 - 34
pom.xml

@@ -1,44 +1,40 @@
 <?xml version="1.0" encoding="utf-8"?>
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">  
-  <modelVersion>4.0.0</modelVersion>  
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
   <groupId>com</groupId>
   <artifactId>jAlbum</artifactId>
   <version>2.6</version>
   <name>jAlbum</name>
   <url>http://codefine.co</url>
   <packaging>pom</packaging>
-  
-  <properties> 
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> 
-  </properties>  
-
-   <modules>
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+  <modules>
     <module>dedup</module>
     <module>photoweb</module>
-   </modules> 
-   
-  <build> 
-    <plugins>   
-  <plugin> 
-    <artifactId>maven-antrun-plugin</artifactId>  
-    <executions> 
-      <execution> 
-        <phase>install</phase>  
-        <goals> 
-          <goal>run</goal> 
-        </goals>  
-        <configuration> 
-          <tasks> 
-            <echo>antrun is started</echo>  
-            <ant antfile="asmblefiles.xml"> 
-              <target name="release"/> 
-            </ant> 
-          </tasks> 
-        </configuration> 
-      </execution> 
-    </executions> 
-  </plugin>       
-    </plugins> 
-  </build> 
+  </modules>
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>install</phase>
+            <goals>
+              <goal>run</goal>
+            </goals>
+            <configuration>
+              <tasks>
+                <echo>antrun is started</echo>
+                <ant antfile="asmblefiles.xml">
+                  <target name="release"/>
+                </ant>
+              </tasks>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
 </project>

+ 56 - 0
pom_for_Raspberry3.xml

@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com</groupId>
+  <artifactId>jAlbum</artifactId>
+  <version>2.6</version>
+  <name>jAlbum</name>
+  <url>http://codefine.co</url>
+  <packaging>pom</packaging>
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+  <modules>
+    <module>dedup</module>
+    <module>photoweb</module>
+  </modules>
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>anttask1</id>
+            <phase>compile</phase>
+            <goals>
+              <goal>run</goal>
+            </goals>
+            <configuration>
+              <tasks>
+                <echo>antrun is started</echo>
+                <ant antfile="build_for_Raspberry3.xml">
+                  <target name="jdbc"/>
+                </ant>
+              </tasks>
+            </configuration>
+          </execution>
+          <execution>
+            <id>anttask2</id>
+            <phase>install</phase>
+            <goals>
+              <goal>run</goal>
+            </goals>
+            <configuration>
+              <tasks>
+                <echo>antrun is started</echo>
+                <ant antfile="build_for_Raspberry3.xml">
+                  <target name="cpfiles"/>
+                </ant>
+              </tasks>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>