Context Navigation

Changeset 2590

Timestamp:

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

Author:

keeloo

Message:

some work on the vlo tests

Location:

vlo/branches/vlo-2.13-param/vlo_webapp/src

Files:

-                      r2577
+                      r2590
     private final SearchResultsDao searchResults;
+    static WebAppConfig config;
     public VloApplication() {
+        // BeanFactory factory = new ClassPathXmlApplicationContext(new String[] { Configuration.CONFIG_FILE });
+        // factory.getBean("configuration"); //Use Configuration.getInstance to get the Configuration just loading the instance here.
+        WebAppConfig.setServletContext(this.getServletContext());
+        String test = WebAppConfig.open().getSolrUrl();
+        /**
+         * The new way of doing things. In case of the web application tests:
+         * just extend this class, and override the constructor by invoking the
+         * open method of the extended test web application configuration class.
+         * Also, change the way in which the get methods are being invoked. From
+         * now on, you only have to invoke config.get ...
+         */
+        config = WebAppConfig.open();
+        // String test;
+        // test = config.getVloHomeLink();
         searchResults = new SearchResultsDao();
+    }

-                      r2577
+                      r2590
  * @author keeloo
  */
 public abstract class ConfigFileParam {
+public abstract class ConfigFromFile {
     /**
      * Empty constructor
      */
     public ConfigFileParam() {
+    public ConfigFromFile() {
+    }
 …
      * @return the object with values assigned to annotated members
      */
     public static synchronized ConfigFileParam read(ConfigFileParam config) {
+    public static synchronized ConfigFromFile read(ConfigFromFile config) {
         ConfigFilePersister persister;
 …
         // assign the members their values
         config = (ConfigFileParam) persister.ConfigFromFile();
+        config = (ConfigFromFile) persister.ConfigFromFile();
         return config;
+    }
 …
      * written to a file in the form of an XML definition.
      */
      public static void write(ConfigFileParam config) {
+     public static void write(ConfigFromFile config) {
         ConfigFilePersister persister;

r2570	r2590
18	18	*/
19	19	@Root // directive for Simple
20		public class ImporterConfig extends ConfigF~~ileParam~~ {
	20	public class ImporterConfig extends ConfigFromFile {
21	21
22	22	/**

-                      r2577
+                      r2590
  */
 @Root
 public class WebAppConfig extends ConfigFileParam {
+public class WebAppConfig extends ConfigFromFile {
     // create a reference to the application logging
 …
         ConfigFilePersister.setLogger(WebAppConfig.logger);
+    }
     /**
      * XML File in which the application configuration is stored
 …
         /* 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);
 …
         servletContext = context;
+    }
+        // servletContest can be null
+    }
     /**
      * Add properties of the {@literal servlet's} context<br><br>
 …
         // 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;
 …
      */
-    @Element
     private String solrUrl = "";

r2577	r2590
16	16
17	17	<Context antiJARLocking="true" path="/vlo">
18		<Parameter name=solrURL value="http://localhost:8084/vlo_solr/"/>
	18	<Parameter name=solrUrl value="http://localhost:8084/vlo_solr/"/>
19	19	</Context>

-                      r1093
+                      r2590
     @Before
     public void setUp() {
+        new WicketTester(new VloApplication());
+        WicketTester wicketTester;
+        wicketTester = new WicketTester(new VloApplication());
+    }

Note: See TracChangeset for help on using the changeset viewer.