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 e72a6cc805aae0317ad34391b4536b186e934ae3..e78bfce283c4da4b2ead95fcec1bd61d49e996e1 100644 (file)
--- 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 2f24dd9f2fc256449d716fc1b95a72e135873cb8..946605e4f20c53322bb23138fe0d5839434f24cd 100644 (file)
--- 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 a8d1f17b090a48e43854609bb4c568b1f7f0ce82..b54f422c9f383e07f33df7e6d224b1dd6154f1c0 100644 (file)
--- 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 @@
 \r
        <!-- SERVICES -->\r
        <service ref="repositoryFactory" interface="javax.jcr.RepositoryFactory" />\r
-<!--   <service ref="repositoryFactory" interface="org.argeo.jcr.RepositoryRegister" /> -->\r
 </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 fc80967ef4375b28ec1d56acf459cd3fca772727..42e02edacacfc79fa59ef82386642f5e9488dc14 100644 (file)
--- 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>