Author: sshyrkov
Date: Tue Oct 30 17:43:00 2007
New Revision: 19004
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D19004&repname=
=3Djahia
Log:
Resolve compilation problems due to Jahia Include Tag changes
Modified:
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/administrat=
ion/import_choose.jsp
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/administrat=
ion/new_template_detail.jsp
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/admin=
istration/import_choose.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/webapp/jsp/jahia/administration/import_choose.jsp&rev=
=3D19004&repname=3Djahia
=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-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/administrat=
ion/import_choose.jsp (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/administrat=
ion/import_choose.jsp Tue Oct 30 17:43:00 2007
@@ -17,7 +17,7 @@
--%><[EMAIL PROTECTED] file=3D"/jsp/jahia/administration/include/header.inc"%>
<[EMAIL PROTECTED] import=3D"org.jahia.bin.JahiaAdministration"%>
<%@ page import=3D"org.jahia.params.ProcessingContext"%>
-<%@ page import=3D"org.jahia.registries.SharedTemplatePackagesRegistry"%>
+<%-- @ page import=3D"org.jahia.registries.SharedTemplatePackagesRegistry"=
--%>
<%@ page import=3D"org.jahia.services.pages.ContentPage"%>
<%@ page import=3D"java.text.DateFormat" %>
<%@ page import=3D"java.text.SimpleDateFormat" %>
@@ -29,15 +29,15 @@
=
<%
Map importsInfos =3D (Map) session.getAttribute("importsInfos");
- List tpls =3D (List) request.getAttribute("tmplSets");
- if (tpls =3D=3D null) {
- SharedTemplatePackagesRegistry tmplSetReg =3D
SharedTemplatePackagesRe=
gistry.getInstance();
- Enumeration en =3D tmplSetReg.getAllTemplatePackages();
- tpls =3D new ArrayList();
- while (en.hasMoreElements()) {
- tpls.add(en.nextElement());
- }
- }
+ List tpls =3D (List) request.getAttribute("tmplSets");
+// if (tpls =3D=3D null) {
+// SharedTemplatePackagesRegistry tmplSetReg =3D
SharedTemplatePackages=
Registry.getInstance();
+// Enumeration en =3D tmplSetReg.getAllTemplatePackages();
+// tpls =3D new ArrayList();
+// while (en.hasMoreElements()) {
+// tpls.add(en.nextElement());
+// }
+// }
JahiaData jData =3D (JahiaData) request.getAttribute("org.jahia.data.J=
ahiaData");
ProcessingContext jParams =3D null;
if (jData !=3D null) {
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/admin=
istration/new_template_detail.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/webapp/jsp/jahia/administration/new_template_detail.j=
sp&rev=3D19004&repname=3Djahia
=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-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/administrat=
ion/new_template_detail.jsp (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/administrat=
ion/new_template_detail.jsp Tue Oct 30 17:43:00 2007
@@ -137,7 +137,7 @@
=
<%
JahiaTemplateDef def =3D null;
- Vector templates =3D aPackage.getTemplates();
+ List templates =3D aPackage.getTemplates();
int size =3D templates.size();
int count =3D 0;
=
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
