Author: bpapez
Date: Fri Jun 8 15:39:09 2007
New Revision: 703
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D703&repname=
=3Dcorporate_portal_templates_v2
Log:
fix JSP precompile errors coming up when using http://localhost:8080/jahia/=
precompileServlet
Added:
branches/JAHIA-5-0-SP-BRANCH/src/jsp/doc/container_revisions_listing.inc
- copied unchanged from r702, branches/JAHIA-5-0-SP-BRANCH/src/jsp/do=
c/container_revisions_listing.jsp
branches/JAHIA-5-0-SP-BRANCH/src/jsp/mediagallery/medialist.inc
- copied unchanged from r702, branches/JAHIA-5-0-SP-BRANCH/src/jsp/me=
diagallery/medialist.jsp
Removed:
branches/JAHIA-5-0-SP-BRANCH/src/jsp/doc/container_revisions_listing.jsp
branches/JAHIA-5-0-SP-BRANCH/src/jsp/mediagallery/medialist.jsp
Modified:
branches/JAHIA-5-0-SP-BRANCH/src/jsp/doc/detail.jsp
branches/JAHIA-5-0-SP-BRANCH/src/jsp/doc/folderDocumentBox.jsp
branches/JAHIA-5-0-SP-BRANCH/src/jsp/mediagallery.jsp
Modified: branches/JAHIA-5-0-SP-BRANCH/src/jsp/doc/detail.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/jsp/doc/detail.jsp&rev=3D703&repname=3Dcorporate_portal_templat=
es_v2
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/src/jsp/doc/detail.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/jsp/doc/detail.jsp Fri Jun 8 15:39:09=
2007
@@ -165,6 +165,6 @@
</jahiaHtml:actionMenu>
<%
}%>
- <%@ include file=3D"container_revisions_listing.jsp"%>
+ <%@ include file=3D"container_revisions_listing.inc"%>
<% } %>
=
Modified: branches/JAHIA-5-0-SP-BRANCH/src/jsp/doc/folderDocumentBox.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/jsp/doc/folderDocumentBox.jsp&rev=3D703&repname=3Dcorporate_por=
tal_templates_v2
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/src/jsp/doc/folderDocumentBox.jsp (origina=
l)
+++ branches/JAHIA-5-0-SP-BRANCH/src/jsp/doc/folderDocumentBox.jsp Fri Jun =
8 15:39:09 2007
@@ -72,97 +72,6 @@
}
return fullPath.toString();
}
-
-
-public CalendarHandler getCalHandler(String calIdentifier,
- long initialDate,
- ProcessingContext jParams){
- Long date =3D new Long(initialDate);
- CalendarHandler calHandler =3D
- new CalendarHandler(jParams.settings().getJahiaEnginesHttpPath=
(),
- calIdentifier,
- ContentVersioningAction.DATE_FORMAT,
- date,
- jParams.getLocale(),
- new Long(0));
- return calHandler;
-}
-
-public ContentVersioningViewHelper initContainerRevisionsListing(String ob=
jectKey,
- ProcessingContext jParams, HttpServletRequest request) throws JahiaExcep=
tion, ClassNotFoundException {
- =
- ContentObject contentObject =3D null;
- // Prepage a new engine view helper
- EntryLoadRequest loadRequest =3D EntryLoadRequest.VERSIONED;
- contentObject =3D ContentObject.getContentObjectInstance(ObjectKey.getIn=
stance(objectKey));
- CalendarHandler cal =3D this.getCalHandler("restoreDateCalendar",0,jPara=
ms);
- ContentVersioningViewHelper versViewHelper =3D ContentVersioningViewHelp=
er.getInstance(contentObject,cal);
- cal =3D this.getCalHandler("fromRevisionDateCalendar",0,jParams);
- versViewHelper.setFromRevisionDateCalendar(cal);
- cal =3D this.getCalHandler("toRevisionDateCalendar",0,jParams);
- versViewHelper.setToRevisionDateCalendar(cal);
-
- long toDate =3D versViewHelper.getToRevisionDateCalendar().getDateLong()=
.longValue();
- if ( toDate =3D=3D 0 ){
- toDate =3D Calendar.getInstance(TimeZone.getTimeZone("UTC")).getTime=
InMillis();
- }
- toDate +=3D versViewHelper.getToRevisionDateCalendar().getTimeZoneOffSet=
().longValue()
- + versViewHelper.getToRevisionDateCalendar().getServerClientTimeDiff().l=
ongValue();
-
- loadRequest =3D
- new EntryLoadRequest(EntryLoadRequest.VERSIONED_WORKFLOW_STATE,
- (int) (toDate / 1000),
- jParams.getEntryLoadRequest().getLocales());
-
- // prepare Revisions List
- ContentTreeRevisionsVisitor revisionsVisitor =3D
- versViewHelper.getContentTreeRevisionsVisitor(
- jParams.getUser(),loadRequest, ProcessingContext.EDIT);
-
- revisionsVisitor.setWithDeletedContent(true);
- revisionsVisitor.setWithStagingRevisions(true);
- long fromDate =3D versViewHelper.getFromRevisionDateCalendar().getDateLo=
ng().longValue();
- if ( fromDate > 0 ){
- fromDate +=3D versViewHelper.getFromRevisionDateCalendar().getTimeZo=
neOffSet().longValue()
- + versViewHelper.getFromRevisionDateCalendar().getServerClientTimeDi=
ff().longValue();
- }
- revisionsVisitor.setFromRevisionDate(fromDate);
- revisionsVisitor.setToRevisionDate(toDate);
-
- revisionsVisitor.loadRevisions(false);
- revisionsVisitor.sortRevisions(
- jParams.getLocale().toString(),
- versViewHelper.getSortAttribute(),
- versViewHelper.getSortOrder(), false);
-
- ArrayList revisions =3D revisionsVisitor.getRevisions();
- ArrayList filteredRevisions =3D new ArrayList();
- int size =3D revisions.size();
- // remove deleted revisions, we don't want to restore at deleted revision
- RevisionEntrySet revEntrySet;
- if ( (versViewHelper.isRestoringPage() || versViewHelper.isRestoringCont=
ainer() )) {
- boolean isEditMode =3D jParams.getOperationMode().equals(ProcessingC=
ontext.EDIT);
- for (int i =3D 0; i < size; i++) {
- revEntrySet =3D (RevisionEntrySet) revisions.get(i);
- if ((revEntrySet.getWorkflowState() !=3D
- EntryLoadRequest.DELETED_WORKFLOW_STATE)
- && !(revEntrySet.getWorkflowState() > EntryLoadRequest.A=
CTIVE_WORKFLOW_STATE && !isEditMode) ) {
- filteredRevisions.add(revEntrySet);
- }
- }
- } else {
- filteredRevisions =3D revisions;
- }
- if ( filteredRevisions =3D=3D null ){
- filteredRevisions =3D new ArrayList();
- }
- request.setAttribute("revisions", filteredRevisions);
- return versViewHelper;
-}
-
-
-
-
%>
<% String id=3D"documentbox";
=
@@ -293,7 +202,7 @@
</fieldset>
</logic:present>
</jahiaHtml:actionMenu></td></tr>
- <%@ include file=3D"container_revisions_listing.jsp"%>
+ <%@ include file=3D"container_revisions_listing.inc"%>
</content:container></td></tr></table>
</content:containerList>
</table></td></tr></table>
Modified: branches/JAHIA-5-0-SP-BRANCH/src/jsp/mediagallery.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/jsp/mediagallery.jsp&rev=3D703&repname=3Dcorporate_portal_templ=
ates_v2
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/src/jsp/mediagallery.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/jsp/mediagallery.jsp Fri Jun 8 15:39:=
09 2007
@@ -20,7 +20,7 @@
<%@ include file=3D"common/top.inc"%>
=
<div class=3D"full2">
- <%@ include file=3D"mediagallery/medialist.jsp"%>
+ <%@ include file=3D"mediagallery/medialist.inc"%>
</div>
<%@ include file=3D"common/bottom.inc"%>
=
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
