Also this file doesn't match and cannot be loaded with generic loadXmlTemplate()...

diff --git a/.gitattributes b/.gitattributes
index 9ab23682bfb820774d76898cb0d92b81de6ddd14..16c230bd237d0b9b6524178820ddec7395625609 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -636,6 +636,7 @@ application/hub/templates/xml/object_registry/.htaccess -text svneol=unset#text/
 application/hub/templates/xml/object_registry/object_registry.xml svneol=native#text/plain
 application/hub/templates/xml/requests/.htaccess -text svneol=unset#text/plain
 application/hub/templates/xml/requests/node_request_node_list.xml svneol=native#text/plain
+application/hub/templates/xml/requests/request_node_list.xml svneol=native#text/plain
 application/hub/templates/xml/self_connect/.htaccess -text svneol=unset#text/plain
 application/hub/templates/xml/self_connect/self_connect.xml svneol=native#text/plain
 db/.htaccess -text svneol=unset#text/plain

diff --git a/application/hub/templates/xml/requests/node_request_node_list.xml b/application/hub/templates/xml/requests/node_request_node_list.xml
index bb9031423ef1a1e83e9ac558176a776532e89b6d..11f5d85d80b1ca4d16cf4c19e14af24e5ec2a60f 100644 (file)
--- a/application/hub/templates/xml/requests/node_request_node_list.xml
+++ b/application/hub/templates/xml/requests/node_request_node_list.xml
@@ -1,35 +1 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-An XML for requesting a node list, to specify which node data shall be
-transmitted.
-
-@author                Roland Haeder <webmaster@ship-simu.org>
-@version       0.0.0
-@copyright     Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2011 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/>
-//-->
-<request-node-list>
-       <!--
-       All accepted object types as a comma-separted list this node is accepting
-       to share (even master nodes may not accept all types of objects.
-       //-->
-       <accepted-object-types>{?accepted_object_types?}</accepted-object-types>
-       <!--
-       This node's session id
-       //-->
-       <session-id>{?session_id?}</session-id>
-</request-node-list>
+<!-- @DEPRECATED //-->

diff --git a/application/hub/templates/xml/requests/request_node_list.xml b/application/hub/templates/xml/requests/request_node_list.xml
new file mode 100644 (file)
index 0000000..bb90314
--- /dev/null
+++ b/application/hub/templates/xml/requests/request_node_list.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+An XML for requesting a node list, to specify which node data shall be
+transmitted.
+
+@author                Roland Haeder <webmaster@ship-simu.org>
+@version       0.0.0
+@copyright     Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2011 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/>
+//-->
+<request-node-list>
+       <!--
+       All accepted object types as a comma-separted list this node is accepting
+       to share (even master nodes may not accept all types of objects.
+       //-->
+       <accepted-object-types>{?accepted_object_types?}</accepted-object-types>
+       <!--
+       This node's session id
+       //-->
+       <session-id>{?session_id?}</session-id>
+</request-node-list>