Task #621
Compare and Merge various buildouts
100%
Description
resolve differences between cn-dev.dataone.org that was a test bed for changes,
https://repository.dataone.org/software/cicore/trunk/cn-buildout/dataone-cn-mercury,
https://daacsvn.ornl.gov/svn/mercury/.ornl.gov/svn/mercury/,
https://esdss-collab.ornl.gov/mercury/svn/trunk
History
#1 Updated by Robert Waltz almost 14 years ago
PilotCatalog.java needs updating in CollabNET. All unit tests need to be added to CollabNET.
/home/rwaltz/Projects/CollabORNL/trunk/pilot_catalog/WebRoot/WEB-INF/classes/gov/ornl/mercury3/services/facets.xml
differs from cn-dev. CollabNET appears definitive
/home/rwaltz/Projects/CollabORNL/trunk/pilot_catalog/WebRoot/WEB-INF/classes/Mercury3Properties.xml
differs from cn-dev. cn-dev version is definitive
cn-dev differs from DataONE. DataONE is definitive
/home/rwaltz/Projects/CollabORNL/trunk/pilot_catalog/src/log4j.properties
differs from DataONE. DataONE is definitive
/home/rwaltz/Projects/CollabORNL/trunk/pilot_catalog/WebRoot/WEB-INF/classes/Mercury3Properties.xml
differs from DataONE. DataONE is definitive
/home/rwaltz/Projects/CollabORNL/trunk/pilot_catalog/src/applicationContext.xml
differs from DataONE. DataONE is definitive
/home/rwaltz/Projects/CollabORNL/trunk/pilot_catalog/src/hibernate.cfg.xml
differs from DataONE. DataONE is definitive
/home/rwaltz/Projects/CollabORNL/trunk/pilot_catalog/src/gov/ornl/mercury3/services/facets.xml
differs from DataONE. DataONE is merged!
/home/rwaltz/Projects/CollabORNL/trunk/pilot_catalog/src/gov/ornl/mercury3/services/Mercury_term_maps.xml
differs from DataONE. DataONE is merged!
/home/rwaltz/Projects/CollabORNL/trunk/pilot_catalog/src/Mercury3Properties.xml
differs from DataONE. DataONE is definitive
/home/rwaltz/Projects/CollabORNL/trunk/pilot_catalog/WebRoot/WEB-INF/views/lba_db_full.xsl
differs from DataONE. DataONE is merged!
/home/rwaltz/Projects/CollabORNL/trunk/pilot_catalog/WebRoot/WEB-INF/views/ornldaac_db_full.xsl
differs from DataONE. DataONE is merged!
/home/rwaltz/Projects/CollabORNL/trunk/pilot_catalog/WebRoot/WEB-INF/views/fgdc_db_full.xsl
differs from DataONE. DataONE is merged!
object xsl ignored due to pending modifications.
/home/rwaltz/Mercury/mercury_dev/datanet/schema_xpath2.xml
differs from DataONE CnBuildout. cn-dev is definitive.
/home/rwaltz/Mercury/mercury_dev/datanet/update.sh
differs from DataONE CnBuildout. Changed CnBuildout but modified to conform to new placement of jar.
on cn-dev appears that apache-solr-1.3.0.war has replaced apache-solr-1.4.0.war and new configuration is in effect
