MOved sql scripts in the jar, added a 'quickrelease' target which makes a...

MOved sql scripts in the jar, added a 'quickrelease' target which makes a release w/o javadocs and no packaging (good for quick testing)


git-svn-id: http://svn.igniterealtime.org/svn/repos/messenger/trunk@141 b35dd754-fafc-0310-a699-88a17e54d16e

build/build.xml

@@ -180,7 +180,7 @@
             <fileset dir="${compile.dir}" includes="**/*.class" excludes="org/jivesoftware/messenger/starter/ServerStarter.class" />
             <fileset dir="${jspc.classes.dest.dir}" includes="**/*.class" />
             <fileset dir="${src.i18n.dir}" includes="*.properties" />
-            <fileset dir="${src.dir}/database" includes="*.sql" />
+            <fileset dir="${src.dir}" includes="database/*.sql" />
             <zipgroupfileset dir="${lib.merge.dir}" includes="*.jar"/>
             <manifest>
                 <attribute name="Built-By" value="Jive Software (www.jivesoftware.org)"/>
@@ -346,10 +346,18 @@
         </copy>
 
         <!-- Copy database scripts -->
-        <copy todir="${prepare.out.dir}">
+        <copy todir="${prepare.out.dir}/resources">
             <fileset dir="${src.dir}" includes="database/**/*.*"></fileset>
         </copy>
 
+        <!-- Copy security resources -->
+        <copy todir="${prepare.out.dir}/resources">
+            <fileset dir="${src.dir}">
+                <include name="security/*" />
+                <include name="security/*.*" />
+            </fileset>
+        </copy>
+
         <!-- Copy bin dir -->
         <copy todir="${prepare.out.dir}">
             <fileset dir="${src.dir}" includes="bin/*.*" />
@@ -363,14 +371,6 @@
             <fileset dir="${src.dir}" includes="plugins/**/*.*" />
         </copy>
 
-        <!-- Copy security resources -->
-        <copy todir="${prepare.out.dir}">
-            <fileset dir="${src.dir}">
-                <include name="security/*" />
-                <include name="security/*.*" />
-            </fileset>
-        </copy>
-
         <!-- Copy admin plugin resources -->
         <copy todir="${prepare.out.dir}/plugins/admin/webapp">
             <!-- All web resources minus jsp's and jspf's - those are precompiled -->
@@ -459,7 +459,15 @@
 
     </target>
 
-    <!-- release =============================================================================== -->
+    <!-- quickrelease ========================================================================== -->
+    <target name="quickrelease" description="Makes an unpackaged release without Javadocs">
+        <antcall target="release">
+            <param name="no.javadoc" value="true" />
+            <param name="no.package" value="true" />
+        </antcall>
+    </target>
+
+    <!-- release-package ======================================================================= -->
     <target name="release-package" unless="no.package" description="Packages a release">
 
         <property name="package.dest.dir" value="${release.dest.dir}" />