Changeset 2570
- Timestamp:
- 02/12/13 13:47:59 (11 years ago)
- Location:
- vlo/branches/vlo-2.13-param
- Files:
-
- 10 added
- 12 edited
- 2 copied
Legend:
- Unmodified
- Added
- Removed
-
vlo/branches/vlo-2.13-param/vlo_solr/pom.xml
r2062 r2570 45 45 <properties> 46 46 <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> 47 <vlo.solr.home>[[PACKAGEDIR]]</vlo.solr.home>48 <vlo.solr.conf> config/solr</vlo.solr.conf>47 <vlo.solr.home>${project.build.directory}</vlo.solr.home> 48 <vlo.solr.conf>${project.build.finalName}-vlo_solr_conf/solr</vlo.solr.conf> 49 49 <!-- <vlo.solr.home>/lat/tools/vlo_solr</vlo.solr.home>--> 50 50 <vlo.war.name>war/solr/</vlo.war.name> … … 77 77 </executions> 78 78 </plugin> 79 80 <plugin> 81 <groupId>org.apache.maven.plugins</groupId> 82 <artifactId>maven-war-plugin</artifactId> 83 <configuration> 84 <!--<warName>${project.artifactId}</warName>--> 85 <webResources> 86 <resource> 87 <directory>src/main/webapp</directory> 88 <filtering>true</filtering> 89 </resource> 90 </webResources> 91 <archive> 92 <manifest> 93 <addDefaultImplementationEntries>true</addDefaultImplementationEntries> 94 </manifest> 95 </archive> 96 </configuration> 97 </plugin> 98 79 99 </plugins> 80 100 </build> -
vlo/branches/vlo-2.13-param/vlo_solr/src/main/webapp/META-INF/context.xml
r2540 r2570 6 6 See the war should be unpacked in the docBase directory. 7 7 --> 8 <Context path=" [[SOLRPATH]]" docBase="${vlo.solr.home}/${vlo.war.name}" debug="0" crossContext="true">8 <Context path="vlo_solr" debug="0" crossContext="true"> 9 9 <Environment name="solr/home" type="java.lang.String" value="${vlo.solr.home}/${vlo.solr.conf}" override="true"/> 10 10 </Context> -
vlo/branches/vlo-2.13-param/vlo_webapp/pom.xml
r2540 r2570 16 16 <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> 17 17 <packaging>war</packaging> 18 <netbeans.hint.deploy.server>Tomcat</netbeans.hint.deploy.server> 18 19 </properties> 19 20 … … 233 234 <version>2.10</version> 234 235 </dependency> 235 236 237 238 239 240 241 242 243 236 <dependency> 237 <groupId>net.sf.json-lib</groupId> 238 <artifactId>json-lib</artifactId> 239 <version>2.4</version> 240 <classifier>jdk15</classifier> 241 </dependency> 242 <dependency> 243 <groupId>net.sf.saxon</groupId> 244 <artifactId>Saxon-HE</artifactId> 244 245 <version>9.4</version> 245 </dependency> 246 </dependency> 247 <dependency> 248 <groupId>org.simpleframework</groupId> 249 <artifactId>simple-xml</artifactId> 250 <version>2.4.1</version> 251 </dependency> 246 252 </dependencies> 247 253 -
vlo/branches/vlo-2.13-param/vlo_webapp/src/main/java/eu/clarin/cmdi/vlo/VloApplication.java
r1007 r2570 1 1 package eu.clarin.cmdi.vlo; 2 2 3 import eu.clarin.cmdi.vlo.config.WebAppConfig; 3 4 import org.apache.wicket.protocol.http.WebApplication; 4 5 import org.springframework.beans.factory.BeanFactory; … … 17 18 18 19 public VloApplication() { 19 BeanFactory factory = new ClassPathXmlApplicationContext(new String[] { Configuration.CONFIG_FILE }); 20 factory.getBean("configuration"); //Use Configuration.getInstance to get the Configuration just loading the instance here. 20 // BeanFactory factory = new ClassPathXmlApplicationContext(new String[] { Configuration.CONFIG_FILE }); 21 // factory.getBean("configuration"); //Use Configuration.getInstance to get the Configuration just loading the instance here. 22 21 23 searchResults = new SearchResultsDao(); 22 24 } -
vlo/branches/vlo-2.13-param/vlo_webapp/src/main/java/eu/clarin/cmdi/vlo/dao/SolrDao.java
r759 r2570 14 14 15 15 import eu.clarin.cmdi.vlo.Configuration; 16 import eu.clarin.cmdi.vlo.config.WebAppConfig; 16 17 17 18 public class SolrDao { … … 21 22 22 23 public SolrDao() { 23 String solrUrl = Configuration.getInstance().getSolrUrl();24 String solrUrl = WebAppConfig.get().getSolrUrl(); 24 25 try { 25 26 solrServer = new CommonsHttpSolrServer(solrUrl); -
vlo/branches/vlo-2.13-param/vlo_webapp/src/main/java/eu/clarin/cmdi/vlo/pages/FacetedSearchPage.java
r2513 r2570 30 30 import eu.clarin.cmdi.vlo.FacetConstants; 31 31 import eu.clarin.cmdi.vlo.Resources; 32 import eu.clarin.cmdi.vlo.config.WebAppConfig; 32 33 import eu.clarin.cmdi.vlo.dao.AutoCompleteDao; 33 34 import fiftyfive.wicket.basic.TruncatedLabel; … … 58 59 public SearchBoxForm(String id, SearchPageQuery query) { 59 60 super(id, new CompoundPropertyModel<SearchPageQuery>(query)); 60 add(new ExternalLink("vloHomeLink", Configuration.getInstance().getVloHomeLink()));61 add(new ExternalLink("vloHomeLink", WebAppConfig.get().getVloHomeLink())); 61 62 searchBox = new AutoCompleteTextField<String>("searchQuery") { 62 63 @Override -
vlo/branches/vlo-2.13-param/vlo_webapp/src/main/java/eu/clarin/cmdi/vlo/pages/HtmlFormCreator.java
r2513 r2570 9 9 import net.sf.json.JSONObject; 10 10 import eu.clarin.cmdi.vlo.Configuration; 11 import eu.clarin.cmdi.vlo.config.WebAppConfig; 11 12 12 13 /** … … 35 36 } 36 37 37 String form = "<form method=\"post\" action=\""+ Configuration.getInstance().getFederatedContentSearchUrl()+"\"> \n"38 String form = "<form method=\"post\" action=\""+WebAppConfig.get().getFederatedContentSearchUrl()+"\"> \n" 38 39 + "<fieldset style=\"border:0px;\"> \n" 39 40 + "\t <label for=\"query\">CQL query:</label> \n" -
vlo/branches/vlo-2.13-param/vlo_webapp/src/main/java/eu/clarin/cmdi/vlo/pages/ResourceLinkPanel.java
r2059 r2570 27 27 import eu.clarin.cmdi.vlo.Configuration; 28 28 import eu.clarin.cmdi.vlo.FacetConstants; 29 import eu.clarin.cmdi.vlo.config.WebAppConfig; 29 30 30 31 import javax.net.ssl.HttpsURLConnection; … … 79 80 if (resourceLink.startsWith(FacetConstants.HANDLE_PREFIX)) { 80 81 String handle = resourceLink.substring(FacetConstants.HANDLE_PREFIX.length()); 81 result = Configuration.getInstance().getHandleServerUrl() + handle;82 result = WebAppConfig.get().getHandleServerUrl() + handle; 82 83 } else if(resourceLink.startsWith(FacetConstants.URN_NBN_PREFIX)) { 83 84 result = URN_NBN_RESOLVER_URL+resourceLink; … … 125 126 if (resourceLink.startsWith(FacetConstants.HANDLE_PREFIX)) { 126 127 String handle = resourceLink.substring(FacetConstants.HANDLE_PREFIX.length()); 127 resourceLink = Configuration.getInstance().getHandleServerUrl() + handle;128 resourceLink = WebAppConfig.get().getHandleServerUrl() + handle; 128 129 // Now points to something like http://hdl.handle.net/1839/00-0000-0000-0004-3357-F 129 130 HttpURLConnection con = null; -
vlo/branches/vlo-2.13-param/vlo_webapp/src/main/java/eu/clarin/cmdi/vlo/pages/SearchPageQuery.java
r1456 r2570 14 14 import eu.clarin.cmdi.vlo.Configuration; 15 15 import eu.clarin.cmdi.vlo.FacetConstants; 16 import eu.clarin.cmdi.vlo.config.WebAppConfig; 16 17 17 18 public class SearchPageQuery implements IClusterable { … … 73 74 result.setFacet(true); 74 75 result.setFacetMinCount(1); 75 result.addFacetField( Configuration.getInstance().getFacetFields());76 result.addFacetField(WebAppConfig.get().getFacetFields()); 76 77 return result; 77 78 } -
vlo/branches/vlo-2.13-param/vlo_webapp/src/main/java/eu/clarin/cmdi/vlo/pages/ShowResultPage.java
r2513 r2570 59 59 import eu.clarin.cmdi.vlo.Resources; 60 60 import eu.clarin.cmdi.vlo.StringUtils; 61 import eu.clarin.cmdi.vlo.config.WebAppConfig; 61 62 import eu.clarin.cmdi.vlo.dao.DaoLocator; 62 63 … … 117 118 } 118 119 if (linkToOriginalContext.startsWith(FacetConstants.HANDLE_MPI_PREFIX)) { 119 result = Configuration.getInstance().getIMDIBrowserUrl(linkToOriginalContext);120 result = WebAppConfig.get().getIMDIBrowserUrl(linkToOriginalContext); 120 121 } else { 121 122 try { -
vlo/branches/vlo-2.13-param/vlo_webapp/src/main/resources/application.properties
r1938 r2570 1 1 #Application properties; specifically the solrUrl to use! 2 eu.clarin.cmdi.vlo.solrUrl= [[SOLRURL]]2 eu.clarin.cmdi.vlo.solrUrl=http://localhost:8084/vlo_solr/ 3 3 eu.clarin.cmdi.vlo.importerConfigFile=importerConfig.xml 4 4 eu.clarin.cmdi.vlo.nationalProjectMapping=nationalProjectsMapping.xml -
vlo/branches/vlo-2.13-param/vlo_webapp/src/test/java/eu/clarin/cmdi/vlo/SearchPageQueryTest.java
r1456 r2570 16 16 @Before 17 17 public void setup() { 18 Configuration.getInstance().setFacetFields(new String[] { "collection", "continent", "organisation", "genre", "country", "language" });18 // Configuration.getInstance().setFacetFields(new String[] { "collection", "continent", "organisation", "genre", "country", "language" }); 19 19 } 20 20 -
vlo/branches/vlo-2.13-param/vlo_webapp/src/test/java/eu/clarin/cmdi/vlo/TestFacetedSearchPage.java
r1048 r2570 13 13 @Before 14 14 public void setUp() { 15 Configuration.getInstance().setSolrUrl("http://localhost:8080/vlo_solr");15 // Configuration.getInstance().setSolrUrl("http://localhost:8080/vlo_solr"); 16 16 tester = new WicketTester(new VloApplication()); 17 17 }
Note: See TracChangeset
for help on using the changeset viewer.