From 68a999f4232290701c631db3fb824bc89e7f5115 Mon Sep 17 00:00:00 2001
From: George Gastaldi <gegastaldi@gmail.com>
Date: Tue, 4 Mar 2014 18:41:40 -0300
Subject: [PATCH] Scaffolded Addon entity

---
 .../java/org/jboss/forge/view/AddonBean.java  | 319 ++++++++++++++++++
 .../java/org/jboss/forge/view/ViewUtils.java  |  86 +++++
 .../org/jboss/forge/website/model/Addon.java  |  97 ++++++
 src/main/resources/META-INF/persistence.xml   |   8 +
 .../WEB-INF/classes/META-INF/forge.taglib.xml |  22 ++
 src/main/webapp/WEB-INF/web.xml               |  39 ++-
 src/main/webapp/addon/create.xhtml            |  70 ++++
 src/main/webapp/addon/search.xhtml            |  79 +++++
 src/main/webapp/addon/view.xhtml              |  43 +++
 .../resources/scaffold/pageTemplate.xhtml     |  22 +-
 10 files changed, 757 insertions(+), 28 deletions(-)
 create mode 100644 src/main/java/org/jboss/forge/view/AddonBean.java
 create mode 100644 src/main/java/org/jboss/forge/view/ViewUtils.java
 create mode 100644 src/main/java/org/jboss/forge/website/model/Addon.java
 create mode 100644 src/main/resources/META-INF/persistence.xml
 create mode 100644 src/main/webapp/WEB-INF/classes/META-INF/forge.taglib.xml
 create mode 100644 src/main/webapp/addon/create.xhtml
 create mode 100644 src/main/webapp/addon/search.xhtml
 create mode 100644 src/main/webapp/addon/view.xhtml

diff --git a/src/main/java/org/jboss/forge/view/AddonBean.java b/src/main/java/org/jboss/forge/view/AddonBean.java
new file mode 100644
index 0000000..956fadf
--- /dev/null
+++ b/src/main/java/org/jboss/forge/view/AddonBean.java
@@ -0,0 +1,319 @@
+package org.jboss.forge.view;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.annotation.Resource;
+import javax.ejb.SessionContext;
+import javax.ejb.Stateful;
+import javax.enterprise.context.Conversation;
+import javax.enterprise.context.ConversationScoped;
+import javax.faces.application.FacesMessage;
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+import javax.faces.convert.Converter;
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import javax.persistence.PersistenceContextType;
+import javax.persistence.TypedQuery;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+
+import org.jboss.forge.website.model.Addon;
+
+/**
+ * Backing bean for Addon entities.
+ * <p>
+ * This class provides CRUD functionality for all Addon entities. It focuses
+ * purely on Java EE 6 standards (e.g. <tt>&#64;ConversationScoped</tt> for
+ * state management, <tt>PersistenceContext</tt> for persistence,
+ * <tt>CriteriaBuilder</tt> for searches) rather than introducing a CRUD framework or
+ * custom base class.
+ */
+
+@Named
+@Stateful
+@ConversationScoped
+public class AddonBean implements Serializable
+{
+
+   private static final long serialVersionUID = 1L;
+
+   /*
+    * Support creating and retrieving Addon entities
+    */
+
+   private Long id;
+
+   public Long getId()
+   {
+      return this.id;
+   }
+
+   public void setId(Long id)
+   {
+      this.id = id;
+   }
+
+   private Addon addon;
+
+   public Addon getAddon()
+   {
+      return this.addon;
+   }
+
+   @Inject
+   private Conversation conversation;
+
+   @PersistenceContext(unitName = "website-persistence-unit", type = PersistenceContextType.EXTENDED)
+   private EntityManager entityManager;
+
+   public String create()
+   {
+
+      this.conversation.begin();
+      return "create?faces-redirect=true";
+   }
+
+   public void retrieve()
+   {
+
+      if (FacesContext.getCurrentInstance().isPostback())
+      {
+         return;
+      }
+
+      if (this.conversation.isTransient())
+      {
+         this.conversation.begin();
+      }
+
+      if (this.id == null)
+      {
+         this.addon = this.example;
+      }
+      else
+      {
+         this.addon = findById(getId());
+      }
+   }
+
+   public Addon findById(Long id)
+   {
+
+      return this.entityManager.find(Addon.class, id);
+   }
+
+   /*
+    * Support updating and deleting Addon entities
+    */
+
+   public String update()
+   {
+      this.conversation.end();
+
+      try
+      {
+         if (this.id == null)
+         {
+            this.entityManager.persist(this.addon);
+            return "search?faces-redirect=true";
+         }
+         else
+         {
+            this.entityManager.merge(this.addon);
+            return "view?faces-redirect=true&id=" + this.addon.getId();
+         }
+      }
+      catch (Exception e)
+      {
+         FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(e.getMessage()));
+         return null;
+      }
+   }
+
+   public String delete()
+   {
+      this.conversation.end();
+
+      try
+      {
+         Addon deletableEntity = findById(getId());
+
+         this.entityManager.remove(deletableEntity);
+         this.entityManager.flush();
+         return "search?faces-redirect=true";
+      }
+      catch (Exception e)
+      {
+         FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(e.getMessage()));
+         return null;
+      }
+   }
+
+   /*
+    * Support searching Addon entities with pagination
+    */
+
+   private int page;
+   private long count;
+   private List<Addon> pageItems;
+
+   private Addon example = new Addon();
+
+   public int getPage()
+   {
+      return this.page;
+   }
+
+   public void setPage(int page)
+   {
+      this.page = page;
+   }
+
+   public int getPageSize()
+   {
+      return 10;
+   }
+
+   public Addon getExample()
+   {
+      return this.example;
+   }
+
+   public void setExample(Addon example)
+   {
+      this.example = example;
+   }
+
+   public void search()
+   {
+      this.page = 0;
+   }
+
+   public void paginate()
+   {
+
+      CriteriaBuilder builder = this.entityManager.getCriteriaBuilder();
+
+      // Populate this.count
+
+      CriteriaQuery<Long> countCriteria = builder.createQuery(Long.class);
+      Root<Addon> root = countCriteria.from(Addon.class);
+      countCriteria = countCriteria.select(builder.count(root)).where(
+            getSearchPredicates(root));
+      this.count = this.entityManager.createQuery(countCriteria)
+            .getSingleResult();
+
+      // Populate this.pageItems
+
+      CriteriaQuery<Addon> criteria = builder.createQuery(Addon.class);
+      root = criteria.from(Addon.class);
+      TypedQuery<Addon> query = this.entityManager.createQuery(criteria
+            .select(root).where(getSearchPredicates(root)));
+      query.setFirstResult(this.page * getPageSize()).setMaxResults(
+            getPageSize());
+      this.pageItems = query.getResultList();
+   }
+
+   private Predicate[] getSearchPredicates(Root<Addon> root)
+   {
+
+      CriteriaBuilder builder = this.entityManager.getCriteriaBuilder();
+      List<Predicate> predicatesList = new ArrayList<Predicate>();
+
+      String groupId = this.example.getGroupId();
+      if (groupId != null && !"".equals(groupId))
+      {
+         predicatesList.add(builder.like(builder.lower(root.<String> get("groupId")), '%' + groupId.toLowerCase() + '%'));
+      }
+      String artifactId = this.example.getArtifactId();
+      if (artifactId != null && !"".equals(artifactId))
+      {
+         predicatesList.add(builder.like(builder.lower(root.<String> get("artifactId")), '%' + artifactId.toLowerCase() + '%'));
+      }
+
+      return predicatesList.toArray(new Predicate[predicatesList.size()]);
+   }
+
+   public List<Addon> getPageItems()
+   {
+      return this.pageItems;
+   }
+
+   public long getCount()
+   {
+      return this.count;
+   }
+
+   /*
+    * Support listing and POSTing back Addon entities (e.g. from inside an
+    * HtmlSelectOneMenu)
+    */
+
+   public List<Addon> getAll()
+   {
+
+      CriteriaQuery<Addon> criteria = this.entityManager
+            .getCriteriaBuilder().createQuery(Addon.class);
+      return this.entityManager.createQuery(
+            criteria.select(criteria.from(Addon.class))).getResultList();
+   }
+
+   @Resource
+   private SessionContext sessionContext;
+
+   public Converter getConverter()
+   {
+
+      final AddonBean ejbProxy = this.sessionContext.getBusinessObject(AddonBean.class);
+
+      return new Converter()
+      {
+
+         @Override
+         public Object getAsObject(FacesContext context,
+               UIComponent component, String value)
+         {
+
+            return ejbProxy.findById(Long.valueOf(value));
+         }
+
+         @Override
+         public String getAsString(FacesContext context,
+               UIComponent component, Object value)
+         {
+
+            if (value == null)
+            {
+               return "";
+            }
+
+            return String.valueOf(((Addon) value).getId());
+         }
+      };
+   }
+
+   /*
+    * Support adding children to bidirectional, one-to-many tables
+    */
+
+   private Addon add = new Addon();
+
+   public Addon getAdd()
+   {
+      return this.add;
+   }
+
+   public Addon getAdded()
+   {
+      Addon added = this.add;
+      this.add = new Addon();
+      return added;
+   }
+}
\ No newline at end of file
diff --git a/src/main/java/org/jboss/forge/view/ViewUtils.java b/src/main/java/org/jboss/forge/view/ViewUtils.java
new file mode 100644
index 0000000..b31311f
--- /dev/null
+++ b/src/main/java/org/jboss/forge/view/ViewUtils.java
@@ -0,0 +1,86 @@
+package org.jboss.forge.view;
+
+import java.beans.PropertyDescriptor;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import javax.persistence.Id;
+
+/**
+ * Utilities for working with Java Server Faces views.
+ */
+
+public final class ViewUtils
+{
+
+   public static <T> List<T> asList(Collection<T> collection)
+   {
+
+      if (collection == null)
+      {
+         return null;
+      }
+
+      return new ArrayList<T>(collection);
+   }
+
+   public static String display(Object object)
+   {
+
+      if (object == null)
+      {
+         return null;
+      }
+
+      try
+      {
+         // Invoke toString if declared in the class. If not found, the NoSuchMethodException is caught and handled
+         object.getClass().getDeclaredMethod("toString");
+         return object.toString();
+      }
+      catch (NoSuchMethodException noMethodEx)
+      {
+         try
+         {
+            for (Field field : object.getClass().getDeclaredFields())
+            {
+               // Find the primary key field and display it
+               if (field.getAnnotation(Id.class) != null)
+               {
+                  // Find a matching getter and invoke it to display the key
+                  for (Method method : object.getClass().getDeclaredMethods())
+                  {
+                     if (method.equals(new PropertyDescriptor(field.getName(), object.getClass()).getReadMethod()))
+                     {
+                        return method.invoke(object).toString();
+                     }
+                  }
+               }
+            }
+            for (Method method : object.getClass().getDeclaredMethods())
+            {
+               // Find the primary key as a property instead of a field, and display it
+               if (method.getAnnotation(Id.class) != null)
+               {
+                  return method.invoke(object).toString();
+               }
+            }
+         }
+         catch (Exception ex)
+         {
+            // Unlikely, but abort and stop view generation if any exception is thrown
+            throw new RuntimeException(ex);
+         }
+      }
+
+      return null;
+   }
+
+   private ViewUtils()
+   {
+
+      // Can never be called
+   }
+}
diff --git a/src/main/java/org/jboss/forge/website/model/Addon.java b/src/main/java/org/jboss/forge/website/model/Addon.java
new file mode 100644
index 0000000..a9277de
--- /dev/null
+++ b/src/main/java/org/jboss/forge/website/model/Addon.java
@@ -0,0 +1,97 @@
+package org.jboss.forge.website.model;
+
+import java.io.Serializable;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Version;
+import java.lang.Override;
+
+@Entity
+public class Addon implements Serializable {
+
+	@Id
+	@GeneratedValue(strategy = GenerationType.AUTO)
+	@Column(name = "id", updatable = false, nullable = false)
+	private Long id;
+
+	@Version
+	@Column(name = "version")
+	private int version;
+
+	@Column
+	private String groupId;
+
+	@Column
+	private String artifactId;
+
+	public Long getId() {
+		return this.id;
+	}
+
+	public void setId(final Long id) {
+		this.id = id;
+	}
+
+	public int getVersion() {
+		return this.version;
+	}
+
+	public void setVersion(final int version) {
+		this.version = version;
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj) {
+			return true;
+		}
+		if (!(obj instanceof Addon)) {
+			return false;
+		}
+		Addon other = (Addon) obj;
+		if (id != null) {
+			if (!id.equals(other.id)) {
+				return false;
+			}
+		}
+		return true;
+	}
+
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + ((id == null) ? 0 : id.hashCode());
+		return result;
+	}
+
+	public String getGroupId() {
+		return this.groupId;
+	}
+
+	public void setGroupId(final String groupId) {
+		this.groupId = groupId;
+	}
+
+	public String getArtifactId() {
+		return this.artifactId;
+	}
+
+	public void setArtifactId(final String artifactId) {
+		this.artifactId = artifactId;
+	}
+
+	@Override
+	public String toString() {
+		String result = getClass().getSimpleName() + " ";
+		if (groupId != null && !groupId.trim().isEmpty())
+			result += "groupId: " + groupId;
+		if (artifactId != null && !artifactId.trim().isEmpty())
+			result += ", artifactId: " + artifactId;
+		return result;
+	}
+}
\ No newline at end of file
diff --git a/src/main/resources/META-INF/persistence.xml b/src/main/resources/META-INF/persistence.xml
new file mode 100644
index 0000000..4fa6b17
--- /dev/null
+++ b/src/main/resources/META-INF/persistence.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<persistence xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.0" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
+   <persistence-unit name="website-persistence-unit" transaction-type="JTA">
+      <description>Forge Persistence Unit</description>
+      <jta-data-source>java:jboss/datasources/PostgreSQLDS</jta-data-source>
+      <exclude-unlisted-classes>false</exclude-unlisted-classes>
+   </persistence-unit>
+</persistence>
diff --git a/src/main/webapp/WEB-INF/classes/META-INF/forge.taglib.xml b/src/main/webapp/WEB-INF/classes/META-INF/forge.taglib.xml
new file mode 100644
index 0000000..ed44fb7
--- /dev/null
+++ b/src/main/webapp/WEB-INF/classes/META-INF/forge.taglib.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE facelet-taglib PUBLIC "-//Sun Microsystems, Inc.//DTD Facelet Taglib 1.0//EN" "http://java.sun.com/dtd/facelet-taglib_1_0.dtd">
+<facelet-taglib xmlns="http://java.sun.com/JSF/Facelet">
+	<namespace>http://jboss.org/forge/view</namespace>
+
+	<function>
+		<function-name>asList</function-name>
+		<function-class>org.jboss.forge.view.ViewUtils</function-class>
+		<function-signature>
+			java.util.List asList(java.util.Collection)
+		</function-signature>
+	</function>
+    
+    <function>
+        <function-name>display</function-name>
+        <function-class>org.jboss.forge.view.ViewUtils</function-class>
+        <function-signature>
+            java.lang.String display(java.lang.Object)
+        </function-signature>
+    </function>
+	
+</facelet-taglib>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index 0a9d908..e41bea0 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -1,19 +1,24 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.0" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
-  <display-name>website</display-name>
-  <session-config>
-    <session-timeout>30</session-timeout>
-  </session-config>
-  <error-page>
-    <error-code>404</error-code>
-    <location>/faces/error.xhtml</location>
-  </error-page>
-  <error-page>
-    <error-code>500</error-code>
-    <location>/faces/error.xhtml</location>
-  </error-page>
-  <context-param>
-    <param-name>javax.faces.DATETIMECONVERTER_DEFAULT_TIMEZONE_IS_SYSTEM_TIMEZONE</param-name>
-    <param-value>true</param-value>
-  </context-param>
+<web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	version="3.0"
+	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
+	<display-name>website</display-name>
+	<session-config>
+		<session-timeout>30</session-timeout>
+	</session-config>
+	<error-page>
+		<error-code>404</error-code>
+		<location>/faces/error.xhtml</location>
+	</error-page>
+	<error-page>
+		<error-code>500</error-code>
+		<location>/faces/error.xhtml</location>
+	</error-page>
+	<context-param>
+		<param-name>javax.faces.DATETIMECONVERTER_DEFAULT_TIMEZONE_IS_SYSTEM_TIMEZONE</param-name>
+		<param-value>true</param-value>
+	</context-param>
+	<welcome-file-list>
+		<welcome-file>index.html</welcome-file>
+	</welcome-file-list>
 </web-app>
diff --git a/src/main/webapp/addon/create.xhtml b/src/main/webapp/addon/create.xhtml
new file mode 100644
index 0000000..c1ced7a
--- /dev/null
+++ b/src/main/webapp/addon/create.xhtml
@@ -0,0 +1,70 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:h="http://java.sun.com/jsf/html"
+	xmlns:f="http://java.sun.com/jsf/core"
+	xmlns:ui="http://java.sun.com/jsf/facelets"
+	xmlns:c="http://java.sun.com/jsp/jstl/core"
+	template="/resources/scaffold/pageTemplate.xhtml">
+
+	<f:metadata>
+		<f:viewParam name="id" value='#{addonBean.id}'/>
+		<f:event type="preRenderView" listener='#{addonBean.retrieve}'/>
+	</f:metadata>
+
+	<ui:param name="pageTitle" value="Create Addon"/>
+
+	<ui:define name="header">
+		Addon
+	</ui:define>
+
+	<ui:define name="subheader">
+		<c:choose>
+			<c:when test='#{!empty addonBean.id}'>
+				Edit existing Addon
+			</c:when>
+			<c:otherwise>
+				Create a new Addon
+			</c:otherwise>
+		</c:choose>
+	</ui:define>
+
+	<ui:define name="footer"/>
+
+	<ui:define name="main">
+		<h:form id="create">
+			<h:messages globalOnly="true" styleClass="error"/>
+
+			<h:panelGrid columnClasses="label,component,required" columns="3">
+				<h:outputLabel for="addonBeanAddonGroupId" value="Group Id:"/>
+				<h:panelGroup>
+					<h:inputText id="addonBeanAddonGroupId" value="#{addonBean.addon.groupId}"/>
+					<h:message for="addonBeanAddonGroupId" styleClass="error"/>
+				</h:panelGroup>
+				<h:outputText/>
+				<h:outputLabel for="addonBeanAddonArtifactId" value="Artifact Id:"/>
+				<h:panelGroup>
+					<h:inputText id="addonBeanAddonArtifactId" value="#{addonBean.addon.artifactId}"/>
+					<h:message for="addonBeanAddonArtifactId" styleClass="error"/>
+				</h:panelGroup>
+				<h:outputText/>
+			</h:panelGrid>
+
+			<div class="buttons">
+				<h:commandLink value="Save" action='#{addonBean.update}' styleClass="btn btn-primary"/>
+				<c:choose>
+					<c:when test='#{!empty addonBean.id}'>
+						<h:link value="Cancel" outcome="view" styleClass="btn btn-primary">
+							<f:param name="id" value='#{addonBean.id}'/>
+						</h:link>
+						<h:commandLink value="Delete" action='#{addonBean.delete}' styleClass="btn btn-primary"/>
+					</c:when>
+					<c:otherwise>
+						<h:link value="Cancel" outcome="search" styleClass="btn btn-primary"/>
+					</c:otherwise>
+				</c:choose>
+			</div>
+		</h:form>
+	</ui:define>
+
+</ui:composition>
\ No newline at end of file
diff --git a/src/main/webapp/addon/search.xhtml b/src/main/webapp/addon/search.xhtml
new file mode 100644
index 0000000..51b1f39
--- /dev/null
+++ b/src/main/webapp/addon/search.xhtml
@@ -0,0 +1,79 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:h="http://java.sun.com/jsf/html"
+	xmlns:f="http://java.sun.com/jsf/core"
+	xmlns:ui="http://java.sun.com/jsf/facelets"
+	template="/resources/scaffold/pageTemplate.xhtml">
+
+	<f:metadata>
+		<f:viewParam name="page" value='#{addonBean.page}'/>
+		<f:event type="preRenderView" listener='#{addonBean.paginate}'/>
+	</f:metadata>
+
+	<ui:param name="pageTitle" value="Search Addon entities"/>
+
+	<ui:define name="header">
+		Addon
+	</ui:define>
+
+	<ui:define name="subheader">
+		Search Addon entities
+	</ui:define>
+
+	<ui:define name="footer"/>
+
+	<ui:define name="main">
+		<h:form id="search">
+			<f:validateBean disabled="true">
+				<h:panelGroup styleClass="search">
+
+					<h:panelGrid columnClasses="label,component,required" columns="3">
+						<h:outputLabel for="addonBeanExampleGroupId" value="Group Id:"/>
+						<h:panelGroup>
+							<h:inputText id="addonBeanExampleGroupId" value="#{addonBean.example.groupId}"/>
+							<h:message for="addonBeanExampleGroupId" styleClass="error"/>
+						</h:panelGroup>
+						<h:outputText/>
+						<h:outputLabel for="addonBeanExampleArtifactId" value="Artifact Id:"/>
+						<h:panelGroup>
+							<h:inputText id="addonBeanExampleArtifactId" value="#{addonBean.example.artifactId}"/>
+							<h:message for="addonBeanExampleArtifactId" styleClass="error"/>
+						</h:panelGroup>
+						<h:outputText/>
+					</h:panelGrid>
+					<h:panelGroup styleClass="buttons">
+						<h:commandLink value="Search" action='#{addonBean.search}' styleClass="btn btn-primary"/>
+						<h:commandLink value="Create New" action='#{addonBean.create}' styleClass="btn btn-primary"/>
+					</h:panelGroup>
+				</h:panelGroup>
+			</f:validateBean>
+			
+			<h:dataTable id="addonBeanPageItems" styleClass="data-table" value="#{addonBean.pageItems}" var="_item">
+				<h:column>
+					<f:facet name="header">
+						<h:outputText value="Group Id"/>
+					</f:facet>
+					<h:link outcome="/addon/view">
+						<f:param name="id" value="#{_item.id}"/>
+						<h:outputText id="itemGroupId" value="#{_item.groupId}"/>
+					</h:link>
+				</h:column>
+				<h:column>
+					<f:facet name="header">
+						<h:outputText value="Artifact Id"/>
+					</f:facet>
+					<h:link outcome="/addon/view">
+						<f:param name="id" value="#{_item.id}"/>
+						<h:outputText id="itemArtifactId" value="#{_item.artifactId}"/>
+					</h:link>
+				</h:column>
+			</h:dataTable>
+			<ui:include src="/resources/scaffold/paginator.xhtml">
+				<ui:param name="paginatorBean" value='#{addonBean}'/>
+			</ui:include>
+		</h:form>
+			
+	</ui:define>
+
+</ui:composition>
diff --git a/src/main/webapp/addon/view.xhtml b/src/main/webapp/addon/view.xhtml
new file mode 100644
index 0000000..8d3fd4d
--- /dev/null
+++ b/src/main/webapp/addon/view.xhtml
@@ -0,0 +1,43 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:h="http://java.sun.com/jsf/html"
+	xmlns:f="http://java.sun.com/jsf/core"
+	xmlns:ui="http://java.sun.com/jsf/facelets"
+	template="/resources/scaffold/pageTemplate.xhtml">
+
+	<f:metadata>
+		<f:viewParam name="id" value='#{addonBean.id}'/>
+		<f:event type="preRenderView" listener='#{addonBean.retrieve}'/>
+	</f:metadata>
+
+	<ui:param name="pageTitle" value="View Addon"/>
+
+	<ui:define name="header">
+		Addon
+	</ui:define>
+
+	<ui:define name="subheader">
+		View existing Addon
+	</ui:define>
+
+	<ui:define name="footer"/>
+
+	<ui:define name="main">
+		<h:panelGrid columnClasses="label,component,required" columns="3">
+			<h:outputLabel for="addonBeanAddonGroupId" value="Group Id:"/>
+			<h:outputText id="addonBeanAddonGroupId" value="#{addonBean.addon.groupId}"/>
+			<h:outputText/>
+			<h:outputLabel for="addonBeanAddonArtifactId" value="Artifact Id:"/>
+			<h:outputText id="addonBeanAddonArtifactId" value="#{addonBean.addon.artifactId}"/>
+			<h:outputText/>
+		</h:panelGrid>
+
+		<div class="buttons">
+			<h:link value="View All" outcome="search" styleClass="btn btn-primary"/> 
+			<h:link value="Edit" outcome="create" includeViewParams="true" styleClass="btn btn-primary"/>
+			<h:link value="Create New" outcome="create" styleClass="btn btn-primary"/>
+		</div>
+	</ui:define>
+
+</ui:composition>
\ No newline at end of file
diff --git a/src/main/webapp/resources/scaffold/pageTemplate.xhtml b/src/main/webapp/resources/scaffold/pageTemplate.xhtml
index 7601f9d..78a4c4a 100644
--- a/src/main/webapp/resources/scaffold/pageTemplate.xhtml
+++ b/src/main/webapp/resources/scaffold/pageTemplate.xhtml
@@ -5,21 +5,20 @@
 
 <h:head>
 	<title>#{empty pageTitle ? 'Page Title' : pageTitle}</title>
-	<link rel="icon" href="#{resource['favicon.ico']}" />
+	<link rel="icon" href='#{resource["favicon.ico"]}' />
 	<h:outputStylesheet name="bootstrap.css" />
 	<h:outputStylesheet name="forge-style.css" />
 </h:head>
 
 <h:body>
+	<ui:debug rendered="#{facesContext.application.projectStage == 'Development'}" />
 	<div class="navbar navbar-fixed-top">
 		<div class="navbar-inner">
 			<div class="container">
 				<h:link id="brandLink" outcome="/index.xhtml" styleClass="brand">Website</h:link>
 				<div class="nav-collapse collapse">
 					<ul class="nav">
-						<li><a
-							href="http://forge.jboss.org/docs/important_plugins/ui-scaffolding.html">How
-								to Customize</a></li>
+						<li><a href="http://forge.jboss.org/docs/important_plugins/ui-scaffolding.html">How to Customize</a></li>
 					</ul>
 				</div>
 			</div>
@@ -29,10 +28,13 @@
 	<div class="container forgecontainer">
 		<div id="navigation">
 			<h:link id="homeLink" outcome="/index.xhtml">
-				<img src="#{resource['forge-logo.png']}" alt="Forge... get hammered"
-					border="0" />
+				<img src='#{resource["forge-logo.png"]}' alt="Forge... get hammered" border="0" />
 			</h:link>
-			<ul />
+			<ul>
+				<li>
+					<h:link outcome="/addon/search" value="Addon"/>
+				</li>
+			</ul>
 		</div>
 
 		<div id="content">
@@ -49,10 +51,8 @@
 
 	<footer>
 		<div id="footer-wrapper">
-			<p>
-				Powered by <a href="http://jboss.org/forge">Forge</a>
-			</p>
-		</div>
+	    	<p>Powered by <a href="http://jboss.org/forge">Forge</a></p>
+	    </div>
 	</footer>
 
 </h:body>