Update of
/var/cvs/contributions/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl
In directory
james.mmbase.org:/tmp/cvs-serv14836/cmsc/portal/src/java/com/finalist/cmsc/portalImpl
Modified Files:
PageNavigationItemManager.java ControllerFilter.java
PortalErrorServlet.java
Log Message:
CMSC-1029 Move some sources from net.sf.mmapps.mmcommons to cmsc cvs
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl
See also: http://www.mmbase.org/jira/browse/CMSC-1029
Index: PageNavigationItemManager.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl/PageNavigationItemManager.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- PageNavigationItemManager.java 16 May 2008 11:46:35 -0000 1.9
+++ PageNavigationItemManager.java 25 Jul 2008 15:54:05 -0000 1.10
@@ -3,18 +3,11 @@
import java.util.List;
import java.util.Map;
-import net.sf.mmapps.commons.beans.MMBaseNodeMapper;
-
-import org.mmbase.bridge.Cloud;
-import org.mmbase.bridge.Node;
-import org.mmbase.bridge.NodeIterator;
-import org.mmbase.bridge.NodeList;
-import org.mmbase.bridge.Relation;
-import org.mmbase.bridge.RelationIterator;
-import org.mmbase.bridge.RelationList;
+import org.mmbase.bridge.*;
import org.mmbase.util.logging.Logger;
import org.mmbase.util.logging.Logging;
+import com.finalist.cmsc.beans.MMBaseNodeMapper;
import com.finalist.cmsc.beans.om.NavigationItem;
import com.finalist.cmsc.beans.om.Page;
import com.finalist.cmsc.navigation.*;
Index: ControllerFilter.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl/ControllerFilter.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- ControllerFilter.java 9 May 2008 10:06:57 -0000 1.6
+++ ControllerFilter.java 25 Jul 2008 15:54:05 -0000 1.7
@@ -12,7 +12,8 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import net.sf.mmapps.commons.web.FriendlyUrlFilter;
+import com.finalist.cmsc.filters.FriendlyUrlFilter;
+
/**
* The controller filter filters out all navigation requests and dispatches
them
@@ -23,11 +24,13 @@
*/
public class ControllerFilter extends FriendlyUrlFilter {
+ @Override
protected String getServlet() {
return PortalConstants.CMSC_PORTAL_SERVLET;
}
+ @Override
protected boolean isFriendlyUrl(HttpServletRequest req, HttpServletResponse
resp) {
return PortalServlet.isNavigation(req, resp);
}
Index: PortalErrorServlet.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl/PortalErrorServlet.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- PortalErrorServlet.java 26 Jun 2008 08:20:10 -0000 1.17
+++ PortalErrorServlet.java 25 Jul 2008 15:54:05 -0000 1.18
@@ -16,9 +16,8 @@
import javax.servlet.RequestDispatcher;
import javax.servlet.ServletException;
-import javax.servlet.http.*;
-
-import net.sf.mmapps.commons.util.HttpUtil;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -26,6 +25,7 @@
import com.finalist.cmsc.beans.om.Site;
import com.finalist.cmsc.navigation.ServerUtil;
import com.finalist.cmsc.services.sitemanagement.SiteManagement;
+import com.finalist.cmsc.util.HttpUtil;
import com.finalist.pluto.portalImpl.core.*;
import com.finalist.util.version.VersionUtil;
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
