Changeset 4583

Timestamp:

02/27/14 16:29:27 (11 years ago)

Author:

twagoo

Message:

new vlo config factory to support partial configuration via context parameters

Location:

vlo/branches/vlo-3.0/vlo-web-app/src

Files:

• main/java/eu/clarin/cmdi/vlo/config/ServletVloConfigFactory.java (added)
• main/java/eu/clarin/cmdi/vlo/config/VloSpringConfig.java (modified) (1 diff)
• main/webapp/META-INF/context.xml (modified) (1 diff)
• main/webapp/WEB-INF/applicationContext.xml (modified) (1 diff)
• main/webapp/WEB-INF/web.xml (modified) (1 diff)
• test/java/eu/clarin/cmdi/vlo/wicket/pages/TestFacetedSearchPage.java (modified) (3 diffs)

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/config/VloSpringConfig.java

@@ -68 +68 @@
     @Bean
     public VloConfigFactory vloConfigFactory() {
-        return new DefaultVloConfigFactory();
+        return new ServletVloConfigFactory();
     }
 

vlo/branches/vlo-3.0/vlo-web-app/src/main/webapp/META-INF/context.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Context antiJARLocking="true" path="/vlo-web-app"/>
+<Context antiJARLocking="true" path="/vlo-web-app">
+    <!-- 
+        If set, configuration will get read from this external location 
+
+
+    <Parameter 
+        name="eu.carlin.cmdi.vlo.config.location" 
+        value="/Users/twagoo/vlo/vlo3/VloConfig.xml"/>
+    -->
+    
+    <!-- 
+        If set, web app will connect to this SOLR server instead of the one 
+        specified in the configuration file 
+
+
+    <Parameter 
+        name="eu.carlin.cmdi.vlo.solr.serverUrl" 
+        value="http://localhost:8080/vlo_solr/core0/"/>
+    -->
+</Context>

vlo/branches/vlo-3.0/vlo-web-app/src/main/webapp/WEB-INF/applicationContext.xml

@@ -9 +9 @@
     <context:annotation-config/>
     <bean class="eu.clarin.cmdi.vlo.config.VloSpringConfig"/>    
+    
+    <!-- Bean to enable context parameters as a properties source -->
+    <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer">
+        <property name="ignoreUnresolvablePlaceholders" value="true" />
+        <property name="ignoreResourceNotFound" value="true"/>
+    </bean>
 </beans>

vlo/branches/vlo-3.0/vlo-web-app/src/main/webapp/WEB-INF/web.xml

@@ -44 +44 @@
         <param-name>contextConfigLocation</param-name>  
         <param-value>WEB-INF/applicationContext.xml</param-value>  
-    </context-param>  
+    </context-param>
 </web-app>

vlo/branches/vlo-3.0/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/wicket/pages/TestFacetedSearchPage.java

@@ -2 +2 @@
 
 import eu.clarin.cmdi.vlo.VloWicketApplication;
+import eu.clarin.cmdi.vlo.config.DefaultVloConfigFactory;
+import eu.clarin.cmdi.vlo.config.VloConfigFactory;
 import eu.clarin.cmdi.vlo.config.VloSpringConfig;
 import eu.clarin.cmdi.vlo.pojo.QueryFacetsSelection;
@@ -23 +25 @@
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.support.AnnotationConfigContextLoader;
-
 
 /**
@@ -53 +54 @@
             return mockery().mock(SolrDocumentService.class);
         }
+
+        @Override
+        public VloConfigFactory vloConfigFactory() {
+            //TODO: Separate test config? -> override vloConfig() instead
+            return new DefaultVloConfigFactory();
+        }
+
     }