Revision 6092
Added by Matt Jones almost 13 years ago
CrudService.java | ||
---|---|---|
84 | 84 |
import org.dataone.service.types.NodeReference; |
85 | 85 |
import org.dataone.service.types.ObjectFormat; |
86 | 86 |
import org.dataone.service.types.ObjectList; |
87 |
import org.dataone.service.types.Principal;
|
|
87 |
import org.dataone.service.types.Subject;
|
|
88 | 88 |
import org.dataone.service.types.SystemMetadata; |
89 | 89 |
import org.dataone.service.types.util.ServiceTypeUtil; |
90 | 90 |
|
... | ... | |
1292 | 1292 |
NodeReference memberNode = new NodeReference(); |
1293 | 1293 |
memberNode.setValue(ipAddress); |
1294 | 1294 |
le.setMemberNode(memberNode); |
1295 |
Principal princ = new Principal();
|
|
1295 |
Subject princ = new Subject();
|
|
1296 | 1296 |
princ.setValue(principal); |
1297 |
le.setPrincipal(princ);
|
|
1297 |
le.setSubject(princ);
|
|
1298 | 1298 |
le.setUserAgent("metacat/RESTService"); |
1299 | 1299 |
|
1300 | 1300 |
if(event == null) |
... | ... | |
2177 | 2177 |
sm.setSize(sizeOfStream(is)); |
2178 | 2178 |
|
2179 | 2179 |
//submitter |
2180 |
Principal p = new Principal();
|
|
2180 |
Subject p = new Subject();
|
|
2181 | 2181 |
p.setValue((String) docInfo.get("user_owner")); |
2182 | 2182 |
sm.setSubmitter(p); |
2183 | 2183 |
sm.setRightsHolder(p); |
Also available in: Unified diff
Modified Metacat to build against the D1_SCHEMA_0_6_1 branch of the dataone schemas by incorporating the 0.6.1-SNAPSHOT version of d1_common and d1_libclient libraries, and refactoring Metacat code references to the d1 schema changed types.