|
Enhydra 5.1rc2 - please include my DODS patch: msg#00030java.enhydra.general
Hi! I started Enhydra 5.1rc2 and saw that my two patches (see below) arenot included in this version. Please include it in the final 5.2 release! Especially the one realted to DODS: there are a lot of people that do not use DODS but Enhydra. BTW: Where is the patch section in the ObjectWeb SourceForge? Why was it removed? --------------------------- patch 1 --------------------------------- Patch for Enhydra 5.1beat8 by Boris Klug <boris.klug@xxxxxxxxxx> Description: Removes the exigency for DODS configuration in Enhydra 5.1beta8 applications. File: modules/DODS/modules/DatabaseManager/src/org/enhydra/dods/Common.java Class: org.enhydra.dods.Common Diff: diff enhydra-5.1/modules/DODS/modules/DatabaseManager/src/org/enhydra/dods/Common.java enhydra-5.1-orig/modules/DODS/modules/DatabaseManager/src/org/enhydra/dods/Common.java 91d90 < 101,114c100 < < dodsConf = null; < Document doc = null; < < try { < // See if the config file is there < FileInputStream fileInputStream = new FileInputStream(dodsFile); < fileInputStream.close(); < } catch (Exception ex) { < System.out.println("Cant find dods config file, ignoring dods."); < return; < } < < doc = XMLDocumentFactory.parse(dodsFile); --- > Document doc = XMLDocumentFactory.parse(dodsFile); 116d101 < 133,143d117 < /** < * If a configuration file for DODS could be read at startup, this method < * returns true otherwise false < * < * @return true if dods is configured, false if not. < */ < static public boolean isDODSConfigured() { < return (dodsConf != null); < } < < File: modules/DODS/modules/DatabaseManager/src/com/lutris/appserver/server/sql/StandardDatabaseManager.java Class: com.lutris.appserver.server.sql.StandardDatabaseManager Diff: diff enhydra-5.1-orig/modules/DODS/modules/DatabaseManager/src/com/lutris/appserver/server/sql/StandardDatabaseManager.java enhydra-5.1/modules/DODS/modules/DatabaseManager/src/com/lutris/appserver/server/sql/StandardDatabaseManager.java 252,260c252,264 < String classPath = Common.getDodsConfProperty("ClassPath",dbClassName); < String className = Common.getDodsConfProperty("ClassName",dbClassName); < if (classPath != null && className != null) { < MultiClassLoader loader = new MultiClassLoader(null); < loader.setClassPath(classPath); < Class dbClass = loader.loadClass(className); < lDB = (LogicalDatabase) dbClass.newInstance (); < lDB.init (dbName, dbConfig); < } else { --- > > if (Common.isDODSConfigured()) { > String classPath = Common.getDodsConfProperty("ClassPath",dbClassName); > String className = Common.getDodsConfProperty("ClassName",dbClassName); > if (classPath != null && className != null) { > MultiClassLoader loader = new MultiClassLoader(null); > loader.setClassPath(classPath); > Class dbClass = loader.loadClass(className); > lDB = (LogicalDatabase) dbClass.newInstance (); > lDB.init (dbName, dbConfig); > } > } > if (lDB == null) { --------------------------- patch 2 --------------------------------- File: modules/MultiServer/src/com/lutris/multiServer/MultiServer.java The enTray file is only cleared when the os name starts with "Windows": Diff: 173,183c173,186 < FileWriter fw; < try { < fw = new FileWriter(ENTRAY_FILE); < PrintWriter prw = new PrintWriter(fw, false /* auto flush */); < prw.println("Quick start doc,file://localhost/" + < System.getProperty("enhydra.home") + < "/doc/Enhydra_quick_start.htm"); < prw.flush(); < prw.close(); < } catch(IOException e) { < logger.log(Level.DEBUG,"Can't create " + MultiServer.ENTRAY_FILE,e); --- > String osName = System.getProperty("os.name"); > if (osName.startsWith("Windows")) { > FileWriter fw; > try { > fw = new FileWriter(ENTRAY_FILE); > PrintWriter prw = new PrintWriter(fw, false /* auto flush */); > prw.println("Quick start doc,file://localhost/" + > System.getProperty("enhydra.home") + > "/doc/Enhydra_quick_start.htm"); > prw.flush(); > prw.close(); > } catch(IOException e) { > logger.log(Level.DEBUG,"Can't create " + MultiServer.ENTRAY_FILE,e); > }
|
|
| <Prev in Thread] | Current Thread | [Next in Thread> |
|---|---|---|
| Previous by Date: | XMLC 2.2.1 release, David Li |
|---|---|
| Next by Date: | Re: Enhydra 5.1rc2 - please include my DODS patch, Vladimir Puskas |
| Previous by Thread: | XMLC 2.2.1 release, David Li |
| Next by Thread: | Re: Enhydra 5.1rc2 - please include my DODS patch, Vladimir Puskas |
| Indexes: | [Date] [Thread] [Top] [All Lists] |
| News | FAQ | advertise |