Change flicker API URL. Other long-since-forgotten changes.

pom.xml

@@ -13,6 +13,7 @@
   <inceptionYear>2009</inceptionYear>
   <properties>
     <scala.version>2.7.7</scala.version>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
 
   <repositories>
@@ -41,7 +42,7 @@
     <dependency>
       <groupId>net.liftweb</groupId>
       <artifactId>lift-webkit</artifactId>
-      <version>1.1-SNAPSHOT</version>
+      <version>2.0</version>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
@@ -143,6 +144,24 @@
           </classpathContainers>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>2.0.2</version>
+        <configuration>
+          <source>1.3</source>
+          <target>1.3</target>
+          <encoding>${project.build.sourceEncoding}</encoding>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-resources-plugin</artifactId>
+        <version>2.2</version>
+        <configuration>
+          <encoding>${project.build.sourceEncoding}</encoding>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
   <reporting>

src/main/resources/log4j.properties

@@ -0,0 +1,5 @@
+log4j.rootLogger=debug, A1
+
+log4j.appender.A1=org.apache.log4j.ConsoleAppender
+log4j.appender.A1.layout=org.apache.log4j.PatternLayout
+log4j.appender.A1.layout.ConversionPattern=%d{HH:mm:ss,SSS} [%t] %-5p %c %x - %m%n

src/main/scala/birdshow/model/flickr/Flickr.scala

@@ -11,7 +11,7 @@ import birdshow.util.{XmlFetcher, Parallelizer}
  */
 object Flickr {
 
-  private val urlPart1 = "http://api.flickr.com/services/rest/?method=flickr."
+  private val urlPart1 = "https://api.flickr.com/services/rest/?method=flickr."
   private val apiKey = "&api_key=979e4a1aa2eb498c845415e254e70f53"
   private val parallelizer = new Parallelizer(20) 
 

src/main/scala/bootstrap/liftweb/Boot.scala

@@ -1,10 +1,10 @@
 package bootstrap.liftweb
 
-import _root_.net.liftweb.http._
-import _root_.net.liftweb.http.provider._
-import _root_.net.liftweb.sitemap._
-import _root_.net.liftweb.sitemap.Loc._
-import _root_.birdshow.model._
+import net.liftweb.http._
+import net.liftweb.http.provider._
+import net.liftweb.sitemap._
+import net.liftweb.sitemap.Loc._
+import birdshow.model._
 
 /**
  * A class that's instantiated early and run.  It allows the application
@@ -44,8 +44,6 @@ class Boot {
   /**
    * Force the request to be UTF-8
    */
-  private def makeUtf8(req: HTTPRequest) {
-    req.setCharacterEncoding("UTF-8")
-  }
+  private def makeUtf8(req: HTTPRequest) = req.setCharacterEncoding("UTF-8")
 
 }

src/main/webapp/galleries.html

@@ -38,7 +38,7 @@
         </table>
     </lift:Galleries.showGalleries>
 
-    <div>©2010 Eleanor Briccetti</div>
+    <div>©2014 Eleanor Briccetti</div>
 
 </lift:surround>