From 9e1985ad51f5af45898bd7d83abf310dad64a116 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Tue, 7 Jun 2011 08:48:45 +0000
Subject: [PATCH] Fix SLC build

git-svn-id: https://svn.argeo.org/slc/trunk@4565 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 runtime/org.argeo.slc.repo/pom.xml            | 23 ++++++++++++++-----
 .../argeo/slc/jcr/dao/applicationContext.xml  |  3 ++-
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/runtime/org.argeo.slc.repo/pom.xml b/runtime/org.argeo.slc.repo/pom.xml
index 87c1b40e2..bc4f88e35 100644
--- a/runtime/org.argeo.slc.repo/pom.xml
+++ b/runtime/org.argeo.slc.repo/pom.xml
@@ -28,18 +28,26 @@
 		</plugins>
 	</build>
 	<dependencies>
+		<!-- SLC Runtime -->
 		<dependency>
-			<groupId>org.argeo.commons.server</groupId>
-			<artifactId>org.argeo.server.jcr</artifactId>
-			<version>${version.argeo-commons}</version>
+			<groupId>org.argeo.slc.runtime</groupId>
+			<artifactId>org.argeo.slc.support.aether</artifactId>
+			<version>0.13.1-SNAPSHOT</version>
 		</dependency>
-
 		<dependency>
 			<groupId>org.argeo.slc.runtime</groupId>
-			<artifactId>org.argeo.slc.support.aether</artifactId>
+			<artifactId>org.argeo.slc.support.jcr</artifactId>
 			<version>0.13.1-SNAPSHOT</version>
 		</dependency>
 
+		<!-- SLC Modules -->
+		<dependency>
+			<groupId>org.argeo.commons.server</groupId>
+			<artifactId>org.argeo.server.jcr</artifactId>
+			<version>${version.argeo-commons}</version>
+		</dependency>
+
+		<!-- Third party -->
 		<dependency>
 			<groupId>org.eclipse.osgi</groupId>
 			<artifactId>org.eclipse.osgi</artifactId>
@@ -52,6 +60,9 @@
 			<groupId>org.slf4j</groupId>
 			<artifactId>com.springsource.slf4j.org.apache.commons.logging</artifactId>
 		</dependency>
-
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>com.springsource.javax.servlet</artifactId>
+		</dependency>
 	</dependencies>
 </project>
diff --git a/runtime/org.argeo.slc.support.jcr/src/test/resources/org/argeo/slc/jcr/dao/applicationContext.xml b/runtime/org.argeo.slc.support.jcr/src/test/resources/org/argeo/slc/jcr/dao/applicationContext.xml
index 4f2d6ffea..bf5539497 100644
--- a/runtime/org.argeo.slc.support.jcr/src/test/resources/org/argeo/slc/jcr/dao/applicationContext.xml
+++ b/runtime/org.argeo.slc.support.jcr/src/test/resources/org/argeo/slc/jcr/dao/applicationContext.xml
@@ -64,7 +64,8 @@
 		</constructor-arg>
 	</bean>
 
-	<bean id="argeo.jcr.repository.inMemory" class="org.argeo.jackrabbit.JackrabbitContainer">
+	<bean id="argeo.jcr.repository.inMemory" class="org.argeo.jackrabbit.JackrabbitContainer"
+		init-method="init" destroy-method="dispose">
 		<property name="homeDirectory"
 			value="${java.io.tmpdir}/jackrabbit-slc-unit-${user.name}" />
 		<property name="inMemory" value="true" />
-- 
2.39.2