Changeset 32357 for main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/FedoraServiceProxy.java
- Timestamp:
- 2018-08-22T22:08:05+12:00 (6 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/FedoraServiceProxy.java
r28966 r32357 39 39 import org.greenstone.gsdl3.util.OID; 40 40 import org.greenstone.gsdl3.util.XMLConverter; 41 import org.greenstone.util.ProtocolPortProperties; 41 42 import org.w3c.dom.Document; 42 43 import org.w3c.dom.Element; … … 142 143 globalProperties.load(Class.forName("org.greenstone.util.GlobalProperties").getClassLoader().getResourceAsStream("global.properties")); 143 144 String host = globalProperties.getProperty("tomcat.server", "localhost"); 144 String port = globalProperties.getProperty("tomcat.port", "8383"); 145 String protocol = "http"; 145 ProtocolPortProperties protocolPortProps = new ProtocolPortProperties(globalProperties); 146 if(protocolPortProps.hadError()) { 147 logger.error("Error with port/protocol in global.properties: " + protocolPortProps.getErrorMsg()); 148 return false; // configure has failed 149 } 150 String protocol = protocolPortProps.getProtocol(); 151 String port = protocolPortProps.getPort(); 152 146 153 String username = "fedoraIntCallUser"; //"fedoraAdmin" 147 154 String password = "changeme"; //"<user password>"
Note:
See TracChangeset
for help on using the changeset viewer.