--- /dev/null
+argeo.osgi.start=\
+org.springframework.osgi.extender,\
+org.argeo.node.repofactory.jackrabbit,\
+org.argeo.node.repo.jackrabbit,\
+org.argeo.security.dao.jackrabbit,\
+org.argeo.slc.node.jackrabbit,\
+org.argeo.slc.agent,\
+org.argeo.slc.agent.jcr,\
+org.argeo.slc.demo.ant,\
+org.argeo.slc.demo.basic,\
+org.argeo.slc.demo.minimal,\
+org.argeo.elgis.rpmfactory,\
+
+eclipse.application=org.argeo.slc.client.rcp.application
+org.argeo.security.ui.initialPerspective=org.argeo.slc.client.ui.slcExecutionPerspective
+
+log4j.configuration=file:../../log4j.properties
+
+argeo.node.repo.home=data/noderepo
+argeo.node.repo.dburl=jdbc:h2:data/h2/noderepo_db
+
+argeo.node.repo.uri=http://localrepo:7070/org.argeo.jcr.webapp/remoting/node
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">\r
\r
<bean id="agent" class="org.argeo.slc.jcr.execution.JcrAgent"\r
- init-method="init" destroy-method="dispose">\r
- <property name="session" ref="session" />\r
+ init-method="init" destroy-method="destroy">\r
+ <property name="repository" ref="repository" />\r
<property name="modulesManager" ref="modulesManager" />\r
</bean>\r
\r
<bean id="executionModulesListener" class="org.argeo.slc.jcr.execution.JcrExecutionModulesListener"\r
- init-method="init" destroy-method="dispose">\r
+ init-method="init" destroy-method="destroy">\r
<property name="agent" ref="agent" />\r
- <property name="session">\r
- <bean factory-bean="repository" factory-method="login" />\r
- </property>\r
+ <property name="repository" ref="repository" />\r
<property name="modulesManager" ref="modulesManager" />\r
</bean>\r
\r
+ <!-- Thread-bound session is used when multiple threads with various authentication \r
+ will call the component -->\r
+ <bean id="session" class="org.argeo.security.jcr.SecureThreadBoundSession">\r
+ <property name="repository" ref="repository" />\r
+ </bean>\r
+\r
<bean id="resultListener" class="org.argeo.slc.jcr.execution.JcrResultListener">\r
<property name="session" ref="session" />\r
</bean>\r
</bean>\r
\r
\r
- <bean id="session" class="org.argeo.security.jcr.SecureThreadBoundSession">\r
- <property name="repository" ref="repository" />\r
- </bean>\r
-\r
<bean\r
class="org.argeo.security.core.AuthenticatedApplicationContextInitialization">\r
<property name="authenticationManager" ref="authenticationManager" />\r
/*
* LIFECYCLE
*/
+ /** Initialization */
public void init() {
try {
agentDescriptor = new SlcAgentDescriptor();
new HashMap<String, String>());
}
- public void dispose() {
+ /** Clean up (needs to be called by overriding method) */
+ public void destroy() {
modulesManager.unregisterProcessNotifier(this,
new HashMap<String, String>());
}
}
}
- public void dispose() {
+ @Override
+ public void destroy() {
try {
jmsTemplate.convertAndSend(agentUnregister, getAgentDescriptor());
log.info("Agent #" + getAgentUuid() + " unregistered from "
if (log.isTraceEnabled())
log.debug("Original error.", e);
}
- super.dispose();
+ super.destroy();
}
public void setAgentRegister(Destination agentRegister) {
import java.util.UUID;
import javax.jcr.Node;
+import javax.jcr.Repository;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
/** SLC VM agent synchronizing with a JCR repository. */
public class JcrAgent extends DefaultAgent implements SlcAgentFactory, SlcNames {
- private Session session;
+ private Repository repository;
/** only one agent per VM is currently supported */
private final String agentNodeName = "default";
* LIFECYCLE
*/
protected String initAgentUuid() {
+ Session session = null;
try {
+ session = repository.login();
Node vmAgentFactoryNode = JcrUtils.mkdirsSafe(session,
SlcJcrConstants.VM_AGENT_FACTORY_PATH,
SlcTypes.SLC_AGENT_FACTORY);
} catch (RepositoryException e) {
JcrUtils.discardQuietly(session);
throw new SlcException("Cannot find JCR agent UUID", e);
+ } finally {
+ JcrUtils.logoutQuietly(session);
}
}
- public void dispose() {
-
+ @Override
+ public void destroy() {
+ super.destroy();
}
/*
/*
* BEAN
*/
- public void setSession(Session session) {
- this.session = session;
- }
-
public String getAgentNodeName() {
return agentNodeName;
}
+ public void setRepository(Repository repository) {
+ this.repository = repository;
+ }
+
}
import javax.jcr.Node;
import javax.jcr.NodeIterator;
import javax.jcr.Property;
+import javax.jcr.Repository;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
import javax.jcr.nodetype.NodeType;
private ExecutionModulesManager modulesManager;
+ private Repository repository;
/**
* We don't use a thread bound session because many different threads will
* call this critical component and we don't want to login each time. We
* LIFECYCLE
*/
public void init() {
- clearAgent();
- if (modulesManager != null) {
- List<ModuleDescriptor> moduleDescriptors = modulesManager
- .listModules();
- String executionModules = System
- .getProperty(SLC_EXECUTION_MODULES_PROPERTY);
- if (executionModules != null)
- try {
+ try {
+ session = repository.login();
+ clearAgent();
+ if (modulesManager != null) {
+ List<ModuleDescriptor> moduleDescriptors = modulesManager
+ .listModules();
+ String executionModules = System
+ .getProperty(SLC_EXECUTION_MODULES_PROPERTY);
+ if (executionModules != null) {
Node agentNode = session.getNode(agent.getNodePath());
for (String executionModule : executionModules.split(",")) {
for (ModuleDescriptor moduleDescriptor : moduleDescriptors) {
}
}
session.save();
- } catch (RepositoryException e) {
- JcrUtils.discardQuietly(session);
- throw new SlcException("Cannot initialize modules", e);
}
+ }
+ } catch (RepositoryException e) {
+ JcrUtils.discardQuietly(session);
+ JcrUtils.logoutQuietly(session);
+ throw new SlcException("Cannot initialize modules", e);
}
}
- public void dispose() {
+ public void destroy() {
clearAgent();
- session.logout();
+ JcrUtils.logoutQuietly(session);
}
protected synchronized void clearAgent() {
this.agent = agent;
}
- /** Expects a non-shared session with admin authorization */
- public void setSession(Session session) {
- this.session = session;
+ public void setRepository(Repository repository) {
+ this.repository = repository;
}
public void setModulesManager(ExecutionModulesManager modulesManager) {
mock.setExecutor(executor);
mock.run();
+ // File repoDir = new File(buildEnvironment.getStagingBase() + "/"
+ // + repository + "/" + level + "/" + release);
File repoDir = new File(buildEnvironment.getStagingBase() + "/"
- + repository + "/" + level + "/" + release);
+ + repository + "-staging" + "/" + release);
File srpmDir = new File(repoDir, "SRPMS");
if (mkdirs)
srpmDir.mkdirs();
import java.util.List;
import java.util.Map;
-import org.apache.commons.exec.Executor;
import org.apache.commons.io.FileUtils;
import org.argeo.slc.SlcException;
private List<String> archs = new ArrayList<String>();
- private String stagingBase = System.getProperty("user.home")
- + "/dev/staging";
+ private String stagingBase = "/srv/rpmfactory";
/** Write (topdir)/rpmmacros and (topdir)/rpmrc */
public void writeRpmbuildConfigFiles(File topdir) {
projects / gpl / argeo-slc.git / commitdiff