Return-Path: 
 <commits-return-15380-apmail-struts-commits-archive=struts.apache.org@struts.apache.org>
X-Original-To: apmail-struts-commits-archive@minotaur.apache.org
Delivered-To: apmail-struts-commits-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id ED85A1912C
	for <apmail-struts-commits-archive@minotaur.apache.org>;
 Mon, 11 Apr 2016 14:31:11 +0000 (UTC)
Received: (qmail 57653 invoked by uid 500); 11 Apr 2016 14:31:10 -0000
Delivered-To: apmail-struts-commits-archive@struts.apache.org
Received: (qmail 57298 invoked by uid 500); 11 Apr 2016 14:30:59 -0000
Mailing-List: contact commits-help@struts.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@struts.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@struts.apache.org>
List-Post: <mailto:commits@struts.apache.org>
List-Id: <commits.struts.apache.org>
Reply-To: dev@struts.apache.org
Delivered-To: mailing list commits@struts.apache.org
Received: (qmail 57227 invoked by uid 99); 11 Apr 2016 14:30:52 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org)
 (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 11 Apr 2016 14:30:52 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at
 git1-us-west.apache.org, from userid 33)
	id 848B4DFC6F; Mon, 11 Apr 2016 14:30:52 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: lukaszlenart@apache.org
To: commits@struts.apache.org
Message-Id: <fa9d61d8e33e4ee798b03796698ecffb@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: struts git commit: Reverts 098ee502b406235755b939c7ef44a8b6cbf9416e
Date: Mon, 11 Apr 2016 14:30:52 +0000 (UTC)

Repository: struts
Updated Branches:
  refs/heads/support-2-3 865f1f278 -> cbae13a6a


Reverts 098ee502b406235755b939c7ef44a8b6cbf9416e


Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/cbae13a6
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/cbae13a6
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/cbae13a6

Branch: refs/heads/support-2-3
Commit: cbae13a6a8900124ebb9f27276854bdcb6adc3c8
Parents: 865f1f2
Author: Lukasz Lenart <lukaszlenart@apache.org>
Authored: Mon Apr 11 16:30:38 2016 +0200
Committer: Lukasz Lenart <lukaszlenart@apache.org>
Committed: Mon Apr 11 16:30:38 2016 +0200

----------------------------------------------------------------------
 apps/portlet/src/main/webapp/WEB-INF/web.xml | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/struts/blob/cbae13a6/apps/portlet/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/apps/portlet/src/main/webapp/WEB-INF/web.xml b/apps/portlet/src/main/webapp/WEB-INF/web.xml
index c95c0af..f424419 100644
--- a/apps/portlet/src/main/webapp/WEB-INF/web.xml
+++ b/apps/portlet/src/main/webapp/WEB-INF/web.xml
@@ -1,10 +1,6 @@
 <?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_2_5.xsd"
-    version="2.5"
-    id="StrutsPortlet">
+<!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 id="StrutsPortlet">
 
     <context-param>
         <param-name>org.apache.tiles.factory.TilesContainerFactory</param-name>