Skip to content
Snippets Groups Projects
Commit 39bb5bdf authored by srosse's avatar srosse
Browse files

no-jira: make setup module easily extendable

parent b46dd1d2
Branches
Tags
No related merge requests found
......@@ -24,14 +24,15 @@ import java.util.ArrayList;
import org.olat.basesecurity.BaseSecurity;
import org.olat.basesecurity.Constants;
import org.olat.basesecurity.SecurityGroup;
import org.olat.core.commons.persistence.DB;
import org.olat.core.commons.persistence.DBFactory;
import org.olat.core.configuration.AbstractSpringModule;
import org.olat.core.id.Identity;
import org.olat.core.logging.OLATRuntimeException;
import org.olat.core.logging.OLog;
import org.olat.core.logging.Tracing;
import org.olat.core.util.coordinate.CoordinatorManager;
import org.olat.core.util.event.FrameworkStartupEventChannel;
import org.olat.core.util.event.GenericEventListener;
import org.olat.user.DefaultUser;
import org.olat.user.UserImpl;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -47,7 +48,7 @@ import org.springframework.util.StringUtils;
*
*/
@Service
public class SetupModule implements GenericEventListener {
public class SetupModule extends AbstractSpringModule {
private static final OLog log = Tracing.createLoggerFor(SetupModule.class);
......@@ -61,21 +62,38 @@ public class SetupModule implements GenericEventListener {
@Autowired @Qualifier("testUsers")
private ArrayList<DefaultUser> testUsers;
@Autowired
protected DB dbInstance;
@Autowired
private BaseSecurity securityManager;
@Autowired
public SetupModule(CoordinatorManager coordinatorManager) {
super(coordinatorManager);
coordinatorManager.getCoordinator().getEventBus().registerFor(this, null, FrameworkStartupEventChannel.getStartupEventChannel());
}
@Override
public void init() {
//
}
@Override
protected void initFromChangedProperties() {
//
}
/**
* Courses are deployed after the startup has completed.
*
*/
@Override
public void event(org.olat.core.gui.control.Event event) {
setup();
}
protected void setup() {
createDefaultUsers();
DBFactory.getInstance().intermediateCommit();
}
......@@ -97,7 +115,7 @@ public class SetupModule implements GenericEventListener {
}
// Cleanup, otherwhise this subjects will have problems in normal OLAT
// operation
DBFactory.getInstance().commitAndCloseSession();
dbInstance.commitAndCloseSession();
}
/**
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment