Author: pboy Date: 2013-01-23 14:11:03 +0000 (Wed, 23 Jan 2013) New Revision: 2456 Modified: contrib/camden/ccm-lbc-aplaws/bundles/devel/cfg/integration.properties contrib/camden/ccm-lbc-aplaws/bundles/devel/cfg/project.xml contrib/camden/ccm-lbc-aplaws/bundles/devel/cfg/web.xml contrib/camden/ccm-lbc-aplaws/bundles/devel/templates/ERROR/camden400.jsp contrib/camden/ccm-lbc-aplaws/bundles/devel/templates/ERROR/camden404.jsp contrib/camden/ccm-lbc-aplaws/bundles/devel/templates/ERROR/camden500.jsp contrib/camden/ccm-lbc-aplaws/bundles/devel/templates/ccm-navigation/navigation/camden-default.jsp contrib/camden/ccm-lbc-aplaws/bundles/intranet/cfg/integration.properties contrib/camden/ccm-lbc-aplaws/bundles/intranet/cfg/web.xml contrib/camden/ccm-lbc-aplaws/bundles/intranet/templates/ERROR/404.jsp contrib/camden/ccm-lbc-aplaws/bundles/intranet/templates/ERROR/500.jsp contrib/camden/ccm-lbc-aplaws/bundles/public/cfg/integration.properties contrib/camden/ccm-lbc-aplaws/bundles/public/cfg/web.xml contrib/camden/ccm-lbc-aplaws/bundles/public/templates/ERROR/camden400.jsp contrib/camden/ccm-lbc-aplaws/bundles/public/templates/ERROR/camden404.jsp contrib/camden/ccm-lbc-aplaws/bundles/public/templates/ERROR/camden500.jsp Log: Modified according to code changes in ccm-cms and ccm-core. Modified: contrib/camden/ccm-lbc-aplaws/bundles/devel/cfg/integration.properties =================================================================== --- contrib/camden/ccm-lbc-aplaws/bundles/devel/cfg/integration.properties 2013-01-10 02:36:00 UTC (rev 2455) +++ contrib/camden/ccm-lbc-aplaws/bundles/devel/cfg/integration.properties 2013-01-23 14:11:03 UTC (rev 2456) @@ -60,10 +60,11 @@ # CORE UI configuration parameters # ############################################################################## -core.ui.pagemap.root_page_url=portal/ -core.ui.pagemap.workspace_url=portal/ -core.ui.pagemap.user_redirect_url=content-center/redirect.jsp -# With versin 2 moved from kernel/security to ui rsp ui.permissions and +core.ui.pagemap.root_page_url=/portal/ +#core.ui.pagemap.user_redirect_url=content-center/redirect.jsp +core.ui.pagemap.user_redirect_url=/content-center/ +core.ui.pagemap.workspace_url=/portal/ +# With version 2 moved from kernel/security to ui rsp ui.permissions and # no longer intended to be user configurable. # TODO CHECK what these URLS (esp. ../one) is used for. # waf.pagemap.permission=permissions/ ; DEFAULT @@ -101,7 +102,8 @@ # list the desired content section names #com.arsdigita.cms.loader.section_names=generic,openccm,homepages -com.arsdigita.cms.category_authoring_add_form=com.arsdigita.aplaws.ui.ItemCategoryPicker +# Replace CMS category form with a terms specific widget +com.arsdigita.cms.category_authoring_add_form=com.arsdigita.london.terms.ui.ItemCategoryPicker # Check parameter, not part of CMSConfig com.arsdigita.cms.check_bcc=ess...@ca... Modified: contrib/camden/ccm-lbc-aplaws/bundles/devel/cfg/project.xml =================================================================== --- contrib/camden/ccm-lbc-aplaws/bundles/devel/cfg/project.xml 2013-01-10 02:36:00 UTC (rev 2455) +++ contrib/camden/ccm-lbc-aplaws/bundles/devel/cfg/project.xml 2013-01-23 14:11:03 UTC (rev 2456) @@ -106,13 +106,14 @@ <ccm:application name="ccm-ldn-importer"/> <!-- Devel Bundle's LBC Content Types --> + <ccm:application name="ccm-lbc-consultation"/> <!-- - <ccm:application name="ccm-lbc-consultation"/> <ccm:application name="ccm-lbc-contentcheck"/> --> + <ccm:application name="ccm-lbc-decisiontree"/> <ccm:application name="ccm-lbc-eforms"/> + <ccm:application name="ccm-lbc-foi"/> <!-- - <ccm:application name="ccm-lbc-foi"/> <ccm:application name="ccm-lbc-wordxml"/> --> @@ -140,12 +141,13 @@ <!-- ADD-ONs Bundle's Applications --> <!-- + <ccm:application name="ccm-auth-http"/> --> - <ccm:application name="ccm-auth-http"/> <ccm:application name="ccm-bookmarks"/> <ccm:application name="ccm-docrepo"/> <ccm:application name="ccm-faq"/> <ccm:application name="ccm-forum-categorised"/> + <ccm:application name="ccm-portalserver"/> <!-- currently doesn't work for unknown reason <ccm:application name="ccm-simplesurvey"/> --> Modified: contrib/camden/ccm-lbc-aplaws/bundles/devel/cfg/web.xml =================================================================== --- contrib/camden/ccm-lbc-aplaws/bundles/devel/cfg/web.xml 2013-01-10 02:36:00 UTC (rev 2455) +++ contrib/camden/ccm-lbc-aplaws/bundles/devel/cfg/web.xml 2013-01-23 14:11:03 UTC (rev 2456) @@ -143,7 +143,7 @@ <servlet> <servlet-name>content-center</servlet-name> - <servlet-class>com.arsdigita.cms.WorkspaceServlet</servlet-class> + <servlet-class>com.arsdigita.cms.ContentCenterServlet</servlet-class> </servlet> <servlet> @@ -195,52 +195,7 @@ </init-param> </servlet> - <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Camden viewing options - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> - <servlet> - <servlet-name>LargeTextServlet</servlet-name> - <display-name>Large Text Output Servlet</display-name> - <servlet-class> - com.arsdigita.web.InternalPrefixerServlet - </servlet-class> - <init-param> - <param-name>prefix</param-name> - <param-value>/large</param-value> - </init-param> - </servlet> - - <servlet> - <servlet-name>LargeLinearTextServlet</servlet-name> - <display-name>Large Linear Text Output Servlet</display-name> - <servlet-class> - com.arsdigita.web.InternalPrefixerServlet - </servlet-class> - <init-param> - <param-name>prefix</param-name> - <param-value>/linear</param-value> - </init-param> - </servlet> - - <servlet> - <servlet-name>HighContrastLinearTextServlet</servlet-name> - <display-name>High Contrast Linear Text Output Servlet</display-name> - <servlet-class> - com.arsdigita.web.InternalPrefixerServlet - </servlet-class> - <init-param> - <param-name>prefix</param-name> - <param-value>/zoom</param-value> - </init-param> - </servlet> -<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Camden viewing options END - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> - - - -<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - MODULES SERVLET DECLARATIONS SECTION - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> @@ -580,25 +535,6 @@ <url-pattern>/print/*</url-pattern> </servlet-mapping> - - <!-- viewing option servlet mapping --> - <servlet-mapping> - <servlet-name>LargeTextServlet</servlet-name> - <url-pattern>/large/*</url-pattern> - </servlet-mapping> - - <servlet-mapping> - <servlet-name>LargeLinearTextServlet</servlet-name> - <url-pattern>/linear/*</url-pattern> - </servlet-mapping> - - <servlet-mapping> - <servlet-name>HighContrastLinearTextServlet</servlet-name> - <url-pattern>/zoom/*</url-pattern> - </servlet-mapping> - <!--// end viewing option servlet mapping // --> - - <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ERROR PAGES - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> Modified: contrib/camden/ccm-lbc-aplaws/bundles/devel/templates/ERROR/camden400.jsp =================================================================== --- contrib/camden/ccm-lbc-aplaws/bundles/devel/templates/ERROR/camden400.jsp 2013-01-10 02:36:00 UTC (rev 2455) +++ contrib/camden/ccm-lbc-aplaws/bundles/devel/templates/ERROR/camden400.jsp 2013-01-23 14:11:03 UTC (rev 2456) @@ -1,7 +1,8 @@ <%@ page isErrorPage="true" import="com.arsdigita.dispatcher.DispatcherHelper, - com.arsdigita.sitenode.ServletErrorReport, - com.arsdigita.web.Web, com.arsdigita.web.URL" %> + com.arsdigita.web.ServletErrorReport, + com.arsdigita.web.Web, + com.arsdigita.web.URL" %> <%DispatcherHelper.forceCacheDisable(response);%> <%-- NB. The above cacheDisable command must be on the first line of the jsp Modified: contrib/camden/ccm-lbc-aplaws/bundles/devel/templates/ERROR/camden404.jsp =================================================================== --- contrib/camden/ccm-lbc-aplaws/bundles/devel/templates/ERROR/camden404.jsp 2013-01-10 02:36:00 UTC (rev 2455) +++ contrib/camden/ccm-lbc-aplaws/bundles/devel/templates/ERROR/camden404.jsp 2013-01-23 14:11:03 UTC (rev 2456) @@ -1,7 +1,8 @@ <%@ page isErrorPage="true" import="com.arsdigita.dispatcher.DispatcherHelper, -com.arsdigita.sitenode.ServletErrorReport, -com.arsdigita.web.Web, com.arsdigita.web.URL" %> + com.arsdigita.web.ServletErrorReport, + com.arsdigita.web.Web, + com.arsdigita.web.URL" %> <%DispatcherHelper.forceCacheDisable(response);%> <%-- NB. The above cacheDisable command must be on the first line of the jsp @@ -11,7 +12,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <head> <title>404 Page not found - Camden Council</title> - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <link rel="schema.DC" href="http://purl.org/dc/elements/1.1/" /> <link rel="schema.DCTERMS" href="http://purl.org/dc/terms/" /> @@ -42,9 +43,9 @@ <meta name="DC.rights" lang="en" content="Copyright Camden Council 2004" /> <meta name="DCTERMS.audience" content="" scheme="LGAL" /> <meta http-equiv="pics-label" content='(pics-1.1 "http://www.icra.org/ratingsv02.html" l gen true for "http://www.camden.gov.uk" r (nz 1 vz 1 lz 1 oz 1 cz 1) gen true for "http://www3.camden.gov.uk" r (nz 1 vz 1 lz 1 oz 1 cz 1))' /> - <link rel="shortcut icon" href="/ccm-ldn-theme/__ccm__/themes-prod/fc-sw2/images/icons/favicon.ico" /> + <link rel="shortcut icon" href="/ccm-ldn-theme/__ccm__/themes-prod/fc-sw2/images/icons/favicon.ico" /> - <link media="screen, projection, print" type="text/css" rel="stylesheet" + <link media="screen, projection, print" type="text/css" rel="stylesheet" href="/ccm-ldn-theme/__ccm__/themes-prod/fc-sw2/css/yui_reset.css"/> <link media="screen, projection" type="text/css" rel="stylesheet" href="/ccm-ldn-theme/__ccm__/themes-prod/fc-sw2/css/screen.min.css"/> Modified: contrib/camden/ccm-lbc-aplaws/bundles/devel/templates/ERROR/camden500.jsp =================================================================== --- contrib/camden/ccm-lbc-aplaws/bundles/devel/templates/ERROR/camden500.jsp 2013-01-10 02:36:00 UTC (rev 2455) +++ contrib/camden/ccm-lbc-aplaws/bundles/devel/templates/ERROR/camden500.jsp 2013-01-23 14:11:03 UTC (rev 2456) @@ -1,7 +1,8 @@ <%@ page isErrorPage="true" import="com.arsdigita.dispatcher.DispatcherHelper, - com.arsdigita.sitenode.ServletErrorReport, - com.arsdigita.web.Web, com.arsdigita.web.URL" %> + com.arsdigita.web.ServletErrorReport, + com.arsdigita.web.Web, + com.arsdigita.web.URL" %> <%DispatcherHelper.forceCacheDisable(response);%> <%-- NB. The above cacheDisable command must be on the first line of the jsp Modified: contrib/camden/ccm-lbc-aplaws/bundles/devel/templates/ccm-navigation/navigation/camden-default.jsp =================================================================== --- contrib/camden/ccm-lbc-aplaws/bundles/devel/templates/ccm-navigation/navigation/camden-default.jsp 2013-01-10 02:36:00 UTC (rev 2455) +++ contrib/camden/ccm-lbc-aplaws/bundles/devel/templates/ccm-navigation/navigation/camden-default.jsp 2013-01-23 14:11:03 UTC (rev 2456) @@ -39,11 +39,12 @@ <jsp:scriptlet> DataCollection pub = SessionManager.getSession().retrieve("com.arsdigita.categorization.Category"); - pub.addEqualsFilter("name", "CMSAnnouncements"); +// pub.addEqualsFilter("name", "CMSAnnouncements"); + pub.addEqualsFilter("name", "Business"); if(!pub.isEmpty()) { pub.next(); DataObject obj = pub.getDataObject(); - System.out.println(obj.toString()); +// System.out.println(obj.toString()); pub.close(); CategoryDataCollectionDefinition categoryDataCollectionDefinition = new CategoryDataCollectionDefinition(); Modified: contrib/camden/ccm-lbc-aplaws/bundles/intranet/cfg/integration.properties =================================================================== --- contrib/camden/ccm-lbc-aplaws/bundles/intranet/cfg/integration.properties 2013-01-10 02:36:00 UTC (rev 2455) +++ contrib/camden/ccm-lbc-aplaws/bundles/intranet/cfg/integration.properties 2013-01-23 14:11:03 UTC (rev 2456) @@ -58,10 +58,11 @@ # CORE UI configuration parameters # ############################################################################## -core.ui.pagemap.root_page_url=portal/ -core.ui.pagemap.workspace_url=portal/ -core.ui.pagemap.user_redirect_url=content-center/redirect.jsp -# With versin 2 moved from kernel/security to ui rsp ui.permissions and +core.ui.pagemap.root_page_url=/portal/ +#core.ui.pagemap.user_redirect_url=content-center/redirect.jsp +core.ui.pagemap.user_redirect_url=/content-center/ +core.ui.pagemap.workspace_url=/portal/ +# With version 2 moved from kernel/security to ui rsp ui.permissions and # no longer intended to be user configurable. # TODO CHECK what these URLS (esp. ../one) is used for. # waf.pagemap.permission=permissions/ ; DEFAULT @@ -99,7 +100,8 @@ # list the desired content section names #com.arsdigita.cms.loader.section_names=generic,openccm,homepages -com.arsdigita.cms.category_authoring_add_form=com.arsdigita.aplaws.ui.ItemCategoryPicker +# Replace CMS category form with a terms specific widget +com.arsdigita.cms.category_authoring_add_form=com.arsdigita.london.terms.ui.ItemCategoryPicker # Check parameter, not part of CMSConfig com.arsdigita.cms.check_bcc=ess...@ca... @@ -214,10 +216,6 @@ ; Comment this out or increase the num_of_threads if you really use remote search com.arsdigita.london.search.num_threads=10 -# # ccm-auth-http application -# auth.http.admin_email=web...@ap... -# auth.http.admin_identifier=webmaster - # LDN Dublin Core configuration parameters # ############################################################################## com.arsdigita.london.cms.dublin.audience_domain=LGAL Modified: contrib/camden/ccm-lbc-aplaws/bundles/intranet/cfg/web.xml =================================================================== --- contrib/camden/ccm-lbc-aplaws/bundles/intranet/cfg/web.xml 2013-01-10 02:36:00 UTC (rev 2455) +++ contrib/camden/ccm-lbc-aplaws/bundles/intranet/cfg/web.xml 2013-01-23 14:11:03 UTC (rev 2456) @@ -142,7 +142,7 @@ <servlet> <servlet-name>content-center</servlet-name> - <servlet-class>com.arsdigita.cms.WorkspaceServlet</servlet-class> + <servlet-class>com.arsdigita.cms.ContentCenterServlet</servlet-class> </servlet> <servlet> Modified: contrib/camden/ccm-lbc-aplaws/bundles/intranet/templates/ERROR/404.jsp =================================================================== --- contrib/camden/ccm-lbc-aplaws/bundles/intranet/templates/ERROR/404.jsp 2013-01-10 02:36:00 UTC (rev 2455) +++ contrib/camden/ccm-lbc-aplaws/bundles/intranet/templates/ERROR/404.jsp 2013-01-23 14:11:03 UTC (rev 2456) @@ -1,7 +1,8 @@ <%@ page isErrorPage="true" import="com.arsdigita.dispatcher.DispatcherHelper, - com.arsdigita.sitenode.ServletErrorReport, - com.arsdigita.web.Web, com.arsdigita.web.URL" %> + com.arsdigita.web.ServletErrorReport, + com.arsdigita.web.Web, + com.arsdigita.web.URL" %> <%DispatcherHelper.forceCacheDisable(response);%> <%-- NB. The above cacheDisable command must be on the first line of the jsp Modified: contrib/camden/ccm-lbc-aplaws/bundles/intranet/templates/ERROR/500.jsp =================================================================== --- contrib/camden/ccm-lbc-aplaws/bundles/intranet/templates/ERROR/500.jsp 2013-01-10 02:36:00 UTC (rev 2455) +++ contrib/camden/ccm-lbc-aplaws/bundles/intranet/templates/ERROR/500.jsp 2013-01-23 14:11:03 UTC (rev 2456) @@ -1,7 +1,8 @@ <%@ page isErrorPage="true" import="com.arsdigita.dispatcher.DispatcherHelper, - com.arsdigita.sitenode.ServletErrorReport, - com.arsdigita.web.Web, com.arsdigita.web.URL" %> + com.arsdigita.web.ServletErrorReport, + com.arsdigita.web.Web, + com.arsdigita.web.URL" %> <%DispatcherHelper.forceCacheDisable(response);%> <%-- NB. The above cacheDisable command must be on the first line of the jsp Modified: contrib/camden/ccm-lbc-aplaws/bundles/public/cfg/integration.properties =================================================================== --- contrib/camden/ccm-lbc-aplaws/bundles/public/cfg/integration.properties 2013-01-10 02:36:00 UTC (rev 2455) +++ contrib/camden/ccm-lbc-aplaws/bundles/public/cfg/integration.properties 2013-01-23 14:11:03 UTC (rev 2456) @@ -58,10 +58,11 @@ # CORE UI configuration parameters # ############################################################################## -core.ui.pagemap.root_page_url=portal/ -core.ui.pagemap.workspace_url=portal/ -core.ui.pagemap.user_redirect_url=content-center/redirect.jsp -# With versin 2 moved from kernel/security to ui rsp ui.permissions and +core.ui.pagemap.root_page_url=/portal/ +#core.ui.pagemap.user_redirect_url=content-center/redirect.jsp +core.ui.pagemap.user_redirect_url=/content-center/ +core.ui.pagemap.workspace_url=/portal/ +# With version 2 moved from kernel/security to ui rsp ui.permissions and # no longer intended to be user configurable. # TODO CHECK what these URLS (esp. ../one) is used for. # waf.pagemap.permission=permissions/ ; DEFAULT @@ -99,7 +100,8 @@ # list the desired content section names #com.arsdigita.cms.loader.section_names=generic,openccm,homepages -com.arsdigita.cms.category_authoring_add_form=com.arsdigita.aplaws.ui.ItemCategoryPicker +# Replace CMS category form with a terms specific widget +com.arsdigita.cms.category_authoring_add_form=com.arsdigita.london.terms.ui.ItemCategoryPicker # Check parameter, not part of CMSConfig com.arsdigita.cms.check_bcc=ess...@ca... @@ -225,9 +227,6 @@ ; Comment this out or increase the num_of_threads if you really use remote search com.arsdigita.london.search.num_threads=10 -# # ccm-auth-http application -# auth.http.admin_email=web...@ap... -# auth.http.admin_identifier=webmaster # LDN Dublin Core configuration parameters # ############################################################################## Modified: contrib/camden/ccm-lbc-aplaws/bundles/public/cfg/web.xml =================================================================== --- contrib/camden/ccm-lbc-aplaws/bundles/public/cfg/web.xml 2013-01-10 02:36:00 UTC (rev 2455) +++ contrib/camden/ccm-lbc-aplaws/bundles/public/cfg/web.xml 2013-01-23 14:11:03 UTC (rev 2456) @@ -142,7 +142,7 @@ <servlet> <servlet-name>content-center</servlet-name> - <servlet-class>com.arsdigita.cms.WorkspaceServlet</servlet-class> + <servlet-class>com.arsdigita.cms.ContentCenterServlet</servlet-class> </servlet> <servlet> @@ -194,52 +194,7 @@ </init-param> </servlet> - <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Camden viewing options - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> - <servlet> - <servlet-name>LargeTextServlet</servlet-name> - <display-name>Large Text Output Servlet</display-name> - <servlet-class> - com.arsdigita.web.InternalPrefixerServlet - </servlet-class> - <init-param> - <param-name>prefix</param-name> - <param-value>/large</param-value> - </init-param> - </servlet> - - <servlet> - <servlet-name>LargeLinearTextServlet</servlet-name> - <display-name>Large Linear Text Output Servlet</display-name> - <servlet-class> - com.arsdigita.web.InternalPrefixerServlet - </servlet-class> - <init-param> - <param-name>prefix</param-name> - <param-value>/linear</param-value> - </init-param> - </servlet> - - <servlet> - <servlet-name>HighContrastLinearTextServlet</servlet-name> - <display-name>High Contrast Linear Text Output Servlet</display-name> - <servlet-class> - com.arsdigita.web.InternalPrefixerServlet - </servlet-class> - <init-param> - <param-name>prefix</param-name> - <param-value>/zoom</param-value> - </init-param> - </servlet> -<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Camden viewing options END - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> - - - -<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - MODULES SERVLET DECLARATIONS SECTION - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> @@ -579,25 +534,6 @@ <url-pattern>/print/*</url-pattern> </servlet-mapping> - - <!-- viewing option servlet mapping --> - <servlet-mapping> - <servlet-name>LargeTextServlet</servlet-name> - <url-pattern>/large/*</url-pattern> - </servlet-mapping> - - <servlet-mapping> - <servlet-name>LargeLinearTextServlet</servlet-name> - <url-pattern>/linear/*</url-pattern> - </servlet-mapping> - - <servlet-mapping> - <servlet-name>HighContrastLinearTextServlet</servlet-name> - <url-pattern>/zoom/*</url-pattern> - </servlet-mapping> - <!--// end viewing option servlet mapping // --> - - <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ERROR PAGES - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> Modified: contrib/camden/ccm-lbc-aplaws/bundles/public/templates/ERROR/camden400.jsp =================================================================== --- contrib/camden/ccm-lbc-aplaws/bundles/public/templates/ERROR/camden400.jsp 2013-01-10 02:36:00 UTC (rev 2455) +++ contrib/camden/ccm-lbc-aplaws/bundles/public/templates/ERROR/camden400.jsp 2013-01-23 14:11:03 UTC (rev 2456) @@ -1,7 +1,8 @@ <%@ page isErrorPage="true" import="com.arsdigita.dispatcher.DispatcherHelper, - com.arsdigita.sitenode.ServletErrorReport, - com.arsdigita.web.Web, com.arsdigita.web.URL" %> + com.arsdigita.web.ServletErrorReport, + com.arsdigita.web.Web, + com.arsdigita.web.URL" %> <%DispatcherHelper.forceCacheDisable(response);%> <%-- NB. The above cacheDisable command must be on the first line of the jsp Modified: contrib/camden/ccm-lbc-aplaws/bundles/public/templates/ERROR/camden404.jsp =================================================================== --- contrib/camden/ccm-lbc-aplaws/bundles/public/templates/ERROR/camden404.jsp 2013-01-10 02:36:00 UTC (rev 2455) +++ contrib/camden/ccm-lbc-aplaws/bundles/public/templates/ERROR/camden404.jsp 2013-01-23 14:11:03 UTC (rev 2456) @@ -1,7 +1,8 @@ <%@ page isErrorPage="true" import="com.arsdigita.dispatcher.DispatcherHelper, -com.arsdigita.sitenode.ServletErrorReport, -com.arsdigita.web.Web, com.arsdigita.web.URL" %> + com.arsdigita.web.ServletErrorReport, + com.arsdigita.web.Web, + com.arsdigita.web.URL" %> <%DispatcherHelper.forceCacheDisable(response);%> <%-- NB. The above cacheDisable command must be on the first line of the jsp Modified: contrib/camden/ccm-lbc-aplaws/bundles/public/templates/ERROR/camden500.jsp =================================================================== --- contrib/camden/ccm-lbc-aplaws/bundles/public/templates/ERROR/camden500.jsp 2013-01-10 02:36:00 UTC (rev 2455) +++ contrib/camden/ccm-lbc-aplaws/bundles/public/templates/ERROR/camden500.jsp 2013-01-23 14:11:03 UTC (rev 2456) @@ -1,7 +1,8 @@ <%@ page isErrorPage="true" import="com.arsdigita.dispatcher.DispatcherHelper, - com.arsdigita.sitenode.ServletErrorReport, - com.arsdigita.web.Web, com.arsdigita.web.URL" %> + com.arsdigita.web.ServletErrorReport, + com.arsdigita.web.Web, + com.arsdigita.web.URL" %> <%DispatcherHelper.forceCacheDisable(response);%> <%-- NB. The above cacheDisable command must be on the first line of the jsp |