From: <bra...@us...> - 2007-09-28 18:44:21
|
Revision: 2015 http://archive-access.svn.sourceforge.net/archive-access/?rev=2015&view=rev Author: bradtofel Date: 2007-09-28 11:44:25 -0700 (Fri, 28 Sep 2007) Log Message: ----------- INITIAL REV: small container wrapping ResourceIndex and ResourceStore Added Paths: ----------- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/webapp/WaybackCollection.java Added: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/webapp/WaybackCollection.java =================================================================== --- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/webapp/WaybackCollection.java (rev 0) +++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/webapp/WaybackCollection.java 2007-09-28 18:44:25 UTC (rev 2015) @@ -0,0 +1,51 @@ +/* WaybackCollection + * + * $Id$ + * + * Created on 11:28:52 AM Sep 28, 2007. + * + * Copyright (C) 2007 Internet Archive. + * + * This file is part of wayback. + * + * wayback is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or + * any later version. + * + * wayback is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser Public License for more details. + * + * You should have received a copy of the GNU Lesser Public License + * along with wayback; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ +package org.archive.wayback.webapp; + +import org.archive.wayback.ResourceIndex; +import org.archive.wayback.ResourceStore; + +/** + * Abstraction point for sharing document collection and index across multiple AccessPoints. + * + * @author brad + * @version $Date$, $Revision$ + */ +public class WaybackCollection { + private ResourceStore resourceStore = null; + private ResourceIndex resourceIndex = null; + public ResourceStore getResourceStore() { + return resourceStore; + } + public void setResourceStore(ResourceStore resourceStore) { + this.resourceStore = resourceStore; + } + public ResourceIndex getResourceIndex() { + return resourceIndex; + } + public void setResourceIndex(ResourceIndex resourceIndex) { + this.resourceIndex = resourceIndex; + } +} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bra...@us...> - 2007-09-28 22:41:16
|
Revision: 2019 http://archive-access.svn.sourceforge.net/archive-access/?rev=2019&view=rev Author: bradtofel Date: 2007-09-28 15:41:20 -0700 (Fri, 28 Sep 2007) Log Message: ----------- BUGFIX: now throws ConfigurationException when no store or index have been configured Modified Paths: -------------- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/webapp/WaybackCollection.java Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/webapp/WaybackCollection.java =================================================================== --- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/webapp/WaybackCollection.java 2007-09-28 22:40:12 UTC (rev 2018) +++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/webapp/WaybackCollection.java 2007-09-28 22:41:20 UTC (rev 2019) @@ -26,9 +26,11 @@ import org.archive.wayback.ResourceIndex; import org.archive.wayback.ResourceStore; +import org.archive.wayback.exception.ConfigurationException; /** - * Abstraction point for sharing document collection and index across multiple AccessPoints. + * Abstraction point for sharing document collection and index across multiple + * AccessPoints. * * @author brad * @version $Date$, $Revision$ @@ -36,13 +38,19 @@ public class WaybackCollection { private ResourceStore resourceStore = null; private ResourceIndex resourceIndex = null; - public ResourceStore getResourceStore() { + public ResourceStore getResourceStore() throws ConfigurationException { + if(resourceStore == null) { + throw new ConfigurationException("No resourceStore declared"); + } return resourceStore; } public void setResourceStore(ResourceStore resourceStore) { this.resourceStore = resourceStore; } - public ResourceIndex getResourceIndex() { + public ResourceIndex getResourceIndex() throws ConfigurationException { + if(resourceIndex == null) { + throw new ConfigurationException("No resourceIndex declared"); + } return resourceIndex; } public void setResourceIndex(ResourceIndex resourceIndex) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bra...@us...> - 2008-04-11 04:08:16
|
Revision: 2233 http://archive-access.svn.sourceforge.net/archive-access/?rev=2233&view=rev Author: bradtofel Date: 2008-04-10 21:08:21 -0700 (Thu, 10 Apr 2008) Log Message: ----------- FEATURE: added shutdown() method, which shuts down ResourceStore and ResourceIndex Modified Paths: -------------- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/webapp/WaybackCollection.java Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/webapp/WaybackCollection.java =================================================================== --- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/webapp/WaybackCollection.java 2008-04-11 04:07:18 UTC (rev 2232) +++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/webapp/WaybackCollection.java 2008-04-11 04:08:21 UTC (rev 2233) @@ -24,6 +24,8 @@ */ package org.archive.wayback.webapp; +import java.io.IOException; + import org.archive.wayback.ResourceIndex; import org.archive.wayback.ResourceStore; import org.archive.wayback.exception.ConfigurationException; @@ -38,6 +40,7 @@ public class WaybackCollection { private ResourceStore resourceStore = null; private ResourceIndex resourceIndex = null; + private boolean shutdownDone = false; public ResourceStore getResourceStore() throws ConfigurationException { if(resourceStore == null) { throw new ConfigurationException("No resourceStore declared"); @@ -56,4 +59,16 @@ public void setResourceIndex(ResourceIndex resourceIndex) { this.resourceIndex = resourceIndex; } + public void shutdown() throws IOException { + if(shutdownDone) { + return; + } + if(resourceStore != null) { + resourceStore.shutdown(); + } + if(resourceIndex != null) { + resourceIndex.shutdown(); + } + shutdownDone = true; + } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |