Merge pull request #3941 from line-o/fix/installer-bundle

[hotfix] include templating in installer and tests

Author: adamretter

exist-installer/src/main/izpack/install.xml

@@ -164,15 +164,15 @@
 
         <pack name="Apps" required="false" installGroups="Group2">
             <description>Application Packages: additional applications for XQuery development, database management,
-                documentation, examples and more. You should at least install the "dashboard" and the "shared" package to
-                be able to add more applications later.
+                documentation, examples and more. You should at least install the "dashboard" and "packageservice" 
+                package to be able to add more applications later.
             </description>
         </pack>
 
-        <pack name="shared" required="true" preselected="true" parent="Apps">
-            <description>Shared Resources: jquery, dojo, ace, templating, utilities</description>
+        <pack name="templating" required="true" preselected="true" parent="Apps">
+            <description>Templating library (formally part of shared-resources)</description>
             <fileset targetdir="$INSTALL_PATH/autodeploy" dir="autodeploy">
-                <include name="shared-resources-*.xar"/>
+                <include name="templating-*.xar"/>
             </fileset>
         </pack>
 
@@ -232,12 +232,5 @@
             </fileset>
         </pack>
 
-        <pack name="markdown" required="false" preselected="true" parent="Apps">
-            <description>Markdown Parser in XQuery</description>
-            <fileset targetdir="$INSTALL_PATH/autodeploy" dir="autodeploy">
-                <include name="markdown-*.xar"/>
-            </fileset>
-        </pack>
-
     </packs>
 </izpack:installation>

extensions/modules/expathrepo/src/test/xquery/modules/expathrepo/deployment.xql

@@ -35,7 +35,7 @@ import module namespace xmldb = "http://exist-db.org/xquery/xmldb";
 declare variable $deploy:expathxml := 
     <package xmlns="http://expath.org/ns/pkg" name="http://exist-db.org/apps/dtest" abbrev="dtest" version="1.0.0" spec="1.0">
         <title>Deployment Test</title>
-        <dependency package="http://exist-db.org/apps/shared" semver-min="0.4.0"/>
+        <dependency package="http://exist-db.org/html-templating" semver-min="1.0.2"/>
     </package>;
 
 declare variable $deploy:repoxml :=
@@ -184,4 +184,4 @@ function deploy:install-uninstall-library() {
         $remove,
         $avail3
     )
-};
+};