From 74c29c8ac135576d33c37b116819cdbe2ab776f5 Mon Sep 17 00:00:00 2001
From: Erik Forkalsrud <erik@forkalsrud.org>
Date: Sat, 6 Feb 2010 12:14:58 -0800
Subject: [PATCH] change maven repository to our new nexus instance and update
 junit version to 4.7

---
 pom.xml                                       | 44 ++++++++++++-------
 .../album/exif/OggIdentifierTest.java         | 22 +++++-----
 .../forkalsrud/album/web/PictureScaler.java   |  2 +-
 3 files changed, 42 insertions(+), 26 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2587ee3..b6635d4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -123,29 +123,43 @@
       <artifactId>je</artifactId>
       <version>4.0.92</version>
     </dependency>
+    <!--
     <dependency><groupId>com.caucho</groupId><artifactId>resin</artifactId><version>3.1.8</version></dependency>
+    <dependency><groupId>org.springframework</groupId><artifactId>spring-webmvc</artifactId><version>3.0.0.RELEASE</version></dependency>
+    <dependency><groupId>org.springframework</groupId><artifactId>spring-context</artifactId><version>3.0.0.RELEASE</version></dependency>
+    <dependency><groupId>org.springframework</groupId><artifactId>spring-orm</artifactId><version>3.0.0.RELEASE</version></dependency>
+    -->
   </dependencies>
   <repositories>
     <repository>
       <id>central</id>
       <name>forkalsrud.org maven proxy</name>
       <releases><enabled>true</enabled></releases>
+      <snapshots><enabled>false</enabled></snapshots>
+      <url>http://forkalsrud.org:8080/nexus/content/groups/public</url>
+    </repository>
+    <repository>
+      <id>snapshots</id>
+      <name>forkalsrud.org maven proxy</name>
+      <releases><enabled>false</enabled></releases>
       <snapshots><enabled>true</enabled></snapshots>
-      <url>http://forkalsrud.org:8081/nexus/content/groups/public</url>
+      <url>http://forkalsrud.org:8080/nexus/content/groups/public-snapshots</url>
     </repository>
-    <!--
-    <repository>
-      <id>oracleReleases</id>
-      <name>Oracle Released Java Packages</name>
-      <url>http://download.oracle.com/maven</url>
-      <layout>default</layout>
-    </repository>
-    <repository>
-      <id>caucho</id>
-      <name>caucho.com</name>
-      <url>http://caucho.com/m2</url>
-      <layout>default</layout>
-    </repository>
-    -->
   </repositories>
+  <pluginRepositories>
+    <pluginRepository>
+      <id>central</id>
+      <name>forkalsrud.org maven proxy</name>
+      <releases><enabled>true</enabled></releases>
+      <snapshots><enabled>false</enabled></snapshots>
+      <url>http://forkalsrud.org:8080/nexus/content/groups/public</url>
+    </pluginRepository>
+    <pluginRepository>
+      <id>snapshots</id>
+      <name>forkalsrud.org maven proxy</name>
+      <releases><enabled>false</enabled></releases>
+      <snapshots><enabled>true</enabled></snapshots>
+      <url>http://forkalsrud.org:8080/nexus/content/groups/public-snapshots</url>
+    </pluginRepository>
+  </pluginRepositories>
 </project>
diff --git a/src/org/forkalsrud/album/exif/OggIdentifierTest.java b/src/org/forkalsrud/album/exif/OggIdentifierTest.java
index bcda11f..f483c55 100644
--- a/src/org/forkalsrud/album/exif/OggIdentifierTest.java
+++ b/src/org/forkalsrud/album/exif/OggIdentifierTest.java
@@ -1,30 +1,32 @@
 package org.forkalsrud.album.exif;
 
 import org.forkalsrud.album.exif.OggIdentifier.Codec;
+import org.junit.Assert;
+import org.junit.Test;
 
-import junit.framework.TestCase;
-
-public class OggIdentifierTest extends TestCase {
+public class OggIdentifierTest {
 
+    @Test
 	public void testVideoIdentifier() throws Exception {
 
 		Codec codec = OggIdentifier.getIdentifier(getClass().getResourceAsStream("videoheader.ogg"));
-		assertNotNull(codec);
-		assertEquals("video/ogg; codecs=theora", codec.getMimeType());
+		Assert.assertNotNull(codec);
+		Assert.assertEquals("video/ogg; codecs=theora", codec.getMimeType());
 	}
 
-	
+
+    @Test
 	public void testAudioIdentifier() throws Exception {
 
 		Codec codec = OggIdentifier.getIdentifier(getClass().getResourceAsStream("musicheader.ogg"));
-		assertNotNull(codec);
-		assertEquals("audio/ogg; codecs=vorbis", codec.getMimeType());
+		Assert.assertNotNull(codec);
+		Assert.assertEquals("audio/ogg; codecs=vorbis", codec.getMimeType());
 	}
 
-
+    @Test
 	public void testInvalidIdentifier() throws Exception {
 
 		Codec codec = OggIdentifier.getIdentifier(getClass().getResourceAsStream("OggIdentifierTest.class"));
-		assertNull(codec);
+		Assert.assertNull(codec);
 	}
 }
diff --git a/src/org/forkalsrud/album/web/PictureScaler.java b/src/org/forkalsrud/album/web/PictureScaler.java
index 0859888..7fe7ae9 100644
--- a/src/org/forkalsrud/album/web/PictureScaler.java
+++ b/src/org/forkalsrud/album/web/PictureScaler.java
@@ -32,7 +32,7 @@ import org.forkalsrud.album.exif.Thumbnail;
 public class PictureScaler {
 
 	ExecutorService executor;
-	BlockingQueue queue;
+	BlockingQueue<PictureRequest> queue;
     HashMap<String, PictureRequest> outstandingRequests;