X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=server%2Fruntime%2Forg.argeo.server.ads%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fserver%2Fads%2FAdsContainer.java;h=0753e14ebd5cf46bd4c582ee424d20f1236b7f23;hb=490d9907457c43acfa965e7979ce5974bc1ba6ca;hp=febc3630318bcb9b40500a71fd16153138afecf5;hpb=581b6f0af126457c76a09af00071a4de687f06c7;p=lgpl%2Fargeo-commons.git

diff --git a/server/runtime/org.argeo.server.ads/src/main/java/org/argeo/server/ads/AdsContainer.java b/server/runtime/org.argeo.server.ads/src/main/java/org/argeo/server/ads/AdsContainer.java
index febc36303..0753e14eb 100644
--- a/server/runtime/org.argeo.server.ads/src/main/java/org/argeo/server/ads/AdsContainer.java
+++ b/server/runtime/org.argeo.server.ads/src/main/java/org/argeo/server/ads/AdsContainer.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2010 Mathieu Baudier <mbaudier@argeo.org>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package org.argeo.server.ads;
 
 import java.io.File;
@@ -19,11 +35,13 @@ import org.apache.commons.logging.LogFactory;
 import org.apache.directory.server.configuration.MutableServerStartupConfiguration;
 import org.apache.directory.server.core.configuration.ShutdownConfiguration;
 import org.apache.directory.server.jndi.ServerContextFactory;
+import org.argeo.ArgeoException;
 import org.springframework.beans.factory.DisposableBean;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.core.io.Resource;
 import org.springframework.util.Assert;
 
+@SuppressWarnings("restriction")
 public class AdsContainer implements InitializingBean, DisposableBean {
 	private final static Log log = LogFactory.getLog(AdsContainer.class);
 
@@ -87,8 +105,8 @@ public class AdsContainer implements InitializingBean, DisposableBean {
 		try {
 			new InitialDirContext(env);
 		} catch (NamingException e) {
-			throw new RuntimeException(
-					"Failed to start Apache Directory server", e);
+			throw new ArgeoException("Failed to start Apache Directory server",
+					e);
 		}
 	}
 
@@ -110,8 +128,8 @@ public class AdsContainer implements InitializingBean, DisposableBean {
 		try {
 			new InitialContext(env);
 		} catch (NamingException e) {
-			throw new RuntimeException(
-					"Failed to stop Apache Directory server", e);
+			throw new ArgeoException("Failed to stop Apache Directory server",
+					e);
 		}
 
 		if (workingDirectory.exists() && deleteWorkingDirOnExit) {