From a5ac6b9c442aa687c152bea0cf7b2f2a8a28f295 Mon Sep 17 00:00:00 2001 From: Jeremie Panzer Date: Thu, 21 Mar 2013 08:55:53 +0100 Subject: [PATCH] fix log path and java warnings --- src/main/java/com/commafeed/backend/dao/GenericDAO.java | 2 ++ src/main/java/com/commafeed/frontend/CommaFeedSession.java | 1 + .../java/com/commafeed/frontend/components/CssTreeView.java | 1 + src/main/java/com/commafeed/frontend/pages/BasePage.java | 1 + .../java/com/commafeed/frontend/pages/feed/FeedViewPage.java | 1 + src/main/java/com/commafeed/frontend/pages/home/HomePage.java | 1 + .../frontend/references/csstree/CssTreeViewReference.java | 1 + src/main/java/com/commafeed/model/Feed.java | 1 + src/main/java/com/commafeed/model/FeedCategory.java | 1 + src/main/java/com/commafeed/model/FeedEntry.java | 1 + src/main/java/com/commafeed/model/FeedEntryStatus.java | 1 + src/main/java/com/commafeed/model/FeedSubscription.java | 1 + src/main/java/com/commafeed/model/User.java | 1 + src/main/resources/log4j.properties | 2 +- 14 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/commafeed/backend/dao/GenericDAO.java b/src/main/java/com/commafeed/backend/dao/GenericDAO.java index f08fa34e..098f4dab 100644 --- a/src/main/java/com/commafeed/backend/dao/GenericDAO.java +++ b/src/main/java/com/commafeed/backend/dao/GenericDAO.java @@ -13,6 +13,8 @@ import com.google.common.reflect.TypeToken; import com.uaihebert.factory.EasyCriteriaFactory; import com.uaihebert.model.EasyCriteria; + +@SuppressWarnings("serial") public abstract class GenericDAO { private TypeToken type = new TypeToken(getClass()) { diff --git a/src/main/java/com/commafeed/frontend/CommaFeedSession.java b/src/main/java/com/commafeed/frontend/CommaFeedSession.java index c27f5d47..d2ae7d68 100644 --- a/src/main/java/com/commafeed/frontend/CommaFeedSession.java +++ b/src/main/java/com/commafeed/frontend/CommaFeedSession.java @@ -11,6 +11,7 @@ import com.commafeed.backend.dao.UserService; import com.commafeed.frontend.components.auth.Role; import com.commafeed.model.User; +@SuppressWarnings("serial") public class CommaFeedSession extends AuthenticatedWebSession { @Inject diff --git a/src/main/java/com/commafeed/frontend/components/CssTreeView.java b/src/main/java/com/commafeed/frontend/components/CssTreeView.java index 7ab99a92..af649910 100644 --- a/src/main/java/com/commafeed/frontend/components/CssTreeView.java +++ b/src/main/java/com/commafeed/frontend/components/CssTreeView.java @@ -16,6 +16,7 @@ import org.apache.wicket.model.IModel; import com.commafeed.frontend.references.csstree.CssTreeViewReference; +@SuppressWarnings("serial") public abstract class CssTreeView extends Panel { private ITreeProvider provider; diff --git a/src/main/java/com/commafeed/frontend/pages/BasePage.java b/src/main/java/com/commafeed/frontend/pages/BasePage.java index 2648f8f5..78fe5dd9 100644 --- a/src/main/java/com/commafeed/frontend/pages/BasePage.java +++ b/src/main/java/com/commafeed/frontend/pages/BasePage.java @@ -9,6 +9,7 @@ import com.commafeed.frontend.components.auth.Role; import de.agilecoders.wicket.Bootstrap; @AuthorizeInstantiation(Role.USER) +@SuppressWarnings("serial") public abstract class BasePage extends WebPage { @Override diff --git a/src/main/java/com/commafeed/frontend/pages/feed/FeedViewPage.java b/src/main/java/com/commafeed/frontend/pages/feed/FeedViewPage.java index 907c03a1..d09d6025 100644 --- a/src/main/java/com/commafeed/frontend/pages/feed/FeedViewPage.java +++ b/src/main/java/com/commafeed/frontend/pages/feed/FeedViewPage.java @@ -25,6 +25,7 @@ import com.google.common.base.Predicate; import com.google.common.collect.Collections2; import com.google.common.collect.Lists; +@SuppressWarnings("serial") public class FeedViewPage extends BasePage { @Inject diff --git a/src/main/java/com/commafeed/frontend/pages/home/HomePage.java b/src/main/java/com/commafeed/frontend/pages/home/HomePage.java index 01f4a3ac..35091a60 100644 --- a/src/main/java/com/commafeed/frontend/pages/home/HomePage.java +++ b/src/main/java/com/commafeed/frontend/pages/home/HomePage.java @@ -2,6 +2,7 @@ package com.commafeed.frontend.pages.home; import com.commafeed.frontend.pages.BasePage; +@SuppressWarnings("serial") public class HomePage extends BasePage { } diff --git a/src/main/java/com/commafeed/frontend/references/csstree/CssTreeViewReference.java b/src/main/java/com/commafeed/frontend/references/csstree/CssTreeViewReference.java index 1d1089b3..563f0fcf 100644 --- a/src/main/java/com/commafeed/frontend/references/csstree/CssTreeViewReference.java +++ b/src/main/java/com/commafeed/frontend/references/csstree/CssTreeViewReference.java @@ -8,6 +8,7 @@ import org.apache.wicket.request.resource.CssResourceReference; * http://experiments.wemakesites.net/css3-treeview.html * */ +@SuppressWarnings("serial") public class CssTreeViewReference extends CssResourceReference { private static CssTreeViewReference instance = new CssTreeViewReference(); diff --git a/src/main/java/com/commafeed/model/Feed.java b/src/main/java/com/commafeed/model/Feed.java index 00cfd6a5..9aa9dab4 100644 --- a/src/main/java/com/commafeed/model/Feed.java +++ b/src/main/java/com/commafeed/model/Feed.java @@ -17,6 +17,7 @@ import com.google.common.collect.Sets; @Entity @Table(name = "FEEDS") +@SuppressWarnings("serial") public class Feed implements Serializable { @Id diff --git a/src/main/java/com/commafeed/model/FeedCategory.java b/src/main/java/com/commafeed/model/FeedCategory.java index 2ffe9375..b680baad 100644 --- a/src/main/java/com/commafeed/model/FeedCategory.java +++ b/src/main/java/com/commafeed/model/FeedCategory.java @@ -17,6 +17,7 @@ import com.google.common.collect.Sets; @Entity @Table(name = "FEEDCATEGORIES") +@SuppressWarnings("serial") public class FeedCategory implements Serializable { @Id diff --git a/src/main/java/com/commafeed/model/FeedEntry.java b/src/main/java/com/commafeed/model/FeedEntry.java index 9847c6a7..9d5e5f5b 100644 --- a/src/main/java/com/commafeed/model/FeedEntry.java +++ b/src/main/java/com/commafeed/model/FeedEntry.java @@ -14,6 +14,7 @@ import javax.persistence.TemporalType; @Entity @Table(name = "FEEDENTRIES") +@SuppressWarnings("serial") public class FeedEntry implements Serializable { @Id diff --git a/src/main/java/com/commafeed/model/FeedEntryStatus.java b/src/main/java/com/commafeed/model/FeedEntryStatus.java index c8b23953..dd359517 100644 --- a/src/main/java/com/commafeed/model/FeedEntryStatus.java +++ b/src/main/java/com/commafeed/model/FeedEntryStatus.java @@ -12,6 +12,7 @@ import javax.persistence.Table; @Entity @Table(name = "FEEDENTRYSTATUSES") +@SuppressWarnings("serial") public class FeedEntryStatus implements Serializable { @Id diff --git a/src/main/java/com/commafeed/model/FeedSubscription.java b/src/main/java/com/commafeed/model/FeedSubscription.java index da34af51..9a764d02 100644 --- a/src/main/java/com/commafeed/model/FeedSubscription.java +++ b/src/main/java/com/commafeed/model/FeedSubscription.java @@ -12,6 +12,7 @@ import javax.persistence.Table; @Entity @Table(name = "FEEDSUBSCRIPTIONS") +@SuppressWarnings("serial") public class FeedSubscription implements Serializable { @Id diff --git a/src/main/java/com/commafeed/model/User.java b/src/main/java/com/commafeed/model/User.java index 200d0eee..79591090 100644 --- a/src/main/java/com/commafeed/model/User.java +++ b/src/main/java/com/commafeed/model/User.java @@ -11,6 +11,7 @@ import javax.persistence.Table; @Entity @Table(name = "USERS") +@SuppressWarnings("serial") public class User implements Serializable { @Id diff --git a/src/main/resources/log4j.properties b/src/main/resources/log4j.properties index 64a13528..d1ca2358 100644 --- a/src/main/resources/log4j.properties +++ b/src/main/resources/log4j.properties @@ -8,7 +8,7 @@ log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout log4j.appender.CONSOLE.layout.ConversionPattern=%-5p %d{ISO8601} [%c{1}\:%L] %m%n log4j.appender.FILE=org.apache.log4j.RollingFileAppender -log4j.appender.FILE.File=${env.OPENSHIFT_LOG_DIR}commafeed.log +log4j.appender.FILE.File=${env.OPENSHIFT_JBOSSEAP_LOG_DIR}commafeed.log log4j.appender.FILE.layout=org.apache.log4j.PatternLayout log4j.appender.FILE.layout.ConversionPattern=%-5p %d{ISO8601} [%c{1}\:%L/%t] %m%n log4j.appender.FILE.MaxFileSize=100KB