From 3e48b9b9669caef30402d84b002f89aa7efaba66 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno.rehling@gmail.com>
Date: Mon, 8 Jun 2015 16:51:41 +0200
Subject: [PATCH] libxml 1.9.x seems to be a bit pickier about how XML catalogs
 are written.

---
 conf/e2/catalog.xml   |  6 ++--
 conf/e2/config.xml    | 64 +++++++++++++++++++++----------------------
 conf/e3/catalog.xml   |  6 ++--
 conf/e3/config.xml    | 60 ++++++++++++++++++++--------------------
 conf/e4/catalog.xml   |  6 ++--
 conf/e4/config.xml    | 60 ++++++++++++++++++++--------------------
 res/armor.xml         | 14 +++++-----
 res/e3a/buildings.xml |  2 +-
 res/e3a/races.xml     |  8 +++---
 res/e3a/resources.xml | 14 +++++-----
 res/e3a/weapons.xml   | 44 ++++++++++++++---------------
 res/weapons.xml       | 42 ++++++++++++++--------------
 12 files changed, 163 insertions(+), 163 deletions(-)

diff --git a/conf/e2/catalog.xml b/conf/e2/catalog.xml
index a66bf0428..d0c7333aa 100644
--- a/conf/e2/catalog.xml
+++ b/conf/e2/catalog.xml
@@ -5,12 +5,12 @@
 
 <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
     <rewriteURI
-        uriStartString="config:///core/"
+        uriStartString="config://core/"
         rewritePrefix="../../res/core/" />
     <rewriteURI
-        uriStartString="config:///game/"
+        uriStartString="config://game/"
         rewritePrefix="../../res/eressea/" />
     <rewriteURI
-        uriStartString="config:///default/"
+        uriStartString="config://default/"
         rewritePrefix="../../res/" />
 </catalog>
diff --git a/conf/e2/config.xml b/conf/e2/config.xml
index 914fd2796..6cb50a1be 100644
--- a/conf/e2/config.xml
+++ b/conf/e2/config.xml
@@ -1,36 +1,36 @@
 <?xml version="1.0"?>
 <eressea xmlns:xi="http://www.w3.org/2001/XInclude">
-  <xi:include href="config:///core/messages.xml"/>
+  <xi:include href="config://core/messages.xml"/>
 
   <!-- Localization -->
-  <xi:include href="config:///core/de/strings.xml"/>
-  <xi:include href="config:///core/en/strings.xml"/>
-  <xi:include href="config:///game/spellinfo.xml" />
+  <xi:include href="config://core/de/strings.xml"/>
+  <xi:include href="config://core/en/strings.xml"/>
+  <xi:include href="config://game/spellinfo.xml" />
 
-  <xi:include href="config:///core/common/items.xml" />
-  <xi:include href="config:///core/common/armor.xml" />
-  <xi:include href="config:///core/common/weapons.xml" />
-  <xi:include href="config:///core/common/resources.xml" />
-  <xi:include href="config:///core/common/luxuries.xml" />
-  <xi:include href="config:///core/common/herbs.xml" />
-  <xi:include href="config:///core/common/potions.xml" />
-  <xi:include href="config:///core/spoils.xml"/>
-  <xi:include href="config:///game/races.xml"/>
-  <xi:include href="config:///core/prefixes.xml"/>
-  <xi:include href="config:///core/ships.xml"/>
-  <xi:include href="config:///core/common/buildings.xml"/>
-  <xi:include href="config:///game/familiars.xml"/>
-  <xi:include href="config:///core/terrains.xml"/>
-  <xi:include href="config:///game/terrains.xml"/>
-  <xi:include href="config:///game/artrewards.xml"/>
-  <xi:include href="config:///game/buildings.xml"/>
-  <xi:include href="config:///core/calendar.xml"/>
+  <xi:include href="config://core/common/items.xml" />
+  <xi:include href="config://core/common/armor.xml" />
+  <xi:include href="config://core/common/weapons.xml" />
+  <xi:include href="config://core/common/resources.xml" />
+  <xi:include href="config://core/common/luxuries.xml" />
+  <xi:include href="config://core/common/herbs.xml" />
+  <xi:include href="config://core/common/potions.xml" />
+  <xi:include href="config://core/spoils.xml"/>
+  <xi:include href="config://game/races.xml"/>
+  <xi:include href="config://core/prefixes.xml"/>
+  <xi:include href="config://core/ships.xml"/>
+  <xi:include href="config://core/common/buildings.xml"/>
+  <xi:include href="config://game/familiars.xml"/>
+  <xi:include href="config://core/terrains.xml"/>
+  <xi:include href="config://game/terrains.xml"/>
+  <xi:include href="config://game/artrewards.xml"/>
+  <xi:include href="config://game/buildings.xml"/>
+  <xi:include href="config://core/calendar.xml"/>
   <calendar name="secondage" newyear="month_1" start="184"/>
-  <xi:include href="config:///game/equipment.xml"/>
-  <xi:include href="config:///game/items.xml"/>
-  <xi:include href="config:///game/spells.xml"/>
-  <xi:include href="config:///game/strings.xml"/>
-  <xi:include href="config:///default/adamantium.xml"/>
+  <xi:include href="config://game/equipment.xml"/>
+  <xi:include href="config://game/items.xml"/>
+  <xi:include href="config://game/spells.xml"/>
+  <xi:include href="config://game/strings.xml"/>
+  <xi:include href="config://default/adamantium.xml"/>
   <equipment>
     <set name="first_unit">
       <item name="conquesttoken" amount="1"/>
@@ -43,11 +43,11 @@
     </set>
   </equipment>
 
-  <xi:include href="config:///default/names-undead.xml"/>
-  <xi:include href="config:///default/names-skeletons.xml"/>
-  <xi:include href="config:///default/names-zombies.xml"/>
-  <xi:include href="config:///default/names-ghouls.xml"/>
-  <xi:include href="config:///default/names-dragons.xml"/>
+  <xi:include href="config://default/names-undead.xml"/>
+  <xi:include href="config://default/names-skeletons.xml"/>
+  <xi:include href="config://default/names-zombies.xml"/>
+  <xi:include href="config://default/names-ghouls.xml"/>
+  <xi:include href="config://default/names-dragons.xml"/>
 
   <game name="Eressea">
     <!-- Game specific settings -->
diff --git a/conf/e3/catalog.xml b/conf/e3/catalog.xml
index beb8b55c9..9987e72c8 100644
--- a/conf/e3/catalog.xml
+++ b/conf/e3/catalog.xml
@@ -5,12 +5,12 @@
 
 <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
     <rewriteURI
-        uriStartString="config:///core/"
+        uriStartString="config://core/"
         rewritePrefix="../../res/core/" />
     <rewriteURI
-        uriStartString="config:///game/"
+        uriStartString="config://game/"
         rewritePrefix="../../res/e3a/" />
     <rewriteURI
-        uriStartString="config:///default/"
+        uriStartString="config://default/"
         rewritePrefix="../../res/" />
 </catalog>
diff --git a/conf/e3/config.xml b/conf/e3/config.xml
index dac778015..89eccdea9 100644
--- a/conf/e3/config.xml
+++ b/conf/e3/config.xml
@@ -1,32 +1,32 @@
 <?xml version="1.0"?>
 <eressea xmlns:xi="http://www.w3.org/2001/XInclude">
-  <xi:include href="config:///core/messages.xml"/>
-  <xi:include href="config:///core/de/strings.xml"/>
-  <xi:include href="config:///core/en/strings.xml"/>
-  <xi:include href="config:///core/common/items.xml"/>
-  <xi:include href="config:///core/common/herbs.xml" />
-  <xi:include href="config:///core/spoils.xml"/>
-  <xi:include href="config:///core/prefixes.xml"/>
-  <xi:include href="config:///core/common/buildings.xml"/>
-  <xi:include href="config:///game/familiars.xml"/>
+  <xi:include href="config://core/messages.xml"/>
+  <xi:include href="config://core/de/strings.xml"/>
+  <xi:include href="config://core/en/strings.xml"/>
+  <xi:include href="config://core/common/items.xml"/>
+  <xi:include href="config://core/common/herbs.xml" />
+  <xi:include href="config://core/spoils.xml"/>
+  <xi:include href="config://core/prefixes.xml"/>
+  <xi:include href="config://core/common/buildings.xml"/>
+  <xi:include href="config://game/familiars.xml"/>
 
-  <xi:include href="config:///default/adamantium.xml" />
+  <xi:include href="config://default/adamantium.xml" />
 
-  <xi:include href="config:///game/ships.xml"/>
-  <xi:include href="config:///game/shipnames.xml"/>
-  <xi:include href="config:///game/terrains.xml"/>
-  <xi:include href="config:///core/calendar.xml"/>
-  <xi:include href="config:///game/items.xml" />
-  <xi:include href="config:///game/strings.xml"/>
-  <xi:include href="config:///game/messages.xml"/>
-  <xi:include href="config:///game/races.xml"/>
-  <xi:include href="config:///game/buildings.xml"/>
-  <xi:include href="config:///game/equipment.xml"/>
-  <xi:include href="config:///game/spells.xml"/>
-  <xi:include href="config:///game/luxuries.xml" />
-  <xi:include href="config:///game/weapons.xml" />
-  <xi:include href="config:///game/armor.xml" />
-  <xi:include href="config:///game/resources.xml" />
+  <xi:include href="config://game/ships.xml"/>
+  <xi:include href="config://game/shipnames.xml"/>
+  <xi:include href="config://game/terrains.xml"/>
+  <xi:include href="config://core/calendar.xml"/>
+  <xi:include href="config://game/items.xml" />
+  <xi:include href="config://game/strings.xml"/>
+  <xi:include href="config://game/messages.xml"/>
+  <xi:include href="config://game/races.xml"/>
+  <xi:include href="config://game/buildings.xml"/>
+  <xi:include href="config://game/equipment.xml"/>
+  <xi:include href="config://game/spells.xml"/>
+  <xi:include href="config://game/luxuries.xml" />
+  <xi:include href="config://game/weapons.xml" />
+  <xi:include href="config://game/armor.xml" />
+  <xi:include href="config://game/resources.xml" />
 
   <calendar name="thirdage" newyear="month_1" start="1"/>
 
@@ -39,11 +39,11 @@
     </set>
   </equipment>
 
-  <xi:include href="config:///default/names-undead.xml"/>
-  <xi:include href="config:///default/names-skeletons.xml"/>
-  <xi:include href="config:///default/names-zombies.xml"/>
-  <xi:include href="config:///default/names-ghouls.xml"/>
-  <xi:include href="config:///default/names-dragons.xml"/>
+  <xi:include href="config://default/names-undead.xml"/>
+  <xi:include href="config://default/names-skeletons.xml"/>
+  <xi:include href="config://default/names-zombies.xml"/>
+  <xi:include href="config://default/names-ghouls.xml"/>
+  <xi:include href="config://default/names-dragons.xml"/>
 
   <game name="E3">
     <!-- Game specific settings -->
diff --git a/conf/e4/catalog.xml b/conf/e4/catalog.xml
index beb8b55c9..9987e72c8 100644
--- a/conf/e4/catalog.xml
+++ b/conf/e4/catalog.xml
@@ -5,12 +5,12 @@
 
 <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
     <rewriteURI
-        uriStartString="config:///core/"
+        uriStartString="config://core/"
         rewritePrefix="../../res/core/" />
     <rewriteURI
-        uriStartString="config:///game/"
+        uriStartString="config://game/"
         rewritePrefix="../../res/e3a/" />
     <rewriteURI
-        uriStartString="config:///default/"
+        uriStartString="config://default/"
         rewritePrefix="../../res/" />
 </catalog>
diff --git a/conf/e4/config.xml b/conf/e4/config.xml
index 641bfb25b..197dc4b69 100644
--- a/conf/e4/config.xml
+++ b/conf/e4/config.xml
@@ -1,32 +1,32 @@
 <?xml version="1.0"?>
 <eressea xmlns:xi="http://www.w3.org/2001/XInclude">
-  <xi:include href="config:///core/messages.xml"/>
-  <xi:include href="config:///core/de/strings.xml"/>
-  <xi:include href="config:///core/en/strings.xml"/>
-  <xi:include href="config:///core/common/items.xml"/>
-  <xi:include href="config:///core/common/herbs.xml" />
-  <xi:include href="config:///core/spoils.xml"/>
-  <xi:include href="config:///core/prefixes.xml"/>
-  <xi:include href="config:///core/common/buildings.xml"/>
-  <xi:include href="config:///game/familiars.xml"/>
+  <xi:include href="config://core/messages.xml"/>
+  <xi:include href="config://core/de/strings.xml"/>
+  <xi:include href="config://core/en/strings.xml"/>
+  <xi:include href="config://core/common/items.xml"/>
+  <xi:include href="config://core/common/herbs.xml" />
+  <xi:include href="config://core/spoils.xml"/>
+  <xi:include href="config://core/prefixes.xml"/>
+  <xi:include href="config://core/common/buildings.xml"/>
+  <xi:include href="config://game/familiars.xml"/>
 
-  <xi:include href="config:///default/adamantium.xml" />
+  <xi:include href="config://default/adamantium.xml" />
 
-  <xi:include href="config:///game/ships.xml"/>
-  <xi:include href="config:///game/shipnames.xml"/>
-  <xi:include href="config:///game/terrains.xml"/>
-  <xi:include href="config:///core/calendar.xml"/>
-  <xi:include href="config:///game/items.xml" />
-  <xi:include href="config:///game/strings.xml"/>
-  <xi:include href="config:///game/messages.xml"/>
-  <xi:include href="config:///game/races.xml"/>
-  <xi:include href="config:///game/buildings.xml"/>
-  <xi:include href="config:///game/equipment.xml"/>
-  <xi:include href="config:///game/spells.xml"/>
-  <xi:include href="config:///game/luxuries.xml" />
-  <xi:include href="config:///game/weapons.xml" />
-  <xi:include href="config:///game/armor.xml" />
-  <xi:include href="config:///game/resources.xml" />
+  <xi:include href="config://game/ships.xml"/>
+  <xi:include href="config://game/shipnames.xml"/>
+  <xi:include href="config://game/terrains.xml"/>
+  <xi:include href="config://core/calendar.xml"/>
+  <xi:include href="config://game/items.xml" />
+  <xi:include href="config://game/strings.xml"/>
+  <xi:include href="config://game/messages.xml"/>
+  <xi:include href="config://game/races.xml"/>
+  <xi:include href="config://game/buildings.xml"/>
+  <xi:include href="config://game/equipment.xml"/>
+  <xi:include href="config://game/spells.xml"/>
+  <xi:include href="config://game/luxuries.xml" />
+  <xi:include href="config://game/weapons.xml" />
+  <xi:include href="config://game/armor.xml" />
+  <xi:include href="config://game/resources.xml" />
 
   <calendar name="thirdage" newyear="month_1" start="1"/>
 
@@ -39,11 +39,11 @@
     </set>
   </equipment>
 
-  <xi:include href="config:///default/names-undead.xml"/>
-  <xi:include href="config:///default/names-skeletons.xml"/>
-  <xi:include href="config:///default/names-zombies.xml"/>
-  <xi:include href="config:///default/names-ghouls.xml"/>
-  <xi:include href="config:///default/names-dragons.xml"/>
+  <xi:include href="config://default/names-undead.xml"/>
+  <xi:include href="config://default/names-skeletons.xml"/>
+  <xi:include href="config://default/names-zombies.xml"/>
+  <xi:include href="config://default/names-ghouls.xml"/>
+  <xi:include href="config://default/names-dragons.xml"/>
 
   <game name="Deveron">
     <!-- Game specific settings -->
diff --git a/res/armor.xml b/res/armor.xml
index f24ddcd35..f26848da2 100644
--- a/res/armor.xml
+++ b/res/armor.xml
@@ -2,12 +2,12 @@
 <resources xmlns:xi="http://www.w3.org/2001/XInclude">
   <!-- this file contains a lot of armor -->
 
-  <xi:include href="eressea:///core/armor/plate.xml"/>
-  <xi:include href="eressea:///core/armor/chainmail.xml"/>
-  <xi:include href="eressea:///core/armor/laenmail.xml"/>
-  <xi:include href="eressea:///core/armor/laenshield.xml"/>
-  <xi:include href="eressea:///core/armor/rustychainmail.xml"/>
-  <xi:include href="eressea:///core/armor/rustyshield.xml"/>
-  <xi:include href="eressea:///core/armor/shield.xml"/>
+  <xi:include href="eressea://core/armor/plate.xml"/>
+  <xi:include href="eressea://core/armor/chainmail.xml"/>
+  <xi:include href="eressea://core/armor/laenmail.xml"/>
+  <xi:include href="eressea://core/armor/laenshield.xml"/>
+  <xi:include href="eressea://core/armor/rustychainmail.xml"/>
+  <xi:include href="eressea://core/armor/rustyshield.xml"/>
+  <xi:include href="eressea://core/armor/shield.xml"/>
 
 </resources>
diff --git a/res/e3a/buildings.xml b/res/e3a/buildings.xml
index 227a2e47a..d95f5ce86 100644
--- a/res/e3a/buildings.xml
+++ b/res/e3a/buildings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <buildings xmlns:xi="http://www.w3.org/2001/XInclude">
 
-  <xi:include href="config:///default/buildings/castle-2.xml" />
+  <xi:include href="config://default/buildings/castle-2.xml" />
 
   <building name="watch" capacity="1" maxsize="10">
     <function name="name" value="fort_name"/>
diff --git a/res/e3a/races.xml b/res/e3a/races.xml
index d5e3831c4..46427ba92 100644
--- a/res/e3a/races.xml
+++ b/res/e3a/races.xml
@@ -3,10 +3,10 @@
 
   <!-- begin main races -->
 
-  <xi:include href="config:///default/races/goblin-3.xml"/>
-  <xi:include href="config:///default/races/wyrm.xml"/>
-  <xi:include href="config:///default/races/dragon.xml"/>
-  <xi:include href="config:///default/races/youngdragon.xml"/>
+  <xi:include href="config://default/races/goblin-3.xml"/>
+  <xi:include href="config://default/races/wyrm.xml"/>
+  <xi:include href="config://default/races/dragon.xml"/>
+  <xi:include href="config://default/races/youngdragon.xml"/>
   
   <race name="lynx" magres="0.000000" maxaura="0.000000" regaura="0.000000" weight="500" capacity="540" speed="1.0" hp="20" damage="2d3" unarmedattack="0" unarmeddefense="0" attackmodifier="4" defensemodifier="5" walk="yes" teach="no" getitem="yes">
     <ai splitsize="99999"/>
diff --git a/res/e3a/resources.xml b/res/e3a/resources.xml
index 4ab29a5b6..32a79d52e 100644
--- a/res/e3a/resources.xml
+++ b/res/e3a/resources.xml
@@ -2,13 +2,13 @@
 <resources xmlns:xi="http://www.w3.org/2001/XInclude">
   <!-- this file contains resources that can be mined in some way (anything with a resourcelimit) -->
 
-  <xi:include href="config:///core/resources/cart.xml"/>
-  <xi:include href="config:///core/resources/horse.xml"/>
-  <xi:include href="config:///core/resources/hp.xml"/>
-  <xi:include href="config:///core/resources/laen.xml"/>
-  <xi:include href="config:///core/resources/log.xml"/>
-  <xi:include href="config:///core/resources/mallorn.xml"/>
-  <xi:include href="config:///core/resources/peasant.xml"/>
+  <xi:include href="config://core/resources/cart.xml"/>
+  <xi:include href="config://core/resources/horse.xml"/>
+  <xi:include href="config://core/resources/hp.xml"/>
+  <xi:include href="config://core/resources/laen.xml"/>
+  <xi:include href="config://core/resources/log.xml"/>
+  <xi:include href="config://core/resources/mallorn.xml"/>
+  <xi:include href="config://core/resources/peasant.xml"/>
   <xi:include href="resources/iron.xml"/>
   <xi:include href="resources/mallornseed.xml"/>
   <xi:include href="resources/seed.xml"/>
diff --git a/res/e3a/weapons.xml b/res/e3a/weapons.xml
index 91748d64e..052266a02 100644
--- a/res/e3a/weapons.xml
+++ b/res/e3a/weapons.xml
@@ -1,25 +1,25 @@
 <?xml version="1.0"?>
 <resources xmlns:xi="http://www.w3.org/2001/XInclude">
-  <xi:include href="config:///core/weapons/axe.xml"/>
-  <xi:include href="config:///core/weapons/bow.xml"/>
-  <xi:include href="config:///core/weapons/catapult.xml"/>
-  <xi:include href="config:///core/weapons/lance.xml"/>
-  <xi:include href="config:///core/weapons/mallornbow.xml"/>
-  <xi:include href="config:///core/weapons/mallornspear.xml"/>
-  <xi:include href="config:///core/weapons/rep_crossbow.xml"/>
-  <xi:include href="config:///core/weapons/runesword.xml"/>
-  <xi:include href="config:///core/weapons/rustyaxe.xml"/>
-  <xi:include href="config:///core/weapons/rustysword.xml"/>
-  <xi:include href="config:///core/weapons/spear.xml"/>
-  <xi:include href="config:///core/weapons/sword.xml"/>
-  <xi:include href="config:///core/weapons/firesword.xml"/>
-  <xi:include href="config:///game/weapons/crossbow.xml"/>
-  <xi:include href="config:///game/weapons/greatbow.xml"/>
-  <xi:include href="config:///game/weapons/greatsword.xml"/>
-  <xi:include href="config:///game/weapons/halberd.xml"/>
-  <xi:include href="config:///game/weapons/laensword.xml"/>
-  <xi:include href="config:///game/weapons/mallorncrossbow.xml"/>
-  <xi:include href="config:///game/weapons/mallornlance.xml"/>
-  <xi:include href="config:///game/weapons/rustygreatsword.xml"/>
-  <xi:include href="config:///game/weapons/rustyhalberd.xml"/>
+  <xi:include href="config://core/weapons/axe.xml"/>
+  <xi:include href="config://core/weapons/bow.xml"/>
+  <xi:include href="config://core/weapons/catapult.xml"/>
+  <xi:include href="config://core/weapons/lance.xml"/>
+  <xi:include href="config://core/weapons/mallornbow.xml"/>
+  <xi:include href="config://core/weapons/mallornspear.xml"/>
+  <xi:include href="config://core/weapons/rep_crossbow.xml"/>
+  <xi:include href="config://core/weapons/runesword.xml"/>
+  <xi:include href="config://core/weapons/rustyaxe.xml"/>
+  <xi:include href="config://core/weapons/rustysword.xml"/>
+  <xi:include href="config://core/weapons/spear.xml"/>
+  <xi:include href="config://core/weapons/sword.xml"/>
+  <xi:include href="config://core/weapons/firesword.xml"/>
+  <xi:include href="config://game/weapons/crossbow.xml"/>
+  <xi:include href="config://game/weapons/greatbow.xml"/>
+  <xi:include href="config://game/weapons/greatsword.xml"/>
+  <xi:include href="config://game/weapons/halberd.xml"/>
+  <xi:include href="config://game/weapons/laensword.xml"/>
+  <xi:include href="config://game/weapons/mallorncrossbow.xml"/>
+  <xi:include href="config://game/weapons/mallornlance.xml"/>
+  <xi:include href="config://game/weapons/rustygreatsword.xml"/>
+  <xi:include href="config://game/weapons/rustyhalberd.xml"/>
 </resources>
diff --git a/res/weapons.xml b/res/weapons.xml
index 0cab11ad0..d0b508012 100644
--- a/res/weapons.xml
+++ b/res/weapons.xml
@@ -1,25 +1,25 @@
 <?xml version="1.0"?>
 <resources xmlns:xi="http://www.w3.org/2001/XInclude">
   <!-- this file contains a lot of weapons -->
-  <xi:include href="eressea:///core/weapons/axe.xml"/>
-  <xi:include href="eressea:///core/weapons/bow.xml"/>
-  <xi:include href="eressea:///core/weapons/catapult.xml"/>
-  <xi:include href="eressea:///core/weapons/crossbow.xml"/>
-  <xi:include href="eressea:///core/weapons/firesword.xml"/>
-  <xi:include href="eressea:///core/weapons/greatbow.xml"/>
-  <xi:include href="eressea:///core/weapons/greatsword.xml"/>
-  <xi:include href="eressea:///core/weapons/halberd.xml"/>
-  <xi:include href="eressea:///core/weapons/laensword.xml"/>
-  <xi:include href="eressea:///core/weapons/lance.xml"/>
-  <xi:include href="eressea:///core/weapons/mallornbow.xml"/>
-  <xi:include href="eressea:///core/weapons/mallorncrossbow.xml"/>
-  <xi:include href="eressea:///core/weapons/mallornlance.xml"/>
-  <xi:include href="eressea:///core/weapons/mallornspear.xml"/>
-  <xi:include href="eressea:///core/weapons/runesword.xml"/>
-  <xi:include href="eressea:///core/weapons/rustyaxe.xml"/>
-  <xi:include href="eressea:///core/weapons/rustygreatsword.xml"/>
-  <xi:include href="eressea:///core/weapons/rustyhalberd.xml"/>
-  <xi:include href="eressea:///core/weapons/rustysword.xml"/>
-  <xi:include href="eressea:///core/weapons/spear.xml"/>
-  <xi:include href="eressea:///core/weapons/sword.xml"/>
+  <xi:include href="eressea://core/weapons/axe.xml"/>
+  <xi:include href="eressea://core/weapons/bow.xml"/>
+  <xi:include href="eressea://core/weapons/catapult.xml"/>
+  <xi:include href="eressea://core/weapons/crossbow.xml"/>
+  <xi:include href="eressea://core/weapons/firesword.xml"/>
+  <xi:include href="eressea://core/weapons/greatbow.xml"/>
+  <xi:include href="eressea://core/weapons/greatsword.xml"/>
+  <xi:include href="eressea://core/weapons/halberd.xml"/>
+  <xi:include href="eressea://core/weapons/laensword.xml"/>
+  <xi:include href="eressea://core/weapons/lance.xml"/>
+  <xi:include href="eressea://core/weapons/mallornbow.xml"/>
+  <xi:include href="eressea://core/weapons/mallorncrossbow.xml"/>
+  <xi:include href="eressea://core/weapons/mallornlance.xml"/>
+  <xi:include href="eressea://core/weapons/mallornspear.xml"/>
+  <xi:include href="eressea://core/weapons/runesword.xml"/>
+  <xi:include href="eressea://core/weapons/rustyaxe.xml"/>
+  <xi:include href="eressea://core/weapons/rustygreatsword.xml"/>
+  <xi:include href="eressea://core/weapons/rustyhalberd.xml"/>
+  <xi:include href="eressea://core/weapons/rustysword.xml"/>
+  <xi:include href="eressea://core/weapons/spear.xml"/>
+  <xi:include href="eressea://core/weapons/sword.xml"/>
 </resources>