From 3cc667229b193e2098dcc943a7297dcab3d3ff75 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Fri, 18 Sep 2015 19:49:36 +0000
Subject: [PATCH] Fix OPENDJ-2284: fix bugs which prevent deployment of Rest2LDAP webapp
---
opendj-sdk/opendj-rest2ldap-servlet/src/main/webapp/WEB-INF/web.xml | 2 +-
opendj-sdk/opendj-rest2ldap/src/main/resources/META-INF/services/org.forgerock.http.HttpApplication | 0
2 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/opendj-sdk/opendj-rest2ldap-servlet/src/main/webapp/WEB-INF/web.xml b/opendj-sdk/opendj-rest2ldap-servlet/src/main/webapp/WEB-INF/web.xml
index 42655ef..112303e 100644
--- a/opendj-sdk/opendj-rest2ldap-servlet/src/main/webapp/WEB-INF/web.xml
+++ b/opendj-sdk/opendj-rest2ldap-servlet/src/main/webapp/WEB-INF/web.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<!--
! The contents of this file are subject to the terms of the Common Development and
! Distribution License (the License). You may not use this file except in compliance with the
@@ -14,7 +15,6 @@
! Copyright 2015 ForgeRock AS.
!
-->
-<?xml version="1.0" encoding="UTF-8"?>
<web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
version="3.0">
diff --git a/opendj-sdk/opendj-rest2ldap-servlet/src/main/webapp/META-INF/services/org.forgerock.http.HttpApplication b/opendj-sdk/opendj-rest2ldap/src/main/resources/META-INF/services/org.forgerock.http.HttpApplication
similarity index 100%
rename from opendj-sdk/opendj-rest2ldap-servlet/src/main/webapp/META-INF/services/org.forgerock.http.HttpApplication
rename to opendj-sdk/opendj-rest2ldap/src/main/resources/META-INF/services/org.forgerock.http.HttpApplication
--
Gitblit v1.10.0