Reapplying previous fixes and changes that were lost in upgrade to ve…

…rsion 2.1.0

baleen/baleen-collectionreaders/src/test/java/uk/gov/dstl/baleen/collectionreaders/FolderReaderTest.java

@@ -20,6 +20,7 @@
 import org.apache.uima.jcas.tcas.DocumentAnnotation;
 import org.junit.After;
 import org.junit.Before;
+import org.junit.BeforeClass;
 import org.junit.Test;
 
 import uk.gov.dstl.baleen.uima.BaleenCollectionReader;
@@ -31,7 +32,20 @@ public class FolderReaderTest {
 	private static final String DIR = "baleen-test";
 	File inputDir;
 	JCas jCas;
-
+
+	private static Long TIMEOUT = 1000L;
+
+	@BeforeClass
+	public static void beforeClass(){
+		//If we're testing on a Mac, then we need to set the time out higher,
+		//as currently the WatchService on a Mac uses polling rather than a
+		//native implementation and therefore we need to ensure we wait longer
+		//than the poll interval
+		if(System.getProperty("os.name").toLowerCase().startsWith("mac os x")){
+			TIMEOUT = 15000L;
+		}
+	}
+
 	@Before
 	public void beforeTest() throws Exception{
 		inputDir = Files.createTempDirectory(DIR).toFile();
@@ -75,7 +89,7 @@ public void testCreateFile() throws Exception{
 		f.createNewFile();
 
 		//Wait for file to be written and change detected
-		Thread.sleep(1000);
+		Thread.sleep(TIMEOUT);
 
 		assertTrue(bcr.doHasNext());
 
@@ -106,7 +120,7 @@ public void testMultipleDirectories() throws Exception{
 		File f22 = new File(inputDir2, TEST2_FILE);
 		f22.createNewFile();
 
-		Thread.sleep(1000);
+		Thread.sleep(TIMEOUT);
 
 		assertNextSourceNotNull(bcr);
 		assertNextSourceNotNull(bcr);
@@ -133,7 +147,7 @@ public void testSubDirectories() throws Exception{
 		File f2 = new File(subdir, TEST2_FILE);
 		f2.createNewFile();
 
-		Thread.sleep(1000);
+		Thread.sleep(TIMEOUT);
 
 		assertNextSourceNotNull(bcr);
 
@@ -166,7 +180,7 @@ public void testSubDirectoriesNonRecursive() throws Exception{
 		File f3 = new File(inputDir, TEST3_FILE);
 		f3.createNewFile();
 
-		Thread.sleep(1000);
+		Thread.sleep(TIMEOUT);
 
 		assertTrue(bcr.hasNext());
 		bcr.getNext(jCas.getCas());
@@ -189,7 +203,7 @@ public void testModifiedFile() throws Exception{
 		f.createNewFile();
 
 		//Wait for file to be written and change detected
-		Thread.sleep(1000);
+		Thread.sleep(TIMEOUT);
 
 		assertTrue(bcr.doHasNext());
 
@@ -203,7 +217,7 @@ public void testModifiedFile() throws Exception{
 		writer.write("Test");
 		writer.close();
 
-		Thread.sleep(1000);
+		Thread.sleep(TIMEOUT);
 
 		assertTrue(bcr.doHasNext());
 
@@ -227,12 +241,12 @@ public void testDeleteFile() throws Exception{
 		f.createNewFile();
 
 		//Wait for file to be written and change detected
-		Thread.sleep(1000);
+		Thread.sleep(TIMEOUT);
 
 		f.delete();
 
 		//Wait for file to be written and change detected
-		Thread.sleep(1000);
+		Thread.sleep(TIMEOUT);
 
 		assertFalse(bcr.doHasNext());
 

baleen/baleen-javadoc/pom.xml

@@ -13,6 +13,8 @@
 	  <groupId>jdk.tools</groupId>
 	  <artifactId>jdk.tools</artifactId>
 	  <version>1.8</version>
+	  <scope>system</scope>
+	  <systemPath>${java.home}/../lib/tools.jar</systemPath>
 	</dependency>
   </dependencies>
 </project>

baleen/pom.xml

@@ -7,6 +7,7 @@
 	<packaging>pom</packaging>
 	<name>Baleen</name>
 	<description>Structured information from unstructured data</description>
+	<url>https://github.com/dstl/baleen</url>
 	<inceptionYear>2015</inceptionYear>
 
 	<licenses>