Changeset 2659

Timestamp:

03/07/13 08:48:58 (11 years ago)

Author:

keeloo

Message:

Removed VloConfig?.get() and made the member variables static themselves. Cleaned up the VloConfig? class.

Location:

vlo/branches/vlo-2.13-param

Files:

• vlo_importer/src/main/java/eu/clarin/cmdi/vlo/config/VloConfig.java (modified) (40 diffs)
• vlo_importer/src/main/java/eu/clarin/cmdi/vlo/config/VloContextConfig.java (modified) (1 diff)
• vlo_importer/src/main/java/eu/clarin/cmdi/vlo/importer/CMDIComponentProfileNamePostProcessor.java (modified) (1 diff)
• vlo_importer/src/main/java/eu/clarin/cmdi/vlo/importer/CMDIParserVTDXML.java (modified) (1 diff)
• vlo_importer/src/main/java/eu/clarin/cmdi/vlo/importer/CountryNamePostProcessor.java (modified) (1 diff)
• vlo_importer/src/main/java/eu/clarin/cmdi/vlo/importer/LanguageCodePostProcessor.java (modified) (5 diffs)
• vlo_importer/src/main/java/eu/clarin/cmdi/vlo/importer/MetadataImporter.java (modified) (3 diffs)
• vlo_importer/src/main/java/eu/clarin/cmdi/vlo/importer/NationalProjectPostProcessor.java (modified) (1 diff)
• vlo_importer/src/test/java/eu/clarin/cmdi/vlo/importer/ImporterTestcase.java (modified) (1 diff)
• vlo_importer/src/test/java/eu/clarin/cmdi/vlo/importer/MetadataImporterTest.java (modified) (1 diff)
• vlo_web_app/src/main/java/eu/clarin/cmdi/vlo/VloWebApplication.java (moved) (moved from vlo/branches/vlo-2.13-param/vlo_web_app/src/main/java/eu/clarin/cmdi/vlo/VloApplication.java) (4 diffs)
• vlo_web_app/src/main/java/eu/clarin/cmdi/vlo/VloWebApplication.properties (moved) (moved from vlo/branches/vlo-2.13-param/vlo_web_app/src/main/java/eu/clarin/cmdi/vlo/VloApplication.properties)
• vlo_web_app/src/main/java/eu/clarin/cmdi/vlo/dao/DaoLocator.java (modified) (2 diffs)
• vlo_web_app/src/main/java/eu/clarin/cmdi/vlo/dao/SolrDao.java (modified) (3 diffs)
• vlo_web_app/src/main/java/eu/clarin/cmdi/vlo/pages/FacetedSearchPage.java (modified) (1 diff)
• vlo_web_app/src/main/java/eu/clarin/cmdi/vlo/pages/HtmlFormCreator.java (modified) (1 diff)
• vlo_web_app/src/main/java/eu/clarin/cmdi/vlo/pages/ResourceLinkPanel.java (modified) (2 diffs)
• vlo_web_app/src/main/java/eu/clarin/cmdi/vlo/pages/SearchPageQuery.java (modified) (1 diff)
• vlo_web_app/src/main/java/eu/clarin/cmdi/vlo/pages/ShowResultPage.java (modified) (1 diff)
• vlo_web_app/src/main/webapp/WEB-INF/web.xml (modified) (2 diffs)
• vlo_web_app/src/test/java/eu/clarin/cmdi/vlo/TestFacetedSearchPage.java (modified) (1 diff)
• vlo_web_app/src/test/java/eu/clarin/cmdi/vlo/pages/FacetBoxPanelTest.java (modified) (2 diffs)
• vlo_web_app/src/test/java/eu/clarin/cmdi/vlo/pages/ResourceLinkPanelTest.java (modified) (2 diffs)

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

@@ -17 +17 @@
  * the VLO web application.
  * 
- * A member is annotated by prepending @element. When the VloConfig class is
- * reflected into the Simple framework, the framework will assign the values
- * it finds in the VloConfig.xml file to the members in the VloConfig class. 
- * 
- * By invoking the get method defined in the VloConfig class, a VLO application 
- * can query the value of a parameter. If you just instantiate an instance of 
- * the VloConfig class, the members will be assigned values from the packaged 
- * the VloConfig.xml file. 
- * 
- * Alternatively, the readConfig methods will let you specify an xml file of 
- * your choice. 
- * 
- * Whenever you like to add a parameter the VLO configuration, add a member 
- * with the appropriate name and type, and prepend an at aign to the 
+ * A member is annotated by prepending {@literal @element}. When the VloConfig 
+ * class is reflected into the Simple framework, the framework will assign the 
+ * values it finds in the VloConfig.xml file to the members in the VloConfig 
+ * class. 
+ * 
+ * Whenever you need to add a parameter the VLO configuration, add a member 
+ * with the appropriate name and type, and prepend an at sign to the 
  * declaration, like this:
  * 
  * {@literal @element}<br> {@literal parameterMember}<br><br>
  * 
- * The xml file used should in this case contain a definition like
+ * The XML should in this case contain a definition like
  * 
  * {@literal<parameterMember>} "the value of the
@@ -41 +34 @@
  *
  * If you want to add a type of member that is not included in VloConfig class 
- * yet, or if you are looking for more information on the framework, please refer
- * to <url> <br><br> 
- * 
- * The parameters are stored statically. This means that after you have create 
- * a VloConfig object, you can reference a parameter outside the scope in which
- * the object was originally created. So after a VloConfig object has been 
- * created, get() in 
+ * yet, or if you are looking for more information on the framework, please 
+ * refer to <url> <br><br> 
+ * 
+ * In the VloConfig class, the parameters are stored statically. This means that
+ * after 
+ * 
+ * {@literal VloConfig.read();}<br><br>
+ * 
+ * or
+ * 
+ * {@literal VloConfig.read();}<br><br>
+ * 
+ * has been issued from a certain context, you can reference a parameter by
+ * 
+ * {@literal WebAppConfig.getSomeParameter();}<br><br>
  *
- * WebAppConfig.get().getSomeParameter();<br><br>
+ * in any scope, also the scope from which the read message was send.
  *
- * will return the configuration, and getSomeParameter() will return a
- * specific parameter in it. 
- * 
  * Through the get and set methods, the application is indifferent to the origin
  * of a parameter: you can get and set the value of a parameter without having
  * to worry about how the parameter was defined originally. 
  *
- * By invoking the read method, and by querying the context, the web
- * application, on initialization, determines which definition to use. 
- * 
  * Also, the get and set methods allow for a modification of the original value
  * of the parameter. For example, if the format of a parameter changes, this 
@@ -128 +123 @@
 
     /**
+     * Read the configuration from the packaged XML configuration file.  
+     * 
+     * @param fileName the name of the file to read the configuration from
+     *
+     * @return the configuration 
+     */
+    public static VloConfig readPackagedConfig() {
+        
+        // set the name of the packaged configuration file
+        String fileName = "/VloConfig";
+        
+        config = VloConfig.readConfig (fileName);
+        
+        return config;
+    }
+    
+    /**
      * Read the configuration from an XML file. 
      *
@@ -138 +150 @@
      */
     public static VloConfig readConfig(String fileName) {
+        
+        // may it is safe to first expand the name a litte bit more
+
         if (config == null) {
             // the configuration is not there yet; create it now
@@ -152 +167 @@
      * Read the configuration from an XML file. 
      * 
-     * Invole this method instead of readConfig() if you want to change
+     * Invoke this method instead of readConfig() if you want to change
      * the parameters because the application is run in a context different
      * from the usual one. Here, modifications of the parameters inspired on
      * the difference in context can be made.
      * 
-     * A web application can serve as a tipical example of a difference in 
+     * A web application can serve as a typical example of a difference in 
      * context: the application itself runs in a web server container, while the
      * tests associated with the web application will be run outside this 
@@ -167 +182 @@
      */
     public static VloConfig readTestConfig(String fileName) {
-        if (config == null) {
-            // the configuration is not there yet; create it now
-            config = new VloConfig();
-        }
-
-        // get the XML file configuration from the file by invoking ...
-        config = (VloConfig) read(fileName, config);
+
+        config = VloConfig.readConfig (fileName);
         
-        // modify the parameters here
-
-        return config;
-    }
-    
-    /**
-     * Return the reference to the configuration
-     * 
-     * @return the configuration
-     */
-    public static VloConfig get (){
+        // modify the configuration here
+
         return config;
     }
@@ -200 +201 @@
     
     @Element // directive for Simple
-    private boolean deleteAllFirst = false;
-    
-    @Element
-    private boolean printMapping = false;
+    private static boolean deleteAllFirst = false;
+    
+    @Element
+    private static boolean printMapping = false;
     
     @ElementList // directive for Simple
-    private List<DataRoot> dataRoots;
-    
-    public List<DataRoot> getDataRoots() {
+    private static List<DataRoot> dataRoots;
+    
+    public static List<DataRoot> getDataRoots() {
         return dataRoots;
     }
     
     @Element
-    private String vloHomeLink = "";
-    
-    @Element
-    private String solrUrl = "";
-    
-    @Element
-    private String profileSchemaUrl = "";
-
-    @Element
-    private String componentRegistryRESTURL = "";
-    
-    @Element
-    private String handleServerUrl = "";
-    
-    @Element
-    private String imdiBrowserUrl = "";
+    private static String vloHomeLink = "";
+    
+    @Element
+    private static String solrUrl = "";
+    
+    @Element
+    private static String profileSchemaUrl = "";
+
+    @Element
+    private static String componentRegistryRESTURL = "";
+    
+    @Element
+    private static String handleServerUrl = "";
+    
+    @Element
+    private static String imdiBrowserUrl = "";
     
     /**
@@ -235 +236 @@
      */
     @Element
-    private String nationalProjectMapping = "";
+    private static String nationalProjectMapping = "";
     
     /**
@@ -261 +262 @@
      */
     @ElementArray(entry = "facetField")
-    private String[] facetFields = {"", "", ""};
-    
-    @Element
-    private String countryComponentUrl = "";
-    
-    @Element
-    private String language2LetterCodeComponentUrl = "";
-    
-    @Element
-    private String language3LetterCodeComponentUrl = "";
-    
-    @Element
-    private String silToISO639CodesUrl = "";
-    
-    @Element
-    private String FederatedContentSearchUrl = " ";
+    private static String[] facetFields = {"", "", ""};
+    
+    @Element
+    private static String countryComponentUrl = "";
+    
+    @Element
+    private static String language2LetterCodeComponentUrl = "";
+    
+    @Element
+    private static String language3LetterCodeComponentUrl = "";
+    
+    @Element
+    private static String silToISO639CodesUrl = "";
+    
+    @Element
+    private static String FederatedContentSearchUrl = " ";
 
     /**
@@ -294 +295 @@
      * @param dataRoots the value
      */
-    public void setDataRoots(List<DataRoot> dataRoots) {
-        this.dataRoots = dataRoots;
+    public static void setDataRoots(List<DataRoot> param) {
+        dataRoots = param;
     }
 
@@ -306 +307 @@
      * @return the value
      */
-    public void setDeleteAllFirst(boolean deleteAllFirst) {
-        this.deleteAllFirst = deleteAllFirst;
+    public static void setDeleteAllFirst(boolean param) {
+        deleteAllFirst = param;
     }
 
@@ -318 +319 @@
      * @return the value
      */
-    public boolean isDeleteAllFirst() {
+    public static boolean isDeleteAllFirst() {
         return deleteAllFirst;
     }
@@ -330 +331 @@
      * @param printMapping the value
      */
-    public void setPrintMapping(boolean printMapping) {
-        this.printMapping = printMapping;
+    public static void setPrintMapping(boolean param) {
+        printMapping = param;
     }
 
@@ -342 +343 @@
      * @return the value
      */
-    public boolean isPrintMapping() {
+    public static boolean isPrintMapping() {
         return printMapping;
     }
@@ -354 +355 @@
      * @return the value
      */
-    public String getVloHomeLink() {
+    public static String getVloHomeLink() {
         return vloHomeLink;
     }
@@ -366 +367 @@
      * @param vloHomeLink the value
      */
-    public void setVloHomeLink(String link) {
-        this.vloHomeLink = link;
+    public static void setVloHomeLink(String param) {
+        vloHomeLink = param;
     }
 
@@ -378 +379 @@
      * @return the value
      */
-    public String getSolrUrl() {
+    static public String getSolrUrl() {
         return solrUrl;
     }
@@ -390 +391 @@
      * @param url the parameter
      */
-    public void setSolrUrl(String url) {
-        this.solrUrl = url;
+    public static void setSolrUrl(String param) {
+        solrUrl = param;
     }
 
@@ -402 +403 @@
      * @return the value
      */
-    public String getComponentRegistryProfileSchema(String id) {
+    public static String getComponentRegistryProfileSchema(String id) {
         return profileSchemaUrl.replace("{PROFILE_ID}", id);
     }
@@ -414 +415 @@
      * @param profileId the value
      */
-    public void setProfileSchemaUrl(String url) {
-        this.profileSchemaUrl = url;
+    public static void setProfileSchemaUrl(String param) {
+        profileSchemaUrl = param;
     }
 
@@ -426 +427 @@
      * @return the value
      */
-    public String getComponentRegistryRESTURL() {
+    public static String getComponentRegistryRESTURL() {
         return componentRegistryRESTURL;
     }
@@ -438 +439 @@
      * @param componentRegistryRESTURL the value
      */
-    public void setComponentRegistryRESTURL(String url) {
-        this.componentRegistryRESTURL = url;
+    public static void setComponentRegistryRESTURL(String param) {
+        componentRegistryRESTURL = param;
     }
 
@@ -450 +451 @@
      * @return the value
      */
-    public String getHandleServerUrl() {
+    public static String getHandleServerUrl() {
         return handleServerUrl;
     }
@@ -462 +463 @@
      * @param handleServerUrl the value
      */
-    public void setHandleServerUrl(String url) {
-        this.handleServerUrl = url;
+    public static void setHandleServerUrl(String param) {
+        handleServerUrl = param;
     }
 
@@ -474 +475 @@
      * @param imdiBrowserUrl the value
      */
-    public void setIMDIBrowserUrl(String url) {
-        this.imdiBrowserUrl = url;
+    public static void setIMDIBrowserUrl(String param) {
+        imdiBrowserUrl = param;
     }
 
@@ -485 +486 @@
      * @return the value 
      */
-    public String getIMDIBrowserUrl(String handle) {
+    public static String getIMDIBrowserUrl(String handle) {
         String result;
         try {
@@ -503 +504 @@
      * @return the value
      */
-    public void setFederatedContentSearchUrl(String url) {
-        this.FederatedContentSearchUrl = url;
+    public static void setFederatedContentSearchUrl(String param) {
+        FederatedContentSearchUrl = param;
     }
 
@@ -515 +516 @@
      * @param FederatedContentSearchUrl the value
      */
-    public String getFederatedContentSearchUrl() {
+    public static String getFederatedContentSearchUrl() {
         return FederatedContentSearchUrl;
     }
@@ -527 +528 @@
      * @param nationalProjectMapping the value
      */
-    public void setNationalProjectMapping(String mapping) {
-        this.nationalProjectMapping = mapping;
-    }
+    public static void setNationalProjectMapping(String param) {
+        nationalProjectMapping = param;
+    }
+   
 
     /**
@@ -539 +541 @@
      * @return the value
      */
-    public String getNationalProjectMapping() {
+    public static String getNationalProjectMapping() {
         return nationalProjectMapping;
     }
@@ -551 +553 @@
      * @return the value
      */
-    public String[] getFacetFields() {
+    public static String[] getFacetFields() {
         return facetFields;
     }
@@ -563 +565 @@
      * @param facetFields the value, a list of facet fields
      */
-    public void setFacetFields(String[] fields) {
-        this.facetFields = fields;
+    public static void setFacetFields(String[] param) {
+        facetFields = param;
     }
 
@@ -575 +577 @@
      * @return the value
      */
-    public String getCountryComponentUrl() {
+    public static String getCountryComponentUrl() {
         return countryComponentUrl;
     }
@@ -587 +589 @@
      * @param countryComponentUrl the value
      */
-    public void setCountryComponentUrl(String url) {
-        this.countryComponentUrl = url;
+    public static void setCountryComponentUrl(String param) {
+        countryComponentUrl = param;
     }
 
@@ -599 +601 @@
      * @return the value
      */
-    public String getLanguage2LetterCodeComponentUrl() {
+    public static String getLanguage2LetterCodeComponentUrl() {
         return language2LetterCodeComponentUrl;
     }
@@ -611 +613 @@
      * @param language2LetterCodeComponentUrl the value
      */
-    public void setLanguage2LetterCodeComponentUrl(String url) {
-        this.language2LetterCodeComponentUrl = url;
+    public static void setLanguage2LetterCodeComponentUrl(String param) {
+        language2LetterCodeComponentUrl = param;
     }
 
@@ -623 +625 @@
      * @return the value
      */
-    public String getLanguage3LetterCodeComponentUrl() {
+    public static String getLanguage3LetterCodeComponentUrl() {
         return language3LetterCodeComponentUrl;
     }
@@ -635 +637 @@
      * @param language3LetterCodeComponentUrl the value
      */
-    public void setLanguage3LetterCodeComponentUrl(String url) {
-        this.language3LetterCodeComponentUrl = url;
+    public static void setLanguage3LetterCodeComponentUrl(String param) {
+        language3LetterCodeComponentUrl = param;
     }
 
@@ -647 +649 @@
      * @return the value
      */
-    public String getSilToISO639CodesUrl() {
+    public static String getSilToISO639CodesUrl() {
         return silToISO639CodesUrl;
     }
@@ -659 +661 @@
      * @param silToISO639CodesUrl the value
      */
-    public void setSilToISO639CodesUrl(String url) {
-        this.silToISO639CodesUrl = url;
+    public static void setSilToISO639CodesUrl(String param) {
+        silToISO639CodesUrl = param;
     }
 }

vlo/branches/vlo-2.13-param/vlo_importer/src/main/java/eu/clarin/cmdi/vlo/config/VloContextConfig.java

@@ -69 +69 @@
             // overrule the current value of solrUrl
 
-            VloConfig.get().setSolrUrl(url);
+            VloConfig.setSolrUrl(url);
         }
         

vlo/branches/vlo-2.13-param/vlo_importer/src/main/java/eu/clarin/cmdi/vlo/importer/CMDIComponentProfileNamePostProcessor.java

@@ -69 +69 @@
         }
         vg = new VTDGen();
-        BASE_URL = VloConfig.get().getComponentRegistryRESTURL();
+        BASE_URL = VloConfig.getComponentRegistryRESTURL();
     }
 }

vlo/branches/vlo-2.13-param/vlo_importer/src/main/java/eu/clarin/cmdi/vlo/importer/CMDIParserVTDXML.java

@@ -79 +79 @@
         if (index != -1) {
             String profileId = nav.toString(index).trim();
-            result = VloConfig.get().getComponentRegistryProfileSchema(profileId);
+            result = VloConfig.getComponentRegistryProfileSchema(profileId);
         }
         return result;

vlo/branches/vlo-2.13-param/vlo_importer/src/main/java/eu/clarin/cmdi/vlo/importer/CountryNamePostProcessor.java

@@ -41 +41 @@
         LOG.debug("Creating country code map.");
         try {
-            Map<String, String> result = CommonUtils.createCMDIComponentItemMap(VloConfig.get().getCountryComponentUrl());
+            Map<String, String> result = CommonUtils.createCMDIComponentItemMap(VloConfig.getCountryComponentUrl());
             return result;
         } catch (Exception e) {

vlo/branches/vlo-2.13-param/vlo_importer/src/main/java/eu/clarin/cmdi/vlo/importer/LanguageCodePostProcessor.java

@@ -98 +98 @@
     private Map<String, String> getTwoLetterCountryCodeMap() {
         if (twoLetterCodesMap == null) {
-            twoLetterCodesMap = createCodeMap(VloConfig.get().getLanguage2LetterCodeComponentUrl());
+            twoLetterCodesMap = createCodeMap(VloConfig.getLanguage2LetterCodeComponentUrl());
         }
         return twoLetterCodesMap;
@@ -105 +105 @@
     private Map<String, String> getThreeLetterCountryCodeMap() {
         if (threeLetterCodesMap == null) {
-            threeLetterCodesMap = createCodeMap(VloConfig.get().getLanguage3LetterCodeComponentUrl());
+            threeLetterCodesMap = createCodeMap(VloConfig.getLanguage3LetterCodeComponentUrl());
         }
         return threeLetterCodesMap;
@@ -112 +112 @@
     protected Map<String, String> getLanguageNameToIso639Map() {
         if (languageNameToIso639Map == null) {
-                        languageNameToIso639Map = createReverseCodeMap(VloConfig.get().getLanguage3LetterCodeComponentUrl());
+                        languageNameToIso639Map = createReverseCodeMap(VloConfig.getLanguage3LetterCodeComponentUrl());
         }
         return languageNameToIso639Map;
@@ -119 +119 @@
     private Map<String, String> getIso639ToLanguageNameMap() {
         if (iso639ToLanguageNameMap == null) {
-                iso639ToLanguageNameMap = createCodeMap(VloConfig.get().getLanguage3LetterCodeComponentUrl());
+                iso639ToLanguageNameMap = createCodeMap(VloConfig.getLanguage3LetterCodeComponentUrl());
         }
 
@@ -151 +151 @@
             DocumentBuilderFactory domFactory = DocumentBuilderFactory.newInstance();
             domFactory.setNamespaceAware(true);
-            URL url = new URL(VloConfig.get().getSilToISO639CodesUrl());
+            URL url = new URL(VloConfig.getSilToISO639CodesUrl());
             DocumentBuilder builder = domFactory.newDocumentBuilder();
             Document doc = builder.parse(url.openStream());

vlo/branches/vlo-2.13-param/vlo_importer/src/main/java/eu/clarin/cmdi/vlo/importer/MetadataImporter.java

@@ -119 +119 @@
         try {
             // Delete the whole Solr db
-            if (VloConfig.get().isDeleteAllFirst()) {
+            if (VloConfig.isDeleteAllFirst()) {
                 LOG.info("Deleting original data...");
                 solrServer.deleteByQuery("*:*");
@@ -175 +175 @@
      */
     private List<DataRoot> checkDataRoots() {
-        List<DataRoot> dataRoots = VloConfig.get().getDataRoots();
+        List<DataRoot> dataRoots = VloConfig.getDataRoots();
         for (DataRoot dataRoot : dataRoots) {
             if (!dataRoot.getRootFile().exists()) {
@@ -210 +210 @@
      */
     protected void initSolrServer() throws MalformedURLException {
-        String solrUrl = VloConfig.get().getSolrUrl();
+        String solrUrl = VloConfig.getSolrUrl();
         LOG.info("Initializing Solr Server on " + solrUrl);
         solrServer = new StreamingUpdateSolrServer(solrUrl, 1000, 2) {

vlo/branches/vlo-2.13-param/vlo_importer/src/main/java/eu/clarin/cmdi/vlo/importer/NationalProjectPostProcessor.java

@@ -51 +51 @@
 
         private Map<String, String> getNationalProjectMapping() {
-        String mappingFileName = VloConfig.get().getNationalProjectMapping();
+        String mappingFileName = VloConfig.getNationalProjectMapping();
         if(mappingFileName == null){
             throw new RuntimeException("Configuration Error, NationalProjectMapping is null");

vlo/branches/vlo-2.13-param/vlo_importer/src/test/java/eu/clarin/cmdi/vlo/importer/ImporterTestcase.java

@@ -41 +41 @@
         // optionally, modify the configuration here
         
-        VloConfig.get().setComponentRegistryRESTURL("http://catalog.clarin.eu/ds/ComponentRegistry/rest/registry/profiles/");
+        VloConfig.setComponentRegistryRESTURL("http://catalog.clarin.eu/ds/ComponentRegistry/rest/registry/profiles/");
     }
 

vlo/branches/vlo-2.13-param/vlo_importer/src/test/java/eu/clarin/cmdi/vlo/importer/MetadataImporterTest.java

@@ -14 +14 @@
 import org.apache.solr.common.SolrInputDocument;
 import static org.junit.Assert.assertEquals;
-import org.junit.Before;
 import org.junit.Test;
 

vlo/branches/vlo-2.13-param/vlo_web_app/src/main/java/eu/clarin/cmdi/vlo/VloWebApplication.java

@@ -11 +11 @@
  * {@literal VLO} web application.<br><br>
  *
- * Because the VloApplication class extends WebApplication, a class instance
+ * Because the VloWebApplication class extends WebApplication, a class instance
  * will normally reside inside a web server container. By running the Start
  * class however, an instance of the application will reside outside a server
@@ -17 +17 @@
  *
  */
-public class VloApplication extends WebApplication {
+public class VloWebApplication extends WebApplication {
 
     private SearchResultsDao searchResults;
@@ -61 +61 @@
      * server container.
      */
-    public VloApplication() {
+    public VloWebApplication() {
 
         /**
-         * Read the application's configuration. Because on instantiation a web
-         * application cannot said to be living in a context, context parameters
-         * can only be added to the configuration later, in this case: when the
-         * {@literal init()} method will be invoked.
+         * Read the application's configuration. 
+         * 
+         * Because on instantiation a web application cannot said to be living 
+         * in a web server context, parameters defined in the context can only 
+         * be added to the configuration later, in this case: when the {@literal
+         * init()} method will be invoked.
          */
-        String fileName = VloConfig.class.getResource("/VloConfig.xml").getFile();
         
-        // configSource = getClass().getClassLoader().getResourceAsStream(fileName);
-        
-        config = VloConfig.readConfig(fileName);
+        config = VloConfig.readPackagedConfig();
 
         // let the {@literal init()} method know that there will be a context
@@ -98 +97 @@
      * context associated with this container will be ignored.
      */
-    public VloApplication(VloConfig testConfig) {
+    public VloWebApplication(VloConfig testConfig) {
 
-        // let the application use the configuration created outside of it
-
+        // remember that the application does not live in a web server context
+        
         inContext = false;
+        
+        // set the current configuration to the test configuration
 
         config = testConfig;

vlo/branches/vlo-2.13-param/vlo_web_app/src/main/java/eu/clarin/cmdi/vlo/dao/DaoLocator.java

@@ -3 +3 @@
 import org.apache.wicket.RequestCycle;
 
-import eu.clarin.cmdi.vlo.VloApplication;
+import eu.clarin.cmdi.vlo.VloWebApplication;
 
 
@@ -10 +10 @@
     public static SearchResultsDao getSearchResultsDao()
     {
-        VloApplication app = (VloApplication)RequestCycle.get().getApplication();
+        VloWebApplication app = (VloWebApplication)RequestCycle.get().getApplication();
         return app.getSearchResultsDao();
     }

vlo/branches/vlo-2.13-param/vlo_web_app/src/main/java/eu/clarin/cmdi/vlo/dao/SolrDao.java

@@ -1 +1 @@
 package eu.clarin.cmdi.vlo.dao;
 
+import eu.clarin.cmdi.vlo.config.VloConfig;
 import java.net.MalformedURLException;
-
 import org.apache.solr.client.solrj.SolrQuery;
 import org.apache.solr.client.solrj.SolrServerException;
@@ -13 +13 @@
 import org.slf4j.LoggerFactory;
 
-import eu.clarin.cmdi.vlo.config.VloConfig;
-
 public class SolrDao {
 
@@ -22 +20 @@
     public SolrDao() {
         String solrUrl;
-        solrUrl = VloConfig.get().getSolrUrl();
+        solrUrl = VloConfig.getSolrUrl();
         try {
             solrServer = new CommonsHttpSolrServer(solrUrl);

vlo/branches/vlo-2.13-param/vlo_web_app/src/main/java/eu/clarin/cmdi/vlo/pages/FacetedSearchPage.java

@@ -56 +56 @@
                 public SearchBoxForm(String id, SearchPageQuery query) {
                         super(id, new CompoundPropertyModel<SearchPageQuery>(query));
-                        add(new ExternalLink("vloHomeLink", VloConfig.get().getVloHomeLink()));
+                        add(new ExternalLink("vloHomeLink", VloConfig.getVloHomeLink()));
                         searchBox = new AutoCompleteTextField<String>("searchQuery") {
                                 @Override

vlo/branches/vlo-2.13-param/vlo_web_app/src/main/java/eu/clarin/cmdi/vlo/pages/HtmlFormCreator.java

@@ -34 +34 @@
                 }               
                 
-                String form = "<form method=\"post\" action=\""+VloConfig.get().getFederatedContentSearchUrl()+"\"> \n"
+                String form = "<form method=\"post\" action=\""+VloConfig.getFederatedContentSearchUrl()+"\"> \n"
                                 + "<fieldset style=\"border:0px;\"> \n"
                                 + "\t  <label for=\"query\">CQL query:</label> \n"

vlo/branches/vlo-2.13-param/vlo_web_app/src/main/java/eu/clarin/cmdi/vlo/pages/ResourceLinkPanel.java

@@ -69 +69 @@
             if (resourceLink.startsWith(FacetConstants.HANDLE_PREFIX)) {
                 String handle = resourceLink.substring(FacetConstants.HANDLE_PREFIX.length());
-                result = VloConfig.get().getHandleServerUrl() + handle;
+                result = VloConfig.getHandleServerUrl() + handle;
             } else if(resourceLink.startsWith(FacetConstants.URN_NBN_PREFIX)) {
                 result = URN_NBN_RESOLVER_URL+resourceLink;
@@ -115 +115 @@
             if (resourceLink.startsWith(FacetConstants.HANDLE_PREFIX)) {
                 String handle = resourceLink.substring(FacetConstants.HANDLE_PREFIX.length());
-                resourceLink = VloConfig.get().getHandleServerUrl() + handle;
+                resourceLink = VloConfig.getHandleServerUrl() + handle;
                 // Now points to something like http://hdl.handle.net/1839/00-0000-0000-0004-3357-F
                 HttpURLConnection con = null;

vlo/branches/vlo-2.13-param/vlo_web_app/src/main/java/eu/clarin/cmdi/vlo/pages/SearchPageQuery.java

@@ -71 +71 @@
         result.setFacet(true);
         result.setFacetMinCount(1);
-        result.addFacetField(VloConfig.get().getFacetFields());
+        result.addFacetField(VloConfig.getFacetFields());
         return result;
     }

vlo/branches/vlo-2.13-param/vlo_web_app/src/main/java/eu/clarin/cmdi/vlo/pages/ShowResultPage.java

@@ -117 +117 @@
             }
             if (linkToOriginalContext.startsWith(FacetConstants.HANDLE_MPI_PREFIX)) {
-                result = VloConfig.get().getIMDIBrowserUrl(linkToOriginalContext);
+                result = VloConfig.getIMDIBrowserUrl(linkToOriginalContext);
             } else {
                 try {

vlo/branches/vlo-2.13-param/vlo_web_app/src/main/webapp/WEB-INF/web.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" version="2.4">
+
+<web-app xmlns="http://java.sun.com/xml/ns/j2ee" 
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" 
+         version="2.4"
+>
 
   <display-name>vlo</display-name>
@@ -10 +14 @@
     <init-param>
       <param-name>applicationClassName</param-name>
-      <param-value>eu.clarin.cmdi.vlo.VloApplication</param-value>
+      <param-value>eu.clarin.cmdi.vlo.VloWebApplication</param-value>
     </init-param>
     <init-param>

vlo/branches/vlo-2.13-param/vlo_web_app/src/test/java/eu/clarin/cmdi/vlo/TestFacetedSearchPage.java

@@ -27 +27 @@
         // optionally, modify the test configuration here
 
-        wicketTester = new WicketTester(new VloApplication(config));
+        wicketTester = new WicketTester(new VloWebApplication(config));
     }
 

vlo/branches/vlo-2.13-param/vlo_web_app/src/test/java/eu/clarin/cmdi/vlo/pages/FacetBoxPanelTest.java

@@ -1 +1 @@
 package eu.clarin.cmdi.vlo.pages;
 
-import eu.clarin.cmdi.vlo.VloApplication;
+import eu.clarin.cmdi.vlo.VloWebApplication;
 import eu.clarin.cmdi.vlo.config.VloConfig;
 import java.util.List;
@@ -25 +25 @@
         // optionally, modify the test configuration here
         
-        wicketTester = new WicketTester(new VloApplication(testConfig));
+        wicketTester = new WicketTester(new VloWebApplication(testConfig));
     }
 

vlo/branches/vlo-2.13-param/vlo_web_app/src/test/java/eu/clarin/cmdi/vlo/pages/ResourceLinkPanelTest.java

@@ -2 +2 @@
 
 import eu.clarin.cmdi.vlo.FacetConstants;
-import eu.clarin.cmdi.vlo.VloApplication;
+import eu.clarin.cmdi.vlo.VloWebApplication;
 import eu.clarin.cmdi.vlo.config.VloConfig;
 import org.apache.wicket.util.tester.WicketTester;
@@ -28 +28 @@
         // optionally, modify the test configuration here
 
-        wicketTester = new WicketTester(new VloApplication(testConfig));
+        wicketTester = new WicketTester(new VloWebApplication(testConfig));
     }