X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=runtime%2Forg.argeo.slc.support.jcr%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fjcr%2Fexecution%2FJcrAgent.java;h=6be4bc86a374c79286b6672ab8320a0659250a9e;hb=659b2045881a49a5987c1e03a41e07799aeda4a8;hp=a096e5d5eebd6aa84b93a8ff94a5c1b926846f10;hpb=0f05a24d55e92b847d2c72ff116ecd281a60adf8;p=gpl%2Fargeo-slc.git diff --git a/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/execution/JcrAgent.java b/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/execution/JcrAgent.java index a096e5d5e..6be4bc86a 100644 --- a/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/execution/JcrAgent.java +++ b/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/execution/JcrAgent.java @@ -4,6 +4,7 @@ import java.util.List; import java.util.UUID; import javax.jcr.Node; +import javax.jcr.Repository; import javax.jcr.RepositoryException; import javax.jcr.Session; @@ -21,7 +22,7 @@ import org.argeo.slc.runtime.SlcAgentFactory; /** 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"; @@ -30,7 +31,9 @@ public class JcrAgent extends DefaultAgent implements SlcAgentFactory, SlcNames * 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); @@ -46,11 +49,14 @@ public class JcrAgent extends DefaultAgent implements SlcAgentFactory, SlcNames } 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(); } /* @@ -88,12 +94,12 @@ public class JcrAgent extends DefaultAgent implements SlcAgentFactory, SlcNames /* * BEAN */ - public void setSession(Session session) { - this.session = session; - } - public String getAgentNodeName() { return agentNodeName; } + public void setRepository(Repository repository) { + this.repository = repository; + } + }