From: Alexander Sherstnev <sherstnv@gmail.com>
Date: Mon, 16 Jun 2014 20:52:22 +0000 (+0100)
Subject: Still not working code
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;ds=sidebyside;h=8c3557ddfef376a427b969c746c8a698e3931218;p=jabaws.git

Still not working code
---

diff --git a/build.xml b/build.xml
index 5775b82..6c7b389 100644
--- a/build.xml
+++ b/build.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<project default="jabaws" name="Build Java Bioinformatics Analysis Web Services" basedir=".">
+<project default="build-all" name="Build Java Bioinformatics Analysis Web Services" basedir=".">
 
 	<property name="LD_LIBRARY_PATH" value="/gridware/sge/lib/lx24-amd64"/>
 
@@ -25,6 +25,7 @@
 	<property name="datamodel" value="${distdir}/datamodel-${jabaws_version}.jar"/>
 	<property name="datamodel-src" value="${distdir}/datamodel-src-${jabaws_version}.jar"/>
 	<property name="min-jabaws-client" value="${distdir}/min-jabaws-client-${jabaws_version}.jar"/>
+	<property name="stat-updater" value="${distdir}/stat-updater-${jabaws_version}.jar"/>
 	<property name="min-jabaws-client-nolog" value="${distdir}/min-jabaws-client-nolog-${jabaws_version}.jar"/>
 	<property name="jabaws-client-src" value="${distdir}/jabaws-client-src-${jabaws_version}.jar"/>
 	<property name="full-jabaws-client" value="${distdir}/full-jabaws-client-${jabaws_version}.jar"/>
@@ -75,6 +76,19 @@
 		<!-- Logging configuration -->
 	</fileset>
 
+	<fileset dir="${basedir}/WEB-INF/classes/" id="statupdater">
+		<!-- Datamodel -->
+		<include name="compbio/data/**"/>
+		<include name="compbio/metadata/**"/>
+		<!-- Engines -->
+		<include name="compbio/engine/**"/>
+		<!-- Runners -->
+		<include name="compbio/stat/collector/**"/>
+		<!-- Logging configuration -->
+	</fileset>
+
+	
+	
 	<!-- Clean temp directories -->
 	<target name="clean">
 		<delete dir="${classes}" />
@@ -242,7 +256,7 @@
 			</manifest>
 		</jar>
 	</target>
-
+	
 	<target name="core-source-jar" depends="compile" description="Pack jabaws core java sources">
 		<delete file="${core-src}"></delete>
 		<jar jarfile="${core-src}">
@@ -325,6 +339,28 @@
 		</jar>
 	</target>
 
+
+	<target name="stat-updater" depends="compile" description="Prepare executable jar for stat updater">
+		<echo>Jar file: StatUpdater jar</echo>
+		<delete file="${basedir}/${stat-updater}"></delete>
+		<jar jarfile="${basedir}/${stat-updater}">
+			<fileset refid="statupdater"/>
+			<zipgroupfileset excludes="META-INF/*" dir="" includes="WEB-INF/lib/log4j-1.2.15.jar" />
+			<zipgroupfileset excludes="META-INF/*" dir="" includes="lib/jcommander-1.30.jar" />
+			<zipgroupfileset excludes="META-INF/*.SF" dir="${web.lib.path}" >
+				<include name="${compbio-util}"/>
+			</zipgroupfileset>
+			<manifest>
+				<attribute name="Built-By" value="${author}" />
+				<attribute name="Main-Class" value="compbio.stat.collector.ExecutionStatUpdater" />
+				<attribute name="Class-Path" value="." />
+				<attribute name="Implementation-Title" value="JABAWS Statistics Updating Program ${product}" />
+				<attribute name="Implementation-Vendor" value="${author}" />
+				<attribute name="Implementation-URL" value="${project.url}" />
+			</manifest>
+		</jar>
+	</target>
+	
 	<target name="full-jabaws-client-jar" depends="compile" description="Pack datamodel, engine and runners">
 		<echo>Jar file: Full WS client jar</echo>
 		<delete file="${full-jabaws-client}">
diff --git a/webservices/compbio/stat/collector/ExecutionStatUpdater.java b/webservices/compbio/stat/collector/ExecutionStatUpdater.java
index 8e9a6e4..f853539 100644
--- a/webservices/compbio/stat/collector/ExecutionStatUpdater.java
+++ b/webservices/compbio/stat/collector/ExecutionStatUpdater.java
@@ -36,7 +36,6 @@ import org.apache.log4j.Logger;
 
 import compbio.engine.client.PathValidator;
 import compbio.engine.client.SkeletalExecutable;
-import compbio.util.FileUtil;
 
 /**
  * Class assumptions: 1. Number of runs of each WS = number of folders with name