Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Get Deposit application running against f4 #538

Merged
merged 17 commits into from Nov 17, 2016
Merged

Get Deposit application running against f4 #538

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
2b94f56
Added new context files to bring the deposit service online with fcre…
bbpennel Oct 27, 2016
49705ab
Added ContentRootObject for base object in the content tree. Added l…
bbpennel Nov 2, 2016
efefb61
Added repository initializer which sets up base objects for the repo.…
bbpennel Nov 2, 2016
07950bc
Added new ingest jobs into pipeline
bbpennel Nov 2, 2016
e4229bd
Fixed bug with FilePremisLogger where getEvents results would not inc…
bbpennel Nov 7, 2016
0238789
Added missing constructors to IngestDepositRecordJob and fixed log st…
bbpennel Nov 7, 2016
f82b1b1
Forcing fedora base to end with a /, parsing etags
bbpennel Nov 7, 2016
7f480b6
Added isUnmodified helper method to repository objects so that subcla…
bbpennel Nov 10, 2016
bd255d7
Added missing constructors for file availability job
bbpennel Nov 10, 2016
2715a19
Added main log4j file for deposit app and turned up test logging level
bbpennel Nov 10, 2016
a00df3e
Added logging to ingest content job to indicate progress. Fixed retr…
bbpennel Nov 10, 2016
0bae7d8
Added staging policy manager to spring context and injecting into ing…
bbpennel Nov 10, 2016
4ffacee
Updated test staging configuration for new reduced structure and fixe…
bbpennel Nov 10, 2016
168a482
Fixed typo in failure message
bbpennel Nov 16, 2016
905e468
Removed fcrepo3 context file for deposit app and renamed fcrepo4 to b…
bbpennel Nov 17, 2016
be927d3
Fixed comments and return on content root creation method
bbpennel Nov 17, 2016
0aac666
Added missing headers for Repo init IT
bbpennel Nov 17, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
View file
Open in desktop
Expand Up @@ -20,4 +20,5 @@ static/css/cdr_admin.css
static/js/cdr-access.js
static/css/cdr_access.css
*.log
dump.rdb
dump.rdb
authorized_keys
1 change: 0 additions & 1 deletion deposit/pom.xml
View file
Open in desktop
Expand Up @@ -184,7 +184,6 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.3.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>gov.loc</groupId>
Expand Down
2 changes: 1 addition & 1 deletion deposit/src/main/java/edu/unc/lib/deposit/DepositDaemon.java
View file
Open in desktop
Expand Up @@ -31,7 +31,7 @@ public void init(DaemonContext daemonContext) throws DaemonInitException, Except
public void start() throws Exception {
LOG.info("Starting the Deposit Daemon");
if(appContext == null) {
appContext = new ClassPathXmlApplicationContext(new String[] {"service-context.xml"});
appContext = new ClassPathXmlApplicationContext(new String[] {"fcrepo4-service-context.xml", "deposit-jobs-context.xml", "fcrepo-clients-context.xml"});
appContext.registerShutdownHook();
} else {
appContext.refresh();
Expand Down
2 changes: 1 addition & 1 deletion deposit/src/main/java/edu/unc/lib/deposit/normalize/AbstractFileServerToBagJob.java
View file
Open in desktop
Expand Up @@ -24,7 +24,7 @@
import java.util.Map;
import java.util.UUID;

import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import org.codehaus.jackson.JsonNode;
import org.codehaus.jackson.map.ObjectMapper;
import org.jdom2.Document;
Expand Down
15 changes: 5 additions & 10 deletions deposit/src/main/java/edu/unc/lib/deposit/work/DepositEmailHandler.java
View file
Open in desktop
Expand Up @@ -22,12 +22,7 @@
import com.hp.hpl.jena.rdf.model.Model;
import com.samskivert.mustache.Template;

import edu.unc.lib.dl.acl.util.AccessGroupConstants;
import edu.unc.lib.dl.acl.util.AccessGroupSet;
import edu.unc.lib.dl.acl.util.ObjectAccessControlsBean;
import edu.unc.lib.dl.acl.util.UserRole;
import edu.unc.lib.dl.fcrepo4.PIDs;
import edu.unc.lib.dl.fedora.FedoraAccessControlService;
import edu.unc.lib.dl.fedora.PID;
import edu.unc.lib.dl.util.DepositStatusFactory;
import edu.unc.lib.dl.util.RedisWorkerConstants.DepositField;
Expand All @@ -54,8 +49,8 @@ public class DepositEmailHandler {
@Autowired
private Dataset dataset;

@Autowired
private FedoraAccessControlService accessControlService;
//@Autowired
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I should have put a comment in here, but this stuff is basically commented out as a reminder until we have access control worked out

//private FedoraAccessControlService accessControlService;

protected DepositStatusFactory getDepositStatusFactory() {
return depositStatusFactory;
Expand Down Expand Up @@ -199,9 +194,9 @@ private void sendCompleted(String depositUUID) {
objectPid = status.get(DepositField.containerId.name());
}

ObjectAccessControlsBean accessControls = accessControlService.getObjectAccessControls(PIDs.get(objectPid));
Date embargoUntil = accessControls.getLastActiveEmbargoUntilDate();
boolean hasPatronRoleForPublicGroup = accessControls.getRoles(new AccessGroupSet(AccessGroupConstants.PUBLIC_GROUP)).contains(UserRole.patron);
//ObjectAccessControlsBean accessControls = accessControlService.getObjectAccessControls(PIDs.get(objectPid));
Date embargoUntil = null; //accessControls.getLastActiveEmbargoUntilDate();
boolean hasPatronRoleForPublicGroup = true; //accessControls.getRoles(new AccessGroupSet(AccessGroupConstants.PUBLIC_GROUP)).contains(UserRole.patron);

Map<String, Object> data = new HashMap<String, Object>();
data.putAll(status);
Expand Down
94 changes: 0 additions & 94 deletions deposit/src/main/java/edu/unc/lib/deposit/work/DepositMessageHandler.java
View file
Open in desktop

This file was deleted.

21 changes: 8 additions & 13 deletions deposit/src/main/java/edu/unc/lib/deposit/work/DepositSupervisor.java
View file
Open in desktop
Expand Up @@ -15,15 +15,6 @@
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;

import net.greghaines.jesque.Job;
import net.greghaines.jesque.client.Client;
import net.greghaines.jesque.meta.QueueInfo;
import net.greghaines.jesque.meta.dao.QueueInfoDAO;
import net.greghaines.jesque.worker.Worker;
import net.greghaines.jesque.worker.WorkerEvent;
import net.greghaines.jesque.worker.WorkerListener;
import net.greghaines.jesque.worker.WorkerPool;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
Expand Down Expand Up @@ -54,6 +45,14 @@
import edu.unc.lib.dl.util.RedisWorkerConstants.DepositField;
import edu.unc.lib.dl.util.RedisWorkerConstants.DepositState;
import edu.unc.lib.dl.util.RedisWorkerConstants.Priority;
import net.greghaines.jesque.Job;
import net.greghaines.jesque.client.Client;
import net.greghaines.jesque.meta.QueueInfo;
import net.greghaines.jesque.meta.dao.QueueInfoDAO;
import net.greghaines.jesque.worker.Worker;
import net.greghaines.jesque.worker.WorkerEvent;
import net.greghaines.jesque.worker.WorkerListener;
import net.greghaines.jesque.worker.WorkerPool;

/**
* Coordinates work on deposits via Redis and Resque. Responsible for putting
Expand Down Expand Up @@ -84,9 +83,6 @@ public class DepositSupervisor implements WorkerListener {

@Autowired
private DepositEmailHandler depositEmailHandler;

@Autowired
private DepositMessageHandler depositMessageHandler;

public net.greghaines.jesque.Config getJesqueConfig() {
return jesqueConfig;
Expand Down Expand Up @@ -647,7 +643,6 @@ private void queueNextJob(Job job, String depositUUID, Map<String, String> statu
depositDuration(depositUUID, status);

depositEmailHandler.sendDepositResults(depositUUID);
depositMessageHandler.sendDepositMessage(depositUUID);

// schedule cleanup job after the configured delay
Job cleanJob = makeJob(CleanupDepositJob.class, depositUUID);
Expand Down