You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@excalibur.apache.org by cz...@apache.org on 2007/01/30 09:36:19 UTC
svn commit: r501344 - in /excalibur/trunk/components/store: ./
src/java/org/apache/excalibur/store/
src/java/org/apache/excalibur/store/impl/
src/test/org/apache/excalibur/store/impl/
Author: cziegeler
Date: Tue Jan 30 00:36:18 2007
New Revision: 501344
URL: http://svn.apache.org/viewvc?view=rev&rev=501344
Log:
Add new licence and fix usage of Component interface
Modified:
excalibur/trunk/components/store/maven.xml
excalibur/trunk/components/store/pom.xml
excalibur/trunk/components/store/project.properties
excalibur/trunk/components/store/project.xml
excalibur/trunk/components/store/src/java/org/apache/excalibur/store/Store.java
excalibur/trunk/components/store/src/java/org/apache/excalibur/store/StoreJanitor.java
excalibur/trunk/components/store/src/java/org/apache/excalibur/store/impl/AbstractFilesystemStore.java
excalibur/trunk/components/store/src/java/org/apache/excalibur/store/impl/AbstractJispFilesystemStore.java
excalibur/trunk/components/store/src/java/org/apache/excalibur/store/impl/AbstractReadWriteStore.java
excalibur/trunk/components/store/src/java/org/apache/excalibur/store/impl/JispFilesystemStore.java
excalibur/trunk/components/store/src/java/org/apache/excalibur/store/impl/JispKey.java
excalibur/trunk/components/store/src/java/org/apache/excalibur/store/impl/MRUMemoryStore.java
excalibur/trunk/components/store/src/java/org/apache/excalibur/store/impl/MemoryStore.java
excalibur/trunk/components/store/src/java/org/apache/excalibur/store/impl/StoreJanitorImpl.java
excalibur/trunk/components/store/src/test/org/apache/excalibur/store/impl/ClearJispFilesystemStoreTestCase.java
Modified: excalibur/trunk/components/store/maven.xml
URL: http://svn.apache.org/viewvc/excalibur/trunk/components/store/maven.xml?view=diff&rev=501344&r1=501343&r2=501344
==============================================================================
--- excalibur/trunk/components/store/maven.xml (original)
+++ excalibur/trunk/components/store/maven.xml Tue Jan 30 00:36:18 2007
@@ -1,19 +1,19 @@
<?xml version="1.0"?>
<!--
-Copyright 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.
-->
<project default="jar:install"
Modified: excalibur/trunk/components/store/pom.xml
URL: http://svn.apache.org/viewvc/excalibur/trunk/components/store/pom.xml?view=diff&rev=501344&r1=501343&r2=501344
==============================================================================
--- excalibur/trunk/components/store/pom.xml (original)
+++ excalibur/trunk/components/store/pom.xml Tue Jan 30 00:36:18 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.
+-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.excalibur.components</groupId>
Modified: excalibur/trunk/components/store/project.properties
URL: http://svn.apache.org/viewvc/excalibur/trunk/components/store/project.properties?view=diff&rev=501344&r1=501343&r2=501344
==============================================================================
--- excalibur/trunk/components/store/project.properties (original)
+++ excalibur/trunk/components/store/project.properties Tue Jan 30 00:36:18 2007
@@ -1,16 +1,16 @@
#
-# Copyright 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
+# 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.
-#
+# 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.
#
Modified: excalibur/trunk/components/store/project.xml
URL: http://svn.apache.org/viewvc/excalibur/trunk/components/store/project.xml?view=diff&rev=501344&r1=501343&r2=501344
==============================================================================
--- excalibur/trunk/components/store/project.xml (original)
+++ excalibur/trunk/components/store/project.xml Tue Jan 30 00:36:18 2007
@@ -1,19 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-Copyright 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.
-->
<project>
<extend>${basedir}/../project-common.xml</extend>
Modified: excalibur/trunk/components/store/src/java/org/apache/excalibur/store/Store.java
URL: http://svn.apache.org/viewvc/excalibur/trunk/components/store/src/java/org/apache/excalibur/store/Store.java?view=diff&rev=501344&r1=501343&r2=501344
==============================================================================
--- excalibur/trunk/components/store/src/java/org/apache/excalibur/store/Store.java (original)
+++ excalibur/trunk/components/store/src/java/org/apache/excalibur/store/Store.java Tue Jan 30 00:36:18 2007
@@ -1,16 +1,16 @@
-/*
- * Copyright 2002-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
- *
+/*
+ * 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.
- *
+ * 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.
*/
@@ -19,8 +19,6 @@
import java.io.IOException;
import java.util.Enumeration;
-import org.apache.avalon.framework.component.Component;
-
/**
* A Store is an object managing arbitrary data. It holds data stored
* under a given key persistently. So if you put something in a store
@@ -34,7 +32,6 @@
* @version CVS $Id: Store.java,v 1.5 2004/02/28 11:47:34 cziegeler Exp $
*/
public interface Store
- extends Component
{
/** The role for a persistent store */
String ROLE = Store.class.getName();
Modified: excalibur/trunk/components/store/src/java/org/apache/excalibur/store/StoreJanitor.java
URL: http://svn.apache.org/viewvc/excalibur/trunk/components/store/src/java/org/apache/excalibur/store/StoreJanitor.java?view=diff&rev=501344&r1=501343&r2=501344
==============================================================================
--- excalibur/trunk/components/store/src/java/org/apache/excalibur/store/StoreJanitor.java (original)
+++ excalibur/trunk/components/store/src/java/org/apache/excalibur/store/StoreJanitor.java Tue Jan 30 00:36:18 2007
@@ -1,16 +1,16 @@
-/*
- * Copyright 2002-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
- *
+/*
+ * 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.
- *
+ * 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.
*/
@@ -27,7 +27,6 @@
* @version CVS $Id: StoreJanitor.java,v 1.4 2004/02/28 11:47:35 cziegeler Exp $
*/
public interface StoreJanitor
- extends Component
{
String ROLE = StoreJanitor.class.getName();
Modified: excalibur/trunk/components/store/src/java/org/apache/excalibur/store/impl/AbstractFilesystemStore.java
URL: http://svn.apache.org/viewvc/excalibur/trunk/components/store/src/java/org/apache/excalibur/store/impl/AbstractFilesystemStore.java?view=diff&rev=501344&r1=501343&r2=501344
==============================================================================
--- excalibur/trunk/components/store/src/java/org/apache/excalibur/store/impl/AbstractFilesystemStore.java (original)
+++ excalibur/trunk/components/store/src/java/org/apache/excalibur/store/impl/AbstractFilesystemStore.java Tue Jan 30 00:36:18 2007
@@ -1,16 +1,16 @@
-/*
- * Copyright 2002-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
- *
+/*
+ * 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.
- *
+ * 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.
*/
@@ -22,9 +22,6 @@
import EDU.oswego.cs.dl.util.concurrent.Sync;
-import org.apache.avalon.framework.thread.ThreadSafe;
-import org.apache.excalibur.store.Store;
-
/**
* Stores objects on the filesystem: String objects as text files,
* all other objects are serialized. This class must be subclassed
@@ -34,8 +31,7 @@
* @version CVS $Id: AbstractFilesystemStore.java,v 1.4 2004/02/28 11:47:31 cziegeler Exp $
*/
public abstract class AbstractFilesystemStore
-extends AbstractReadWriteStore
-implements Store, ThreadSafe {
+extends AbstractReadWriteStore {
/** The directory repository */
protected File m_directoryFile;
Modified: excalibur/trunk/components/store/src/java/org/apache/excalibur/store/impl/AbstractJispFilesystemStore.java
URL: http://svn.apache.org/viewvc/excalibur/trunk/components/store/src/java/org/apache/excalibur/store/impl/AbstractJispFilesystemStore.java?view=diff&rev=501344&r1=501343&r2=501344
==============================================================================
--- excalibur/trunk/components/store/src/java/org/apache/excalibur/store/impl/AbstractJispFilesystemStore.java (original)
+++ excalibur/trunk/components/store/src/java/org/apache/excalibur/store/impl/AbstractJispFilesystemStore.java Tue Jan 30 00:36:18 2007
@@ -1,16 +1,16 @@
-/*
- * Copyright 2002-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
- *
+/*
+ * 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.
- *
+ * 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.
*/
@@ -29,9 +29,6 @@
import com.coyotegulch.jisp.KeyNotFound;
import com.coyotegulch.jisp.KeyObject;
-import org.apache.avalon.framework.thread.ThreadSafe;
-import org.apache.excalibur.store.Store;
-
/**
* This store is based on the Jisp library
* (http://www.coyotegulch.com/jisp/index.html). This store uses B-Tree indexes
@@ -41,8 +38,7 @@
* @version CVS $Id: AbstractJispFilesystemStore.java,v 1.7 2004/02/28 11:47:31 cziegeler Exp $
*/
public abstract class AbstractJispFilesystemStore
- extends AbstractReadWriteStore
- implements Store, ThreadSafe {
+ extends AbstractReadWriteStore {
/** The directory repository */
protected File m_directoryFile;
Modified: excalibur/trunk/components/store/src/java/org/apache/excalibur/store/impl/AbstractReadWriteStore.java
URL: http://svn.apache.org/viewvc/excalibur/trunk/components/store/src/java/org/apache/excalibur/store/impl/AbstractReadWriteStore.java?view=diff&rev=501344&r1=501343&r2=501344
==============================================================================
--- excalibur/trunk/components/store/src/java/org/apache/excalibur/store/impl/AbstractReadWriteStore.java (original)
+++ excalibur/trunk/components/store/src/java/org/apache/excalibur/store/impl/AbstractReadWriteStore.java Tue Jan 30 00:36:18 2007
@@ -1,16 +1,16 @@
-/*
- * Copyright 2002-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
- *
+/*
+ * 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.
- *
+ * 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.
*/
@@ -24,6 +24,7 @@
import EDU.oswego.cs.dl.util.concurrent.ReadWriteLock;
import EDU.oswego.cs.dl.util.concurrent.Sync;
+import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.excalibur.instrument.CounterInstrument;
@@ -41,7 +42,7 @@
*/
public abstract class AbstractReadWriteStore
extends AbstractLogEnabled
-implements Store, ThreadSafe {
+implements Store, ThreadSafe, Component {
private ValueInstrument m_sizeInstrument = new ValueInstrument("size");
private CounterInstrument m_hitsInstrument = new CounterInstrument("hits");
Modified: excalibur/trunk/components/store/src/java/org/apache/excalibur/store/impl/JispFilesystemStore.java
URL: http://svn.apache.org/viewvc/excalibur/trunk/components/store/src/java/org/apache/excalibur/store/impl/JispFilesystemStore.java?view=diff&rev=501344&r1=501343&r2=501344
==============================================================================
--- excalibur/trunk/components/store/src/java/org/apache/excalibur/store/impl/JispFilesystemStore.java (original)
+++ excalibur/trunk/components/store/src/java/org/apache/excalibur/store/impl/JispFilesystemStore.java Tue Jan 30 00:36:18 2007
@@ -1,16 +1,16 @@
-/*
- * Copyright 2002-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
- *
+/*
+ * 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.
- *
+ * 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.
*/
@@ -27,8 +27,6 @@
import org.apache.avalon.framework.parameters.ParameterException;
import org.apache.avalon.framework.parameters.Parameterizable;
import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.avalon.framework.thread.ThreadSafe;
-import org.apache.excalibur.store.Store;
/**
* This store is based on the Jisp library
@@ -39,9 +37,7 @@
* @version CVS $Id: JispFilesystemStore.java,v 1.4 2004/02/28 11:47:31 cziegeler Exp $
*/
public class JispFilesystemStore extends AbstractJispFilesystemStore
- implements Store,
- ThreadSafe,
- Parameterizable,
+ implements Parameterizable,
Disposable {
/**
Modified: excalibur/trunk/components/store/src/java/org/apache/excalibur/store/impl/JispKey.java
URL: http://svn.apache.org/viewvc/excalibur/trunk/components/store/src/java/org/apache/excalibur/store/impl/JispKey.java?view=diff&rev=501344&r1=501343&r2=501344
==============================================================================
--- excalibur/trunk/components/store/src/java/org/apache/excalibur/store/impl/JispKey.java (original)
+++ excalibur/trunk/components/store/src/java/org/apache/excalibur/store/impl/JispKey.java Tue Jan 30 00:36:18 2007
@@ -1,16 +1,16 @@
-/*
- * Copyright 2002-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
- *
+/*
+ * 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.
- *
+ * 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.
*/
Modified: excalibur/trunk/components/store/src/java/org/apache/excalibur/store/impl/MRUMemoryStore.java
URL: http://svn.apache.org/viewvc/excalibur/trunk/components/store/src/java/org/apache/excalibur/store/impl/MRUMemoryStore.java?view=diff&rev=501344&r1=501343&r2=501344
==============================================================================
--- excalibur/trunk/components/store/src/java/org/apache/excalibur/store/impl/MRUMemoryStore.java (original)
+++ excalibur/trunk/components/store/src/java/org/apache/excalibur/store/impl/MRUMemoryStore.java Tue Jan 30 00:36:18 2007
@@ -1,16 +1,16 @@
-/*
- * Copyright 2002-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
- *
+/*
+ * 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.
- *
+ * 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.
*/
@@ -23,6 +23,7 @@
import java.util.NoSuchElementException;
import org.apache.avalon.framework.activity.Disposable;
+import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.parameters.ParameterException;
import org.apache.avalon.framework.parameters.Parameterizable;
@@ -53,7 +54,7 @@
*/
public class MRUMemoryStore
extends AbstractLogEnabled
- implements Store, Parameterizable, Serviceable, Disposable, ThreadSafe, Instrumentable
+ implements Store, Parameterizable, Serviceable, Disposable, ThreadSafe, Instrumentable, Component
{
private String m_instrumentableName;
private int m_maxobjects;
Modified: excalibur/trunk/components/store/src/java/org/apache/excalibur/store/impl/MemoryStore.java
URL: http://svn.apache.org/viewvc/excalibur/trunk/components/store/src/java/org/apache/excalibur/store/impl/MemoryStore.java?view=diff&rev=501344&r1=501343&r2=501344
==============================================================================
--- excalibur/trunk/components/store/src/java/org/apache/excalibur/store/impl/MemoryStore.java (original)
+++ excalibur/trunk/components/store/src/java/org/apache/excalibur/store/impl/MemoryStore.java Tue Jan 30 00:36:18 2007
@@ -1,16 +1,16 @@
-/*
- * Copyright 2002-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
- *
+/*
+ * 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.
- *
+ * 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.
*/
@@ -19,6 +19,7 @@
import java.util.Enumeration;
import java.util.Hashtable;
+import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.excalibur.store.Store;
@@ -35,7 +36,7 @@
*/
public class MemoryStore
extends AbstractLogEnabled
- implements Store, ThreadSafe {
+ implements Store, ThreadSafe, Component {
/* WARNING: Hashtable is threadsafe, whereas HashMap is not.
* Should we move this class over to the Collections API,
Modified: excalibur/trunk/components/store/src/java/org/apache/excalibur/store/impl/StoreJanitorImpl.java
URL: http://svn.apache.org/viewvc/excalibur/trunk/components/store/src/java/org/apache/excalibur/store/impl/StoreJanitorImpl.java?view=diff&rev=501344&r1=501343&r2=501344
==============================================================================
--- excalibur/trunk/components/store/src/java/org/apache/excalibur/store/impl/StoreJanitorImpl.java (original)
+++ excalibur/trunk/components/store/src/java/org/apache/excalibur/store/impl/StoreJanitorImpl.java Tue Jan 30 00:36:18 2007
@@ -1,16 +1,16 @@
/*
- * Copyright 2002-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.
- *
+ * 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.
*/
Modified: excalibur/trunk/components/store/src/test/org/apache/excalibur/store/impl/ClearJispFilesystemStoreTestCase.java
URL: http://svn.apache.org/viewvc/excalibur/trunk/components/store/src/test/org/apache/excalibur/store/impl/ClearJispFilesystemStoreTestCase.java?view=diff&rev=501344&r1=501343&r2=501344
==============================================================================
--- excalibur/trunk/components/store/src/test/org/apache/excalibur/store/impl/ClearJispFilesystemStoreTestCase.java (original)
+++ excalibur/trunk/components/store/src/test/org/apache/excalibur/store/impl/ClearJispFilesystemStoreTestCase.java Tue Jan 30 00:36:18 2007
@@ -1,16 +1,16 @@
-/*
- * Copyright 2002-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
- *
+/*
+ * 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.
- *
+ * 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.
*/
---------------------------------------------------------------------
To unsubscribe, e-mail: scm-unsubscribe@excalibur.apache.org
For additional commands, e-mail: scm-help@excalibur.apache.org