[Aplaws-commit] r1134 - trunk/ccm-ldn-theme/web/templates/ccm-ldn-theme

[<ap...@vh...>]

Author: apevec
Date: 2006-05-04 00:07:18 +0200 (Thu, 04 May 2006)
New Revision: 1134

Modified:
   trunk/ccm-ldn-theme/web/templates/ccm-ldn-theme/sync-theme.jsp
Log:
don't mix JSP and XML syntax, coverted all to XML


Modified: trunk/ccm-ldn-theme/web/templates/ccm-ldn-theme/sync-theme.jsp
===================================================================
--- trunk/ccm-ldn-theme/web/templates/ccm-ldn-theme/sync-theme.jsp	2006-05-03 21:28:34 UTC (rev 1133)
+++ trunk/ccm-ldn-theme/web/templates/ccm-ldn-theme/sync-theme.jsp	2006-05-03 22:07:18 UTC (rev 1134)
@@ -12,8 +12,6 @@
   <jsp:directive.page import="com.arsdigita.london.theme.Theme"/>
   <jsp:directive.page import="javax.servlet.jsp.JspWriter"/>
   <jsp:directive.page import="com.arsdigita.domain.DataObjectNotFoundException"/>
-    <%//    <jsp:directive.page import="com.arsdigita.cms.publishToFile.LocalRequestPassword"/>
-%>
     <jsp:directive.page import="com.arsdigita.dispatcher.AccessDeniedException"/>
     <jsp:directive.page import="com.arsdigita.kernel.Party"/>
     <jsp:directive.page import="com.arsdigita.kernel.Kernel"/>
@@ -23,8 +21,6 @@
     <jsp:directive.page import="com.arsdigita.kernel.permissions.PermissionService"/>
   <jsp:scriptlet>
     DispatcherHelper.cacheDisable(response);
-  </jsp:scriptlet>
-<%
         Party party = Kernel.getContext().getParty();
         Resource resource = Kernel.getContext().getResource();
         PermissionDescriptor permDescriptor =
@@ -33,8 +29,9 @@
                                      party);
 // we don't do permissions checks yet because we don't have an easy
 // way to do it.
+// jsp:directive.page import="com.arsdigita.cms.publishToFile.LocalRequestPassword"
 /*
-        if (!LocalRequestPassword.validLocalRequest(request) && !PermissionService.checkPermission(permDescriptor)) {
+        if (!LocalRequestPassword.validLocalRequest(request) &amp;&amp; !PermissionService.checkPermission(permDescriptor)) {
             throw new AccessDeniedException();
         }
 */
@@ -58,7 +55,7 @@
         String updateType = request.getParameter("updateType");
         ThemeFileManager pubManager = ThemePublishedFileManager.getInstance();
         ThemeFileManager devManager = ThemeDevelopmentFileManager.getInstance();
-        if (pubManager != null && (updateType == null || ThemeFile.LIVE.equals(updateType))) {
+        if (pubManager != null &amp;&amp; (updateType == null || ThemeFile.LIVE.equals(updateType))) {
             if (theme == null) {
                 pubManager.updateAllThemesNow();
             } else {
@@ -66,13 +63,15 @@
             }
         }
 
-        if (devManager != null && (updateType == null || ThemeFile.DRAFT.equals(updateType))) {
+        if (devManager != null &amp;&amp; (updateType == null || ThemeFile.DRAFT.equals(updateType))) {
             if (theme == null) {
                 devManager.updateAllThemesNow();
             } else {
                 devManager.updateThemeNow(theme);
             }
         }
-%>
+  </jsp:scriptlet>
+<jsp:text>
 Sync Complete
+</jsp:text>
 </jsp:root>