Changeset 5327

Timestamp:

08/31/10 13:46:44 (17 months ago)

Author:

mtld

Message:

made xmlonly depending on build mode instead of editmode

Files:

• branches/release-0.15.x/pustefix-core/src/main/java/org/pustefixframework/http/AbstractPustefixXMLRequestHandler.java (modified) (6 diffs)

branches/release-0.15.x/pustefix-core/src/main/java/org/pustefixframework/http/AbstractPustefixXMLRequestHandler.java

@@ -62 +62 @@
 import de.schlund.pfixxml.SessionCleaner;
 import de.schlund.pfixxml.Variant;
+import de.schlund.pfixxml.config.BuildTimeProperties;
 import de.schlund.pfixxml.perflogging.AdditionalTrailInfo;
 import de.schlund.pfixxml.serverutil.SessionHelper;
@@ -157 +158 @@
     private boolean      includePartsEditableByDefault = true;
     private boolean      checkModtime               = true;
+    private boolean xmlOnlyAllowed = false;
     
     private final static Logger LOGGER_TRAIL = Logger.getLogger("LOGGER_TRAIL");
@@ -191 +193 @@
         servletname = this.getAbstractXMLServletConfig().getServletName();
 
+        String mode = BuildTimeProperties.getProperties().getProperty("mode");
+        if(!"prod".equals(mode)) xmlOnlyAllowed = true; 
+        
         if (generator == null) {
             LOGGER.error("Error: TargetGenerator has not been set.");
@@ -204 +209 @@
             sb.append("               servletname = ").append(servletname).append("\n");
             sb.append("           editModeAllowed = ").append(editmodeAllowed).append("\n");
+            sb.append("            xmlOnlyAllowed = ").append(xmlOnlyAllowed).append("\n");
             sb.append("             maxStoredDoms = ").append(maxStoredDoms).append("\n");
             sb.append("                   timeout = ").append(sessionCleaner.getTimeout()).append("\n");
@@ -397 +403 @@
             // This is a seperate place from the SessionCleaner as we don't want to interfere with this, nor do we want to use 
             // the whole queue of possible stored SPDocs only for the viewing of the DOM during development.
-            if (editmodeAllowed) {
+            if (xmlOnlyAllowed) {
                 session.setAttribute(ATTR_SHOWXMLDOC, spdoc);
             }
@@ -769 +775 @@
             throw new IllegalArgumentException("invalid value for " + PARAM_XMLONLY + ": " + value);
         }
-        if (editmodeAllowed || (testRecording!=null && testRecording.isKnownClient(pfreq.getRemoteAddr()))) {
+        if (xmlOnlyAllowed || (testRecording!=null && testRecording.isKnownClient(pfreq.getRemoteAddr()))) {
             return rendering;
         } else {