Menu
▾
▴
[Jboss-svn-commits] JBL Code SVN: r1505 - in trunk/forge/portal-extensions: forge-blog/src/java/org/jboss/portlet/blog forge-blog/src/web/WEB-INF forge-contributor/src/java/org/jboss/forge/contributor forge-feeds/src/java/org/jboss/forge/feeds
Author: adamw Date: 2005-11-04 04:56:16 -0500 (Fri, 04 Nov 2005) New Revision: 1505 Modified: trunk/forge/portal-extensions/forge-blog/src/java/org/jboss/portlet/blog/BlogPortlet.java trunk/forge/portal-extensions/forge-blog/src/web/WEB-INF/portlet.xml trunk/forge/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConTools.java trunk/forge/portal-extensions/forge-feeds/src/java/org/jboss/forge/feeds/InformaBasedFeed.java trunk/forge/portal-extensions/forge-feeds/src/java/org/jboss/forge/feeds/RomeBasedFeed.java Log: http://jira.jboss.com/jira/browse/JBLAB-405 : done Modified: trunk/forge/portal-extensions/forge-blog/src/java/org/jboss/portlet/blog/BlogPortlet.java =================================================================== --- trunk/forge/portal-extensions/forge-blog/src/java/org/jboss/portlet/blog/BlogPortlet.java 2005-11-03 22:53:43 UTC (rev 1504) +++ trunk/forge/portal-extensions/forge-blog/src/java/org/jboss/portlet/blog/BlogPortlet.java 2005-11-04 09:56:16 UTC (rev 1505) @@ -82,12 +82,15 @@ response.setContentType("text/html"); PortalContext portalCtx = request.getPortalContext(); + PortletConfig pConfig = getPortletConfig(); - String projectId = ProjectsHelper.getSelectedProjectId(request, true); + String projectId = ProjectsHelper.getSelectedProjectId(request, false); + if (projectId == null) + projectId = pConfig.getInitParameter("defaultFeed"); + String portalName = ForgeHelper.getPortalName(request); // Getting the number of headers and entries to display - PortletConfig pConfig = getPortletConfig(); int headersNormal = Integer.valueOf( pConfig.getInitParameter("headersNormal")).intValue(); int headersMaximized = Integer.valueOf( Modified: trunk/forge/portal-extensions/forge-blog/src/web/WEB-INF/portlet.xml =================================================================== --- trunk/forge/portal-extensions/forge-blog/src/web/WEB-INF/portlet.xml 2005-11-03 22:53:43 UTC (rev 1504) +++ trunk/forge/portal-extensions/forge-blog/src/web/WEB-INF/portlet.xml 2005-11-04 09:56:16 UTC (rev 1505) @@ -29,13 +29,18 @@ <init-param> <description>Address of the blog's local feed.</description> <name>feedAddress</name> - <value>${scheme.name}://${host.address}:${host.port}/blojsom/blog/${project.name}/?flavor=${feed.type}</value> + <value>${scheme.name}://${host.address}:${host.port}/feeds/${project.name}/${feed.type}</value> </init-param> <init-param> <description>Address of the blog's remote feed.</description> <name>remoteFeedAddress</name> - <value>${scheme.name}://${host.address}:${host.port}/blojsom/blog/${project.name}/?flavor=${feed.type}</value> + <value>${scheme.name}://${host.address}:${host.port}/feeds/${project.name}/${feed.type}</value> </init-param> + <init-param> + <description>Default feed to display.</description> + <name>defaultFeed</name> + <value>all</value> + </init-param> <portlet-info> <title>JBoss Blog Portlet</title> </portlet-info> Modified: trunk/forge/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConTools.java =================================================================== --- trunk/forge/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConTools.java 2005-11-03 22:53:43 UTC (rev 1504) +++ trunk/forge/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConTools.java 2005-11-04 09:56:16 UTC (rev 1505) @@ -25,6 +25,7 @@ import javax.faces.context.FacesContext; import javax.portlet.PortletURL; +import org.jboss.forge.common.ForgeHelper; import org.jboss.portlet.JBossActionRequest; import org.jboss.portlet.JBossActionResponse; import org.jboss.portlet.JBossRenderRequest; @@ -63,21 +64,12 @@ } static String getBaseServerAddress() { - int port; - String server; - String scheme; Object request = getExternalContext().getRequest(); if (request instanceof JBossActionRequest) { - scheme = ((JBossActionRequest) request).getScheme(); - port = ((JBossActionRequest) request).getServerPort(); - server = ((JBossActionRequest) request).getServerName(); + return ForgeHelper.getBaseServerAddress((JBossActionRequest) request); } else if (request instanceof JBossRenderRequest) { - scheme = ((JBossRenderRequest) request).getScheme(); - port = ((JBossRenderRequest) request).getServerPort(); - server = ((JBossRenderRequest) request).getServerName(); + return ForgeHelper.getBaseServerAddress((JBossRenderRequest) request); } else return ""; - - return scheme + "://" + server + ":" + port; } static String getPortalName() { Modified: trunk/forge/portal-extensions/forge-feeds/src/java/org/jboss/forge/feeds/InformaBasedFeed.java =================================================================== --- trunk/forge/portal-extensions/forge-feeds/src/java/org/jboss/forge/feeds/InformaBasedFeed.java 2005-11-03 22:53:43 UTC (rev 1504) +++ trunk/forge/portal-extensions/forge-feeds/src/java/org/jboss/forge/feeds/InformaBasedFeed.java 2005-11-04 09:56:16 UTC (rev 1505) @@ -3,8 +3,11 @@ import java.io.File; import java.io.IOException; import java.net.URL; +import java.util.ArrayList; import java.util.Calendar; +import java.util.Collections; import java.util.Iterator; +import java.util.List; import de.nava.informa.core.ChannelExporterIF; import de.nava.informa.core.ChannelIF; @@ -12,6 +15,7 @@ import de.nava.informa.core.ParseException; import de.nava.informa.impl.basic.ChannelBuilder; import de.nava.informa.parsers.FeedParser; +import de.nava.informa.utils.ItemComparator; public abstract class InformaBasedFeed extends FileBasedFeed { public InformaBasedFeed(File file) { @@ -33,6 +37,8 @@ newChannel.setLocation(new URL(link)); newChannel.setPubDate(Calendar.getInstance().getTime()); + List<ItemIF> newItems = new ArrayList<ItemIF>(); + for (Feed feed : feeds) { ChannelIF childChannel; try { @@ -42,10 +48,18 @@ } for (Iterator iter = childChannel.getItems().iterator(); iter.hasNext();) { - newChannel.addItem((ItemIF) iter.next()); + ItemIF nextItem = (ItemIF) iter.next(); + nextItem.setCreator(childChannel.getCreator()); + newItems.add(nextItem); } } + Collections.sort(newItems, new ItemComparator(true)); + + for (ItemIF newItem : newItems) { + newChannel.addItem(newItem); + } + getExporter().write(newChannel); } } Modified: trunk/forge/portal-extensions/forge-feeds/src/java/org/jboss/forge/feeds/RomeBasedFeed.java =================================================================== --- trunk/forge/portal-extensions/forge-feeds/src/java/org/jboss/forge/feeds/RomeBasedFeed.java 2005-11-03 22:53:43 UTC (rev 1504) +++ trunk/forge/portal-extensions/forge-feeds/src/java/org/jboss/forge/feeds/RomeBasedFeed.java 2005-11-04 09:56:16 UTC (rev 1505) @@ -79,8 +79,6 @@ entry.setAuthor(inFeed.getAuthor()); entries.add(entry); } - - inFeed.setAuthor(null); } } |
