[jboss-svn-commits] JBL Code SVN: r9700 - in labs/jbosslabs/trunk/portal-extensions: forge-portlets/src/web/WEB-INF and 2 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Feb 22 10:24:31 EST 2007
Author: dejp
Date: 2007-02-22 10:24:31 -0500 (Thu, 22 Feb 2007)
New Revision: 9700
Modified:
labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/PrimaryNavigationFilter.java
labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/web/WEB-INF/portlet-instances.xml
labs/jbosslabs/trunk/portal-extensions/forge-primarynav/maven.xml
labs/jbosslabs/trunk/portal-extensions/portal-default/src/web/WEB-INF/default-object.xml
Log:
jboss projects page, cleaning
Modified: labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/PrimaryNavigationFilter.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/PrimaryNavigationFilter.java 2007-02-22 14:03:44 UTC (rev 9699)
+++ labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/PrimaryNavigationFilter.java 2007-02-22 15:24:31 UTC (rev 9700)
@@ -14,18 +14,24 @@
public class PrimaryNavigationFilter implements Filter {
+ private static final String[] pages = {"default", "knowledgebase",
+ "jbossprojects", "contribute", "myorg"};
+
+ private static final String PRIMARYNAV_CURR_PAGE = "primarynav_current_page";
+
public void destroy() {
}
public void doFilter(ServletRequest request, ServletResponse response,
FilterChain filterChain) throws IOException, ServletException {
-
+
if (request instanceof HttpServletRequest) {
HttpServletRequest httpReq = (HttpServletRequest) request;
- String url = httpReq.getRequestURI();
- httpReq.setAttribute(Constants.ATTR_URL, url);
+ String uri = httpReq.getRequestURI();
+
+ httpReq.setAttribute(PRIMARYNAV_CURR_PAGE, getSelectedPage(uri));
}
filterChain.doFilter(request, response);
@@ -35,4 +41,20 @@
}
+ public static String getSelectedPage(String requestURL) {
+ if (requestURL.startsWith(Constants.LINK_BASE + pages[4])) {
+ return pages[4];
+ } else if (requestURL.startsWith(Constants.LINK_BASE + pages[3])) {
+ return pages[3];
+ } else if (requestURL.startsWith(Constants.LINK_BASE + pages[2])) {
+ return pages[2];
+ } else if (requestURL.startsWith(Constants.LINK_BASE + pages[1])) {
+ return pages[1];
+ } else if (requestURL.startsWith(Constants.LINK_BASE)) {
+ return pages[0];
+ }
+
+ return null;
+ }
+
}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/web/WEB-INF/portlet-instances.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/web/WEB-INF/portlet-instances.xml 2007-02-22 14:03:44 UTC (rev 9699)
+++ labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/web/WEB-INF/portlet-instances.xml 2007-02-22 15:24:31 UTC (rev 9700)
@@ -51,10 +51,27 @@
</preferences>
</instance>
</deployment>
-
<deployment>
<if-exists>overwrite</if-exists>
<instance>
+ <instance-id>FreezoneJBossProjectsPageInstance</instance-id>
+ <portlet-ref>FreezonePortlet</portlet-ref>
+ <preferences>
+ <preference>
+ <name>projectId</name>
+ <value>default</value>
+ </preference>
+ <preference>
+ <name>page</name>
+ <value>projects_main.html</value>
+ </preference>
+ </preferences>
+ </instance>
+ </deployment>
+
+ <deployment>
+ <if-exists>overwrite</if-exists>
+ <instance>
<instance-id>PodcastPortletInstanceSmall</instance-id>
<portlet-ref>PodcastPortlet</portlet-ref>
<preferences>
Modified: labs/jbosslabs/trunk/portal-extensions/forge-primarynav/maven.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-primarynav/maven.xml 2007-02-22 14:03:44 UTC (rev 9699)
+++ labs/jbosslabs/trunk/portal-extensions/forge-primarynav/maven.xml 2007-02-22 15:24:31 UTC (rev 9700)
@@ -7,21 +7,19 @@
xmlns:u="jelly:util">
<goal name="all">
- <attainGoal name="prj-all" />
+ <!--attainGoal name="prj-all" /-->
</goal>
<goal name="build">
- <!--attainGoal name="prj-war-build" /-->
- <attainGoal name="jar" />
+ <!--attainGoal name="jar" />
<ant:copy todir="target/forge-primarynav/WEB-INF/lib"
file="target/forge-primarynav.jar" />
- <attainGoal name="war" />
+ <attainGoal name="war" /-->
</goal>
<goal name="deploy">
- <!--attainGoal name="prj-war-deploy" /-->
- <ant:copy todir="${local.deploy.dir}"
- file="target/forge-primarynav.war" />
+ <!--ant:copy todir="${local.deploy.dir}"
+ file="target/forge-primarynav.war" /-->
</goal>
<goal name="clean">
Modified: labs/jbosslabs/trunk/portal-extensions/portal-default/src/web/WEB-INF/default-object.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-default/src/web/WEB-INF/default-object.xml 2007-02-22 14:03:44 UTC (rev 9699)
+++ labs/jbosslabs/trunk/portal-extensions/portal-default/src/web/WEB-INF/default-object.xml 2007-02-22 15:24:31 UTC (rev 9700)
@@ -71,17 +71,6 @@
</property>
</properties>
- <window>
- <window-name>
- PrimaryNavigationPortletWindow
- </window-name>
- <instance-ref>
- PrimaryNavigationPortletInstance
- </instance-ref>
- <region>primarynav</region>
- <height>0</height>
- </window>
-
<window>
<window-name>FreezoneDefaultWindow</window-name>
<instance-ref>FreezoneDefaultPageInstance</instance-ref>
@@ -107,31 +96,6 @@
<page>
<page-name>knowledgebase</page-name>
- <window>
- <window-name>
- PrimaryNavigationPortletWindow
- </window-name>
- <instance-ref>
- PrimaryNavigationPortletInstance
- </instance-ref>
- <region>primarynav</region>
- <height>0</height>
-
- <properties>
- <property>
- <name>theme.windowRendererId</name>
- <value>emptyRenderer</value>
- </property>
- <property>
- <name>theme.decorationRendererId</name>
- <value>emptyRenderer</value>
- </property>
- <property>
- <name>theme.portletRendererId</name>
- <value>emptyRenderer</value>
- </property>
- </properties>
- </window>
</page>
</deployment>
@@ -141,31 +105,19 @@
<page>
<page-name>jbossprojects</page-name>
+ <properties>
+ <!-- Set the emptyRenderer for this page -->
+ <property>
+ <name>theme.renderSetId</name>
+ <value>emptyRenderer</value>
+ </property>
+ </properties>
<window>
- <window-name>
- PrimaryNavigationPortletWindow
- </window-name>
- <instance-ref>
- PrimaryNavigationPortletInstance
- </instance-ref>
- <region>primarynav</region>
+ <window-name>FreezoneJbossprojectsWindow</window-name>
+ <instance-ref>FreezoneJBossProjectsPageInstance</instance-ref>
+ <region>triple</region>
<height>0</height>
-
- <properties>
- <property>
- <name>theme.windowRendererId</name>
- <value>emptyRenderer</value>
- </property>
- <property>
- <name>theme.decorationRendererId</name>
- <value>emptyRenderer</value>
- </property>
- <property>
- <name>theme.portletRendererId</name>
- <value>emptyRenderer</value>
- </property>
- </properties>
</window>
</page>
</deployment>
@@ -176,31 +128,6 @@
<page>
<page-name>contribute</page-name>
- <window>
- <window-name>
- PrimaryNavigationPortletWindow
- </window-name>
- <instance-ref>
- PrimaryNavigationPortletInstance
- </instance-ref>
- <region>primarynav</region>
- <height>0</height>
-
- <properties>
- <property>
- <name>theme.windowRendererId</name>
- <value>emptyRenderer</value>
- </property>
- <property>
- <name>theme.decorationRendererId</name>
- <value>emptyRenderer</value>
- </property>
- <property>
- <name>theme.portletRendererId</name>
- <value>emptyRenderer</value>
- </property>
- </properties>
- </window>
</page>
</deployment>
@@ -239,43 +166,24 @@
<region>center</region>
<height>0</height>
</window>
- <window>
- <window-name>PrimaryNavigationPortletWindow</window-name>
- <instance-ref>PrimaryNavigationPortletInstance</instance-ref>
- <region>primarynav</region>
- <height>0</height>
- <properties>
- <property>
- <name>theme.windowRendererId</name>
- <value>emptyRenderer</value>
- </property>
- <property>
- <name>theme.decorationRendererId</name>
- <value>emptyRenderer</value>
- </property>
- <property>
- <name>theme.portletRendererId</name>
- <value>emptyRenderer</value>
- </property>
- </properties>
- </window>
</page>
</deployment>
<deployment>
<if-exists>overwrite</if-exists>
<parent-ref>default</parent-ref>
- <properties>
- <!-- Set the emptyRenderer for this page -->
- <property>
- <name>theme.renderSetId</name>
- <value>emptyRenderer</value>
- </property>
- </properties>
<page>
<!-- login page -->
<page-name>loginPage</page-name>
+ <properties>
+ <!-- Set the emptyRenderer for this page -->
+ <property>
+ <name>theme.renderSetId</name>
+ <value>emptyRenderer</value>
+ </property>
+ </properties>
+
<window>
<window-name>LoginWindow</window-name>
<instance-ref>LoginInstance</instance-ref>
@@ -290,6 +198,14 @@
<parent-ref>default</parent-ref>
<page>
<page-name>community</page-name>
+ <properties>
+ <!-- Set the emptyRenderer for this page -->
+ <property>
+ <name>theme.renderSetId</name>
+ <value>emptyRenderer</value>
+ </property>
+ </properties>
+
<window>
<window-name>
PrimatesPortletWindowDefaultCommunity
More information about the jboss-svn-commits
mailing list