Fix SLC build

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

diff --git a/runtime/org.argeo.slc.repo/pom.xml b/runtime/org.argeo.slc.repo/pom.xml
index 87c1b40e2b3242534d1f67cfc16e6402a8a24b45..bc4f88e3544a766153656c0ab28fc292cc3f7f9c 100644 (file)
--- 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 4f2d6ffea82178d448432a57afbad019b4c5b679..bf55394976b583cb25834b7ae1a5a5570f694286 100644 (file)
--- 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>\r
        </bean>\r
 \r
-       <bean id="argeo.jcr.repository.inMemory" class="org.argeo.jackrabbit.JackrabbitContainer">\r
+       <bean id="argeo.jcr.repository.inMemory" class="org.argeo.jackrabbit.JackrabbitContainer"\r
+               init-method="init" destroy-method="dispose">\r
                <property name="homeDirectory"\r
                        value="${java.io.tmpdir}/jackrabbit-slc-unit-${user.name}" />\r
                <property name="inMemory" value="true" />\r