merge in shane's changes

jsf/pastecode/src/main/java/org/jboss/weld/examples/pastecode/model/CodeFragment.java

@@ -23,6 +23,7 @@
 
 import static javax.persistence.GenerationType.AUTO;
 
+import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
 
@@ -46,6 +47,13 @@
 public class CodeFragment
 {
 
+   private static final long MS_PER_SECOND = 1000;
+   private static final long MS_PER_MINUTE = 60 * MS_PER_SECOND;
+   private static final long MS_PER_HOUR = 60 * MS_PER_MINUTE;
+   private static final long MS_PER_DAY = 24 * MS_PER_HOUR;
+
+   private static final SimpleDateFormat df = new SimpleDateFormat("d MMM");
+
    @Id
    @GeneratedValue(strategy = AUTO)
    @Column(name = "id")
@@ -107,6 +115,60 @@ public void setDatetime(Date datetime)
       this.datetime = datetime;
    }
 
+   public String getFriendlyDate()
+   {
+      if (getDatetime() == null)
+         return "unknown";
+
+      Date now = new Date();
+
+      long age = now.getTime() - getDatetime().getTime();
+
+      long days = (long) Math.floor(age / MS_PER_DAY);
+      age -= (days * MS_PER_DAY);
+      long hours = (long) Math.floor(age / MS_PER_HOUR);
+      age -= (hours * MS_PER_HOUR);
+      long minutes = (long) Math.floor(age / MS_PER_MINUTE);
+
+      if (days < 7)
+      {
+         StringBuilder sb = new StringBuilder();
+
+         if (days > 0)
+         {
+            sb.append(days);
+            sb.append(days > 1 ? " days " : " day ");
+         }
+
+         if (hours > 0)
+         {
+            sb.append(hours);
+            sb.append(hours > 1 ? " hrs " : " hr ");
+         }
+
+         if (minutes > 0)
+         {
+            sb.append(minutes);
+            sb.append(minutes > 1 ? " minutes " : " minute ");
+         }
+
+         if (hours == 0 && minutes == 0)
+         {
+            sb.append("just now");
+         }
+         else
+         {
+            sb.append("ago");
+         }
+
+         return sb.toString();
+      }
+      else
+      {
+         return df.format(getDatetime());
+      }
+   }
+
    public Language getLanguage()
    {
       return language;

jsf/pastecode/src/main/java/org/jboss/weld/examples/pastecode/session/EEProducers.java

@@ -0,0 +1,15 @@
+package org.jboss.weld.examples.pastecode.session;
+
+import javax.enterprise.inject.Produces;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+
+public class EEProducers
+{
+
+   @SuppressWarnings("unused")
+   @PersistenceContext(unitName = "pastecodeDatabase")
+   @Produces
+   private EntityManager em;
+
+}