You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by ri...@apache.org on 2012/11/08 11:08:51 UTC
svn commit: r1406990 - in /manifoldcf/trunk: ./
framework/api-service/src/main/webapp/WEB-INF/
framework/authority-service/src/main/webapp/WEB-INF/
framework/crawler-ui/src/main/webapp/WEB-INF/
test-materials/alfresco-war/jetty/
Author: ridder
Date: Thu Nov 8 10:08:50 2012
New Revision: 1406990
URL: http://svn.apache.org/viewvc?rev=1406990&view=rev
Log:
CONNECTORS-562: Some web.xml files contain wrong declarations
Modified:
manifoldcf/trunk/CHANGES.txt
manifoldcf/trunk/framework/api-service/src/main/webapp/WEB-INF/web.xml
manifoldcf/trunk/framework/authority-service/src/main/webapp/WEB-INF/web.xml
manifoldcf/trunk/framework/crawler-ui/src/main/webapp/WEB-INF/web.xml
manifoldcf/trunk/test-materials/alfresco-war/jetty/jetty-env.xml
Modified: manifoldcf/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1406990&r1=1406989&r2=1406990&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Thu Nov 8 10:08:50 2012
@@ -3,6 +3,9 @@ $Id$
======================= 1.1-dev =====================
+CONNECTORS-562: Some web.xml files contain wrong declarations
+(Alex Ott, Erlend Garåsen)
+
CONNECTORS-564: Configure velocity to use the ManifoldCF log
configuration and the logger "velocity".
(Shigeki Kobayashi, Karl Wright)
Modified: manifoldcf/trunk/framework/api-service/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/api-service/src/main/webapp/WEB-INF/web.xml?rev=1406990&r1=1406989&r2=1406990&view=diff
==============================================================================
--- manifoldcf/trunk/framework/api-service/src/main/webapp/WEB-INF/web.xml (original)
+++ manifoldcf/trunk/framework/api-service/src/main/webapp/WEB-INF/web.xml Thu Nov 8 10:08:50 2012
@@ -1,9 +1,4 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<!DOCTYPE web-app
- PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN"
- "http://java.sun.com/j2ee/dtds/web-app_2.2.dtd">
-
<!-- Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
@@ -20,7 +15,10 @@
limitations under the License.
-->
-<web-app>
+<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">
<display-name>ManifoldCF General API Webapp</display-name>
<description>ManifoldCF General API Webapp</description>
Modified: manifoldcf/trunk/framework/authority-service/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/authority-service/src/main/webapp/WEB-INF/web.xml?rev=1406990&r1=1406989&r2=1406990&view=diff
==============================================================================
--- manifoldcf/trunk/framework/authority-service/src/main/webapp/WEB-INF/web.xml (original)
+++ manifoldcf/trunk/framework/authority-service/src/main/webapp/WEB-INF/web.xml Thu Nov 8 10:08:50 2012
@@ -1,9 +1,4 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<!DOCTYPE web-app
- PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN"
- "http://java.sun.com/j2ee/dtds/web-app_2.2.dtd">
-
<!-- Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
@@ -20,7 +15,10 @@
limitations under the License.
-->
-<web-app>
+<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">
<display-name>ManifoldCF Authorities API Webapp</display-name>
<description>ManifoldCF Authorities API Webapp</description>
Modified: manifoldcf/trunk/framework/crawler-ui/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/crawler-ui/src/main/webapp/WEB-INF/web.xml?rev=1406990&r1=1406989&r2=1406990&view=diff
==============================================================================
--- manifoldcf/trunk/framework/crawler-ui/src/main/webapp/WEB-INF/web.xml (original)
+++ manifoldcf/trunk/framework/crawler-ui/src/main/webapp/WEB-INF/web.xml Thu Nov 8 10:08:50 2012
@@ -20,7 +20,7 @@
<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">
+ http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" version="2.5">
<display-name>ManifoldCF Crawler Interface</display-name>
<description>ManifoldCF Crawler Interface</description>
Modified: manifoldcf/trunk/test-materials/alfresco-war/jetty/jetty-env.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/test-materials/alfresco-war/jetty/jetty-env.xml?rev=1406990&r1=1406989&r2=1406990&view=diff
==============================================================================
--- manifoldcf/trunk/test-materials/alfresco-war/jetty/jetty-env.xml (original)
+++ manifoldcf/trunk/test-materials/alfresco-war/jetty/jetty-env.xml Thu Nov 8 10:08:50 2012
@@ -1,3 +1,4 @@
+<?xml version="1.0"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -14,7 +15,6 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<?xml version="1.0"?>
<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://jetty.mortbay.org/configure.dtd">
<Configure class="org.mortbay.jetty.webapp.WebAppContext">