From 1be098f6f52e265580ea1275fa0f143b4ad55790 Mon Sep 17 00:00:00 2001 From: uwe <arokis.u@gmail.com> Date: Sun, 25 Feb 2018 22:47:56 +0100 Subject: [PATCH] version 0.2.5 with namespace changes in some modules --- expath-pkg.xml | 2 +- modules/intermediate_format/identification.xqm | 4 ++-- modules/intermediate_format/markerset.xqm | 2 +- modules/intermediate_format/preprocessing.xqm | 4 ++-- modules/intermediate_format/whitespace-handling.xqm | 4 ++-- oxygen/devel/modules/outputtesting.xqm | 2 +- oxygen/devel/modules/unittesting.xqm | 4 ++-- oxygen/intermediate_format.oxygen.devel.xqm | 8 ++++---- oxygen/outputtest.oxygen.devel.xqm | 2 +- rest/intermediate_format.xql | 6 +++--- 10 files changed, 19 insertions(+), 19 deletions(-) diff --git a/expath-pkg.xml b/expath-pkg.xml index b5bd0b9..457f8c4 100644 --- a/expath-pkg.xml +++ b/expath-pkg.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<package xmlns="http://expath.org/ns/pkg" name="http://bdn-edition.de/intermediate_format" abbrev="interformat" version="0.2.4" spec="1.0"> +<package xmlns="http://expath.org/ns/pkg" name="http://bdn-edition.de/intermediate_format" abbrev="interformat" version="0.2.5" spec="1.0"> <title>BdN - Intermediate Format</title> <dependency package="http://exist-db.org/apps/shared"/> </package> \ No newline at end of file diff --git a/modules/intermediate_format/identification.xqm b/modules/intermediate_format/identification.xqm index 4f0f1b3..0b43eda 100644 --- a/modules/intermediate_format/identification.xqm +++ b/modules/intermediate_format/identification.xqm @@ -17,8 +17,8 @@ xquery version "3.0"; : @status working : @author Uwe Sikora :) -module namespace ident="http://bdn.edition.de/intermediate_format/identification"; -import module namespace markerset = "http://bdn.edition.de/intermediate_format/markerset" at "markerset.xqm"; +module namespace ident="http://bdn-edition.de/intermediate_format/identification"; +import module namespace markerset = "http://bdn-edition.de/intermediate_format/markerset" at "markerset.xqm"; declare default element namespace "http://www.tei-c.org/ns/1.0"; diff --git a/modules/intermediate_format/markerset.xqm b/modules/intermediate_format/markerset.xqm index 2566975..4a9f0fc 100644 --- a/modules/intermediate_format/markerset.xqm +++ b/modules/intermediate_format/markerset.xqm @@ -8,7 +8,7 @@ xquery version "3.0"; : @status working : @author Uwe Sikora, Michelles Rodzis :) -module namespace markerset="http://bdn.edition.de/intermediate_format/markerset"; +module namespace markerset="http://bdn-edition.de/intermediate_format/markerset"; declare default element namespace "http://www.tei-c.org/ns/1.0"; diff --git a/modules/intermediate_format/preprocessing.xqm b/modules/intermediate_format/preprocessing.xqm index 061e16c..436c3e6 100644 --- a/modules/intermediate_format/preprocessing.xqm +++ b/modules/intermediate_format/preprocessing.xqm @@ -10,8 +10,8 @@ xquery version "3.0"; : @status working : @author Uwe Sikora :) -module namespace pre="http://bdn.edition.de/intermediate_format/preprocessing"; -import module namespace whitespace = "http://bdn.edition.de/intermediate_format/whitespace_handling" at "whitespace-handling.xqm"; +module namespace pre="http://bdn-edition.de/intermediate_format/preprocessing"; +import module namespace whitespace = "http://bdn-edition.de/intermediate_format/whitespace_handling" at "whitespace-handling.xqm"; declare default element namespace "http://www.tei-c.org/ns/1.0"; diff --git a/modules/intermediate_format/whitespace-handling.xqm b/modules/intermediate_format/whitespace-handling.xqm index 4e797d5..485d513 100644 --- a/modules/intermediate_format/whitespace-handling.xqm +++ b/modules/intermediate_format/whitespace-handling.xqm @@ -8,8 +8,8 @@ xquery version "3.0"; : @status working : @author Uwe Sikora :) -module namespace whitespace="http://bdn.edition.de/intermediate_format/whitespace_handling"; -import module namespace pre="http://bdn.edition.de/intermediate_format/preprocessing" at "preprocessing.xqm"; +module namespace whitespace="http://bdn-edition.de/intermediate_format/whitespace_handling"; +import module namespace pre="http://bdn-edition.de/intermediate_format/preprocessing" at "preprocessing.xqm"; declare default element namespace "http://www.tei-c.org/ns/1.0"; diff --git a/oxygen/devel/modules/outputtesting.xqm b/oxygen/devel/modules/outputtesting.xqm index b002343..ddf7b8e 100644 --- a/oxygen/devel/modules/outputtesting.xqm +++ b/oxygen/devel/modules/outputtesting.xqm @@ -8,7 +8,7 @@ xquery version "3.0"; : @status development : @author Uwe Sikora :) -module namespace output="http://bdn.edition.de/intermediate_format/output_testing"; +module namespace output="http://bdn-edition.de/intermediate_format/output_testing"; (:declare default element namespace "http://www.tei-c.org/ns/1.0";:) declare namespace tei = "http://www.tei-c.org/ns/1.0"; diff --git a/oxygen/devel/modules/unittesting.xqm b/oxygen/devel/modules/unittesting.xqm index 6e13bf6..67d1e42 100644 --- a/oxygen/devel/modules/unittesting.xqm +++ b/oxygen/devel/modules/unittesting.xqm @@ -10,9 +10,9 @@ xquery version "3.0"; : @status development : @author Uwe Sikora :) -module namespace test="http://bdn.edition.de/intermediate_format/unit_testing"; +module namespace test="http://bdn-edition.de/intermediate_format/unit_testing"; -import module namespace ident = "http://bdn.edition.de/intermediate_format/identification" at "../../../modules/intermediate_format/identification.xqm"; +import module namespace ident = "http://bdn-edition.de/intermediate_format/identification" at "../../../modules/intermediate_format/identification.xqm"; declare namespace tei = "http://www.tei-c.org/ns/1.0"; diff --git a/oxygen/intermediate_format.oxygen.devel.xqm b/oxygen/intermediate_format.oxygen.devel.xqm index 8b4616e..2b1a66a 100644 --- a/oxygen/intermediate_format.oxygen.devel.xqm +++ b/oxygen/intermediate_format.oxygen.devel.xqm @@ -4,10 +4,10 @@ xquery version "3.0"; declare default element namespace "http://www.tei-c.org/ns/1.0"; import module namespace functx = "http://www.functx.com" at "functx.xqm"; -import module namespace markerset = "http://bdn.edition.de/intermediate_format/markerset" at "../modules/intermediate_format/markerset.xqm"; -import module namespace pre = "http://bdn.edition.de/intermediate_format/preprocessing" at "../modules/intermediate_format/preprocessing.xqm"; -import module namespace ident = "http://bdn.edition.de/intermediate_format/identification" at "../modules/intermediate_format/identification.xqm"; -import module namespace test = "http://bdn.edition.de/intermediate_format/unit_testing" at "devel/modules/unittesting.xqm"; +import module namespace markerset = "http://bdn-edition.de/intermediate_format/markerset" at "../modules/intermediate_format/markerset.xqm"; +import module namespace pre = "http://bdn-edition.de/intermediate_format/preprocessing" at "../modules/intermediate_format/preprocessing.xqm"; +import module namespace ident = "http://bdn-edition.de/intermediate_format/identification" at "../modules/intermediate_format/identification.xqm"; +import module namespace test = "http://bdn-edition.de/intermediate_format/unit_testing" at "devel/modules/unittesting.xqm"; (:declare namespace target = "http://www.interform.com/target_index"; import module "http://www.interform.com/target_index" at "targetindex.xqm"; :) diff --git a/oxygen/outputtest.oxygen.devel.xqm b/oxygen/outputtest.oxygen.devel.xqm index 8b71c70..4d024e9 100644 --- a/oxygen/outputtest.oxygen.devel.xqm +++ b/oxygen/outputtest.oxygen.devel.xqm @@ -3,7 +3,7 @@ xquery version "3.0"; declare default element namespace "http://www.tei-c.org/ns/1.0"; -import module namespace output = "http://bdn.edition.de/intermediate_format/output_testing" at "devel/modules/outputtesting.xqm"; +import module namespace output = "http://bdn-edition.de/intermediate_format/output_testing" at "devel/modules/outputtesting.xqm"; declare namespace tei = "http://www.tei-c.org/ns/1.0"; (:declare option saxon:output "indent=no";:) diff --git a/rest/intermediate_format.xql b/rest/intermediate_format.xql index 6b70285..4010b36 100644 --- a/rest/intermediate_format.xql +++ b/rest/intermediate_format.xql @@ -1,10 +1,10 @@ xquery version "3.1"; declare namespace tei = "http://www.tei-c.org/ns/1.0"; -import module namespace pre="http://bdn.edition.de/intermediate_format/preprocessing" at "xmldb:exist:///db/apps/interformat/modules/intermediate_format/preprocessing.xqm"; -import module namespace ident = "http://bdn.edition.de/intermediate_format/identification" at "xmldb:exist:///db/apps/interformat/modules/intermediate_format/identification.xqm"; +import module namespace pre="http://bdn-edition.de/intermediate_format/preprocessing" at "xmldb:exist:///db/apps/interformat/modules/intermediate_format/preprocessing.xqm"; +import module namespace ident = "http://bdn-edition.de/intermediate_format/identification" at "xmldb:exist:///db/apps/interformat/modules/intermediate_format/identification.xqm"; import module namespace config = "http://bdn-edition.de/intermediate_format/config" at "xmldb:exist:///db/apps/interformat/modules/config.xqm"; -import module namespace ifutils="http://bdn.edition.de/intermediate_format/utils" at "xmldb:exist:///db/apps/interformat/modules/ifutils.xqm"; +import module namespace ifutils="http://bdn-edition.de/intermediate_format/utils" at "xmldb:exist:///db/apps/interformat/modules/ifutils.xqm"; import module namespace console="http://exist-db.org/xquery/console"; (: http://localhost:8080/exist/rest/apps/interformat/rest/intermediate_format.xql :) -- GitLab