Changeset 2590 for vlo/branches/vlo-2.13-param/vlo_webapp/src/main/java/eu/clarin/cmdi/vlo/config/WebAppConfig.java

Timestamp:

02/14/13 15:46:12 (11 years ago)

Author:

keeloo

Message:

some work on the vlo tests

File:

• vlo/branches/vlo-2.13-param/vlo_webapp/src/main/java/eu/clarin/cmdi/vlo/config/WebAppConfig.java (modified) (6 diffs)

vlo/branches/vlo-2.13-param/vlo_webapp/src/main/java/eu/clarin/cmdi/vlo/config/WebAppConfig.java

@@ -66 +66 @@
  */
 @Root
-public class WebAppConfig extends ConfigFileParam {
+public class WebAppConfig extends ConfigFromFile {
 
     // create a reference to the application logging
@@ -94 +94 @@
         ConfigFilePersister.setLogger(WebAppConfig.logger);
     }
-
+    
     /**
      * XML File in which the application configuration is stored
@@ -161 +161 @@
         /* Contrary to Simple, the servlet context parameters are not retrieved
          * by annotation. Get them by invoking a local method. 
+         * 
+         * Here also invoke a superclass method
          */
         config = addServletContext(config);
@@ -567 +569 @@
         
         servletContext = context;
-    }
-
+        
+        // servletContest can be null 
+    }
+    
     /**
      * Add properties of the {@literal servlet's} context<br><br>
@@ -582 +586 @@
 
         // retrieve parameter valies from the servlet context
-
-        config.solrUrl = servletContext.getInitParameter("solrUrl");
+        
+        if (servletContext == null) {
+            // no servlet context yet
+            
+        } else {
+            config.solrUrl = servletContext.getInitParameter("solrUrl");
+        }
 
         return config;
@@ -595 +604 @@
      */
     
-    @Element
     private String solrUrl = "";