Streamlining Moxie integration

diff --git a/build.moxie b/build.moxie
index 7b8c6a2014e03982a58aa38e6c10656a1eadf729..94c2882ad5eb4e8cf4fdf854d96946da550eedf1 100644 (file)
--- a/build.moxie
+++ b/build.moxie
@@ -11,6 +11,7 @@ description: 'a model-based database access wrapper for JDBC'
 groupId: com.iciql
 artifactId: iciql
 version: 1.2.0-SNAPSHOT
+packaging: jar+zip
 inceptionYear: 2011
 
 # Current stable release

diff --git a/build.xml b/build.xml
index 0832bf101a6e5d81167d730316dbd9cad1274221..1a3e62777fbdc5b1e2dca59ee61e8cb963a002b1 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -86,19 +86,10 @@
                Build\r
                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\r
        -->\r
-       <target name="build" depends="compile" description="Builds iciql from source">\r
-               \r
-               <mx:jar packageSources="true" />                \r
-               <mx:javadoc redirect="true" />\r
-               <mx:zip>\r
-                       <artifact />\r
-                       <artifact classifier="sources"/>\r
-                       <artifact classifier="javadoc"/>\r
-                       <fileset dir="${basedir}">\r
-                               <include name="LICENSE" />\r
-                               <include name="NOTICE" />\r
-                       </fileset>\r
-               </mx:zip>\r
+       <target name="build" depends="compile" description="Packages iciql for deployment">\r
+\r
+               <!-- Package the jar, javadoc, sources, and zip distribution -->\r
+               <mx:package />\r
                \r
                <!-- Deploy the artifacts into the version-controlled repository -->            \r
                <mx:deploy basedir="${basedir}/maven" allowSnapshots="false" />\r

diff --git a/maven b/maven
index a4cb7ef844cdd325c359a37b498036388951bc35..2cd53edea7e4ec121d7a98a39c7ec59306cb5fb0 160000 (submodule)
--- a/maven
+++ b/maven
@@ -1 +1 @@
-Subproject commit a4cb7ef844cdd325c359a37b498036388951bc35
+Subproject commit 2cd53edea7e4ec121d7a98a39c7ec59306cb5fb0