You are viewing a plain text version of this content. The canonical link for it is here.
Posted to pluto-scm@portals.apache.org by dd...@apache.org on 2004/10/17 07:28:56 UTC
svn commit: rev 54952 - in portals/pluto/branches/pluto-1.1/portal/src: java/org/apache/pluto/driver/config webapp/WEB-INF webapp/WEB-INF/aggregation webapp/WEB-INF/config webapp/WEB-INF/data webapp/WEB-INF/fragments
Author: ddewolf
Date: Sat Oct 16 22:28:56 2004
New Revision: 54952
Removed:
portals/pluto/branches/pluto-1.1/portal/src/webapp/WEB-INF/aggregation/
portals/pluto/branches/pluto-1.1/portal/src/webapp/WEB-INF/config/
portals/pluto/branches/pluto-1.1/portal/src/webapp/WEB-INF/data/
Modified:
portals/pluto/branches/pluto-1.1/portal/src/java/org/apache/pluto/driver/config/PageConfig.java
portals/pluto/branches/pluto-1.1/portal/src/java/org/apache/pluto/driver/config/RenderConfig.java
portals/pluto/branches/pluto-1.1/portal/src/webapp/WEB-INF/fragments/template.jsp
portals/pluto/branches/pluto-1.1/portal/src/webapp/WEB-INF/pluto-portal-driver-config.xml
Log:
Cleaning Up Portal:
- Remove resources left over from Pluto 1.0.x
- Create About Pluto page in portal
- Properly order pages
Modified: portals/pluto/branches/pluto-1.1/portal/src/java/org/apache/pluto/driver/config/PageConfig.java
==============================================================================
--- portals/pluto/branches/pluto-1.1/portal/src/java/org/apache/pluto/driver/config/PageConfig.java (original)
+++ portals/pluto/branches/pluto-1.1/portal/src/java/org/apache/pluto/driver/config/PageConfig.java Sat Oct 16 22:28:56 2004
@@ -26,6 +26,7 @@
private String name;
private String uri;
private Collection portletIds;
+ private int orderNumber;
public PageConfig() {
this.portletIds = new ArrayList();
@@ -54,6 +55,14 @@
public void addPortlet(String contextPath, String portletName) {
portletIds.add(
PortletWindowConfig.createPortletId(contextPath, portletName));
+ }
+
+ void setOrderNumber(int number) {
+ this.orderNumber = number;
+ }
+
+ int getOrderNumber() {
+ return orderNumber;
}
}
Modified: portals/pluto/branches/pluto-1.1/portal/src/java/org/apache/pluto/driver/config/RenderConfig.java
==============================================================================
--- portals/pluto/branches/pluto-1.1/portal/src/java/org/apache/pluto/driver/config/RenderConfig.java (original)
+++ portals/pluto/branches/pluto-1.1/portal/src/java/org/apache/pluto/driver/config/RenderConfig.java Sat Oct 16 22:28:56 2004
@@ -17,6 +17,10 @@
import java.util.Collection;
import java.util.Map;
+import java.util.Collections;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Comparator;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -31,8 +35,31 @@
private Map pages;
private String defaultPageId;
+ // internally used.
+ private int orderNumberCounter = 0;
+ private Comparator pageComparator;
+
public RenderConfig() {
this.pages = new java.util.HashMap();
+ this.pageComparator = new Comparator() {
+ public int compare(Object a, Object b) {
+ PageConfig pa = (PageConfig)a;
+ PageConfig pb = (PageConfig)b;
+ if(pa.getOrderNumber() > pb.getOrderNumber()) {
+ return 1;
+ }
+ else if(pa.getOrderNumber() == pb.getOrderNumber()) {
+ return 0;
+ }
+ else {
+ return -1;
+ }
+ }
+
+ public boolean equals(Object a) {
+ return false;
+ }
+ };
}
@@ -45,7 +72,9 @@
}
public Collection getPages() {
- return pages.values();
+ List col = new ArrayList(pages.values());
+ Collections.sort(col, pageComparator);
+ return col;
}
public PageConfig getPageConfig(String pageId) {
@@ -61,6 +90,7 @@
}
public void addPage(PageConfig config) {
+ config.setOrderNumber(orderNumberCounter++);
pages.put(config.getName(), config);
}
Modified: portals/pluto/branches/pluto-1.1/portal/src/webapp/WEB-INF/fragments/template.jsp
==============================================================================
--- portals/pluto/branches/pluto-1.1/portal/src/webapp/WEB-INF/fragments/template.jsp (original)
+++ portals/pluto/branches/pluto-1.1/portal/src/webapp/WEB-INF/fragments/template.jsp Sat Oct 16 22:28:56 2004
@@ -36,7 +36,7 @@
<TR><TD>
<%-- This could be dynamic. At this point there's no need --%>
- <jsp:include page="/WEB-INF/fragments/portlet-page.jsp"/>
+ <jsp:include page='<%=(String)pageContext.findAttribute("include")%>'/>
</TD></TR>
</TABLE>
</BODY>
Modified: portals/pluto/branches/pluto-1.1/portal/src/webapp/WEB-INF/pluto-portal-driver-config.xml
==============================================================================
--- portals/pluto/branches/pluto-1.1/portal/src/webapp/WEB-INF/pluto-portal-driver-config.xml (original)
+++ portals/pluto/branches/pluto-1.1/portal/src/webapp/WEB-INF/pluto-portal-driver-config.xml Sat Oct 16 22:28:56 2004
@@ -24,13 +24,14 @@
</portlet-app>
<render-config default="Test Page">
- <page name="Test Page" uri="/WEB-INF/fragments/template.jsp">
+ <page name="Test Page" uri="/WEB-INF/fragments/portlet.jsp">
<portlet context="/testsuite" name="TestPortlet1"/>
<portlet context="/testsuite" name="TestPortlet2"/>
</page>
- <page name="Secondary Page" uri="/WEB-INF/fragments/template.jsp">
+ <page name="Secondary Page" uri="/WEB-INF/fragments/portlet.jsp">
<portlet context="/testsuite" name="TestPortlet1"/>
<portlet context="/testsuite" name="TestPortlet2"/>
</page>
+ <page name="About Pluto" uri="/WEB-INF/fragments/about.jsp"/>
</render-config>
</pluto-portal-driver>