From bb130b9f672b5e86d6bc53dd2e730615cc2ff175 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Tue, 01 Oct 2013 22:23:36 +0000
Subject: [PATCH] Additional fix OPENDJ-1131: Rest2LDAP fails to start with GlassFish3.1

---
 opendj-sdk/opendj3/opendj-rest2ldap-servlet/pom.xml |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/opendj-sdk/opendj3/opendj-rest2ldap-servlet/pom.xml b/opendj-sdk/opendj3/opendj-rest2ldap-servlet/pom.xml
index 0bc7004..d251a2c 100644
--- a/opendj-sdk/opendj3/opendj-rest2ldap-servlet/pom.xml
+++ b/opendj-sdk/opendj3/opendj-rest2ldap-servlet/pom.xml
@@ -42,7 +42,6 @@
             <groupId>org.forgerock.commons</groupId>
             <artifactId>json-resource-servlet</artifactId>
             <version>${forgerockRestVersion}</version>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <!-- Required for runtime via WAR overlay -->
@@ -100,6 +99,9 @@
                                     <groupId>org.forgerock.commons</groupId>
                                     <artifactId>json-resource-servlet</artifactId>
                                     <classifier>servlet</classifier>
+                                    <includes>
+                                        <include>WEB-INF/*.xml</include>
+                                    </includes>
                                 </overlay>
                             </overlays>
                         </configuration>

--
Gitblit v1.10.0