From: James Moger <james.moger@gmail.com>
Date: Fri, 15 Mar 2013 02:20:34 +0000 (-0400)
Subject: Streamlining Moxie integration
X-Git-Tag: v1.2.0~4
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=661deb78457b6865b8d27baa3208ce556f1dbab2;p=iciql.git

Streamlining Moxie integration
---

diff --git a/build.moxie b/build.moxie
index 7b8c6a2..94c2882 100644
--- 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 0832bf1..1a3e627 100644
--- a/build.xml
+++ b/build.xml
@@ -86,19 +86,10 @@
 		Build
 		~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	-->
-	<target name="build" depends="compile" description="Builds iciql from source">
-		
-		<mx:jar packageSources="true" />		
-		<mx:javadoc redirect="true" />
-		<mx:zip>
-			<artifact />
-			<artifact classifier="sources"/>
-			<artifact classifier="javadoc"/>
-			<fileset dir="${basedir}">
-				<include name="LICENSE" />
-				<include name="NOTICE" />
-			</fileset>
-		</mx:zip>
+	<target name="build" depends="compile" description="Packages iciql for deployment">
+
+		<!-- Package the jar, javadoc, sources, and zip distribution -->
+		<mx:package />
 		
 		<!-- Deploy the artifacts into the version-controlled repository -->		
 		<mx:deploy basedir="${basedir}/maven" allowSnapshots="false" />
diff --git a/maven b/maven
index a4cb7ef..2cd53ed 160000
--- a/maven
+++ b/maven
@@ -1 +1 @@
-Subproject commit a4cb7ef844cdd325c359a37b498036388951bc35
+Subproject commit 2cd53edea7e4ec121d7a98a39c7ec59306cb5fb0