[jboss-cvs] JBossCache/src/org/jboss/cache ...

[Brian Stansberry]

  User: bstansberry
  Date: 06/10/25 00:52:51

  Modified:    src/org/jboss/cache  TreeCache.java
  Log:
  Handle parsing of config XML in XmlConfigurationParser 
  Use the proper config format
  
  Revision  Changes    Path
  1.258     +4 -24     JBossCache/src/org/jboss/cache/TreeCache.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: TreeCache.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/TreeCache.java,v
  retrieving revision 1.257
  retrieving revision 1.258
  diff -u -b -r1.257 -r1.258
  --- TreeCache.java	24 Oct 2006 11:35:30 -0000	1.257
  +++ TreeCache.java	25 Oct 2006 04:52:51 -0000	1.258
  @@ -92,7 +92,7 @@
    * @author <a href="mailto:manik at jboss.org">Manik Surtani (manik at jboss.org)</a>
    * @author Brian Stansberry
    * @author Daniel Huang (dhuang at jboss.org)
  - * @version $Id: TreeCache.java,v 1.257 2006/10/24 11:35:30 msurtani Exp $
  + * @version $Id: TreeCache.java,v 1.258 2006/10/25 04:52:51 bstansberry Exp $
    *          <p/>
    * @see <a href="http://labs.jboss.com/portal/jbosscache/docs">JBossCache doc</a>
    */
  @@ -609,7 +609,7 @@
         }
   
         // create cache loader
  -      if ((configuration.getCacheLoaderConfiguration() != null || cloaderConfig != null) && cacheLoaderManager == null)
  +      if ((configuration.getCacheLoaderConfig() != null || cloaderConfig != null) && cacheLoaderManager == null)
         {
            initialiseCacheLoaderManager();
         }
  @@ -670,7 +670,7 @@
               disp = new RpcDispatcher(channel, ml, this, this);
               disp.setMarshaller(getMarshaller());
   
  -            setBuddyReplicationConfig(configuration.getBuddyReplicationConfiguration());
  +            setBuddyReplicationConfig(configuration.getBuddyReplicationConfig());
               break;
            default:
               throw new IllegalArgumentException("cache mode " + configuration.getCacheMode() + " is invalid");
  @@ -3893,26 +3893,6 @@
      }
   
      /**
  -    * Loads the specified class using this class's classloader, or, if it is <code>null</code>
  -    * (i.e. this class was loaded by the bootstrap classloader), the system classloader.
  -    * <p/>
  -    * If loadtime instrumentation via GenerateInstrumentedClassLoader is used, this
  -    * class may be loaded by the bootstrap classloader.
  -    * </p>
  -    *
  -    * @throws ClassNotFoundException
  -    */
  -   protected Class loadClass(String classname) throws ClassNotFoundException
  -   {
  -      ClassLoader cl = getClass().getClassLoader();
  -      if (cl == null)
  -      {
  -         cl = ClassLoader.getSystemClassLoader();
  -      }
  -      return cl.loadClass(classname);
  -   }
  -
  -   /**
       * Finds a node given a fully qualified name.
       * Whenever nodes are created, and the global transaction is not null, the created
       * nodes have to be added to the transaction's {@link TransactionEntry}
  @@ -4063,7 +4043,7 @@
         {
            cacheLoaderManager = new CacheLoaderManager();
         }
  -      cacheLoaderManager.setConfig(configuration.getCacheLoaderConfiguration(), getCacheSPI());
  +      cacheLoaderManager.setConfig(configuration.getCacheLoaderConfig(), getCacheSPI());
      }
   
      /**