directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smckin...@apache.org
Subject directory-fortress-commander git commit: Makes web.xml conformant to serlet 3.1 spec and remove unnecessary wicket servlet
Date Thu, 13 Jul 2017 14:17:10 GMT
Repository: directory-fortress-commander
Updated Branches:
  refs/heads/master ed0ed3338 -> adc45a64a


Makes web.xml conformant to serlet 3.1 spec and remove unnecessary wicket servlet


Project: http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/commit/adc45a64
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/tree/adc45a64
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/diff/adc45a64

Branch: refs/heads/master
Commit: adc45a64acce44bf0c2177bf7ac55c28bda4cfd6
Parents: ed0ed33
Author: Shawn McKinney <smckinney@apache.org>
Authored: Thu Jul 13 09:17:06 2017 -0500
Committer: Shawn McKinney <smckinney@apache.org>
Committed: Thu Jul 13 09:17:06 2017 -0500

----------------------------------------------------------------------
 src/main/webapp/WEB-INF/web.xml | 22 +++-------------------
 1 file changed, 3 insertions(+), 19 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/adc45a64/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index 9f993a4..99a3fb6 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -16,27 +16,12 @@
    specific language governing permissions and limitations
    under the License.
 -->
-<!DOCTYPE web-app PUBLIC
-        "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
-        "http://java.sun.com/dtd/web-app_2_3.dtd" >
+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
+        version="3.1">
 
-<web-app>
     <display-name>Fortress Web Admin</display-name>
 
-    <servlet>
-        <servlet-name>wicket</servlet-name>
-        <servlet-class>org.apache.wicket.protocol.http.WicketServlet</servlet-class>
-        <init-param>
-            <param-name>applicationFactoryClassName</param-name>
-            <param-value>org.apache.wicket.spring.SpringWebApplicationFactory</param-value>
-        </init-param>
-        <init-param>
-            <param-name>applicationBean</param-name>
-            <param-value>wicketApplication</param-value>
-        </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-
     <context-param>
         <param-name>contextConfigLocation</param-name>
         <param-value>classpath:applicationContext.xml</param-value>
@@ -147,7 +132,6 @@
         <auth-method>FORM</auth-method>
         <realm-name>SentrySecurityRealm</realm-name>
         <form-login-config>
-            basedir
             <form-login-page>/login/login.html</form-login-page>
             <form-error-page>/login/error.html</form-error-page>
         </form-login-config>


Mime
View raw message