setting vaadin production mode to true - globally

diff --git a/src/main/java/eu/etaxonomy/cdm/vaadin/ui/CheckUI.java b/src/main/java/eu/etaxonomy/cdm/vaadin/ui/CheckUI.java
index d97e221e082748a3833e29e53b06189c03bd7271..d53811576b46c2a73029d258482e02df375e131a 100644 (file)
--- a/src/main/java/eu/etaxonomy/cdm/vaadin/ui/CheckUI.java
+++ b/src/main/java/eu/etaxonomy/cdm/vaadin/ui/CheckUI.java
@@ -21,6 +21,10 @@ public class CheckUI extends UI
 //                     @WebInitParam(name="org.atmosphere.cpr.asyncSupport", value="org.atmosphere.container.Jetty9AsyncSupportWithWebSocket")
 //     })
 
+    /*
+     * NOTE: productionMode=true seems not to have any effect here, maybe because we are using multiple Servlets?
+     * The is therefore set globally in the web.xml
+     */
     @WebServlet(value = {"/app/*"}, asyncSupported = true)
     @VaadinServletConfiguration(productionMode = true, ui = CheckUI.class, widgetset = "eu.etaxonomy.cdm.vaadin.AppWidgetSet")
     public static class Servlet extends VaadinServlet {

diff --git a/src/main/java/eu/etaxonomy/cdm/vaadin/ui/ConceptRelationshipUI.java b/src/main/java/eu/etaxonomy/cdm/vaadin/ui/ConceptRelationshipUI.java
index e4bfbf5eae30efa17ef5e2ec79ea12c05ccf105b..63052e1d89edb0951aa049fcd016d73d431160a5 100644 (file)
--- a/src/main/java/eu/etaxonomy/cdm/vaadin/ui/ConceptRelationshipUI.java
+++ b/src/main/java/eu/etaxonomy/cdm/vaadin/ui/ConceptRelationshipUI.java
@@ -37,6 +37,10 @@ public class ConceptRelationshipUI extends AbstractAuthenticatedUI {
 
     private final static Logger logger = Logger.getLogger(ConceptRelationshipUI.class);
 
+    /*
+     * NOTE: productionMode=true seems not to have any effect here, maybe because we are using multiple Servlets?
+     * The is therefore set globally in the web.xml
+     */
     @WebServlet(value = {"/app/concept/*"}, asyncSupported = true)
     @VaadinServletConfiguration(productionMode = true, ui = ConceptRelationshipUI.class, widgetset = "eu.etaxonomy.cdm.vaadin.AppWidgetSet")
     public static class Servlet extends VaadinServlet {

diff --git a/src/main/java/eu/etaxonomy/cdm/vaadin/ui/DbStatusUI.java b/src/main/java/eu/etaxonomy/cdm/vaadin/ui/DbStatusUI.java
index f97ef1205287c665a04e4c08f05622d51f64d1b9..daf1221d4e594652220f03e95ebbfd3ce5c56932 100644 (file)
--- a/src/main/java/eu/etaxonomy/cdm/vaadin/ui/DbStatusUI.java
+++ b/src/main/java/eu/etaxonomy/cdm/vaadin/ui/DbStatusUI.java
@@ -19,6 +19,10 @@ public class DbStatusUI extends AbstractAuthenticatedUI{
 
        private static final String FIRST_VIEW = "firstView";
 
+    /*
+     * NOTE: productionMode=true seems not to have any effect here, maybe because we are using multiple Servlets?
+     * The is therefore set globally in the web.xml
+     */
        @WebServlet(value = {"/app/distribution/*"}, asyncSupported = true)
        @VaadinServletConfiguration(productionMode = true, ui = DbStatusUI.class, widgetset = "eu.etaxonomy.cdm.vaadin.AppWidgetSet")
        public static class Servlet extends CdmVaadinConversationalServlet {

diff --git a/src/main/java/eu/etaxonomy/cdm/vaadin/ui/StatusEditorUI.java b/src/main/java/eu/etaxonomy/cdm/vaadin/ui/StatusEditorUI.java
index 749e96ca81127105ec63f87591ccccaf9611c808..2ab51b891bab87e33c5dac5c24503963a850be1c 100644 (file)
--- a/src/main/java/eu/etaxonomy/cdm/vaadin/ui/StatusEditorUI.java
+++ b/src/main/java/eu/etaxonomy/cdm/vaadin/ui/StatusEditorUI.java
@@ -41,6 +41,10 @@ public class StatusEditorUI extends AbstractAuthenticatedUI {
     private final static Logger logger =
             Logger.getLogger(StatusEditorUI.class.getName());
 
+    /*
+     * NOTE: productionMode=true seems not to have any effect here, maybe because we are using multiple Servlets?
+     * The is therefore set globally in the web.xml
+     */
     @WebServlet(value = {"/app/editstatus/*"}, asyncSupported = true)
     @VaadinServletConfiguration(productionMode = true, ui = StatusEditorUI.class, widgetset = "eu.etaxonomy.cdm.vaadin.AppWidgetSet")
     public static class Servlet extends VaadinServlet {

diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index aefe5496bde6c96912b7ed159bf9480190c470c9..1b960810ccdab3ba2ea34b05cb2ed99e35fd968f 100644 (file)
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -49,5 +49,16 @@
       <filter-name>charsetFilter</filter-name>
       <url-pattern>/*</url-pattern>
     </filter-mapping>
-
+    
+    <!-- 
+      The production mode is disabled per default.
+      
+      There are also productionMode=true settings in the eu.etaxonomy.cdm.vaadin.ui package
+      which don't seem to have an effect. 
+    -->
+    <context-param>
+      <description>Vaadin production mode</description>
+      <param-name>productionMode</param-name>
+      <param-value>true</param-value>
+    </context-param>
 </web-app>