Update to Moxie 0.7.3

diff --git a/build.moxie b/build.moxie
index c6ca36f971f180f7a9fb1e72ea7d2c9523349c1a..937725189bffd8616e12a6b95d336942e09857c6 100644 (file)
--- a/build.moxie
+++ b/build.moxie
@@ -3,7 +3,7 @@
 #
 
 # Specify minimum Moxie version required to build
-requires: 0.7.1
+requires: 0.7.3
 
 # Project Metadata
 name: Iciql
@@ -87,7 +87,7 @@ properties: {
        derby.version : 10.9.1.0
        mysql.version : 5.0.51b
        postgresql.version : 9.0
-       postgresqldriver.version : 9.0-801.jdbc4        
+       postgresqldriver.version : 9.0-801.jdbc4
 }
 
 dependencies:

diff --git a/build.xml b/build.xml
index 830b3a7e6c3c228fb32e0f5afc26ecb4cdb6bd5e..5d6fca64389be4c66467edc55eb909bbf8e3c888 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -4,34 +4,34 @@
        <!--\r
                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\r
                Retrieve Moxie Toolkit\r
-               \r
+\r
                documentation @ http://gitblit.github.io/moxie\r
                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\r
        -->\r
-       <property name="moxie.version" value="0.7.2" />\r
+       <property name="moxie.version" value="0.7.3" />\r
        <property name="moxie.url" value="http://gitblit.github.io/moxie/maven" />\r
        <property name="moxie.jar" value="moxie-toolkit-${moxie.version}.jar" />\r
        <property name="moxie.dir" value="${user.home}/.moxie" />\r
-       \r
+\r
        <!-- Download Moxie from it's Maven repository to user.home -->\r
        <mkdir dir="${moxie.dir}" />\r
        <get src="${moxie.url}/org/moxie/moxie-toolkit/${moxie.version}/${moxie.jar}"\r
                dest="${moxie.dir}" skipexisting="true" verbose="true" />\r
-       \r
+\r
        <!-- Register Moxie tasks -->\r
        <taskdef uri="antlib:org.moxie">\r
                <classpath location="${moxie.dir}/${moxie.jar}" />\r
        </taskdef>\r
 \r
-       \r
+\r
        <!--\r
                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\r
                Initialize Moxie and setup build properties\r
                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\r
        -->\r
        <target name="prepare"  description="Retrieves dependencies and sets up build properties">\r
-               \r
-               <mx:init />\r
+\r
+               <mx:init mxroot="${moxie.dir}" />\r
 \r
        </target>\r
 \r
@@ -47,7 +47,7 @@
 \r
        </target>\r
 \r
-       \r
+\r
        <!--\r
                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\r
                Compile\r
@@ -73,13 +73,13 @@
                <mx:run scope="test" classname="com.iciql.test.IciqlSuite">\r
                        <arg value="--dbFile" />\r
                        <arg value="${project.outputDirectory}/performance_db.txt" />\r
-                                                       \r
+\r
                        <arg value="--sqlFile" />\r
                        <arg value="${project.outputDirectory}/performance_sql.txt" />\r
                </mx:run>\r
        </target>\r
 \r
-       \r
+\r
        <!--\r
                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\r
                Build\r
@@ -89,12 +89,12 @@
 \r
                <!-- Package the jar, javadoc, sources, and zip distribution -->\r
                <mx:package />\r
-               \r
-               <!-- Deploy the artifacts into the version-controlled repository -->            \r
+\r
+               <!-- Deploy the artifacts into the version-controlled repository -->\r
                <mx:deploy basedir="${basedir}/maven" allowSnapshots="false" />\r
 \r
        </target>\r
-       \r
+\r
 \r
        <!--\r
                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\r
@@ -102,16 +102,16 @@
                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\r
        -->\r
        <target name="uploadArtifacts" depends="build">\r
-                       \r
-               <mx:gcupload \r
-                                username="${googlecode.user}" \r
-                                password="${googlecode.password}" \r
-                                projectname="iciql" \r
-                                filename="${project.targetDirectory}/${project.artifactId}-${project.version}.zip" \r
+\r
+               <mx:gcupload\r
+                                username="${googlecode.user}"\r
+                                password="${googlecode.password}"\r
+                                projectname="iciql"\r
+                                filename="${project.targetDirectory}/${project.artifactId}-${project.version}.zip"\r
                                 targetfilename="${project.artifactId}-${project.version}.zip"\r
                                 summary="Version ${project.version} -- library, sources, and javadoc"\r
                                 labels="Featured, Type-Package, OpSys-All" />\r
-                                                       \r
+\r
                <mx:ftp server="${ftp.server}" userid="${ftp.user}" password="${ftp.password}"\r
                        remotedir="${ftp.maven.dir}" verbose="yes" depends="yes" timediffauto="true"\r
                        preservelastmodified="true">\r
@@ -122,9 +122,9 @@
                        </fileset>\r
                </mx:ftp>\r
        </target>\r
-       \r
-                               \r
-       <!-- \r
+\r
+\r
+       <!--\r
                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\r
                Build the iciql website\r
                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\r
@@ -139,12 +139,12 @@
                                <fail message="Please run the &quot;testsuite&quot; target!"/>\r
                        </then>\r
                </mx:if>\r
-                                       \r
+\r
                <!-- Download links -->\r
                <property name="gc.url" value="http://code.google.com/p/iciql/downloads/detail?name=" />\r
                <property name="releaselog" value="${basedir}/releases.moxie" />\r
-                       \r
-               <mx:doc googleplusone="true" prettifyTheme="googlecode" minify="true" \r
+\r
+               <mx:doc googleplusone="true" prettifyTheme="googlecode" minify="true"\r
                        templateDir="${project.siteSourceDirectory}/templates"\r
                        customless="custom.less" rssFeed="rss.xml" atomFeed="atom.xml">\r
 \r
@@ -156,13 +156,13 @@
                                replacePattern="&lt;a href='${project.issuesUrl}/detail?id=$3'&gt;issue $3&lt;/a&gt;" />\r
 \r
                        <structure>\r
-       \r
+\r
                                <menu name="about" pager="true" pagerPlacement="bottom" pagerLayout="justified">\r
                                        <page name="overview" src="index.mkd" out="index.html" />\r
                                        <page name="performance" src="performance.mkd" out="performance.html" />\r
                                        <page name="jaqu comparison" src="jaqu_comparison.mkd" out="jaqu_comparison.html" />\r
                                </menu>\r
-       \r
+\r
                                <menu name="getting started" pager="true" pagerPlacement="bottom" pagerLayout="justified">\r
                                        <page name="models" src="model_classes.mkd" out="model_classes.html" headerLinks="true" />\r
                                        <page name="versioning" src="table_versioning.mkd" out="table_versioning.html" headerLinks="true" />\r
@@ -170,7 +170,7 @@
                                        <page name="examples" src="examples.mkd" out="examples.html" headerLinks="true" />\r
                                        <page name="tools" src="tools.mkd" out="tools.html" headerLinks="true" />\r
                                </menu>\r
-       \r
+\r
                                <page name="building" src="building.mkd" out="building.html" />\r
                                <page name="javadoc" src="javadoc.mkd" out="javadoc.html" />\r
 \r
@@ -180,14 +180,14 @@
                                <page out="releases.html" navbarlink="false">\r
                                        <template src="releasehistory.ftl" data="${releaselog}" />\r
                                </page>\r
-                                       \r
+\r
                                <menu name="downloads">\r
                                        <link name="${project.artifactId}-${project.releaseVersion}"\r
                                                src="${gc.url}${project.artifactId}-${project.releaseVersion}.zip" />\r
                                        <divider />\r
                                        <link name="Maven Repository" src="${project.mavenUrl}" />\r
                                </menu>\r
-                                               \r
+\r
                                <menu name="links">\r
                                        <link name="Github" src="${project.scmUrl}" />\r
                                        <link name="Issues" src="${project.issuesUrl}" />\r
@@ -195,7 +195,7 @@
                                </menu>\r
                                <divider />\r
                        </structure>\r
-                                               \r
+\r
                        <!-- Generate RSS and Atom feeds from the release history -->\r
                        <page as="atom.xml">\r
                                <template src="atom.ftl" data="${releaselog}" />\r
@@ -203,9 +203,9 @@
                        <page as="rss.xml">\r
                                <template src="rss.ftl" data="${releaselog}" />\r
                        </page>\r
-                                               \r
+\r
                </mx:doc>\r
-                                               \r
+\r
                <!-- Copy standard javadoc -->\r
                <mkdir dir="${project.siteTargetDirectory}/javadoc" />\r
                <copy todir="${project.siteTargetDirectory}/javadoc">\r
@@ -215,17 +215,17 @@
 \r
 \r
        <!--\r
-               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ \r
+               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\r
                Copy the built site to the gh-pages branch\r
-               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ \r
+               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\r
        -->\r
        <target name="updateGhpages" depends="buildSite">\r
                <mx:ghpages obliterate="false" />\r
        </target>\r
 \r
-               \r
+\r
        <!--\r
-               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ \r
+               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\r
                Publish site to hosting service\r
                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\r
        -->\r
@@ -243,16 +243,16 @@
                </mx:ftp>\r
        </target>\r
 \r
-       \r
+\r
        <!--\r
-               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ \r
+               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\r
                Tag a new version and prepare for the next development cycle.\r
-               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ \r
+               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\r
        -->\r
        <target name="tagRelease" depends="prepare">\r
                <!-- release -->\r
                <property name="dryrun" value="false" />\r
-               <mx:version stage="release" dryrun="${dryrun}" />               \r
+               <mx:version stage="release" dryrun="${dryrun}" />\r
                <property name="project.tag" value="v${project.version}" />\r
                <!-- commit build.moxie & releases.moxie (automatic) -->\r
                <mx:commit showtitle="no">\r
@@ -293,6 +293,6 @@
                    <message>Reset build identifiers for next development cycle</message>\r
                </mx:commit>\r
        </target>\r
-       \r
+\r
 \r
 </project>\r