From 03a01efdcb536ab2e123acf5f7f69b886f5632cf Mon Sep 17 00:00:00 2001
From: Miika Turkia <miika.turkia@gmail.com>
Date: Tue, 24 Dec 2013 17:01:40 +0200
Subject: [PATCH] We need to use include statement on XSLT nowadays

After change to include XSLT files in resources, the import quit
working (even though the files and templates were found properly). This
patch uses include statement instead as it seems to work in our case.

Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
---
 xslt/SuuntoDM4.xslt       | 2 +-
 xslt/csv2xml.xslt         | 2 +-
 xslt/divelogs-export.xslt | 2 +-
 xslt/uddf-export.xslt     | 2 +-
 xslt/uddf.xslt            | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/xslt/SuuntoDM4.xslt b/xslt/SuuntoDM4.xslt
index 5c61c0c52..ca1a0569b 100644
--- a/xslt/SuuntoDM4.xslt
+++ b/xslt/SuuntoDM4.xslt
@@ -2,7 +2,7 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   xmlns:u="http://schemas.datacontract.org/2004/07/Suunto.Diving.Dal"
   version="1.0">
-  <xsl:import href="commonTemplates.xsl"/>
+  <xsl:include href="commonTemplates.xsl"/>
   <xsl:strip-space elements="*"/>
   <xsl:output method="xml" indent="yes"/>
 
diff --git a/xslt/csv2xml.xslt b/xslt/csv2xml.xslt
index 7ddbda92d..f21fced13 100644
--- a/xslt/csv2xml.xslt
+++ b/xslt/csv2xml.xslt
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-  <xsl:import href="commonTemplates.xsl"/>
+  <xsl:include href="commonTemplates.xsl"/>
   <xsl:strip-space elements="*"/>
   <xsl:param name="timeField" select="timeField"/>
   <xsl:param name="depthField" select="depthField"/>
diff --git a/xslt/divelogs-export.xslt b/xslt/divelogs-export.xslt
index b3bed6c35..cbca51dec 100644
--- a/xslt/divelogs-export.xslt
+++ b/xslt/divelogs-export.xslt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-  <xsl:import href="commonTemplates.xsl"/>
+  <xsl:include href="commonTemplates.xsl"/>
   <xsl:strip-space elements="*"/>
   <xsl:output method="xml" encoding="UTF-8" indent="yes"
     cdata-section-elements="LOCATION SITE WEATHER WATERVIZIBILITY PARTNER BOATNAME CYLINDERDESCRIPTION LOGNOTES"
diff --git a/xslt/uddf-export.xslt b/xslt/uddf-export.xslt
index 1d25c8cf6..af305df90 100644
--- a/xslt/uddf-export.xslt
+++ b/xslt/uddf-export.xslt
@@ -1,5 +1,5 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-  <xsl:import href="commonTemplates.xsl"/>
+  <xsl:include href="commonTemplates.xsl"/>
   <xsl:strip-space elements="*"/>
   <xsl:output method="xml" encoding="utf-8" indent="yes"/>
 
diff --git a/xslt/uddf.xslt b/xslt/uddf.xslt
index bb7a554d6..efc18c14d 100644
--- a/xslt/uddf.xslt
+++ b/xslt/uddf.xslt
@@ -4,7 +4,7 @@
   xmlns:u1="http://www.streit.cc/uddf/3.1/"
   exclude-result-prefixes="u u1"
   version="1.0">
-  <xsl:import href="commonTemplates.xsl"/>
+  <xsl:include href="commonTemplates.xsl"/>
   <xsl:strip-space elements="*"/>
   <xsl:output method="xml" indent="yes"/>