From 149d03ecd349d720ad724bb6deab4f5ccb214c03 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Wed, 23 Feb 2011 21:08:28 +0000
Subject: [PATCH] Remote JCR client working First (failed) try of Modeshape

git-svn-id: https://svn.argeo.org/slc/trunk@4177 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 demo/log4j.properties                            |  3 ++-
 dep/org.argeo.slc.dep.agent/pom.xml              |  7 +++++++
 eclipse/plugins/pom.xml                          |  2 +-
 .../META-INF/spring/jackrabbit.xml               |  1 +
 .../repository.xml                               | 16 ++++++++--------
 5 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/demo/log4j.properties b/demo/log4j.properties
index a17b667c9..6c9cc66b1 100644
--- a/demo/log4j.properties
+++ b/demo/log4j.properties
@@ -6,6 +6,7 @@ log4j.logger.org.argeo.slc.execution.ExecutionParameterPostProcessor=TRACE
 log4j.logger.org.argeo.slc.execution.ExecutionContext=DEBUG
 log4j.logger.org.argeo.slc.execution.SimpleExecutionSpec=DEBUG
 log4j.logger.org.argeo.security.mvc.ArgeoRememberMeServices=WARN
+log4j.logger.org.argeo.server.jackrabbit.webdav.ExtendedDispatcherServlet=WARN
 #log4j.logger.org.argeo.server.jcr.mvc.OpenSessionInViewJcrInterceptor=TRACE
 
 log4j.logger.org.argeo.slc.client.ui.views.ExecutionModulesContentProvider=TRACE
@@ -19,7 +20,7 @@ log4j.logger.org.hibernate=WARN
 log4j.logger.org.springframework=WARN
 #log4j.logger.org.springframework.web=DEBUG
 #log4j.logger.org.springframework.jms=WARN
-log4j.logger.org.springframework.security=DEBUG
+#log4j.logger.org.springframework.security=DEBUG
 #log4j.logger.org.springframework.ldap=TRACE
 #log4j.logger.org.springframework.osgi.web=TRACE
 
diff --git a/dep/org.argeo.slc.dep.agent/pom.xml b/dep/org.argeo.slc.dep.agent/pom.xml
index cf6a5ef5a..8767350a6 100644
--- a/dep/org.argeo.slc.dep.agent/pom.xml
+++ b/dep/org.argeo.slc.dep.agent/pom.xml
@@ -18,6 +18,11 @@
 			<artifactId>org.argeo.osgi.boot</artifactId>
 			<version>${version.argeo-commons}</version>
 		</dependency>
+		<dependency>
+			<groupId>org.argeo.commons.server</groupId>
+			<artifactId>org.argeo.server.modeshape</artifactId>
+			<version>${version.argeo-commons}</version>
+		</dependency>
 
 		<!-- SLC -->
 		<dependency>
@@ -77,6 +82,8 @@
 			<version>${version.argeo-commons}</version>
 			<type>pom</type>
 		</dependency>
+		
+		<!-- JCR -->
 
 		<!-- Spring -->
 		<dependency>
diff --git a/eclipse/plugins/pom.xml b/eclipse/plugins/pom.xml
index dff317f68..f2a08dd4a 100644
--- a/eclipse/plugins/pom.xml
+++ b/eclipse/plugins/pom.xml
@@ -14,7 +14,7 @@
 	<modules>
 		<module>org.argeo.slc.client.ui</module>
 		<module>org.argeo.slc.client.ui.dist</module>
-		<module>org.argeo.slc.client.ui.gis</module>
+		<module>org.argeo.slc.ui.gis</module>
 		<module>org.argeo.slc.client.rcp</module>
 		<module>org.argeo.slc.client.rap</module>
 	</modules>
diff --git a/modules/server/org.argeo.slc.server.jackrabbit.pgsql/META-INF/spring/jackrabbit.xml b/modules/server/org.argeo.slc.server.jackrabbit.pgsql/META-INF/spring/jackrabbit.xml
index eacbf848e..d10ff6e2a 100644
--- a/modules/server/org.argeo.slc.server.jackrabbit.pgsql/META-INF/spring/jackrabbit.xml
+++ b/modules/server/org.argeo.slc.server.jackrabbit.pgsql/META-INF/spring/jackrabbit.xml
@@ -26,4 +26,5 @@
 			</list>
 		</property>
 	</bean>
+	
 </beans>
\ No newline at end of file
diff --git a/modules/server/org.argeo.slc.server.jackrabbit.pgsql/repository.xml b/modules/server/org.argeo.slc.server.jackrabbit.pgsql/repository.xml
index 36207ec73..9f95adf5e 100644
--- a/modules/server/org.argeo.slc.server.jackrabbit.pgsql/repository.xml
+++ b/modules/server/org.argeo.slc.server.jackrabbit.pgsql/repository.xml
@@ -74,13 +74,13 @@
 		<AccessManager
 			class="org.apache.jackrabbit.core.security.simple.SimpleAccessManager">
 		</AccessManager>
-		 <LoginModule 
-		 class="org.springframework.security.providers.jaas.SecurityContextLoginModule"> 
-		 </LoginModule> 
-<!--		<LoginModule-->
-<!--			class="org.apache.jackrabbit.core.security.simple.SimpleLoginModule">-->
-<!--			<param name="anonymousId" value="anonymous" />-->
-<!--			<param name="adminId" value="admin" />-->
-<!--		</LoginModule>-->
+<!--		 <LoginModule -->
+<!--		 class="org.springframework.security.providers.jaas.SecurityContextLoginModule"> -->
+<!--		 </LoginModule> -->
+		<LoginModule
+			class="org.apache.jackrabbit.core.security.simple.SimpleLoginModule">
+			<param name="anonymousId" value="anonymous" />
+			<param name="adminId" value="admin" />
+		</LoginModule>
 	</Security>
 </Repository>
\ No newline at end of file
-- 
2.39.2