Changeset 4019
- Timestamp:
- 11/14/13 15:18:45 (11 years ago)
- Location:
- vlo/trunk/vlo_importer
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
vlo/trunk/vlo_importer/nbactions.xml
r3203 r4019 37 37 </properties> 38 38 </action> 39 <action> 40 <actionName>CUSTOM-build - skip tests</actionName> 41 <displayName>build - skip tests</displayName> 42 <goals> 43 <goal>install</goal> 44 </goals> 45 <properties> 46 <skipTests>true</skipTests> 47 </properties> 48 </action> 49 39 50 40 51 </actions> -
vlo/trunk/vlo_importer/pom.xml
r4004 r4019 12 12 <packaging>jar</packaging> 13 13 14 <version>2.1 7</version>14 <version>2.18</version> 15 15 <name>vlo_importer</name> 16 16 <description></description> -
vlo/trunk/vlo_importer/src/main/bin/vlo_solr_importer.sh
r4004 r4019 24 24 # take preference over a specification as a property. 25 25 26 $JAVA -Xmx1024M -cp .:vlo_importer-2.1 7-importer.jar eu.clarin.cmdi.vlo.importer.MetadataImporter26 $JAVA -Xmx1024M -cp .:vlo_importer-2.18-importer.jar eu.clarin.cmdi.vlo.importer.MetadataImporter -
vlo/trunk/vlo_importer/src/main/java/eu/clarin/cmdi/vlo/config/VloConfig.java
r3819 r4019 161 161 private static boolean deleteAllFirst = false; 162 162 163 @Element 164 private static int facetOverviewLength = 0; 165 163 166 @Element 164 167 private static int maxDocsInList = 0; … … 190 193 @Element 191 194 private static String vloHomeLink = ""; 195 196 @Element 197 private static String helpUrl = ""; 192 198 193 199 @Element … … 245 251 private static String[] facetFields = {"", "", ""}; 246 252 253 @ElementArray(entry = "languageFilter") 254 private static String[] languageFilters = {"", "", ""}; 255 247 256 @Element 248 257 private static String countryComponentUrl = ""; … … 260 269 private static String FederatedContentSearchUrl = " "; 261 270 262 @Element 271 @Element(required = false) 263 272 private static String reverseProxyPrefix = ""; 264 273 265 @Element 266 private static Boolean expectReverseProxy = false; 274 @Element(required = false) 275 private static String cqlEndpointFilter = ""; 276 277 @Element(required = false) 278 private static String cqlEndpointAlternative= ""; 267 279 268 280 /** … … 547 559 public static void setVloHomeLink(String param) { 548 560 vloHomeLink = param; 561 } 562 563 /** 564 * Get the value of the helpUrl parameter<br><br> 565 * 566 * For a description of the parameter, refer to the general VLO 567 * documentation. 568 * 569 * @return the value 570 */ 571 public static String getHelpUrl() { 572 return helpUrl; 573 } 574 575 /** 576 * Set the value of the helpUrl parameter<br><br> 577 * 578 * For a description of the parameter, refer to the general VLO 579 * documentation. 580 * 581 * @param param the value 582 */ 583 public static void setHelpUrl(String param) { 584 helpUrl = param; 549 585 } 550 586 … … 771 807 } 772 808 773 774 809 /** 775 810 * Get the value of the FacetFields parameter<br><br> … … 795 830 facetFields = param; 796 831 } 832 833 /** 834 * Get the value of the languageFields parameter<br><br> 835 * 836 * For a description of the parameter, refer to the general VLO 837 * documentation. 838 * 839 * @return the value 840 */ 841 public static String[] getLanguageFilters() { 842 return languageFilters; 843 } 844 845 /** 846 * Set the value of the languageFilters parameter<br><br> 847 * 848 * For a description of the parameter, refer to the general VLO 849 * documentation. 850 * 851 * @param param the value, a list of language filters 852 */ 853 public static void setLanguageFilters(String[] param) { 854 languageFilters = param; 855 } 856 857 /** 858 * Get the value of the getFacetOverviewLength parameter<br><br> 859 * 860 * For a description of the parameter, refer to the general VLO 861 * documentation. 862 * 863 * @return the value 864 */ 865 public static int getFacetOverviewLength() { 866 return facetOverviewLength; 867 } 868 869 /** 870 * Set the value of the setFacetOverviewLength parameter<br><br> 871 * 872 * For a description of the parameter, refer to the general VLO 873 * documentation. 874 * 875 * @param param the value 876 */ 877 public void setFacetOverviewLength(Integer param) { 878 facetOverviewLength = param; 879 } 797 880 798 881 /** … … 917 1000 918 1001 /** 919 * Get the value of the expectReverseProxy parameter<br><br> 920 * 921 * For a description of the parameter, refer to the general VLO 922 * documentation. 923 * 924 * @return the value 925 */ 926 public static Boolean getExpectReverseProxy() { 927 return expectReverseProxy; 928 } 929 930 /** 931 * Set the value of the expectReverseProxy parameter<br><br> 932 * 933 * For a description of the parameter, refer to the general VLO 934 * documentation. 935 * 936 * @param param the value 937 */ 938 public static void setExpectReverseProxy(Boolean param) { 939 expectReverseProxy = param; 940 } 941 1002 * Get the value of the cqlEndpointFilter parameter<br><br> 1003 * 1004 * For a description of the parameter, refer to the general VLO 1005 * documentation. 1006 * 1007 * @return the value 1008 */ 1009 public static String getCqlEndpointFilter() { 1010 return cqlEndpointFilter; 1011 } 1012 1013 /** 1014 * Set the value of the cqlEndpointFilter parameter<br><br> 1015 * 1016 * For a description of the parameter, refer to the general VLO 1017 * documentation. 1018 * 1019 * @param param the value 1020 */ 1021 public static void setCqlEndpointFilter(String param) { 1022 cqlEndpointFilter = param; 1023 } 1024 1025 /** 1026 * Get the value of the cqlEndpointAlternative parameter<br><br> 1027 * 1028 * For a description of the parameter, refer to the general VLO 1029 * documentation. 1030 * 1031 * @return the value 1032 */ 1033 public static String getCqlEndpointAlternative() { 1034 return cqlEndpointAlternative; 1035 } 1036 1037 /** 1038 * Set the value of the cqlEndpointAlternative parameter<br><br> 1039 * 1040 * For a description of the parameter, refer to the general VLO 1041 * documentation. 1042 * 1043 * @param param the value 1044 */ 1045 public static void setCqlEndpointAlternative(String param) { 1046 cqlEndpointAlternative = param; 1047 } 942 1048 } -
vlo/trunk/vlo_importer/src/main/resources/VloConfig.xml
r3935 r4019 44 44 </DataRoot> 45 45 </dataRoots> 46 46 47 47 <vloHomeLink>http://www.clarin.eu/vlo</vloHomeLink> 48 49 <helpUrl>http://www.clarin.eu/vlo</helpUrl> 48 50 49 51 <solrUrl>http://localhost:8084/vlo_solr/</solrUrl> … … 75 77 </facetFields> 76 78 79 <languageFilters length="3"> 80 <languageFilter>filterOne</languageFilter> 81 <languageFilter>filterTwo</languageFilter> 82 <languageFilter>filterThree</languageFilter> 83 </languageFilters> 84 85 <facetOverviewLength>30</facetOverviewLength> 86 77 87 <countryComponentUrl>http://catalog.clarin.eu/ds/ComponentRegistry/rest/registry/components/clarin.eu:cr1:c_1271859438104/xml</countryComponentUrl> 78 88 … … 87 97 <silToISO639CodesUrl>http://www.clarin.eu/cmd/xslt/sil_to_iso6393.xml</silToISO639CodesUrl> 88 98 99 <reverseProxyPrefix></reverseProxyPrefix> 100 89 101 <FederatedContentSearchUrl>http://weblicht.sfs.uni-tuebingen.de/Aggregator/</FederatedContentSearchUrl> 90 102 91 < expectReverseProxy>false</expectReverseProxy>103 <cqlEndpointFilter>http://cqlservlet.mpi.nl/</cqlEndpointFilter> 92 104 93 < reverseProxyPrefix>vlodev/</reverseProxyPrefix>105 <cqlEndpointAlternative>http://cqlservlet.mpi.nl/</cqlEndpointAlternative> 94 106 </VloConfig> -
vlo/trunk/vlo_importer/src/test/java/eu/clarin/cmdi/vlo/config/VloConfigTest.java
r3935 r4019 180 180 } 181 181 182 182 /** 183 183 * Test the getMaxFileSize method 184 184 */ … … 323 323 public void testSetVloHomeLink() { 324 324 325 System.out.println("set SetVloHomeLink");325 System.out.println("setVloHomeLink"); 326 326 327 327 String param = "http://www.clarin.eu/vlo"; … … 330 330 331 331 String result = VloConfig.getVloHomeLink(); 332 333 assertEquals(param, result); 334 } 335 336 /** 337 * Test the getHelpUrl method 338 */ 339 @Test 340 public void testGetHelpUrl() { 341 342 System.out.println("getHelpUrl"); 343 344 String expResult = "http://www.clarin.eu/vlo"; 345 String result = VloConfig.getHelpUrl(); 346 347 assertEquals(expResult, result); 348 } 349 350 /** 351 * Test the setHelpUrl method 352 */ 353 @Test 354 public void testSetHelpUrl() { 355 356 System.out.println("setHelpUrl"); 357 358 String param = "http://www.clarin.eu/vlo"; 359 360 VloConfig.setHelpUrl(param); 361 362 String result = VloConfig.getHelpUrl(); 332 363 333 364 assertEquals(param, result); … … 789 820 assertEquals(param, result); 790 821 } 791 822 823 /** 824 * Test the getReverseProxyPrefix method 825 */ 826 @Test 827 public void testReverseProxyPrefix() { 828 829 System.out.println("getReverseProxyPrefix"); 830 831 String expResult = ""; 832 String result = VloConfig.getReverseProxyPrefix(); 833 834 assertEquals(expResult, result); 835 } 836 837 /** 838 * Test the setReverseProxyPrefix method 839 */ 840 @Test 841 public void testSetReverseProxyPrefix() { 842 843 System.out.println("setReverseProxyPrefix"); 844 845 String param = "vlodev/"; 846 847 VloConfig.setReverseProxyPrefix(param); 848 849 String result = VloConfig.getReverseProxyPrefix(); 850 851 assertEquals(param, result); 852 } 853 854 /** 855 * Test the getCqlEndpointFilter method 856 */ 857 @Test 858 public void testGetCqlEndpointFilter() { 859 860 System.out.println("getCqlEndpointFilter"); 861 862 String expResult = "http://cqlservlet.mpi.nl/"; 863 String result = VloConfig.getCqlEndpointFilter(); 864 865 assertEquals(expResult, result); 866 } 867 868 /** 869 * Test the setCqlEndpointFilter method 870 */ 871 @Test 872 public void testSetCqlEndpointFilter() { 873 874 System.out.println("setCqlEndpointFilter"); 875 876 String param = "http://cqlservlet.mpi.nl/"; 877 878 VloConfig.setCqlEndpointFilter(param); 879 880 String result = VloConfig.getCqlEndpointFilter(); 881 882 assertEquals(param, result); 883 } 884 885 /** 886 * Test the getCqlEndpointAlternative method 887 */ 888 @Test 889 public void testGetCqlEndpointAlternative() { 890 891 System.out.println("getCqlEndpointAlternative"); 892 893 String expResult = "http://cqlservlet.mpi.nl/"; 894 String result = VloConfig.getCqlEndpointAlternative(); 895 896 assertEquals(expResult, result); 897 } 898 899 /** 900 * Test the setCqlEndpointAlternative method 901 */ 902 @Test 903 public void testSetCqlEndpointAlternative() { 904 905 System.out.println("setCqlEndpointAlternative"); 906 907 String param = "http://cqlservlet.mpi.nl/"; 908 909 VloConfig.setCqlEndpointAlternative(param); 910 911 String result = VloConfig.getCqlEndpointAlternative(); 912 913 assertEquals(param, result); 914 } 792 915 }
Note: See TracChangeset
for help on using the changeset viewer.