abdera-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jmsn...@apache.org
Subject svn commit: r630479 - /incubator/abdera/java/trunk/build/build.xml
Date Sat, 23 Feb 2008 17:51:01 GMT
Author: jmsnell
Date: Sat Feb 23 09:50:53 2008
New Revision: 630479

URL: http://svn.apache.org/viewvc?rev=630479&view=rev
Log:
https://issues.apache.org/jira/browse/ABDERA-130

fix the build when security module is not being built.

Modified:
    incubator/abdera/java/trunk/build/build.xml

Modified: incubator/abdera/java/trunk/build/build.xml
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/build/build.xml?rev=630479&r1=630478&r2=630479&view=diff
==============================================================================
--- incubator/abdera/java/trunk/build/build.xml (original)
+++ incubator/abdera/java/trunk/build/build.xml Sat Feb 23 09:50:53 2008
@@ -445,14 +445,13 @@
     <mkdir dir="${dist}" />
     <mkdir dir="${dist_lib}" />
    
-    <jar destfile="${complete.jar}" manifest="${work}/MANIFEST.MF">
+    <jar destfile="${complete.jar}" manifest="${work}/MANIFEST.MF" >
       <fileset dir="${core.work}" includes="**/*" excludes="META-INF/**/*"/>
       <fileset dir="${core.work}" includes="META-INF/LICENSE,META-INF/NOTICE"/>
       <fileset dir="${parser.work}" includes="**/*" excludes="META-INF/**/*"/>
       <fileset dir="${protocol.work}" includes="**/*" excludes="META-INF/**/*"/>
       <fileset dir="${server.work}" includes="**/*" excludes="META-INF/**/*"/>
       <fileset dir="${client.work}" includes="**/*" excludes="META-INF/**/*"/>
-      <fileset dir="${security.work}" includes="**/*" excludes="META-INF/**/*"/>
       <fileset dir="${dependencies.work}/i18n" includes="**/*" excludes="META-INF/**/*"/>
       <fileset dir="${extensions.work}/main" includes="**/*" excludes="META-INF/**/*"/>
       <fileset dir="${extensions.work}/json" includes="**/*" excludes="META-INF/**/*"/>
@@ -487,6 +486,9 @@
 
   <target name="dist.security" if="do.security">
     <jar destfile="${security.jar}" basedir="${security.work}" manifest="${work}/MANIFEST.MF"
/>
+    <jar destfile="${complete.jar}" update="true">
+      <fileset dir="${security.work}" includes="**/*" excludes="META-INF/**/*" />
+    </jar>
   </target>
   
   <target name="dist.spring" if="do.spring">



Mime
View raw message