Get it to run on newest versions

4 files changed, 101 insertions, 68 deletions

diff --git a/src/beans/CategoryManager.java b/src/beans/CategoryManager.java
index 7b96d2f..fc3d438 100644
--- a/src/beans/CategoryManager.java
+++ b/src/beans/CategoryManager.java
@@ -13,6 +13,8 @@ import java.io.IOException;
 import java.util.Collection;
 import java.util.Map;
 
+import javax.faces.bean.ManagedBean;
+import javax.faces.bean.SessionScoped;
 import javax.faces.context.FacesContext;
 import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;
@@ -21,6 +23,8 @@ import javax.persistence.Persistence;
 
 import jpa.Category;
 
+@ManagedBean(name = "CategoryManager")
+@SessionScoped
 public class CategoryManager
 {
    private Category current;
@@ -48,7 +52,7 @@ public class CategoryManager
       FacesContext facesContext = FacesContext.getCurrentInstance();
       Map params = facesContext.getExternalContext().getRequestParameterMap();
       Integer selectedId = Integer.valueOf((String) params.get("selectedId"));
-//      System.out.println(selectedId);
+      // System.out.println(selectedId);
 
       EntityManagerFactory factory = Persistence
             .createEntityManagerFactory("catalog");
@@ -59,7 +63,7 @@ public class CategoryManager
       try
       {
          current = manager.find(Category.class, selectedId);
-//         System.out.println(current.getName());
+         // System.out.println(current.getName());
          tx.commit();
       }
       catch (Exception ex)
diff --git a/src/beans/ContactManager.java b/src/beans/ContactManager.java
index 43c96e0..4625848 100644
--- a/src/beans/ContactManager.java
+++ b/src/beans/ContactManager.java
@@ -9,6 +9,11 @@
  */
 package beans;
 
+import javax.faces.bean.ManagedBean;
+import javax.faces.bean.SessionScoped;
+
+@ManagedBean(name = "ContactManager")
+@SessionScoped
 public class ContactManager
 {
    // nothing implemented yet
diff --git a/src/beans/ProductManager.java b/src/beans/ProductManager.java
index cc0dcaa..d499e3c 100644
--- a/src/beans/ProductManager.java
+++ b/src/beans/ProductManager.java
@@ -12,6 +12,8 @@ package beans;
 import java.io.IOException;
 import java.util.Map;
 
+import javax.faces.bean.ManagedBean;
+import javax.faces.bean.SessionScoped;
 import javax.faces.context.FacesContext;
 import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;
@@ -20,10 +22,12 @@ import javax.persistence.Persistence;
 
 import jpa.Product;
 
+@ManagedBean(name = "ProductManager")
+@SessionScoped
 public class ProductManager
 {
    private Product current;
-   
+
    public Product getCurrent()
    {
       return current;
@@ -34,7 +38,7 @@ public class ProductManager
       FacesContext facesContext = FacesContext.getCurrentInstance();
       Map params = facesContext.getExternalContext().getRequestParameterMap();
       String selectedId = (String) params.get("selectedId");
-//      System.out.println(selectedId);
+      // System.out.println(selectedId);
 
       EntityManagerFactory factory = Persistence
             .createEntityManagerFactory("catalog");
diff --git a/src/beans/UserManager.java b/src/beans/UserManager.java
index 9e08543..190926b 100644
--- a/src/beans/UserManager.java
+++ b/src/beans/UserManager.java
@@ -9,8 +9,12 @@
  */
 package beans;
 
+import static util.DigestUtils.md5;
+
 import java.util.List;
 
+import javax.faces.bean.ManagedBean;
+import javax.faces.bean.SessionScoped;
 import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;
 import javax.persistence.EntityTransaction;
@@ -18,83 +22,99 @@ import javax.persistence.Persistence;
 import javax.persistence.Query;
 
 import jpa.User;
-import static util.DigestUtils.md5;
 
-public class UserManager {
-	private User current;
+@ManagedBean(name = "UserManager")
+@SessionScoped
+public class UserManager
+{
+   private User current;
 
-	private boolean loggedIn;
+   private boolean loggedIn;
 
-	public UserManager() {
-		current = new User();
-	}
+   public UserManager()
+   {
+      current = new User();
+   }
 
-	public String login() {
-		String outcome = "failure";
-		if (current.getUsername() != null && current.getUsername().length() > 0
-				&& current.getPassword() != null
-				&& current.getPassword().length() > 0) {
-			EntityManagerFactory factory = Persistence
-					.createEntityManagerFactory("catalog");
-			EntityManager manager = factory.createEntityManager();
-			Query query = manager
-					.createQuery("SELECT u FROM User u where u.username = :username and u.password = :password");
-			query.setParameter("username", current.getUsername());
-			query.setParameter("password", md5(current.getPassword()));
-			List results = query.getResultList();
+   public String login()
+   {
+      String outcome = "failure";
+      if (current.getUsername() != null && current.getUsername().length() > 0
+            && current.getPassword() != null
+            && current.getPassword().length() > 0)
+      {
+         EntityManagerFactory factory = Persistence
+               .createEntityManagerFactory("catalog");
+         EntityManager manager = factory.createEntityManager();
+         Query query = manager.createQuery(
+               "SELECT u FROM User u where u.username = :username and u.password = :password");
+         query.setParameter("username", current.getUsername());
+         query.setParameter("password", md5(current.getPassword()));
+         List results = query.getResultList();
 
-			if (!results.isEmpty()) {
-				loggedIn = true;
-				current = (User) results.get(0);
-				outcome = "success";
-			}
-		}
-		// System.out.println(outcome);
-		return outcome;
-	}
+         if (!results.isEmpty())
+         {
+            loggedIn = true;
+            current = (User) results.get(0);
+            outcome = "success";
+         }
+      }
+      // System.out.println(outcome);
+      return outcome;
+   }
 
-	public String logout() {
-		loggedIn = false;
-		current = new User();
-		return "home";
-	}
+   public String logout()
+   {
+      loggedIn = false;
+      current = new User();
+      return "home";
+   }
 
-	public void setUsername(String username) {
-		current.setUsername(username);
-	}
+   public void setUsername(String username)
+   {
+      current.setUsername(username);
+   }
 
-	public String getUsername() {
-		return current.getUsername();
-	}
+   public String getUsername()
+   {
+      return current.getUsername();
+   }
 
-	public void setPassword(String password) {
-		current.setPassword(password);
-	}
+   public void setPassword(String password)
+   {
+      current.setPassword(password);
+   }
 
-	public String getPassword() {
-		return current.getPassword();
-	}
+   public String getPassword()
+   {
+      return current.getPassword();
+   }
 
-	public boolean isLoggedIn() {
-		return loggedIn;
-	}
+   public boolean isLoggedIn()
+   {
+      return loggedIn;
+   }
 
-	public User getCurrent() {
-		EntityManagerFactory factory = Persistence
-				.createEntityManagerFactory("catalog");
-		EntityManager manager = factory.createEntityManager();
+   public User getCurrent()
+   {
+      EntityManagerFactory factory = Persistence
+            .createEntityManagerFactory("catalog");
+      EntityManager manager = factory.createEntityManager();
 
-		EntityTransaction tx = manager.getTransaction();
-		tx.begin();
-		try {
-			current = manager.find(User.class, getUsername());
+      EntityTransaction tx = manager.getTransaction();
+      tx.begin();
+      try
+      {
+         current = manager.find(User.class, getUsername());
 
-			tx.commit();
-		} catch (Exception ex) {
-			ex.printStackTrace(System.err);
-			tx.rollback();
-		}
+         tx.commit();
+      }
+      catch (Exception ex)
+      {
+         ex.printStackTrace(System.err);
+         tx.rollback();
+      }
 
-		return current;
-	}
+      return current;
+   }
 }