You are viewing a plain text version of this content. The canonical link for it is here.
Posted to photark-commits@incubator.apache.org by lr...@apache.org on 2010/02/28 19:17:46 UTC
svn commit: r917259 - in /incubator/photark/trunk:
photark-ui-admin/src/main/webapp/WEB-INF/web.xml
photark-ui/src/main/webapp/WEB-INF/web.xml
photark-webapp/src/main/webapp/WEB-INF/web.xml
Author: lresende
Date: Sun Feb 28 19:17:45 2010
New Revision: 917259
URL: http://svn.apache.org/viewvc?rev=917259&view=rev
Log:
Fixing web.xml schema and character encoding
Modified:
incubator/photark/trunk/photark-ui-admin/src/main/webapp/WEB-INF/web.xml
incubator/photark/trunk/photark-ui/src/main/webapp/WEB-INF/web.xml
incubator/photark/trunk/photark-webapp/src/main/webapp/WEB-INF/web.xml
Modified: incubator/photark/trunk/photark-ui-admin/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/photark/trunk/photark-ui-admin/src/main/webapp/WEB-INF/web.xml?rev=917259&r1=917258&r2=917259&view=diff
==============================================================================
--- incubator/photark/trunk/photark-ui-admin/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/photark/trunk/photark-ui-admin/src/main/webapp/WEB-INF/web.xml Sun Feb 28 19:17:45 2010
@@ -18,9 +18,11 @@
* 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>
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+ id="WebApp_ID" version="2.5">
<display-name>PhotArk photo gallery web application admin resources</display-name>
Modified: incubator/photark/trunk/photark-ui/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/photark/trunk/photark-ui/src/main/webapp/WEB-INF/web.xml?rev=917259&r1=917258&r2=917259&view=diff
==============================================================================
--- incubator/photark/trunk/photark-ui/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/photark/trunk/photark-ui/src/main/webapp/WEB-INF/web.xml Sun Feb 28 19:17:45 2010
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,9 +18,11 @@
* 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>
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+ id="WebApp_ID" version="2.5">
<display-name>PhotArk photo gallery web application resources</display-name>
Modified: incubator/photark/trunk/photark-webapp/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/photark/trunk/photark-webapp/src/main/webapp/WEB-INF/web.xml?rev=917259&r1=917258&r2=917259&view=diff
==============================================================================
--- incubator/photark/trunk/photark-webapp/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/photark/trunk/photark-webapp/src/main/webapp/WEB-INF/web.xml Sun Feb 28 19:17:45 2010
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,9 +18,12 @@
* 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>
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+ id="WebApp_ID" version="2.5">
+ <display-name>sample-store-secure-webapp</display-name>
<display-name>PhotArk photo gallery web application</display-name>