inclus un fichier ant

Author: jdusart

.classpath

@@ -0,0 +1,7 @@
+<?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/mongo-java-driver-2.13.2.jar"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

.project

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>toolkit-java</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>

MANIFEST.MF

@@ -0,0 +1,6 @@
+Manifest-Version: 1.0
+Ant-Version: Apache Ant 1.9.3
+Created-By: 1.7.0_79-b14 (Oracle Corporation)
+Main-Class: net.wekeypedia.main.Main
+Class-Path: lib/mongo-java-driver-2.13.2.jar
+

build.xml

@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<project basedir="." default="build" name="toolkit-java">
+    <property environment="env"/>
+    <property name="debuglevel" value="source,lines,vars"/>
+    <property name="target" value="1.6"/>
+    <property name="source" value="1.6"/>
+    
+	<path id="toolkit-java.classpath">
+        <pathelement location="bin"/>
+        <pathelement location="lib/mongo-java-driver-2.13.2.jar"/>
+    </path>
+	
+    <target name="init">
+        <mkdir dir="bin"/>
+        <copy includeemptydirs="false" todir="bin">
+            <fileset dir="src">
+                <exclude name="**/*.launch"/>
+                <exclude name="**/*.java"/>
+            </fileset>
+        </copy>
+    </target>
+	
+    <target name="doc" description="Generate the documentation.">
+        <mkdir dir="doc"/>
+    	<javadoc sourcepath="src/" destdir="doc/">
+            <classpath refid="toolkit-java.classpath" />
+        	<link href="http://docs.oracle.com/javase/7/docs/api/"/>
+    		<link href="http://api.mongodb.org/java/3.0/"/>
+    	</javadoc>
+    </target>
+              	
+    <target name="clean">
+        <delete dir="bin"/>
+		<delete dir="doc"/>
+    	<delete file="wekeypedia.jar"/> 
+    </target>
+	
+    <target depends="init" name="build">
+        <echo message="${ant.project.name}: ${ant.file}"/>
+        <javac debug="true" debuglevel="${debuglevel}" destdir="bin" includeantruntime="false" source="${source}" target="${target}">
+            <src path="src"/>
+            <classpath refid="toolkit-java.classpath"/>
+        </javac>
+    </target>
+	
+    <target name="Main">
+        <java classname="net.wekeypedia.main.Main" failonerror="true" fork="yes">
+            <classpath refid="toolkit-java.classpath"/>
+        </java>
+    </target>
+	
+    <target name="jar" description="Package into executable JAR." depends="build">
+        <jar destfile="wekeypedia.jar" basedir="bin" compress="true">
+	    	<manifest>
+	    	      <attribute name="Main-Class" value="net.wekeypedia.main.Main"/>
+	    	      <attribute name="Class-Path" value="lib/mongo-java-driver-2.13.2.jar"/>
+	        </manifest>
+        </jar>
+    </target>
+	
+</project>

src/net/wekeypedia/main/Main.java

@@ -15,9 +15,18 @@
 import net.wekeypedia.manager.MongoManager;
 
 
-
+/** This class allowed the use of the toolkit through command line.
+ * 
+ * @author jeremie
+ *
+ */
 public class Main {
-	
+	/** Read the list of titles of the pages to download.
+	 * 
+	 * @param is
+	 * @return
+	 * @throws IOException
+	 */
 	public static List<String> getListOfNames(InputStream is) throws IOException{
 		List<String> res = new LinkedList<String>();
 		BufferedReader reader = new BufferedReader(new InputStreamReader(is));
@@ -30,7 +39,9 @@ public static List<String> getListOfNames(InputStream is) throws IOException{
 		return res;
 	}
 
-	
+	/** Display the options of the command line.
+	 * 
+	 */
 	public static void usage(){
 		System.out.println("Usage: wikeypedia [OPTIONS]");
 		System.out.println();
@@ -69,13 +80,13 @@ public static void main(String args[]){
 				if(args[i].equals("-mongoDB")) mongoDB = args[++i];
 				if(args[i].equals("-mongoCol"))	mongoCollection = args[++i];
 			}
-			
+
 			List<String> listNames = null;
 			if (file==null) listNames =	Main.getListOfNames(System.in);
 			else listNames = Main.getListOfNames(new FileInputStream(file));
 			int jobsize=1+listNames.size()*10/nbThread;
 			JobManager JM = new JobManager(domain,listNames,jobsize);
-			
+
 			ManagerInterface MI = null;
 			if (mongo){
 				MongoManager MM = new MongoManager();
@@ -92,8 +103,9 @@ public static void main(String args[]){
 			List<DownloadThread> threads = new LinkedList<DownloadThread>();
 			for (int j=0;j<nbThread;j++) threads.add(new DownloadThread(JM,MI));
 			for (DownloadThread df:threads) df.start();
-			for (DownloadThread df:threads) df.wait();			
+			for (DownloadThread df:threads) df.join();			
 		}catch(Exception e){
+			e.printStackTrace();
 			Main.usage();
 		}
 	}

src/net/wekeypedia/manager/DownloadThread.java

@@ -23,6 +23,7 @@ public class DownloadThread extends Thread{
 	public DownloadThread(JobManager jm, ManagerInterface mi) {
 		super();
 		this.mi=mi;
+		this.jm=jm;
 		this.downloadNames = new LinkedList<String>();
 	}
 
@@ -34,14 +35,10 @@ public void run(){
 		while (jm.hasAnOtherJob()){
 			List<String> dlnames=jm.getAJob();
 			for (String name:dlnames){
-				try{
 					wp=mi.getWikiPage(jm.getDomain(),name);
 					mi.saveWikiPage(wp);
 					if (wp!=null) downloadNames.add(name);
-				}catch(Exception e){
-					e.printStackTrace();
-					System.err.println("Error >> "+name);
-				}
+
 			}
 		}
 	}

src/net/wekeypedia/manager/JobManager.java

@@ -16,14 +16,16 @@ public JobManager(String domain, List<String> names){
 
 	public JobManager(String domain, List<String> names,int jobSize){
 		this.domain=domain;
-		works=new HashMap<Integer,List<String>>();	
-		for (int i=0;i<=names.size()/jobSize;i++){
-			works.put(i,new LinkedList<String>());
-		}
-		int i=0;
-		for (String name :names) {
-			works.get(i%works.size()).add(name);
-			i++;
+		works=new HashMap<Integer,List<String>>();
+		if (names!=null && names.size()>0){
+			for (int i=0;i<=names.size()/jobSize;i++){
+				works.put(i,new LinkedList<String>());
+			}
+			int i=0;
+			for (String name :names) {
+				works.get(i%works.size()).add(name);
+				i++;
+			}
 		}
 	}