svn commit: r536904 [7/38] - in /jakarta/jcs/trunk: ./ auxiliary-builds/javagroups/ auxiliary-builds/javagroups/src/java/org/apache/jcs/auxiliary/javagroups/ auxiliary-builds/javagroups/src/test/org/apache/jcs/auxiliary/javagroups/ auxiliary-builds/jdk...

Modified: jakarta/jcs/trunk/sandbox/yajcache/test/org/apache/jcs/yajcache/core/SafeCacheManagerTest.java
URL: http://svn.apache.org/viewvc/jakarta/jcs/trunk/sandbox/yajcache/test/org/apache/jcs/yajcache/core/SafeCacheManagerTest.java?view=diff&rev=536904&r1=536903&r2=536904
==============================================================================
--- jakarta/jcs/trunk/sandbox/yajcache/test/org/apache/jcs/yajcache/core/SafeCacheManagerTest.java (original)
+++ jakarta/jcs/trunk/sandbox/yajcache/test/org/apache/jcs/yajcache/core/SafeCacheManagerTest.java Thu May 10 09:03:42 2007
@@ -1,21 +1,24 @@
+package org.apache.jcs.yajcache.core;
+
 /*
- * Copyright 2005 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License")
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
-package org.apache.jcs.yajcache.core;
-
 import junit.framework.*;
 import org.apache.jcs.yajcache.util.TestSerializable;
 
@@ -31,7 +34,7 @@
 @TestOnly
 public class SafeCacheManagerTest extends TestCase {
     private Log log = LogFactory.getLog(this.getClass());
-    
+
     public void testGetCache() {
         log.debug("Test getCache and get");
         ICacheSafe<String> c = CacheManager.inst.getSafeCache(
@@ -100,7 +103,7 @@
         ICacheSafe intCache1 = CacheManager.inst.getSafeCache("race", Integer.class);
         assertFalse(intCache == intCache1);
         CacheManager.inst.removeCache("race");
-        ICache<Double> doubleCache = 
+        ICache<Double> doubleCache =
                 CacheManager.inst.testCreateCacheRaceCondition(
                 "race", Double.class, CacheType.SOFT_REFERENCE_SAFE);
         doubleCache.put("double", 1.234);
@@ -129,7 +132,7 @@
         ICacheSafe<TestSerializable> c = CacheManager.inst.getSafeCache(
                 "myCache", TestSerializable.class, CacheType.SOFT_REFERENCE_SAFE);
         TestSerializable[] ta = {
-                new TestSerializable("First Put"), 
+                new TestSerializable("First Put"),
                 new TestSerializable("Second Put"),
                 new TestSerializable("Third Put")
         };
@@ -145,7 +148,7 @@
         c.putBeanClone("2a", ta[1]);
         assertFalse(ta[1] == c.get("2a"));
         assertEquals(ta[1], c.get("2a"));
-        
+
         c.put("3", ta[2]);
         assertEquals(c.size(), 4);
         assertFalse(ta[1] == c.getBeanClone("2"));

Modified: jakarta/jcs/trunk/sandbox/yajcache/test/org/apache/jcs/yajcache/file/CacheFileDAOTest.java
URL: http://svn.apache.org/viewvc/jakarta/jcs/trunk/sandbox/yajcache/test/org/apache/jcs/yajcache/file/CacheFileDAOTest.java?view=diff&rev=536904&r1=536903&r2=536904
==============================================================================
--- jakarta/jcs/trunk/sandbox/yajcache/test/org/apache/jcs/yajcache/file/CacheFileDAOTest.java (original)
+++ jakarta/jcs/trunk/sandbox/yajcache/test/org/apache/jcs/yajcache/file/CacheFileDAOTest.java Thu May 10 09:03:42 2007
@@ -1,22 +1,24 @@
+package org.apache.jcs.yajcache.file;
 
 /*
- * Copyright 2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License")
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
-package org.apache.jcs.yajcache.file;
-
 import java.io.File;
 import java.io.RandomAccessFile;
 import java.util.Arrays;
@@ -33,29 +35,29 @@
 @TestOnly
 public class CacheFileDAOTest extends TestCase {
     private Log log = LogFactory.getLog(this.getClass());
-    
+
     public void test() {
-        log.debug("testing cache directory " 
+        log.debug("testing cache directory "
                 + CacheFileUtils.inst.getCacheDir("testCache").getAbsolutePath());
         log.debug("remove Cache directory");
         assertTrue(CacheFileUtils.inst.rmCacheDir("testCache"));
         log.debug("create Cache directory");
         assertTrue(CacheFileUtils.inst.mkCacheDirs("testCache"));
-        
+
         log.debug("test writeCacheItem");
         byte[] ba1 = {1, 2, 3, 4};
-        CacheFileDAO.inst.writeCacheItem("testCache", 
+        CacheFileDAO.inst.writeCacheItem("testCache",
                 CacheFileContentType.JAVA_SERIALIZATION, "key1", ba1);
         byte[] ba2 = {'a', 'b', 'c', 'd'};
-        CacheFileDAO.inst.writeCacheItem("testCache", 
+        CacheFileDAO.inst.writeCacheItem("testCache",
                 CacheFileContentType.XML_ENCODER, "key2", ba2);
-        
+
         log.debug("test readCacheItem");
         byte[] ba1r = CacheFileDAO.inst.readCacheItem("testCache", "key1").getContent();
         assertTrue(Arrays.equals(ba1, ba1r));
         byte[] ba2r = (byte[]) CacheFileDAO.inst.readCacheItem("testCache", "key2").getContent();
         assertTrue(Arrays.equals(ba2, ba2r));
-        
+
         log.debug("test removeCacheItem");
         assertTrue(CacheFileDAO.inst.removeCacheItem("testCache", "key1"));
         assertTrue(CacheFileDAO.inst.removeCacheItem("testCache", "key2"));
@@ -64,7 +66,7 @@
     public void testCorruptedFile() throws Exception {
         log.debug("create testCacheCorrupt Cache directory");
         CacheFileUtils.inst.mkCacheDirs("testCacheCorrupt");
-        
+
         log.debug("test readCacheItem missing content");
         CacheFileContent cfc = CacheFileDAO.inst.readCacheItem("testCacheCorrupt", "keyx");
         byte[] ba = cfc == null ? null : cfc.getContent();
@@ -90,7 +92,7 @@
         cfc.setContentLength(100);
         cfc.write(raf);
         raf.close();
-        
+
         cfc = CacheFileDAO.inst.readCacheItem("testCacheCorrupt", "keyy");
         ba2i = cfc == null ? null : cfc.getContent();
         assertTrue(ba2i == null);
@@ -106,7 +108,7 @@
         cfc = CacheFileDAO.inst.readCacheItem("testCacheCorrupt", "keyy");
         ba2i = cfc == null ? null : cfc.getContent();
         assertTrue(ba2i == null);
-        
+
         log.debug("test readCacheItem with appended content");
         file.delete();
         raf = new RandomAccessFile(file, "rw");
@@ -114,11 +116,11 @@
         cfc.setContent(new byte[] {1, 2, 3, 4, 5});
         cfc.write(raf);
         raf.close();
-        
+
         cfc = CacheFileDAO.inst.readCacheItem("testCacheCorrupt", "keyy");
         ba2i = cfc == null ? null : cfc.getContent();
         assertTrue(ba2i == null);
-        
+
         log.debug("test readCacheItem with content less than min length");
         file.delete();
         raf = new RandomAccessFile(file, "rw");
@@ -130,8 +132,8 @@
         cfc = CacheFileDAO.inst.readCacheItem("testCacheCorrupt", "keyy");
         ba2i = cfc == null ? null : cfc.getContent();
         assertTrue(ba2i == null);
-        
+
         log.debug(CacheFileDAO.inst.toString());
-        
+
     }
 }

Modified: jakarta/jcs/trunk/sandbox/yajcache/test/org/apache/jcs/yajcache/file/FileContentTypeTest.java
URL: http://svn.apache.org/viewvc/jakarta/jcs/trunk/sandbox/yajcache/test/org/apache/jcs/yajcache/file/FileContentTypeTest.java?view=diff&rev=536904&r1=536903&r2=536904
==============================================================================
--- jakarta/jcs/trunk/sandbox/yajcache/test/org/apache/jcs/yajcache/file/FileContentTypeTest.java (original)
+++ jakarta/jcs/trunk/sandbox/yajcache/test/org/apache/jcs/yajcache/file/FileContentTypeTest.java Thu May 10 09:03:42 2007
@@ -1,20 +1,23 @@
+package org.apache.jcs.yajcache.file;
+
 /*
- * Copyright 2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License")
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
-package org.apache.jcs.yajcache.file;
 
 import junit.framework.*;
 import org.apache.commons.logging.Log;

Modified: jakarta/jcs/trunk/sandbox/yajcache/test/org/apache/jcs/yajcache/lang/annotation/CopyRightApacheTest.java
URL: http://svn.apache.org/viewvc/jakarta/jcs/trunk/sandbox/yajcache/test/org/apache/jcs/yajcache/lang/annotation/CopyRightApacheTest.java?view=diff&rev=536904&r1=536903&r2=536904
==============================================================================
--- jakarta/jcs/trunk/sandbox/yajcache/test/org/apache/jcs/yajcache/lang/annotation/CopyRightApacheTest.java (original)
+++ jakarta/jcs/trunk/sandbox/yajcache/test/org/apache/jcs/yajcache/lang/annotation/CopyRightApacheTest.java Thu May 10 09:03:42 2007
@@ -1,20 +1,23 @@
+package org.apache.jcs.yajcache.lang.annotation;
+
 /*
- * Copyright 2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License")
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
-package org.apache.jcs.yajcache.lang.annotation;
 
 import junit.framework.TestCase;
 import org.apache.commons.logging.Log;

Modified: jakarta/jcs/trunk/sandbox/yajcache/test/org/apache/jcs/yajcache/soft/SoftRefCacheTest.java
URL: http://svn.apache.org/viewvc/jakarta/jcs/trunk/sandbox/yajcache/test/org/apache/jcs/yajcache/soft/SoftRefCacheTest.java?view=diff&rev=536904&r1=536903&r2=536904
==============================================================================
--- jakarta/jcs/trunk/sandbox/yajcache/test/org/apache/jcs/yajcache/soft/SoftRefCacheTest.java (original)
+++ jakarta/jcs/trunk/sandbox/yajcache/test/org/apache/jcs/yajcache/soft/SoftRefCacheTest.java Thu May 10 09:03:42 2007
@@ -1,21 +1,24 @@
+package org.apache.jcs.yajcache.soft;
+
 /*
- * Copyright 2005 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License")
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
-package org.apache.jcs.yajcache.soft;
-
 import junit.framework.*;
 
 import org.apache.commons.logging.Log;
@@ -33,7 +36,7 @@
 @TestOnly
 public class SoftRefCacheTest extends TestCase {
     private Log log = LogFactory.getLog(this.getClass());
-    
+
     public void testSoftRefCache() throws Exception {
         ICache<byte[]> c = CacheManager.inst.getCache(
                 "bytesCache", byte[].class, CacheType.SOFT_REFERENCE);
@@ -55,7 +58,7 @@
 //        SoftRefFileCache sc = (SoftRefFileCache)c;
 //        log.debug("count: " + sc.getCollectorCount());
 //        log.debug(SoftRefCacheCleaner.inst.toString());
-        
+
 //        for (int i=0; i < 100; i++) {
 //            log.debug("get i="+i +":"+ c.get(String.valueOf(i)));
 //        }

Modified: jakarta/jcs/trunk/sandbox/yajcache/test/org/apache/jcs/yajcache/soft/SoftRefFileCacheSafeTest.java
URL: http://svn.apache.org/viewvc/jakarta/jcs/trunk/sandbox/yajcache/test/org/apache/jcs/yajcache/soft/SoftRefFileCacheSafeTest.java?view=diff&rev=536904&r1=536903&r2=536904
==============================================================================
--- jakarta/jcs/trunk/sandbox/yajcache/test/org/apache/jcs/yajcache/soft/SoftRefFileCacheSafeTest.java (original)
+++ jakarta/jcs/trunk/sandbox/yajcache/test/org/apache/jcs/yajcache/soft/SoftRefFileCacheSafeTest.java Thu May 10 09:03:42 2007
@@ -1,21 +1,24 @@
+package org.apache.jcs.yajcache.soft;
+
 /*
- * Copyright 2005 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License")
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
-package org.apache.jcs.yajcache.soft;
-
 import junit.framework.*;
 import org.apache.jcs.yajcache.core.ICacheSafe;
 
@@ -33,7 +36,7 @@
 @TestOnly
 public class SoftRefFileCacheSafeTest extends TestCase {
     private Log log = LogFactory.getLog(this.getClass());
-    
+
     public void testSoftRefCache() throws Exception {
         ICacheSafe<byte[]> c = CacheManager.inst.getSafeCache(
                 "bytesCache", byte[].class, CacheType.SOFT_REFERENCE_FILE_SAFE);
@@ -55,7 +58,7 @@
 //        SoftRefFileCache sc = (SoftRefFileCache)c;
 //        log.debug("count: " + sc.getCollectorCount());
 //        log.debug(SoftRefCacheCleaner.inst.toString());
-        
+
 //        for (int i=0; i < 100; i++) {
 //            log.debug("get i="+i +":"+ c.get(String.valueOf(i)));
 //        }

Modified: jakarta/jcs/trunk/sandbox/yajcache/test/org/apache/jcs/yajcache/util/SerializeUtilsTest.java
URL: http://svn.apache.org/viewvc/jakarta/jcs/trunk/sandbox/yajcache/test/org/apache/jcs/yajcache/util/SerializeUtilsTest.java?view=diff&rev=536904&r1=536903&r2=536904
==============================================================================
--- jakarta/jcs/trunk/sandbox/yajcache/test/org/apache/jcs/yajcache/util/SerializeUtilsTest.java (original)
+++ jakarta/jcs/trunk/sandbox/yajcache/test/org/apache/jcs/yajcache/util/SerializeUtilsTest.java Thu May 10 09:03:42 2007
@@ -1,21 +1,24 @@
+package org.apache.jcs.yajcache.util;
+
 /*
- * Copyright 2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License")
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
-package org.apache.jcs.yajcache.util;
-
 import junit.framework.*;
 import java.util.Arrays;
 import org.apache.commons.logging.Log;
@@ -67,7 +70,7 @@
         Integer[] inta1 = SerializeUtils.inst.dup(inta);
         assertFalse(inta == inta1);
         assertTrue(Arrays.equals(inta, inta1));
-        
+
         for (int i=inta.length-1; i > -1; i--) {
             assertTrue(inta[i] == inta1[i]);
         }

Modified: jakarta/jcs/trunk/sandbox/yajcache/test/org/apache/jcs/yajcache/util/TestSerializable.java
URL: http://svn.apache.org/viewvc/jakarta/jcs/trunk/sandbox/yajcache/test/org/apache/jcs/yajcache/util/TestSerializable.java?view=diff&rev=536904&r1=536903&r2=536904
==============================================================================
--- jakarta/jcs/trunk/sandbox/yajcache/test/org/apache/jcs/yajcache/util/TestSerializable.java (original)
+++ jakarta/jcs/trunk/sandbox/yajcache/test/org/apache/jcs/yajcache/util/TestSerializable.java Thu May 10 09:03:42 2007
@@ -1,21 +1,24 @@
+package org.apache.jcs.yajcache.util;
+
 /*
- * Copyright 2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License")
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
-package org.apache.jcs.yajcache.util;
-
 import java.io.Serializable;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.jcs.yajcache.lang.annotation.*;
@@ -28,7 +31,7 @@
 @TestOnly
 public class TestSerializable implements Serializable {
     private static final long serialVersionUID = 1L;
-    
+
     private String name;
 
     public TestSerializable() {

Modified: jakarta/jcs/trunk/src/conf/JCSAdminServlet.velocity.properties
URL: http://svn.apache.org/viewvc/jakarta/jcs/trunk/src/conf/JCSAdminServlet.velocity.properties?view=diff&rev=536904&r1=536903&r2=536904
==============================================================================
--- jakarta/jcs/trunk/src/conf/JCSAdminServlet.velocity.properties (original)
+++ jakarta/jcs/trunk/src/conf/JCSAdminServlet.velocity.properties Thu May 10 09:03:42 2007
@@ -1,5 +1,21 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 runtime.log.logsystem.class = org.apache.velocity.runtime.log.AvalonLogSystem
 runtime.log.logsystem.log4j.category = org.apache.plexus.velocity.DefaultVelocityComponentTest
 
 resource.loader = classpath
-classpath.resource.loader.class = org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
\ No newline at end of file
+classpath.resource.loader.class = org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader

Modified: jakarta/jcs/trunk/src/conf/LocalStrings.properties
URL: http://svn.apache.org/viewvc/jakarta/jcs/trunk/src/conf/LocalStrings.properties?view=diff&rev=536904&r1=536903&r2=536904
==============================================================================
--- jakarta/jcs/trunk/src/conf/LocalStrings.properties (original)
+++ jakarta/jcs/trunk/src/conf/LocalStrings.properties Thu May 10 09:03:42 2007
@@ -1,3 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # Default localized resources for example servlets
 # This locale is en_US
 

Modified: jakarta/jcs/trunk/src/conf/cache.ccf
URL: http://svn.apache.org/viewvc/jakarta/jcs/trunk/src/conf/cache.ccf?view=diff&rev=536904&r1=536903&r2=536904
==============================================================================
--- jakarta/jcs/trunk/src/conf/cache.ccf (original)
+++ jakarta/jcs/trunk/src/conf/cache.ccf Thu May 10 09:03:42 2007
@@ -1,5 +1,21 @@
-##############################################################
-################## DEFAULT CACHE REGION  #####################
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+# #############################################################
+# ################# DEFAULT CACHE REGION  #####################
 # sets the default aux value for any non configured caches
 jcs.default=DC
 jcs.default.cacheattributes=org.apache.jcs.engine.CompositeCacheAttributes
@@ -17,8 +33,8 @@
 jcs.default.elementattributes.IsLateral=true
 
 
-##############################################################
-################## CACHE REGIONS AVAILABLE ###################
+# #############################################################
+# ################# CACHE REGIONS AVAILABLE ###################
 # Regions preconfirgured for caching
 jcs.region.testCache1=DC
 jcs.region.testCache1.cacheattributes=org.apache.jcs.engine.CompositeCacheAttributes
@@ -63,8 +79,8 @@
 jcs.region.testCache3.elementattributes.IsLateral=true
 
 
-##############################################################
-################## AUXILIARY CACHES AVAILABLE ################
+# #############################################################
+# ################# AUXILIARY CACHES AVAILABLE ################
 
 # Remote RMI cache without failover
 jcs.auxiliary.RGroup=org.apache.jcs.auxiliary.remote.RemoteCacheFactory
@@ -112,9 +128,9 @@
 jcs.auxiliary.JE=org.apache.jcs.auxiliary.disk.bdbje.BDBJECacheFactory
 jcs.auxiliary.JE.attributes=org.apache.jcs.auxiliary.disk.bdbje.BDBJECacheAttributes
 jcs.auxiliary.JE.attributes.DiskPath=target/test-sandbox/bdbje-disk-cache-conc
-#the minimum cache size is 1024
+# the minimum cache size is 1024
 jcs.auxiliary.indexedDiskCache.attributes.CacheSize=1024
-#jcs.auxiliary.indexedDiskCache.attributes.CachePercent=0
+# jcs.auxiliary.indexedDiskCache.attributes.CachePercent=0
 
 # HSQL Disk Cache -- too slow as is
 jcs.auxiliary.HDC=org.apache.jcs.auxiliary.disk.hsql.HSQLCacheFactory
@@ -134,8 +150,8 @@
 jcs.auxiliary.RC.attributes.FailoverServers=localhost:1101,localhost:1102
 jcs.auxiliary.RC.attributes.LocalPort=1201
 jcs.auxiliary.RC.attributes.RemoveUponRemotePut=false
-#jcs.auxiliary.RC.attributes.RemoteServiceName=RemoteCache
-#-1 means no timeout, this is the default
+# jcs.auxiliary.RC.attributes.RemoteServiceName=RemoteCache
+# -1 means no timeout, this is the default
 # if the timeout is -1, no threadpool will be used.
 jcs.auxiliary.RC.attributes.GetTimeoutMillis=500
 jcs.auxiliary.RC.attributes.ThreadPoolName=remote_cache_client
@@ -194,14 +210,14 @@
 jcs.auxiliary.LCHTTP.attributes.httpDeleteServlet=/cache/DeleteCacheServlet
 
 
-##############################################################
-################## OPTIONAL THREAD POOL CONFIGURATION ###################
+# #############################################################
+# ################# OPTIONAL THREAD POOL CONFIGURATION ###################
 # Default thread pool config
 thread_pool.default.boundarySize=2000
 thread_pool.default.maximumPoolSize=150
 thread_pool.default.minimumPoolSize=4
 thread_pool.default.keepAliveTime=350000
-#RUN ABORT WAIT BLOCK DISCARDOLDEST
+# RUN ABORT WAIT BLOCK DISCARDOLDEST
 thread_pool.default.whenBlockedPolicy=RUN
 thread_pool.default.startUpSize=4
 

Modified: jakarta/jcs/trunk/src/conf/cache2.ccf
URL: http://svn.apache.org/viewvc/jakarta/jcs/trunk/src/conf/cache2.ccf?view=diff&rev=536904&r1=536903&r2=536904
==============================================================================
--- jakarta/jcs/trunk/src/conf/cache2.ccf (original)
+++ jakarta/jcs/trunk/src/conf/cache2.ccf Thu May 10 09:03:42 2007
@@ -1,5 +1,21 @@
-##############################################################
-################## DEFAULT CACHE REGION  #####################
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+# #############################################################
+# ################# DEFAULT CACHE REGION  #####################
 # sets the default aux value for any non configured caches
 jcs.default=DC
 jcs.default.cacheattributes=org.apache.jcs.engine.CompositeCacheAttributes
@@ -11,10 +27,10 @@
 jcs.system.groupIdCache.cacheattributes=org.apache.jcs.engine.CompositeCacheAttributes
 jcs.system.groupIdCache.cacheattributes.MaxObjects=1000
 jcs.system.groupIdCache.cacheattributes.MemoryCacheName=org.apache.jcs.engine.memory.lru.LRUMemoryCache
- 
 
-##############################################################
-################## CACHE REGIONS AVAILABLE ###################
+
+# #############################################################
+# ################# CACHE REGIONS AVAILABLE ###################
 jcs.region.testCache1=DC,RC
 jcs.region.testCache1.cacheattributes=org.apache.jcs.engine.CompositeCacheAttributes
 jcs.region.testCache1.cacheattributes.MaxObjects=10
@@ -40,8 +56,8 @@
 jcs.region.test2.cacheattributes.MaxObjects=1000
 
 
-##############################################################
-################## AUXILIARY CACHES AVAILABLE ################
+# #############################################################
+# ################# AUXILIARY CACHES AVAILABLE ################
 jcs.auxiliary.HC=org.apache.jcs.auxiliary.disk.hsql.HSQLCacheFactory
 jcs.auxiliary.HC.attributes=org.apache.jcs.auxiliary.disk.hsql.HSQLCacheAttributes
 jcs.auxiliary.HC.attributes.DiskPath=@project_home@/hsql
@@ -107,24 +123,24 @@
 jcs.auxiliary.LCHTTP.attributes.httpReceiveServlet=/cache/LateralCacheReceiverServlet
 jcs.auxiliary.LCHTTP.attributes.httpDeleteServlet=/cache/DeleteCacheServlet
 
-##############################################################
-################## THREAD POOL CONFIGURATION ###################
+# #############################################################
+# ################# THREAD POOL CONFIGURATION ###################
 # Default thread pool config
 thread_pool.default.boundarySize=2000
 thread_pool.default.maximumPoolSize=150
 thread_pool.default.minimumPoolSize=4
 thread_pool.default.keepAliveTime=350000
-#RUN ABORT WAIT BLOCK DISCARDOLDEST
+# RUN ABORT WAIT BLOCK DISCARDOLDEST
 thread_pool.default.whenBlockedPolicy=RUN
 thread_pool.default.startUpSize=4
 
 # Default Cache Event Queue thread pool config, used by auxiliaries
 thread_pool.cache_event_queue.useBoundary=false
-#thread_pool.cache_event_queue.boundarySize=2000
-#thread_pool.cache_event_queue.maximumPoolSize=10
+# thread_pool.cache_event_queue.boundarySize=2000
+# thread_pool.cache_event_queue.maximumPoolSize=10
 thread_pool.cache_event_queue.minimumPoolSize=5
 thread_pool.cache_event_queue.keepAliveTime=3500
-#thread_pool.cache_event_queue.whenBlockedPolicy=RUN
+# thread_pool.cache_event_queue.whenBlockedPolicy=RUN
 thread_pool.cache_event_queue.startUpSize=5
 
 # Remote cache client thread pool config

Modified: jakarta/jcs/trunk/src/conf/cache3.ccf
URL: http://svn.apache.org/viewvc/jakarta/jcs/trunk/src/conf/cache3.ccf?view=diff&rev=536904&r1=536903&r2=536904
==============================================================================
--- jakarta/jcs/trunk/src/conf/cache3.ccf (original)
+++ jakarta/jcs/trunk/src/conf/cache3.ccf Thu May 10 09:03:42 2007
@@ -1,5 +1,21 @@
-##############################################################
-################## DEFAULT CACHE REGION  #####################
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+# #############################################################
+# ################# DEFAULT CACHE REGION  #####################
 # sets the default aux value for any non configured caches
 jcs.default=DC
 jcs.default.cacheattributes=org.apache.jcs.engine.CompositeCacheAttributes
@@ -11,10 +27,10 @@
 jcs.system.groupIdCache.cacheattributes=org.apache.jcs.engine.CompositeCacheAttributes
 jcs.system.groupIdCache.cacheattributes.MaxObjects=1000
 jcs.system.groupIdCache.cacheattributes.MemoryCacheName=org.apache.jcs.engine.memory.lru.LRUMemoryCache
- 
 
-##############################################################
-################## CACHE REGIONS AVAILABLE ###################
+
+# #############################################################
+# ################# CACHE REGIONS AVAILABLE ###################
 jcs.region.testCache1=RC
 jcs.region.testCache1.cacheattributes=org.apache.jcs.engine.CompositeCacheAttributes
 jcs.region.testCache1.cacheattributes.MaxObjects=1000
@@ -32,8 +48,8 @@
 jcs.region.test2.cacheattributes.MaxObjects=1000
 
 
-##############################################################
-################## AUXILIARY CACHES AVAILABLE ################
+# #############################################################
+# ################# AUXILIARY CACHES AVAILABLE ################
 jcs.auxiliary.HC=org.apache.jcs.auxiliary.disk.hsql.HSQLCacheFactory
 jcs.auxiliary.HC.attributes=org.apache.jcs.auxiliary.disk.hsql.HSQLCacheAttributes
 jcs.auxiliary.HC.attributes.DiskPath=@project_home@/hsql
@@ -49,9 +65,9 @@
 jcs.auxiliary.RC.attributes=org.apache.jcs.auxiliary.remote.RemoteCacheAttributes
 jcs.auxiliary.RC.attributes.RemoteHost=10.21.209.150
 jcs.auxiliary.RC.attributes.RemotePort=1102
-#jcs.auxiliary.RC.attributes.LocalPort=1103
+# jcs.auxiliary.RC.attributes.LocalPort=1103
 jcs.auxiliary.RC.attributes.RemoveUponRemotePut=false
-#jcs.auxiliary.RC.attributes.RemoteServiceName=RemoteCache
+# jcs.auxiliary.RC.attributes.RemoteServiceName=RemoteCache
 
 
 # unreliable
@@ -99,24 +115,24 @@
 jcs.auxiliary.LCHTTP.attributes.httpReceiveServlet=/cache/LateralCacheReceiverServlet
 jcs.auxiliary.LCHTTP.attributes.httpDeleteServlet=/cache/DeleteCacheServlet
 
-##############################################################
-################## THREAD POOL CONFIGURATION ###################
+# #############################################################
+# ################# THREAD POOL CONFIGURATION ###################
 # Default thread pool config
 thread_pool.default.boundarySize=2000
 thread_pool.default.maximumPoolSize=150
 thread_pool.default.minimumPoolSize=4
 thread_pool.default.keepAliveTime=350000
-#RUN ABORT WAIT BLOCK DISCARDOLDEST
+# RUN ABORT WAIT BLOCK DISCARDOLDEST
 thread_pool.default.whenBlockedPolicy=RUN
 thread_pool.default.startUpSize=4
 
 # Default Cache Event Queue thread pool config, used by auxiliaries
 thread_pool.cache_event_queue.useBoundary=false
-#thread_pool.cache_event_queue.boundarySize=2000
-#thread_pool.cache_event_queue.maximumPoolSize=10
+# thread_pool.cache_event_queue.boundarySize=2000
+# thread_pool.cache_event_queue.maximumPoolSize=10
 thread_pool.cache_event_queue.minimumPoolSize=5
 thread_pool.cache_event_queue.keepAliveTime=3500
-#thread_pool.cache_event_queue.whenBlockedPolicy=RUN
+# thread_pool.cache_event_queue.whenBlockedPolicy=RUN
 thread_pool.cache_event_queue.startUpSize=5
 
 # Remote cache client thread pool config

Modified: jakarta/jcs/trunk/src/conf/cacheB.ccf
URL: http://svn.apache.org/viewvc/jakarta/jcs/trunk/src/conf/cacheB.ccf?view=diff&rev=536904&r1=536903&r2=536904
==============================================================================
--- jakarta/jcs/trunk/src/conf/cacheB.ccf (original)
+++ jakarta/jcs/trunk/src/conf/cacheB.ccf Thu May 10 09:03:42 2007
@@ -1,5 +1,21 @@
-##############################################################
-################## DEFAULT CACHE REGION  #####################
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+# #############################################################
+# ################# DEFAULT CACHE REGION  #####################
 # sets the default aux value for any non configured caches
 jcs.default=DC
 jcs.default.cacheattributes=org.apache.jcs.engine.CompositeCacheAttributes
@@ -17,8 +33,8 @@
 jcs.default.elementattributes.IsLateral=true
 
 
-##############################################################
-################## CACHE REGIONS AVAILABLE ###################
+# #############################################################
+# ################# CACHE REGIONS AVAILABLE ###################
 # Regions preconfirgured for caching
 jcs.region.testCache1=RC
 jcs.region.testCache1.cacheattributes=org.apache.jcs.engine.CompositeCacheAttributes
@@ -63,8 +79,8 @@
 jcs.region.testCache3.elementattributes.IsLateral=true
 
 
-##############################################################
-################## AUXILIARY CACHES AVAILABLE ################
+# #############################################################
+# ################# AUXILIARY CACHES AVAILABLE ################
 
 # Remote RMI cache without failover
 jcs.auxiliary.RGroup=org.apache.jcs.auxiliary.remote.RemoteCacheFactory
@@ -111,9 +127,9 @@
 jcs.auxiliary.JE=org.apache.jcs.auxiliary.disk.bdbje.BDBJECacheFactory
 jcs.auxiliary.JE.attributes=org.apache.jcs.auxiliary.disk.bdbje.BDBJECacheAttributes
 jcs.auxiliary.JE.attributes.DiskPath=target/test-sandbox/bdbje-disk-cache-conc
-#the minimum cache size is 1024
+# the minimum cache size is 1024
 jcs.auxiliary.indexedDiskCache.attributes.CacheSize=1024
-#jcs.auxiliary.indexedDiskCache.attributes.CachePercent=0
+# jcs.auxiliary.indexedDiskCache.attributes.CachePercent=0
 
 # HSQL Disk Cache -- too slow as is
 jcs.auxiliary.HDC=org.apache.jcs.auxiliary.disk.hsql.HSQLCacheFactory
@@ -190,14 +206,14 @@
 jcs.auxiliary.LCHTTP.attributes.httpDeleteServlet=/cache/DeleteCacheServlet
 
 
-##############################################################
-################## OPTIONAL THREAD POOL CONFIGURATION ###################
+# #############################################################
+# ################# OPTIONAL THREAD POOL CONFIGURATION ###################
 # Default thread pool config
 thread_pool.default.boundarySize=2000
 thread_pool.default.maximumPoolSize=150
 thread_pool.default.minimumPoolSize=4
 thread_pool.default.keepAliveTime=350000
-#RUN ABORT WAIT BLOCK DISCARDOLDEST
+# RUN ABORT WAIT BLOCK DISCARDOLDEST
 thread_pool.default.whenBlockedPolicy=RUN
 thread_pool.default.startUpSize=4
 

Modified: jakarta/jcs/trunk/src/conf/cacheBDB.ccf
URL: http://svn.apache.org/viewvc/jakarta/jcs/trunk/src/conf/cacheBDB.ccf?view=diff&rev=536904&r1=536903&r2=536904
==============================================================================
--- jakarta/jcs/trunk/src/conf/cacheBDB.ccf (original)
+++ jakarta/jcs/trunk/src/conf/cacheBDB.ccf Thu May 10 09:03:42 2007
@@ -1,39 +1,55 @@
-# Cache configuration for the 'TestDiskCache' test. The memory cache has a
-# a maximum of 100 objects, so objects should get pushed into the disk cache
-
-jcs.default=bdbje
-jcs.default.cacheattributes=org.apache.jcs.engine.CompositeCacheAttributes
-jcs.default.cacheattributes.MaxObjects=100
-jcs.default.cacheattributes.MemoryCacheName=org.apache.jcs.engine.memory.lru.LRUMemoryCache
-
-##### CACHE REGIONS FOR TEST
-
-jcs.region.indexedRegion1=bdbje
-jcs.region.indexedRegion1.cacheattributes=org.apache.jcs.engine.CompositeCacheAttributes
-jcs.region.indexedRegion1.cacheattributes.MaxObjects=100
-jcs.region.indexedRegion1.cacheattributes.MemoryCacheName=org.apache.jcs.engine.memory.lru.LRUMemoryCache
-
-jcs.region.indexedRegion2=bdbje
-jcs.region.indexedRegion2.cacheattributes=org.apache.jcs.engine.CompositeCacheAttributes
-jcs.region.indexedRegion2.cacheattributes.MaxObjects=100
-jcs.region.indexedRegion2.cacheattributes.MemoryCacheName=org.apache.jcs.engine.memory.lru.LRUMemoryCache
-
-jcs.region.indexedRegion3=bdbje
-jcs.region.indexedRegion3.cacheattributes=org.apache.jcs.engine.CompositeCacheAttributes
-jcs.region.indexedRegion3.cacheattributes.MaxObjects=100
-jcs.region.indexedRegion3.cacheattributes.MemoryCacheName=org.apache.jcs.engine.memory.lru.LRUMemoryCache
-
-jcs.region.indexedRegion4=bdbje
-jcs.region.indexedRegion4.cacheattributes=org.apache.jcs.engine.CompositeCacheAttributes
-jcs.region.indexedRegion4.cacheattributes.MaxObjects=100
-jcs.region.indexedRegion4.cacheattributes.MemoryCacheName=org.apache.jcs.engine.memory.lru.LRUMemoryCache
-jcs.region.indexedRegion4.cacheattributes.UseMemoryShrinker=false
-
-
-##### AUXILIARY CACHES
-
-# Berkeley DB JE
-jcs.auxiliary.bdbje=org.apache.jcs.auxiliary.disk.bdbje.BDBJECacheFactory
-jcs.auxiliary.bdbje.attributes=org.apache.jcs.auxiliary.disk.bdbje.BDBJECacheAttributes
-jcs.auxiliary.bdbje.attributes.DiskPath=target/
-jcs.auxiliary.bdbje.attributes.MaxPurgatorySize=100000
\ No newline at end of file
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+# Cache configuration for the 'TestDiskCache' test. The memory cache has a
+# a maximum of 100 objects, so objects should get pushed into the disk cache
+
+jcs.default=bdbje
+jcs.default.cacheattributes=org.apache.jcs.engine.CompositeCacheAttributes
+jcs.default.cacheattributes.MaxObjects=100
+jcs.default.cacheattributes.MemoryCacheName=org.apache.jcs.engine.memory.lru.LRUMemoryCache
+
+# #### CACHE REGIONS FOR TEST
+
+jcs.region.indexedRegion1=bdbje
+jcs.region.indexedRegion1.cacheattributes=org.apache.jcs.engine.CompositeCacheAttributes
+jcs.region.indexedRegion1.cacheattributes.MaxObjects=100
+jcs.region.indexedRegion1.cacheattributes.MemoryCacheName=org.apache.jcs.engine.memory.lru.LRUMemoryCache
+
+jcs.region.indexedRegion2=bdbje
+jcs.region.indexedRegion2.cacheattributes=org.apache.jcs.engine.CompositeCacheAttributes
+jcs.region.indexedRegion2.cacheattributes.MaxObjects=100
+jcs.region.indexedRegion2.cacheattributes.MemoryCacheName=org.apache.jcs.engine.memory.lru.LRUMemoryCache
+
+jcs.region.indexedRegion3=bdbje
+jcs.region.indexedRegion3.cacheattributes=org.apache.jcs.engine.CompositeCacheAttributes
+jcs.region.indexedRegion3.cacheattributes.MaxObjects=100
+jcs.region.indexedRegion3.cacheattributes.MemoryCacheName=org.apache.jcs.engine.memory.lru.LRUMemoryCache
+
+jcs.region.indexedRegion4=bdbje
+jcs.region.indexedRegion4.cacheattributes=org.apache.jcs.engine.CompositeCacheAttributes
+jcs.region.indexedRegion4.cacheattributes.MaxObjects=100
+jcs.region.indexedRegion4.cacheattributes.MemoryCacheName=org.apache.jcs.engine.memory.lru.LRUMemoryCache
+jcs.region.indexedRegion4.cacheattributes.UseMemoryShrinker=false
+
+
+# #### AUXILIARY CACHES
+
+# Berkeley DB JE
+jcs.auxiliary.bdbje=org.apache.jcs.auxiliary.disk.bdbje.BDBJECacheFactory
+jcs.auxiliary.bdbje.attributes=org.apache.jcs.auxiliary.disk.bdbje.BDBJECacheAttributes
+jcs.auxiliary.bdbje.attributes.DiskPath=target/
+jcs.auxiliary.bdbje.attributes.MaxPurgatorySize=100000

Modified: jakarta/jcs/trunk/src/conf/cacheD10A.ccf
URL: http://svn.apache.org/viewvc/jakarta/jcs/trunk/src/conf/cacheD10A.ccf?view=diff&rev=536904&r1=536903&r2=536904
==============================================================================
--- jakarta/jcs/trunk/src/conf/cacheD10A.ccf (original)
+++ jakarta/jcs/trunk/src/conf/cacheD10A.ccf Thu May 10 09:03:42 2007
@@ -1,151 +1,167 @@
-##############################################################
-################## DEFAULT CACHE REGION  #####################
-# sets the default aux value for any non configured caches
-jcs.default=DC,RC
-jcs.default.cacheattributes=org.apache.jcs.engine.CompositeCacheAttributes
-jcs.default.cacheattributes.MaxObjects=200001
-jcs.default.cacheattributes.MemoryCacheName=org.apache.jcs.engine.memory.lru.LRUMemoryCache
-jcs.default.cacheattributes.UseMemoryShrinker=true
-jcs.default.cacheattributes.MaxMemoryIdleTimeSeconds=3600
-jcs.default.cacheattributes.ShrinkerIntervalSeconds=60
-jcs.default.elementattributes=org.apache.jcs.engine.ElementAttributes
-jcs.default.elementattributes.IsEternal=false
-jcs.default.elementattributes.MaxLifeSeconds=700
-jcs.default.elementattributes.IdleTime=1800
-jcs.default.elementattributes.IsSpool=true
-jcs.default.elementattributes.IsRemote=true
-jcs.default.elementattributes.IsLateral=true
-
-
-##############################################################
-################## CACHE REGIONS AVAILABLE ###################
-# Regions preconfirgured for caching
-jcs.region.testCache1=DC,RC
-jcs.region.testCache1.cacheattributes=org.apache.jcs.engine.CompositeCacheAttributes
-jcs.region.testCache1.cacheattributes.MaxObjects=1000000
-jcs.region.testCache1.cacheattributes.MemoryCacheName=org.apache.jcs.engine.memory.lru.LRUMemoryCache
-jcs.region.testCache1.cacheattributes.UseMemoryShrinker=true
-jcs.region.testCache1.cacheattributes.ShrinkerIntervalSeconds=30
-jcs.region.testCache1.cacheattributes.MaxMemoryIdleTimeSeconds=300
-jcs.region.testCache1.cacheattributes.MaxSpoolPerRun=100
-jcs.region.testCache1.elementattributes=org.apache.jcs.engine.ElementAttributes
-jcs.region.testCache1.elementattributes.IsEternal=false
-jcs.region.testCache1.elementattributes.MaxLifeSeconds=60000
-jcs.region.testCache1.elementattributes.IsLateral=true
-jcs.region.testCache1.elementattributes.IsRemote=true
-
-jcs.region.testCache2=DC,RC
-jcs.region.testCache2.cacheattributes=org.apache.jcs.engine.CompositeCacheAttributes
-jcs.region.testCache2.cacheattributes.MaxObjects=100
-jcs.region.testCache2.cacheattributes.MemoryCacheName=org.apache.jcs.engine.memory.lru.LRUMemoryCache
-jcs.region.testCache2.cacheattributes.UseMemoryShrinker=true
-jcs.region.testCache2.cacheattributes.MaxMemoryIdleTimeSeconds=1000
-jcs.region.testCache2.cacheattributes.ShrinkerIntervalSeconds=40
-jcs.region.testCache2.elementattributes=org.apache.jcs.engine.ElementAttributes
-jcs.region.testCache2.elementattributes.IsEternal=false
-jcs.region.testCache2.elementattributes.MaxLifeSeconds=600
-jcs.region.testCache2.elementattributes.IsSpool=true
-jcs.region.testCache2.elementattributes.IsRemote=true
-jcs.region.testCache2.elementattributes.IsLateral=true
-
-jcs.region.testCache3=
-jcs.region.testCache3.cacheattributes=org.apache.jcs.engine.CompositeCacheAttributes
-jcs.region.testCache3.cacheattributes.MaxObjects=100000
-jcs.region.testCache3.cacheattributes.MemoryCacheName=org.apache.jcs.engine.memory.lru.LRUMemoryCache
-jcs.region.testCache3.cacheattributes.UseMemoryShrinker=false
-jcs.region.testCache3.cacheattributes.MaxMemoryIdleTimeSeconds=10
-jcs.region.testCache3.cacheattributes.ShrinkerIntervalSeconds=60
-jcs.region.testCache3.elementattributes=org.apache.jcs.engine.ElementAttributes
-jcs.region.testCache3.elementattributes.IsEternal=false
-jcs.region.testCache3.elementattributes.MaxLifeSeconds=3600
-jcs.region.testCache3.elementattributes.IsSpool=true
-jcs.region.testCache3.elementattributes.IsRemote=true
-jcs.region.testCache3.elementattributes.IsLateral=true
-
-
-##############################################################
-################## AUXILIARY CACHES AVAILABLE ################
-
-# Primary Disk Cache-- faster than the rest because of memory key storage
-jcs.auxiliary.DC=org.apache.jcs.auxiliary.disk.indexed.IndexedDiskCacheFactory
-jcs.auxiliary.DC.attributes=org.apache.jcs.auxiliary.disk.indexed.IndexedDiskCacheAttributes
-jcs.auxiliary.DC.attributes.DiskPath=target/test-sandbox/raf
-jcs.auxiliary.DC.attributes.MaxPurgatorySize=10000000
-jcs.auxiliary.DC.attributes.MaxKeySize=1000000
-jcs.auxiliary.DC.attributes.MaxRecycleBinSize=5000
-jcs.auxiliary.DC.attributes.OptimizeAtRemoveCount=300000
-jcs.auxiliary.DC.attributes.ShutdownSpoolTimeLimit=60
-
-# Disk Cache Using a Pooled Event Queue -- this allows you
-# to control the maximum number of threads it will use.
-# Each region uses 1 thread by default in the SINGLE model.
-# adding more threads does not help.
-# If you want to use a separate pool for each disk cache, either use
-# the single model or define a different auxiliary for each region and use the Pooled.
-# SINGLE is best unless you ahve a huge # of regions.
-jcs.auxiliary.DC2=org.apache.jcs.auxiliary.disk.indexed.IndexedDiskCacheFactory
-jcs.auxiliary.DC2.attributes=org.apache.jcs.auxiliary.disk.indexed.IndexedDiskCacheAttributes
-jcs.auxiliary.DC2.attributes.DiskPath=target/test-sandbox/raf
-jcs.auxiliary.DC2.attributes.MaxPurgatorySize=10000
-jcs.auxiliary.DC2.attributes.MaxKeySize=10000
-jcs.auxiliary.DC2.attributes.MaxRecycleBinSize=5000
-jcs.auxiliary.DC2.attributes.OptimizeAtRemoveCount=300000
-jcs.auxiliary.DC2.attributes.EventQueueType=POOLED
-jcs.auxiliary.DC2.attributes.EventQueuePoolName=disk_cache_event_queue
-
-
-# need to make put or invalidate an option
-# just a remove lock to add
-jcs.auxiliary.RC=org.apache.jcs.auxiliary.remote.RemoteCacheFactory
-jcs.auxiliary.RC.attributes=org.apache.jcs.auxiliary.remote.RemoteCacheAttributes
-jcs.auxiliary.RC.attributes.FailoverServers=dev10.hq.site59.com:1101
-jcs.auxiliary.RC.attributes.LocalPort=1200
-jcs.auxiliary.RC.attributes.RemoveUponRemotePut=false
-#-1 means no timeout, this is the default
-# if the timeout is -1, no threadpool will be used.
-#jcs.auxiliary.RC.attributes.GetTimeoutMillis=500
-#jcs.auxiliary.RC.attributes.ThreadPoolName=remote_cache_client
-#jcs.auxiliary.RC.attributes.GetOnly=false
-
-# Remote RMI Cache set up to failover
-jcs.auxiliary.RFailover=org.apache.jcs.auxiliary.remote.RemoteCacheFactory
-jcs.auxiliary.RFailover.attributes=org.apache.jcs.auxiliary.remote.RemoteCacheAttributes
-jcs.auxiliary.RFailover.attributes.FailoverServers=dev10.hq.site59.com:1101
-jcs.auxiliary.RC.attributes.RemoveUponRemotePut=true
-jcs.auxiliary.RFailover.attributes.GetOnly=false
-
-
-##############################################################
-################## OPTIONAL THREAD POOL CONFIGURATION ###################
-# Default thread pool config
-thread_pool.default.boundarySize=2000
-thread_pool.default.maximumPoolSize=150
-thread_pool.default.minimumPoolSize=4
-thread_pool.default.keepAliveTime=350000
-#RUN ABORT WAIT BLOCK DISCARDOLDEST
-thread_pool.default.whenBlockedPolicy=RUN
-thread_pool.default.startUpSize=4
-
-# Default Cache Event Queue thread pool config, used by auxiliaries
-# since it doesn't use a boundary, some of the options are unnecessary
-thread_pool.cache_event_queue.useBoundary=false
-thread_pool.cache_event_queue.minimumPoolSize=5
-thread_pool.cache_event_queue.keepAliveTime=3500
-thread_pool.cache_event_queue.startUpSize=5
-
-# Disk Cache pool
-thread_pool.disk_cache_event_queue.useBoundary=false
-thread_pool.remote_cache_client.maximumPoolSize=15
-thread_pool.disk_cache_event_queue.minimumPoolSize=1
-thread_pool.disk_cache_event_queue.keepAliveTime=3500
-thread_pool.disk_cache_event_queue.startUpSize=1
-
-# Remote cache client thread pool config
-thread_pool.remote_cache_client.boundarySize=75
-thread_pool.remote_cache_client.maximumPoolSize=150
-thread_pool.remote_cache_client.minimumPoolSize=4
-thread_pool.remote_cache_client.keepAliveTime=350000
-thread_pool.remote_cache_client.whenBlockedPolicy=RUN
-thread_pool.remote_cache_client.startUpSize=4
-
-
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+# #############################################################
+# ################# DEFAULT CACHE REGION  #####################
+# sets the default aux value for any non configured caches
+jcs.default=DC,RC
+jcs.default.cacheattributes=org.apache.jcs.engine.CompositeCacheAttributes
+jcs.default.cacheattributes.MaxObjects=200001
+jcs.default.cacheattributes.MemoryCacheName=org.apache.jcs.engine.memory.lru.LRUMemoryCache
+jcs.default.cacheattributes.UseMemoryShrinker=true
+jcs.default.cacheattributes.MaxMemoryIdleTimeSeconds=3600
+jcs.default.cacheattributes.ShrinkerIntervalSeconds=60
+jcs.default.elementattributes=org.apache.jcs.engine.ElementAttributes
+jcs.default.elementattributes.IsEternal=false
+jcs.default.elementattributes.MaxLifeSeconds=700
+jcs.default.elementattributes.IdleTime=1800
+jcs.default.elementattributes.IsSpool=true
+jcs.default.elementattributes.IsRemote=true
+jcs.default.elementattributes.IsLateral=true
+
+
+# #############################################################
+# ################# CACHE REGIONS AVAILABLE ###################
+# Regions preconfirgured for caching
+jcs.region.testCache1=DC,RC
+jcs.region.testCache1.cacheattributes=org.apache.jcs.engine.CompositeCacheAttributes
+jcs.region.testCache1.cacheattributes.MaxObjects=1000000
+jcs.region.testCache1.cacheattributes.MemoryCacheName=org.apache.jcs.engine.memory.lru.LRUMemoryCache
+jcs.region.testCache1.cacheattributes.UseMemoryShrinker=true
+jcs.region.testCache1.cacheattributes.ShrinkerIntervalSeconds=30
+jcs.region.testCache1.cacheattributes.MaxMemoryIdleTimeSeconds=300
+jcs.region.testCache1.cacheattributes.MaxSpoolPerRun=100
+jcs.region.testCache1.elementattributes=org.apache.jcs.engine.ElementAttributes
+jcs.region.testCache1.elementattributes.IsEternal=false
+jcs.region.testCache1.elementattributes.MaxLifeSeconds=60000
+jcs.region.testCache1.elementattributes.IsLateral=true
+jcs.region.testCache1.elementattributes.IsRemote=true
+
+jcs.region.testCache2=DC,RC
+jcs.region.testCache2.cacheattributes=org.apache.jcs.engine.CompositeCacheAttributes
+jcs.region.testCache2.cacheattributes.MaxObjects=100
+jcs.region.testCache2.cacheattributes.MemoryCacheName=org.apache.jcs.engine.memory.lru.LRUMemoryCache
+jcs.region.testCache2.cacheattributes.UseMemoryShrinker=true
+jcs.region.testCache2.cacheattributes.MaxMemoryIdleTimeSeconds=1000
+jcs.region.testCache2.cacheattributes.ShrinkerIntervalSeconds=40
+jcs.region.testCache2.elementattributes=org.apache.jcs.engine.ElementAttributes
+jcs.region.testCache2.elementattributes.IsEternal=false
+jcs.region.testCache2.elementattributes.MaxLifeSeconds=600
+jcs.region.testCache2.elementattributes.IsSpool=true
+jcs.region.testCache2.elementattributes.IsRemote=true
+jcs.region.testCache2.elementattributes.IsLateral=true
+
+jcs.region.testCache3=
+jcs.region.testCache3.cacheattributes=org.apache.jcs.engine.CompositeCacheAttributes
+jcs.region.testCache3.cacheattributes.MaxObjects=100000
+jcs.region.testCache3.cacheattributes.MemoryCacheName=org.apache.jcs.engine.memory.lru.LRUMemoryCache
+jcs.region.testCache3.cacheattributes.UseMemoryShrinker=false
+jcs.region.testCache3.cacheattributes.MaxMemoryIdleTimeSeconds=10
+jcs.region.testCache3.cacheattributes.ShrinkerIntervalSeconds=60
+jcs.region.testCache3.elementattributes=org.apache.jcs.engine.ElementAttributes
+jcs.region.testCache3.elementattributes.IsEternal=false
+jcs.region.testCache3.elementattributes.MaxLifeSeconds=3600
+jcs.region.testCache3.elementattributes.IsSpool=true
+jcs.region.testCache3.elementattributes.IsRemote=true
+jcs.region.testCache3.elementattributes.IsLateral=true
+
+
+# #############################################################
+# ################# AUXILIARY CACHES AVAILABLE ################
+
+# Primary Disk Cache-- faster than the rest because of memory key storage
+jcs.auxiliary.DC=org.apache.jcs.auxiliary.disk.indexed.IndexedDiskCacheFactory
+jcs.auxiliary.DC.attributes=org.apache.jcs.auxiliary.disk.indexed.IndexedDiskCacheAttributes
+jcs.auxiliary.DC.attributes.DiskPath=target/test-sandbox/raf
+jcs.auxiliary.DC.attributes.MaxPurgatorySize=10000000
+jcs.auxiliary.DC.attributes.MaxKeySize=1000000
+jcs.auxiliary.DC.attributes.MaxRecycleBinSize=5000
+jcs.auxiliary.DC.attributes.OptimizeAtRemoveCount=300000
+jcs.auxiliary.DC.attributes.ShutdownSpoolTimeLimit=60
+
+# Disk Cache Using a Pooled Event Queue -- this allows you
+# to control the maximum number of threads it will use.
+# Each region uses 1 thread by default in the SINGLE model.
+# adding more threads does not help.
+# If you want to use a separate pool for each disk cache, either use
+# the single model or define a different auxiliary for each region and use the Pooled.
+# SINGLE is best unless you ahve a huge # of regions.
+jcs.auxiliary.DC2=org.apache.jcs.auxiliary.disk.indexed.IndexedDiskCacheFactory
+jcs.auxiliary.DC2.attributes=org.apache.jcs.auxiliary.disk.indexed.IndexedDiskCacheAttributes
+jcs.auxiliary.DC2.attributes.DiskPath=target/test-sandbox/raf
+jcs.auxiliary.DC2.attributes.MaxPurgatorySize=10000
+jcs.auxiliary.DC2.attributes.MaxKeySize=10000
+jcs.auxiliary.DC2.attributes.MaxRecycleBinSize=5000
+jcs.auxiliary.DC2.attributes.OptimizeAtRemoveCount=300000
+jcs.auxiliary.DC2.attributes.EventQueueType=POOLED
+jcs.auxiliary.DC2.attributes.EventQueuePoolName=disk_cache_event_queue
+
+
+# need to make put or invalidate an option
+# just a remove lock to add
+jcs.auxiliary.RC=org.apache.jcs.auxiliary.remote.RemoteCacheFactory
+jcs.auxiliary.RC.attributes=org.apache.jcs.auxiliary.remote.RemoteCacheAttributes
+jcs.auxiliary.RC.attributes.FailoverServers=dev10.hq.site59.com:1101
+jcs.auxiliary.RC.attributes.LocalPort=1200
+jcs.auxiliary.RC.attributes.RemoveUponRemotePut=false
+# -1 means no timeout, this is the default
+# if the timeout is -1, no threadpool will be used.
+# jcs.auxiliary.RC.attributes.GetTimeoutMillis=500
+# jcs.auxiliary.RC.attributes.ThreadPoolName=remote_cache_client
+# jcs.auxiliary.RC.attributes.GetOnly=false
+
+# Remote RMI Cache set up to failover
+jcs.auxiliary.RFailover=org.apache.jcs.auxiliary.remote.RemoteCacheFactory
+jcs.auxiliary.RFailover.attributes=org.apache.jcs.auxiliary.remote.RemoteCacheAttributes
+jcs.auxiliary.RFailover.attributes.FailoverServers=dev10.hq.site59.com:1101
+jcs.auxiliary.RC.attributes.RemoveUponRemotePut=true
+jcs.auxiliary.RFailover.attributes.GetOnly=false
+
+
+# #############################################################
+# ################# OPTIONAL THREAD POOL CONFIGURATION ###################
+# Default thread pool config
+thread_pool.default.boundarySize=2000
+thread_pool.default.maximumPoolSize=150
+thread_pool.default.minimumPoolSize=4
+thread_pool.default.keepAliveTime=350000
+# RUN ABORT WAIT BLOCK DISCARDOLDEST
+thread_pool.default.whenBlockedPolicy=RUN
+thread_pool.default.startUpSize=4
+
+# Default Cache Event Queue thread pool config, used by auxiliaries
+# since it doesn't use a boundary, some of the options are unnecessary
+thread_pool.cache_event_queue.useBoundary=false
+thread_pool.cache_event_queue.minimumPoolSize=5
+thread_pool.cache_event_queue.keepAliveTime=3500
+thread_pool.cache_event_queue.startUpSize=5
+
+# Disk Cache pool
+thread_pool.disk_cache_event_queue.useBoundary=false
+thread_pool.remote_cache_client.maximumPoolSize=15
+thread_pool.disk_cache_event_queue.minimumPoolSize=1
+thread_pool.disk_cache_event_queue.keepAliveTime=3500
+thread_pool.disk_cache_event_queue.startUpSize=1
+
+# Remote cache client thread pool config
+thread_pool.remote_cache_client.boundarySize=75
+thread_pool.remote_cache_client.maximumPoolSize=150
+thread_pool.remote_cache_client.minimumPoolSize=4
+thread_pool.remote_cache_client.keepAliveTime=350000
+thread_pool.remote_cache_client.whenBlockedPolicy=RUN
+thread_pool.remote_cache_client.startUpSize=4
+
+

Modified: jakarta/jcs/trunk/src/conf/cacheD10B.ccf
URL: http://svn.apache.org/viewvc/jakarta/jcs/trunk/src/conf/cacheD10B.ccf?view=diff&rev=536904&r1=536903&r2=536904
==============================================================================
--- jakarta/jcs/trunk/src/conf/cacheD10B.ccf (original)
+++ jakarta/jcs/trunk/src/conf/cacheD10B.ccf Thu May 10 09:03:42 2007
@@ -1,151 +1,167 @@
-##############################################################
-################## DEFAULT CACHE REGION  #####################
-# sets the default aux value for any non configured caches
-jcs.default=DC,RC
-jcs.default.cacheattributes=org.apache.jcs.engine.CompositeCacheAttributes
-jcs.default.cacheattributes.MaxObjects=200001
-jcs.default.cacheattributes.MemoryCacheName=org.apache.jcs.engine.memory.lru.LRUMemoryCache
-jcs.default.cacheattributes.UseMemoryShrinker=true
-jcs.default.cacheattributes.MaxMemoryIdleTimeSeconds=3600
-jcs.default.cacheattributes.ShrinkerIntervalSeconds=60
-jcs.default.elementattributes=org.apache.jcs.engine.ElementAttributes
-jcs.default.elementattributes.IsEternal=false
-jcs.default.elementattributes.MaxLifeSeconds=700
-jcs.default.elementattributes.IdleTime=1800
-jcs.default.elementattributes.IsSpool=true
-jcs.default.elementattributes.IsRemote=true
-jcs.default.elementattributes.IsLateral=true
-
-
-##############################################################
-################## CACHE REGIONS AVAILABLE ###################
-# Regions preconfirgured for caching
-jcs.region.testCache1=DC,RC
-jcs.region.testCache1.cacheattributes=org.apache.jcs.engine.CompositeCacheAttributes
-jcs.region.testCache1.cacheattributes.MaxObjects=1000000
-jcs.region.testCache1.cacheattributes.MemoryCacheName=org.apache.jcs.engine.memory.lru.LRUMemoryCache
-jcs.region.testCache1.cacheattributes.UseMemoryShrinker=true
-jcs.region.testCache1.cacheattributes.ShrinkerIntervalSeconds=30
-jcs.region.testCache1.cacheattributes.MaxMemoryIdleTimeSeconds=300
-jcs.region.testCache1.cacheattributes.MaxSpoolPerRun=100
-jcs.region.testCache1.elementattributes=org.apache.jcs.engine.ElementAttributes
-jcs.region.testCache1.elementattributes.IsEternal=false
-jcs.region.testCache1.elementattributes.MaxLifeSeconds=60000
-jcs.region.testCache1.elementattributes.IsLateral=true
-jcs.region.testCache1.elementattributes.IsRemote=true
-
-jcs.region.testCache2=DC,RC
-jcs.region.testCache2.cacheattributes=org.apache.jcs.engine.CompositeCacheAttributes
-jcs.region.testCache2.cacheattributes.MaxObjects=100
-jcs.region.testCache2.cacheattributes.MemoryCacheName=org.apache.jcs.engine.memory.lru.LRUMemoryCache
-jcs.region.testCache2.cacheattributes.UseMemoryShrinker=true
-jcs.region.testCache2.cacheattributes.MaxMemoryIdleTimeSeconds=1000
-jcs.region.testCache2.cacheattributes.ShrinkerIntervalSeconds=40
-jcs.region.testCache2.elementattributes=org.apache.jcs.engine.ElementAttributes
-jcs.region.testCache2.elementattributes.IsEternal=false
-jcs.region.testCache2.elementattributes.MaxLifeSeconds=600
-jcs.region.testCache2.elementattributes.IsSpool=true
-jcs.region.testCache2.elementattributes.IsRemote=true
-jcs.region.testCache2.elementattributes.IsLateral=true
-
-jcs.region.testCache3=
-jcs.region.testCache3.cacheattributes=org.apache.jcs.engine.CompositeCacheAttributes
-jcs.region.testCache3.cacheattributes.MaxObjects=100000
-jcs.region.testCache3.cacheattributes.MemoryCacheName=org.apache.jcs.engine.memory.lru.LRUMemoryCache
-jcs.region.testCache3.cacheattributes.UseMemoryShrinker=false
-jcs.region.testCache3.cacheattributes.MaxMemoryIdleTimeSeconds=10
-jcs.region.testCache3.cacheattributes.ShrinkerIntervalSeconds=60
-jcs.region.testCache3.elementattributes=org.apache.jcs.engine.ElementAttributes
-jcs.region.testCache3.elementattributes.IsEternal=false
-jcs.region.testCache3.elementattributes.MaxLifeSeconds=3600
-jcs.region.testCache3.elementattributes.IsSpool=true
-jcs.region.testCache3.elementattributes.IsRemote=true
-jcs.region.testCache3.elementattributes.IsLateral=true
-
-
-##############################################################
-################## AUXILIARY CACHES AVAILABLE ################
-
-# Primary Disk Cache-- faster than the rest because of memory key storage
-jcs.auxiliary.DC=org.apache.jcs.auxiliary.disk.indexed.IndexedDiskCacheFactory
-jcs.auxiliary.DC.attributes=org.apache.jcs.auxiliary.disk.indexed.IndexedDiskCacheAttributes
-jcs.auxiliary.DC.attributes.DiskPath=target/test-sandbox/raf
-jcs.auxiliary.DC.attributes.MaxPurgatorySize=10000000
-jcs.auxiliary.DC.attributes.MaxKeySize=1000000
-jcs.auxiliary.DC.attributes.MaxRecycleBinSize=5000
-jcs.auxiliary.DC.attributes.OptimizeAtRemoveCount=300000
-jcs.auxiliary.DC.attributes.ShutdownSpoolTimeLimit=60
-
-# Disk Cache Using a Pooled Event Queue -- this allows you
-# to control the maximum number of threads it will use.
-# Each region uses 1 thread by default in the SINGLE model.
-# adding more threads does not help.
-# If you want to use a separate pool for each disk cache, either use
-# the single model or define a different auxiliary for each region and use the Pooled.
-# SINGLE is best unless you ahve a huge # of regions.
-jcs.auxiliary.DC2=org.apache.jcs.auxiliary.disk.indexed.IndexedDiskCacheFactory
-jcs.auxiliary.DC2.attributes=org.apache.jcs.auxiliary.disk.indexed.IndexedDiskCacheAttributes
-jcs.auxiliary.DC2.attributes.DiskPath=target/test-sandbox/raf
-jcs.auxiliary.DC2.attributes.MaxPurgatorySize=10000
-jcs.auxiliary.DC2.attributes.MaxKeySize=10000
-jcs.auxiliary.DC2.attributes.MaxRecycleBinSize=5000
-jcs.auxiliary.DC2.attributes.OptimizeAtRemoveCount=300000
-jcs.auxiliary.DC2.attributes.EventQueueType=POOLED
-jcs.auxiliary.DC2.attributes.EventQueuePoolName=disk_cache_event_queue
-
-
-# need to make put or invalidate an option
-# just a remove lock to add
-jcs.auxiliary.RC=org.apache.jcs.auxiliary.remote.RemoteCacheFactory
-jcs.auxiliary.RC.attributes=org.apache.jcs.auxiliary.remote.RemoteCacheAttributes
-jcs.auxiliary.RC.attributes.FailoverServers=dev10.hq.site59.com:1101
-jcs.auxiliary.RC.attributes.LocalPort=1201
-jcs.auxiliary.RC.attributes.RemoveUponRemotePut=false
-#-1 means no timeout, this is the default
-# if the timeout is -1, no threadpool will be used.
-#jcs.auxiliary.RC.attributes.GetTimeoutMillis=500
-#jcs.auxiliary.RC.attributes.ThreadPoolName=remote_cache_client
-#jcs.auxiliary.RC.attributes.GetOnly=false
-
-# Remote RMI Cache set up to failover
-jcs.auxiliary.RFailover=org.apache.jcs.auxiliary.remote.RemoteCacheFactory
-jcs.auxiliary.RFailover.attributes=org.apache.jcs.auxiliary.remote.RemoteCacheAttributes
-jcs.auxiliary.RFailover.attributes.FailoverServers=dev10.hq.site59.com:1101
-jcs.auxiliary.RC.attributes.RemoveUponRemotePut=true
-jcs.auxiliary.RFailover.attributes.GetOnly=false
-
-
-##############################################################
-################## OPTIONAL THREAD POOL CONFIGURATION ###################
-# Default thread pool config
-thread_pool.default.boundarySize=2000
-thread_pool.default.maximumPoolSize=150
-thread_pool.default.minimumPoolSize=4
-thread_pool.default.keepAliveTime=350000
-#RUN ABORT WAIT BLOCK DISCARDOLDEST
-thread_pool.default.whenBlockedPolicy=RUN
-thread_pool.default.startUpSize=4
-
-# Default Cache Event Queue thread pool config, used by auxiliaries
-# since it doesn't use a boundary, some of the options are unnecessary
-thread_pool.cache_event_queue.useBoundary=false
-thread_pool.cache_event_queue.minimumPoolSize=5
-thread_pool.cache_event_queue.keepAliveTime=3500
-thread_pool.cache_event_queue.startUpSize=5
-
-# Disk Cache pool
-thread_pool.disk_cache_event_queue.useBoundary=false
-thread_pool.remote_cache_client.maximumPoolSize=15
-thread_pool.disk_cache_event_queue.minimumPoolSize=1
-thread_pool.disk_cache_event_queue.keepAliveTime=3500
-thread_pool.disk_cache_event_queue.startUpSize=1
-
-# Remote cache client thread pool config
-thread_pool.remote_cache_client.boundarySize=75
-thread_pool.remote_cache_client.maximumPoolSize=150
-thread_pool.remote_cache_client.minimumPoolSize=4
-thread_pool.remote_cache_client.keepAliveTime=350000
-thread_pool.remote_cache_client.whenBlockedPolicy=RUN
-thread_pool.remote_cache_client.startUpSize=4
-
-
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+# #############################################################
+# ################# DEFAULT CACHE REGION  #####################
+# sets the default aux value for any non configured caches
+jcs.default=DC,RC
+jcs.default.cacheattributes=org.apache.jcs.engine.CompositeCacheAttributes
+jcs.default.cacheattributes.MaxObjects=200001
+jcs.default.cacheattributes.MemoryCacheName=org.apache.jcs.engine.memory.lru.LRUMemoryCache
+jcs.default.cacheattributes.UseMemoryShrinker=true
+jcs.default.cacheattributes.MaxMemoryIdleTimeSeconds=3600
+jcs.default.cacheattributes.ShrinkerIntervalSeconds=60
+jcs.default.elementattributes=org.apache.jcs.engine.ElementAttributes
+jcs.default.elementattributes.IsEternal=false
+jcs.default.elementattributes.MaxLifeSeconds=700
+jcs.default.elementattributes.IdleTime=1800
+jcs.default.elementattributes.IsSpool=true
+jcs.default.elementattributes.IsRemote=true
+jcs.default.elementattributes.IsLateral=true
+
+
+# #############################################################
+# ################# CACHE REGIONS AVAILABLE ###################
+# Regions preconfirgured for caching
+jcs.region.testCache1=DC,RC
+jcs.region.testCache1.cacheattributes=org.apache.jcs.engine.CompositeCacheAttributes
+jcs.region.testCache1.cacheattributes.MaxObjects=1000000
+jcs.region.testCache1.cacheattributes.MemoryCacheName=org.apache.jcs.engine.memory.lru.LRUMemoryCache
+jcs.region.testCache1.cacheattributes.UseMemoryShrinker=true
+jcs.region.testCache1.cacheattributes.ShrinkerIntervalSeconds=30
+jcs.region.testCache1.cacheattributes.MaxMemoryIdleTimeSeconds=300
+jcs.region.testCache1.cacheattributes.MaxSpoolPerRun=100
+jcs.region.testCache1.elementattributes=org.apache.jcs.engine.ElementAttributes
+jcs.region.testCache1.elementattributes.IsEternal=false
+jcs.region.testCache1.elementattributes.MaxLifeSeconds=60000
+jcs.region.testCache1.elementattributes.IsLateral=true
+jcs.region.testCache1.elementattributes.IsRemote=true
+
+jcs.region.testCache2=DC,RC
+jcs.region.testCache2.cacheattributes=org.apache.jcs.engine.CompositeCacheAttributes
+jcs.region.testCache2.cacheattributes.MaxObjects=100
+jcs.region.testCache2.cacheattributes.MemoryCacheName=org.apache.jcs.engine.memory.lru.LRUMemoryCache
+jcs.region.testCache2.cacheattributes.UseMemoryShrinker=true
+jcs.region.testCache2.cacheattributes.MaxMemoryIdleTimeSeconds=1000
+jcs.region.testCache2.cacheattributes.ShrinkerIntervalSeconds=40
+jcs.region.testCache2.elementattributes=org.apache.jcs.engine.ElementAttributes
+jcs.region.testCache2.elementattributes.IsEternal=false
+jcs.region.testCache2.elementattributes.MaxLifeSeconds=600
+jcs.region.testCache2.elementattributes.IsSpool=true
+jcs.region.testCache2.elementattributes.IsRemote=true
+jcs.region.testCache2.elementattributes.IsLateral=true
+
+jcs.region.testCache3=
+jcs.region.testCache3.cacheattributes=org.apache.jcs.engine.CompositeCacheAttributes
+jcs.region.testCache3.cacheattributes.MaxObjects=100000
+jcs.region.testCache3.cacheattributes.MemoryCacheName=org.apache.jcs.engine.memory.lru.LRUMemoryCache
+jcs.region.testCache3.cacheattributes.UseMemoryShrinker=false
+jcs.region.testCache3.cacheattributes.MaxMemoryIdleTimeSeconds=10
+jcs.region.testCache3.cacheattributes.ShrinkerIntervalSeconds=60
+jcs.region.testCache3.elementattributes=org.apache.jcs.engine.ElementAttributes
+jcs.region.testCache3.elementattributes.IsEternal=false
+jcs.region.testCache3.elementattributes.MaxLifeSeconds=3600
+jcs.region.testCache3.elementattributes.IsSpool=true
+jcs.region.testCache3.elementattributes.IsRemote=true
+jcs.region.testCache3.elementattributes.IsLateral=true
+
+
+# #############################################################
+# ################# AUXILIARY CACHES AVAILABLE ################
+
+# Primary Disk Cache-- faster than the rest because of memory key storage
+jcs.auxiliary.DC=org.apache.jcs.auxiliary.disk.indexed.IndexedDiskCacheFactory
+jcs.auxiliary.DC.attributes=org.apache.jcs.auxiliary.disk.indexed.IndexedDiskCacheAttributes
+jcs.auxiliary.DC.attributes.DiskPath=target/test-sandbox/raf
+jcs.auxiliary.DC.attributes.MaxPurgatorySize=10000000
+jcs.auxiliary.DC.attributes.MaxKeySize=1000000
+jcs.auxiliary.DC.attributes.MaxRecycleBinSize=5000
+jcs.auxiliary.DC.attributes.OptimizeAtRemoveCount=300000
+jcs.auxiliary.DC.attributes.ShutdownSpoolTimeLimit=60
+
+# Disk Cache Using a Pooled Event Queue -- this allows you
+# to control the maximum number of threads it will use.
+# Each region uses 1 thread by default in the SINGLE model.
+# adding more threads does not help.
+# If you want to use a separate pool for each disk cache, either use
+# the single model or define a different auxiliary for each region and use the Pooled.
+# SINGLE is best unless you ahve a huge # of regions.
+jcs.auxiliary.DC2=org.apache.jcs.auxiliary.disk.indexed.IndexedDiskCacheFactory
+jcs.auxiliary.DC2.attributes=org.apache.jcs.auxiliary.disk.indexed.IndexedDiskCacheAttributes
+jcs.auxiliary.DC2.attributes.DiskPath=target/test-sandbox/raf
+jcs.auxiliary.DC2.attributes.MaxPurgatorySize=10000
+jcs.auxiliary.DC2.attributes.MaxKeySize=10000
+jcs.auxiliary.DC2.attributes.MaxRecycleBinSize=5000
+jcs.auxiliary.DC2.attributes.OptimizeAtRemoveCount=300000
+jcs.auxiliary.DC2.attributes.EventQueueType=POOLED
+jcs.auxiliary.DC2.attributes.EventQueuePoolName=disk_cache_event_queue
+
+
+# need to make put or invalidate an option
+# just a remove lock to add
+jcs.auxiliary.RC=org.apache.jcs.auxiliary.remote.RemoteCacheFactory
+jcs.auxiliary.RC.attributes=org.apache.jcs.auxiliary.remote.RemoteCacheAttributes
+jcs.auxiliary.RC.attributes.FailoverServers=dev10.hq.site59.com:1101
+jcs.auxiliary.RC.attributes.LocalPort=1201
+jcs.auxiliary.RC.attributes.RemoveUponRemotePut=false
+# -1 means no timeout, this is the default
+# if the timeout is -1, no threadpool will be used.
+# jcs.auxiliary.RC.attributes.GetTimeoutMillis=500
+# jcs.auxiliary.RC.attributes.ThreadPoolName=remote_cache_client
+# jcs.auxiliary.RC.attributes.GetOnly=false
+
+# Remote RMI Cache set up to failover
+jcs.auxiliary.RFailover=org.apache.jcs.auxiliary.remote.RemoteCacheFactory
+jcs.auxiliary.RFailover.attributes=org.apache.jcs.auxiliary.remote.RemoteCacheAttributes
+jcs.auxiliary.RFailover.attributes.FailoverServers=dev10.hq.site59.com:1101
+jcs.auxiliary.RC.attributes.RemoveUponRemotePut=true
+jcs.auxiliary.RFailover.attributes.GetOnly=false
+
+
+# #############################################################
+# ################# OPTIONAL THREAD POOL CONFIGURATION ###################
+# Default thread pool config
+thread_pool.default.boundarySize=2000
+thread_pool.default.maximumPoolSize=150
+thread_pool.default.minimumPoolSize=4
+thread_pool.default.keepAliveTime=350000
+# RUN ABORT WAIT BLOCK DISCARDOLDEST
+thread_pool.default.whenBlockedPolicy=RUN
+thread_pool.default.startUpSize=4
+
+# Default Cache Event Queue thread pool config, used by auxiliaries
+# since it doesn't use a boundary, some of the options are unnecessary
+thread_pool.cache_event_queue.useBoundary=false
+thread_pool.cache_event_queue.minimumPoolSize=5
+thread_pool.cache_event_queue.keepAliveTime=3500
+thread_pool.cache_event_queue.startUpSize=5
+
+# Disk Cache pool
+thread_pool.disk_cache_event_queue.useBoundary=false
+thread_pool.remote_cache_client.maximumPoolSize=15
+thread_pool.disk_cache_event_queue.minimumPoolSize=1
+thread_pool.disk_cache_event_queue.keepAliveTime=3500
+thread_pool.disk_cache_event_queue.startUpSize=1
+
+# Remote cache client thread pool config
+thread_pool.remote_cache_client.boundarySize=75
+thread_pool.remote_cache_client.maximumPoolSize=150
+thread_pool.remote_cache_client.minimumPoolSize=4
+thread_pool.remote_cache_client.keepAliveTime=350000
+thread_pool.remote_cache_client.whenBlockedPolicy=RUN
+thread_pool.remote_cache_client.startUpSize=4
+
+