From: Mathieu Baudier <mbaudier@argeo.org>
Date: Tue, 6 Nov 2012 13:51:20 +0000 (+0000)
Subject: Make node and node factory initialisation synchronous
X-Git-Tag: argeo-commons-2.1.30~783
X-Git-Url: https://git.argeo.org/?a=commitdiff_plain;h=59e83ddd830f74fe503592225687f665febd7de3;p=lgpl%2Fargeo-commons.git

Make node and node factory initialisation synchronous

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

diff --git a/security/modules/org.argeo.security.dao.os/pom.xml b/security/modules/org.argeo.security.dao.os/pom.xml
index e72a6cc80..e78bfce28 100644
--- a/security/modules/org.argeo.security.dao.os/pom.xml
+++ b/security/modules/org.argeo.security.dao.os/pom.xml
@@ -15,10 +15,6 @@
 				<artifactId>maven-bundle-plugin</artifactId>
 				<configuration>
 					<instructions>
-						<Import-Package>
-							*,
-							org.argeo.jcr,
-						</Import-Package>
 					</instructions>
 				</configuration>
 			</plugin>
diff --git a/server/modules/org.argeo.node.repo.jackrabbit/pom.xml b/server/modules/org.argeo.node.repo.jackrabbit/pom.xml
index 2f24dd9f2..946605e4f 100644
--- a/server/modules/org.argeo.node.repo.jackrabbit/pom.xml
+++ b/server/modules/org.argeo.node.repo.jackrabbit/pom.xml
@@ -17,6 +17,9 @@
 				<configuration>
 					<instructions>
 						<Bundle-SymbolicName>${project.artifactId};singleton:=true</Bundle-SymbolicName>
+						<!-- Import-Package needs to be specified explicitly since BND doesn't 
+							deal with custom Spring-Context instructions -->
+						<Spring-Context>META-INF/spring/*.xml;create-asynchronously:=false</Spring-Context>
 						<Import-Package>
 							*,
 							com.mysql.jdbc;resolution:=optional,
diff --git a/server/modules/org.argeo.node.repofactory.jackrabbit/META-INF/spring/repofactory-osgi.xml b/server/modules/org.argeo.node.repofactory.jackrabbit/META-INF/spring/repofactory-osgi.xml
index a8d1f17b0..b54f422c9 100644
--- a/server/modules/org.argeo.node.repofactory.jackrabbit/META-INF/spring/repofactory-osgi.xml
+++ b/server/modules/org.argeo.node.repofactory.jackrabbit/META-INF/spring/repofactory-osgi.xml
@@ -18,5 +18,4 @@
 
 	<!-- SERVICES -->
 	<service ref="repositoryFactory" interface="javax.jcr.RepositoryFactory" />
-<!-- 	<service ref="repositoryFactory" interface="org.argeo.jcr.RepositoryRegister" /> -->
 </beans:beans>
\ No newline at end of file
diff --git a/server/modules/org.argeo.node.repofactory.jackrabbit/pom.xml b/server/modules/org.argeo.node.repofactory.jackrabbit/pom.xml
index fc80967ef..42e02edac 100644
--- a/server/modules/org.argeo.node.repofactory.jackrabbit/pom.xml
+++ b/server/modules/org.argeo.node.repofactory.jackrabbit/pom.xml
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.argeo.commons.server</groupId>
@@ -16,8 +17,14 @@
 				<artifactId>maven-bundle-plugin</artifactId>
 				<configuration>
 					<instructions>
+						<Bundle-SymbolicName>${project.artifactId};singleton:=true</Bundle-SymbolicName>
+						<!-- Import-Package needs to be specified explicitly since BND doesn't 
+							deal with custom Spring-Context instructions -->
+						<Spring-Context>META-INF/spring/*.xml;create-asynchronously:=false</Spring-Context>
 						<Import-Package>
 							*,
+							javax.jcr,
+							org.argeo.jackrabbit,
 						</Import-Package>
 					</instructions>
 				</configuration>