- Timestamp:
- 2012-04-16T20:50:16+12:00 (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone3/src/java/org/greenstone/server/Server3Settings.java
r24207 r25388 33 33 JLabel servlet_label = new JLabel(server.dictionary.get(BaseServer.Property.SERVER_SETTINGS+".URL")); 34 34 35 this.servletDefault = server.config_properties.getProperty(BaseServer.Property.DEFAULT_SERVLET) .replaceAll("/","");36 35 this.servletDefault = server.config_properties.getProperty(BaseServer.Property.DEFAULT_SERVLET); 36 37 37 servlet_combobox = new JComboBox(); 38 38 servlet_combobox.setMaximumRowCount(5); … … 62 62 } 63 63 64 if (pattern.replaceAll("/ ","").equals(servletDefault)) {64 if (pattern.replaceAll("/\\*","").equals(servletDefault)) { // urlmapping maybe something like "/library/*", want "/library" 65 65 servlet_combobox.setSelectedItem(name); 66 66 } … … 80 80 boolean hasChanged = false; 81 81 boolean requireRestart = false; 82 if (!servletDefault.equals((String)url_mappings.get(servlet_combobox.getSelectedItem()))) { 82 String urlMapping = (String)url_mappings.get(servlet_combobox.getSelectedItem()); 83 if(urlMapping.endsWith("/*")) { // urlmapping maybe something like "/library/*" 84 urlMapping = urlMapping.substring(0, urlMapping.length()-2); 85 } 86 if (!servletDefault.equals(urlMapping)) { 83 87 hasChanged = true; 84 88 requireRestart = true; … … 97 101 98 102 String newServletDef = (String) servlet_combobox.getSelectedItem(); 99 newFileLines = scriptReadWrite.queryReplace(newFileLines,BaseServer.Property.DEFAULT_SERVLET, (String) url_mappings.get(newServletDef)); 103 String servletDefName = (String) url_mappings.get(newServletDef); 104 if(servletDefName.endsWith("/*")) { // urlmapping maybe something like "/library/*" 105 servletDefName = servletDefName.substring(0, servletDefName.length()-2); 106 } 107 newFileLines = scriptReadWrite.queryReplace(newFileLines,BaseServer.Property.DEFAULT_SERVLET, servletDefName); 100 108 } 101 109
Note:
See TracChangeset
for help on using the changeset viewer.