From e4d90778b7877fe7abdc6a9c7a9ddc6e02368591 Mon Sep 17 00:00:00 2001
From: Sasha Sherstnev <a.sherstnev@dundee.ac.uk>
Date: Thu, 24 Oct 2013 18:27:29 +0100
Subject: [PATCH] Modify project configuration

---
 .classpath                                 |   14 ++++++++------
 .gitignore                                 |    5 +----
 .settings/org.eclipse.wst.common.component |   13 +++++--------
 3 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/.classpath b/.classpath
index f6b5f4a..291ed8d 100644
--- a/.classpath
+++ b/.classpath
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="datamodel"/>
-	<classpathentry kind="src" path="log"/>
-	<classpathentry kind="src" path="engine"/>
-	<classpathentry kind="src" path="cassdb"/>
-	<classpathentry kind="src" path="webservices"/>
+	<classpathentry kind="src" path="datadb"/>
+	<classpathentry kind="src" path="server"/>
 	<classpathentry excluding="testdata/" kind="src" path="testsrc"/>
 	<classpathentry kind="lib" path="WEB-INF/lib/drmaa.jar"/>
-	<classpathentry kind="lib" path="WEB-INF/lib/log4j-1.2.15.jar"/>
 	<classpathentry kind="lib" path="WEB-INF/lib/compbio-annotations-1.0.jar"/>
 	<classpathentry kind="lib" path="WEB-INF/lib/compbio-util-1.4.jar"/>
 	<classpathentry kind="lib" path="WEB-INF/lib/derby-10.8.2.2.jar"/>
@@ -25,5 +21,11 @@
 	<classpathentry kind="lib" path="testsrc/lib/testng-5.10-jdk15.jar"/>
 	<classpathentry kind="lib" path="WEB-INF/lib/jstl-1.1.2.jar"/>
 	<classpathentry kind="lib" path="WEB-INF/lib/standard-1.1.2.jar"/>
+	<classpathentry kind="lib" path="WEB-INF/lib/log4j-1.2.16.jar"/>
+	<classpathentry kind="lib" path="WEB-INF/lib/cassandra-all-1.2.4.jar"/>
+	<classpathentry kind="lib" path="WEB-INF/lib/cassandra-clientutil-1.2.4.jar"/>
+	<classpathentry kind="lib" path="WEB-INF/lib/cassandra-thrift-1.2.4.jar"/>
+	<classpathentry kind="lib" path="WEB-INF/lib/hector-0.7.0-20-sources.jar"/>
+	<classpathentry kind="lib" path="WEB-INF/lib/hector-core-1.0-5.jar" sourcepath="/home/asherstnev/.m2/repository/me/prettyprint/hector-core/1.0-5/hector-core-1.0-5-sources.jar"/>
 	<classpathentry kind="output" path="WEB-INF/classes"/>
 </classpath>
diff --git a/.gitignore b/.gitignore
index b09440a..01f344e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,6 @@
-/logs
 /distro
-/jobsout
-/JABAWSLogFilename.*
 /testsrc/testdata/*.written
 /testsrc/testdata/alirna.ps
-
+/WEB-INF/classes/
 
 
diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index f33c768..bc59027 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -2,14 +2,11 @@
 <project-modules id="moduleCoreId" project-version="1.5.0">
     <wb-module deploy-name="jaba">
         <wb-resource deploy-path="/" source-path="/website" tag="defaultRootSource"/>
-        <wb-resource deploy-path="/binaries" source-path="binaries"/>
-        <wb-resource deploy-path="/jobsout" source-path="jobsout"/>
-        <wb-resource deploy-path="/ExecutionStatistic" source-path="ExecutionStatistic"/>
-        <wb-resource deploy-path="/conf" source-path="conf"/>
-        <wb-resource deploy-path="/statpages" source-path="statpages"/>
-        <wb-resource deploy-path="/WEB-INF" source-path="WEB-INF"/>
-        <wb-resource deploy-path="/META-INF" source-path="META-INF"/>
-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/log"/>
+        <wb-resource deploy-path="/conf" source-path="/conf"/>
+        <wb-resource deploy-path="/WEB-INF" source-path="/WEB-INF"/>
+        <wb-resource deploy-path="/META-INF" source-path="/META-INF"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/datadb"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/server"/>
 <!--        <dependent-module archiveName="jaba-client.jar" deploy-path="/WEB-INF/lib/" handle="module:/resource/jaba-client/jaba-client">
             <dependency-type>uses</dependency-type>
         </dependent-module> -->
-- 
1.7.10.2