[Wonder-cvs] CVS: Wonder/Common/Frameworks/ERExtensions/Sources/er/extensions ERXAdaptorChannelDelegate.java,1.4,1.5 ERXDatabaseContextDelegate.java,1.17,1.18

[Anjo K. <an...@us...>]

Update of /cvsroot/wonder/Wonder/Common/Frameworks/ERExtensions/Sources/er/extensions
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19757/Common/Frameworks/ERExtensions/Sources/er/extensions

Modified Files:
	ERXAdaptorChannelDelegate.java ERXDatabaseContextDelegate.java 
Log Message:
loggin and speling

Index: ERXAdaptorChannelDelegate.java
===================================================================
RCS file: /cvsroot/wonder/Wonder/Common/Frameworks/ERExtensions/Sources/er/extensions/ERXAdaptorChannelDelegate.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ERXAdaptorChannelDelegate.java	1 Sep 2004 15:18:18 -0000	1.4
--- ERXAdaptorChannelDelegate.java	30 Nov 2004 09:04:04 -0000	1.5
***************
*** 44,48 ****
              long millisecondsNeeded = System.currentTimeMillis() - _lastMilliseconds;
              if(millisecondsNeeded > _maxMilliseconds) {
!                 log.debug("Expression took " + millisecondsNeeded + " ms : " + expression);
              }
          }
--- 44,49 ----
              long millisecondsNeeded = System.currentTimeMillis() - _lastMilliseconds;
              if(millisecondsNeeded > _maxMilliseconds) {
!                 String entityName = (expression.entity() != null ? expression.entity().name() : "Unknown");
!                 log.debug("\"" + entityName  + "\" expression took " + millisecondsNeeded + " ms: " + expression);
              }
          }

Index: ERXDatabaseContextDelegate.java
===================================================================
RCS file: /cvsroot/wonder/Wonder/Common/Frameworks/ERExtensions/Sources/er/extensions/ERXDatabaseContextDelegate.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** ERXDatabaseContextDelegate.java	25 May 2004 11:13:58 -0000	1.17
--- ERXDatabaseContextDelegate.java	30 Nov 2004 09:04:07 -0000	1.18
***************
*** 17,21 ****
   * {@link com.webobjects.eoaccess.EODatabaseContext.Delegate EODatabaseContext.Delegate}. 
   * Of special note this class adds the ability
!  * for enterpiseobjects to generate their own primary keys, correctly throws an
   * exception when a toOne relationship object is not found in the database and adds
   * debugging abilities to tracking down when faults are fired.
--- 17,21 ----
   * {@link com.webobjects.eoaccess.EODatabaseContext.Delegate EODatabaseContext.Delegate}. 
   * Of special note this class adds the ability
!  * for enterpriseobjects to generate their own primary keys, correctly throws an
   * exception when a toOne relationship object is not found in the database and adds
   * debugging abilities to tracking down when faults are fired.
***************
*** 147,151 ****
                                                  EODatabaseChannel channel) {
          if (dbLog.isDebugEnabled()) {
!             dbLog.debug("databaseContextDidSelectObjects " + fs + " at: " + ERXUtilities.stackTrace());
          }
      }
--- 147,151 ----
                                                  EODatabaseChannel channel) {
          if (dbLog.isDebugEnabled()) {
!             dbLog.debug("databaseContextDidSelectObjects " + fs, new Exception());
          }
      }
***************
*** 155,159 ****
       **/
      public NSArray databaseContextWillPerformAdaptorOperations(EODatabaseContext dbCtxt,NSArray adaptorOps,EOAdaptorChannel adChannel) {
!         log.debug("databaseContextWillPerformAdaptorOperations.. Setting it to ReadWrite");
          if (adaptorOps.count() != 0) {
              setReadWriteForConnectionInDatabaseContext(true, dbCtxt);
--- 155,161 ----
       **/
      public NSArray databaseContextWillPerformAdaptorOperations(EODatabaseContext dbCtxt,NSArray adaptorOps,EOAdaptorChannel adChannel) {
!         if(log.isDebugEnabled()) {
!             log.debug("databaseContextWillPerformAdaptorOperations.. Setting it to ReadWrite");
!         }
          if (adaptorOps.count() != 0) {
              setReadWriteForConnectionInDatabaseContext(true, dbCtxt);
***************
*** 166,170 ****
       **/
      public boolean databaseContextShouldFetchObjectFault(EODatabaseContext dbCtxt, Object obj) {
!         log.debug("databaseContextShouldFetchObjectFault.. Setting it to ReadOnly");
          setReadWriteForConnectionInDatabaseContext(false, dbCtxt);
          return true;
--- 168,174 ----
       **/
      public boolean databaseContextShouldFetchObjectFault(EODatabaseContext dbCtxt, Object obj) {
!         if(log.isDebugEnabled()) {
!             log.debug("databaseContextShouldFetchObjectFault.. Setting it to ReadOnly");
!         }
          setReadWriteForConnectionInDatabaseContext(false, dbCtxt);
          return true;
***************
*** 175,179 ****
       **/
      public  boolean databaseContextShouldFetchArrayFault(EODatabaseContext eodatabasecontext, Object obj) {
!         log.debug("databaseContextShouldFetchArrayFault.. Setting it to ReadOnly");
          setReadWriteForConnectionInDatabaseContext(false, eodatabasecontext);
          return true;
--- 179,185 ----
       **/
      public  boolean databaseContextShouldFetchArrayFault(EODatabaseContext eodatabasecontext, Object obj) {
!         if(log.isDebugEnabled()) {
!             log.debug("databaseContextShouldFetchArrayFault.. Setting it to ReadOnly");
!         }
          setReadWriteForConnectionInDatabaseContext(false, eodatabasecontext);
          return true;
***************
*** 183,190 ****
          Delegate method. Will switch the connection to read only.
       **/
!     public  NSArray databaseContextShouldFetchObjects(EODatabaseContext eodatabasecontext, EOFetchSpecification
!                                                       eofetchspecification, EOEditingContext eoeditingcontext) {
!         log.debug("databaseContextShouldFetchObjects.. Setting it to ReadOnly");
!         setReadWriteForConnectionInDatabaseContext(false, eodatabasecontext);
          return null;
      }
--- 189,197 ----
          Delegate method. Will switch the connection to read only.
       **/
!     public  NSArray databaseContextShouldFetchObjects(EODatabaseContext dbc, EOFetchSpecification fs, EOEditingContext ec) {
!         if(log.isDebugEnabled()) {
!             log.debug("databaseContextShouldFetchObjects.. Setting it to ReadOnly");
!         }
!         setReadWriteForConnectionInDatabaseContext(false, dbc);
          return null;
      }
***************
*** 200,204 ****
      public void setReadWriteForConnectionInDatabaseContext(boolean isReadWrite, EODatabaseContext dbc) {
          if (_readOnlySessionProperties().length() > 0 && _readWriteSessionProperties().length() > 0) {
!             log.debug("ReadOnly and ReadWrite Transactions enabled, trying to change");
              try {
  
--- 207,213 ----
      public void setReadWriteForConnectionInDatabaseContext(boolean isReadWrite, EODatabaseContext dbc) {
          if (_readOnlySessionProperties().length() > 0 && _readWriteSessionProperties().length() > 0) {
!             if(log.isDebugEnabled()) {
!                 log.debug("ReadOnly and ReadWrite Transactions enabled, trying to change");
!             }
              try {
  
***************
*** 211,215 ****
                      }
                  } else {
!                     log.warn("Cannot change readoonly/readwrite level since the connection for the editing context is null!!");
                  }
  
--- 220,224 ----
                      }
                  } else {
!                     log.warn("Cannot change readoonly/readwrite level since the connection for the database context is null!!");
                  }
  
***************
*** 226,233 ****
      
      public void _configureReadWrite(Connection aConnection) throws SQLException {
!         if (log.isDebugEnabled())
              log.debug("Setting the JDBC connection "+aConnection+" to read / write, current state:"+
                        " isReadOnly="+aConnection.isReadOnly()+
                        ", isolation level="+aConnection.getTransactionIsolation());
          aConnection.commit();
          aConnection.createStatement().executeUpdate(_readWriteSessionProperties());
--- 235,243 ----
      
      public void _configureReadWrite(Connection aConnection) throws SQLException {
!         if (log.isDebugEnabled()) {
              log.debug("Setting the JDBC connection "+aConnection+" to read / write, current state:"+
                        " isReadOnly="+aConnection.isReadOnly()+
                        ", isolation level="+aConnection.getTransactionIsolation());
+         }
          aConnection.commit();
          aConnection.createStatement().executeUpdate(_readWriteSessionProperties());