Revision 8810
Added by ben leinfelder over 9 years ago
| SyncAccessPolicy.java | ||
|---|---|---|
| 40 | 40 |
import java.util.concurrent.Executors; |
| 41 | 41 |
|
| 42 | 42 |
import org.apache.log4j.Logger; |
| 43 |
import org.dataone.client.CNode; |
|
| 44 |
import org.dataone.client.D1Client; |
|
| 43 |
import org.dataone.client.v2.CNode;
|
|
| 44 |
import org.dataone.client.v2.itk.D1Client;
|
|
| 45 | 45 |
import org.dataone.service.exceptions.InvalidRequest; |
| 46 | 46 |
import org.dataone.service.exceptions.InvalidToken; |
| 47 | 47 |
import org.dataone.service.exceptions.NotAuthorized; |
| ... | ... | |
| 58 | 58 |
import org.dataone.service.types.v1.Permission; |
| 59 | 59 |
import org.dataone.service.types.v1.Session; |
| 60 | 60 |
import org.dataone.service.types.v1.Subject; |
| 61 |
import org.dataone.service.types.v1.SystemMetadata;
|
|
| 61 |
import org.dataone.service.types.v2.SystemMetadata;
|
|
| 62 | 62 |
|
| 63 | 63 |
import edu.ucsb.nceas.metacat.AccessionNumberException; |
| 64 | 64 |
import edu.ucsb.nceas.metacat.IdentifierManager; |
| ... | ... | |
| 149 | 149 |
|
| 150 | 150 |
// Get sm, access policy for requested pid from the CN |
| 151 | 151 |
try {
|
| 152 |
cnSysMeta = cn.getSystemMetadata(pid); |
|
| 152 |
cnSysMeta = cn.getSystemMetadata(null, pid);
|
|
| 153 | 153 |
} catch (Exception e) {
|
| 154 | 154 |
logMetacat.error("Error getting system metadata for pid: "
|
| 155 | 155 |
+ pid.getValue() + " from cn: " + e.getMessage()); |
Also available in: Unified diff
add support for v2 DataONE API.