Author: husted
Date: Mon Nov 26 15:46:16 2007
New Revision: 598465
URL: http://svn.apache.org/viewvc?rev=598465&view=rev
Log:
WW-1399 Include sample logging settings. Switch to production mode to be sure
system doesn't spam logs. (The type converts can be a problem, since they issue
WARN statements in the normal course.)
Added:
struts/sandbox/trunk/jpa-mailreader/src/main/java/log4j.properties
struts/sandbox/trunk/jpa-mailreader/src/main/java/log4j.properties.txt
Modified:
struts/sandbox/trunk/jpa-mailreader/src/main/java/action/Index.java
struts/sandbox/trunk/jpa-mailreader/src/main/java/action/user/Index.java
struts/sandbox/trunk/jpa-mailreader/src/main/java/action/user/subscription/Index.java
struts/sandbox/trunk/jpa-mailreader/src/main/java/commons-logging.properties
struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/protocol/ProtocolHelperImpl.java
struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/protocol/ProtocolTypeConverter.java
struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/subscription/Subscription.java
struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/subscription/SubscriptionHelperImpl.java
struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/subscription/SubscriptionTypeConverter.java
struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/user/UserHelperImpl.java
Modified: struts/sandbox/trunk/jpa-mailreader/src/main/java/action/Index.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/jpa-mailreader/src/main/java/action/Index.java?rev=598465&r1=598464&r2=598465&view=diff
==============================================================================
--- struts/sandbox/trunk/jpa-mailreader/src/main/java/action/Index.java
(original)
+++ struts/sandbox/trunk/jpa-mailreader/src/main/java/action/Index.java Mon Nov
26 15:46:16 2007
@@ -92,10 +92,6 @@
// ---- PROPERTIES ----
- public String getLocation() {
- return "/WEB-INF/results/";
- }
-
/**
* <p>
* Provide a local cache of client properties.
Modified:
struts/sandbox/trunk/jpa-mailreader/src/main/java/action/user/Index.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/jpa-mailreader/src/main/java/action/user/Index.java?rev=598465&r1=598464&r2=598465&view=diff
==============================================================================
--- struts/sandbox/trunk/jpa-mailreader/src/main/java/action/user/Index.java
(original)
+++ struts/sandbox/trunk/jpa-mailreader/src/main/java/action/user/Index.java
Mon Nov 26 15:46:16 2007
@@ -45,11 +45,7 @@
// ---- PROPERTIES ----
- UserHelper manager;
-
- public String getLocation() {
- return "/WEB-INF/results/user/";
- }
+ private UserHelper manager;
private User user;
Modified:
struts/sandbox/trunk/jpa-mailreader/src/main/java/action/user/subscription/Index.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/jpa-mailreader/src/main/java/action/user/subscription/Index.java?rev=598465&r1=598464&r2=598465&view=diff
==============================================================================
---
struts/sandbox/trunk/jpa-mailreader/src/main/java/action/user/subscription/Index.java
(original)
+++
struts/sandbox/trunk/jpa-mailreader/src/main/java/action/user/subscription/Index.java
Mon Nov 26 15:46:16 2007
@@ -52,11 +52,12 @@
@ParentPackage("entity-default")
public class Index extends action.user.Index implements Preparable {
- protected static final String ERROR_HOST_UNIQUE = "error.host.unique";
+ private static final String ERROR_CREDENTIALS_MISMATCH =
"error.password.mismatch";
- static final String ERROR_CREDENTIALS_MISMATCH = "error.password.mismatch";
+ protected static final String ERROR_HOST_UNIQUE = "error.host.unique";
protected SubscriptionHelper manager;
+
private ProtocolHelper protocolManager;
private Map<String, String> protocols;
Modified:
struts/sandbox/trunk/jpa-mailreader/src/main/java/commons-logging.properties
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/jpa-mailreader/src/main/java/commons-logging.properties?rev=598465&r1=598464&r2=598465&view=diff
==============================================================================
---
struts/sandbox/trunk/jpa-mailreader/src/main/java/commons-logging.properties
(original)
+++
struts/sandbox/trunk/jpa-mailreader/src/main/java/commons-logging.properties
Mon Nov 26 15:46:16 2007
@@ -1 +1,2 @@
-org.apache.commons.logging.Log=org.apache.commons.logging.impl.Jdk14Logger
+org.apache.commons.logging.Log=org.apache.commons.logging.impl.Log4JLogger
+# org.apache.commons.logging.Log=org.apache.commons.logging.impl.Jdk14Logger
Modified:
struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/protocol/ProtocolHelperImpl.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/protocol/ProtocolHelperImpl.java?rev=598465&r1=598464&r2=598465&view=diff
==============================================================================
---
struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/protocol/ProtocolHelperImpl.java
(original)
+++
struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/protocol/ProtocolHelperImpl.java
Mon Nov 26 15:46:16 2007
@@ -35,7 +35,7 @@
* Default JPA implementation of <code>ProtocolHelper</code>.
* </p>
*/
[EMAIL PROTECTED](serviceName = "protocol.soap", endpointInterface =
"entity.protocol.ProtocolHelper")
[EMAIL PROTECTED](serviceName = "protocol", endpointInterface =
"entity.protocol.ProtocolHelper")
public class ProtocolHelperImpl extends EntityHelper implements ProtocolHelper
{
public int count() throws PersistenceException {
Modified:
struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/protocol/ProtocolTypeConverter.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/protocol/ProtocolTypeConverter.java?rev=598465&r1=598464&r2=598465&view=diff
==============================================================================
---
struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/protocol/ProtocolTypeConverter.java
(original)
+++
struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/protocol/ProtocolTypeConverter.java
Mon Nov 26 15:46:16 2007
@@ -31,8 +31,8 @@
public class ProtocolTypeConverter extends StrutsTypeConverter {
/**
- * Given a String ID, retrieve the corresponding <code>Protocol</code>
- * entity from the persistence database.
+ * Retrieve the corresponding <code>Protocol</code>
+ * entity from the persistence database, given a String ID.
*/
public Object convertFromString(Map context, String[] values, Class
toClass) {
ProtocolHelper manager = new ProtocolHelperImpl();
Modified:
struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/subscription/Subscription.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/subscription/Subscription.java?rev=598465&r1=598464&r2=598465&view=diff
==============================================================================
---
struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/subscription/Subscription.java
(original)
+++
struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/subscription/Subscription.java
Mon Nov 26 15:46:16 2007
@@ -65,28 +65,18 @@
* Named query for finding a <code>User</code> by username.
* </p>
*/
- static final String FIND_ALL = "Subscription.FIND_ALL";
+ public static final String FIND_ALL = "Subscription.FIND_ALL";
- /**
- * <p>
- * Query for finding a <code>User</code> by username.
- * </p>
- */
- static final String FIND_ALL_QUERY = "SELECT s FROM APP_SUBSCRIPTION s";
+ private static final String FIND_ALL_QUERY = "SELECT s FROM
APP_SUBSCRIPTION s";
/**
* <p>
* Named query for finding a <code>User</code> by username.
* </p>
*/
- static final String FIND_BY_NAME = "Subscription.FIND_BY_HOST";
+ public static final String FIND_BY_NAME = "Subscription.FIND_BY_HOST";
- /**
- * <p>
- * Query for finding a <code>User</code> by username.
- * </p>
- */
- static final String FIND_BY_NAME_QUERY = "SELECT s FROM APP_SUBSCRIPTION s
WHERE s.host = :host";
+ private static final String FIND_BY_NAME_QUERY = "SELECT s FROM
APP_SUBSCRIPTION s WHERE s.host = :host";
/**
* <p>
Modified:
struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/subscription/SubscriptionHelperImpl.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/subscription/SubscriptionHelperImpl.java?rev=598465&r1=598464&r2=598465&view=diff
==============================================================================
---
struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/subscription/SubscriptionHelperImpl.java
(original)
+++
struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/subscription/SubscriptionHelperImpl.java
Mon Nov 26 15:46:16 2007
@@ -30,7 +30,7 @@
* Default JPA implementation of <code>UserHelper</code>.
* </p>
*/
[EMAIL PROTECTED](serviceName = "subscription.soap", endpointInterface =
"entity.subscription.SubscriptionHelper")
[EMAIL PROTECTED](serviceName = "subscription", endpointInterface =
"entity.subscription.SubscriptionHelper")
public class SubscriptionHelperImpl extends EntityHelper implements
SubscriptionHelper {
Modified:
struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/subscription/SubscriptionTypeConverter.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/subscription/SubscriptionTypeConverter.java?rev=598465&r1=598464&r2=598465&view=diff
==============================================================================
---
struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/subscription/SubscriptionTypeConverter.java
(original)
+++
struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/subscription/SubscriptionTypeConverter.java
Mon Nov 26 15:46:16 2007
@@ -31,8 +31,8 @@
public class SubscriptionTypeConverter extends StrutsTypeConverter {
/**
- * Given a host name, retrieve the corresponding <code>Subscription</code>
- * entity from the persistence database.
+ * Retrieve the corresponding <code>Subscription</code>
+ * entity from the persistence database, fiven a host name.
*/
public Object convertFromString(Map context, String[] values, Class
toClass) {
SubscriptionHelper manager = new SubscriptionHelperImpl();
Modified:
struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/user/UserHelperImpl.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/user/UserHelperImpl.java?rev=598465&r1=598464&r2=598465&view=diff
==============================================================================
---
struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/user/UserHelperImpl.java
(original)
+++
struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/user/UserHelperImpl.java
Mon Nov 26 15:46:16 2007
@@ -27,7 +27,7 @@
* Default JPA implementation of <code>UserHelper</code>.
* </p>
*/
[EMAIL PROTECTED](serviceName = "user.soap", endpointInterface =
"entity.user.UserHelper")
[EMAIL PROTECTED](serviceName = "user", endpointInterface =
"entity.user.UserHelper")
public class UserHelperImpl extends EntityHelper implements UserHelper {
public int count() throws PersistenceException {
Added: struts/sandbox/trunk/jpa-mailreader/src/main/java/log4j.properties
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/jpa-mailreader/src/main/java/log4j.properties?rev=598465&view=auto
==============================================================================
--- struts/sandbox/trunk/jpa-mailreader/src/main/java/log4j.properties (added)
+++ struts/sandbox/trunk/jpa-mailreader/src/main/java/log4j.properties Mon Nov
26 15:46:16 2007
@@ -0,0 +1,9 @@
+
+# -- production mode --
+
+log4j.rootLogger = error, stdout
+log4j.appender.stdout = org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.Threshold = error
+log4j.appender.stdout.Target = System.out
+log4j.appender.stdout.layout = org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern = %d{ISO8601} %-5p [%F:%L] :
%m%n
Added: struts/sandbox/trunk/jpa-mailreader/src/main/java/log4j.properties.txt
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/jpa-mailreader/src/main/java/log4j.properties.txt?rev=598465&view=auto
==============================================================================
--- struts/sandbox/trunk/jpa-mailreader/src/main/java/log4j.properties.txt
(added)
+++ struts/sandbox/trunk/jpa-mailreader/src/main/java/log4j.properties.txt Mon
Nov 26 15:46:16 2007
@@ -0,0 +1,35 @@
+# Levels: TRACE, DEBUG, INFO, WARN, ERROR and FATAL
+
+# -- production mode --
+
+log4j.rootLogger = ERROR, stdout
+
+log4j.appender.stdout = org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.Threshold = ERROR
+log4j.appender.stdout.Target = System.out
+log4j.appender.stdout.layout = org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern = %d{ISO8601} %-5p [%F:%L] :
%m%n
+
+
+# -- development mode (not all need be set individually) --
+
+log4j.rootLogger = INFO, stdout
+
+#log4j.category.catalia=INFO
+#log4j.category.com.opensymphony.sitemesh=DEBUG
+#log4j.category.org.apache=DEBUG
+#log4j.category.org.apache.struts2=DEBUG
+
+#log4j.logger.org.hibernate=DEBUG
+#log4j.logger.org.hibernate.SQL=DEBUG
+#log4j.logger.org.hibernate.type=DEBUG
+#log4j.logger.org.hibernate.tool.hbm2ddl=DEBUG
+#log4j.logger.org.hibernate.cache=DEBUG
+#log4j.logger.org.hibernate.transaction=DEBUG
+#log4j.logger.org.hibernate.jdbc=DEBUG
+
+log4j.appender.stdout = org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.Threshold = DEBUG
+log4j.appender.stdout.Target = System.out
+log4j.appender.stdout.layout = org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern = %d{ISO8601} %-5p [%F:%L] :
%m%n
