From: Mathieu Baudier <mbaudier@argeo.org>
Date: Mon, 25 Mar 2013 11:39:44 +0000 (+0000)
Subject: Fixes for remote, but will not work with the current version of Jackrabbit.
X-Git-Tag: argeo-slc-2.1.7~374
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=dbb420ec2208b2c4cd3ed64c3fe99c4e6f1644be;p=gpl%2Fargeo-slc.git

Fixes for remote, but will not work with the current version of Jackrabbit.

git-svn-id: https://svn.argeo.org/slc/trunk@6210 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---

diff --git a/demo/slc_demo_remote.properties b/demo/slc_demo_remote.properties
index bf6d879c8..784038fe4 100644
--- a/demo/slc_demo_remote.properties
+++ b/demo/slc_demo_remote.properties
@@ -1,22 +1,18 @@
 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.support.maven,\
+
+slc.executionModules=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
+argeo.node.repo.uri=http://localhost:7070/data/jcr/node
diff --git a/modules/org.argeo.slc.node.jackrabbit/META-INF/spring/jackrabbit.xml b/modules/org.argeo.slc.node.jackrabbit/META-INF/spring/jackrabbit.xml
index 6b0680053..f41c5f115 100644
--- a/modules/org.argeo.slc.node.jackrabbit/META-INF/spring/jackrabbit.xml
+++ b/modules/org.argeo.slc.node.jackrabbit/META-INF/spring/jackrabbit.xml
@@ -15,15 +15,15 @@
 	</bean>
 
 	<!-- Security -->
-	<bean class="org.argeo.jackrabbit.JackrabbitAuthorizations"
-		init-method="run">
-		<property name="principalPrivileges">
-			<map>
-				<entry key="jcr:all" value="ROLE_SLC" />
-			</map>
-		</property>
-		<property name="repository" ref="jcrRepository" />
-	</bean>
+<!-- 	<bean class="org.argeo.jackrabbit.JackrabbitAuthorizations" -->
+<!-- 		init-method="run"> -->
+<!-- 		<property name="principalPrivileges"> -->
+<!-- 			<map> -->
+<!-- 				<entry key="jcr:all" value="ROLE_SLC" /> -->
+<!-- 			</map> -->
+<!-- 		</property> -->
+<!-- 		<property name="repository" ref="jcrRepository" /> -->
+<!-- 	</bean> -->
 
 	<bean
 		class="org.argeo.security.core.AuthenticatedApplicationContextInitialization">
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 a7f5b7747..008b1c5f1 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
@@ -15,6 +15,8 @@
  */
 package org.argeo.slc.jcr.execution;
 
+import java.net.InetAddress;
+import java.net.UnknownHostException;
 import java.util.UUID;
 
 import javax.jcr.Node;
@@ -34,6 +36,9 @@ import org.argeo.slc.jcr.SlcTypes;
 
 /** SLC VM agent synchronizing with a JCR repository. */
 public class JcrAgent extends DefaultAgent implements SlcNames {
+	// final static String ROLE_REMOTE = "ROLE_REMOTE";
+	final static String NODE_REPO_URI = "argeo.node.repo.uri";
+
 	private Repository repository;
 
 	private String agentNodeName = "default";
@@ -45,9 +50,10 @@ public class JcrAgent extends DefaultAgent implements SlcNames {
 		Session session = null;
 		try {
 			session = repository.login();
+
+			String agentFactoryPath = getAgentFactoryPath();
 			Node vmAgentFactoryNode = JcrUtils.mkdirsSafe(session,
-					SlcJcrConstants.VM_AGENT_FACTORY_PATH,
-					SlcTypes.SLC_AGENT_FACTORY);
+					agentFactoryPath, SlcTypes.SLC_AGENT_FACTORY);
 			if (!vmAgentFactoryNode.hasNode(agentNodeName)) {
 				String uuid = UUID.randomUUID().toString();
 				Node agentNode = vmAgentFactoryNode.addNode(agentNodeName,
@@ -89,7 +95,29 @@ public class JcrAgent extends DefaultAgent implements SlcNames {
 	 * UTILITIES
 	 */
 	public String getNodePath() {
-		return SlcJcrConstants.VM_AGENT_FACTORY_PATH + '/' + getAgentNodeName();
+		return getAgentFactoryPath() + '/' + getAgentNodeName();
+	}
+
+	public String getAgentFactoryPath() {
+		try {
+			Boolean isRemote = System.getProperty(NODE_REPO_URI) != null;
+			String agentFactoryPath;
+			if (isRemote) {
+				InetAddress localhost = InetAddress.getLocalHost();
+				agentFactoryPath = SlcJcrConstants.AGENTS_BASE_PATH + "/"
+						+ localhost.getCanonicalHostName();
+
+				if (agentFactoryPath
+						.equals(SlcJcrConstants.VM_AGENT_FACTORY_PATH))
+					throw new SlcException("Unsupported hostname "
+							+ localhost.getCanonicalHostName());
+			} else {// local
+				agentFactoryPath = SlcJcrConstants.VM_AGENT_FACTORY_PATH;
+			}
+			return agentFactoryPath;
+		} catch (UnknownHostException e) {
+			throw new SlcException("Cannot find agent factory base path", e);
+		}
 	}
 
 	/*
@@ -106,5 +134,4 @@ public class JcrAgent extends DefaultAgent implements SlcNames {
 	public void setAgentNodeName(String agentNodeName) {
 		this.agentNodeName = agentNodeName;
 	}
-
 }