/ - Diff - Metacat - Ecoinformatics Redmine

           <write-delay-seconds>0</write-delay-seconds>
         </map-store>
       </map>
       <map name="hzIndexEventMap">
         <backup-count>3</backup-count>
         <eviction-policy>LRU</eviction-policy>
         <max-size policy="cluster_wide_map_size">1000</max-size>
         <eviction-percentage>25</eviction-percentage>
         <merge-policy>hz.ADD_NEW_ENTRY</merge-policy>
         <map-store enabled="true">
           <class-name>edu.ucsb.nceas.metacat.index.IndexEventEntryListener</class-name>
           <write-delay-seconds>0</write-delay-seconds>
         </map-store>
       </map>
     </hazelcast>

     ############### Application Values ############
     ## one of the few places where we use ANT tokens
     application.metacatVersion=2.0.7
     application.metacatVersion=2.1.0
     application.metacatReleaseInfo=-1
     application.deployDir=
-...
     database.upgradeVersion.2.0.5=upgrade-db-to-2.0.5
     database.upgradeVersion.2.0.6=upgrade-db-to-2.0.6
     database.upgradeVersion.2.0.7=upgrade-db-to-2.0.7
     database.upgradeVersion.2.1.0=upgrade-db-to-2.1.0
     ## for running java-based utilities
     database.upgradeUtility.1.5.0=edu.ucsb.nceas.metacat.admin.upgrade.Upgrade1_5_0
     database.upgradeUtility.2.0.0=edu.ucsb.nceas.metacat.admin.upgrade.Upgrade2_0_0

     CREATE INDEX identifier_rev on identifier(rev);
     CREATE INDEX identifier_docid_rev on identifier(docid, rev);
     /*
      * the index_event table for solr-based indexing
      */
     CREATE TABLE index_event (
     	guid VARCHAR2(2000),
     	event_action VARCHAR2(250),
     	description VARCHAR2(2000),
     	event_date DATE
     );
     /*
      * accesssubtree -- table to store access subtree info
      */
     CREATE TABLE xml_accesssubtree (

       CONSTRAINT access_log_pk PRIMARY KEY (entryid)
     );
     /*
      * the index_event table for solr-based indexing
      */
     CREATE TABLE index_event (
     	guid text,
     	event_action VARCHAR(250),
     	description text,
     	event_date TIMESTAMP
     );
     /*
      * Table for indexing the paths specified the administrator in metacat.properties

src/loaddtdschema-postgres.sql
92	92	INSERT INTO xml_catalog (entry_type, public_id, system_id)
93	93	VALUES ('Schema', 'http://ecoinformatics.org/registryentry-1.0.0', '/schema/RegistryService/RegistryEntryType.xsd');
94	94	INSERT INTO db_version (version, status, date_created)
95		VALUES ('2.0.7',1,CURRENT_DATE);
	95	VALUES ('2.1.0',1,CURRENT_DATE);

src/loaddtdschema-oracle.sql
92	92	INSERT INTO xml_catalog (entry_type, public_id, system_id)
93	93	VALUES ('Schema', '/schema/RegistryService/RegistryEntryType.xsd', '/schema/RegistryService/RegistryEntryType.xsd');
94	94	INSERT INTO db_version (version, status, date_created)
95		VALUES ('2.0.7',1,CURRENT_DATE);
	95	VALUES ('2.1.0',1,CURRENT_DATE);

     /**
      *  '$RCSfile$'
      *    Purpose: Implements a service for managing a Hazelcast cluster member
      *  Copyright: 2013 Regents of the University of California and the
      *             National Center for Ecological Analysis and Synthesis
      *    Authors: Leinfelder
+     *
      *   '$Author$'
      *     '$Date$'
      * '$Revision$'
+     *
      * This program is free software; you can redistribute it and/or modify
      * it under the terms of the GNU General Public License as published by
      * the Free Software Foundation; either version 2 of the License, or
      * (at your option) any later version.
+     *
      * This program 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 General Public License for more details.
+     *
      * You should have received a copy of the GNU General Public License
      * along with this program; if not, write to the Free Software
      * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
      */
     package edu.ucsb.nceas.metacat.index;
     import java.sql.SQLException;
     import java.util.Collection;
     import java.util.Map;
     import java.util.Set;
     import java.util.TreeMap;
     import org.apache.log4j.Logger;
     import org.dataone.service.types.v1.Identifier;
     import com.hazelcast.core.EntryEvent;
-...
     public class IndexEventEntryListener implements MapStore<Identifier, IndexEvent>, MapLoader<Identifier, IndexEvent>, EntryListener<Identifier, IndexEvent> {
     	private Logger logMetacat = Logger.getLogger(IndexEventEntryListener.class);
     	/**
     	 * The map store/loader methods
     	 */
     	@Override
     	public IndexEvent load(Identifier arg0) {
     		// TODO Auto-generated method stub
     	public IndexEvent load(Identifier identifier) {
     		try {
     			return IndexEventDAO.getInstance().get(identifier);
     		} catch (SQLException e) {
     			logMetacat.error(e.getMessage(), e);
+    		}
     		return null;
+    	}
     	@Override
     	public Map<Identifier, IndexEvent> loadAll(Collection<Identifier> arg0) {
     		// TODO Auto-generated method stub
     		return null;
     	public Map<Identifier, IndexEvent> loadAll(Collection<Identifier> identifiers) {
     		Map<Identifier, IndexEvent> eventMap = new TreeMap<Identifier, IndexEvent>();
     		for (Identifier identifier: identifiers) {
     			IndexEvent event = null;
     			try {
     				event = IndexEventDAO.getInstance().get(identifier);
     				eventMap.put(identifier, event);
     			} catch (SQLException e) {
     				logMetacat.error(e.getMessage(), e);
+    			}
+    		}
     		return eventMap;
+    	}
     	@Override
     	public Set<Identifier> loadAllKeys() {
     		// TODO Auto-generated method stub
     		try {
     			return IndexEventDAO.getInstance().getAllIdentifiers();
     		} catch (SQLException e) {
     			logMetacat.error(e.getMessage(), e);
+    		}
     		return null;
+    	}
     	@Override
     	public void delete(Identifier arg0) {
     		// TODO Auto-generated method stub
     	public void delete(Identifier identifier) {
     		try {
     			IndexEventDAO.getInstance().remove(identifier);
     		} catch (SQLException e) {
     			logMetacat.error(e.getMessage(), e);
+    		}
+    	}
     	@Override
     	public void deleteAll(Collection<Identifier> arg0) {
     		// TODO Auto-generated method stub
     	public void deleteAll(Collection<Identifier> identifiers) {
     		for (Identifier identifier: identifiers) {
     			try {
     				IndexEventDAO.getInstance().remove(identifier);
     			} catch (SQLException e) {
     				logMetacat.error(e.getMessage(), e);
+    			}
+    		}
+    	}
     	@Override
     	public void store(Identifier arg0, IndexEvent arg1) {
     		// TODO Auto-generated method stub
     	public void store(Identifier identifier, IndexEvent event) {
     		try {
     			IndexEventDAO.getInstance().add(event);
     		} catch (SQLException e) {
     			logMetacat.error(e.getMessage(), e);
+    		}
+    	}
     	@Override
     	public void storeAll(Map<Identifier, IndexEvent> arg0) {
     		// TODO Auto-generated method stub
     	public void storeAll(Map<Identifier, IndexEvent> indexEventMap) {
     		for (IndexEvent event: indexEventMap.values()) {
     			try {
     				IndexEventDAO.getInstance().add(event);
     			} catch (SQLException e) {
     				logMetacat.error(e.getMessage(), e);
+    			}
+    		}
+    	}
     	/**
-...
     	 */
     	@Override
     	public void entryAdded(EntryEvent<Identifier, IndexEvent> arg0) {
     		// TODO Auto-generated method stub
     	public void entryAdded(EntryEvent<Identifier, IndexEvent> event) {
     		try {
     			IndexEventDAO.getInstance().add(event.getValue());
     		} catch (SQLException e) {
     			logMetacat.error(e.getMessage(), e);
+    		}
+    	}
     	@Override
     	public void entryEvicted(EntryEvent<Identifier, IndexEvent> arg0) {
     		// TODO Auto-generated method stub
     		// do nothing
+    	}
     	@Override
     	public void entryRemoved(EntryEvent<Identifier, IndexEvent> arg0) {
     		// TODO Auto-generated method stub
     	public void entryRemoved(EntryEvent<Identifier, IndexEvent> event) {
     		try {
     			IndexEventDAO.getInstance().remove(event.getKey());
     		} catch (SQLException e) {
     			logMetacat.error(e.getMessage(), e);
+    		}
+    	}
     	@Override
     	public void entryUpdated(EntryEvent<Identifier, IndexEvent> arg0) {
     		// TODO Auto-generated method stub
     	public void entryUpdated(EntryEvent<Identifier, IndexEvent> event) {
     		try {
     			IndexEventDAO.getInstance().add(event.getValue());
     		} catch (SQLException e) {
     			logMetacat.error(e.getMessage(), e);
+    		}
+    	}
+    }

     /**
      *  '$RCSfile$'
      *    Purpose: Implements a service for managing a Hazelcast cluster member
      *  Copyright: 2013 Regents of the University of California and the
      *             National Center for Ecological Analysis and Synthesis
      *    Authors: Leinfelder
+     *
      *   '$Author$'
      *     '$Date$'
      * '$Revision$'
+     *
      * This program is free software; you can redistribute it and/or modify
      * it under the terms of the GNU General Public License as published by
      * the Free Software Foundation; either version 2 of the License, or
      * (at your option) any later version.
+     *
      * This program 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 General Public License for more details.
+     *
      * You should have received a copy of the GNU General Public License
      * along with this program; if not, write to the Free Software
      * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
      */
     package edu.ucsb.nceas.metacat.index;
     import java.sql.PreparedStatement;
     import java.sql.ResultSet;
     import java.sql.SQLException;
     import java.sql.Timestamp;
     import java.util.Set;
     import java.util.TreeSet;
     import org.dataone.service.types.v1.Event;
     import org.dataone.service.types.v1.Identifier;
     import edu.ucsb.nceas.metacat.common.index.event.IndexEvent;
     import edu.ucsb.nceas.metacat.database.DBConnection;
     import edu.ucsb.nceas.metacat.database.DBConnectionPool;
     public class IndexEventDAO {
     	private static IndexEventDAO instance = null;
     	private IndexEventDAO() {}
     	public static IndexEventDAO getInstance() {
     		if (instance == null) {
     			instance = new IndexEventDAO();
+    		}
     		return instance;
+    	}
     	public void add(IndexEvent event) throws SQLException {
     		String sql = "insert into index_event(guid, event_action, description, event_date) values (?, ?, ?, ?)";
     		DBConnection dbConn = null;
     		int serialNumber = -1;
     		try {
     			// Get a database connection from the pool
     			dbConn = DBConnectionPool.getDBConnection("IndexEventDAO.add");
     			serialNumber = dbConn.getCheckOutSerialNumber();
     			// Execute the statement
     			PreparedStatement stmt = dbConn.prepareStatement(sql);
     			stmt.setString(1, event.getIdentifier().getValue());
     			stmt.setString(2, event.getAction().xmlValue());
     			stmt.setString(3, event.getDescription());
     			stmt.setTimestamp(4, new Timestamp(event.getDate().getTime()));
     			stmt.executeUpdate();
     			stmt.close();
     		} finally {
     			// Return database connection to the pool
     			DBConnectionPool.returnDBConnection(dbConn, serialNumber);
+    		}
+    	}
     	public void remove(Identifier identifier) throws SQLException {
     		String sql = "delete from index_event where guid = ?";
     		DBConnection dbConn = null;
     		int serialNumber = -1;
     		try {
     			// Get a database connection from the pool
     			dbConn = DBConnectionPool.getDBConnection("IndexEventDAO.remove");
     			serialNumber = dbConn.getCheckOutSerialNumber();
     			// Execute the statement
     			PreparedStatement stmt = dbConn.prepareStatement(sql);
     			stmt.setString(1, identifier.getValue());
     			stmt.execute();
     			stmt.close();
     		} finally {
     			// Return database connection to the pool
     			DBConnectionPool.returnDBConnection(dbConn, serialNumber);
+    		}
+    	}
     	public IndexEvent get(Identifier identifier) throws SQLException {
     		IndexEvent event = null;
     		String sql = "select guid, event_action, description, event_date from index_event where guid = ?";
     		DBConnection dbConn = null;
     		int serialNumber = -1;
     		try {
     			// Get a database connection from the pool
     			dbConn = DBConnectionPool.getDBConnection("IndexEventDAO.get");
     			serialNumber = dbConn.getCheckOutSerialNumber();
     			// Execute the statement
     			PreparedStatement stmt = dbConn.prepareStatement(sql);
     			stmt.setString(1, identifier.getValue());
     			ResultSet rs = stmt.executeQuery();
     			while (rs.next()) {
     				//String guid = rs.getString(1);
     				String action = rs.getString(2);
     				String description = rs.getString(3);
     				Timestamp timestamp = rs.getTimestamp(4);
     				event = new IndexEvent();
     				event.setIdentifier(identifier);
     				event.setAction(Event.valueOf(action));
     				event.setDate(timestamp);
     				event.setDescription(description);
+    			}
     			stmt.close();
     		} finally {
     			// Return database connection to the pool
     			DBConnectionPool.returnDBConnection(dbConn, serialNumber);
+    		}
     		return event;
+    	}
     	public Set<Identifier> getAllIdentifiers() throws SQLException {
     		Set<Identifier> identifiers = new TreeSet<Identifier>();
     		String sql = "select guid from index_event";
     		DBConnection dbConn = null;
     		int serialNumber = -1;
     		try {
     			// Get a database connection from the pool
     			dbConn = DBConnectionPool.getDBConnection("IndexEventDAO.getAllIdentifiers");
     			serialNumber = dbConn.getCheckOutSerialNumber();
     			// Execute the statement
     			PreparedStatement stmt = dbConn.prepareStatement(sql);
     			ResultSet rs = stmt.executeQuery();
     			while (rs.next()) {
     				String guid = rs.getString(1);
     				Identifier identifier = new Identifier();
     				identifier.setValue(guid);
     				identifiers.add(identifier);
+    			}
     			stmt.close();
     		} finally {
     			// Return database connection to the pool
     			DBConnectionPool.returnDBConnection(dbConn, serialNumber);
+    		}
     		return identifiers;
+    	}
+    }

     # The short X.Y version.
     version = '2.0'
     # The full version, including alpha/beta/rc tags.
     release = '2.0.7'
     release = '2.1.0'
     # The language for content autogenerated by Sphinx. Refer to documentation
     # for a list of supported languages.

     Downloading the Metacat Installer is the simplest way to get started with the
     application. To download the installer:
 .  Browse to the `Metacat Download Page`_. In the Metacat section, select the link to the "GZIP file" (the link should look like: metacat-bin-X.X.X.tar.gz, where X.X.X is the latest version of Metacat e.g., 2.0.7)
 .  Browse to the `Metacat Download Page`_. In the Metacat section, select the link to the "GZIP file" (the link should look like: metacat-bin-X.X.X.tar.gz, where X.X.X is the latest version of Metacat e.g., 2.1.0)
 .  Save the file locally.
 .  Extract the Metacat package files by typing:
-...
     ............................
     To get the Metacat source distribution:
 . Browse to the `Metacat Download Page`_. In the Metacat section, select the link to the Metacat Source code (it will look something like this: metacat-src-X.X.X.tar.gz, where X.X.X is the latest version of Metacat, e.g., 2.0.7).
 . Browse to the `Metacat Download Page`_. In the Metacat section, select the link to the Metacat Source code (it will look something like this: metacat-src-X.X.X.tar.gz, where X.X.X is the latest version of Metacat, e.g., 2.1.0).
 . Save the file locally.
 . Extract the Metacat package files by typing (replace X.X.X with the current version number):

     Metacat Administrator's Guide
     =============================
     .. sidebar:: Version: 2.0.7
     .. sidebar:: Version: 2.1.0
         .. image:: themes/readable/static/metacat-logo.png
            :height: 130pt
-...
         License: GPL
         Release Date: May, 2013
         Release Date: July, 2013
     Metacat is a repository for data and metadata (documentation about data) that helps
     scientists find, understand and effectively use data sets they manage or that
-...
     - Download Metacat
         - Binary Distribution (A war file installation)
             - GZIP File: metacat-bin-2.0.7.tar.gz_
             - ZIP File: metacat-bin-2.0.7.zip_
             - GZIP File: metacat-bin-2.1.0.tar.gz_
             - ZIP File: metacat-bin-2.1.0.zip_
         - Source Distribution (Full source, requiring build)
             - GZIP File: metacat-src-2.0.7.tar.gz_
             - ZIP File: metacat-src-2.0.7.zip_
             - GZIP File: metacat-src-2.1.0.tar.gz_
             - ZIP File: metacat-src-2.1.0.zip_
         - `Older versions`_
     - For Developers: Metacat `API documentation`_
-...
     .. _API documentation: ./api/index.html
     .. _metacat-bin-2.0.7.tar.gz: http://knb.ecoinformatics.org/software/dist/metacat-bin-2.0.7.tar.gz
     .. _metacat-bin-2.1.0.tar.gz: http://knb.ecoinformatics.org/software/dist/metacat-bin-2.1.0.tar.gz
     .. _metacat-bin-2.0.7.zip: http://knb.ecoinformatics.org/software/dist/metacat-bin-2.0.7.zip
     .. _metacat-bin-2.1.0.zip: http://knb.ecoinformatics.org/software/dist/metacat-bin-2.1.0.zip
     .. _metacat-src-2.0.7.tar.gz: http://knb.ecoinformatics.org/software/dist/metacat-src-2.0.7.tar.gz
     .. _metacat-src-2.1.0.tar.gz: http://knb.ecoinformatics.org/software/dist/metacat-src-2.1.0.tar.gz
     .. _metacat-src-2.0.7.zip: http://knb.ecoinformatics.org/software/dist/metacat-src-2.0.7.zip
     .. _metacat-src-2.1.0.zip: http://knb.ecoinformatics.org/software/dist/metacat-src-2.1.0.zip
     .. _Older versions: http://knb.ecoinformatics.org/software/dist/

     #Version of this build.  This needs to be a dotted numeric version.  For
     #instance 1.9.1 is okay.  1.9.1_rc1 is not.
     metacat.version=2.0.7
     metacat.version=2.1.0
     #This is for packaging purposes.  leave it blank for final production release.
     metacat.releaseCandidate=

     Metacat: XML Metadata and Data Management System
     ------------------------------------------------
     Version: 2.0.7 Release
     Version: 2.1.0 Release
     Send feedback and bugs to: metacat-dev@ecoinformatics.org
                                http://bugzilla.ecoinformatics.org
-...
     See the file "docs/install.html" for detailed instructions
     for your OS.
     Release Notes for 2.1.0:
     ------------------------
     This is a major release of Metacat that includes a SOLR-based search feature
     * Optional SOLR search index
     * Client certificate delegation (using a service provider like CILogon)
     Release Notes for 2.0.7:
     ------------------------
     This is a patch release for Metacat replication

Project

General

Profile

Metacat

Revision 7830

Added by ben leinfelder almost 11 years ago