changed layout to default maven2 structure

pom.xml

@@ -25,12 +25,11 @@
       <timezone>PST</timezone>
     </developer>
   </developers>
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
   <build>
-    <finalName>album</finalName>
-    <sourceDirectory>src</sourceDirectory>
-    <resources>
-      <resource><directory>etc</directory></resource>
-    </resources>
+    <finalName>photo</finalName>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -40,13 +39,6 @@
           <target>1.5</target>         
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-war-plugin</artifactId>
-        <configuration>
-          <warSourceDirectory>webapp</warSourceDirectory>
-        </configuration>
-      </plugin>
       <plugin>
         <groupId>org.mortbay.jetty</groupId>
         <artifactId>maven-jetty-plugin</artifactId>

src/test/java/org/forkalsrud/album/exif/OggIdentifierTest.java

@@ -9,7 +9,7 @@ public class OggIdentifierTest {
     @Test
 	public void testVideoIdentifier() throws Exception {
 
-		Codec codec = OggIdentifier.getIdentifier(getClass().getResourceAsStream("videoheader.ogg"));
+		Codec codec = OggIdentifier.getIdentifier(getClass().getResourceAsStream("/videoheader.ogg"));
 		Assert.assertNotNull(codec);
 		Assert.assertEquals("video/ogg; codecs=theora", codec.getMimeType());
 	}
@@ -18,7 +18,7 @@ public class OggIdentifierTest {
     @Test
 	public void testAudioIdentifier() throws Exception {
 
-		Codec codec = OggIdentifier.getIdentifier(getClass().getResourceAsStream("musicheader.ogg"));
+		Codec codec = OggIdentifier.getIdentifier(getClass().getResourceAsStream("/musicheader.ogg"));
 		Assert.assertNotNull(codec);
 		Assert.assertEquals("audio/ogg; codecs=vorbis", codec.getMimeType());
 	}