From 1301dac1c056ec60fe6bcc1d9592ce0e290e85d9 Mon Sep 17 00:00:00 2001 From: Bert Frees Date: Fri, 19 Jun 2015 20:44:59 +0200 Subject: [PATCH] Loose coupling with calabash and saxon modules using Provide-Capability This also implies making calabash and saxon modules API-less. pef-to-html had to be merged into pef-utils. -> see issue https://github.com/snaekobbi/pipeline-mod-braille/issues/49 --- bom/pom.xml | 5 -- catalog.xml | 5 -- pipeline-braille-scripts/zedai-to-pef/pom.xml | 10 ++++ .../src/test/java/ZedaiToPefTest.java | 2 - .../css-utils/css-calabash/pom.xml | 1 + .../src/main/resources/META-INF/catalog.xml | 6 --- .../library.xpl => test/resources/inline.xpl} | 0 .../src/test/xprocspec/test_content.xprocspec | 2 +- .../test/xprocspec/test_encoding.xprocspec | 2 +- .../src/test/xprocspec/test_import.xprocspec | 2 +- .../src/test/xprocspec/test_media.xprocspec | 2 +- .../src/test/xprocspec/test_page.xprocspec | 2 +- .../test/xprocspec/test_properties.xprocspec | 2 +- .../test/xprocspec/test_selectors.xprocspec | 2 +- .../css-utils/css-utils/pom.xml | 14 ++++++ .../src/main/resources/META-INF/catalog.xml | 1 - .../src/main/resources/xml/library.xpl | 13 +++-- .../dotify-utils/dotify-calabash/pom.xml | 1 + .../src/main/resources/META-INF/catalog.xml | 6 --- .../src/main/resources/xml/library.xpl | 13 ----- .../dotify-utils/dotify-formatter/pom.xml | 2 +- .../src/main/resources/META-INF/catalog.xml | 2 +- .../src/main/resources/xml/format.xpl | 2 +- .../src/test/java/DotifyFormatterTest.java | 4 +- .../test/xprocspec/test_obfl-to-pef.xprocspec | 2 +- .../dotify-utils/dotify-saxon/pom.xml | 1 + .../dotify-utils/dotify-utils/pom.xml | 14 ++++++ .../src/main/resources/META-INF/catalog.xml | 2 - .../src/main/resources/xml/library.xpl | 11 +++- .../liblouis-utils/liblouis-calabash/pom.xml | 1 + .../src/main/resources/META-INF/catalog.xml | 6 --- .../src/main/resources/xml/library.xpl | 18 ------- .../liblouis-utils/liblouis-core/pom.xml | 17 ++++--- .../liblouis-utils/liblouis-formatter/pom.xml | 7 ++- .../src/main/resources/META-INF/catalog.xml | 2 +- .../main/resources/xml/translate-files.xpl | 2 +- .../src/test/java/LiblouisFormatterTest.java | 6 ++- .../src/test/xprocspec/test_lists.xprocspec | 0 .../src/test/xprocspec/test_tables.xprocspec | 0 .../src/test/xprocspec/test_toc.xprocspec | 0 .../liblouis-utils/liblouis-mathml/pom.xml | 7 +-- .../src/main/resources/META-INF/catalog.xml | 2 +- .../main/resources/xml/translate-mathml.xpl | 2 +- .../src/test/java/LiblouisMathMLTest.java | 4 ++ .../liblouis-utils/liblouis-saxon/pom.xml | 4 ++ .../liblouis-utils/liblouis-utils/pom.xml | 30 +++++++---- .../src/main/resources/META-INF/catalog.xml | 2 - .../src/main/resources/xml/library.xpl | 11 ++++ .../src/test/java/LiblouisUtilsTest.java | 36 ++++--------- pipeline-braille-utils/pef-utils/README.md | 2 - .../pef-utils/pef-calabash/pom.xml | 5 ++ .../src/main/resources/META-INF/catalog.xml | 6 --- .../src/main/resources/xml/library.xpl | 9 ---- .../xml => test/resources}/pef2text.xpl | 0 .../xml => test/resources}/text2pef.xpl | 0 .../xml => test/resources}/validate.xpl | 0 .../test/xprocspec/test_pef2text.xprocspec | 2 +- .../test/xprocspec/test_text2pef.xprocspec | 2 +- .../pef-utils/pef-saxon/pom.xml | 3 ++ .../pef-utils/pef-to-html/pom.xml | 30 ----------- .../src/main/resources/META-INF/catalog.xml | 7 --- .../src/main/resources/xml/library.xpl | 6 --- .../pef-utils/pef-utils/pom.xml | 50 +++++++++++++------ .../src/main/resources/META-INF/catalog.xml | 3 -- .../src/main/resources/xml/library.xpl | 20 ++++++-- .../src/main/resources/xml/pef-padding.xsl | 0 .../src/main/resources/xml/pef-preview.css | 0 .../src/main/resources/xml/pef-preview.js | 0 .../src/main/resources/xml/pef-preview.xsl | 0 .../resources/xml/pef-to-html.convert.xpl | 0 .../src/main/resources/xml/pef2text.xpl | 14 ++++++ .../src/main/resources/xml/store.xpl | 4 +- .../src/main/resources/xml/text2pef.xpl | 16 ++++++ .../src/main/resources/xml/validate.xpl | 13 +++++ pipeline-braille-utils/pef-utils/pom.xml | 1 - 75 files changed, 256 insertions(+), 225 deletions(-) delete mode 100644 pipeline-braille-utils/css-utils/css-calabash/src/main/resources/META-INF/catalog.xml rename pipeline-braille-utils/css-utils/css-calabash/src/{main/resources/xml/library.xpl => test/resources/inline.xpl} (100%) delete mode 100644 pipeline-braille-utils/dotify-utils/dotify-calabash/src/main/resources/META-INF/catalog.xml delete mode 100644 pipeline-braille-utils/dotify-utils/dotify-calabash/src/main/resources/xml/library.xpl delete mode 100644 pipeline-braille-utils/liblouis-utils/liblouis-calabash/src/main/resources/META-INF/catalog.xml delete mode 100644 pipeline-braille-utils/liblouis-utils/liblouis-calabash/src/main/resources/xml/library.xpl rename pipeline-braille-utils/liblouis-utils/{liblouis-utils => liblouis-formatter}/src/test/xprocspec/test_lists.xprocspec (100%) rename pipeline-braille-utils/liblouis-utils/{liblouis-utils => liblouis-formatter}/src/test/xprocspec/test_tables.xprocspec (100%) rename pipeline-braille-utils/liblouis-utils/{liblouis-utils => liblouis-formatter}/src/test/xprocspec/test_toc.xprocspec (100%) delete mode 100755 pipeline-braille-utils/pef-utils/pef-calabash/src/main/resources/META-INF/catalog.xml delete mode 100644 pipeline-braille-utils/pef-utils/pef-calabash/src/main/resources/xml/library.xpl rename pipeline-braille-utils/pef-utils/pef-calabash/src/{main/resources/xml => test/resources}/pef2text.xpl (100%) rename pipeline-braille-utils/pef-utils/pef-calabash/src/{main/resources/xml => test/resources}/text2pef.xpl (100%) rename pipeline-braille-utils/pef-utils/pef-calabash/src/{main/resources/xml => test/resources}/validate.xpl (100%) delete mode 100644 pipeline-braille-utils/pef-utils/pef-to-html/pom.xml delete mode 100644 pipeline-braille-utils/pef-utils/pef-to-html/src/main/resources/META-INF/catalog.xml delete mode 100644 pipeline-braille-utils/pef-utils/pef-to-html/src/main/resources/xml/library.xpl rename pipeline-braille-utils/pef-utils/{pef-to-html => pef-utils}/src/main/resources/xml/pef-padding.xsl (100%) rename pipeline-braille-utils/pef-utils/{pef-to-html => pef-utils}/src/main/resources/xml/pef-preview.css (100%) rename pipeline-braille-utils/pef-utils/{pef-to-html => pef-utils}/src/main/resources/xml/pef-preview.js (100%) rename pipeline-braille-utils/pef-utils/{pef-to-html => pef-utils}/src/main/resources/xml/pef-preview.xsl (100%) rename pipeline-braille-utils/pef-utils/{pef-to-html => pef-utils}/src/main/resources/xml/pef-to-html.convert.xpl (100%) create mode 100755 pipeline-braille-utils/pef-utils/pef-utils/src/main/resources/xml/pef2text.xpl create mode 100755 pipeline-braille-utils/pef-utils/pef-utils/src/main/resources/xml/text2pef.xpl create mode 100755 pipeline-braille-utils/pef-utils/pef-utils/src/main/resources/xml/validate.xpl diff --git a/bom/pom.xml b/bom/pom.xml index 63cbae54b..7a16fff1a 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -179,11 +179,6 @@ pef-saxon 1.1.2-SNAPSHOT - - org.daisy.pipeline.modules.braille - pef-to-html - 1.1.0 - org.daisy.pipeline.modules.braille pef-utils diff --git a/catalog.xml b/catalog.xml index 149143d6a..35fba2f1e 100644 --- a/catalog.xml +++ b/catalog.xml @@ -4,20 +4,15 @@ - - - - - diff --git a/pipeline-braille-scripts/zedai-to-pef/pom.xml b/pipeline-braille-scripts/zedai-to-pef/pom.xml index 2c595c3ab..9553dc452 100644 --- a/pipeline-braille-scripts/zedai-to-pef/pom.xml +++ b/pipeline-braille-scripts/zedai-to-pef/pom.xml @@ -72,6 +72,16 @@ liblouis-tables test + + org.daisy.pipeline.modules.braille + liblouis-formatter + test + + + org.daisy.pipeline.modules.braille + dotify-formatter + test + org.daisy.maven xproc-engine-daisy-pipeline diff --git a/pipeline-braille-scripts/zedai-to-pef/src/test/java/ZedaiToPefTest.java b/pipeline-braille-scripts/zedai-to-pef/src/test/java/ZedaiToPefTest.java index 3fa620e0f..4f4e5b018 100644 --- a/pipeline-braille-scripts/zedai-to-pef/src/test/java/ZedaiToPefTest.java +++ b/pipeline-braille-scripts/zedai-to-pef/src/test/java/ZedaiToPefTest.java @@ -62,7 +62,6 @@ public Option[] config() { brailleModule("liblouis-saxon"), brailleModule("liblouis-calabash"), brailleModule("liblouis-formatter"), - brailleModule("liblouis-mathml"), brailleModule("liblouis-utils"), brailleModule("liblouis-tables"), brailleModule("libhyphen-core"), @@ -77,7 +76,6 @@ public Option[] config() { brailleModule("pef-core"), brailleModule("pef-calabash"), brailleModule("pef-saxon"), - brailleModule("pef-to-html"), brailleModule("pef-utils"), forThisPlatform(brailleModule("liblouis-native")), pipelineModule("file-utils"), diff --git a/pipeline-braille-utils/css-utils/css-calabash/pom.xml b/pipeline-braille-utils/css-utils/css-calabash/pom.xml index 93bd98340..b31e42f6b 100644 --- a/pipeline-braille-utils/css-utils/css-calabash/pom.xml +++ b/pipeline-braille-utils/css-utils/css-calabash/pom.xml @@ -152,6 +152,7 @@ <_dsannotations>* + xproc.step;name="{http://www.daisy.org/ns/pipeline/braille-css}inline" diff --git a/pipeline-braille-utils/css-utils/css-calabash/src/main/resources/META-INF/catalog.xml b/pipeline-braille-utils/css-utils/css-calabash/src/main/resources/META-INF/catalog.xml deleted file mode 100644 index 112417ce1..000000000 --- a/pipeline-braille-utils/css-utils/css-calabash/src/main/resources/META-INF/catalog.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - diff --git a/pipeline-braille-utils/css-utils/css-calabash/src/main/resources/xml/library.xpl b/pipeline-braille-utils/css-utils/css-calabash/src/test/resources/inline.xpl similarity index 100% rename from pipeline-braille-utils/css-utils/css-calabash/src/main/resources/xml/library.xpl rename to pipeline-braille-utils/css-utils/css-calabash/src/test/resources/inline.xpl diff --git a/pipeline-braille-utils/css-utils/css-calabash/src/test/xprocspec/test_content.xprocspec b/pipeline-braille-utils/css-utils/css-calabash/src/test/xprocspec/test_content.xprocspec index 6fe46a3ae..aafd228d6 100644 --- a/pipeline-braille-utils/css-utils/css-calabash/src/test/xprocspec/test_content.xprocspec +++ b/pipeline-braille-utils/css-utils/css-calabash/src/test/xprocspec/test_content.xprocspec @@ -1,7 +1,7 @@ + script="../resources/inline.xpl"> diff --git a/pipeline-braille-utils/css-utils/css-calabash/src/test/xprocspec/test_encoding.xprocspec b/pipeline-braille-utils/css-utils/css-calabash/src/test/xprocspec/test_encoding.xprocspec index 9461cd195..6a36ef874 100644 --- a/pipeline-braille-utils/css-utils/css-calabash/src/test/xprocspec/test_encoding.xprocspec +++ b/pipeline-braille-utils/css-utils/css-calabash/src/test/xprocspec/test_encoding.xprocspec @@ -1,7 +1,7 @@ + script="../resources/inline.xpl"> diff --git a/pipeline-braille-utils/css-utils/css-calabash/src/test/xprocspec/test_import.xprocspec b/pipeline-braille-utils/css-utils/css-calabash/src/test/xprocspec/test_import.xprocspec index a91331a45..460116475 100644 --- a/pipeline-braille-utils/css-utils/css-calabash/src/test/xprocspec/test_import.xprocspec +++ b/pipeline-braille-utils/css-utils/css-calabash/src/test/xprocspec/test_import.xprocspec @@ -1,7 +1,7 @@ + script="../resources/inline.xpl"> diff --git a/pipeline-braille-utils/css-utils/css-calabash/src/test/xprocspec/test_media.xprocspec b/pipeline-braille-utils/css-utils/css-calabash/src/test/xprocspec/test_media.xprocspec index 5ca24749c..adc56d1b4 100644 --- a/pipeline-braille-utils/css-utils/css-calabash/src/test/xprocspec/test_media.xprocspec +++ b/pipeline-braille-utils/css-utils/css-calabash/src/test/xprocspec/test_media.xprocspec @@ -1,7 +1,7 @@ + script="../resources/inline.xpl"> diff --git a/pipeline-braille-utils/css-utils/css-calabash/src/test/xprocspec/test_page.xprocspec b/pipeline-braille-utils/css-utils/css-calabash/src/test/xprocspec/test_page.xprocspec index ce290ea85..9c397f7a1 100644 --- a/pipeline-braille-utils/css-utils/css-calabash/src/test/xprocspec/test_page.xprocspec +++ b/pipeline-braille-utils/css-utils/css-calabash/src/test/xprocspec/test_page.xprocspec @@ -1,7 +1,7 @@ + script="../resources/inline.xpl"> diff --git a/pipeline-braille-utils/css-utils/css-calabash/src/test/xprocspec/test_properties.xprocspec b/pipeline-braille-utils/css-utils/css-calabash/src/test/xprocspec/test_properties.xprocspec index 052b15b34..1b917374a 100644 --- a/pipeline-braille-utils/css-utils/css-calabash/src/test/xprocspec/test_properties.xprocspec +++ b/pipeline-braille-utils/css-utils/css-calabash/src/test/xprocspec/test_properties.xprocspec @@ -1,7 +1,7 @@ + script="../resources/inline.xpl"> diff --git a/pipeline-braille-utils/css-utils/css-calabash/src/test/xprocspec/test_selectors.xprocspec b/pipeline-braille-utils/css-utils/css-calabash/src/test/xprocspec/test_selectors.xprocspec index da35612cd..e5da1c144 100644 --- a/pipeline-braille-utils/css-utils/css-calabash/src/test/xprocspec/test_selectors.xprocspec +++ b/pipeline-braille-utils/css-utils/css-calabash/src/test/xprocspec/test_selectors.xprocspec @@ -1,7 +1,7 @@ + script="../resources/inline.xpl"> diff --git a/pipeline-braille-utils/css-utils/css-utils/pom.xml b/pipeline-braille-utils/css-utils/css-utils/pom.xml index 4eb5bb0ba..6f224290d 100644 --- a/pipeline-braille-utils/css-utils/css-utils/pom.xml +++ b/pipeline-braille-utils/css-utils/css-utils/pom.xml @@ -25,10 +25,14 @@ css-core runtime + org.daisy.pipeline.modules.braille css-calabash runtime + - + + + + + diff --git a/pipeline-braille-utils/dotify-utils/dotify-calabash/pom.xml b/pipeline-braille-utils/dotify-utils/dotify-calabash/pom.xml index 8f279bd3c..324b0902b 100644 --- a/pipeline-braille-utils/dotify-utils/dotify-calabash/pom.xml +++ b/pipeline-braille-utils/dotify-utils/dotify-calabash/pom.xml @@ -100,6 +100,7 @@ <_dsannotations>* + xproc.step;name="{http://code.google.com/p/dotify/}obfl-to-pef" diff --git a/pipeline-braille-utils/dotify-utils/dotify-calabash/src/main/resources/META-INF/catalog.xml b/pipeline-braille-utils/dotify-utils/dotify-calabash/src/main/resources/META-INF/catalog.xml deleted file mode 100644 index 925cd7e26..000000000 --- a/pipeline-braille-utils/dotify-utils/dotify-calabash/src/main/resources/META-INF/catalog.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - diff --git a/pipeline-braille-utils/dotify-utils/dotify-calabash/src/main/resources/xml/library.xpl b/pipeline-braille-utils/dotify-utils/dotify-calabash/src/main/resources/xml/library.xpl deleted file mode 100644 index 14352589b..000000000 --- a/pipeline-braille-utils/dotify-utils/dotify-calabash/src/main/resources/xml/library.xpl +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - diff --git a/pipeline-braille-utils/dotify-utils/dotify-formatter/pom.xml b/pipeline-braille-utils/dotify-utils/dotify-formatter/pom.xml index 6d10dc04a..46dcbb2a0 100644 --- a/pipeline-braille-utils/dotify-utils/dotify-formatter/pom.xml +++ b/pipeline-braille-utils/dotify-utils/dotify-formatter/pom.xml @@ -54,7 +54,7 @@ org.daisy.pipeline.modules.braille - dotify-calabash + dotify-utils runtime diff --git a/pipeline-braille-utils/dotify-utils/dotify-formatter/src/main/resources/META-INF/catalog.xml b/pipeline-braille-utils/dotify-utils/dotify-formatter/src/main/resources/META-INF/catalog.xml index 65311a215..1d29871e3 100644 --- a/pipeline-braille-utils/dotify-utils/dotify-formatter/src/main/resources/META-INF/catalog.xml +++ b/pipeline-braille-utils/dotify-utils/dotify-formatter/src/main/resources/META-INF/catalog.xml @@ -3,5 +3,5 @@ PUBLIC "-//OASIS/DTD Entity Resolution XML Catalog V1.0//EN" "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd"> - + diff --git a/pipeline-braille-utils/dotify-utils/dotify-formatter/src/main/resources/xml/format.xpl b/pipeline-braille-utils/dotify-utils/dotify-formatter/src/main/resources/xml/format.xpl index 29ed2b444..c0f5a9f15 100644 --- a/pipeline-braille-utils/dotify-utils/dotify-formatter/src/main/resources/xml/format.xpl +++ b/pipeline-braille-utils/dotify-utils/dotify-formatter/src/main/resources/xml/format.xpl @@ -13,7 +13,7 @@ - + diff --git a/pipeline-braille-utils/dotify-utils/dotify-formatter/src/test/java/DotifyFormatterTest.java b/pipeline-braille-utils/dotify-utils/dotify-formatter/src/test/java/DotifyFormatterTest.java index 7a56305ff..c23acd612 100644 --- a/pipeline-braille-utils/dotify-utils/dotify-formatter/src/test/java/DotifyFormatterTest.java +++ b/pipeline-braille-utils/dotify-utils/dotify-formatter/src/test/java/DotifyFormatterTest.java @@ -60,14 +60,16 @@ public Option[] config() { brailleModule("pef-core"), brailleModule("pef-calabash"), brailleModule("pef-saxon"), - brailleModule("pef-to-html"), brailleModule("pef-utils"), pipelineModule("file-utils"), brailleModule("obfl-utils"), brailleModule("css-core"), brailleModule("css-calabash"), brailleModule("css-utils"), + brailleModule("dotify-core"), + brailleModule("dotify-saxon"), brailleModule("dotify-calabash"), + brailleModule("dotify-utils"), xspecBundles(), xprocspecBundles(), thisBundle("org.daisy.pipeline.modules.braille", "dotify-formatter"), diff --git a/pipeline-braille-utils/dotify-utils/dotify-formatter/src/test/xprocspec/test_obfl-to-pef.xprocspec b/pipeline-braille-utils/dotify-utils/dotify-formatter/src/test/xprocspec/test_obfl-to-pef.xprocspec index 2d35422ea..6184bfe8c 100644 --- a/pipeline-braille-utils/dotify-utils/dotify-formatter/src/test/xprocspec/test_obfl-to-pef.xprocspec +++ b/pipeline-braille-utils/dotify-utils/dotify-formatter/src/test/xprocspec/test_obfl-to-pef.xprocspec @@ -9,7 +9,7 @@ - + diff --git a/pipeline-braille-utils/dotify-utils/dotify-saxon/pom.xml b/pipeline-braille-utils/dotify-utils/dotify-saxon/pom.xml index a1bd3be56..ba8dfdfcf 100644 --- a/pipeline-braille-utils/dotify-utils/dotify-saxon/pom.xml +++ b/pipeline-braille-utils/dotify-utils/dotify-saxon/pom.xml @@ -99,6 +99,7 @@ <_dsannotations>* + xpath.function;name="{http://code.google.com/p/dotify/}translate" diff --git a/pipeline-braille-utils/dotify-utils/dotify-utils/pom.xml b/pipeline-braille-utils/dotify-utils/dotify-utils/pom.xml index 01e58641d..b16ffcbf3 100644 --- a/pipeline-braille-utils/dotify-utils/dotify-utils/pom.xml +++ b/pipeline-braille-utils/dotify-utils/dotify-utils/pom.xml @@ -46,22 +46,32 @@ css-utils runtime + org.daisy.pipeline.modules.braille dotify-saxon runtime + org.daisy.pipeline.modules.braille dotify-calabash runtime + + + @@ -77,6 +87,10 @@ <_dsannotations> org.daisy.pipeline.braille.dotify.impl.DotifyCSSBlockTransform$Provider + + xproc.step;filter:="(name={http://code.google.com/p/dotify/}obfl-to-pef)", + xpath.function;filter:="(name={http://code.google.com/p/dotify/}translate)" + diff --git a/pipeline-braille-utils/dotify-utils/dotify-utils/src/main/resources/META-INF/catalog.xml b/pipeline-braille-utils/dotify-utils/dotify-utils/src/main/resources/META-INF/catalog.xml index a8dbf196a..2c8ae7ec5 100644 --- a/pipeline-braille-utils/dotify-utils/dotify-utils/src/main/resources/META-INF/catalog.xml +++ b/pipeline-braille-utils/dotify-utils/dotify-utils/src/main/resources/META-INF/catalog.xml @@ -5,6 +5,4 @@ - - diff --git a/pipeline-braille-utils/dotify-utils/dotify-utils/src/main/resources/xml/library.xpl b/pipeline-braille-utils/dotify-utils/dotify-utils/src/main/resources/xml/library.xpl index 022cea972..14352589b 100644 --- a/pipeline-braille-utils/dotify-utils/dotify-utils/src/main/resources/xml/library.xpl +++ b/pipeline-braille-utils/dotify-utils/dotify-utils/src/main/resources/xml/library.xpl @@ -1,4 +1,13 @@ - + + + + + + + + diff --git a/pipeline-braille-utils/liblouis-utils/liblouis-calabash/pom.xml b/pipeline-braille-utils/liblouis-utils/liblouis-calabash/pom.xml index 309d6efa0..10c8180b8 100644 --- a/pipeline-braille-utils/liblouis-utils/liblouis-calabash/pom.xml +++ b/pipeline-braille-utils/liblouis-utils/liblouis-calabash/pom.xml @@ -93,6 +93,7 @@ <_dsannotations>* + xproc.step;name="{http://liblouis.org/liblouis}translate-file" diff --git a/pipeline-braille-utils/liblouis-utils/liblouis-calabash/src/main/resources/META-INF/catalog.xml b/pipeline-braille-utils/liblouis-utils/liblouis-calabash/src/main/resources/META-INF/catalog.xml deleted file mode 100644 index 8218142ae..000000000 --- a/pipeline-braille-utils/liblouis-utils/liblouis-calabash/src/main/resources/META-INF/catalog.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - diff --git a/pipeline-braille-utils/liblouis-utils/liblouis-calabash/src/main/resources/xml/library.xpl b/pipeline-braille-utils/liblouis-utils/liblouis-calabash/src/main/resources/xml/library.xpl deleted file mode 100644 index 3f1203bd4..000000000 --- a/pipeline-braille-utils/liblouis-utils/liblouis-calabash/src/main/resources/xml/library.xpl +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/pipeline-braille-utils/liblouis-utils/liblouis-core/pom.xml b/pipeline-braille-utils/liblouis-utils/liblouis-core/pom.xml index adb102025..547d29681 100644 --- a/pipeline-braille-utils/liblouis-utils/liblouis-core/pom.xml +++ b/pipeline-braille-utils/liblouis-utils/liblouis-core/pom.xml @@ -65,12 +65,17 @@ linux runtime - - - - - - + + diff --git a/pipeline-braille-utils/liblouis-utils/liblouis-formatter/pom.xml b/pipeline-braille-utils/liblouis-utils/liblouis-formatter/pom.xml index 6ae7a69b9..c212b48c4 100644 --- a/pipeline-braille-utils/liblouis-utils/liblouis-formatter/pom.xml +++ b/pipeline-braille-utils/liblouis-utils/liblouis-formatter/pom.xml @@ -48,7 +48,7 @@ --> org.daisy.pipeline.modules.braille - liblouis-calabash + liblouis-utils runtime @@ -130,6 +130,11 @@ + + org.daisy.pipeline.modules.braille + liblouis-tables + test + org.daisy.maven xproc-engine-daisy-pipeline diff --git a/pipeline-braille-utils/liblouis-utils/liblouis-formatter/src/main/resources/META-INF/catalog.xml b/pipeline-braille-utils/liblouis-utils/liblouis-formatter/src/main/resources/META-INF/catalog.xml index 71ae56a97..5d455b67c 100644 --- a/pipeline-braille-utils/liblouis-utils/liblouis-formatter/src/main/resources/META-INF/catalog.xml +++ b/pipeline-braille-utils/liblouis-utils/liblouis-formatter/src/main/resources/META-INF/catalog.xml @@ -7,5 +7,5 @@ - + diff --git a/pipeline-braille-utils/liblouis-utils/liblouis-formatter/src/main/resources/xml/translate-files.xpl b/pipeline-braille-utils/liblouis-utils/liblouis-formatter/src/main/resources/xml/translate-files.xpl index 8b7338b56..febd768cf 100644 --- a/pipeline-braille-utils/liblouis-utils/liblouis-formatter/src/main/resources/xml/translate-files.xpl +++ b/pipeline-braille-utils/liblouis-utils/liblouis-formatter/src/main/resources/xml/translate-files.xpl @@ -20,7 +20,7 @@ - + diff --git a/pipeline-braille-utils/liblouis-utils/liblouis-formatter/src/test/java/LiblouisFormatterTest.java b/pipeline-braille-utils/liblouis-utils/liblouis-formatter/src/test/java/LiblouisFormatterTest.java index 2f701dbce..f418c0af4 100644 --- a/pipeline-braille-utils/liblouis-utils/liblouis-formatter/src/test/java/LiblouisFormatterTest.java +++ b/pipeline-braille-utils/liblouis-utils/liblouis-formatter/src/test/java/LiblouisFormatterTest.java @@ -55,16 +55,20 @@ public Option[] config() { mavenBundle().groupId("org.daisy.libs").artifactId("jstyleparser").versionAsInProject(), mavenBundle().groupId("org.daisy.braille").artifactId("braille-css").versionAsInProject(), mavenBundle().groupId("org.liblouis").artifactId("liblouis-java").versionAsInProject(), + mavenBundle().groupId("org.daisy.bindings").artifactId("jhyphen").versionAsInProject(), brailleModule("common-utils"), brailleModule("liblouis-core"), + brailleModule("liblouis-saxon"), brailleModule("liblouis-calabash"), + brailleModule("liblouis-utils"), + brailleModule("liblouis-tables"), + brailleModule("libhyphen-core"), brailleModule("css-core"), brailleModule("css-calabash"), brailleModule("css-utils"), brailleModule("pef-core"), brailleModule("pef-calabash"), brailleModule("pef-saxon"), - brailleModule("pef-to-html"), brailleModule("pef-utils"), forThisPlatform(brailleModule("liblouis-native")), pipelineModule("file-utils"), diff --git a/pipeline-braille-utils/liblouis-utils/liblouis-utils/src/test/xprocspec/test_lists.xprocspec b/pipeline-braille-utils/liblouis-utils/liblouis-formatter/src/test/xprocspec/test_lists.xprocspec similarity index 100% rename from pipeline-braille-utils/liblouis-utils/liblouis-utils/src/test/xprocspec/test_lists.xprocspec rename to pipeline-braille-utils/liblouis-utils/liblouis-formatter/src/test/xprocspec/test_lists.xprocspec diff --git a/pipeline-braille-utils/liblouis-utils/liblouis-utils/src/test/xprocspec/test_tables.xprocspec b/pipeline-braille-utils/liblouis-utils/liblouis-formatter/src/test/xprocspec/test_tables.xprocspec similarity index 100% rename from pipeline-braille-utils/liblouis-utils/liblouis-utils/src/test/xprocspec/test_tables.xprocspec rename to pipeline-braille-utils/liblouis-utils/liblouis-formatter/src/test/xprocspec/test_tables.xprocspec diff --git a/pipeline-braille-utils/liblouis-utils/liblouis-utils/src/test/xprocspec/test_toc.xprocspec b/pipeline-braille-utils/liblouis-utils/liblouis-formatter/src/test/xprocspec/test_toc.xprocspec similarity index 100% rename from pipeline-braille-utils/liblouis-utils/liblouis-utils/src/test/xprocspec/test_toc.xprocspec rename to pipeline-braille-utils/liblouis-utils/liblouis-formatter/src/test/xprocspec/test_toc.xprocspec diff --git a/pipeline-braille-utils/liblouis-utils/liblouis-mathml/pom.xml b/pipeline-braille-utils/liblouis-utils/liblouis-mathml/pom.xml index 01f4f0ff4..84993dfb8 100644 --- a/pipeline-braille-utils/liblouis-utils/liblouis-mathml/pom.xml +++ b/pipeline-braille-utils/liblouis-utils/liblouis-mathml/pom.xml @@ -39,12 +39,7 @@ --> org.daisy.pipeline.modules.braille - liblouis-core - runtime - - - org.daisy.pipeline.modules.braille - liblouis-calabash + liblouis-utils runtime diff --git a/pipeline-braille-utils/liblouis-utils/liblouis-mathml/src/main/resources/META-INF/catalog.xml b/pipeline-braille-utils/liblouis-utils/liblouis-mathml/src/main/resources/META-INF/catalog.xml index a0e5be280..c558d5a72 100644 --- a/pipeline-braille-utils/liblouis-utils/liblouis-mathml/src/main/resources/META-INF/catalog.xml +++ b/pipeline-braille-utils/liblouis-utils/liblouis-mathml/src/main/resources/META-INF/catalog.xml @@ -4,5 +4,5 @@ - + diff --git a/pipeline-braille-utils/liblouis-utils/liblouis-mathml/src/main/resources/xml/translate-mathml.xpl b/pipeline-braille-utils/liblouis-utils/liblouis-mathml/src/main/resources/xml/translate-mathml.xpl index a29b9c1ca..fbfc810ba 100644 --- a/pipeline-braille-utils/liblouis-utils/liblouis-mathml/src/main/resources/xml/translate-mathml.xpl +++ b/pipeline-braille-utils/liblouis-utils/liblouis-mathml/src/main/resources/xml/translate-mathml.xpl @@ -12,7 +12,7 @@ - + diff --git a/pipeline-braille-utils/liblouis-utils/liblouis-mathml/src/test/java/LiblouisMathMLTest.java b/pipeline-braille-utils/liblouis-utils/liblouis-mathml/src/test/java/LiblouisMathMLTest.java index 0d71cb7c5..e06d044cc 100644 --- a/pipeline-braille-utils/liblouis-utils/liblouis-mathml/src/test/java/LiblouisMathMLTest.java +++ b/pipeline-braille-utils/liblouis-utils/liblouis-mathml/src/test/java/LiblouisMathMLTest.java @@ -54,9 +54,13 @@ public Option[] config() { mavenBundle().groupId("org.daisy.libs").artifactId("jing").versionAsInProject(), brailleModule("common-utils"), brailleModule("css-core"), + brailleModule("css-calabash"), + brailleModule("css-utils"), brailleModule("pef-core"), brailleModule("liblouis-core"), + brailleModule("liblouis-saxon"), brailleModule("liblouis-calabash"), + brailleModule("liblouis-utils"), forThisPlatform(brailleModule("liblouis-native")), pipelineModule("file-utils"), pipelineModule("common-utils"), diff --git a/pipeline-braille-utils/liblouis-utils/liblouis-saxon/pom.xml b/pipeline-braille-utils/liblouis-utils/liblouis-saxon/pom.xml index 772c6888d..d78467ca1 100644 --- a/pipeline-braille-utils/liblouis-utils/liblouis-saxon/pom.xml +++ b/pipeline-braille-utils/liblouis-utils/liblouis-saxon/pom.xml @@ -98,6 +98,10 @@ <_dsannotations>* + + xpath.function;name="{http://liblouis.org/liblouis}translate", + xpath.function;name="{http://liblouis.org/liblouis}hyphenate" + diff --git a/pipeline-braille-utils/liblouis-utils/liblouis-utils/pom.xml b/pipeline-braille-utils/liblouis-utils/liblouis-utils/pom.xml index 7f34e04ba..0f33ddd4c 100644 --- a/pipeline-braille-utils/liblouis-utils/liblouis-utils/pom.xml +++ b/pipeline-braille-utils/liblouis-utils/liblouis-utils/pom.xml @@ -46,16 +46,30 @@ + + org.daisy.pipeline.modules.braille + css-utils + runtime + + org.daisy.pipeline.modules.braille liblouis-saxon runtime + org.daisy.pipeline.modules.braille liblouis-calabash runtime + + + @@ -81,11 +91,6 @@ liblouis-tables test - - org.daisy.pipeline.modules.braille - pef-utils - test - org.daisy.maven xproc-engine-daisy-pipeline @@ -154,6 +159,11 @@ <_dsannotations> org.daisy.pipeline.braille.liblouis.impl.LiblouisCSSBlockTransform$Provider + + xproc.step;filter:="(name={http://liblouis.org/liblouis}translate-file)", + xpath.function;filter:="(name={http://liblouis.org/liblouis}translate)", + xpath.function;filter:="(name={http://liblouis.org/liblouis}hyphenate)" + diff --git a/pipeline-braille-utils/liblouis-utils/liblouis-utils/src/main/resources/META-INF/catalog.xml b/pipeline-braille-utils/liblouis-utils/liblouis-utils/src/main/resources/META-INF/catalog.xml index 5a6fdbf1f..33de94006 100644 --- a/pipeline-braille-utils/liblouis-utils/liblouis-utils/src/main/resources/META-INF/catalog.xml +++ b/pipeline-braille-utils/liblouis-utils/liblouis-utils/src/main/resources/META-INF/catalog.xml @@ -5,6 +5,4 @@ - - diff --git a/pipeline-braille-utils/liblouis-utils/liblouis-utils/src/main/resources/xml/library.xpl b/pipeline-braille-utils/liblouis-utils/liblouis-utils/src/main/resources/xml/library.xpl index 7703c5463..7b63e0db0 100755 --- a/pipeline-braille-utils/liblouis-utils/liblouis-utils/src/main/resources/xml/library.xpl +++ b/pipeline-braille-utils/liblouis-utils/liblouis-utils/src/main/resources/xml/library.xpl @@ -1,4 +1,15 @@ + + + + + + + + + + + diff --git a/pipeline-braille-utils/liblouis-utils/liblouis-utils/src/test/java/LiblouisUtilsTest.java b/pipeline-braille-utils/liblouis-utils/liblouis-utils/src/test/java/LiblouisUtilsTest.java index 0772b05cd..9a873a844 100644 --- a/pipeline-braille-utils/liblouis-utils/liblouis-utils/src/test/java/LiblouisUtilsTest.java +++ b/pipeline-braille-utils/liblouis-utils/liblouis-utils/src/test/java/LiblouisUtilsTest.java @@ -50,8 +50,6 @@ public Option[] config() { mavenBundle().groupId("net.java.dev.jna").artifactId("jna").versionAsInProject(), mavenBundle().groupId("org.apache.servicemix.bundles").artifactId("org.apache.servicemix.bundles.antlr-runtime").versionAsInProject(), mavenBundle().groupId("org.daisy.braille").artifactId("braille-utils.api").versionAsInProject(), - mavenBundle().groupId("org.daisy.braille").artifactId("braille-utils.pef-tools").versionAsInProject(), - mavenBundle().groupId("org.daisy.libs").artifactId("jing").versionAsInProject(), mavenBundle().groupId("org.daisy.libs").artifactId("jstyleparser").versionAsInProject(), mavenBundle().groupId("org.daisy.braille").artifactId("braille-css").versionAsInProject(), mavenBundle().groupId("org.liblouis").artifactId("liblouis-java").versionAsInProject(), @@ -60,25 +58,13 @@ public Option[] config() { brailleModule("liblouis-core"), brailleModule("liblouis-saxon"), brailleModule("liblouis-calabash"), - brailleModule("liblouis-formatter"), - brailleModule("liblouis-mathml"), brailleModule("liblouis-tables"), brailleModule("libhyphen-core"), + brailleModule("pef-core"), brailleModule("css-core"), brailleModule("css-calabash"), brailleModule("css-utils"), forThisPlatform(brailleModule("liblouis-native")), - brailleModule("pef-core"), - brailleModule("pef-calabash"), - brailleModule("pef-saxon"), - brailleModule("pef-to-html"), - brailleModule("pef-utils"), - pipelineModule("file-utils"), - pipelineModule("common-utils"), - pipelineModule("html-utils"), - pipelineModule("zip-utils"), - pipelineModule("mediatype-utils"), - pipelineModule("fileset-utils"), xspecBundles(), xprocspecBundles(), thisBundle("org.daisy.pipeline.modules.braille", "liblouis-utils"), @@ -102,14 +88,14 @@ public void runXSpec() throws Exception { @Inject private XProcSpecRunner xprocspecRunner; - @Test - public void runXProcSpec() throws Exception { - File baseDir = new File(PathUtils.getBaseDir()); - boolean success = xprocspecRunner.run(new File(baseDir, "src/test/xprocspec"), - new File(baseDir, "target/xprocspec-reports"), - new File(baseDir, "target/surefire-reports"), - new File(baseDir, "target/xprocspec"), - new XProcSpecRunner.Reporter.DefaultReporter()); - assertTrue("XProcSpec tests should run with success", success); - } + // @Test + // public void runXProcSpec() throws Exception { + // File baseDir = new File(PathUtils.getBaseDir()); + // boolean success = xprocspecRunner.run(new File(baseDir, "src/test/xprocspec"), + // new File(baseDir, "target/xprocspec-reports"), + // new File(baseDir, "target/surefire-reports"), + // new File(baseDir, "target/xprocspec"), + // new XProcSpecRunner.Reporter.DefaultReporter()); + // assertTrue("XProcSpec tests should run with success", success); + // } } diff --git a/pipeline-braille-utils/pef-utils/README.md b/pipeline-braille-utils/pef-utils/README.md index ddbb671c6..6b339a56b 100644 --- a/pipeline-braille-utils/pef-utils/README.md +++ b/pipeline-braille-utils/pef-utils/README.md @@ -27,8 +27,6 @@ Submodules - [`pef-calabash`](pef-calabash): XProc bindings for [BrailleUtils][]. - [`pef-saxon`](pef-saxon): XPath bindings for BrailleUtils. -- [`pef-to-html`](pef-to-html): XProc step for converting a PEF - document into an HTML preview. [PEF]: http://pef-format.org [BrailleUtils]: http://code.google.com/p/brailleutils diff --git a/pipeline-braille-utils/pef-utils/pef-calabash/pom.xml b/pipeline-braille-utils/pef-utils/pef-calabash/pom.xml index ea8bb0a78..77f6b8d15 100644 --- a/pipeline-braille-utils/pef-utils/pef-calabash/pom.xml +++ b/pipeline-braille-utils/pef-utils/pef-calabash/pom.xml @@ -132,6 +132,11 @@ <_dsannotations>* + + xproc.step;name="{http://www.daisy.org/ns/2008/pef}pef2text", + xproc.step;name="{http://www.daisy.org/ns/2008/pef}text2pef", + xproc.step;name="{http://www.daisy.org/ns/2008/pef}validate" + diff --git a/pipeline-braille-utils/pef-utils/pef-calabash/src/main/resources/META-INF/catalog.xml b/pipeline-braille-utils/pef-utils/pef-calabash/src/main/resources/META-INF/catalog.xml deleted file mode 100755 index 4dfa17c2e..000000000 --- a/pipeline-braille-utils/pef-utils/pef-calabash/src/main/resources/META-INF/catalog.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - diff --git a/pipeline-braille-utils/pef-utils/pef-calabash/src/main/resources/xml/library.xpl b/pipeline-braille-utils/pef-utils/pef-calabash/src/main/resources/xml/library.xpl deleted file mode 100644 index aace2f34b..000000000 --- a/pipeline-braille-utils/pef-utils/pef-calabash/src/main/resources/xml/library.xpl +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - diff --git a/pipeline-braille-utils/pef-utils/pef-calabash/src/main/resources/xml/pef2text.xpl b/pipeline-braille-utils/pef-utils/pef-calabash/src/test/resources/pef2text.xpl similarity index 100% rename from pipeline-braille-utils/pef-utils/pef-calabash/src/main/resources/xml/pef2text.xpl rename to pipeline-braille-utils/pef-utils/pef-calabash/src/test/resources/pef2text.xpl diff --git a/pipeline-braille-utils/pef-utils/pef-calabash/src/main/resources/xml/text2pef.xpl b/pipeline-braille-utils/pef-utils/pef-calabash/src/test/resources/text2pef.xpl similarity index 100% rename from pipeline-braille-utils/pef-utils/pef-calabash/src/main/resources/xml/text2pef.xpl rename to pipeline-braille-utils/pef-utils/pef-calabash/src/test/resources/text2pef.xpl diff --git a/pipeline-braille-utils/pef-utils/pef-calabash/src/main/resources/xml/validate.xpl b/pipeline-braille-utils/pef-utils/pef-calabash/src/test/resources/validate.xpl similarity index 100% rename from pipeline-braille-utils/pef-utils/pef-calabash/src/main/resources/xml/validate.xpl rename to pipeline-braille-utils/pef-utils/pef-calabash/src/test/resources/validate.xpl diff --git a/pipeline-braille-utils/pef-utils/pef-calabash/src/test/xprocspec/test_pef2text.xprocspec b/pipeline-braille-utils/pef-utils/pef-calabash/src/test/xprocspec/test_pef2text.xprocspec index 4d740ad86..8b3e2a9a7 100644 --- a/pipeline-braille-utils/pef-utils/pef-calabash/src/test/xprocspec/test_pef2text.xprocspec +++ b/pipeline-braille-utils/pef-utils/pef-calabash/src/test/xprocspec/test_pef2text.xprocspec @@ -1,7 +1,7 @@ + script="../resources/pef2text.xpl"> diff --git a/pipeline-braille-utils/pef-utils/pef-calabash/src/test/xprocspec/test_text2pef.xprocspec b/pipeline-braille-utils/pef-utils/pef-calabash/src/test/xprocspec/test_text2pef.xprocspec index 65b6d6207..71ef005f9 100644 --- a/pipeline-braille-utils/pef-utils/pef-calabash/src/test/xprocspec/test_text2pef.xprocspec +++ b/pipeline-braille-utils/pef-utils/pef-calabash/src/test/xprocspec/test_text2pef.xprocspec @@ -11,7 +11,7 @@ - + diff --git a/pipeline-braille-utils/pef-utils/pef-saxon/pom.xml b/pipeline-braille-utils/pef-utils/pef-saxon/pom.xml index 63db5ae62..a04db9aca 100644 --- a/pipeline-braille-utils/pef-utils/pef-saxon/pom.xml +++ b/pipeline-braille-utils/pef-utils/pef-saxon/pom.xml @@ -47,6 +47,9 @@ <_dsannotations>* + + xpath.function;name="{http://www.daisy.org/ns/2008/pef}encode", + diff --git a/pipeline-braille-utils/pef-utils/pef-to-html/pom.xml b/pipeline-braille-utils/pef-utils/pef-to-html/pom.xml deleted file mode 100644 index 68b584447..000000000 --- a/pipeline-braille-utils/pef-utils/pef-to-html/pom.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - 4.0.0 - - - org.daisy.pipeline.modules.braille - braille-modules-parent - 1.10-SNAPSHOT - ../../../parent/ - - - pef-to-html - 1.1.1-SNAPSHOT - bundle - - DP2 Braille Modules :: pef-utils :: pef-to-html - - - - - org.daisy.pipeline.modules.braille - pef-saxon - runtime - - - - diff --git a/pipeline-braille-utils/pef-utils/pef-to-html/src/main/resources/META-INF/catalog.xml b/pipeline-braille-utils/pef-utils/pef-to-html/src/main/resources/META-INF/catalog.xml deleted file mode 100644 index b0e89180f..000000000 --- a/pipeline-braille-utils/pef-utils/pef-to-html/src/main/resources/META-INF/catalog.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - diff --git a/pipeline-braille-utils/pef-utils/pef-to-html/src/main/resources/xml/library.xpl b/pipeline-braille-utils/pef-utils/pef-to-html/src/main/resources/xml/library.xpl deleted file mode 100644 index 6f38d5066..000000000 --- a/pipeline-braille-utils/pef-utils/pef-to-html/src/main/resources/xml/library.xpl +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/pipeline-braille-utils/pef-utils/pef-utils/pom.xml b/pipeline-braille-utils/pef-utils/pef-utils/pom.xml index 5a167cca7..d4a6d496e 100644 --- a/pipeline-braille-utils/pef-utils/pef-utils/pom.xml +++ b/pipeline-braille-utils/pef-utils/pef-utils/pom.xml @@ -20,22 +20,6 @@ - - org.daisy.pipeline.modules.braille - pef-saxon - runtime - - - org.daisy.pipeline.modules.braille - pef-calabash - runtime - - - org.daisy.pipeline.modules.braille - pef-to-html - 1.1.1-SNAPSHOT - runtime - org.daisy.pipeline.modules file-utils @@ -49,6 +33,40 @@ saxon-he runtime + + + org.daisy.pipeline.modules.braille + pef-saxon + runtime + + + + org.daisy.pipeline.modules.braille + pef-calabash + runtime + + + + + + org.apache.felix + maven-bundle-plugin + + + + xproc.step;filter:="(name={http://www.daisy.org/ns/2008/pef}pef2text)", + xproc.step;filter:="(name={http://www.daisy.org/ns/2008/pef}text2pef)", + xproc.step;filter:="(name={http://www.daisy.org/ns/2008/pef}validate)", + xpath.function;filter:="(name={http://www.daisy.org/ns/2008/pef}encode)" + + + + + + + diff --git a/pipeline-braille-utils/pef-utils/pef-utils/src/main/resources/META-INF/catalog.xml b/pipeline-braille-utils/pef-utils/pef-utils/src/main/resources/META-INF/catalog.xml index 29f1e22b0..4a48105a9 100755 --- a/pipeline-braille-utils/pef-utils/pef-utils/src/main/resources/META-INF/catalog.xml +++ b/pipeline-braille-utils/pef-utils/pef-utils/src/main/resources/META-INF/catalog.xml @@ -6,8 +6,5 @@ - - - diff --git a/pipeline-braille-utils/pef-utils/pef-utils/src/main/resources/xml/library.xpl b/pipeline-braille-utils/pef-utils/pef-utils/src/main/resources/xml/library.xpl index 51d98596f..a68c75deb 100755 --- a/pipeline-braille-utils/pef-utils/pef-utils/src/main/resources/xml/library.xpl +++ b/pipeline-braille-utils/pef-utils/pef-utils/src/main/resources/xml/library.xpl @@ -1,5 +1,8 @@ - + - + + + + + + + pef-utils