From: hansonr <hansonr@stolaf.edu>
Date: Tue, 3 Jul 2018 18:54:26 +0000 (+0100)
Subject: adds log4j zip file
X-Git-Tag: Release_2_11_4_0~45^2~18^2~592
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=ecd6af3b381077c0ce77d3c783214ceb446bd80d;p=jalview.git

adds log4j zip file
---

diff --git a/build-site.xml b/build-site.xml
index 55ff89a..c1684a2 100644
--- a/build-site.xml
+++ b/build-site.xml
@@ -22,6 +22,7 @@
   	<!-- packages -->
     <property name="varna.zip" value="${libjsDir}/VARNA-site.zip" />
     <property name="mig.zip" value="${libjsDir}/MiGLayout-site.zip" />	  	  	
+    <property name="log4j.zip" value="${libjsDir}/log4j-site.zip" />	  	  	
 
 	<!-- output directories -->
   	<property name="site" value="site"/>
@@ -42,6 +43,11 @@
   	<echo> Unzipping ${mig.zip} into ${site} </echo> 
  	<unzip src="${mig.zip}" dest="${site}" overwrite="true"/>  	
   	
+	<!-- log4j -->
+
+  	<echo> Unzipping ${log4j.zip} into ${site} </echo> 
+ 	<unzip src="${log4j.zip}" dest="${site}" overwrite="true"/>  	
+  	
     <!-- resources -->
 
   	<echo> Copying ${resourceDir} files into ${j2sDir} </echo>
diff --git a/build-zip-jars.xml b/build-zip-jars.xml
index ec353da..2cb70bd 100644
--- a/build-zip-jars.xml
+++ b/build-zip-jars.xml
@@ -15,7 +15,7 @@
   	<property name="j2sDir" value="${site}/swingjs/j2s"/>
   	<property name="libjsDir" value="libjs"/>
 
-	<target name="zipall" depends="zipvarna,zipmig">
+	<target name="zipall" depends="zipvarna,zipmig,ziplog4j">
 		
 		
   </target>
@@ -24,14 +24,21 @@
     <!-- VARNA -->
 	    <property name="varna.zip" value="${libjsDir}/VARNA-site.zip" />	  	  	
 	  	<echo> Zipping up ${varna.zip} </echo>
-	  	<zip destfile="${varna.zip}" basedir="site" includes="fr_*,swingjs/j2s/fr/**" />
+	  	<zip destfile="${varna.zip}" basedir="${site}" includes="fr_*,swingjs/j2s/fr/**" />
 	</target>
 
 	<target name="zipmig">
 		  <!-- MiGLayout -->
 		    <property name="mig.zip" value="${libjsDir}/MiGLayout-site.zip" />	  	  	
 		  	<echo> Zipping up ${mig.zip} </echo>
-		  	<zip destfile="${mig.zip}" basedir="site" includes="swingjs/j2s/net/miginfocom/**" />
+		  	<zip destfile="${mig.zip}" basedir="${site}" includes="swingjs/j2s/net/miginfocom/**" />
+	</target>
+
+	<target name="ziplog4j">
+		  <!-- log4j -->
+		    <property name="log4j.zip" value="${libjsDir}/log4j-site.zip" />	  	  	
+		  	<echo> Zipping up ${log4j.zip} </echo>
+		  	<zip destfile="${log4j.zip}" basedir="${site}" includes="swingjs/j2s/org/apache/log4j/**" />
 	</target>
 
 </project>
diff --git a/libjs/log4j-site.zip b/libjs/log4j-site.zip
new file mode 100644
index 0000000..3ae734c
Binary files /dev/null and b/libjs/log4j-site.zip differ