[jboss-svn-commits] JBL Code SVN: r10267 - in labs/jbosslabs/trunk/portal-extensions: forge-portlets and 3 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Mar 16 11:39:10 EDT 2007
Author: dejp
Date: 2007-03-16 11:39:10 -0400 (Fri, 16 Mar 2007)
New Revision: 10267
Modified:
labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/PrimaryNavigationFilter.java
labs/jbosslabs/trunk/portal-extensions/forge-portlets/project.xml
labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/web/WEB-INF/portlet-instances.xml
labs/jbosslabs/trunk/portal-extensions/forge-theme/jbossForgeLayout.war/WEB-INF/portal-layouts.xml
labs/jbosslabs/trunk/portal-extensions/portal-default/src/web/WEB-INF/default-object.xml
Log:
theme update
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-03-16 15:13:18 UTC (rev 10266)
+++ labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/PrimaryNavigationFilter.java 2007-03-16 15:39:10 UTC (rev 10267)
@@ -11,14 +11,25 @@
import javax.servlet.http.HttpServletRequest;
import org.jboss.forge.common.Constants;
+import org.jboss.forge.common.ForgeHelper;
+import org.jboss.forge.common.projects.ProjectsHelper;
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";
+ private static final String RESOURCES_PAGE = "resources";
+
+ private static final String PROJECTS_PAGE = "projects";
+
+ private static final String COMMUNITY_PAGE = "community";
+
+ private static final String MYORG_PAGE = "myorg";
+
+ private static final String WIKI_PAGE = "labswiki";
+
+ private static final String FORUMS_PAGE = "forums";
+
public void destroy() {
}
@@ -29,9 +40,7 @@
if (request instanceof HttpServletRequest) {
HttpServletRequest httpReq = (HttpServletRequest) request;
- String uri = httpReq.getRequestURI();
-
- httpReq.setAttribute(PRIMARYNAV_CURR_PAGE, getSelectedPage(uri));
+ httpReq.setAttribute(PRIMARYNAV_CURR_PAGE, getSelectedPage(httpReq));
}
filterChain.doFilter(request, response);
@@ -41,17 +50,19 @@
}
- 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];
+ public static String getSelectedPage(HttpServletRequest request) {
+ String requestURL = request.getRequestURI();
+
+ if (requestURL.contains(Constants.LINK_BASE + MYORG_PAGE)) {
+ return MYORG_PAGE;
+ } else if (requestURL.contains(Constants.LINK_BASE + COMMUNITY_PAGE)) {
+ return COMMUNITY_PAGE;
+ } else if (requestURL.contains(Constants.LINK_BASE + PROJECTS_PAGE)) {
+ return PROJECTS_PAGE;
+ } else if (requestURL.contains(Constants.LINK_BASE + RESOURCES_PAGE) ||
+ requestURL.contains(Constants.LINK_BASE + WIKI_PAGE) ||
+ requestURL.contains(Constants.LINK_BASE + FORUMS_PAGE)) {
+ return RESOURCES_PAGE;
}
return null;
Modified: labs/jbosslabs/trunk/portal-extensions/forge-portlets/project.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-portlets/project.xml 2007-03-16 15:13:18 UTC (rev 10266)
+++ labs/jbosslabs/trunk/portal-extensions/forge-portlets/project.xml 2007-03-16 15:39:10 UTC (rev 10267)
@@ -73,5 +73,10 @@
<version>0.6.5</version>
<jar>informa.jar</jar>
</dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.6.2</version>
+ </dependency>
</dependencies>
</project>
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-03-16 15:13:18 UTC (rev 10266)
+++ labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/web/WEB-INF/portlet-instances.xml 2007-03-16 15:39:10 UTC (rev 10267)
@@ -54,7 +54,7 @@
<deployment>
<if-exists>overwrite</if-exists>
<instance>
- <instance-id>FreezoneJBossProjectsPageInstance</instance-id>
+ <instance-id>FreezoneProjectsPageInstance</instance-id>
<portlet-ref>FreezonePortlet</portlet-ref>
<preferences>
<preference>
Modified: labs/jbosslabs/trunk/portal-extensions/forge-theme/jbossForgeLayout.war/WEB-INF/portal-layouts.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-theme/jbossForgeLayout.war/WEB-INF/portal-layouts.xml 2007-03-16 15:13:18 UTC (rev 10266)
+++ labs/jbosslabs/trunk/portal-extensions/forge-theme/jbossForgeLayout.war/WEB-INF/portal-layouts.xml 2007-03-16 15:39:10 UTC (rev 10267)
@@ -35,6 +35,7 @@
<uri>/layouts/org/project_details.jsp</uri>
<uri state="maximized">/layouts/org/project_details.jsp</uri>
<regions>
+ <region name="triple" />
<region name="left" />
<region name="center" />
<region name="innerleft" />
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-03-16 15:13:18 UTC (rev 10266)
+++ labs/jbosslabs/trunk/portal-extensions/portal-default/src/web/WEB-INF/default-object.xml 2007-03-16 15:39:10 UTC (rev 10267)
@@ -71,14 +71,16 @@
</property>
</properties>
- <window>
+ <window>
<window-name>FreezoneDefaultWindow</window-name>
- <instance-ref>FreezoneDefaultPageInstance</instance-ref>
+ <instance-ref>
+ FreezoneDefaultPageInstance
+ </instance-ref>
<region>left</region>
<height>0</height>
</window>
- <window>
+ <window>
<window-name>PodcastPortletWindow</window-name>
<instance-ref>
PodcastPortletInstanceSmall
@@ -94,7 +96,7 @@
<if-exists>overwrite</if-exists>
<parent-ref>default</parent-ref>
<page>
- <page-name>knowledgebase</page-name>
+ <page-name>resources</page-name>
</page>
</deployment>
@@ -102,9 +104,9 @@
<deployment>
<if-exists>overwrite</if-exists>
<parent-ref>default</parent-ref>
-
+
<page>
- <page-name>jbossprojects</page-name>
+ <page-name>projects</page-name>
<properties>
<!-- Set the emptyRenderer for this page -->
<property>
@@ -114,8 +116,10 @@
</properties>
<window>
- <window-name>FreezoneJbossprojectsWindow</window-name>
- <instance-ref>FreezoneJBossProjectsPageInstance</instance-ref>
+ <window-name>FreezoneProjectsWindow</window-name>
+ <instance-ref>
+ FreezoneProjectsPageInstance
+ </instance-ref>
<region>triple</region>
<height>0</height>
</window>
@@ -126,7 +130,7 @@
<if-exists>overwrite</if-exists>
<parent-ref>default</parent-ref>
<page>
- <page-name>contribute</page-name>
+ <page-name>community</page-name>
</page>
</deployment>
@@ -138,10 +142,10 @@
<page-name>myorg</page-name>
<properties>
<property>
- <name>dashboard</name>
- <value>true</value>
- </property>
- <!-- Set the layout for the default portal, see also portal-layouts.xml. -->
+ <name>dashboard</name>
+ <value>true</value>
+ </property>
+ <!-- Set the layout for the default portal, see also portal-layouts.xml. -->
<property>
<name>layout.id</name>
<value>org</value>
@@ -153,7 +157,7 @@
<value>org</value>
</property>
</properties>
-
+
<window>
<window-name>WikiPortletWindow</window-name>
<instance-ref>WikiPortletInstanceMyORG</instance-ref>
@@ -161,69 +165,38 @@
<height>0</height>
</window>
<window>
- <window-name>LoginWindow</window-name>
- <instance-ref>LoginInstance</instance-ref>
- <region>center</region>
- <height>0</height>
- </window>
+ <window-name>LoginWindow</window-name>
+ <instance-ref>LoginInstance</instance-ref>
+ <region>center</region>
+ <height>0</height>
+ </window>
</page>
</deployment>
- <deployment>
- <if-exists>overwrite</if-exists>
- <parent-ref>default</parent-ref>
-
- <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>
- <region>center</region>
- <height>0</height>
- </window>
- </page>
- </deployment>
-
<deployment>
<if-exists>overwrite</if-exists>
<parent-ref>default</parent-ref>
+
<page>
- <page-name>community</page-name>
+ <!-- login page -->
+ <page-name>loginPage</page-name>
<properties>
<!-- Set the emptyRenderer for this page -->
<property>
<name>theme.renderSetId</name>
<value>emptyRenderer</value>
</property>
- </properties>
-
+ </properties>
+
<window>
- <window-name>
- PrimatesPortletWindowDefaultCommunity
- </window-name>
- <instance-ref>PrimatesPortletAllInstance</instance-ref>
- <region>triple</region>
- <height>1</height>
+ <window-name>LoginWindow</window-name>
+ <instance-ref>LoginInstance</instance-ref>
+ <region>center</region>
+ <height>0</height>
</window>
- <!--window>
- <window-name>
- PollsPortletWindowDefaultRandom
- </window-name>
- <instance-ref>PollsPortletInstanceRandom</instance-ref>
- <region>left</region>
- <height>2</height>
- </window-->
</page>
</deployment>
+
<deployment>
<if-exists>overwrite</if-exists>
<parent-ref>default</parent-ref>
@@ -237,6 +210,7 @@
</window>
</page>
</deployment>
+
<deployment>
<if-exists>overwrite</if-exists>
<parent-ref>default</parent-ref>
@@ -250,6 +224,7 @@
</window>
</page>
</deployment>
+
<deployment>
<if-exists>overwrite</if-exists>
<parent-ref>default</parent-ref>
@@ -271,143 +246,143 @@
<page>
<page-name>admin</page-name>
<window>
- <window-name>AdminPortletWindow</window-name>
- <instance-ref>AdminPortletInstance</instance-ref>
- <region>center</region>
- <height>0</height>
- </window>
- <window>
- <window-name>CatalogPortletWindow</window-name>
- <instance-ref>CatalogPortletInstance</instance-ref>
- <region>left</region>
- <height>0</height>
- </window>
- <window>
- <window-name>UserPortletWindow</window-name>
- <instance-ref>UserPortletInstance</instance-ref>
- <region>center</region>
- <height>0</height>
- </window>
- <window>
- <window-name>RolePortletWindow</window-name>
- <instance-ref>RolePortletInstance</instance-ref>
- <region>left</region>
- <height>0</height>
- </window>
+ <window-name>AdminPortletWindow</window-name>
+ <instance-ref>AdminPortletInstance</instance-ref>
+ <region>center</region>
+ <height>0</height>
+ </window>
+ <window>
+ <window-name>CatalogPortletWindow</window-name>
+ <instance-ref>CatalogPortletInstance</instance-ref>
+ <region>left</region>
+ <height>0</height>
+ </window>
+ <window>
+ <window-name>UserPortletWindow</window-name>
+ <instance-ref>UserPortletInstance</instance-ref>
+ <region>center</region>
+ <height>0</height>
+ </window>
+ <window>
+ <window-name>RolePortletWindow</window-name>
+ <instance-ref>RolePortletInstance</instance-ref>
+ <region>left</region>
+ <height>0</height>
+ </window>
<security-constraint>
- <policy-permission>
- <action-name>viewrecursive</action-name>
- <role-name>Admin</role-name>
- </policy-permission>
- </security-constraint>
+ <policy-permission>
+ <action-name>viewrecursive</action-name>
+ <role-name>Admin</role-name>
+ </policy-permission>
+ </security-constraint>
</page>
</deployment>
<!-- <deployment>
- <parent-ref/>
- <if-exists>keep</if-exists>
- <portal>
- <portal-name>admin</portal-name>
- <supported-modes>
- <mode>view</mode>
- <mode>edit</mode>
- <mode>help</mode>
- </supported-modes>
- <supported-window-states>
- <window-state>normal</window-state>
- <window-state>minimized</window-state>
- <window-state>maximized</window-state>
- </supported-window-states>
- <properties>
-
- <property>
- <name>layout.id</name>
- <value>generic</value>
- </property>
-
- <property>
- <name>theme.id</name>
- <value>renaissance</value>
- </property>
-
- <property>
- <name>theme.renderSetId</name>
- <value>divRenderer</value>
- </property>
-
- <property>
- <name>layout.strategyId</name>
- <value>maximizedRegion</value>
- </property>
-
- <property>
- <name>portal.defaultObjectName</name>
- <value>default</value>
- </property>
- </properties>
- <security-constraint>
- <policy-permission>
- <action-name>viewrecursive</action-name>
- <role-name>Admin</role-name>
- </policy-permission>
- </security-constraint>
- <page>
- <page-name>default</page-name>
- <window>
- <window-name>AdminPortletWindow</window-name>
- <instance-ref>AdminPortletInstance</instance-ref>
- <region>center</region>
- <height>0</height>
- </window>
- <window>
- <window-name>CatalogPortletWindow</window-name>
- <instance-ref>CatalogPortletInstance</instance-ref>
- <region>left</region>
- <height>0</height>
- </window>
- </page>
- <page>
- <page-name>Members</page-name>
- <window>
- <window-name>UserPortletWindow</window-name>
- <instance-ref>UserPortletInstance</instance-ref>
- <region>center</region>
- <height>0</height>
- </window>
- <window>
- <window-name>RolePortletWindow</window-name>
- <instance-ref>RolePortletInstance</instance-ref>
- <region>left</region>
- <height>0</height>
- </window>
- </page>
- </portal>
- </deployment> -->
- <deployment>
+ <parent-ref/>
+ <if-exists>keep</if-exists>
+ <portal>
+ <portal-name>admin</portal-name>
+ <supported-modes>
+ <mode>view</mode>
+ <mode>edit</mode>
+ <mode>help</mode>
+ </supported-modes>
+ <supported-window-states>
+ <window-state>normal</window-state>
+ <window-state>minimized</window-state>
+ <window-state>maximized</window-state>
+ </supported-window-states>
+ <properties>
+
+ <property>
+ <name>layout.id</name>
+ <value>generic</value>
+ </property>
+
+ <property>
+ <name>theme.id</name>
+ <value>renaissance</value>
+ </property>
+
+ <property>
+ <name>theme.renderSetId</name>
+ <value>divRenderer</value>
+ </property>
+
+ <property>
+ <name>layout.strategyId</name>
+ <value>maximizedRegion</value>
+ </property>
+
+ <property>
+ <name>portal.defaultObjectName</name>
+ <value>default</value>
+ </property>
+ </properties>
+ <security-constraint>
+ <policy-permission>
+ <action-name>viewrecursive</action-name>
+ <role-name>Admin</role-name>
+ </policy-permission>
+ </security-constraint>
+ <page>
+ <page-name>default</page-name>
+ <window>
+ <window-name>AdminPortletWindow</window-name>
+ <instance-ref>AdminPortletInstance</instance-ref>
+ <region>center</region>
+ <height>0</height>
+ </window>
+ <window>
+ <window-name>CatalogPortletWindow</window-name>
+ <instance-ref>CatalogPortletInstance</instance-ref>
+ <region>left</region>
+ <height>0</height>
+ </window>
+ </page>
+ <page>
+ <page-name>Members</page-name>
+ <window>
+ <window-name>UserPortletWindow</window-name>
+ <instance-ref>UserPortletInstance</instance-ref>
+ <region>center</region>
+ <height>0</height>
+ </window>
+ <window>
+ <window-name>RolePortletWindow</window-name>
+ <instance-ref>RolePortletInstance</instance-ref>
+ <region>left</region>
+ <height>0</height>
+ </window>
+ </page>
+ </portal>
+ </deployment> -->
+ <!--deployment>
<if-exists>overwrite</if-exists>
<parent-ref>default</parent-ref>
<page>
- <page-name>info</page-name>
- <window>
- <window-name>PrjInfoPortletWindowDefaultInfo</window-name>
- <instance-ref>PrjInfoPortletInstance</instance-ref>
- <region>triple</region>
- <height>0</height>
- </window>
- <window>
- <window-name>PollsPortletWindowInfo</window-name>
- <instance-ref>PollsPortletInstance</instance-ref>
- <region>rightA</region>
- <height>1</height>
- </window>
+ <page-name>info</page-name>
+ <window>
+ <window-name>PrjInfoPortletWindowDefaultInfo</window-name>
+ <instance-ref>PrjInfoPortletInstance</instance-ref>
+ <region>triple</region>
+ <height>0</height>
+ </window>
+ <window>
+ <window-name>PollsPortletWindowInfo</window-name>
+ <instance-ref>PollsPortletInstance</instance-ref>
+ <region>rightA</region>
+ <height>1</height>
+ </window>
</page>
- </deployment>
+ </deployment-->
<deployment>
- <parent-ref/>
- <if-exists>keep</if-exists>
- <portal>
- <portal-name>template</portal-name>
- <properties>
- <!-- Set the layout for the default portal, see also portal-layouts.xml. -->
+ <parent-ref />
+ <if-exists>keep</if-exists>
+ <portal>
+ <portal-name>template</portal-name>
+ <properties>
+ <!-- Set the layout for the default portal, see also portal-layouts.xml. -->
<property>
<name>layout.id</name>
<value>org</value>
@@ -430,64 +405,64 @@
<!--<value>jbfStrategy</value>-->
<value>maximizedRegion</value>
</property>
- <!--
- | The default page name, if the property is not explicited then the default page name is "default"
- -->
- <property>
- <name>portal.defaultObjectName</name>
- <value>default</value>
- </property>
- </properties>
- <supported-modes>
- <mode>view</mode>
- <mode>edit</mode>
- <mode>help</mode>
- </supported-modes>
- <supported-window-states>
- <window-state>normal</window-state>
- <window-state>minimized</window-state>
- <window-state>maximized</window-state>
- </supported-window-states>
- <page>
- <page-name>default</page-name>
- <properties>
- <property>
- <name>order</name>
- <value>1</value>
- </property>
- </properties>
- <window>
- <window-name>JSPPortletWindow</window-name>
- <instance-ref>JSPPortletInstance</instance-ref>
- <region>left</region>
- <height>0</height>
- </window>
- <window>
- <window-name>CMSWindow</window-name>
- <content>
- <content-type>cms</content-type>
- <content-uri>/default/index.html</content-uri>
- </content>
- <region>center</region>
- <height>0</height>
- </window>
- <window>
- <window-name>UserPortletWindow</window-name>
- <instance-ref>UserPortletInstance</instance-ref>
- <region>left</region>
- <height>1</height>
- </window>
- </page>
- </portal>
- </deployment>
- <deployment>
- <parent-ref/>
- <if-exists>keep</if-exists>
- <context>
- <context-name>dashboard</context-name>
- <properties>
- <!-- Set the layout for the default portal, see also portal-layouts.xml. -->
+ <!--
+ | The default page name, if the property is not explicited then the default page name is "default"
+ -->
<property>
+ <name>portal.defaultObjectName</name>
+ <value>default</value>
+ </property>
+ </properties>
+ <supported-modes>
+ <mode>view</mode>
+ <mode>edit</mode>
+ <mode>help</mode>
+ </supported-modes>
+ <supported-window-states>
+ <window-state>normal</window-state>
+ <window-state>minimized</window-state>
+ <window-state>maximized</window-state>
+ </supported-window-states>
+ <page>
+ <page-name>default</page-name>
+ <properties>
+ <property>
+ <name>order</name>
+ <value>1</value>
+ </property>
+ </properties>
+ <window>
+ <window-name>JSPPortletWindow</window-name>
+ <instance-ref>JSPPortletInstance</instance-ref>
+ <region>left</region>
+ <height>0</height>
+ </window>
+ <window>
+ <window-name>CMSWindow</window-name>
+ <content>
+ <content-type>cms</content-type>
+ <content-uri>/default/index.html</content-uri>
+ </content>
+ <region>center</region>
+ <height>0</height>
+ </window>
+ <window>
+ <window-name>UserPortletWindow</window-name>
+ <instance-ref>UserPortletInstance</instance-ref>
+ <region>left</region>
+ <height>1</height>
+ </window>
+ </page>
+ </portal>
+ </deployment>
+ <deployment>
+ <parent-ref />
+ <if-exists>keep</if-exists>
+ <context>
+ <context-name>dashboard</context-name>
+ <properties>
+ <!-- Set the layout for the default portal, see also portal-layouts.xml. -->
+ <property>
<name>layout.id</name>
<value>org</value>
</property>
@@ -509,22 +484,22 @@
<!--<value>jbfStrategy</value>-->
<value>maximizedRegion</value>
</property>
- <!--
- | Set the dashboard property
- -->
- <property>
- <name>dashboard</name>
- <value>true</value>
- </property>
- </properties>
-<!--
- <security-constraint>
- <policy-permission>
- <role-name>Authenticated</role-name>
- <action-name>view</action-name>
- </policy-permission>
- </security-constraint>
--->
- </context>
- </deployment>
+ <!--
+ | Set the dashboard property
+ -->
+ <property>
+ <name>dashboard</name>
+ <value>true</value>
+ </property>
+ </properties>
+ <!--
+ <security-constraint>
+ <policy-permission>
+ <role-name>Authenticated</role-name>
+ <action-name>view</action-name>
+ </policy-permission>
+ </security-constraint>
+ -->
+ </context>
+ </deployment>
</deployments>
More information about the jboss-svn-commits
mailing list