Author: markt
Date: Fri Oct 3 14:17:47 2014
New Revision: 1629205
URL: http://svn.apache.org/r1629205
Log:
Fix namespace inconsistencies
Modified:
tomcat/trunk/conf/tomcat-users.xml
tomcat/trunk/conf/tomcat-users.xsd
tomcat/trunk/java/org/apache/catalina/users/MemoryUserDatabase.java
tomcat/trunk/res/confinstall/tomcat-users_1.xml
Modified: tomcat/trunk/conf/tomcat-users.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/conf/tomcat-users.xml?rev=1629205&r1=1629204&r2=1629205&view=diff
==============================================================================
--- tomcat/trunk/conf/tomcat-users.xml (original)
+++ tomcat/trunk/conf/tomcat-users.xml Fri Oct 3 14:17:47 2014
@@ -17,7 +17,7 @@
-->
<tomcat-users xmlns="http://tomcat.apache.org/xml";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://tomcat.apache.org tomcat-users.xsd"
+ xsi:schemaLocation="http://tomcat.apache.org/xml
tomcat-users.xsd"
version="1.0">
<!--
NOTE: By default, no user is included in the "manager-gui" role required
@@ -36,5 +36,4 @@
<user username="both" password="tomcat" roles="tomcat,role1"/>
<user username="role1" password="tomcat" roles="role1"/>
-->
-
</tomcat-users>
Modified: tomcat/trunk/conf/tomcat-users.xsd
URL:
http://svn.apache.org/viewvc/tomcat/trunk/conf/tomcat-users.xsd?rev=1629205&r1=1629204&r2=1629205&view=diff
==============================================================================
--- tomcat/trunk/conf/tomcat-users.xsd (original)
+++ tomcat/trunk/conf/tomcat-users.xsd Fri Oct 3 14:17:47 2014
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<xs:schema xmlns="http://www.w3.org/2001/XMLSchema";
- targetNamespace="http://tomcat.apache.org";
- xmlns:users="http://tomcat.apache.org";
+ targetNamespace="http://tomcat.apache.org/xml";
+ xmlns:users="http://tomcat.apache.org/xml";
xmlns:xs="http://www.w3.org/2001/XMLSchema";
elementFormDefault="qualified"
attributeFormDefault="unqualified"
Modified: tomcat/trunk/java/org/apache/catalina/users/MemoryUserDatabase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/users/MemoryUserDatabase.java?rev=1629205&r1=1629204&r2=1629205&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/users/MemoryUserDatabase.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/users/MemoryUserDatabase.java Fri Oct
3 14:17:47 2014
@@ -546,7 +546,7 @@ public class MemoryUserDatabase implemen
writer.println("<?xml version='1.0' encoding='utf-8'?>");
writer.println("<tomcat-users
xmlns=\"http://tomcat.apache.org/xml\"";);
writer.println("
xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"";);
- writer.println("
xsi:schemaLocation=\"http://tomcat.apache.org tomcat-users.xsd\"");
+ writer.println("
xsi:schemaLocation=\"http://tomcat.apache.org/xml tomcat-users.xsd\"");
writer.println(" version=\"1.0\">");
// Print entries for each defined role, group, and user
Modified: tomcat/trunk/res/confinstall/tomcat-users_1.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/confinstall/tomcat-users_1.xml?rev=1629205&r1=1629204&r2=1629205&view=diff
==============================================================================
--- tomcat/trunk/res/confinstall/tomcat-users_1.xml (original)
+++ tomcat/trunk/res/confinstall/tomcat-users_1.xml Fri Oct 3 14:17:47 2014
@@ -16,5 +16,5 @@
-->
<tomcat-users xmlns="http://tomcat.apache.org/xml";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://tomcat.apache.org tomcat-users.xsd"
+ xsi:schemaLocation="http://tomcat.apache.org/xml
tomcat-users.xsd"
version="1.0">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
