Update of
/var/cvs/contributions/CMSContainer_Modules/language-redirect/src/java/com/finalist/cmsc/languageredirect
In directory
james.mmbase.org:/tmp/cvs-serv27028/language-redirect/src/java/com/finalist/cmsc/languageredirect
Modified Files:
LanguageRedirectServlet.java
Log Message:
CMSC-755 Navigation code refactored to use navigationitem
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/language-redirect/src/java/com/finalist/cmsc/languageredirect
See also: http://www.mmbase.org/jira/browse/CMSC-755
Index: LanguageRedirectServlet.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/language-redirect/src/java/com/finalist/cmsc/languageredirect/LanguageRedirectServlet.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- LanguageRedirectServlet.java 26 Nov 2007 11:42:00 -0000 1.4
+++ LanguageRedirectServlet.java 28 Jan 2008 21:16:21 -0000 1.5
@@ -33,6 +33,7 @@
import org.mmbase.storage.search.FieldCompareConstraint;
import org.mmbase.storage.search.FieldValueConstraint;
+import com.finalist.cmsc.beans.om.NavigationItem;
import com.finalist.cmsc.beans.om.Page;
import com.finalist.cmsc.mmbase.TreeUtil;
import com.finalist.cmsc.navigation.*;
@@ -95,12 +96,12 @@
private String getRedirectUrl(HttpServletRequest request, String path) {
- Page page = SiteManagement.getPageFromPath(path);
- String link = SiteManagement.getPath(page, !ServerUtil.useServerName());
+ NavigationItem item = SiteManagement.getNavigationItemFromPath(path);
+ String link = SiteManagement.getPath(item, !ServerUtil.useServerName());
String host = null;
if (ServerUtil.useServerName()) {
- host = SiteManagement.getSite(page);
+ host = SiteManagement.getSite(item);
}
PortalURL u = new PortalURL(host, request, link);
return u.toString();
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
