[weld-commits] Weld SVN: r6465 - in examples/trunk/jsf/pastecode/src/main: java/org/jboss/weld/examples/pastecode/session and 1 other directories.

Author: pete.muir(a)jboss.org Date: 2010-06-16 17:30:13 -0400 (Wed, 16 Jun 2010) New Revision: 6465 Added: examples/trunk/jsf/pastecode/src/main/java/org/jboss/weld/examples/pastecode/session/LogManager.java Modified: examples/trunk/jsf/pastecode/src/main/java/org/jboss/weld/examples/pastecode/servlets/DownloadServlet.java examples/trunk/jsf/pastecode/src/main/java/org/jboss/weld/examples/pastecode/session/CodeFragmentManagerImpl.java examples/trunk/jsf/pastecode/src/main/java/org/jboss/weld/examples/pastecode/session/PasteWindow.java examples/trunk/jsf/pastecode/src/main/java/org/jboss/weld/examples/pastecode/session/PopulateDatabaseBean.java examples/trunk/jsf/pastecode/src/main/webapp/WEB-INF/faces-config.xml Log: minor tweaks to nav Modified: examples/trunk/jsf/pastecode/src/main/java/org/jboss/weld/examples/pastecode/servlets/DownloadServlet.java =================================================================== --- examples/trunk/jsf/pastecode/src/main/java/org/jboss/weld/examples/pastecode/servlets/DownloadServlet.java 2010-06-16 21:03:34 UTC (rev 6464) +++ examples/trunk/jsf/pastecode/src/main/java/org/jboss/weld/examples/pastecode/servlets/DownloadServlet.java 2010-06-16 21:30:13 UTC (rev 6465) @@ -22,6 +22,8 @@ package org.jboss.weld.examples.pastecode.servlets; import java.io.IOException; +import java.util.logging.Level; +import java.util.logging.Logger; import javax.inject.Inject; import javax.servlet.ServletException; @@ -38,6 +40,9 @@ public class DownloadServlet extends HttpServlet { private static final long serialVersionUID = 1L; + + @Inject + private Logger log; @Inject private CodeFragmentManager codeFragmentManager; @@ -61,7 +66,7 @@ } catch (Exception e) { - e.printStackTrace(); + log.log(Level.WARNING, "Error processing file for download", e); } finally { Modified: examples/trunk/jsf/pastecode/src/main/java/org/jboss/weld/examples/pastecode/session/CodeFragmentManagerImpl.java =================================================================== --- examples/trunk/jsf/pastecode/src/main/java/org/jboss/weld/examples/pastecode/session/CodeFragmentManagerImpl.java 2010-06-16 21:03:34 UTC (rev 6464) +++ examples/trunk/jsf/pastecode/src/main/java/org/jboss/weld/examples/pastecode/session/CodeFragmentManagerImpl.java 2010-06-16 21:30:13 UTC (rev 6465) @@ -26,6 +26,7 @@ import java.util.Calendar; import java.util.Date; import java.util.List; +import java.util.logging.Logger; import javax.ejb.Stateless; import javax.enterprise.inject.Produces; @@ -40,6 +41,8 @@ @Stateless public class CodeFragmentManagerImpl implements CodeFragmentManager { + + @Inject Logger log; // The number of code fragments to return in our recentCodeFragments query private static int MAX_RECENT_FRAGMENTS = 7; @@ -74,6 +77,7 @@ String hashValue = hashComputer.getHashValue(code); code.setHash(hashValue); entityManager.persist(code); + log.info("Added private pastecode: " + hashValue); return hashValue; } catch (NoSuchAlgorithmException e) @@ -86,6 +90,9 @@ else { entityManager.persist(code); + // Make sure we have the latest version (with the generated id!) + entityManager.refresh(code); + log.info("Added pastecode: " + code.getId()); return new Integer(code.getId()).toString(); } } Added: examples/trunk/jsf/pastecode/src/main/java/org/jboss/weld/examples/pastecode/session/LogManager.java =================================================================== --- examples/trunk/jsf/pastecode/src/main/java/org/jboss/weld/examples/pastecode/session/LogManager.java (rev 0) +++ examples/trunk/jsf/pastecode/src/main/java/org/jboss/weld/examples/pastecode/session/LogManager.java 2010-06-16 21:30:13 UTC (rev 6465) @@ -0,0 +1,18 @@ +package org.jboss.weld.examples.pastecode.session; + +import java.util.logging.Logger; + +import javax.enterprise.inject.Produces; +import javax.enterprise.inject.spi.InjectionPoint; + +public class LogManager +{ + + @Produces + public Logger getLogger(InjectionPoint ip) + { + String category = ip.getMember().getDeclaringClass().getName(); + return Logger.getLogger(category); + } + +} Property changes on: examples/trunk/jsf/pastecode/src/main/java/org/jboss/weld/examples/pastecode/session/LogManager.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Modified: examples/trunk/jsf/pastecode/src/main/java/org/jboss/weld/examples/pastecode/session/PasteWindow.java =================================================================== --- examples/trunk/jsf/pastecode/src/main/java/org/jboss/weld/examples/pastecode/session/PasteWindow.java 2010-06-16 21:03:34 UTC (rev 6464) +++ examples/trunk/jsf/pastecode/src/main/java/org/jboss/weld/examples/pastecode/session/PasteWindow.java 2010-06-16 21:30:13 UTC (rev 6465) @@ -54,7 +54,7 @@ // The send method is called when we hit the Send button public String send() { - codeFragmentManager.addCodeFragment(codeFragment, privateFragment); + codeFragmentId = codeFragmentManager.addCodeFragment(codeFragment, privateFragment); return "success"; } Modified: examples/trunk/jsf/pastecode/src/main/java/org/jboss/weld/examples/pastecode/session/PopulateDatabaseBean.java =================================================================== --- examples/trunk/jsf/pastecode/src/main/java/org/jboss/weld/examples/pastecode/session/PopulateDatabaseBean.java 2010-06-16 21:03:34 UTC (rev 6464) +++ examples/trunk/jsf/pastecode/src/main/java/org/jboss/weld/examples/pastecode/session/PopulateDatabaseBean.java 2010-06-16 21:30:13 UTC (rev 6465) @@ -27,6 +27,8 @@ import java.io.InputStreamReader; import java.text.SimpleDateFormat; import java.util.StringTokenizer; +import java.util.logging.Level; +import java.util.logging.Logger; import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; @@ -49,6 +51,8 @@ public class PopulateDatabaseBean { + @Inject Logger log; + private static final String DATA_FILE_NAME = "data.sql"; @Inject @@ -89,9 +93,10 @@ } catch (Exception e) { - System.err.println("Unable to read all records from " + DATA_FILE_NAME + " file"); + log.log(Level.WARNING, "Unable to read all records from " + DATA_FILE_NAME + " file"); } + log.info("Successfully imported data!"); populated = true; } Modified: examples/trunk/jsf/pastecode/src/main/webapp/WEB-INF/faces-config.xml =================================================================== --- examples/trunk/jsf/pastecode/src/main/webapp/WEB-INF/faces-config.xml 2010-06-16 21:03:34 UTC (rev 6464) +++ examples/trunk/jsf/pastecode/src/main/webapp/WEB-INF/faces-config.xml 2010-06-16 21:30:13 UTC (rev 6465) @@ -8,7 +8,7 @@ <navigation-rule> <from-view-id>/home.xhtml</from-view-id> <navigation-case> - <from-action>#{pasteWindow.send}</from-action> + <from-outcome>success</from-outcome> <to-view-id>/#{pasteWindow.codeFragmentId}</to-view-id> <redirect /> </navigation-case>