Merge branch 'master' of github.com:caelum/guj.com.br

.settings/org.eclipse.core.resources.prefs

@@ -1,12 +1,3 @@
 eclipse.preferences.version=1
 encoding//webapp/stylesheets/guj3.css=UTF-8
-encoding//webapp/templates/default/admin/admin_index.htm=UTF-8
-encoding//webapp/templates/default/admin/admin_welcome.htm=UTF-8
-encoding//webapp/templates/default/bookmark_insert.htm=UTF-8
-encoding//webapp/templates/default/bottom.htm=ISO-8859-1
-encoding//webapp/templates/default/header.htm=ISO-8859-1
-encoding//webapp/templates/default/install.htm=UTF-8
-encoding//webapp/templates/default/install_check_info.htm=UTF-8
-encoding//webapp/templates/default/install_error.htm=UTF-8
-encoding//webapp/templates/default/install_finished.htm=UTF-8
-encoding//webapp/templates/default/pm_finduser.htm=UTF-8
+encoding//webapp/templates/default/header.htm=utf-8

resources/guj.properties

@@ -18,11 +18,16 @@ jobs.refresh.interval = 60
 jobs.items = 50
 jobs.url = http://ondetrabalhar.com/vagas.rss
 
-# Brutal
+# Brutal - Questions
 brutal.refresh.interval = 60
 brutal.items = 9
 brutal.url = http://www.guj.com.br/rss
 
+# Brutal - News
+brutal_news.refresh.interval = 60
+brutal_news.items = 5
+brutal_news.url = http://www.guj.com.br/noticias/rss
+
 
 posts.home.items = 10
 article.home.items = 8

src/br/com/caelum/guj/Agregators.java

@@ -1,7 +1,13 @@
 package br.com.caelum.guj;
 
+import java.util.HashMap;
+import java.util.Map.Entry;
+import java.util.Set;
+
 import javax.annotation.PostConstruct;
 
+import freemarker.template.SimpleHash;
+
 import br.com.caelum.guj.feeds.Agregator;
 import br.com.caelum.guj.feeds.JobsAgregator;
 import br.com.caelum.vraptor.Result;
@@ -11,28 +17,38 @@
 @Component
 @ApplicationScoped
 public class Agregators {
-	private Agregator forumAgregator;
-	private Agregator newsAgregator;
-	private Agregator infoqAgregator;
-	private Agregator brutalAgregator;
+	private HashMap<String, Agregator> agregatorsMap = new HashMap<String, Agregator>();
+	private static Agregators instance;
 
 	@PostConstruct
 	public void init() {
 		Config.loadConfigs();
 
-		this.forumAgregator = new Agregator("forum.refresh.interval", "forum.items", "forum.url");
-		this.newsAgregator = new Agregator("news.refresh.interval", "news.items", "news.url");
-		this.infoqAgregator = new Agregator("infoq.refresh.interval", "infoq.items", "infoq.url");
-		this.brutalAgregator = new Agregator("brutal.refresh.interval", "brutal.items", "brutal.url");
-
-		JobsAgregator.start();
+		agregatorsMap.put("infoq", new Agregator("infoq.refresh.interval", "infoq.items", "infoq.url"));
+		agregatorsMap.put("forum", new Agregator("forum.refresh.interval", "forum.items", "forum.url"));
+		agregatorsMap.put("news", new Agregator("news.refresh.interval", "news.items", "news.url"));
+		agregatorsMap.put("brutalQuestions", new Agregator("brutal.refresh.interval", "brutal.items", "brutal.url"));
+		agregatorsMap.put("brutalNews", new Agregator("brutal_news.refresh.interval", "brutal_news.items", "brutal_news.url"));
+		agregatorsMap.put("jobs", JobsAgregator.start());
+
+		instance = this;
+	}
+
+	public static Agregators getInstance(){
+		return instance;
 	}
 
 	public void addAggregators(Result result) {
-		result.include("infoq", this.infoqAgregator.getItems());
-		result.include("news", this.newsAgregator.getItems());
-		result.include("forum", this.forumAgregator.getItems());
-		result.include("brutalQuestions", this.brutalAgregator.getItems());
-		result.include("jobs", JobsAgregator.getItems());
+		Set<Entry<String, Agregator>> entrySet = agregatorsMap.entrySet();
+		for (Entry<String, Agregator> entry : entrySet) {
+			result.include(entry.getKey(), entry.getValue().getItems());
+		}
+	}
+
+	public void addAggregators(SimpleHash context) {
+		Set<Entry<String, Agregator>> entrySet = agregatorsMap.entrySet();
+		for (Entry<String, Agregator> entry : entrySet) {
+			context.put(entry.getKey(), entry.getValue().getItems());
+		}
 	}
 }

src/br/com/caelum/guj/feeds/JobsAgregator.java

@@ -7,8 +7,9 @@
 public class JobsAgregator {
 	private static Agregator agregator;
 
-	public static void start() {
+	public static Agregator start() {
 		agregator = new Agregator("jobs.refresh.interval", "jobs.items", "jobs.url");
+		return agregator;
 	}
 
 	public static List<ItemIF> getItems() {

src/net/jforum/ControllerUtils.java

@@ -49,6 +49,8 @@
 
 import org.apache.log4j.Logger;
 
+import br.com.caelum.guj.Agregators;
+
 import net.jforum.context.ForumContext;
 import net.jforum.context.RequestContext;
 import net.jforum.context.SessionContext;
@@ -111,6 +113,8 @@ public void prepareTemplateContext(SimpleHash context, ForumContext jforumContex
 		context.put("canAccessModerationLog", SecurityRepository.canAccess(SecurityConstants.PERM_MODERATION_LOG));
 		context.put("JForumContext", jforumContext);
 		context.put("timestamp", new Long(System.currentTimeMillis()));
+		Agregators.getInstance().addAggregators(context);
+
 	}
 
 	/**

src/net/jforum/view/forum/ForumAction.java

@@ -148,6 +148,7 @@ public void list()
 		}
 
 		this.context.put("mostUsersEverOnline", mostUsersEverOnline);
+
 	}
 
 	public void moderation()