From 5ab8fee9ec8e28b4cf817084f7eaf3b48b0a4066 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Thu, 8 Nov 2012 18:24:56 +0000
Subject: [PATCH] Start ADS server synchronously

git-svn-id: https://svn.argeo.org/commons/trunk@5754 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 server/modules/org.argeo.server.ads.server/pom.xml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/server/modules/org.argeo.server.ads.server/pom.xml b/server/modules/org.argeo.server.ads.server/pom.xml
index d5c899b24..cfe3aef27 100644
--- a/server/modules/org.argeo.server.ads.server/pom.xml
+++ b/server/modules/org.argeo.server.ads.server/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>
@@ -15,6 +16,9 @@
 				<artifactId>maven-bundle-plugin</artifactId>
 				<configuration>
 					<instructions>
+						<!-- 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.naming.directory,
@@ -36,6 +40,8 @@
 							org.apache.directory.server.jndi,
 							org.apache.directory.server.ldap.support.extended,
 							org.apache.directory.shared.asn1.codec,
+							org.argeo.server.ads,
+							org.springframework.beans.factory.config
 						</Import-Package>
 					</instructions>
 				</configuration>
-- 
2.30.2