From: <aca...@us...> - 2007-05-31 15:51:04
|
Revision: 452 http://geonetwork.svn.sourceforge.net/geonetwork/?rev=452&view=rev Author: acarboni Date: 2007-05-31 08:49:22 -0700 (Thu, 31 May 2007) Log Message: ----------- Moved creation of embedded db at boot phase to avoid problems with fresh checkouts Modified Paths: -------------- trunk/gast/data/gui.xml trunk/src/org/fao/gast/gui/MainFrame.java trunk/src/org/fao/gast/gui/panels/config/dbms/EmbeddedPanel.java Modified: trunk/gast/data/gui.xml =================================================================== --- trunk/gast/data/gui.xml 2007-05-31 14:45:30 UTC (rev 451) +++ trunk/gast/data/gui.xml 2007-05-31 15:49:22 UTC (rev 452) @@ -245,9 +245,7 @@ <description> Once you have configured your DBMS in the 'configuration/dbms' panel, you have to use this panel to create tables and fill - them with initial data. Please notice that if you did a checkout - from subversion, you have to select the 'configuration/dbms' - panel and press the 'save' button to update the configuration. + them with initial data. </description> <button> Modified: trunk/src/org/fao/gast/gui/MainFrame.java =================================================================== --- trunk/src/org/fao/gast/gui/MainFrame.java 2007-05-31 14:45:30 UTC (rev 451) +++ trunk/src/org/fao/gast/gui/MainFrame.java 2007-05-31 15:49:22 UTC (rev 452) @@ -83,11 +83,39 @@ GuiBuilder builder = new GuiBuilder(appPath, panView, panWork); builder.build("/gast/data/gui.xml"); + checkAndCreateDB(); + setSize(700, 500); setVisible(true); } //--------------------------------------------------------------------------- + + private void checkAndCreateDB() throws Exception + { + String user = Lib.embeddedDB.getUser(); + String pass = Lib.embeddedDB.getPassword(); + + if (user == null || pass == null) + { + //--- user & password can be null only if the data files of the + //--- embedded database are not there, so we create them + + Lib.embeddedDB.createDB(); + + user = Lib.embeddedDB.getUser(); + pass = Lib.embeddedDB.getPassword(); + + //--- then we store the generated account into the config.xml file + //--- and save it + + Lib.config.setDbmsUser (user); + Lib.config.setDbmsPassword(pass); + Lib.config.save(); + } + } + + //--------------------------------------------------------------------------- //--- //--- ActionListener //--- Modified: trunk/src/org/fao/gast/gui/panels/config/dbms/EmbeddedPanel.java =================================================================== --- trunk/src/org/fao/gast/gui/panels/config/dbms/EmbeddedPanel.java 2007-05-31 14:45:30 UTC (rev 451) +++ trunk/src/org/fao/gast/gui/panels/config/dbms/EmbeddedPanel.java 2007-05-31 15:49:22 UTC (rev 452) @@ -85,24 +85,6 @@ if (!Lib.type.isInteger(port)) throw new Exception("The port must be an integer"); - if (user == null || pass == null) - { - //--- user & password can be null only if the data files of the - //--- embedded database are not there, so we create them - - Lib.embeddedDB.createDB(); - - user = Lib.embeddedDB.getUser(); - pass = Lib.embeddedDB.getPassword(); - - //--- then we store the generated account into the config.xml file - //--- and save it - - Lib.config.setDbmsUser (user); - Lib.config.setDbmsPassword(pass); - Lib.config.save(); - } - Lib.config.setDbmsDriver ("com.mckoi.JDBCDriver"); Lib.config.setDbmsURL ("jdbc:mckoi://localhost:"+port+"/"); Lib.config.setDbmsUser (user); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |