knut/album
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

change maven repository to our new nexus instance and update junit version to 4.7

Browse source
This commit is contained in:
Erik Forkalsrud 2010-02-06 12:14:58 -08:00
parent b39aad9fa3
commit 74c29c8ac1
3 changed files with 42 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
pom.xml
View file

@ -123,29 +123,43 @@
<artifactId>je</artifactId> <artifactId>je</artifactId>
<version>4.0.92</version> <version>4.0.92</version>
</dependency> </dependency>
<!--
<dependency><groupId>com.caucho</groupId><artifactId>resin</artifactId><version>3.1.8</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> </dependencies>
<repositories> <repositories>
<repository> <repository>
<id>central</id> <id>central</id>
<name>forkalsrud.org maven proxy</name> <name>forkalsrud.org maven proxy</name>
<releases><enabled>true</enabled></releases> <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> <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>
<!--
<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> </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> </project>

20
src/org/forkalsrud/album/exif/OggIdentifierTest.java
View file

@ -1,30 +1,32 @@
package org.forkalsrud.album.exif; package org.forkalsrud.album.exif;
import org.forkalsrud.album.exif.OggIdentifier.Codec; import org.forkalsrud.album.exif.OggIdentifier.Codec;
import org.junit.Assert;
import org.junit.Test;
import junit.framework.TestCase; public class OggIdentifierTest {
public class OggIdentifierTest extends TestCase {
@Test
public void testVideoIdentifier() throws Exception { public void testVideoIdentifier() throws Exception {
Codec codec = OggIdentifier.getIdentifier(getClass().getResourceAsStream("videoheader.ogg")); Codec codec = OggIdentifier.getIdentifier(getClass().getResourceAsStream("videoheader.ogg"));
assertNotNull(codec); Assert.assertNotNull(codec);
assertEquals("video/ogg; codecs=theora", codec.getMimeType()); Assert.assertEquals("video/ogg; codecs=theora", codec.getMimeType());
} }
@Test
public void testAudioIdentifier() throws Exception { public void testAudioIdentifier() throws Exception {
Codec codec = OggIdentifier.getIdentifier(getClass().getResourceAsStream("musicheader.ogg")); Codec codec = OggIdentifier.getIdentifier(getClass().getResourceAsStream("musicheader.ogg"));
assertNotNull(codec); Assert.assertNotNull(codec);
assertEquals("audio/ogg; codecs=vorbis", codec.getMimeType()); Assert.assertEquals("audio/ogg; codecs=vorbis", codec.getMimeType());
} }
@Test
public void testInvalidIdentifier() throws Exception { public void testInvalidIdentifier() throws Exception {
Codec codec = OggIdentifier.getIdentifier(getClass().getResourceAsStream("OggIdentifierTest.class")); Codec codec = OggIdentifier.getIdentifier(getClass().getResourceAsStream("OggIdentifierTest.class"));
assertNull(codec); Assert.assertNull(codec);
} }
} }

2
src/org/forkalsrud/album/web/PictureScaler.java
View file

@ -32,7 +32,7 @@ import org.forkalsrud.album.exif.Thumbnail;
public class PictureScaler { public class PictureScaler {
ExecutorService executor; ExecutorService executor;
BlockingQueue queue; BlockingQueue<PictureRequest> queue;
HashMap<String, PictureRequest> outstandingRequests; HashMap<String, PictureRequest> outstandingRequests;