jakarta-jcs-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t.@apache.org
Subject svn commit: r536904 [20/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/jd...
Date Thu, 10 May 2007 16:04:27 GMT
Modified: jakarta/jcs/trunk/src/java/org/apache/jcs/engine/CacheWatchRepairable.java
URL: http://svn.apache.org/viewvc/jakarta/jcs/trunk/src/java/org/apache/jcs/engine/CacheWatchRepairable.java?view=diff&rev=536904&r1=536903&r2=536904
==============================================================================
--- jakarta/jcs/trunk/src/java/org/apache/jcs/engine/CacheWatchRepairable.java (original)
+++ jakarta/jcs/trunk/src/java/org/apache/jcs/engine/CacheWatchRepairable.java Thu May 10 09:03:42 2007
@@ -1,19 +1,22 @@
 package org.apache.jcs.engine;
 
 /*
- * Copyright 2001-2004 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.
  */
 
 import java.io.IOException;
@@ -35,7 +38,7 @@
  * listeners can be recorded locally for remote connection recovery purposes.
  * (Durable subscription like those in JMS is not implemented at this stage for
  * it can be too expensive on the runtime.)
- *  
+ *
  */
 public class CacheWatchRepairable
     implements ICacheObserver
@@ -133,7 +136,7 @@
         cacheWatch.addCacheListener( obj );
     }
 
-    /** 
+    /**
      * Tell the server to release us.
      * <p>
      * @param cacheName
@@ -161,7 +164,7 @@
         cacheWatch.removeCacheListener( cacheName, obj );
     }
 
-    /**  
+    /**
      * @param obj
      * @throws IOException
      */
@@ -172,7 +175,7 @@
         {
             log.info( "removeCacheListener, ICacheListener [" + obj + "]" );
         }
-        
+
         // Record the removal locally, regardless of whether the remote
         // remove-listener operation succeeds or fails.
         synchronized ( cacheMap )

Modified: jakarta/jcs/trunk/src/java/org/apache/jcs/engine/CompositeCacheAttributes.java
URL: http://svn.apache.org/viewvc/jakarta/jcs/trunk/src/java/org/apache/jcs/engine/CompositeCacheAttributes.java?view=diff&rev=536904&r1=536903&r2=536904
==============================================================================
--- jakarta/jcs/trunk/src/java/org/apache/jcs/engine/CompositeCacheAttributes.java (original)
+++ jakarta/jcs/trunk/src/java/org/apache/jcs/engine/CompositeCacheAttributes.java Thu May 10 09:03:42 2007
@@ -1,12 +1,22 @@
 package org.apache.jcs.engine;
 
 /*
- * Copyright 2001-2004 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 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.
+ * 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.
  */
 
 import org.apache.jcs.engine.behavior.ICompositeCacheAttributes;

Modified: jakarta/jcs/trunk/src/java/org/apache/jcs/engine/ElementAttributes.java
URL: http://svn.apache.org/viewvc/jakarta/jcs/trunk/src/java/org/apache/jcs/engine/ElementAttributes.java?view=diff&rev=536904&r1=536903&r2=536904
==============================================================================
--- jakarta/jcs/trunk/src/java/org/apache/jcs/engine/ElementAttributes.java (original)
+++ jakarta/jcs/trunk/src/java/org/apache/jcs/engine/ElementAttributes.java Thu May 10 09:03:42 2007
@@ -1,14 +1,22 @@
 package org.apache.jcs.engine;
 
 /*
- * Copyright 2001-2004 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
- * 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.
+ * 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.
  */
 
 import java.io.ByteArrayInputStream;

Modified: jakarta/jcs/trunk/src/java/org/apache/jcs/engine/PooledCacheEventQueue.java
URL: http://svn.apache.org/viewvc/jakarta/jcs/trunk/src/java/org/apache/jcs/engine/PooledCacheEventQueue.java?view=diff&rev=536904&r1=536903&r2=536904
==============================================================================
--- jakarta/jcs/trunk/src/java/org/apache/jcs/engine/PooledCacheEventQueue.java (original)
+++ jakarta/jcs/trunk/src/java/org/apache/jcs/engine/PooledCacheEventQueue.java Thu May 10 09:03:42 2007
@@ -1,12 +1,22 @@
 package org.apache.jcs.engine;
 
 /*
- * Copyright 2001-2004 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 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.
+ * 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.
  */
 
 import java.io.IOException;

Modified: jakarta/jcs/trunk/src/java/org/apache/jcs/engine/ZombieCacheService.java
URL: http://svn.apache.org/viewvc/jakarta/jcs/trunk/src/java/org/apache/jcs/engine/ZombieCacheService.java?view=diff&rev=536904&r1=536903&r2=536904
==============================================================================
--- jakarta/jcs/trunk/src/java/org/apache/jcs/engine/ZombieCacheService.java (original)
+++ jakarta/jcs/trunk/src/java/org/apache/jcs/engine/ZombieCacheService.java Thu May 10 09:03:42 2007
@@ -1,14 +1,22 @@
 package org.apache.jcs.engine;
 
 /*
- * Copyright 2001-2004 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
- * 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.
+ * 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.
  */
 
 import java.io.Serializable;

Modified: jakarta/jcs/trunk/src/java/org/apache/jcs/engine/ZombieCacheWatch.java
URL: http://svn.apache.org/viewvc/jakarta/jcs/trunk/src/java/org/apache/jcs/engine/ZombieCacheWatch.java?view=diff&rev=536904&r1=536903&r2=536904
==============================================================================
--- jakarta/jcs/trunk/src/java/org/apache/jcs/engine/ZombieCacheWatch.java (original)
+++ jakarta/jcs/trunk/src/java/org/apache/jcs/engine/ZombieCacheWatch.java Thu May 10 09:03:42 2007
@@ -1,19 +1,22 @@
 package org.apache.jcs.engine;
 
 /*
- * Copyright 2001-2004 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.
  */
 
 import org.apache.jcs.engine.behavior.ICacheObserver;
@@ -23,7 +26,7 @@
 
 /**
  * Description of the Class
- *  
+ *
  */
 public class ZombieCacheWatch
     implements ICacheObserver, IZombie

Modified: jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/ICache.java
URL: http://svn.apache.org/viewvc/jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/ICache.java?view=diff&rev=536904&r1=536903&r2=536904
==============================================================================
--- jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/ICache.java (original)
+++ jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/ICache.java Thu May 10 09:03:42 2007
@@ -1,12 +1,22 @@
 package org.apache.jcs.engine.behavior;
 
 /*
- * Copyright 2001-2004 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 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.
+ * 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.
  */
 
 import java.io.IOException;

Modified: jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/ICacheElement.java
URL: http://svn.apache.org/viewvc/jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/ICacheElement.java?view=diff&rev=536904&r1=536903&r2=536904
==============================================================================
--- jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/ICacheElement.java (original)
+++ jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/ICacheElement.java Thu May 10 09:03:42 2007
@@ -1,19 +1,22 @@
 package org.apache.jcs.engine.behavior;
 
 /*
- * Copyright 2001-2004 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.
  */
 
 import java.io.Serializable;
@@ -28,7 +31,7 @@
  * The element attributes have lots of useful information about each elment,
  * such as when they were created, how long they have to live, and if they are
  * allowed to be spooled, etc.
- *  
+ *
  */
 public interface ICacheElement
     extends Serializable
@@ -37,35 +40,35 @@
     /**
      * Gets the cacheName attribute of the ICacheElement object. The cacheName
      * is also known as the region name.
-     * 
+     *
      * @return The cacheName value
      */
     public String getCacheName();
 
     /**
      * Gets the key attribute of the ICacheElement object
-     * 
+     *
      * @return The key value
      */
     public Serializable getKey();
 
     /**
      * Gets the val attribute of the ICacheElement object
-     * 
+     *
      * @return The val value
      */
     public Serializable getVal();
 
     /**
      * Gets the attributes attribute of the ICacheElement object
-     * 
+     *
      * @return The attributes value
      */
     public IElementAttributes getElementAttributes();
 
     /**
      * Sets the attributes attribute of the ICacheElement object
-     * 
+     *
      * @param attr
      *            The new attributes value
      */

Modified: jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/ICacheElementSerialized.java
URL: http://svn.apache.org/viewvc/jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/ICacheElementSerialized.java?view=diff&rev=536904&r1=536903&r2=536904
==============================================================================
--- jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/ICacheElementSerialized.java (original)
+++ jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/ICacheElementSerialized.java Thu May 10 09:03:42 2007
@@ -1,75 +1,78 @@
-package org.apache.jcs.engine.behavior;
-
-/*
- * Copyright 2001-2004 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
- *
- *     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.
- */
-
-import java.io.Serializable;
-
-/**
- * This interface defines the behavior of the serialized element wrapper.
- * <p>
- * The value is stored as a byte array. This should allow for a variety of
- * serialization mechanisms.
- * <p>
- * This currently extends ICacheElement for backward compatibility.
- * 
- * @author Aaron Smuts
- * 
- */
-public interface ICacheElementSerialized
-    extends ICacheElement
-{
-
-    /**
-     * Gets the cacheName attribute of the ICacheElement object. The cacheName
-     * is also known as the region name.
-     * 
-     * @return The cacheName value
-     */
-    public String getCacheName();
-
-    /**
-     * Gets the key attribute of the ICacheElementSerialized object. This is the
-     * standard key that the value can be reference by.
-     * 
-     * @return The key value
-     */
-    public Serializable getKey();
-    
-    /**
-     * Gets the value attribute of the ICacheElementSerialized object. This is
-     * the value the client cached seriailzed by some mechanism.
-     * 
-     * @return The serialized value
-     */
-    public byte[] getSerializedValue();
-
-    /**
-     * Gets the attributes attribute of the ICacheElement object
-     * 
-     * @return The attributes value
-     */
-    public IElementAttributes getElementAttributes();
-
-    /**
-     * Sets the attributes attribute of the ICacheElement object
-     * 
-     * @param attr
-     *            The new attributes value
-     */
-    public void setElementAttributes( IElementAttributes attr );
-
-}
+package org.apache.jcs.engine.behavior;
+
+/*
+ * 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.
+ */
+
+import java.io.Serializable;
+
+/**
+ * This interface defines the behavior of the serialized element wrapper.
+ * <p>
+ * The value is stored as a byte array. This should allow for a variety of
+ * serialization mechanisms.
+ * <p>
+ * This currently extends ICacheElement for backward compatibility.
+ *
+ * @author Aaron Smuts
+ *
+ */
+public interface ICacheElementSerialized
+    extends ICacheElement
+{
+
+    /**
+     * Gets the cacheName attribute of the ICacheElement object. The cacheName
+     * is also known as the region name.
+     *
+     * @return The cacheName value
+     */
+    public String getCacheName();
+
+    /**
+     * Gets the key attribute of the ICacheElementSerialized object. This is the
+     * standard key that the value can be reference by.
+     *
+     * @return The key value
+     */
+    public Serializable getKey();
+
+    /**
+     * Gets the value attribute of the ICacheElementSerialized object. This is
+     * the value the client cached seriailzed by some mechanism.
+     *
+     * @return The serialized value
+     */
+    public byte[] getSerializedValue();
+
+    /**
+     * Gets the attributes attribute of the ICacheElement object
+     *
+     * @return The attributes value
+     */
+    public IElementAttributes getElementAttributes();
+
+    /**
+     * Sets the attributes attribute of the ICacheElement object
+     *
+     * @param attr
+     *            The new attributes value
+     */
+    public void setElementAttributes( IElementAttributes attr );
+
+}

Modified: jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/ICacheEventQueue.java
URL: http://svn.apache.org/viewvc/jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/ICacheEventQueue.java?view=diff&rev=536904&r1=536903&r2=536904
==============================================================================
--- jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/ICacheEventQueue.java (original)
+++ jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/ICacheEventQueue.java Thu May 10 09:03:42 2007
@@ -1,19 +1,22 @@
 package org.apache.jcs.engine.behavior;
 
 /*
- * Copyright 2001-2004 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.
  */
 
 import java.io.IOException;
@@ -85,7 +88,7 @@
 
     /**
      * Gets the listenerId attribute of the ICacheEventQueue object
-     * 
+     *
      * @return The listenerId value
      */
     public long getListenerId();
@@ -116,14 +119,14 @@
      * @return number of items in the queue.
      */
     public int size();
-    
+
     /**
      * Are there elements in the queue.
      * <p>
      * @return true if there are stil elements.
      */
     public boolean isEmpty();
-    
+
     /**
      * Returns the historical and statistical data for an event queue cache.
      * <p>

Modified: jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/ICacheListener.java
URL: http://svn.apache.org/viewvc/jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/ICacheListener.java?view=diff&rev=536904&r1=536903&r2=536904
==============================================================================
--- jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/ICacheListener.java (original)
+++ jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/ICacheListener.java Thu May 10 09:03:42 2007
@@ -1,19 +1,22 @@
 package org.apache.jcs.engine.behavior;
 
 /*
- * Copyright 2001-2004 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.
  */
 
 import java.io.IOException;
@@ -25,30 +28,30 @@
  * Note: objects which implement this interface are local listeners to cache
  * changes, whereas objects which implement IRmiCacheListener are remote
  * listeners to cache changes.
- *  
+ *
  */
 public interface ICacheListener
 {
-    /** Notifies the subscribers for a cache entry update. 
+    /** Notifies the subscribers for a cache entry update.
      * @param item
      * @throws IOException*/
     public void handlePut( ICacheElement item )
         throws IOException;
 
-    /** Notifies the subscribers for a cache entry removal. 
+    /** Notifies the subscribers for a cache entry removal.
      * @param cacheName
      * @param key
      * @throws IOException*/
     public void handleRemove( String cacheName, Serializable key )
         throws IOException;
 
-    /** Notifies the subscribers for a cache remove-all. 
+    /** Notifies the subscribers for a cache remove-all.
      * @param cacheName
      * @throws IOException*/
     public void handleRemoveAll( String cacheName )
         throws IOException;
 
-    /** Notifies the subscribers for freeing up the named cache. 
+    /** Notifies the subscribers for freeing up the named cache.
      * @param cacheName
      * @throws IOException*/
     public void handleDispose( String cacheName )
@@ -56,14 +59,14 @@
 
     /**
      * Notifies the subscribers for releasing all caches.
-     * 
+     *
      * @param id
      *            The new listenerId value
      */
     //  public void handleRelease() throws IOException;
     /**
      * sets unique identifier of listener home
-     * 
+     *
      * @param id
      *            The new listenerId value
      * @throws IOException
@@ -73,7 +76,7 @@
 
     /**
      * Gets the listenerId attribute of the ICacheListener object
-     * 
+     *
      * @return The listenerId value
      * @throws IOException
      */

Modified: jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/ICacheManager.java
URL: http://svn.apache.org/viewvc/jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/ICacheManager.java?view=diff&rev=536904&r1=536903&r2=536904
==============================================================================
--- jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/ICacheManager.java (original)
+++ jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/ICacheManager.java Thu May 10 09:03:42 2007
@@ -1,24 +1,27 @@
 package org.apache.jcs.engine.behavior;
 
 /*
- * Copyright 2001-2004 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.
  */
 
 /**
  * Inteface implemented by a specific cache.
- *  
+ *
  */
 public interface ICacheManager
     extends ICacheType
@@ -27,7 +30,7 @@
     /**
      * methods to get a cache region from a maanger
      * @param cacheName
-     * 
+     *
      * @return The cache value
      */
     public ICache getCache( String cacheName );

Modified: jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/ICacheObserver.java
URL: http://svn.apache.org/viewvc/jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/ICacheObserver.java?view=diff&rev=536904&r1=536903&r2=536904
==============================================================================
--- jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/ICacheObserver.java (original)
+++ jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/ICacheObserver.java Thu May 10 09:03:42 2007
@@ -1,19 +1,22 @@
 package org.apache.jcs.engine.behavior;
 
 /*
- * Copyright 2001-2004 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.
  */
 
 import java.io.IOException;
@@ -24,13 +27,13 @@
  * Note: server which implements this interface provides a local cache event
  * notification service, whereas server which implements IRmiCacheWatch provides
  * a remote cache event notification service.
- *  
+ *
  */
 public interface ICacheObserver
 {
     /**
      * Subscribes to the specified cache.
-     * 
+     *
      * @param cacheName
      *            the specified cache.
      * @param obj
@@ -44,7 +47,7 @@
 
     /**
      * Subscribes to all caches.
-     * 
+     *
      * @param obj
      *            object to notify for all cache changes.
      * @throws IOException
@@ -55,7 +58,7 @@
     /**
      * Unsubscribes from the specified cache.
      * @param cacheName
-     * 
+     *
      * @param obj
      *            existing subscriber.
      * @throws IOException
@@ -65,7 +68,7 @@
 
     /**
      * Unsubscribes from all caches.
-     * 
+     *
      * @param obj
      *            existing subscriber.
      * @throws IOException

Modified: jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/ICacheRestore.java
URL: http://svn.apache.org/viewvc/jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/ICacheRestore.java?view=diff&rev=536904&r1=536903&r2=536904
==============================================================================
--- jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/ICacheRestore.java (original)
+++ jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/ICacheRestore.java Thu May 10 09:03:42 2007
@@ -1,30 +1,33 @@
 package org.apache.jcs.engine.behavior;
 
 /*
- * Copyright 2001-2004 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.
  */
 
 /**
  * Description of the Interface
- *  
+ *
  */
 public interface ICacheRestore
 {
-    /** 
+    /**
      * Tries to fix the cache, returns true if successful.
-     * 
+     *
      * @return true if fixed
      */
     public boolean canFix();

Modified: jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/ICacheService.java
URL: http://svn.apache.org/viewvc/jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/ICacheService.java?view=diff&rev=536904&r1=536903&r2=536904
==============================================================================
--- jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/ICacheService.java (original)
+++ jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/ICacheService.java Thu May 10 09:03:42 2007
@@ -1,12 +1,22 @@
 package org.apache.jcs.engine.behavior;
 
 /*
- * Copyright 2001-2004 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 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.
+ * 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.
  */
 
 import java.io.IOException;

Modified: jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/ICacheServiceAdmin.java
URL: http://svn.apache.org/viewvc/jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/ICacheServiceAdmin.java?view=diff&rev=536904&r1=536903&r2=536904
==============================================================================
--- jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/ICacheServiceAdmin.java (original)
+++ jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/ICacheServiceAdmin.java Thu May 10 09:03:42 2007
@@ -1,45 +1,48 @@
 package org.apache.jcs.engine.behavior;
 
 /*
- * Copyright 2001-2004 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.
  */
 
 import java.io.IOException;
 
 /**
  * Description of the Interface
- *  
+ *
  */
 public interface ICacheServiceAdmin
 {
 
     /**
      * Gets the stats attribute of the ICacheServiceAdmin object
-     * 
+     *
      * @return The stats value
      * @throws IOException
      */
     public String getStats()
         throws IOException;
 
-    /** Description of the Method 
+    /** Description of the Method
      * @throws IOException*/
     public void shutdown()
         throws IOException;
 
-    /** Description of the Method 
+    /** Description of the Method
      * @param host
      * @param port
      * @throws IOException*/

Modified: jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/ICacheType.java
URL: http://svn.apache.org/viewvc/jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/ICacheType.java?view=diff&rev=536904&r1=536903&r2=536904
==============================================================================
--- jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/ICacheType.java (original)
+++ jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/ICacheType.java Thu May 10 09:03:42 2007
@@ -1,26 +1,29 @@
 package org.apache.jcs.engine.behavior;
 
 /*
- * Copyright 2001-2004 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.
  */
 
 import java.io.Serializable;
 
 /**
  * Interface implemented by a specific cache.
- *  
+ *
  */
 public interface ICacheType
     extends Serializable

Modified: jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/ICompositeCacheAttributes.java
URL: http://svn.apache.org/viewvc/jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/ICompositeCacheAttributes.java?view=diff&rev=536904&r1=536903&r2=536904
==============================================================================
--- jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/ICompositeCacheAttributes.java (original)
+++ jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/ICompositeCacheAttributes.java Thu May 10 09:03:42 2007
@@ -1,19 +1,22 @@
 package org.apache.jcs.engine.behavior;
 
 /*
- * Copyright 2001-2004 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.
  */
 
 import java.io.Serializable;
@@ -32,7 +35,7 @@
      * disabled.
      */
     public static final short DISK_USAGE_PATTERN_UPDATE = 1;
-    
+
     /**
      * SetMaxObjects is used to set the attribute to determine the maximum
      * number of objects allowed in the memory cache. If the max number of
@@ -217,10 +220,10 @@
      * <p>
      * @param diskUsagePatternName The diskUsagePattern to set.
      */
-    public void setDiskUsagePatternName( String diskUsagePatternName );    
-    
+    public void setDiskUsagePatternName( String diskUsagePatternName );
+
     /**
      * @return Returns the diskUsagePattern.
      */
-    public short getDiskUsagePattern();   
+    public short getDiskUsagePattern();
 }

Modified: jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/ICompositeCacheManager.java
URL: http://svn.apache.org/viewvc/jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/ICompositeCacheManager.java?view=diff&rev=536904&r1=536903&r2=536904
==============================================================================
--- jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/ICompositeCacheManager.java (original)
+++ jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/ICompositeCacheManager.java Thu May 10 09:03:42 2007
@@ -1,35 +1,38 @@
-package org.apache.jcs.engine.behavior;
-
-/*
- * Copyright 2001-2004 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
- *
- *     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.
- */
-
-import org.apache.jcs.engine.control.CompositeCache;
-
-/**
- * I need the interface so I can plug in mock managers for testing.
- * 
- * @author Aaron Smuts
- */
-public interface ICompositeCacheManager
-{
-    /**
-     * Gets the cache attribute of the CacheHub object
-     * 
-     * @param cacheName
-     * @return
-     */
-    public abstract CompositeCache getCache( String cacheName );
-}
\ No newline at end of file
+package org.apache.jcs.engine.behavior;
+
+/*
+ * 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.
+ */
+
+import org.apache.jcs.engine.control.CompositeCache;
+
+/**
+ * I need the interface so I can plug in mock managers for testing.
+ *
+ * @author Aaron Smuts
+ */
+public interface ICompositeCacheManager
+{
+    /**
+     * Gets the cache attribute of the CacheHub object
+     *
+     * @param cacheName
+     * @return
+     */
+    public abstract CompositeCache getCache( String cacheName );
+}

Modified: jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/IElementAttributes.java
URL: http://svn.apache.org/viewvc/jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/IElementAttributes.java?view=diff&rev=536904&r1=536903&r2=536904
==============================================================================
--- jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/IElementAttributes.java (original)
+++ jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/IElementAttributes.java Thu May 10 09:03:42 2007
@@ -1,19 +1,22 @@
 package org.apache.jcs.engine.behavior;
 
 /*
- * Copyright 2001-2004 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.
  */
 
 import java.util.ArrayList;
@@ -25,14 +28,14 @@
  * associated with an element attributes object. It is used to track the life of
  * the object as well as to restrict its behavior. By default, elements get a
  * clone of the region's attributes.
- *  
+ *
  */
 public interface IElementAttributes
 {
 
     /**
      * Sets the version attribute of the IAttributes object
-     * 
+     *
      * @param version
      *            The new version value
      */
@@ -40,7 +43,7 @@
 
     /**
      * Sets the maxLife attribute of the IAttributes object.
-     * 
+     *
      * @param mls
      *            The new MaxLifeSeconds value
      */
@@ -53,8 +56,8 @@
      * If this is exceeded the element will not be returned, instead it will be
      * removed. It will be removed on retrieval, or removed actively if the
      * memory shrinker is turned on.
-     * 
-     * 
+     *
+     *
      * @return The MaxLifeSeconds value
      */
     public long getMaxLifeSeconds();
@@ -66,7 +69,7 @@
      * If this is exceeded the element will not be returned, instead it will be
      * removed. It will be removed on retrieval, or removed actively if the
      * memory shrinker is turned on.
-     * 
+     *
      * @param idle
      *            The new idleTime value
      */
@@ -75,7 +78,7 @@
     /**
      * Size in bytes. This is not used except in the admin pages. It will be -1
      * by default.
-     * 
+     *
      * @param size
      *            The new size value
      */
@@ -83,7 +86,7 @@
 
     /**
      * Gets the size attribute of the IAttributes object
-     * 
+     *
      * @return The size value
      */
     public int getSize();
@@ -95,14 +98,14 @@
      * call when the element is put in the cache.
      * <p>
      * Putting an item in the cache overrides any existing items.
-     * 
+     *
      * @return The createTime value
      */
     public long getCreateTime();
 
     /**
      * Gets the LastAccess attribute of the IAttributes object.
-     * 
+     *
      * @return The LastAccess value.
      */
     public long getLastAccessTime();
@@ -114,14 +117,14 @@
 
     /**
      * Gets the version attribute of the IAttributes object
-     * 
+     *
      * @return The version value
      */
     public long getVersion();
 
     /**
      * Gets the idleTime attribute of the IAttributes object
-     * 
+     *
      * @return The idleTime value
      */
     public long getIdleTime();
@@ -130,14 +133,14 @@
      * Gets the time left to live of the IAttributes object.
      * <p>
      * This is the (max life + create time) - current time.
-     * 
+     *
      * @return The TimeToLiveSeconds value
      */
     public long getTimeToLiveSeconds();
 
     /**
      * Returns a copy of the object.
-     * 
+     *
      * @return IElementAttributes
      */
     public IElementAttributes copy();
@@ -146,7 +149,7 @@
      * Can this item be spooled to disk
      * <p>
      * By default this is true.
-     * 
+     *
      * @return The spoolable value
      */
     public boolean getIsSpool();
@@ -155,7 +158,7 @@
      * Sets the isSpool attribute of the IElementAttributes object
      * <p>
      * By default this is true.
-     * 
+     *
      * @param val
      *            The new isSpool value
      */
@@ -166,7 +169,7 @@
      * type lateral.
      * <p>
      * By default this is true.
-     * 
+     *
      * @return The isLateral value
      */
     public boolean getIsLateral();
@@ -175,7 +178,7 @@
      * Sets the isLateral attribute of the IElementAttributes object
      * <p>
      * By default this is true.
-     * 
+     *
      * @param val
      *            The new isLateral value
      */
@@ -185,7 +188,7 @@
      * Can this item be sent to the remote cache.
      * <p>
      * By default this is true.
-     * 
+     *
      * @return The isRemote value
      */
     public boolean getIsRemote();
@@ -194,7 +197,7 @@
      * Sets the isRemote attribute of the IElementAttributes object.
      * <p>
      * By default this is true.
-     * 
+     *
      * @param val
      *            The new isRemote value
      */
@@ -202,14 +205,14 @@
 
     /**
      * This turns off expiration if it is true.
-     * 
+     *
      * @return The IsEternal value
      */
     public boolean getIsEternal();
 
     /**
      * Sets the isEternal attribute of the IElementAttributes object
-     * 
+     *
      * @param val
      *            The new isEternal value
      */
@@ -218,7 +221,7 @@
     /**
      * Adds a ElementEventHandler. Handler's can be registered for multiple
      * events. A registered handler will be called at every recognized event.
-     * 
+     *
      * @param eventHandler
      *            The feature to be added to the ElementEventHandler
      */
@@ -229,14 +232,14 @@
      * <p>
      * Event handlers are transient. The only events defined are in memory
      * events. All handlers are lost if the item goes to disk.
-     * 
+     *
      * @return The elementEventHandlers value, null if there are none
      */
     public ArrayList getElementEventHandlers();
 
     /**
      * Sets the eventHandlers of the IElementAttributes object
-     * 
+     *
      * @param eventHandlers
      *            value
      */

Modified: jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/IElementSerializer.java
URL: http://svn.apache.org/viewvc/jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/IElementSerializer.java?view=diff&rev=536904&r1=536903&r2=536904
==============================================================================
--- jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/IElementSerializer.java (original)
+++ jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/IElementSerializer.java Thu May 10 09:03:42 2007
@@ -1,37 +1,56 @@
-package org.apache.jcs.engine.behavior;
-
-import java.io.IOException;
-import java.io.Serializable;
-
-/**
- * Defines the behavior for cache element serializers. This layer of abstraction
- * allows us to plug in different serialization mechanisms, such as XStream.
- * 
- * @author Aaron Smuts
- * 
- */
-public interface IElementSerializer
-{
-
-    /**
-     * Turns an object into a byte array.
-     * 
-     * @param obj
-     * @return
-     * @throws IOException
-     */
-    public abstract byte[] serialize( Serializable obj )
-        throws IOException;
-
-    /**
-     * Turns a byte array into an object.
-     * 
-     * @param bytes
-     * @return
-     * @throws IOException
-     * @throws ClassNotFoundException thrown if we don't know the object.
-     */
-    public abstract Object deSerialize( byte[] bytes )
-        throws IOException, ClassNotFoundException;
-
-}
+package org.apache.jcs.engine.behavior;
+
+/*
+ * 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.
+ */
+
+import java.io.IOException;
+import java.io.Serializable;
+
+/**
+ * Defines the behavior for cache element serializers. This layer of abstraction
+ * allows us to plug in different serialization mechanisms, such as XStream.
+ *
+ * @author Aaron Smuts
+ *
+ */
+public interface IElementSerializer
+{
+
+    /**
+     * Turns an object into a byte array.
+     *
+     * @param obj
+     * @return
+     * @throws IOException
+     */
+    public abstract byte[] serialize( Serializable obj )
+        throws IOException;
+
+    /**
+     * Turns a byte array into an object.
+     *
+     * @param bytes
+     * @return
+     * @throws IOException
+     * @throws ClassNotFoundException thrown if we don't know the object.
+     */
+    public abstract Object deSerialize( byte[] bytes )
+        throws IOException, ClassNotFoundException;
+
+}

Modified: jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/IShutdownObservable.java
URL: http://svn.apache.org/viewvc/jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/IShutdownObservable.java?view=diff&rev=536904&r1=536903&r2=536904
==============================================================================
--- jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/IShutdownObservable.java (original)
+++ jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/IShutdownObservable.java Thu May 10 09:03:42 2007
@@ -1,53 +1,55 @@
-package org.apache.jcs.engine.behavior;
-
-
-/*
- * Copyright 2001-2004 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
- *
- *     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.
- */
-
-/**
- * ShutdownObservers can observer ShutdownObservable objects.  
- * The CacheManager is the primary observable that this is intended for.
- * <p>
- * Most shutdown operations will occur outside this framework for now.  The initial
- * goal is to allow background threads that are not reachable through any reference
- * that the cahe manager maintains to be killed on shutdown.
- * <p>
- * Perhaps the composite cache itself should be the observable object.
- * It doesn't make much of a difference.  There are some problems with
- * region by region shutdown.  Some auxiliaries are glocal.  They will
- * need to track when every region has shutdown before doing things like
- * closing the socket with a lateral.  
- * <p>
- * @author Aaron Smuts
- *
- */
-public interface IShutdownObservable
-{
-
-    /**
-     * Registers an observer with the observable object.
-     * @param observer
-     */
-    abstract void registerShutdownObserver( IShutdownObserver observer );
-
-    /**
-     * Deregisters the observer with the observable.
-     * 
-     * @param observer
-     */
-    abstract void deregisterShutdownObserver( IShutdownObserver observer );
-
-}
+package org.apache.jcs.engine.behavior;
+
+/*
+ * 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.
+ */
+
+/**
+ * ShutdownObservers can observer ShutdownObservable objects.
+ * The CacheManager is the primary observable that this is intended for.
+ * <p>
+ * Most shutdown operations will occur outside this framework for now.  The initial
+ * goal is to allow background threads that are not reachable through any reference
+ * that the cahe manager maintains to be killed on shutdown.
+ * <p>
+ * Perhaps the composite cache itself should be the observable object.
+ * It doesn't make much of a difference.  There are some problems with
+ * region by region shutdown.  Some auxiliaries are glocal.  They will
+ * need to track when every region has shutdown before doing things like
+ * closing the socket with a lateral.
+ * <p>
+ * @author Aaron Smuts
+ *
+ */
+public interface IShutdownObservable
+{
+
+    /**
+     * Registers an observer with the observable object.
+     * @param observer
+     */
+    abstract void registerShutdownObserver( IShutdownObserver observer );
+
+    /**
+     * Deregisters the observer with the observable.
+     *
+     * @param observer
+     */
+    abstract void deregisterShutdownObserver( IShutdownObserver observer );
+
+}

Modified: jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/IShutdownObserver.java
URL: http://svn.apache.org/viewvc/jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/IShutdownObserver.java?view=diff&rev=536904&r1=536903&r2=536904
==============================================================================
--- jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/IShutdownObserver.java (original)
+++ jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/IShutdownObserver.java Thu May 10 09:03:42 2007
@@ -1,40 +1,43 @@
-package org.apache.jcs.engine.behavior;
-
-/*
- * Copyright 2001-2004 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
- *
- *     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.
- */
-
-/**
- * This interface is required of all shutdown observers.  These observers
- * can observer ShutdownObservable objects.  The CacheManager is the primary
- * observable that this is intended for.
- * <p>
- * Most shutdown operations will occur outside this framework for now.  The initial
- * goal is to allow background threads that are not reachable through any reference
- * that the cahe manager maintains to be killed on shutdown.
- * 
- * @author Aaron Smuts
- *
- */
-public interface IShutdownObserver
-{
-
-    /**
-     * Tells the observer that the observable has received a shutdown command.
-     *
-     */
-    abstract void shutdown();
-    
-}
+package org.apache.jcs.engine.behavior;
+
+/*
+ * 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.
+ */
+
+/**
+ * This interface is required of all shutdown observers.  These observers
+ * can observer ShutdownObservable objects.  The CacheManager is the primary
+ * observable that this is intended for.
+ * <p>
+ * Most shutdown operations will occur outside this framework for now.  The initial
+ * goal is to allow background threads that are not reachable through any reference
+ * that the cahe manager maintains to be killed on shutdown.
+ *
+ * @author Aaron Smuts
+ *
+ */
+public interface IShutdownObserver
+{
+
+    /**
+     * Tells the observer that the observable has received a shutdown command.
+     *
+     */
+    abstract void shutdown();
+
+}

Modified: jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/IZombie.java
URL: http://svn.apache.org/viewvc/jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/IZombie.java?view=diff&rev=536904&r1=536903&r2=536904
==============================================================================
--- jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/IZombie.java (original)
+++ jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/IZombie.java Thu May 10 09:03:42 2007
@@ -1,24 +1,27 @@
 package org.apache.jcs.engine.behavior;
 
 /*
- * Copyright 2001-2004 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.
  */
 
 /**
  * Interface to mark an object as zombie for error recovery purposes.
- *  
+ *
  */
 public interface IZombie
 {

Modified: jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/package.html
URL: http://svn.apache.org/viewvc/jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/package.html?view=diff&rev=536904&r1=536903&r2=536904
==============================================================================
--- jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/package.html (original)
+++ jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/package.html Thu May 10 09:03:42 2007
@@ -1,3 +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.
+-->
 <html>
   <head>
   </head>

Modified: jakarta/jcs/trunk/src/java/org/apache/jcs/engine/control/CompositeCache.java
URL: http://svn.apache.org/viewvc/jakarta/jcs/trunk/src/java/org/apache/jcs/engine/control/CompositeCache.java?view=diff&rev=536904&r1=536903&r2=536904
==============================================================================
--- jakarta/jcs/trunk/src/java/org/apache/jcs/engine/control/CompositeCache.java (original)
+++ jakarta/jcs/trunk/src/java/org/apache/jcs/engine/control/CompositeCache.java Thu May 10 09:03:42 2007
@@ -1,12 +1,22 @@
 package org.apache.jcs.engine.control;
 
 /*
- * Copyright 2001-2004 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 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.
+ * 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.
  */
 
 import java.io.IOException;

Modified: jakarta/jcs/trunk/src/java/org/apache/jcs/engine/control/CompositeCacheConfigurator.java
URL: http://svn.apache.org/viewvc/jakarta/jcs/trunk/src/java/org/apache/jcs/engine/control/CompositeCacheConfigurator.java?view=diff&rev=536904&r1=536903&r2=536904
==============================================================================
--- jakarta/jcs/trunk/src/java/org/apache/jcs/engine/control/CompositeCacheConfigurator.java (original)
+++ jakarta/jcs/trunk/src/java/org/apache/jcs/engine/control/CompositeCacheConfigurator.java Thu May 10 09:03:42 2007
@@ -1,19 +1,22 @@
 package org.apache.jcs.engine.control;
 
 /*
- * Copyright 2001-2004 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.
  */
 
 import java.io.FileInputStream;
@@ -41,7 +44,7 @@
  * This class is based on the log4j class org.apache.log4j.PropertyConfigurator
  * which was made by: "Luke Blanshard" <Luke@quiq.com>"Mark DONSZELMANN"
  * <Mark.Donszelmann@cern.ch>"Anders Kristensen" <akristensen@dynamicsoft.com>
- * 
+ *
  */
 public class CompositeCacheConfigurator
 {
@@ -65,7 +68,7 @@
 
     /**
      * Constructor for the CompositeCacheConfigurator object
-     * 
+     *
      * @param ccMgr
      */
     public CompositeCacheConfigurator( CompositeCacheManager ccMgr )
@@ -78,7 +81,7 @@
      * <p>
      * This is only used for testing. The manager handles the translation of a
      * file into a properties object.
-     * 
+     *
      * @param configFileName
      */
     protected void doConfigure( String configFileName )
@@ -112,7 +115,7 @@
      * <li>Setup system caches to be used
      * <li>Setup preconfigured caches
      * </ul>
-     * 
+     *
      * @param properties
      */
     public void doConfigure( Properties properties )
@@ -140,12 +143,12 @@
         {
             log.info( "Finished configuration in " + ( end - start ) + " ms." );
         }
-        
+
     }
 
     /**
      * Set the default aux list for new caches.
-     * 
+     *
      * @param props
      */
     protected void setDefaultAuxValues( Properties props )
@@ -161,7 +164,7 @@
 
     /**
      * Set the default CompositeCacheAttributes for new caches.
-     * 
+     *
      * @param props
      */
     protected void setDefaultCompositeCacheAttributes( Properties props )
@@ -175,7 +178,7 @@
 
     /**
      * Set the default ElementAttributes for new caches.
-     * 
+     *
      * @param props
      */
     protected void setDefaultElementAttributes( Properties props )
@@ -189,7 +192,7 @@
     /**
      * Create caches used internally. System status gives them creation
      * priority.
-     * 
+     *
      * @param props
      */
     protected void parseSystemRegions( Properties props )
@@ -217,13 +220,13 @@
 
     /**
      * Parse region elements.
-     * 
+     *
      * @param props
      */
     protected void parseRegions( Properties props )
     {
         List regionNames = new ArrayList();
-        
+
         Enumeration en = props.propertyNames();
         while ( en.hasMoreElements() )
         {
@@ -231,9 +234,9 @@
             if ( key.startsWith( REGION_PREFIX ) && ( key.indexOf( "attributes" ) == -1 ) )
             {
                 String regionName = key.substring( REGION_PREFIX.length() );
-                
+
                 regionNames.add( regionName );
-                
+
                 String value = OptionConverter.findAndSubst( key, props );
                 ICache cache;
                 synchronized ( regionName )
@@ -243,17 +246,17 @@
                 compositeCacheManager.caches.put( regionName, cache );
             }
         }
-        
+
         if ( log.isInfoEnabled() )
         {
             log.info( "Parsed regions " + regionNames );
         }
-        
+
     }
 
     /**
      * Create cache region.
-     * 
+     *
      * @param props
      * @param regName
      * @param value
@@ -268,7 +271,7 @@
      * Get all the properties for a region and configure its cache.
      * <p>
      * This method tells the otehr parse method the name of the region prefix.
-     * 
+     *
      * @param props
      * @param regName
      * @param value
@@ -282,7 +285,7 @@
 
     /**
      * Get all the properties for a region and configure its cache.
-     * 
+     *
      * @param props
      * @param regName
      * @param value
@@ -359,7 +362,7 @@
 
     /**
      * Get an compositecacheattributes for the listed region.
-     * 
+     *
      * @param props
      * @param regName
      * @return
@@ -371,7 +374,7 @@
 
     /**
      * Get the main attributes for a region.
-     * 
+     *
      * @param props
      * @param regName
      * @param regionPrefix
@@ -421,7 +424,7 @@
     /**
      * Create the element attributes from the properties object for a cache
      * region.
-     * 
+     *
      * @param props
      * @param regName
      * @param regionPrefix
@@ -468,7 +471,7 @@
 
     /**
      * Get an aux cache for the listed aux for a region.
-     * 
+     *
      * @param cache
      *            the cache manager
      * @param props

Modified: jakarta/jcs/trunk/src/java/org/apache/jcs/engine/control/CompositeCacheManager.java
URL: http://svn.apache.org/viewvc/jakarta/jcs/trunk/src/java/org/apache/jcs/engine/control/CompositeCacheManager.java?view=diff&rev=536904&r1=536903&r2=536904
==============================================================================
--- jakarta/jcs/trunk/src/java/org/apache/jcs/engine/control/CompositeCacheManager.java (original)
+++ jakarta/jcs/trunk/src/java/org/apache/jcs/engine/control/CompositeCacheManager.java Thu May 10 09:03:42 2007
@@ -1,19 +1,22 @@
 package org.apache.jcs.engine.control;
 
 /*
- * Copyright 2001-2004 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.
  */
 
 import java.io.IOException;
@@ -55,7 +58,7 @@
  * <p>
  * It is recommended that you use the JCS convenience class for all cache
  * access.
- * 
+ *
  */
 public class CompositeCacheManager
     implements IRemoteCacheConstants, Serializable, ICompositeCacheManager, IShutdownObservable
@@ -105,7 +108,7 @@
      * the instance it will attempt to configure it with the default
      * configuration. If you want to configure from your own source, use
      * {@link #getUnconfiguredInstance}and then call {@link #configure}
-     * 
+     *
      * @return
      */
     public static synchronized CompositeCacheManager getInstance()
@@ -126,7 +129,7 @@
 
     /**
      * Initializes the cache manager using the props file for the given name.
-     * 
+     *
      * @param propsFilename
      * @return CompositeCacheManager configured from the give propsFileName
      */
@@ -152,7 +155,7 @@
     /**
      * Get a CacheHub instance which is not configured. If an instance already
      * exists, it will be returned.
-     * 
+     *
      * @return
      */
     public static synchronized CompositeCacheManager getUnconfiguredInstance()
@@ -175,7 +178,7 @@
     /**
      * Simple factory method, must override in subclasses so getInstance creates /
      * returns the correct object.
-     * 
+     *
      * @return CompositeCacheManager
      */
     protected static CompositeCacheManager createInstance()
@@ -193,7 +196,7 @@
 
     /**
      * Configure from specific properties file.
-     * 
+     *
      * @param propFile
      *            Path <u>within classpath </u> to load configuration from
      */
@@ -247,7 +250,7 @@
      * <p>
      * This method will call confiure, instructing it to use ssytem properties
      * as a default.
-     * 
+     *
      * @param props
      */
     public void configure( Properties props )
@@ -264,8 +267,8 @@
      * For example, you could override this value in the cache.ccf file by
      * starting up your program with the argument:
      * -Djcs.auxiliary.LTCP.attributes.TcpListenerPort=1111
-     * 
-     * 
+     *
+     *
      * @param props
      * @param useSystemProperties --
      *            if true, values starting with jcs will be put into the props
@@ -320,7 +323,7 @@
 
     /**
      * Gets the defaultCacheAttributes attribute of the CacheHub object
-     * 
+     *
      * @return The defaultCacheAttributes value
      */
     public ICompositeCacheAttributes getDefaultCacheAttributes()
@@ -330,7 +333,7 @@
 
     /**
      * Sets the defaultCacheAttributes attribute of the CacheHub object
-     * 
+     *
      * @param icca
      *            The new defaultCacheAttributes value
      */
@@ -341,7 +344,7 @@
 
     /**
      * Sets the defaultElementAttributes attribute of the CacheHub object
-     * 
+     *
      * @param iea
      *            The new defaultElementAttributes value
      */
@@ -352,7 +355,7 @@
 
     /**
      * Gets the defaultElementAttributes attribute of the CacheHub object
-     * 
+     *
      * @return The defaultElementAttributes value
      */
     public IElementAttributes getDefaultElementAttributes()
@@ -362,7 +365,7 @@
 
     /**
      * Gets the cache attribute of the CacheHub object
-     * 
+     *
      * @param cacheName
      * @return CompositeCache -- the cache region controller
      */
@@ -373,7 +376,7 @@
 
     /**
      * Gets the cache attribute of the CacheHub object
-     * 
+     *
      * @param cacheName
      * @param cattr
      * @return
@@ -386,7 +389,7 @@
 
     /**
      * Gets the cache attribute of the CacheHub object
-     * 
+     *
      * @param cacheName
      * @param cattr
      * @param attr
@@ -400,7 +403,7 @@
 
     /**
      * Gets the cache attribute of the CacheHub object
-     * 
+     *
      * @param cattr
      * @return
      */
@@ -419,7 +422,7 @@
      * the atributes are assigned to elements. Get cache creates a cache with
      * defaults if none are specified. We might want to create separate method
      * for creating/getting. . .
-     * 
+     *
      * @param cattr
      * @param attr
      * @return CompositeCache
@@ -552,7 +555,7 @@
 
     /**
      * Returns a list of the current cache names.
-     * 
+     *
      * @return String[]
      */
     public String[] getCacheNames()
@@ -619,7 +622,7 @@
     /**
      * Gets stats for debugging. This calls gets statistics and then puts all
      * the results in a string. This returns data for all regions.
-     * 
+     *
      * @return String
      */
     public String getStats()
@@ -644,7 +647,7 @@
     /**
      * This returns data gathered for all regions and all the auxiliaries they
      * currently uses.
-     * 
+     *
      * @return
      */
     public ICacheStats[] getStatistics()
@@ -685,7 +688,7 @@
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see org.apache.jcs.engine.behavior.ShutdownObservable#deregisterShutdownObserver(org.apache.jcs.engine.behavior.ShutdownObserver)
      */
     public void deregisterShutdownObserver( IShutdownObserver observer )



---------------------------------------------------------------------
To unsubscribe, e-mail: jcs-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jcs-dev-help@jakarta.apache.org


Mime
View raw message