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

Timestamp:

02/20/13 11:36:52 (11 years ago)

Author:

keeloo

Message:

Changed WebAppConfig?.xml to VloConfig? to allow for the importerparameters to be included. Made the configuration sensitive to the web application context.

File:

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

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

@@ -3 +3 @@
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
-import javax.servlet.GenericServlet;
 import javax.servlet.ServletContext;
 import org.simpleframework.xml.Element;
@@ -89 +88 @@
     public VloConfig() {
         // let the superclass know about the logger defined here
-        // ConfigFileParam.logger = webAppConfigLogger;
 
         logger = new WebAppConfigLogger();
@@ -100 +98 @@
      */
     public static final String CONFIG_FILE =
-            VloConfig.class.getResource("/WebAppConfig.xml").getFile();
+            VloConfig.class.getResource("/VloConfig.xml").getFile();
 
     /**
@@ -131 +129 @@
     /**
      * kj: change the annotation. Instead of opening a context, it is now a 
-     * matter of initialising it. Make a new method for referencing.
+     * matter of initializing it. Make a new method for referencing.
      * 
      * Open a static context of WebAppConfig members, and assign values to
@@ -151 +149 @@
      * @return the web application configuration in a new static context
      */
-    public static VloConfig setWebApp(ServletContext context) {
+    public static VloConfig webApp() {
         if (config == null) {
             // the configuration is not there yet; create it now
@@ -157 +155 @@
         }
 
-        /**
-         * get the XML file configuration from the file by invoking the
-         * superclass method
-         */
+        // get the XML file configuration from the file by invoking the
+
         config = (VloConfig) read(config);
-
-        /* 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, context);
 
         return config;
@@ -177 +166 @@
      * method.
      * 
+     * In this method, exceptions to the normal web application context can 
+     * be made.
+     * 
      * @return 
      */
-    public static VloConfig WebAppTest() {
+    public static VloConfig testWebApp() {
         if (config == null) {
             // the configuration is not there yet; create it now
@@ -185 +177 @@
         }
 
-        /**
-         * get the XML file configuration from the file by invoking the
-         * superclass method
-         */
+        // get the XML file configuration from the file by invoking the
+
         config = (VloConfig) read(config);
 
@@ -607 +597 @@
             
     /**
+     *
+     * kj: repair annotation
+     * 
+     * Contrary to Simple, the web application's context parameters are not
+     * retrieved by annotation. Get them by invoking a local method.
+     *
      * Add properties of the {@literal servlet's} context<br><br>
-     * 
+     *  
      * Keep the properties in the static context of the WebAppConfig class, next
      * to the members representing the values in WebAppConfig.xml file.<br><br>
@@ -616 +612 @@
      * @return the static WebAppConfig member
      */
-    static VloConfig addServletContext(VloConfig config, ServletContext context) {
+    public static VloConfig addServletContext(VloConfig config, ServletContext context) {
 
         // retrieve parameter valies from the servlet context