From aae77b2d10d01324f9b1643c6bb1038d57fb8da2 Mon Sep 17 00:00:00 2001
From: Marcel Werk <burntime@woltlab.com>
Date: Mon, 25 Jul 2011 19:25:11 +0200
Subject: [PATCH] Fixed XSD urls

---
 com.woltlab.wcf/acpmenu.xml               | 2 +-
 com.woltlab.wcf/cronjobs.xml              | 2 +-
 com.woltlab.wcf/eventlistener.xml         | 5 +----
 com.woltlab.wcf/groupoptions.xml          | 2 +-
 com.woltlab.wcf/options.xml               | 2 +-
 com.woltlab.wcf/package.xml               | 2 +-
 com.woltlab.wcf/pip.xml                   | 2 +-
 com.woltlab.wcf/styleattributes.xml       | 5 ++---
 com.woltlab.wcf/useroptions.xml           | 2 +-
 wcfsetup/install/lang/de-informal.xml     | 2 +-
 wcfsetup/install/lang/de.xml              | 2 +-
 wcfsetup/install/lang/en.xml              | 2 +-
 wcfsetup/setup/lang/setup_de-informal.xml | 2 +-
 wcfsetup/setup/lang/setup_de.xml          | 2 +-
 wcfsetup/setup/lang/setup_en.xml          | 2 +-
 15 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/com.woltlab.wcf/acpmenu.xml b/com.woltlab.wcf/acpmenu.xml
index febcd646ac..5db41c068b 100644
--- a/com.woltlab.wcf/acpmenu.xml
+++ b/com.woltlab.wcf/acpmenu.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<data xmlns="http://www.woltlab.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.woltlab.com http://www.woltlab.com/XSD/acpmenu.xsd">
+<data xmlns="http://www.woltlab.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.woltlab.com http://www.woltlab.com/XSD/maelstrom/acpmenu.xsd">
 	<import>
 		<acpmenuitem name="wcf.acp.menu.link.system">
 			<icon>icon/systemL.png</icon>
diff --git a/com.woltlab.wcf/cronjobs.xml b/com.woltlab.wcf/cronjobs.xml
index 29284d9567..dd4cc087b3 100644
--- a/com.woltlab.wcf/cronjobs.xml
+++ b/com.woltlab.wcf/cronjobs.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<data xmlns="http://www.woltlab.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.woltlab.com http://www.woltlab.com/XSD/cronjobs.xsd">
+<data xmlns="http://www.woltlab.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.woltlab.com http://www.woltlab.com/XSD/maelstrom/cronjobs.xsd">
 	<import>
 		<cronjob>
 			<classpath>lib/system/cronjob/GetUpdateInfoCronjob.class.php</classpath>
diff --git a/com.woltlab.wcf/eventlistener.xml b/com.woltlab.wcf/eventlistener.xml
index e1ebdd122a..8d2f3688b9 100644
--- a/com.woltlab.wcf/eventlistener.xml
+++ b/com.woltlab.wcf/eventlistener.xml
@@ -1,24 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<data xmlns="http://www.woltlab.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.woltlab.com http://www.woltlab.com/XSD/eventlistener.xsd">
+<data xmlns="http://www.woltlab.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.woltlab.com http://www.woltlab.com/XSD/maelstrom/eventlistener.xsd">
 	<import>
 		<eventlistener>
 			<eventclassname>wcf\page\AbstractPage</eventclassname>
 			<eventname>readParameters</eventname>
-			<environment>admin</environment>
 			<inherit>1</inherit>
 			<listenerclassname>wcf\system\event\listener\SessionAccessLogListener</listenerclassname>
 		</eventlistener>
 		<eventlistener>
 			<eventclassname>wcf\form\AbstractForm</eventclassname>
 			<eventname>readParameters</eventname>
-			<environment>admin</environment>
 			<inherit>1</inherit>
 			<listenerclassname>wcf\system\event\listener\SessionAccessLogListener</listenerclassname>
 		</eventlistener>
 		<eventlistener>
 			<eventclassname>wcf\action\AbstractAction</eventclassname>
 			<eventname>readParameters</eventname>
-			<environment>admin</environment>
 			<inherit>1</inherit>
 			<listenerclassname>wcf\system\event\listener\SessionAccessLogListener</listenerclassname>
 		</eventlistener>
diff --git a/com.woltlab.wcf/groupoptions.xml b/com.woltlab.wcf/groupoptions.xml
index 6fbf3625d7..ffdf9c1c78 100644
--- a/com.woltlab.wcf/groupoptions.xml
+++ b/com.woltlab.wcf/groupoptions.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<data xmlns="http://www.woltlab.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.woltlab.com http://www.woltlab.com/XSD/groupoptions.xsd">
+<data xmlns="http://www.woltlab.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.woltlab.com http://www.woltlab.com/XSD/maelstrom/groupoptions.xsd">
 	<import>
 		<categories>
 			<category name="user"></category>
diff --git a/com.woltlab.wcf/options.xml b/com.woltlab.wcf/options.xml
index 8cee348477..e32eab2f17 100644
--- a/com.woltlab.wcf/options.xml
+++ b/com.woltlab.wcf/options.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<data xmlns="http://www.woltlab.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.woltlab.com http://www.woltlab.com/XSD/options.xsd">
+<data xmlns="http://www.woltlab.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.woltlab.com http://www.woltlab.com/XSD/maelstrom/options.xsd">
 	<import>
 		<categories>
 			<!-- modules -->
diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml
index 7fd13fc63e..a5e8825468 100644
--- a/com.woltlab.wcf/package.xml
+++ b/com.woltlab.wcf/package.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<package name="com.woltlab.wcf" xmlns="http://www.woltlab.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.woltlab.com http://www.woltlab.com/XSD/package.xsd">
+<package name="com.woltlab.wcf" xmlns="http://www.woltlab.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.woltlab.com http://www.woltlab.com/XSD/maelstrom/package.xsd">
 	<packageinformation>
 		<packagename>WoltLab Community Framework</packagename>
 		<packagedescription>Free web-framework, designed and developed for complex community applications.</packagedescription>
diff --git a/com.woltlab.wcf/pip.xml b/com.woltlab.wcf/pip.xml
index 9e55af9098..ec9aa41354 100644
--- a/com.woltlab.wcf/pip.xml
+++ b/com.woltlab.wcf/pip.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<data xmlns="http://www.woltlab.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.woltlab.com http://www.woltlab.com/XSD/pip.xsd">
+<data xmlns="http://www.woltlab.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.woltlab.com http://www.woltlab.com/XSD/maelstrom/pip.xsd">
 	<import>
 		<pip name="acpmenu">wcf\system\package\plugin\ACPMenuPackageInstallationPlugin</pip>
 		<pip name="acptemplates">wcf\system\package\plugin\ACPTemplatesPackageInstallationPlugin</pip>
diff --git a/com.woltlab.wcf/styleattributes.xml b/com.woltlab.wcf/styleattributes.xml
index ef8401801a..75b8e4f085 100644
--- a/com.woltlab.wcf/styleattributes.xml
+++ b/com.woltlab.wcf/styleattributes.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
-<!DOCTYPE data SYSTEM "http://www.woltlab.com/DTDs/styleattributes.dtd">
-<data>
+<?xml version="1.0" encoding="UTF-8"?>
+<data xmlns="http://www.woltlab.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.woltlab.com http://www.woltlab.com/XSD/maelstrom/styleattributes.xsd">
 	<import>
 		<attribute>
 			<selector><![CDATA[]]></selector>
diff --git a/com.woltlab.wcf/useroptions.xml b/com.woltlab.wcf/useroptions.xml
index 2ba47394e1..757ca7639e 100644
--- a/com.woltlab.wcf/useroptions.xml
+++ b/com.woltlab.wcf/useroptions.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<data xmlns="http://www.woltlab.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.woltlab.com http://www.woltlab.com/XSD/useroptions.xsd">
+<data xmlns="http://www.woltlab.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.woltlab.com http://www.woltlab.com/XSD/maelstrom/useroptions.xsd">
 	<import>
 		<categories>
 			<category name="hidden"></category>
diff --git a/wcfsetup/install/lang/de-informal.xml b/wcfsetup/install/lang/de-informal.xml
index f2fecb1777..cf3646dcae 100644
--- a/wcfsetup/install/lang/de-informal.xml
+++ b/wcfsetup/install/lang/de-informal.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<language xmlns="http://www.woltlab.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.woltlab.com http://www.woltlab.com/XSD/language.xsd" languagecode="de-informal">
+<language xmlns="http://www.woltlab.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.woltlab.com http://www.woltlab.com/XSD/maelstrom/language.xsd" languagecode="de-informal">
 	<category name="wcf.acp">
 		<item name="wcf.acp"><![CDATA[Administrationsoberfläche]]></item>
 		<item name="wcf.acp.help"><![CDATA[Hilfe]]></item>
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index fece798aa1..08bd3fda0f 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<language xmlns="http://www.woltlab.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.woltlab.com http://www.woltlab.com/XSD/language.xsd" languagecode="de">
+<language xmlns="http://www.woltlab.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.woltlab.com http://www.woltlab.com/XSD/maelstrom/language.xsd" languagecode="de">
 	<category name="wcf.acp">
 		<item name="wcf.acp"><![CDATA[Administrationsoberfläche]]></item>
 		<item name="wcf.acp.help"><![CDATA[Hilfe]]></item>
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index a75b54aef4..8c580da668 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<language xmlns="http://www.woltlab.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.woltlab.com http://www.woltlab.com/XSD/language.xsd" languagecode="en">
+<language xmlns="http://www.woltlab.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.woltlab.com http://www.woltlab.com/XSD/maelstrom/language.xsd" languagecode="en">
 	<category name="wcf.acp">
 		<item name="wcf.acp"><![CDATA[Administration Control Panel]]></item>
 		<item name="wcf.acp.help"><![CDATA[Help]]></item>
diff --git a/wcfsetup/setup/lang/setup_de-informal.xml b/wcfsetup/setup/lang/setup_de-informal.xml
index 3880361e2e..24d26ea167 100644
--- a/wcfsetup/setup/lang/setup_de-informal.xml
+++ b/wcfsetup/setup/lang/setup_de-informal.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<language xmlns="http://www.woltlab.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.woltlab.com http://www.woltlab.com/XSD/language.xsd" languagecode="de-informal">
+<language xmlns="http://www.woltlab.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.woltlab.com http://www.woltlab.com/XSD/maelstrom/language.xsd" languagecode="de-informal">
 	<category name="wcf.global">
 		<item name="wcf.global.pageTitle"><![CDATA[{$setupPackageName} Installation]]></item>
 		<item name="wcf.global.title"><![CDATA[<strong>{$setupPackageName}</strong><br />Installation]]></item>
diff --git a/wcfsetup/setup/lang/setup_de.xml b/wcfsetup/setup/lang/setup_de.xml
index 553201843e..11684dbbfa 100644
--- a/wcfsetup/setup/lang/setup_de.xml
+++ b/wcfsetup/setup/lang/setup_de.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<language xmlns="http://www.woltlab.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.woltlab.com http://www.woltlab.com/XSD/language.xsd" languagecode="de">
+<language xmlns="http://www.woltlab.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.woltlab.com http://www.woltlab.com/XSD/maelstrom/language.xsd" languagecode="de">
 	<category name="wcf.global">
 		<item name="wcf.global.pageTitle"><![CDATA[{$setupPackageName} Installation]]></item>
 		<item name="wcf.global.title"><![CDATA[<b>{$setupPackageName}</b><br />Installation]]></item>
diff --git a/wcfsetup/setup/lang/setup_en.xml b/wcfsetup/setup/lang/setup_en.xml
index abea4c1a47..f8fb33fd31 100644
--- a/wcfsetup/setup/lang/setup_en.xml
+++ b/wcfsetup/setup/lang/setup_en.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<language xmlns="http://www.woltlab.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.woltlab.com http://www.woltlab.com/XSD/language.xsd" languagecode="en">
+<language xmlns="http://www.woltlab.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.woltlab.com http://www.woltlab.com/XSD/maelstrom/language.xsd" languagecode="en">
 	<category name="wcf.global">
 		<item name="wcf.global.pageTitle"><![CDATA[{$setupPackageName} Installation]]></item>
 		<item name="wcf.global.title"><![CDATA[<b>{$setupPackageName}</b><br />Installation]]></item>
-- 
2.20.1