Merge pull request #13 from joewiz/fix/align-source

Align source code, prepare new release for compatibility with eXist 3.1.0

build.properties

@@ -0,0 +1,7 @@
+#
+# Don't directly modify this file. Instead, copy it to local.build.properties and
+# edit that.
+#
+
+project.name=public-repo
+project.version=0.6.0

build.xml

@@ -2,8 +2,6 @@
 <project xmlns:xdb="http://exist-db.org/ant" default="all" name="Public Application Repository">
     <property file="local.build.properties"/>
     <property file="build.properties"/>
-    <property name="project.app" value="public-repo"/>
-    <property name="project.version" value="0.5.4"/>
     <property name="build" value="./build"/>
     <property name="server.url" value="http://demo.exist-db.org/exist/apps/public-repo/public/"/>
     <condition property="git.commit" value="${git.commit}" else="">
@@ -19,10 +17,11 @@
         <mkdir dir="${build}"/>
         <copy file="expath-pkg.xml.tmpl" tofile="expath-pkg.xml" filtering="true" overwrite="true">
             <filterset>
+                <filter token="project.name" value="${project.name}"/>
                 <filter token="project.version" value="${project.version}"/>
             </filterset>
         </copy>
-        <zip destfile="${build}/${project.app}-${project.version}${git.commit}.xar">
+        <zip destfile="${build}/${project.name}-${project.version}${git.commit}.xar">
             <fileset dir=".">
                 <include name="*.*"/>
                 <include name="modules/**"/>
@@ -42,7 +41,7 @@
         <input message="Enter password:" addproperty="server.pass" defaultvalue="">
             <handler type="secure"/>
         </input>
-        <property name="xar" value="${project.app}-${project.version}${git.commit}.xar"/>
+        <property name="xar" value="${project.name}-${project.version}${git.commit}.xar"/>
         <exec executable="curl">
             <arg line="-T ${build}/${xar} -u admin:${server.pass} ${server.url}/${xar}"/>
         </exec>

expath-pkg.xml.tmpl

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<package xmlns="http://expath.org/ns/pkg" name="http://exist-db.org/apps/public-repo" abbrev="public-repo" version="@project.version@" spec="1.0">
+<package xmlns="http://expath.org/ns/pkg" name="http://exist-db.org/apps/public-repo" abbrev="@project.name@" version="@project.version@" spec="1.0">
     <title>eXist-db Public Application Repository</title>
 </package>

repo.xml

@@ -2,7 +2,7 @@
 <meta xmlns="http://exist-db.org/xquery/repo">
     <description>Scripts to maintain eXist's public application repository.</description>
     <author>Wolfgang Meier</author>
-    <website/>
+    <website>https://github.com/eXist-db/public-xar-repo</website>
     <status>alpha</status>
     <license>GNU-LGPL</license>
     <copyright>true</copyright>
@@ -12,6 +12,12 @@
     <finish>post-install.xql</finish>
     <permissions xmlns:repo="http://exist-db.org/xquery/repo" password="repo" user="repo" group="repo" mode="rw-rw-r--"/>
     <changelog>
+        <change version="0.6.0">
+            <ul xmlns="http://www.w3.org/1999/xhtml">
+                <li>Allow processor version to end with a label, for compatibility with eXist 3.1.0+ semver scheme.</li>
+                <li>Fixed links in atom feed by including min-version parameter.</li>
+            </ul>
+        </change>
         <change version="0.5.4">
             <ul xmlns="http://www.w3.org/1999/xhtml">
                 <li>Fixed error affecting view of packages requiring different processor versions.</li>
@@ -27,27 +33,27 @@
                 <li>New admin section to upload packages and publish them.</li>
             </ul>
         </change>
-        <repo:change xmlns:repo="http://exist-db.org/xquery/repo" version="0.5.1">
+        <change  version="0.5.1">
             <ul xmlns="http://www.w3.org/1999/xhtml">
                 <li>Fixed auto-upload.xql to consider only the xar type files.</li>
             </ul>
-        </repo:change>
-        <repo:change xmlns:repo="http://exist-db.org/xquery/repo" version="0.5.0">
+        </change>
+        <change  version="0.5.0">
             <ul xmlns="http://www.w3.org/1999/xhtml">
                 <li>Added support for automatic updating of apps.xml in case one adds, updates, or deletes a xar file from public folder.</li>
             </ul>
-        </repo:change>
-        <repo:change xmlns:repo="http://exist-db.org/xquery/repo" version="0.4.2">
+        </change>
+        <change  version="0.4.2">
             <ul xmlns="http://www.w3.org/1999/xhtml">
                 <li>Updated atom feed entries to link to each app's html page</li>
             </ul>
-        </repo:change>
-        <repo:change xmlns:repo="http://exist-db.org/xquery/repo" version="0.4">
+        </change>
+        <change  version="0.4">
             <ul xmlns="http://www.w3.org/1999/xhtml">
                 <li>Changed homepage display from grid to list, with separate detailed view for each
                     package</li>
                 <li>Added display of change log to atom feed and detailed web view</li>
             </ul>
-        </repo:change>
+        </change>
     </changelog>
 </meta>