Index: test/clienttestfiles/non-conforming-xml.xml
===================================================================
--- test/clienttestfiles/non-conforming-xml.xml	(revision 6123)
+++ test/clienttestfiles/non-conforming-xml.xml	(revision 6124)

Property changes on: test/clienttestfiles/non-conforming-xml.xml
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,0 +0,0 ##
Index: lib/d1_common_java-0.6.1-SNAPSHOT.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: lib/d1_common_java-0.6.1-SNAPSHOT.jar
___________________________________________________________________
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: lib/d1_libclient_java-0.6.1-SNAPSHOT.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: lib/d1_libclient_java-0.6.1-SNAPSHOT.jar
___________________________________________________________________
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: lib/workflowscheduler/workflowscheduler.properties
===================================================================
--- lib/workflowscheduler/workflowscheduler.properties	(revision 6123)
+++ lib/workflowscheduler/workflowscheduler.properties	(revision 6124)

Property changes on: lib/workflowscheduler/workflowscheduler.properties
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,0 +0,0 ##
Index: lib/workflowscheduler/workflowscheduler.web.xml
===================================================================
--- lib/workflowscheduler/workflowscheduler.web.xml	(revision 6123)
+++ lib/workflowscheduler/workflowscheduler.web.xml	(revision 6124)

Property changes on: lib/workflowscheduler/workflowscheduler.web.xml
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,0 +0,0 ##
Index: lib/metacat.properties
===================================================================
--- lib/metacat.properties	(revision 6123)
+++ lib/metacat.properties	(revision 6124)

Property changes on: lib/metacat.properties
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,0 +0,0 ##
Index: lib/lsid_lib/axis-ant.jar
===================================================================
--- lib/lsid_lib/axis-ant.jar	(revision 6123)
+++ lib/lsid_lib/axis-ant.jar	(revision 6124)

Property changes on: lib/lsid_lib/axis-ant.jar
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,0 +0,0 ##
Index: lib/admin/auth-configuration.jsp
===================================================================
--- lib/admin/auth-configuration.jsp	(revision 6123)
+++ lib/admin/auth-configuration.jsp	(revision 6124)

Property changes on: lib/admin/auth-configuration.jsp
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,0 +0,0 ##
Index: lib/admin/footer-section.jsp
===================================================================
--- lib/admin/footer-section.jsp	(revision 6123)
+++ lib/admin/footer-section.jsp	(revision 6124)

Property changes on: lib/admin/footer-section.jsp
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,0 +0,0 ##
Index: lib/style/skins/sanparks/searchWorkflowRun.jsp
===================================================================
--- lib/style/skins/sanparks/searchWorkflowRun.jsp	(revision 6123)
+++ lib/style/skins/sanparks/searchWorkflowRun.jsp	(revision 6124)

Property changes on: lib/style/skins/sanparks/searchWorkflowRun.jsp
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,0 +0,0 ##
Index: lib/style/skins/sanparks/workflowAccess.jsp
===================================================================
--- lib/style/skins/sanparks/workflowAccess.jsp	(revision 6123)
+++ lib/style/skins/sanparks/workflowAccess.jsp	(revision 6124)

Property changes on: lib/style/skins/sanparks/workflowAccess.jsp
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,0 +0,0 ##
Index: lib/style/skins/sanparks/searchWorkflow.jsp
===================================================================
--- lib/style/skins/sanparks/searchWorkflow.jsp	(revision 6123)
+++ lib/style/skins/sanparks/searchWorkflow.jsp	(revision 6124)

Property changes on: lib/style/skins/sanparks/searchWorkflow.jsp
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,0 +0,0 ##
Index: lib/style/skins/sanparks/workflowAccess.xsl
===================================================================
--- lib/style/skins/sanparks/workflowAccess.xsl	(revision 6123)
+++ lib/style/skins/sanparks/workflowAccess.xsl	(revision 6124)

Property changes on: lib/style/skins/sanparks/workflowAccess.xsl
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,0 +0,0 ##
Index: lib/style/skins/sanparks/workflowAccess.js
===================================================================
--- lib/style/skins/sanparks/workflowAccess.js	(revision 6123)
+++ lib/style/skins/sanparks/workflowAccess.js	(revision 6124)

Property changes on: lib/style/skins/sanparks/workflowAccess.js
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,0 +0,0 ##
Index: lib/style/skins/tpc-result
===================================================================
--- lib/style/skins/tpc-result	(revision 6123)
+++ lib/style/skins/tpc-result	(revision 6124)

Property changes on: lib/style/skins/tpc-result
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,0 +0,0 ##
Index: lib/style/common/searchWorkflowResultset.xsl
===================================================================
--- lib/style/common/searchWorkflowResultset.xsl	(revision 6123)
+++ lib/style/common/searchWorkflowResultset.xsl	(revision 6124)

Property changes on: lib/style/common/searchWorkflowResultset.xsl
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,0 +0,0 ##
Index: lib/style/common/templates/esaGetReviews.tmpl
===================================================================
--- lib/style/common/templates/esaGetReviews.tmpl	(revision 6123)
+++ lib/style/common/templates/esaGetReviews.tmpl	(revision 6124)

Property changes on: lib/style/common/templates/esaGetReviews.tmpl
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,0 +0,0 ##
Index: lib/style/common/searchWorkflowRunResultset.xsl
===================================================================
--- lib/style/common/searchWorkflowRunResultset.xsl	(revision 6123)
+++ lib/style/common/searchWorkflowRunResultset.xsl	(revision 6124)

Property changes on: lib/style/common/searchWorkflowRunResultset.xsl
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,0 +0,0 ##
Index: lib/style/common/widgets/form-fields-widget.js
===================================================================
--- lib/style/common/widgets/form-fields-widget.js	(revision 6123)
+++ lib/style/common/widgets/form-fields-widget.js	(revision 6124)

Property changes on: lib/style/common/widgets/form-fields-widget.js
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,0 +0,0 ##
Index: lib/auth.properties.metadata.xml
===================================================================
--- lib/auth.properties.metadata.xml	(revision 6123)
+++ lib/auth.properties.metadata.xml	(revision 6124)

Property changes on: lib/auth.properties.metadata.xml
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,0 +0,0 ##
Index: src/scripts
===================================================================
--- src/scripts	(revision 6123)
+++ src/scripts	(revision 6124)

Property changes on: src/scripts
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,0 +0,0 ##
Index: src/edu/ucsb/nceas/metacat/accesscontrol/AccessControlInterface.java
===================================================================
--- src/edu/ucsb/nceas/metacat/accesscontrol/AccessControlInterface.java	(revision 6123)
+++ src/edu/ucsb/nceas/metacat/accesscontrol/AccessControlInterface.java	(revision 6124)

Property changes on: src/edu/ucsb/nceas/metacat/accesscontrol/AccessControlInterface.java
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,0 +0,0 ##
Index: src/edu/ucsb/nceas/metacat/accesscontrol/AccessSection.java
===================================================================
--- src/edu/ucsb/nceas/metacat/accesscontrol/AccessSection.java	(revision 6123)
+++ src/edu/ucsb/nceas/metacat/accesscontrol/AccessSection.java	(revision 6124)

Property changes on: src/edu/ucsb/nceas/metacat/accesscontrol/AccessSection.java
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,0 +0,0 ##
Index: src/edu/ucsb/nceas/metacat/accesscontrol/AccessRule.java
===================================================================
--- src/edu/ucsb/nceas/metacat/accesscontrol/AccessRule.java	(revision 6123)
+++ src/edu/ucsb/nceas/metacat/accesscontrol/AccessRule.java	(revision 6124)

Property changes on: src/edu/ucsb/nceas/metacat/accesscontrol/AccessRule.java
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,0 +0,0 ##
Index: src/edu/ucsb/nceas/metacat/accesscontrol/AccessControlForSingleFile.java
===================================================================
--- src/edu/ucsb/nceas/metacat/accesscontrol/AccessControlForSingleFile.java	(revision 6123)
+++ src/edu/ucsb/nceas/metacat/accesscontrol/AccessControlForSingleFile.java	(revision 6124)

Property changes on: src/edu/ucsb/nceas/metacat/accesscontrol/AccessControlForSingleFile.java
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,0 +0,0 ##
Index: src/edu/ucsb/nceas/metacat/accesscontrol/AccessControlList.java
===================================================================
--- src/edu/ucsb/nceas/metacat/accesscontrol/AccessControlList.java	(revision 6123)
+++ src/edu/ucsb/nceas/metacat/accesscontrol/AccessControlList.java	(revision 6124)

Property changes on: src/edu/ucsb/nceas/metacat/accesscontrol/AccessControlList.java
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,0 +0,0 ##
Index: src/edu/ucsb/nceas/metacat/workflow/WorkflowSchedulerClient.java
===================================================================
--- src/edu/ucsb/nceas/metacat/workflow/WorkflowSchedulerClient.java	(revision 6123)
+++ src/edu/ucsb/nceas/metacat/workflow/WorkflowSchedulerClient.java	(revision 6124)

Property changes on: src/edu/ucsb/nceas/metacat/workflow/WorkflowSchedulerClient.java
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,0 +0,0 ##
Index: src/edu/ucsb/nceas/metacat/util/AuthUtil.java
===================================================================
--- src/edu/ucsb/nceas/metacat/util/AuthUtil.java	(revision 6123)
+++ src/edu/ucsb/nceas/metacat/util/AuthUtil.java	(revision 6124)

Property changes on: src/edu/ucsb/nceas/metacat/util/AuthUtil.java
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,0 +0,0 ##
Index: src/edu/ucsb/nceas/metacat/util/MetacatUtil.java
===================================================================
--- src/edu/ucsb/nceas/metacat/util/MetacatUtil.java	(revision 6123)
+++ src/edu/ucsb/nceas/metacat/util/MetacatUtil.java	(revision 6124)

Property changes on: src/edu/ucsb/nceas/metacat/util/MetacatUtil.java
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,0 +0,0 ##
Index: src/edu/ucsb/nceas/metacat/database/DBConnectionPool.java
===================================================================
--- src/edu/ucsb/nceas/metacat/database/DBConnectionPool.java	(revision 6123)
+++ src/edu/ucsb/nceas/metacat/database/DBConnectionPool.java	(revision 6124)

Property changes on: src/edu/ucsb/nceas/metacat/database/DBConnectionPool.java
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,0 +0,0 ##
Index: src/edu/ucsb/nceas/metacat/database/DBConnection.java
===================================================================
--- src/edu/ucsb/nceas/metacat/database/DBConnection.java	(revision 6123)
+++ src/edu/ucsb/nceas/metacat/database/DBConnection.java	(revision 6124)

Property changes on: src/edu/ucsb/nceas/metacat/database/DBConnection.java
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,0 +0,0 ##
Index: src/edu/ucsb/nceas/metacat/database/DatabaseService.java
===================================================================
--- src/edu/ucsb/nceas/metacat/database/DatabaseService.java	(revision 6123)
+++ src/edu/ucsb/nceas/metacat/database/DatabaseService.java	(revision 6124)

Property changes on: src/edu/ucsb/nceas/metacat/database/DatabaseService.java
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,0 +0,0 ##
Index: src/edu/ucsb/nceas/metacat/database/DBVersion.java
===================================================================
--- src/edu/ucsb/nceas/metacat/database/DBVersion.java	(revision 6123)
+++ src/edu/ucsb/nceas/metacat/database/DBVersion.java	(revision 6124)

Property changes on: src/edu/ucsb/nceas/metacat/database/DBVersion.java
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,0 +0,0 ##
Index: src/edu/ucsb/nceas/metacat/shared/ServiceException.java
===================================================================
--- src/edu/ucsb/nceas/metacat/shared/ServiceException.java	(revision 6123)
+++ src/edu/ucsb/nceas/metacat/shared/ServiceException.java	(revision 6124)

Property changes on: src/edu/ucsb/nceas/metacat/shared/ServiceException.java
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,0 +0,0 ##
Index: src/edu/ucsb/nceas/metacat/shared/AccessException.java
===================================================================
--- src/edu/ucsb/nceas/metacat/shared/AccessException.java	(revision 6123)
+++ src/edu/ucsb/nceas/metacat/shared/AccessException.java	(revision 6124)

Property changes on: src/edu/ucsb/nceas/metacat/shared/AccessException.java
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,0 +0,0 ##
Index: src/edu/ucsb/nceas/metacat/shared/BaseException.java
===================================================================
--- src/edu/ucsb/nceas/metacat/shared/BaseException.java	(revision 6123)
+++ src/edu/ucsb/nceas/metacat/shared/BaseException.java	(revision 6124)

Property changes on: src/edu/ucsb/nceas/metacat/shared/BaseException.java
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,0 +0,0 ##
Index: src/edu/ucsb/nceas/metacat/shared/BaseService.java
===================================================================
--- src/edu/ucsb/nceas/metacat/shared/BaseService.java	(revision 6123)
+++ src/edu/ucsb/nceas/metacat/shared/BaseService.java	(revision 6124)

Property changes on: src/edu/ucsb/nceas/metacat/shared/BaseService.java
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,0 +0,0 ##
Index: src/edu/ucsb/nceas/metacat/shared/MetacatUtilException.java
===================================================================
--- src/edu/ucsb/nceas/metacat/shared/MetacatUtilException.java	(revision 6123)
+++ src/edu/ucsb/nceas/metacat/shared/MetacatUtilException.java	(revision 6124)

Property changes on: src/edu/ucsb/nceas/metacat/shared/MetacatUtilException.java
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,0 +0,0 ##
Index: src/edu/ucsb/nceas/metacat/shared/BaseAccess.java
===================================================================
--- src/edu/ucsb/nceas/metacat/shared/BaseAccess.java	(revision 6123)
+++ src/edu/ucsb/nceas/metacat/shared/BaseAccess.java	(revision 6124)

Property changes on: src/edu/ucsb/nceas/metacat/shared/BaseAccess.java
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,0 +0,0 ##
Index: src/edu/ucsb/nceas/metacat/shared/HandlerException.java
===================================================================
--- src/edu/ucsb/nceas/metacat/shared/HandlerException.java	(revision 6123)
+++ src/edu/ucsb/nceas/metacat/shared/HandlerException.java	(revision 6124)

Property changes on: src/edu/ucsb/nceas/metacat/shared/HandlerException.java
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,0 +0,0 ##
Index: src/edu/ucsb/nceas/metacat/shared/BaseDAO.java
===================================================================
--- src/edu/ucsb/nceas/metacat/shared/BaseDAO.java	(revision 6123)
+++ src/edu/ucsb/nceas/metacat/shared/BaseDAO.java	(revision 6124)

Property changes on: src/edu/ucsb/nceas/metacat/shared/BaseDAO.java
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,0 +0,0 ##
Index: src/edu/ucsb/nceas/metacat/admin/LoginAdmin.java
===================================================================
--- src/edu/ucsb/nceas/metacat/admin/LoginAdmin.java	(revision 6123)
+++ src/edu/ucsb/nceas/metacat/admin/LoginAdmin.java	(revision 6124)

Property changes on: src/edu/ucsb/nceas/metacat/admin/LoginAdmin.java
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,0 +0,0 ##
Index: src/edu/ucsb/nceas/metacat/admin/MetacatAdmin.java
===================================================================
--- src/edu/ucsb/nceas/metacat/admin/MetacatAdmin.java	(revision 6123)
+++ src/edu/ucsb/nceas/metacat/admin/MetacatAdmin.java	(revision 6124)

Property changes on: src/edu/ucsb/nceas/metacat/admin/MetacatAdmin.java
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,0 +0,0 ##
Index: src/edu/ucsb/nceas/metacat/admin/AuthAdmin.java
===================================================================
--- src/edu/ucsb/nceas/metacat/admin/AuthAdmin.java	(revision 6123)
+++ src/edu/ucsb/nceas/metacat/admin/AuthAdmin.java	(revision 6124)

Property changes on: src/edu/ucsb/nceas/metacat/admin/AuthAdmin.java
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,0 +0,0 ##
Index: src/edu/ucsb/nceas/metacat/admin/MetacatAdminServlet.java
===================================================================
--- src/edu/ucsb/nceas/metacat/admin/MetacatAdminServlet.java	(revision 6123)
+++ src/edu/ucsb/nceas/metacat/admin/MetacatAdminServlet.java	(revision 6124)

Property changes on: src/edu/ucsb/nceas/metacat/admin/MetacatAdminServlet.java
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,0 +0,0 ##
Index: src/edu/ucsb/nceas/metacat/properties/PropertyService.java
===================================================================
--- src/edu/ucsb/nceas/metacat/properties/PropertyService.java	(revision 6123)
+++ src/edu/ucsb/nceas/metacat/properties/PropertyService.java	(revision 6124)

Property changes on: src/edu/ucsb/nceas/metacat/properties/PropertyService.java
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,0 +0,0 ##
Index: src/edu/ucsb/nceas/metacat/properties/SkinPropertyService.java
===================================================================
--- src/edu/ucsb/nceas/metacat/properties/SkinPropertyService.java	(revision 6123)
+++ src/edu/ucsb/nceas/metacat/properties/SkinPropertyService.java	(revision 6124)

Property changes on: src/edu/ucsb/nceas/metacat/properties/SkinPropertyService.java
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,0 +0,0 ##
Index: src/edu/ucsb/nceas/metacat/MetacatVersion.java
===================================================================
--- src/edu/ucsb/nceas/metacat/MetacatVersion.java	(revision 6123)
+++ src/edu/ucsb/nceas/metacat/MetacatVersion.java	(revision 6124)

Property changes on: src/edu/ucsb/nceas/metacat/MetacatVersion.java
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,0 +0,0 ##
Index: src/edu/ucsb/nceas/metacat/replication/ReplicationServer.java
===================================================================
--- src/edu/ucsb/nceas/metacat/replication/ReplicationServer.java	(revision 6123)
+++ src/edu/ucsb/nceas/metacat/replication/ReplicationServer.java	(revision 6124)

Property changes on: src/edu/ucsb/nceas/metacat/replication/ReplicationServer.java
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,0 +0,0 ##
Index: src/edu/ucsb/nceas/metacat/replication/ReplMessageHandler.java
===================================================================
--- src/edu/ucsb/nceas/metacat/replication/ReplMessageHandler.java	(revision 6123)
+++ src/edu/ucsb/nceas/metacat/replication/ReplMessageHandler.java	(revision 6124)

Property changes on: src/edu/ucsb/nceas/metacat/replication/ReplMessageHandler.java
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,0 +0,0 ##
Index: src/edu/ucsb/nceas/metacat/replication/ForceReplicationHandler.java
===================================================================
--- src/edu/ucsb/nceas/metacat/replication/ForceReplicationHandler.java	(revision 6123)
+++ src/edu/ucsb/nceas/metacat/replication/ForceReplicationHandler.java	(revision 6124)

Property changes on: src/edu/ucsb/nceas/metacat/replication/ForceReplicationHandler.java
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,0 +0,0 ##
Index: src/edu/ucsb/nceas/metacat/replication/ReplicationHandler.java
===================================================================
--- src/edu/ucsb/nceas/metacat/replication/ReplicationHandler.java	(revision 6123)
+++ src/edu/ucsb/nceas/metacat/replication/ReplicationHandler.java	(revision 6124)

Property changes on: src/edu/ucsb/nceas/metacat/replication/ReplicationHandler.java
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,0 +0,0 ##
Index: src/edu/ucsb/nceas/metacat/replication/ReplicationService.java
===================================================================
--- src/edu/ucsb/nceas/metacat/replication/ReplicationService.java	(revision 6123)
+++ src/edu/ucsb/nceas/metacat/replication/ReplicationService.java	(revision 6124)

Property changes on: src/edu/ucsb/nceas/metacat/replication/ReplicationService.java
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,0 +0,0 ##
Index: src/edu/ucsb/nceas/metacat/replication/ReplicationServerList.java
===================================================================
--- src/edu/ucsb/nceas/metacat/replication/ReplicationServerList.java	(revision 6123)
+++ src/edu/ucsb/nceas/metacat/replication/ReplicationServerList.java	(revision 6124)

Property changes on: src/edu/ucsb/nceas/metacat/replication/ReplicationServerList.java
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,0 +0,0 ##
Index: src/edu/ucsb/nceas/metacat/scheduler/ScheduledJobParamDAO.java
===================================================================
--- src/edu/ucsb/nceas/metacat/scheduler/ScheduledJobParamDAO.java	(revision 6123)
+++ src/edu/ucsb/nceas/metacat/scheduler/ScheduledJobParamDAO.java	(revision 6124)

Property changes on: src/edu/ucsb/nceas/metacat/scheduler/ScheduledJobParamDAO.java
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,0 +0,0 ##
Index: src/edu/ucsb/nceas/metacat/scheduler/ScheduledJobParamAccess.java
===================================================================
--- src/edu/ucsb/nceas/metacat/scheduler/ScheduledJobParamAccess.java	(revision 6123)
+++ src/edu/ucsb/nceas/metacat/scheduler/ScheduledJobParamAccess.java	(revision 6124)

Property changes on: src/edu/ucsb/nceas/metacat/scheduler/ScheduledJobParamAccess.java
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,0 +0,0 ##
Index: docs/dev/testing-metacat.html
===================================================================
--- docs/dev/testing-metacat.html	(revision 6123)
+++ docs/dev/testing-metacat.html	(revision 6124)

Property changes on: docs/dev/testing-metacat.html
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,0 +0,0 ##
Index: test/edu/ucsb/nceas/metacat/dataone/MetadataTypeRegisterTest.java
===================================================================
--- test/edu/ucsb/nceas/metacat/dataone/MetadataTypeRegisterTest.java	(revision 6123)
+++ test/edu/ucsb/nceas/metacat/dataone/MetadataTypeRegisterTest.java	(revision 6124)
@@ -28,6 +28,8 @@
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
+import org.dataone.client.ObjectFormatCache;
+import org.dataone.service.exceptions.NotFound;
 import org.dataone.service.types.*;
 
 /**
@@ -76,22 +78,36 @@
      */
     public void testIsMetadataType()
     {
-        ObjectFormat of = ObjectFormat.convert("XXXX");
+      ObjectFormat of = null;
+      try {
+	        of = ObjectFormatCache.getFormat("XXXX");
+              
+      } catch (NotFound e) {
         assertFalse(MetadataTypeRegister.isMetadataType(of));
-        
-        of = ObjectFormat.convert("eml://ecoinformatics.org/eml-2.0.0");
-        assertTrue(MetadataTypeRegister.isMetadataType(of));
-        
-        of = ObjectFormat.convert("http://www.unidata.ucar.edu/namespaces/netcdf/ncml-2.2");
-        assertTrue(MetadataTypeRegister.isMetadataType(of));
-        
-        of = ObjectFormat.convert("CF-1.3");
-        assertTrue(MetadataTypeRegister.isMetadataType(of));
-        
-        of = ObjectFormat.convert("http://www.loc.gov/METS/");
-        assertTrue(MetadataTypeRegister.isMetadataType(of));
-        
-        of = ObjectFormat.convert("eml://ecoinformatics.org/eml-3.0.0");
-        assertFalse(MetadataTypeRegister.isMetadataType(of));
+      
+      }
+      
+      try {
+	      
+      	of = ObjectFormatCache.getFormat("eml://ecoinformatics.org/eml-2.0.0");
+	      assertTrue(MetadataTypeRegister.isMetadataType(of));
+	      
+	      of = ObjectFormatCache.getFormat("http://www.unidata.ucar.edu/namespaces/netcdf/ncml-2.2");
+	      assertTrue(MetadataTypeRegister.isMetadataType(of));
+	      
+	      of = ObjectFormatCache.getFormat("CF-1.3");
+	      assertTrue(MetadataTypeRegister.isMetadataType(of));
+	      
+	      of = ObjectFormatCache.getFormat("http://www.loc.gov/METS/");
+	      assertTrue(MetadataTypeRegister.isMetadataType(of));
+	      
+	      of = ObjectFormatCache.getFormat("eml://ecoinformatics.org/eml-3.0.0");
+	      assertFalse(MetadataTypeRegister.isMetadataType(of));
+      
+      } catch (NotFound e) {
+      	e.printStackTrace();
+      	
+      }
+
     }
 }
Index: test/edu/ucsb/nceas/metacat/dataone/CNCoreTest.java
===================================================================
--- test/edu/ucsb/nceas/metacat/dataone/CNCoreTest.java	(revision 6123)
+++ test/edu/ucsb/nceas/metacat/dataone/CNCoreTest.java	(revision 6124)
@@ -30,6 +30,7 @@
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
+import org.dataone.client.ObjectFormatCache;
 import org.dataone.service.types.Checksum;
 import org.dataone.service.types.ChecksumAlgorithm;
 import org.dataone.service.types.Identifier;
@@ -125,7 +126,7 @@
 	    SystemMetadata sm = new SystemMetadata();
         //set the id
         sm.setIdentifier(id);
-        sm.setObjectFormat(ObjectFormat.OCTET_STREAM);
+        sm.setObjectFormat(ObjectFormatCache.getFormat("application/octet-stream"));
         //create the checksum
         String checksumS = "test";
         ChecksumAlgorithm ca = ChecksumAlgorithm.convert("MD5");
Index: test/edu/ucsb/nceas/metacat/dataone/CrudServiceTest.java
===================================================================
--- test/edu/ucsb/nceas/metacat/dataone/CrudServiceTest.java	(revision 6123)
+++ test/edu/ucsb/nceas/metacat/dataone/CrudServiceTest.java	(revision 6124)
@@ -34,6 +34,7 @@
 import junit.framework.TestSuite;
 
 import org.apache.commons.io.IOUtils;
+import org.dataone.client.ObjectFormatCache;
 import org.dataone.service.exceptions.BaseException;
 import org.dataone.service.types.AuthToken;
 import org.dataone.service.types.Checksum;
@@ -131,7 +132,7 @@
             //create the system metadata then run the create method
             StringBufferInputStream sbis = new StringBufferInputStream(testDoc);
             SystemMetadata sm = createSystemMetadata(id, testDoc, 
-                    ObjectFormat.convert("eml://ecoinformatics.org/eml-2.1.0"));
+                    ObjectFormatCache.getFormat("eml://ecoinformatics.org/eml-2.1.0"));
             //create the doc
             Identifier rGuid = cs.create(token, id, sbis, sm);
             
@@ -291,7 +292,7 @@
 	            id.setValue(docid);
 	            String testDoc = getTestDoc();
 	            StringBufferInputStream sbis = new StringBufferInputStream(testDoc);
-	            ObjectFormat of1 = ObjectFormat.convert("eml://ecoinformatics.org/eml-2.1.0");
+	            ObjectFormat of1 = ObjectFormatCache.getFormat("eml://ecoinformatics.org/eml-2.1.0");
 	            SystemMetadata sm = createSystemMetadata(id, testDoc, of1);
 	            assertFalse(sm.getChecksum().getValue().startsWith("MD5"));
 	            //create the doc
@@ -310,7 +311,7 @@
             id.setValue(docid);
             String testDoc = getTestDoc();
             StringBufferInputStream sbis = new StringBufferInputStream(testDoc);
-            ObjectFormat of1 = ObjectFormat.convert("eml://ecoinformatics.org/eml-2.1.0");
+            ObjectFormat of1 = ObjectFormatCache.getFormat("eml://ecoinformatics.org/eml-2.1.0");
             SystemMetadata sm = createSystemMetadata(id, testDoc, of1);
             assertFalse(sm.getChecksum().getValue().startsWith("MD5"));
             //create the doc
@@ -358,7 +359,7 @@
 	        Date d1 = new Date(new Date().getTime() - 5000);
 	        CrudService cs = CrudService.getInstance();
 	        AuthToken token = getToken();
-	        ObjectFormat of1 = ObjectFormat.convert("eml://ecoinformatics.org/eml-2.1.0");
+	        ObjectFormat of1 = ObjectFormatCache.getFormat("eml://ecoinformatics.org/eml-2.1.0");
 	        //create docs at different times
 
 	        Identifier id = new Identifier();
@@ -479,8 +480,8 @@
 	    {
 	        CrudService cs = CrudService.getInstance();
 	        AuthToken token = getToken();
-	        ObjectFormat of1 = ObjectFormat.convert("eml://ecoinformatics.org/eml-2.1.0");
-	        ObjectFormat of2 = ObjectFormat.convert("eml://ecoinformatics.org/eml-2.0.0");
+	        ObjectFormat of1 = ObjectFormatCache.getFormat("eml://ecoinformatics.org/eml-2.1.0");
+	        ObjectFormat of2 = ObjectFormatCache.getFormat("eml://ecoinformatics.org/eml-2.0.0");
 	        //create docs at different times
 	        Date d1 = new Date();
 	        Identifier id1 = createDoc(token, getTestDoc(EML2_1_0), of1);
@@ -820,7 +821,7 @@
 	 */
 	public Identifier createDoc(AuthToken token, String testDoc) throws Exception
 	{
-	    return createDoc(token, testDoc, ObjectFormat.convert("eml://ecoinformatics.org/eml-2.1.0"));
+	    return createDoc(token, testDoc, ObjectFormatCache.getFormat("eml://ecoinformatics.org/eml-2.1.0"));
 	}
 	
 	/**
@@ -851,7 +852,7 @@
 	  throws Exception
 	{
 	    return createSystemMetadata(id, testDoc, 
-	            ObjectFormat.convert("eml://ecoinformatics.org/eml-2.1.0"));
+	            ObjectFormatCache.getFormat("eml://ecoinformatics.org/eml-2.1.0"));
 	}
 	
 	/**
Index: lib/d1_libclient_java-0.6.2-SNAPSHOT.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: lib/d1_libclient_java-0.6.2-SNAPSHOT.jar
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: lib/d1_common_java-0.6.2-SNAPSHOT.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: lib/d1_common_java-0.6.2-SNAPSHOT.jar
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: lib/style/common/eml_xsl.css
===================================================================
--- lib/style/common/eml_xsl.css	(revision 6123)
+++ lib/style/common/eml_xsl.css	(revision 6124)
@@ -1,330 +1,1194 @@
- /*
-  *   '$RCSfile: default.css,v $'
-  *     Purpose: Default style sheet for KNB project web pages 
-  *              Using this stylesheet rather than placing styles directly in 
-  *              the KNB web documents allows us to globally change the 
-  *              formatting styles of the entire site in one easy place.
-  *   Copyright: 2000 Regents of the University of California and the
-  *               National Center for Ecological Analysis and Synthesis
-  *     Authors: Matt Jones
-  *
-  *    '$Author: jones $'
-  *      '$Date: 2009-03-05 18:56:15 $'
-  *  '$Revision: 1.32 $'
-  *
-  * 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
-  */
+/*   '$RCSfile: pisco.css,v $'                                              */
+/*     Purpose: Default style sheet for PISCO project web pages             */
+/*              Using this stylesheet rather than placing styles directly   */
+/*              into PISCO web documents allows us to globally change the   */
+/*              formatting styles of the entire site in one easy place.     */
+/*              Versioning information for this document can be found at    */
+/*              cvs.piscoweb.org.                                           */
+/*   Copyright: 2000 Regents of the University of California and the        */
+/*              Partnership for Interdisciplinary Studies of Coastal Oceans */
+/*     Authors: Chris Jones, James Woods                                    */
+/*                                                                          */
+/*    '$Author: leinfelder $'                                                   */
+/*      '$Date: 2011-01-13 15:01:00 -0800 (Thu, 13 Jan 2011) $'                                      */
+/*  '$Revision: 5804 $'                                                      */
+/*                                                                          */
 
 
-  
-/******************************************************************************/  
-/******************************************************************************/  
-/**  COMMON : USED BY EML STYLESHEETS AND OTHER PAGES                        **/
-/******************************************************************************/  
-/******************************************************************************/  
+/* Color Scheme:
+ *    dark blue:                  #003366
+ *    aqua blue:                  #0066CC
+ *    aqua green:                 #006666
+ *    white:                      #FFFFFF
+ *    dark tan(kelp color):       #666600
+ *    light tan:                  #CCCC99
+ */
 
-/*** styles that override html tags ***/
 
+/*
+*  import eml css:
+*/
+
 body {
-    padding: 0px;
-    margin: 10px;
-    color: #333333; 
-    background-color: #ffffff;
-    font-weight: normal;
-    font-size: 12px; 
-    font-family: Verdana,Arial,Helvetica,sans-serif; 
-}
+    width:                   100%;
+    min-width:			800px;
+    /* width:expression(document.body.clientWidth < 800? "800px": "auto");  */ /* hack for ie min width */
 
-a {
-    color: #669933;
-    font-weight: bold;
-    font-size: 12px; 
-    text-decoration: none; 
-    text-align: left;
-}
+    margin:                     0px 0px 0px 0px;
+    background-color:           #ffffff;
+    padding:                    0px;
+    border:                     0px;
+/*  background-image:           url('images/bg.gif');
+/*  background-position:        top left;     /* No NN4 */
+/*  background-repeat:          repeat-y;     /* No NN4 */
 
-a:hover {
-    color: #ff9933;
-    text-decoration: underline; 
+    font-style:                 normal;
+    font-weight:                normal;
+    font-size:                  100%;
+    font-family:                "Myriad Pro", "Myriad Web Pro", "Myriad Web", "Myriad", Verdana, Arial, Helvetica, sans-serif;
+    text-decoration:            none;
+  }
+
+body>div img {
+    padding:                    0px 0px 0px 0px;
+    }
+
+
+#content_wrapper {
+	margin:                     0px 10px 10px 10px;
 }
 
-h1 {
-  font-size: 24px;
-  font-family: Georgia, Times New Roman, Times, serif;
-  text-align: center;
+
+#header {
+  width:                        100%;
+  min-width:			800px; 
+  width:expression(document.documentElement.clientWidth < 800? "800px": "auto");   /* hack for ie min width */
+   /* position:                   absolute;  
+    top:                        0px;
+    left:                       10px; 
+    right:                      10px; */
+/*  margin:                     0px 10px 0px 10px; /* T R B L */
+    padding:                    0px;
+    border:                     0px;
+    background-color:           #ffffff;
+/*  background-image:           url('images/data_catalog_header_bg.jpg'); */
+
+    height:                     60px; /* begin hack for ie5win */
+    width:                      100%;
+    voice-family:               "\"}\"";
+    voice-family:               inherit;
+    height:                     60px;
+    }
+
+html>body #header {
+    height:                     60px; 
+    width:                      auto;
+    min-width:                  800px; /* end hack for ie5win */
+    }
+
+
+/* div "content" should be sibling to div "header" */ 
+/* top margin required to clear sibling (logo is 100px tall)*/
+
+#content {
+    margin:                     0px 0px 0px 0px ; 
+    background-color:           #ffffff;
+    border:                     0px;
+    /* margin:                     0px 0px 0px 0px;
+ */
+    }
+
+
+
+/* these elements positioned to be in header below */
+
+#left_logo {
+    position:                   absolute;
+    top:                        5px;
+    z-index:                    2;  /* stack on top of header menu */
+    left:                       10px; /* we want the logo on the left */
+    margin:                     0px 0px 0px 0px; /* T R B L */
+    padding:                    0px;
+    border:                     0px;
+    background-image:           url('images/sbclter-logo.gif');
+    background-position:        top left;     /* No NN4 */
+    background-repeat:          no-repeat;         /* No NN4 */
+    width:                      99px; /* begin hack for 1e5win */
+    height:                     100px; 
+    voice-family:               "\"}\"";
+    voice-family:               inherit;
+    width:                      99px;
+    height:                     100px;
+    }
+
+html>body #left_logo {
+    width:                      99px;
+    height:                     100px; /* end hack for ie5win */
+    }
+
+#right_logo {
+    position:                   absolute;
+    top:                        0px;
+    right:                      10px; /* we want the logo near the right */
+    margin:                     0px 0px 0px 0px; /* T R B L */
+    padding:                    0px;
+    border:                     0px;
+    background-image:           url('images/sbclter-coastal-header.jpg');
+    background-position:        top right;     /* No NN4 */
+    background-repeat:          no-repeat;         /* No NN4 */
+    height:                     60px; /* begin hack for 1e5win */
+    width:                      223px;
+    voice-family:               "\"}\"";
+    voice-family:               inherit;
+    height:                     60px;
+    width:                      223px;
+    }
+
+html>body #right_logo {
+    width:                      223px;
+    height:                     60px; /* end hack for ie5win */
+    }
+
+/* banner holds the title and subtitle */
+#banner {
+    margin:                     0px 0px 0px 110px; /* T R B L */
+    padding:                    0px;
+    border:                     0px;
+    background-color:           #ffffff;
+/*  background-image:           url('images/data_catalog_header_search.jpg') */
+    background-position:        top left;     /* No NN4 */
+    background-repeat:          no-repeat;         /* No NN4 */
+/*  height:                     60px; /* begin hack for ie5win */
+    voice-family:               "\"}\"";
+    voice-family:               inherit;
+/*  height:                     60px;
+ */
+    }
+
+html>body #banner {
+/*  height:                     60px; /* end hack for ie5win */
+    }
+
+
+
+/* Header Sub-Title Classes
+ * title and subtitle in the left portion of the banner */
+
+div.header-title {
+    position:           absolute;
+    top:                5px;
+    left:               110px;
+    color:              #003366;
+/*  padding:            1px 4px 1px 100px;
+ */
+    font-size:          26px;
+    font-family:        serif;
+    font-style:         normal;
+    font-weight:        800;
 }
 
-h2 {
-  font-size: 20px;
-  font-family: Georgia, Times New Roman, Times, serif;
+
+div.header-subtitle {
+    position:           absolute;
+    top:                40px;
+    left:               115px;
+    color:              #006666;
+/*  padding:            1px 4px 1px 110px; */
+    font-size:          12px;
 }
 
-h3 {
-  font-size: 16px;
-  font-family: Georgia, Times New Roman, Times, serif;
-  text-align: center;
+div.header-menu {
+    position:           absolute;
+    top:                60px;
+    width:              100%;
+    z-index:            1;       /* put menu underneath logos */
+    border-top:         1px solid #006666;
+    border-bottom:      1px solid #006666;                    
+    color:              #666600;                                  
+    background-color:   #CCCC99;                                  
+    padding:            2px 2px 2px 110px;                        
+    font-size:          14px;                                     
+}                                                                 
+
+
+
+
+/* header doesnt currently accomodate this class  */
+div.header-submenu {                                              
+    color:              #003366;                                  
+    background-color:   #FFFFFF;                                  
+    padding:            2px 10px 2px 110px;                       
+    font-size:          14px;                                     
+}                                                                 
+                                                                  
+
+
+
+#left_sidebar {
+    position:                   absolute;
+    top:                        0px;
+    left:                       0px;
+    margin:                     0px;
+    padding:                    0px;
+    border:                     0px;
+    background-color:           #003366;
+    width:                      10px; /* begin hack for 1e5win */
+    voice-family:               "\"}\"";
+    voice-family:               inherit;
+    width:                      10px;
+    }
+
+html>body #left_sidebar {
+    width:                      10px; /* end hack for ie5win */
+    }
+
+#right_sidebar {
+    position:                   absolute;
+    top:                        0px;
+    right:                      0px;
+    margin:                     0px;
+    padding:                    0px;
+    border:                     0px;
+    background-color:           #003366;
+    width:                      10px; /* begin hack for 1e5win */
+    voice-family:               "\"}\"";
+    voice-family:               inherit;
+    width:                      10px;
+    }
+
+html>body #right_sidebar {
+    width:                      10px; /* end hack for ie5win */
+    }
+
+
+
+
+
+
+
+
+
+
+
+
+/* these classes to be children of div "content" */
+
+
+/* for the skip-to box */
+
+ div.skipto-box {
+      vertical-align:	  middle;
+      text-align:         center;
+      color:              #003366;
+      background-color:   #CCCC99;
+      /* turned off float, placed with a table cell */
+      /*float:              left; */
+      padding:            6px;
+      /* set border for NN4 only change in advanced.css */
+      border:             0.1px solid #006666;
+      margin:             8px;
+      /* width: 		  50%; */
+      width:              300px; 
+     /* height:             20px; */
+      font-size:          12px;
   }
 
-td {
-    font-size: 12px; 
-    line-height: 1.5;
-}
+div.r-box {
+      vertical-align:     middle;
+      text-align:         center;
+      color:              #003366;
+      background-color:   #CCCC99;
+      float:              right;
+      padding:            6px 6px;
+      /* set border for NN4 only change in advanced.css */
+      border:             0.1px solid #006666;
+      margin:             0px;
+      width:              50%;
+   /*   height:             auto; */
+      font-size:          12px;
+   /*   clear:              both; */
+  }
 
-p { 
-    margin: 5px; 
-}
 
-p + p { 
-    margin: 5px; 
-    text-indent: 2em; 
-}
+div.content-area {
+       /* for padding area within parent area */
+    background-color:   #FFFFFF;
+    color:              #003366;
+    text-align:         left;
+   padding:            30px 40px 15px 40px; 
+   /*padding:            0px 0px 0px 0px; */
 
-p.label { 
-    color: #333333; 
-    font-weight: bold; 
 }
 
-p.contact { 
-    color: #333333; 
-    padding: 1em;
-    font-size: 0.75em; 
-    font-weight: normal;
-    font-style: italic; 
+div.content-area-dense {
+       /* for padding area within parent area */
+    background-color:   #FFFFFF;
+    color:              #003366;
+    text-align:         left;
+  /*  padding:            30px 40px 15px 40px; */
+   padding:            0px 0px 0px 0px; 
+
 }
 
 
-/*** custom styles ***/
 
-#mainTableAligmentStyle {
-    width: 100%;
-}
+div.hanging-paragraph {
+	margin-left:	20px;
+	text-indent:	-20px;
 
-.mainContainerTableStyle {
-    width: 100%;
 }
 
-.title {
-    font-family: Georgia, Times New Roman, Times, serif;
-    color:  #0247A8;
-    font-size: 24px; 
-    font-weight: bold;
+div.smaller-font {
+    	font-size:		smaller;
 }
 
-.subtitle {
-    font-family: Verdana,Arial,Helvetica,sans-serif;
-    font-size: 12px;
-    font-weight: bold;
-    color: #666666; 
-    margin-left: 3em;
-    margin-top: 0.5em;
-    margin-bottom: 2em;
-    font-weight: normal;  
+div.bottom-padding {
+/*	padding:		0px 0px 10px 0px; */
+	padding-bottom:		10px;
 }
 
-.sectiontitle {
-    font-family: Verdana,Arial,Helvetica,sans-serif;
-    font-size: 12px;
-    font-weight: bold;
-    color: #666666;
-    margin-top: 1em;
-	margin-bottom: 0.25em;						
+div.left-padding {
+	padding-left:		10px;
 }
 
-.tabledefault {
-    background: white;
-    color: #555555;
-    width: 100%; 
-    font-size: 12px; 
-    line-height: 1.2;
-    left-padding: 5px;
-    right-padding: 5px; 
-}
+#search-box { 
+  /* background and text style set by table .group */
+  position:           relative;
+  margin-left:        50%;
+  /* top: 110px; */
+ }
 
-.tablehead {
-    background-color: #B3D4FF;
-    color: #0040A1; 
-    font-size: 14px; 
-    font-weight: bold; 
-    border-top: solid #ffffff 5px;
-    border-bottom: solid #ffffff 2px;
-    padding-left: 15%;
-    padding-top: 0px;
-    padding-bottom: 0px;
-}
 
-.roweven {
-    background: white; 
-}
+#search-box_right {
+    text-align:     right;
+    }
 
-.rowodd {
-    background: white; 
-}
+#loginbox {
+    border:                     0px;
+    position:                   absolute;
+    top:                        55px;
+    right:                      65px;
+    }
+
+#footer {
+    position:                   absolute;
+    right:                      10px;
+    bottom:                     0;
+    left:                       167px;
+    margin:                     0px 10px 10px 177px;
+    }
+
+#debug {
+    position:                   absolute;
+    right:                      20px;
+    bottom:                     0;
+    left:                       167px;
+    margin:                     0px 10px 10px 177px;
+    }
+
+p,ul,ol,dl,li,dt {
+    color:                      #555555;
+    font-style:                 normal;
+    font-weight:                normal;
+    text-decoration:            none;
+  }
   
-.emphasis { 
-    color: red; 
-}
+p ol,p ul, p dl, ol ul {
+    color:                      #555555;
+    font-style:                 normal;
+    font-weight:                normal;
+    text-decoration:            none; 
+  } 
 
-    
-/******************************************************************************/  
-/******************************************************************************/  
-/**  USED BY EML STYLESHEETS ONLY - NO OTHERS                                **/
-/******************************************************************************/  
-/******************************************************************************/  
+ul,ol {
+    padding:                    0px;
+    /* margin:                     0px 0px 0px 15px; */
+    }
 
-.mainContainerTable {
-    width: 750px;
-    background-color: #ffffff; 
-    font-size: 12px;
-}
 
-.linkedHeaderStyle {
-    background: #B2D2FE;
-    border-top: solid #ffffff 5px;
-    padding-left: 15%;
-    text-align: left;
-    font-weight: bold; 
-}
 
-.highlight  {
-    background-color: #dddddd; 
-    font-size: 12px;
-    border: solid #ffffff 1px;
-    padding-right: 4px;
-    text-align: right;
-    
-}
+.ol-lower-alpha { 
+    list-style-type: lower-alpha;
+    margin-top:       2px;
 
-.highlightAttrib {
-    background-color: #ffffff;
-    font-size: 12px;
-    text-align: center;
-    border-bottom: solid #cccccc  2px;
-    padding-left: 4px;
+  }
 
-}
 
-.searchresultsdivider {
-	background-color: #dddddd;
-}
+.ul-bulleted-list { 
+    list-style-type:  disc;
+    margin-top:       2px;
+    margin-bottom:    10px;
+    margin-left:      15px;
+  }
 
+/* add a little space before items in a list ?*/
+/* ol li { margin-top : 5px; } */
+/* ul li { margin-top : 5px; } */
 
-.citation  {
-    color: black;
-    background-color: #FFFFFF;
-    font-size: 1.2em; 
+
+
+
+div {
+    color:                      #003366;
+    font-style:                 normal;
+    font-weight:                normal;
+    text-decoration:            none;
+  }
+
+  
+/* NN 4.xx needs the font weight reset for b and strong tags */ 
+strong, b {
+    font-weight:                800;
+  }
+
+/* to emphasize words, use it inline with a <span> class*/ 
+big {
+    font-size:                  larger;
+  }
+
+/* to shrink words, use it inline with a <span> class*/
+small {
+    font-size:                  smaller;
+  }
+  
+/* for pre-formated text: adds a small padding around it
+ * font is set to the default style, 
+ * but could be changed for different effect
+ */
+pre {
+    color:                      #003366;
+    padding:                    10px;
+    font-style:                 normal;
+    font-weight:                normal;
+    text-decoration:            none;
+  }
+  
+pre.inline {
+    padding: 0px;
     padding-left: 10px;
+    padding-right: 10px;
+}  
+
+/* for creating block quotes. 
+ * set off with a slight indent to the left & right margins
+ * font is set to default style,
+ * but could be changed for different effect
+ */
+blockquote {
+    color:                      #003366;
+    padding:                    0;
+    font-style:                 normal;
+    font-weight:                normal;
+    text-decoration:            none;
+  }
+
+/* Headings Tags : 
+ * Headings are used to break up straight text. 
+ * They are used to present topics, or subsections, chapters, etc.
+ * There are 6 headings tag which can be styled as we wish.
+ * All of our headings will be rendered in the same font and color as the
+ * default settings.
+ */  
+
+/* h1: very large font, set bold */
+h1 {
+    color:                      #003366;
+    background-color:           #ffffff;
+    padding:                    0;
+    font-size:                  18pt;
+    font-style:                 normal;
+    font-weight:                bold;
+    text-decoration:            none;
+  }
+
+/* large font, set bold */
+h2 {
+    color:                      #003366;
+    background-color:           #ffffff;
+    padding:                    0;
+    font-size:                  16pt;
+    font-style:                 normal;
+    font-weight:                bold;
+    text-decoration:            none;
+  }
+
+/* slightly larger font, set bold */
+h3 {
+    color:                      #003366;
+    background-color:           #ffffff;
+    padding:                    0;
+    font-size:                  14pt;
+    font-style:                 normal;
+    font-weight:                700;
+    text-decoration:            none;
+   /*  margin-bottom:                 0px; */
+  }
+
+
+/* an italic header w border */
+/*
+h3 {
+  border-bottom:                #94c1d4 solid 1px;
+  color:                        #003366;
+  padding:                      0;
+  font-size:                    14pt;
+  margin:                       3px;
+  text-align:                   left;
+  font-style:                   italic;
+  font-weight:                  200;
+  }
+*/
+
+
+
+/* slightly larger, no bold */  
+/* make margins around h4 all the same, and a little larger than h5 */
+h4 {
+    color:                      #003366;
+    padding:                    0;
+    font-size:                  12pt;
+    font-style:                 normal;
+    font-weight:                400;
+    text-decoration:            none;
+    margin-top:			10px;
+    margin-bottom:                 0px;
+
+  }
+
+/* slightly smaller font */  
+/* moz-net-fox and ie have different default margins for h5 - make them uniform */
+h5 {
+    color:                      #003366;
+    padding:                    0;
+    font-size:                  12pt;
+    font-style:                 normal;
+    font-weight:                400;
+    text-decoration:            none;
+    margin-bottom:                 0px; 
+    margin-top:                 7px; 
+
+
+  }
+
+/* very small font */  
+h6 {
+    color:                      #003366;
+    background-color:           #FFFFFF;
+    padding:                    0;
+    font-size:                  10pt;
+    font-style:                 normal;
+    font-weight:                normal;
+    text-decoration:            none;
+  }  
+
+
+
+/* Old style hr command - will be depreciated
+ * Netscape 4.x does not like this
+ * should use new style below
+ * used anywhere? remove?
+ */
+hr {
+    border-top:                 #003366 0px solid;
+    width:                      450px;
+    height:                     2px;
+    color:                      #003366;
+    background-color:           #003366;
+    /*border-width:               none;
+    border-color:               #003366; */
+  }
+
+/* New horizontal rule. Netscape 4.x should render this fine.
+ * apply this class to a <div> tag for the desired effect.
+ * the rule is 1px wide, blue with a slight margin on the left and right.
+ */
+.rule {
+    border-top-width:           2px;
+    border-top-style:           solid;
+    border-color:               #003366; 
+    margin:                     4px 4px
+  }
+  
+ /* Default link properties
+ * currently set the links to the dark tan
+ * with no additional decorations
+ * except underline on hover
+*/
+a:link {
+    color:                      #333333;
+    background:                 transparent;
+/*    background-color:           #FFFFFF; */
+    text-decoration:            none;
+  }
+a:visited {
+    color:                      #333333;
+    background:                  transparent;
+/*    background-color:           #FFFFFF; */
+    text-decoration:            none;
+  } 
+a:hover {
+    color:                      #000000;
+    background:                 transparent;
+/*    background-color:           #FFFFFF; */
+    text-decoration:            underline;
+  } 
+a:active { 
+    color:                      #333333;
+    background:                 transparent;
+/*    background-color:           #FFFFFF; */
+    text-decoration:            none;
+  }
+
+/* Menu Link properties
+ * the Menu is currently identical to the dafault
+ * but this may change so it is defined here                      
+ */                                                               
+a.menu:link {                                                     
+    color:                      #003366;                          
+    background:                 transparent;                      
+    /*background-color:           #CCCC9A;*/                      
+    text-decoration:            none;                             
+  }                                                               
+a.menu:visited {                                                  
+    color:                      #003366;                          
+    background:                 transparent;                      
+    /*background-color:           #CCCC9A;*/
+    text-decoration:            none;                             
+  }                                                               
+a.menu:hover {                                                    
+    color:                      #003366;                          
+    background:                 transparent;                      
+   /* background-color:           #CCCC9A;*/                      
+    text-decoration:            underline;                        
+  }                                                               
+a.menu:active {                                                   
+    color:                      #003366;                          
+    background:                 transparent;                      
+   /* background-color:           #CCCC9A; */                     
+    text-decoration:            none;                             
+  }                                                               
+                                                                  
+/* SubMenu Link Properties                                        
+ * Set the color to dark tan with underline on hover              
+ */                                                               
+a.submenu:link {                                                  
+    color:                      #003366;                          
+/*  color:                      #003366; */                       
+    background:                 transparent;                      
+    /*background-color:           #CCCC9A;*/                      
+    text-decoration:            none;                             
+  }                                                               
+a.submenu:visited {                                               
+    color:                      #003366;                          
+/*  color:                      #003366; */                       
+    background:                 transparent;                      
+    /*background-color:           #CCCC9A;*/                      
+    text-decoration:            none;                             
+  }                                                               
+a.submenu:hover {                                                 
+    color:                      #003366;                          
+/*  color:                      #003366; */                       
+    background:                 transparent;                      
+   /* background-color:           #CCCC9A;*/                      
+    text-decoration:            underline;                        
+  }                                                               
+a.submenu:active {                                                
+    color:                      #003366;                          
+/*  color:                      #003366; */                       
+    background:                 transparent;                      
+   /* background-color:           #CCCC9A; */                     
+    text-decoration:            none;                             
+  }                                                               
+                                                                  
+
+/* image styles */
+/* no padding or border around images by default */
+img {
+    border:                     0px; 
+    border-style:               none;
+    border-width:               0px;
+    padding:                    0px;
+    text-decoration:            none;
+  }
+
+/* this class is needed to remove some extra space along the top of images
+ * this attribute can not be put into default img class because it prevents
+ * text from wrapping correctly
+ */
+img.vtop {  
+    vertical-align:             top;
+  }
+
+/* Add a blue border around an image */
+
+img.border {
+    border:                     medium;
+    border-style:               solid;
+    border-color:               #003366;
+    padding:                    0px;
+  }
+
+/* Format the headshot images in the who section */
+
+img.headshot {
+    margin-right:               20px;
+    margin-bottom:              40px;
+  }
+
+/* Format the headshot images in the who section 
+ * that have alot of text aligned to the right */
+img.headshot_long {
+    margin-right:               20px;
+    margin-bottom:              80px;
+  }
+  
+/* Format inline images justified to the left in the text*/
+
+img.inlineleft {
+    border:                     medium;
+    border-style:               solid;
+    border-color:               #003366;
+    margin-right:               8px;
+    margin-top:                 8px;
+    margin-bottom:              8px;
+  }
+
+/* Format inline images justified to the right in the text*/
+
+img.inlineright {
+    border:                     medium;
+    border-style:               solid;
+    border-color:               #003366;
+    margin-left:                8px;
+    margin-top:                 8px;
+    margin-bottom:              8px;
+  }
+  
+/* Default behavior for linked images 
+ * no border, no padding, aligned to the top
+ */
+
+a img {
+    border:                     0px; 
+    border-style:               none;
+    border-width:               0px;
+    padding:                    0px;
+    vertical-align:             top;
+    text-decoration:            none;
+  }
+
+/* Default for table cells. 
+ * No border or padding. 
+ * Keep the relative font size and set color to blue
+ */
+
+ td {
+    color:                      #003366;
+    font-style:                 normal;
+    font-size:                  95%;
+    font-weight:                normal;
+    text-decoration:            none;    
+    border:                     0px;
+    padding:                    0px;
+    vertical-align:             top; 
+  }
+  
+/* Classes for the footer area */
+  
+/* Basic footer class to get the correct font size
+ * default footer style.
+ * colors are the same, but font size is smaller
+ */
+.footer {
+    color:                      #003366;
+    background-color:           #FFFFFF;
+    margin-top:                 20px;
+    margin-bottom:              20px;
+    margin-left:                5px;
+    margin-right:               0px;
+    font-size:                  75%;      /* No EM in NN4 */
+    font-style:                 normal;
+    font-weight:                normal;
+    text-decoration:            none;
+    text-align:                 center;
+  }
+/* extra class to handle the small table in the footer */ 
+.tblfooter {
+    color:                      #003366;
+    background-color:           #FFFFFF;
+    font-size:                  75%;      /* No EM in NN4 */
+    font-style:                 normal;
+    font-weight:                normal;
+    text-decoration:            none;
+  }
+
+/* Classes for positioning: use with div tags for desired effect */
+.indent1 {
+    white-space:                nowrap;
+    padding-left:               10px;
 }
 
-.lsid {
-    text-decoration: underline; 
+.indent2 {
+    padding-left:               15px;
 }
 
-.secondCol {
-    background-color: #ffffff; 
-    font-size: 12px; 
-    padding-left: 2px;
-    padding-right: 2px;
-
+.indent3 {
+    padding-left:               50px;
 }
 
-.bordered {
-    background-color: #ffffff; 
-    font-size: 12px; 
-    text-align: left;
-    padding: 5px;
-    border-bottom: solid #dddddd 1px;
-    width: 350px;
+/* Classes for the <em> tag (emphasis) */
+.italic {
+    font-style:                 italic;
+    font-weight:                normal;
+  }
+
+.italics {
+    font-style:                 italic;
+    font-weight:                normal;
+  }
+
+.bold {
+    font-style:                 normal;
+    font-weight:                bold;
+  }
+
+.waybold {
+    font-style:                 italic;
+    font-weight:                bolder;
+  }
+
+/* Additions for the data catalog pages */
+
+/* Define a border for groups of elements.  This uses the 
+   -moz-border-radius (Mozilla, Netscape, Opera only) 
+   attribute for the time being.  Once
+   browsers support the CSS3 border-radius attribute, this 
+   should be switched.*/
+.group {
+    padding:                    0;
+    color:                      #003366;
+    min-width:                  800px;
+    voice-family:               "\"}\""; /* begin ie5win hack */
+    voice-family:               inherit;
+    -moz-border-radius:         10px; /* end ie5win hack */
+    }
+/* Children of the group get some padding */
+.group * {
+    padding:                    2px;
+    }
+ 
+.group_border {
+    /* aqua-green border */
+    border:                     #006666 solid 1px;
+    }
+
+.subGroup {
+    padding:                    3px;
+    color:                      #003366;
+    voice-family:               "\"}\""; /* begin ie5win hack */
+    voice-family:               inherit;
+    -moz-border-radius:         10px; /* end ie5win hack */
+    }
+ 
+.subGroup_border {
+    /* blue-ish border */
+    border:                     #94c1d4 solid 1px;
+    }
+
+/* This selector causes the 'section' tables to indent under the overarching div
+ * tags */
+div>table.subGroup {
+    padding-left:               15px;
+    padding-right:              15px;
+    }
+
+div.left {
+    position:                   absolute;
+    left:                       20px;
+    clear:                      right;
+    }
+
+div.right {
+    position:                   absolute;
+    right:                      20px;
+    clear:                      left;
+    }
+
+table.left {
+    position:                   absolute;
+    left:                       20px;
+    }
+
+table.right {
+    float:                      right;
+    margin-right:               10px;
+    clear:                      left;
+    }
+
+th {
+    border-bottom:              #006666 solid 1px;
+    color:                      #003366;
+    padding:                    0;
+    margin:                     0;
+    text-align:                 left;
+    font-style:                 normal;
+    font-weight:                700;
 }
 
+th.rowheader {
+    background:                 #f1f8f8;
+    border-right:               #94c1d4 solid 1px;
+    }
+
+.rowodd {
+    border-bottom:              #94c1d4 dotted 1px;
+    border-top:                 #94c1d4 dotted 1px;
+    background-color:           #f1f8f8;
+    padding:                    0;
+    margin:                     0;
+} 
+
+.roweven {
+    padding:                    0;
+    margin:                     0;
+} 
+
 .coleven {
-    background-color: #ffffff; 
-    font-size: 12px;
-    padding: 5px;
+    border-left:                #94c1d4 dotted 1px;
+    border-right:               #94c1d4 dotted 1px;
+    background-color:           #f1f8f8;
+    padding-left:               2px;
+    padding-right:              2px;
     text-align: left;
-    border-bottom: solid #dddddd 1px;
 }
 
 .colodd {
-    background-color: #ffffff; 
-    font-size: 12px;
-    padding: 5px;
-    text-align: left;
-    border-bottom: solid #dddddd 1px;
+    padding-left:               2px;
+    padding-right:              2px;
+    text-align:                 left;
 }
-.emptycolumn {
-    width: 1px; 
-    border: 1px solid #ffffff;
-    }
 
 .innercolodd {
-    font-size: 10px;
-    padding-left: 2px;
-    padding-right: 2px;
-    text-align: left;
+    border:                     solid #94c1d4 1px;
+    font-size:                  .75em;
+    padding-left:               2px;
+    padding-right:              2px;
+    text-align:                 left;
 }
 
 .innercoleven {
-    font-size: 10px; 
-    padding-left: 2px;
-    padding-right: 2px;
-    text-align: left;
+    border:                     solid #94c1d4 1px;
+    background-color:           #f1f8f8;
+    font-size:                  .75em;
+    padding-left:               2px;
+    padding-right:              2px;
+    text-align:                 left;
 }    
 
+.onehundred_percent {
+    width:                      100%;
+    }
 
-/******************************************************************************/  
-/******************************************************************************/  
-/**  USED BY OTHER PAGES ONLY - NOT EML STYLESHEETS                          **/
-/******************************************************************************/  
-/******************************************************************************/  
+.eighty_percent {
+    width:                      80%;
+    }
 
 
-.tablepanel {
-    background: #ffffff;
-    color: #555555;
-    font-size: 12px; 
-    left-padding: 5px;
-    right-padding: 5px; 
+.seventyfive_percent {
+    width:                      75%;
+    }
+
+.seventy_percent {
+    width:                      70%;
+    }
+
+.fifty_percent {
+    width:                      50%;
+    }
+
+.fortyfive_percent {
+    width:                      45%;
+    }
+
+.forty_percent {
+    width:                      40%;
+    }
+
+.twentyfive_percent {
+    width:                      25%;
+    }
+
+
+.twenty_percent {
+    width:                      20%;
+    }
+
+
+.fifteen_percent {
+    width:                      15%;
+    }
+
+input, select, textarea {
+    color:                      #003366;
+    border:                     1px solid #94c1d4;
+    margin:                     5px;
+    }
+    
+input.submit {
+    margin-left:                5px;
+    border:                     #94c1d4 dotted 1px;
+    background-color:           #f1f8f8;
+    font-size:                  85%;
+    }
+
+label {
+    text-align:                 right;
+    vertical-align:             middle;
+    color:                      #94c1d4;
+    }
+
+.login {
+    font-size:                  85%;
+    width:                      6em;
+    }
+input.view.data-button{
+ /*  color:		#666600; */
+   font-size:		1.25em;
+ /*  font-weight:		bold; */
+   text-decoration:		underline;
+   background:		#ffffff;
+
 }
 
-.tablehead2 {
-    background: white;
-    vertical-align: bottom;
-    color: black;
-    font-size: 1em;
-    font-weight: bold;
+/***
+iframe classes
+****/
+.iframeheaderclass {
+    height:   85px; 
+    width:    100%;
+    border:   0px;
+    /*margin-bottom:   10px;*/
+    margin: 10px;
 }
 
-.plaintext {
-    color: #555555;
-    font-weight: normal;
-    font-size: 12px;
+.iframesearchboxclass {
+    height:   450px; 
+    width:    100%;
+    border:   0px;
+    margin:   0px;
 }
 
-.boldtext {
-    color: #333333;
-    font-weight: bold;
-    font-size: 12px;
+.iframeadvancedsearchboxclass {
+    height:   1250px; 
+    width:    100%;
+    border:   0px;
+    margin:   0px;
 }
 
-.rowevenemphasis {
-  background: #9ab3de;
-  font-weight: bold;
+.iframemapclass {
+    height:   570px; 
+    width:    100%;
+    border:   0px;
+    margin:   0px;
 }
 
-.rowoddemphasis {
-  background: #cccccc;
-  font-weight: bold;
+.iframeloginboxclass {
+    height:   305px; 
+    width:    100%;
+    border:   0px;
+    margin:   0px;
 }
 
+.iframeleftcolclass  { /* not used */ }
+.iframerightcolclass { /* not used */ }
+.iframefooterclass   { /* not used */ }
+
+/**
+ *  set the size and alignment etc of the top-level layout table
+ */  
+.templatetableclass {
+    width:   100%; 
+    border:   0px;
+    padding:  0px;
+    margin:   0px;
+}
+
+/**
+ *  set the style of the main content area and its contents
+ */ 
+.templatecontentareaclass {
+    border:   0px;
+    padding:  0px;
+    margin:   0px;
+}
+
+/**
+ *  set the correct <td> sizes to accomodate the 
+ *  header, footer, left and right iframes.
+ *  NOTE: these styles apply only to each 
+ *  container frame, *NOT* to the document in
+ *  the iframe within it!
+ */  
+.templateheaderrowclass {
+    height:   80px; 
+    /*
+      no width allowed - uses same width as table class
+    */
+    border:   0px;
+    padding:  0px;
+    margin:   0px;
+}
+
+.templateleftcolclass {
+    height:   100%; 
+    width:    0px;
+    border:   0px;
+    padding:  0px;
+    margin:   0px;
+}
+
+.templaterightcolclass {
+    height:   100%; 
+    width:    0px;
+    border:   0px;
+    padding:  0px;
+    margin:   0px;
+}
+
+.templatefooterrowclass {
+    height:   0px; 
+    /*
+      no width allowed - uses same width as
+      table class
+    */
+    border:   0px;
+    padding:  0px;
+    margin:   0px;
+}
+
+.banner {
+	background-image: url("./images/banner_background.jpg");
+	background-repeat: repeat-x;
+}
+.sectionheader {
+	font-weight: bold;
+}
+.searchresultsdivider {
+	height:	10px;
+}
+.highlight {
+    border-bottom:              #94c1d4 dotted 1px;
+    border-top:                 #94c1d4 dotted 1px;
+    background-color:           #f1f8f8;
+    padding:                    0;
+    margin:                     0;
+}
+.tablehead {
+    border-bottom:              #006666 solid 1px;
+    color:                      #003366;
+    padding:                    0;
+    margin:                     0;
+    text-align:                 left;
+    font-style:                 normal;
+    font-weight:                700;
+}
Index: src/loaddtdschema-oracle.sql
===================================================================
--- src/loaddtdschema-oracle.sql	(revision 6123)
+++ src/loaddtdschema-oracle.sql	(revision 6124)
@@ -55,5 +55,9 @@
   VALUES ('Schema', 'http://dataone.org/service/types/0.5.1', '/schema/D1_SCHEMA_0_5_1/dataoneTypes.xsd');
 INSERT INTO xml_catalog (entry_type, public_id, system_id)
   VALUES ('Schema', 'http://ns.dataone.org/service/types/0.6.0', '/schema/D1_SCHEMA_0_6_0/dataoneTypes.xsd');  
+INSERT INTO xml_catalog (entry_type, public_id, system_id)
+  VALUES ('Schema', 'http://ns.dataone.org/service/types/0.6.1', '/schema/D1_SCHEMA_0_6_1/dataoneTypes.xsd');  
+INSERT INTO xml_catalog (entry_type, public_id, system_id)
+  VALUES ('Schema', 'http://ns.dataone.org/service/types/0.6.2', '/schema/D1_SCHEMA_0_6_2/dataoneTypes.xsd');  
 INSERT INTO db_version (version, status, date_created) 
   VALUES ('1.10.0',1,CURRENT_DATE);
Index: src/edu/ucsb/nceas/metacat/restservice/ResourceHandler.java
===================================================================
--- src/edu/ucsb/nceas/metacat/restservice/ResourceHandler.java	(revision 6123)
+++ src/edu/ucsb/nceas/metacat/restservice/ResourceHandler.java	(revision 6124)
@@ -45,6 +45,7 @@
 import org.apache.log4j.Logger;
 import org.apache.maven.artifact.ant.shaded.IOUtil;
 import org.dataone.client.MNode;
+import org.dataone.client.ObjectFormatCache;
 import org.dataone.mimemultipart.MultipartRequest;
 import org.dataone.mimemultipart.MultipartRequestResolver;
 import org.dataone.service.NodeListParser;
@@ -538,7 +539,7 @@
                             if(params.containsKey("format"))
                             {
                                 String format = params.get("format")[0];
-                                of = ObjectFormat.convert(format);
+                                of = ObjectFormatCache.getFormat(format);
                             }
                             if(params.containsKey("time"))
                             {
@@ -575,7 +576,7 @@
                             if(params.containsKey("format"))
                             {
                                 String format = params.get("format")[0];
-                                of = ObjectFormat.convert(format);
+                                of = ObjectFormatCache.getFormat(format);
                             }
                             if(params.containsKey("eventtime"))
                             {
@@ -1164,17 +1165,20 @@
                     SystemMetadata sm = cs.getSystemMetadata(token, id);
                     
                     //set the content type
-                    if(sm.getObjectFormat().toString().trim().equals(ObjectFormat.TEXT_CSV.toString()))
+                    if(sm.getObjectFormat().toString().trim().equals(
+                    		ObjectFormatCache.getFormat("text/csv").getFmtid().getValue()))
                     {
                         response.setContentType("text/csv");
                         response.setHeader("Content-Disposition", "inline; filename=" + id.getValue() + ".csv");
                     }
-                    else if(sm.getObjectFormat().toString().trim().equals(ObjectFormat.TEXT_PLAIN.toString()))
+                    else if(sm.getObjectFormat().toString().trim().equals(
+                    		ObjectFormatCache.getFormat("text/plain").getFmtid().getValue()))
                     {
                         response.setContentType("text/plain");
                         response.setHeader("Content-Disposition", "inline; filename=" + id.getValue() + ".txt");
                     } 
-                    else if(sm.getObjectFormat().toString().trim().equals(ObjectFormat.OCTET_STREAM.toString()))
+                    else if(sm.getObjectFormat().toString().trim().equals(
+                    		ObjectFormatCache.getFormat("application/octet-stream").getFmtid().getValue()))
                     {
                         response.setContentType("application/octet-stream");
                     }
@@ -1271,7 +1275,7 @@
                     }
                     else if(name.equals("objectFormat") && value != null) 
                     {
-                        objectFormat = ObjectFormat.convert(value[0]);
+                        objectFormat = ObjectFormatCache.getFormat(value[0]);
                     }
                     else if(name.equals("replicaStatus") && value != null)
                     {
Index: src/edu/ucsb/nceas/metacat/MetaCatServlet.java
===================================================================
--- src/edu/ucsb/nceas/metacat/MetaCatServlet.java	(revision 6123)
+++ src/edu/ucsb/nceas/metacat/MetaCatServlet.java	(revision 6124)
@@ -345,7 +345,7 @@
 			ServiceService.registerService("XMLSchemaService", XMLSchemaService.getInstance());
 			
 			// register the object format service
-      //ServiceService.registerService("ObjectFormatService", ObjectFormatService.getInstance());
+      ServiceService.registerService("ObjectFormatService", ObjectFormatService.getInstance());
 
 			// check if eml201 document were corrected or not. if not, correct eml201 documents.
 			// Before Metacat 1.8.1, metacat uses tag RELEASE_EML_2_0_1_UPDATE_6 as eml
Index: src/edu/ucsb/nceas/metacat/MetacatHandler.java
===================================================================
--- src/edu/ucsb/nceas/metacat/MetacatHandler.java	(revision 6123)
+++ src/edu/ucsb/nceas/metacat/MetacatHandler.java	(revision 6124)
@@ -112,6 +112,7 @@
 import org.apache.log4j.Logger;
 import org.ecoinformatics.eml.EMLParser;
 
+import org.dataone.client.ObjectFormatCache;
 import org.dataone.eml.DataoneEMLParser;
 import org.dataone.eml.EMLDocument;
 import org.dataone.eml.EMLDocument.DistributionMetadata;
@@ -3588,23 +3589,40 @@
       Hashtable<String, Object> docInfo = IdentifierManager.getInstance().getDocumentInfo(localId);
       //set the default object format
       String doctype = (String) docInfo.get("doctype");
-      ObjectFormat format = ObjectFormat.convert(doctype);
-      if (format == null) {
-          if (doctype.trim().equals("BIN")) {
-              format = ObjectFormat.OCTET_STREAM;
-          } else {
-              format = ObjectFormat.convert("text/plain");
-          }
+      ObjectFormat format = null;
+      
+      // set the object format, fall back to defaults
+      try {
+	      format = ObjectFormatCache.getFormat(doctype);
+
+      } catch (NotFound nfe) {
+        
+        try {
+        	// format is not registered, use default
+	        if (doctype.trim().equals("BIN")) {
+	        	format = ObjectFormatCache.getFormat("application/octet-stream");
+	        
+	        } else {
+	        	format = ObjectFormatCache.getFormat("text/plain");
+	        }
+        
+        } catch (NotFound nf) {
+          logMetacat.error("There was a problem getting the default format " +
+          	"from the ObjectFormatCache: " + nf.getMessage());
+          throw nf;
+        }
+
       }
+      
       sysMeta.setObjectFormat(format);
       logMetacat.debug("The ObjectFormat for " + localId + " is " + format.toString());
       
       // further parse EML documents to get data object format,
       // describes and describedBy information
-      if ( format == ObjectFormat.EML_2_0_0 ||
-           format == ObjectFormat.EML_2_0_1 ||
-           format == ObjectFormat.EML_2_1_0 ||
-           format == ObjectFormat.EML_2_1_1 ) {
+      if ( format == ObjectFormatCache.getFormat("eml://ecoinformatics.org/eml-2.0.0") ||
+           format == ObjectFormatCache.getFormat("eml://ecoinformatics.org/eml-2.0.1") ||
+           format == ObjectFormatCache.getFormat("eml://ecoinformatics.org/eml-2.1.0") ||
+           format == ObjectFormatCache.getFormat("eml://ecoinformatics.org/eml-2.1.1") ) {
         
         try {
           DataoneEMLParser emlParser = DataoneEMLParser.getInstance();
@@ -3622,7 +3640,8 @@
             String dataDocUrl = distMetadata.url;
             String dataDocMimeType = "";
             if (distMetadata.mimeType == null) {
-                dataDocMimeType = ObjectFormat.OCTET_STREAM.name();
+                dataDocMimeType = 
+                	ObjectFormatCache.getFormat("application/octet-stream").getFmtid().getValue();
             } else {
                 dataDocMimeType = distMetadata.mimeType;
             }
@@ -3670,9 +3689,9 @@
                       
                       // set object format
                       logMetacat.debug("Updating system metadata for " + dataGuid.getValue() + " to " + dataDocMimeType);
-                      ObjectFormat f = ObjectFormat.convert(dataDocMimeType);
+                      ObjectFormat f = ObjectFormatCache.getFormat(dataDocMimeType);
                       if (f == null) {
-                    	  f = ObjectFormat.OCTET_STREAM;
+                    	  f = ObjectFormatCache.getFormat("application/octet-stream");
                       }
                       dataSysMeta.setObjectFormat(f);
                   
Index: src/edu/ucsb/nceas/metacat/service/ObjectFormatService.java
===================================================================
--- src/edu/ucsb/nceas/metacat/service/ObjectFormatService.java	(revision 6123)
+++ src/edu/ucsb/nceas/metacat/service/ObjectFormatService.java	(revision 6124)
@@ -48,6 +48,7 @@
 
 import org.dataone.client.CNode;
 import org.dataone.client.D1Client;
+import org.dataone.client.ObjectFormatCache;
 import org.dataone.service.exceptions.InsufficientResources;
 import org.dataone.service.exceptions.InvalidRequest;
 import org.dataone.service.exceptions.NotFound;
@@ -55,6 +56,7 @@
 import org.dataone.service.exceptions.ServiceFailure;
 import org.dataone.service.types.Identifier;
 import org.dataone.service.types.ObjectFormat;
+import org.dataone.service.types.ObjectFormatList;
 //import org.dataone.service.types.ObjectFormatList;
 import org.dataone.service.types.util.ServiceTypeUtil;
 import org.jibx.runtime.JiBXException;
@@ -87,7 +89,7 @@
   private String accNumber = null;
 
   /* The list of object formats */
-  //private static ObjectFormatList objectFormatList = null;
+  private static ObjectFormatList objectFormatList = null;
   
   /* the searchable map of object formats */
   private static HashMap<String, ObjectFormat> objectFormatMap = 
@@ -182,82 +184,7 @@
       throw new ServiceException(message);
     }
     
-    // For DataONE Member Nodes, get the authoritative list from the 
-    // Coordinating Node, otherwise, get the cached list
-    if ( this.nodeType.equals("mn") ) {
-      
-      /*
-       *try {
-       *  
-       *  // try to get the authoritative list remotely
-       *  D1Client d1Client = new D1Client(coordinatingNodeBaseURL);
-       *  this.cn = D1Client.getCN();
-       *  this.objectFormatList = cn.listFormats();
-       *
-       *} catch (ServiceFailure e) {
-       *  
-       *  logMetacat.debug("There was a getting the object format list from " +
-       *    "the coordinating node. The message was: " +
-       *    e.getMessage());
-       *  this.getCachedList();  
-       *  
-       *} catch (NotImplemented e) {
-       *  
-       *  logMetacat.debug("There was a getting the object format list from " +
-       *    "the coordinating node. The message was: " + e.getMessage());
-       *  this.getCachedList();  
-       *  
-       *} catch (InvalidRequest e) {
-       *  
-       *  logMetacat.debug("There was a getting the object format list from " +
-       *    "the coordinating node. The message was: " + e.getMessage());
-       *  this.getCachedList();  
-       *  
-       *} catch (NotFound e) {
-       *  
-       *  logMetacat.debug("There was a getting the object format list from " +
-       *    "the coordinating node. The message was: " + e.getMessage());
-       *  this.getCachedList();  
-       *  
-       *} catch (InsufficientResources e) {
-       *  
-       *  logMetacat.debug("There was a getting the object format list from " +
-       *    "the coordinating node. The message was: " + e.getMessage());
-       *  this.getCachedList();  
-       *  
-       *}
-       */
-      
-      // this will be replaced with external lookup code above
-      //this.getCachedList();
-      
-    } else if ( this.nodeType.equals("cn") ) {
-      
-      // get the list from the local metacat database
-      //this.getCachedList();  
-
-    } else {
-      
-      // the node type is not recognized
-      throw new ServiceException("An error occurred in initializing the " +
-        "ObjectFormatService. The DataONE node type needs to be either "  +
-        "'cn' or 'mn', but instead was: " + this.nodeType);
-    }
-    
-    // index the object format list based on the format identifier
-    //int listSize = ObjectFormatService.objectFormatList.sizeObjectFormats();
-    //
-    //for (int i = 0; i < listSize; i++ ) {
-    //  
-    //  ObjectFormat objectFormat = 
-    //    ObjectFormatService.objectFormatList.getObjectFormat(i);
-    //  String identifier = objectFormat.getFmtid();
-    //  ObjectFormatService.objectFormatMap.put(identifier, objectFormat);
-    //  
-    //}
-        
-
-    
+    this.getCachedList();  
   }
 
   /**
@@ -287,11 +214,11 @@
    * 
    * @return objectFormatList - the list of object formats
    */
-  //public ObjectFormatList listFormats() {
-  //  
-  //  return ObjectFormatService.objectFormatList;
-  //  
-  //}
+  public ObjectFormatList listFormats() {
+    
+    return ObjectFormatService.objectFormatList;
+    
+  }
   
   /**
    * Get the object format based on the given identifier as a string.
@@ -299,14 +226,14 @@
    * @param format - the object format as a string
    * @return objectFormat - the ObjectFormat represented by the format string
    */
-  //public static ObjectFormat getFormat(String format) {
-  //  
-  //  ObjectFormat objectFormat = null;
-  //  objectFormat = ObjectFormatService.objectFormatMap.get(format);
-  //  
-  //  return objectFormat;
-  //  
-  //}
+  public static ObjectFormat getFormat(String format) {
+    
+    ObjectFormat objectFormat = null;
+    objectFormat = ObjectFormatService.objectFormatMap.get(format);
+    
+    return objectFormat;
+    
+  }
   /**
    * Get the object format list cached in Metacat, or on failure, via a
    * cached file on disk
@@ -313,140 +240,74 @@
    * 
    * @return objectFormatList - the cached object format list
    */
-  //private void getCachedList()
-  //  throws ServiceException {
-  //        
-  //  try {
-  //    
-  //    // reset the accession number separator in case it is 
-  //    // different than the default
-  //    try {
-  //      
-  //      this.separator = PropertyService.getProperty("document.accNumSeparator");
-  //      
-  //    } catch ( PropertyNotFoundException pnfe ) {
-  //      
-  //      // use the default separator, but log the issue
-  //      logMetacat.debug("There was a problem finding the document " +
-  //        "separator property. The error message was: " + pnfe.getMessage());
-  //    }
-  //    
-  //    // get the latest accession number if it is in Metacat
-  //    this.rev = 
-  //      DBUtil.getLatestRevisionInDocumentTable(this.OBJECT_FORMAT_DOCID);
-  //    
-  //    if ( this.rev != -1 ) {
-  //      this.accNumber = this.OBJECT_FORMAT_DOCID + 
-  //                       this.separator + 
-  //                       this.rev;
-  //      DocumentImpl objectFormatsDocument = new DocumentImpl(accNumber, false);
-  //      ByteArrayInputStream bais = 
-  //        new ByteArrayInputStream(objectFormatsDocument.toString().getBytes());
-  //      ObjectFormatService.objectFormatList = 
-  //        this.deserializeObjectFormatList(bais);
-  //
-  //    } else {
-  //      
-  //      logMetacat.info("The latest revision number of "   + 
-  //        this.OBJECT_FORMAT_DOCID                         +
-  //        " could not be found. Reverting to the on-disk " +
-  //        "object format list");
-  //      try {
-  //        
-  //        ObjectFormatService.objectFormatList = this.getListFromDisk();
-  //      
-  //      } catch (ServiceException se) {
-  //        
-  //        throw new ServiceException(se.getMessage());
-  //      
-  //      }
-  //
-  //    }
-  //    
-  //  } catch ( SQLException sqle ) {
-  //    
-  //    // we either have a metacat error or the docid was not inserted yet
-  //    logMetacat.info("The latest revision number of "   + 
-  //      this.OBJECT_FORMAT_DOCID                         +
-  //      " could not be found. Reverting to the on-disk " +
-  //      "object format list");
-  //    
-  //    try {
-  //      
-  //      ObjectFormatService.objectFormatList = this.getListFromDisk();
-  //    
-  //    } catch (ServiceException se) {
-  //      
-  //      throw se; 
-  //      
-  //    }
-  //    
-  //  } catch (McdbException mcdbe) {
-  //    
-  //    // we have a metacat doc not found error
-  //    logMetacat.info( this.OBJECT_FORMAT_DOCID          +
-  //      " could not be found. Reverting to the on-disk " +
-  //      "object format list");
-  //    
-  //    try {
-  //      
-  //      ObjectFormatService.objectFormatList = this.getListFromDisk();
-  //    
-  //    } catch (ServiceException se) {
-  //      
-  //      throw se; 
-  //      
-  //    }
-  //    
-  //
-  //  }
-  //
-  //  return;
-  //  
-  //}
+  private void getCachedList()
+    throws ServiceException {
+          
+    try {
+      
+      // reset the accession number separator in case it is 
+      // different than the default
+      try {
+        
+        this.separator = PropertyService.getProperty("document.accNumSeparator");
+        
+      } catch ( PropertyNotFoundException pnfe ) {
+        
+        // use the default separator, but log the issue
+        logMetacat.debug("There was a problem finding the document " +
+          "separator property. The error message was: " + pnfe.getMessage());
+      }
+      
+      // get the latest accession number if it is in Metacat
+      this.rev = 
+        DBUtil.getLatestRevisionInDocumentTable(this.OBJECT_FORMAT_DOCID);
+      
+      if ( this.rev != -1 ) {
+        this.accNumber = this.OBJECT_FORMAT_DOCID + 
+                         this.separator + 
+                         this.rev;
+        DocumentImpl objectFormatsDocument = new DocumentImpl(accNumber, false);
+        ByteArrayInputStream bais = 
+          new ByteArrayInputStream(objectFormatsDocument.toString().getBytes());
+        ObjectFormatService.objectFormatList = 
+          this.deserializeObjectFormatList(bais);
+  
+      } else {
+        
+        logMetacat.info("The latest revision number of "   + 
+          this.OBJECT_FORMAT_DOCID                         +
+          " could not be found. Reverting to the on-disk " +
+          "object format list");
+          
+        ObjectFormatService.objectFormatList = ObjectFormatCache.listFormats();
+      }
+      
+    } catch ( SQLException sqle ) {
+      
+      // we either have a metacat error or the docid was not inserted yet
+      logMetacat.info("The latest revision number of "   + 
+        this.OBJECT_FORMAT_DOCID                         +
+        " could not be found. Reverting to the on-disk " +
+        "object format list");
+        
+      ObjectFormatService.objectFormatList = ObjectFormatCache.listFormats();
+      
+    } catch (McdbException mcdbe) {
+      
+      // we have a metacat doc not found error
+      logMetacat.info( this.OBJECT_FORMAT_DOCID          +
+        " could not be found. Reverting to the on-disk " +
+        "object format list");
+      
+      ObjectFormatService.objectFormatList = ObjectFormatCache.listFormats();
+  
+    }
+  
+    return;
+    
+  }
 
   /**
-   * Get the object format list cached on disk as stated in the metacat
-   * properties file.
-   * 
-   * @return objectFormatList - the on-disk object format list
-   * @throws ServiceException
-   */
-  //private ObjectFormatList getListFromDisk() 
-  //  throws ServiceException {
-  //  
-  //  // the filesystem location of the object format list xml file
-  //  String objectFormatFilePath = null;
-  //  
-  //  // get the object format list from disk and parse it
-  //  try {
-  //    objectFormatFilePath = SystemUtil.getContextDir() + "/WEB-INF/" +
-  //      PropertyService.getProperty("dataone.objectFormatListName");
-  //          
-  //    FileInputStream fileInputStream = new FileInputStream(objectFormatFilePath);         
-  //
-  //    ObjectFormatService.objectFormatList = 
-  //      this.deserializeObjectFormatList(fileInputStream);
-  //
-  //  } catch (PropertyNotFoundException pnfe) {
-  //    
-  //    logMetacat.error("The object format list file could not be parsed. " +
-  //      "The error message was: " + pnfe.getMessage());
-  //    throw new ServiceException(pnfe.getMessage());
-  //    
-  //  } catch ( FileNotFoundException fnfe ) {
-  //    
-  //    logMetacat.debug("There was an error reading the file " +
-  //      objectFormatFilePath + ". The error was: "            +
-  //      fnfe.getMessage());
-  //    throw new ServiceException(fnfe.getMessage());
-  //        
-  //  }
-  //  
-  //  return ObjectFormatService.objectFormatList;
-  //}
-
-  /**
    * Deserialize the object format list file to an object format list object
    * 
    * @param fileInputStream - the file input stream of the XML object format list file
@@ -453,23 +314,23 @@
    * @return objectFormatList - the ObjectFormatList object from the XML stream
    * @throws ServiceException
    */
-  //private ObjectFormatList deserializeObjectFormatList(InputStream inputStream) 
-  //  throws ServiceException {
-  //  
-  //  ObjectFormatList objectFormatList;
-  //  try {
-  //    objectFormatList = (ObjectFormatList)
-  //    ServiceTypeUtil.deserializeServiceType(ObjectFormatList.class, inputStream);
-  //  
-  //  } catch ( JiBXException jbxe ) {
-  //    
-  //    logMetacat.debug("There was an error deserializing the input stream. " +
-  //      "The error was: " + jbxe.getMessage());
-  //    jbxe.printStackTrace();
-  //    throw new ServiceException(jbxe.getMessage());
-  //  }
-  //  
-  //  return objectFormatList;
-  //}
+  private ObjectFormatList deserializeObjectFormatList(InputStream inputStream) 
+    throws ServiceException {
+    
+    ObjectFormatList objectFormatList;
+    try {
+      objectFormatList = (ObjectFormatList)
+      ServiceTypeUtil.deserializeServiceType(ObjectFormatList.class, inputStream);
+    
+    } catch ( JiBXException jbxe ) {
+      
+      logMetacat.debug("There was an error deserializing the input stream. " +
+        "The error was: " + jbxe.getMessage());
+      jbxe.printStackTrace();
+      throw new ServiceException(jbxe.getMessage());
+    }
+    
+    return objectFormatList;
+  }
   
 }
\ No newline at end of file
Index: src/edu/ucsb/nceas/metacat/util/MetacatPopulator.java
===================================================================
--- src/edu/ucsb/nceas/metacat/util/MetacatPopulator.java	(revision 6123)
+++ src/edu/ucsb/nceas/metacat/util/MetacatPopulator.java	(revision 6124)
@@ -43,6 +43,7 @@
 import org.apache.commons.io.IOUtils;
 import org.dataone.client.D1Client;
 import org.dataone.client.MNode;
+import org.dataone.client.ObjectFormatCache;
 import org.dataone.eml.DataoneEMLParser;
 import org.dataone.eml.EMLDocument;
 import org.dataone.eml.EMLDocument.DistributionMetadata;
@@ -180,7 +181,7 @@
                     SystemMetadata dataDocSysMeta = generateSystemMetadata(doc);
                     //overwrite the bogus values from the last call 
                     dataDocSysMeta.setIdentifier(did);
-                    dataDocSysMeta.setObjectFormat(ObjectFormat.convert(dataDocMimeType));
+                    dataDocSysMeta.setObjectFormat(ObjectFormatCache.getFormat(dataDocMimeType));
                     Checksum checksum = new Checksum();
                     dataDocIs = stringToStream(dataDocText);
                     ChecksumAlgorithm ca = ChecksumAlgorithm.convert("MD5");
@@ -272,16 +273,16 @@
         sm.setIdentifier(id);
         
         //set the object format
-        ObjectFormat format = ObjectFormat.convert(doc.doctype);
+        ObjectFormat format = ObjectFormatCache.getFormat(doc.doctype);
         if(format == null)
         {
             if(doc.doctype.trim().equals("BIN"))
             {
-                format = ObjectFormat.OCTET_STREAM;
+                format = ObjectFormatCache.getFormat("application/octet-stream");
             }
             else
             {
-                format = ObjectFormat.TEXT_PLAIN;
+                format = ObjectFormatCache.getFormat("text/plain");
             }
         }
         sm.setObjectFormat(format);
Index: src/edu/ucsb/nceas/metacat/dataone/CNCoreImpl.java
===================================================================
--- src/edu/ucsb/nceas/metacat/dataone/CNCoreImpl.java	(revision 6123)
+++ src/edu/ucsb/nceas/metacat/dataone/CNCoreImpl.java	(revision 6124)
@@ -27,7 +27,7 @@
 import java.util.Timer;
 
 import org.apache.log4j.Logger;
-import org.dataone.service.cn.tier1.CNCore;
+import org.dataone.service.cn.CNCore;
 import org.dataone.service.exceptions.IdentifierNotUnique;
 import org.dataone.service.exceptions.InsufficientResources;
 import org.dataone.service.exceptions.InvalidRequest;
@@ -43,6 +43,8 @@
 import org.dataone.service.types.Log;
 import org.dataone.service.types.NodeList;
 import org.dataone.service.types.ObjectFormat;
+import org.dataone.service.types.ObjectFormatIdentifier;
+import org.dataone.service.types.ObjectFormatList;
 import org.dataone.service.types.Session;
 import org.dataone.service.types.SystemMetadata;
 import org.joda.time.DateTime;
@@ -129,19 +131,20 @@
         return true;
     }
 
-	@Override
-	public ObjectFormat getFormat(Identifier arg0) throws InvalidRequest,
-			ServiceFailure, NotFound, InsufficientResources, NotImplemented {
-		// TODO Auto-generated method stub
-		return null;
-	}
 
-	@Override
-	public Log getLogRecords(DateTime arg0, DateTime arg1, Event arg2)
-			throws InvalidToken, InvalidRequest, ServiceFailure, NotAuthorized,
-			NotImplemented {
-		// TODO Auto-generated method stub
-		return null;
+  @Override
+  public Log getLogRecords(Session arg0, DateTime arg1, DateTime arg2,
+    Event arg3) throws InvalidToken, InvalidRequest, ServiceFailure,
+    NotAuthorized, NotImplemented {
+  	  // TODO Auto-generated method stub
+  	  return null;
+    }
+   @Override
+	 public ObjectFormat getFormat(ObjectFormatIdentifier arg0) 
+	   throws InvalidRequest, ServiceFailure, NotFound, InsufficientResources, 
+	   NotImplemented {
+		 // TODO Auto-generated method stub
+		 return null;
 	}
 
 	@Override
@@ -150,5 +153,12 @@
 		return null;
 	}
 
+	@Override
+  public ObjectFormatList listFormats() throws InvalidRequest, ServiceFailure,
+    NotFound, InsufficientResources, NotImplemented {
+	  // TODO Auto-generated method stub
+	  return null;
+  }
+
 }
 
Index: src/edu/ucsb/nceas/metacat/IdentifierManager.java
===================================================================
--- src/edu/ucsb/nceas/metacat/IdentifierManager.java	(revision 6123)
+++ src/edu/ucsb/nceas/metacat/IdentifierManager.java	(revision 6124)
@@ -35,6 +35,8 @@
 import java.util.Vector;
 
 import org.apache.log4j.Logger;
+import org.dataone.client.ObjectFormatCache;
+import org.dataone.service.exceptions.NotFound;
 import org.dataone.service.types.AccessPolicy;
 import org.dataone.service.types.AccessRule;
 import org.dataone.service.types.Checksum;
@@ -42,6 +44,7 @@
 import org.dataone.service.types.Identifier;
 import org.dataone.service.types.NodeReference;
 import org.dataone.service.types.ObjectFormat;
+import org.dataone.service.types.ObjectFormatIdentifier;
 import org.dataone.service.types.ObjectInfo;
 import org.dataone.service.types.ObjectList;
 import org.dataone.service.types.Permission;
@@ -127,7 +130,18 @@
         Subject submitterSubject = new Subject();
         submitterSubject.setValue(submitter);
         sysMeta.setSubmitter(submitterSubject);
-        sysMeta.setObjectFormat(ObjectFormat.convert(objectFormat));
+        try {
+	        sysMeta.setObjectFormat(ObjectFormatCache.getFormat(objectFormat));
+        } catch (NotFound nfe) {
+          logMetacat.error("The objectFormat " + objectFormat +
+          	" is not registered. Setting the default format.");
+          ObjectFormat of = new ObjectFormat();
+          ObjectFormatIdentifier fmtid = new ObjectFormatIdentifier();
+          fmtid.setValue("application/octet-stream");
+          of.setFmtid(fmtid);
+          of.setFormatName("Octet Stream");
+          sysMeta.setObjectFormat(of);
+        }
         sysMeta.setSize(size);
         
         return sysMeta;
@@ -276,7 +290,18 @@
                 Subject submitterSubject = new Subject();
                 submitterSubject.setValue(submitter);
                 sysMeta.setSubmitter(submitterSubject);
-                sysMeta.setObjectFormat(ObjectFormat.convert(objectFormat));
+                try {
+        	        sysMeta.setObjectFormat(ObjectFormatCache.getFormat(objectFormat));
+                } catch (NotFound nfe) {
+                  logMetacat.error("The objectFormat " + objectFormat +
+                  	" is not registered. Setting the default format.");
+                  ObjectFormat of = new ObjectFormat();
+                  ObjectFormatIdentifier fmtid = new ObjectFormatIdentifier();
+                  fmtid.setValue("application/octet-stream");
+                  of.setFmtid(fmtid);
+                  of.setFormatName("Octet Stream");
+                  sysMeta.setObjectFormat(of);
+                }
                 sysMeta.setSize(size);
                 
                 stmt.close();
@@ -1286,7 +1311,6 @@
     	List<XMLAccessDAO> accessDAOs = new ArrayList<XMLAccessDAO>();
         for (AccessRule accessRule: accessPolicy.getAllowList()) {
         	List<Subject> subjects = accessRule.getSubjectList();
-        	List<Identifier> resources = accessRule.getResourceList();
         	List<Permission> permissions = accessRule.getPermissionList();
         	for (Subject subject: subjects) {
     			XMLAccessDAO accessDAO = new XMLAccessDAO();
@@ -1572,7 +1596,7 @@
                 //cs.setAlgorithm(ChecksumAlgorithm.convert(checksumAlgorithm));
                 oi.setChecksum(cs);
                 
-                ObjectFormat oFormat = ObjectFormat.convert(format);
+                ObjectFormat oFormat = ObjectFormatCache.getFormat(format);
                 if(oFormat != null)
                 {
                     oi.setObjectFormat(oFormat);
@@ -1579,7 +1603,7 @@
                 }
                 else
                 { //if there is no object format, just default to text/plain
-                    oi.setObjectFormat(ObjectFormat.OCTET_STREAM);
+                    oi.setObjectFormat(ObjectFormatCache.getFormat("application/octet-stream"));
                 }
                                 
                 oi.setSize(size);
Index: build.xml
===================================================================
--- build.xml	(revision 6123)
+++ build.xml	(revision 6124)
@@ -185,7 +185,7 @@
 		<property name="eml2_0_1-schema-tag" value="RELEASE_EML_2_0_1" />
 		<property name="eml2_1_0-schema-tag" value="RELEASE_EML_2_1_0" />
 		<property name="eml2_1_1-schema-tag" value="RELEASE_EML_2_1_1_RC_2" />
-		<property name="dataone-schema-tag" value="D1_SCHEMA_0_6_1" />
+		<property name="dataone-schema-tag" value="D1_SCHEMA_0_6_2" />
 		<property name="eml2-style-tag" value="RELEASE_EML_UTILS_1_0_0_RC12" />
 		<property name="eml2_0_0namespace"
 			value="eml://ecoinformatics.org/eml-2.0.0" />
@@ -1592,7 +1592,7 @@
          sibling of the current build directory. Requires maven2 to
          be installed and on the path. -->
     <target name="dataone-service" if="d1.available">
-        <property name="d1.jar" value="d1_common_java-0.5.0.jar"/>
+        <property name="d1.jar" value="d1_common_java-0.6.2-SNAPSHOT.jar"/>
         <artifact:mvn pom="${d1.dir}/pom.xml" fork="true"
                       mavenHome="${maven.home}">
             <arg value="install"/>
Index: .
===================================================================
--- .	(revision 6123)
+++ .	(revision 6124)

Property changes on: .
___________________________________________________________________
Added: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /branches/D1_0_6_2_BRANCH:r6107-6121
