From: <jbo...@li...> - 2005-08-23 19:05:28
|
Author: adamw Date: 2005-08-23 15:05:16 -0400 (Tue, 23 Aug 2005) New Revision: 932 Modified: trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/taglib/WikiURLTag.java trunk/forge/portal-extensions/forge-common/src/web/WEB-INF/tld/forge.tld trunk/forge/portal-extensions/forge-contributor/src/web/WEB-INF/tld/forge.tld trunk/forge/portal-extensions/forge-file-access/src/web/WEB-INF/tld/forge.tld trunk/forge/portal-extensions/forge-root-redirect/src/web/WEB-INF/tld/forge.tld trunk/forge/portal-extensions/forge-wiki/src/web/WEB-INF/tld/forge.tld trunk/forge/portal-extensions/portal-federation/src/web/WEB-INF/tld/forge.tld Log: Attr rename Modified: trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/taglib/WikiURLTag.java =================================================================== --- trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/taglib/WikiURLTag.java 2005-08-23 19:00:23 UTC (rev 931) +++ trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/taglib/WikiURLTag.java 2005-08-23 19:05:16 UTC (rev 932) @@ -15,27 +15,28 @@ public class WikiURLTag extends URLTag { private final static String WIKI_URL = "window.default.WikiPortletWindow&ctrl:type=action"; - private String project; + private String page; - public String getProject() { - return project; + public String getPage() { + return page; } - public void setProject(String project) { - this.project = project; + public void setPage(String page) { + this.page = page; } private String capitilizeFirstLetter(String value) { - return value.substring(0,1).toUpperCase()+ value.substring(1,value.length()); + return value.substring(0,1).toUpperCase() + + value.substring(1,value.length()); } public int doStartTag() throws JspException { - String projectName = project.equals(SELECTED_PROJECT) ? + String pageName = page.equals(SELECTED_PROJECT) ? pageContext.getRequest().getAttribute( - ProjectsHelper.PROJECT_ID).toString() : project; + ProjectsHelper.PROJECT_ID).toString() : page; return writeURL("/portal/index.html", "ctrl:id", - WIKI_URL+"&page="+capitilizeFirstLetter(projectName)+"&project="+ - projectName); + WIKI_URL+"&page="+capitilizeFirstLetter(pageName)+"&project="+ + pageName); } } Modified: trunk/forge/portal-extensions/forge-common/src/web/WEB-INF/tld/forge.tld =================================================================== --- trunk/forge/portal-extensions/forge-common/src/web/WEB-INF/tld/forge.tld 2005-08-23 19:00:23 UTC (rev 931) +++ trunk/forge/portal-extensions/forge-common/src/web/WEB-INF/tld/forge.tld 2005-08-23 19:05:16 UTC (rev 932) @@ -46,7 +46,7 @@ <name>wikiURL</name> <tagclass>org.jboss.forge.common.taglib.WikiURLTag</tagclass> <attribute> - <name>project</name> + <name>page</name> <required>true</required> <rtexprvalue>true</rtexprvalue> </attribute> Modified: trunk/forge/portal-extensions/forge-contributor/src/web/WEB-INF/tld/forge.tld =================================================================== --- trunk/forge/portal-extensions/forge-contributor/src/web/WEB-INF/tld/forge.tld 2005-08-23 19:00:23 UTC (rev 931) +++ trunk/forge/portal-extensions/forge-contributor/src/web/WEB-INF/tld/forge.tld 2005-08-23 19:05:16 UTC (rev 932) @@ -46,7 +46,7 @@ <name>wikiURL</name> <tagclass>org.jboss.forge.common.taglib.WikiURLTag</tagclass> <attribute> - <name>project</name> + <name>page</name> <required>true</required> <rtexprvalue>true</rtexprvalue> </attribute> Modified: trunk/forge/portal-extensions/forge-file-access/src/web/WEB-INF/tld/forge.tld =================================================================== --- trunk/forge/portal-extensions/forge-file-access/src/web/WEB-INF/tld/forge.tld 2005-08-23 19:00:23 UTC (rev 931) +++ trunk/forge/portal-extensions/forge-file-access/src/web/WEB-INF/tld/forge.tld 2005-08-23 19:05:16 UTC (rev 932) @@ -46,7 +46,7 @@ <name>wikiURL</name> <tagclass>org.jboss.forge.common.taglib.WikiURLTag</tagclass> <attribute> - <name>project</name> + <name>page</name> <required>true</required> <rtexprvalue>true</rtexprvalue> </attribute> Modified: trunk/forge/portal-extensions/forge-root-redirect/src/web/WEB-INF/tld/forge.tld =================================================================== --- trunk/forge/portal-extensions/forge-root-redirect/src/web/WEB-INF/tld/forge.tld 2005-08-23 19:00:23 UTC (rev 931) +++ trunk/forge/portal-extensions/forge-root-redirect/src/web/WEB-INF/tld/forge.tld 2005-08-23 19:05:16 UTC (rev 932) @@ -46,7 +46,7 @@ <name>wikiURL</name> <tagclass>org.jboss.forge.common.taglib.WikiURLTag</tagclass> <attribute> - <name>project</name> + <name>page</name> <required>true</required> <rtexprvalue>true</rtexprvalue> </attribute> Modified: trunk/forge/portal-extensions/forge-wiki/src/web/WEB-INF/tld/forge.tld =================================================================== --- trunk/forge/portal-extensions/forge-wiki/src/web/WEB-INF/tld/forge.tld 2005-08-23 19:00:23 UTC (rev 931) +++ trunk/forge/portal-extensions/forge-wiki/src/web/WEB-INF/tld/forge.tld 2005-08-23 19:05:16 UTC (rev 932) @@ -46,7 +46,7 @@ <name>wikiURL</name> <tagclass>org.jboss.forge.common.taglib.WikiURLTag</tagclass> <attribute> - <name>project</name> + <name>page</name> <required>true</required> <rtexprvalue>true</rtexprvalue> </attribute> Modified: trunk/forge/portal-extensions/portal-federation/src/web/WEB-INF/tld/forge.tld =================================================================== --- trunk/forge/portal-extensions/portal-federation/src/web/WEB-INF/tld/forge.tld 2005-08-23 19:00:23 UTC (rev 931) +++ trunk/forge/portal-extensions/portal-federation/src/web/WEB-INF/tld/forge.tld 2005-08-23 19:05:16 UTC (rev 932) @@ -46,7 +46,7 @@ <name>wikiURL</name> <tagclass>org.jboss.forge.common.taglib.WikiURLTag</tagclass> <attribute> - <name>project</name> + <name>page</name> <required>true</required> <rtexprvalue>true</rtexprvalue> </attribute> |