From cb0ba60bfcc6a9fa7302ccfbb1a87c5fff7a97ef Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Wed, 22 Aug 2012 21:22:57 +0000
Subject: [PATCH] self_announcement doesn't fit new naming sceme

---
 .gitattributes                                |  1 +
 .../xml/announcement/announcement.xml         | 45 ++++++++++++++++++
 .../xml/announcement/self_announcement.xml    | 46 +------------------
 3 files changed, 47 insertions(+), 45 deletions(-)
 create mode 100644 application/hub/templates/xml/announcement/announcement.xml

diff --git a/.gitattributes b/.gitattributes
index 4e96e943b..9ab23682b 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -621,6 +621,7 @@ application/hub/templates/.htaccess -text svneol=unset#text/plain
 application/hub/templates/xml/.htaccess -text svneol=unset#text/plain
 application/hub/templates/xml/.xml svneol=native#text/plain
 application/hub/templates/xml/announcement/.htaccess -text svneol=unset#text/plain
+application/hub/templates/xml/announcement/announcement.xml svneol=native#text/plain
 application/hub/templates/xml/announcement/self_announcement.xml svneol=native#text/plain
 application/hub/templates/xml/answer/.htaccess -text svneol=unset#text/plain
 application/hub/templates/xml/answer/announcement/.htaccess -text svneol=unset#text/plain
diff --git a/application/hub/templates/xml/announcement/announcement.xml b/application/hub/templates/xml/announcement/announcement.xml
new file mode 100644
index 000000000..542e60a48
--- /dev/null
+++ b/application/hub/templates/xml/announcement/announcement.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+A template for announcing itself to upper hubs. Do not fill anything in here.
+Please use config.php/config-local.php files at application/hub/ instead.
+
+@author		Roland Haeder <webmaster@ship-simu.org>
+@version	0.0.0
+@copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2012 Hub Developer Team
+@license	GNU GPL 3.0 or any newer version
+@link		http://www.ship-simu.org
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>
+//-->
+<announcement>
+	<!-- Announcement data like, node status, session id etc. //-->
+	<announcement-data>
+		<!-- Status of this node, see node_status.xml for details. //-->
+		<node-status>{?node_status?}</node-status>
+		<!-- Node mode: regular, master, list, boot again //-->
+		<node-mode>{?node_default_mode?}</node-mode>
+		<!-- The session id. This should be announced to all other hubs. //-->
+		<session-id>{?session_id?}</session-id>
+		<!-- Data from our listeners (e.g. which port) //-->
+		<listener>
+			<!-- Public external IP address //-->
+			<external-ip>{?external_ip?}</external-ip>
+			<!-- Private internal IP address //-->
+			<internal-ip>{?internal_ip?}</internal-ip>
+			<!-- Listener ports for both connections //-->
+			<tcp-port>{?node_tcp_listen_port?}</tcp-port>
+			<udp-port>{?node_udp_listen_port?}</udp-port>
+		</listener>
+	</announcement-data>
+</announcement>
diff --git a/application/hub/templates/xml/announcement/self_announcement.xml b/application/hub/templates/xml/announcement/self_announcement.xml
index 542e60a48..11f5d85d8 100644
--- a/application/hub/templates/xml/announcement/self_announcement.xml
+++ b/application/hub/templates/xml/announcement/self_announcement.xml
@@ -1,45 +1 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-A template for announcing itself to upper hubs. Do not fill anything in here.
-Please use config.php/config-local.php files at application/hub/ instead.
-
-@author		Roland Haeder <webmaster@ship-simu.org>
-@version	0.0.0
-@copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2012 Hub Developer Team
-@license	GNU GPL 3.0 or any newer version
-@link		http://www.ship-simu.org
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>
-//-->
-<announcement>
-	<!-- Announcement data like, node status, session id etc. //-->
-	<announcement-data>
-		<!-- Status of this node, see node_status.xml for details. //-->
-		<node-status>{?node_status?}</node-status>
-		<!-- Node mode: regular, master, list, boot again //-->
-		<node-mode>{?node_default_mode?}</node-mode>
-		<!-- The session id. This should be announced to all other hubs. //-->
-		<session-id>{?session_id?}</session-id>
-		<!-- Data from our listeners (e.g. which port) //-->
-		<listener>
-			<!-- Public external IP address //-->
-			<external-ip>{?external_ip?}</external-ip>
-			<!-- Private internal IP address //-->
-			<internal-ip>{?internal_ip?}</internal-ip>
-			<!-- Listener ports for both connections //-->
-			<tcp-port>{?node_tcp_listen_port?}</tcp-port>
-			<udp-port>{?node_udp_listen_port?}</udp-port>
-		</listener>
-	</announcement-data>
-</announcement>
+<!-- @DEPRECATED //-->
-- 
2.39.2