| Revision:
  • svn:ignore: build
  • svn:mergeinfo: /branches/D1_0_6_2_BRANCH:6107-6121

# Date Author Comment
9457 12/16/2015 04:37 PM ben leinfelder

merge from 2.0 branch: initialize mock cn for test to run successfully.

9455 12/16/2015 02:58 PM ben leinfelder

merge from branch: only check for d1 rightsholder when checking permissions in original metacat code base, otherwise legacy access control tests in metcat begin to fail.

9452 12/16/2015 09:58 AM ben leinfelder

include check for d1 rightsholder when checking permissions in original metacat code base.

9451 12/11/2015 11:56 AM Jing Tao

Change the version to 2.6.0

9450 12/11/2015 11:53 AM Jing Tao

Set the metacat to 2.6.0 and add the db upgrade scripts.

9449 12/11/2015 11:50 AM Jing Tao

Add the sql file for the upgrading.

9448 12/11/2015 11:45 AM ben leinfelder

merge jing's commit from the 2.5 branch to include the 2.5.1 upgrade utility in properties file.

9446 12/09/2015 03:48 PM Jing Tao

Removed the jar file since it is replaced by the jar file from the maven.

9443 12/09/2015 07:59 AM ben leinfelder

merge from 2.5.x branch: neglected to replace solr schema during 2.5.0 upgrade - this will do it for 2.5.1.

9441 12/08/2015 04:49 PM Jing Tao

Escape the user names, group name and other information in the xml format.

9439 12/08/2015 04:18 PM Jing Tao

Change the metacatui to 1.8.1

9437 12/07/2015 02:06 PM Jing Tao

Add the keyword "select" into the list.

9435 12/02/2015 04:31 PM Jing Tao

Reset the xml_catalog_id sequence value to the max value of the table.

9427 11/24/2015 01:51 PM ben leinfelder

merge from branch: use hash for latest solr schema

9425 11/19/2015 11:44 AM ben leinfelder

add checks on archived flag to avoid NPE.

9424 11/19/2015 08:44 AM ben leinfelder

only consult fields to merge if there was an existing referenced doc

9422 11/18/2015 09:56 PM ben leinfelder

remove "al" prefix from subquery since we are only querying one table and do not need to use a prefix.

9421 11/18/2015 09:12 PM ben leinfelder

added 4 new schema fields so need to account for them in the test case.

9420 11/18/2015 04:41 PM ben leinfelder

subclass AnnotatorSubprocessor for use in metacat-index (uses embedded solr server and solrj for retrieving/merging existing documents).

9419 11/18/2015 04:03 PM ben leinfelder

bump trunk to 2.6.0-SNAPSHOT and pull in d1 dependencies at 2.1.0-SNAPSHOT to continue trunk development.

9416 11/18/2015 11:26 AM ben leinfelder

merge from 2.5 branch

9411 11/18/2015 10:33 AM ben leinfelder

add fileName, mediaType and mediaTypeProperties to solr schema and v2 system metadata processor

9410 11/17/2015 03:41 PM ben leinfelder

merge from 2.5 branch: use subquery to do paging before joining to identifier table.

9408 11/16/2015 04:51 PM Jing Tao

Add more statement to debug the query performance.

9406 11/16/2015 02:24 PM ben leinfelder

refactor v2 context bean to use the v1 pattern used in metacat

9405 11/16/2015 02:21 PM ben leinfelder

include seriesId in solr schema and context file (v2 system metadata)

9404 11/16/2015 11:33 AM ben leinfelder

rollback to use entity/attribute id for the tab-pane (so it will work) and include new div id for the annotatable attribute section.

9403 11/13/2015 11:51 AM ben leinfelder

restructure attribute and party sections so that the annotatable div does not have DOM children.

9402 11/10/2015 04:09 PM Lauren Walker

Mrge from 2.5 branch: Clean up the admin and doc page styles, update all the screenshot images, and include a link to the MetacatUI Github

9391 11/03/2015 02:36 PM ben leinfelder

Use conditional method for retrieving server URL (http vs https). When metacat is configured to force SSL communication we get the https url, otherwise we get http. this allows us to use the DBTransform on localhosts that are not using SSL.

9390 11/03/2015 12:31 PM ben leinfelder

add section for CN vs MN endpoints for MetacatUI.

9389 11/03/2015 11:27 AM Jing Tao

Fixed a bug that the publish method should throw an io exception.

9388 11/03/2015 11:22 AM ben leinfelder

use stable EZID 1.0.1 release tag for dependency.

9387 11/02/2015 04:44 PM Lauren Walker

Move the editScienceMetadata method to the MNodeService class - only update packageId in EML on publish()

9386 11/02/2015 02:34 PM ben leinfelder

update documentation to reference Tomcat 7, Java 7 and newer apache config file name conventions.

9385 10/29/2015 06:59 PM Jing Tao

Fixed a bug in the condition check for the archive field in the updateSystemMetadata method.

9384 10/29/2015 04:00 PM Jing Tao

The archived field can't be reset to false if it is true in the systemMetadataChanged method.

9383 10/29/2015 03:56 PM Jing Tao

Doesn't allow to reset the archived field to be false if the field is true in the updateSystemMetadata method.

9382 10/28/2015 11:14 AM Jing Tao

In the systemMetadataChanged method, we will update system metadata when the local serial version is less than or equals the comming one.

9381 10/27/2015 04:09 PM Jing Tao

In order to make jenkins work, switch back to maven.

9380 10/27/2015 03:42 PM rnahf

refs #7453: modified the metacatLog message from mn.synchronizationFailed to include the syncFailed.message field. Also increased the log level to WARN.

9379 10/23/2015 11:59 AM Jing Tao

Change the maven home to maven2 which is more popular.

9378 10/22/2015 04:28 PM Jing Tao

Rearrange some test cases.

9377 10/22/2015 04:09 PM Jing Tao

Add a new test to test the checksum matching for mn.update.

9376 10/22/2015 12:15 PM Jing Tao

Remove the method editScienceMetadata from the update method. This method will add a packageId attribute into the eml document. Lauren will add the method to the publish method.

9375 10/21/2015 04:52 PM Jing Tao

In the systemMetadataChanged method, the object will be archived if the new archive value is true and old value is false.
The log event is recorded in the systemMetadataChanged method as well.

9374 10/21/2015 03:31 PM Jing Tao

Make the isAuthoritativeNode throw exception if some value is null.

9373 10/20/2015 04:11 PM Jing Tao

In the updateSystemMetadata method, we avoid to log the event twice for archive=true.

9372 10/20/2015 04:08 PM Jing Tao

In the hasReservation method, it doesn't throw the IdentifierNotUnqiue exception.

9371 10/20/2015 02:34 PM Jing Tao

In the setReplicationStatus method, it only notified the replicas when the status is completed. Now we added the status - failed and invalid.

9370 10/20/2015 11:16 AM ben leinfelder

use idFilter for v2 getLogRecords() to match v2 API definition.

9369 10/19/2015 12:01 PM ben leinfelder

include property.

9368 10/16/2015 08:22 PM Jing Tao

Add the code to print the exception.

9367 10/14/2015 01:15 PM rnahf

refs #7419: refactored CNodeService implementations to not throw IdentifierNotUnique for hasReservation.

9366 10/09/2015 03:24 PM Jing Tao

Change the text content for the testing.

9365 10/09/2015 02:42 PM Jing Tao

Use the create method to replace registerSystemMetadata method.

9364 10/09/2015 01:55 PM Jing Tao

Use the MN.updateSystemMetadata to replace CN.updateSystemMetadata.

9363 10/09/2015 12:26 PM Jing Tao

In the reindex method, the error message will be sent back.

9362 10/02/2015 04:36 PM Jing Tao

In the create method, the modification date is reset only on the objects whose authoritative member node is v1.

9361 10/02/2015 04:16 PM Jing Tao

In the deleteReplicationMetadata method, the modification date of the system metadata will not be reset.

9360 10/02/2015 04:09 PM Jing Tao

Modify the text of an exception.

9359 10/02/2015 03:53 PM Jing Tao

Add contrains for the v1/v2.registerSystemMetadata method. See

9358 10/02/2015 10:23 AM Jing Tao

Adjust the test code base on the new contrains on setRightHolder, archive. The new contrains is they only apply to the objects whose authoriative node is v1.

9357 10/02/2015 10:20 AM Jing Tao

For the v1/v2 setObsoletedBy and setRightsHolder method, they only apply the objects whose authoriative member node is v1.

9356 10/02/2015 08:55 AM Jing Tao

Add the constrains that v1/v2.archive only applies the object whose authoritative node is a v1 node.

9355 10/01/2015 05:35 PM Jing Tao

Adjust code according the change on cn.updateSystemMetadata.

9354 10/01/2015 05:33 PM Jing Tao

Add the case the mn.updateSystemMetadata and cn.updateSystemMetadata will call the archive method internally.

9353 10/01/2015 03:01 PM Jing Tao

Refactory the mn.archive and cn.archive method so the mn.update and cn.update can reuse them.

9352 10/01/2015 02:23 PM Lauren Walker

Update the packageId attribute in EML documents on update. Never display the local docid in the rendered EML.

9351 10/01/2015 12:30 PM Jing Tao

Add the testArchive method.

9350 10/01/2015 12:30 PM Jing Tao

In the archive method, add the lock.

9349 10/01/2015 10:39 AM ben leinfelder

check for auth before doing asynch call to MN dirtySysMeta implementation

9348 09/30/2015 05:03 PM Jing Tao

Adjusted the testSetAccessPolicy method.

9347 09/30/2015 05:01 PM Jing Tao

Only applies the setAccessPolicy method to objects whose authoritative mn is v1.

9346 09/30/2015 04:39 PM Jing Tao

Adjust the testReplicationPolicy method.

9345 09/30/2015 04:38 PM Jing Tao

Add a comment to specify that the setReplicationPolicy only applys to v1.

9344 09/30/2015 04:27 PM Jing Tao

Uncommented some code.

9343 09/30/2015 04:07 PM Jing Tao

The setReplicationPolicy method only apply to the pids whose authoritative member node has v2 MNStorage.

9342 09/30/2015 11:55 AM Jing Tao

Add the code to check if the serialVersion object is null before it is saved to the db.

9341 09/29/2015 10:14 AM ben leinfelder

add missing quotation mark

9340 09/28/2015 01:47 PM Jing Tao

Add a flag on the systemMetadataChanged method. If it is true, the authoritative member node will only accepts the serial version and replica list; the replica node accepts everything. If it is false, it will accept everything.

9339 09/28/2015 10:01 AM Jing Tao

Add a note for the updateSystemMetadata method.

9338 09/25/2015 05:17 PM Jing Tao

Add a test to test the cn.updateSystemMetadata will ignore the serial version and replica list from the coming system metadata.

9337 09/25/2015 02:55 PM Jing Tao

CN.updateSystemMetadata will ignore the serial version and replica list in the comming system metadata from the mn.

9336 09/24/2015 05:21 PM Jing Tao

Change the test method for the updateSystemMetadata method.

9335 09/24/2015 04:58 PM Jing Tao

Add the code to check the date of system metadata modification match in MN.updateSystemMetadata only. CN.updateSystemMetadata doesn't check.

9334 09/24/2015 02:51 PM ben leinfelder

fix compilation error for previous change: include isPublic criteria when there is a public subject (which is always).

9333 09/24/2015 01:59 PM ben leinfelder

use request query string first when handling MN.query() method.

9332 09/24/2015 01:35 PM ben leinfelder

fix xpath from CN changes for isPublic.

9331 09/24/2015 01:18 PM ben leinfelder

include isPublic criteria when there is a public subject (which is always)

9330 09/24/2015 10:34 AM ben leinfelder

include hierarchical permissions when evaluating isPublic during indexing.

9329 09/23/2015 03:35 PM Jing Tao

Commented out the code to check serial version on the updateSystemMetadata method.

9328 09/23/2015 12:00 PM Jing Tao

Add more debug messages for the isCNAdmin method.

9327 09/21/2015 04:37 PM Jing Tao

Put a the systemMetadataChanged method into a queue, so it will not hold the block.

9326 09/16/2015 12:57 PM Chris Jones

Change updateReplicationMetadata() and setReplicationStatus() to no longer set the dateSysmetaModified date per our discussion on 9/16/15.

9325 09/16/2015 10:04 AM Jing Tao

Add more debug statement for the updateSystemMetadata method.

9324 09/15/2015 04:16 PM Jing Tao

In the getLog method, if the event is null, we will set it unknown.

9323 09/15/2015 03:51 PM Jing Tao

If the event string is null, we will skip this log in the getLog method.

9322 09/15/2015 03:15 PM Jing Tao

Add the code to check if we can't get the current system metadata from the node in the mn.systemMetadataChanged method.
If we can't find it, an InvalidRequest will be thrown.

9321 09/10/2015 09:47 AM Jing Tao

Fixed a bug that a client can set the original member node to be null.