[cvs] expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc ConfigManager.java

[JCorporate Ltd]

Update of /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc
In directory jcorp2.servlets.net:/tmp/cvs-serv9366/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc

Modified Files:
	ConfigManager.java 
Log Message:
change 'enum' as a variable name to something else


Index: ConfigManager.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/ConfigManager.java,v
retrieving revision 1.67
retrieving revision 1.68
diff -C2 -d -r1.67 -r1.68
*** ConfigManager.java	1 Apr 2004 06:05:59 -0000	1.67
--- ConfigManager.java	22 May 2004 00:51:11 -0000	1.68
***************
*** 325,329 ****
          try {
              cm.stopJobHandler();
!             cm.dbUninitialize();
  
  
--- 325,329 ----
          try {
              cm.stopJobHandler();
!             ConfigManager.dbUninitialize();
  
  
***************
*** 337,344 ****
               * request so the VM can exit.
               */
!             for (Enumeration e = cm.getAllConfigKeys(); e.hasMoreElements();) {
                  String oneKey = (String) e.nextElement();
                  try {
!                     ConfigJdbc jdbcConfig = cm.getContext(oneKey).getJdbc();
                      if (jdbcConfig.getDriver().equals("org.hsqldb.jdbcDriver")) {
  
--- 337,344 ----
               * request so the VM can exit.
               */
!             for (Enumeration e = ConfigManager.getAllConfigKeys(); e.hasMoreElements();) {
                  String oneKey = (String) e.nextElement();
                  try {
!                     ConfigJdbc jdbcConfig = ConfigManager.getContext(oneKey).getJdbc();
                      if (jdbcConfig.getDriver().equals("org.hsqldb.jdbcDriver")) {
  
***************
*** 498,504 ****
  
          // associate all objects w/i schema with this schema
!         Enumeration enum = schema.getMembers();
!         while (enum.hasMoreElements()) {
!             DBObject obj = (DBObject) enum.nextElement();
              try {
                  obj.setSchema(schema);
--- 498,504 ----
  
          // associate all objects w/i schema with this schema
!         Enumeration anEnum = schema.getMembers();
!         while (anEnum.hasMoreElements()) {
!             DBObject obj = (DBObject) anEnum.nextElement();
              try {
                  obj.setSchema(schema);
***************
*** 860,870 ****
      /**
       * Stops all job handlers
-      * @throws DBException if there's an error starting the job handler from
-      * the DBContext point of view.
       * @throws ConfigurationException if there's an error getting the config
       * information beans.
       */
      protected void stopJobHandler()
!             throws DBException, ConfigurationException {
          if (log.isInfoEnabled()) {
              log.info("Stops job handler(s)");
--- 860,868 ----
      /**
       * Stops all job handlers
       * @throws ConfigurationException if there's an error getting the config
       * information beans.
       */
      protected void stopJobHandler()
!             throws ConfigurationException {
          if (log.isInfoEnabled()) {
              log.info("Stops job handler(s)");
***************
*** 1116,1123 ****
              log.info("Initializing connection pool(s)");
          }
!         instance.dbInitialize();
  
          //Read the DBOtherMap entries into memory
!         instance.mapOtherDBs();
  
          /* read - or re-read - the setup values */
--- 1114,1121 ----
              log.info("Initializing connection pool(s)");
          }
!         ConfigManager.dbInitialize();
  
          //Read the DBOtherMap entries into memory
!         ConfigManager.mapOtherDBs();
  
          /* read - or re-read - the setup values */
***************
*** 1143,1147 ****
              log.info("Starting job handler(s)");
          }
!         instance.startJobHandler();
          if (log.isInfoEnabled()) {
              log.info("Expresso initialization complete");
--- 1141,1145 ----
              log.info("Starting job handler(s)");
          }
!         ConfigManager.startJobHandler();
          if (log.isInfoEnabled()) {
              log.info("Expresso initialization complete");