commit 562c2fccb9ec17cd3eb95828ae97d4a56cdc9f36
author anbangx <anbangx@123451ca-8445-de46-9d55-352943316053> Wed Mar 13 20:59:25 2013 +0000
committer anbangx <anbangx@123451ca-8445-de46-9d55-352943316053> Wed Mar 13 20:59:25 2013 +0000
tree 58627d8dedd092868cf40d19801b66065b31aa53
parent 322e6d687a0f448eb8f127d86ba8215e486e56a4

git-svn-id: https://hyracks.googlecode.com/svn/branches/fullstack_genomix@3107 123451ca-8445-de46-9d55-352943316053

genomix/genomix-pregelix/data/webmap/sequenceShortFileMergeTest

diff --git a/genomix/genomix-pregelix/data/webmap/sequenceShortFileMergeTest b/genomix/genomix-pregelix/data/webmap/sequenceShortFileMergeTest
index 51da962..c5ebbc1 100755
--- a/genomix/genomix-pregelix/data/webmap/sequenceShortFileMergeTest
+++ b/genomix/genomix-pregelix/data/webmap/sequenceShortFileMergeTest
Binary files differ

genomix/genomix-pregelix/pom.xml

diff --git a/genomix/genomix-pregelix/pom.xml b/genomix/genomix-pregelix/pom.xml
index 1d713a5..d74d954 100644
--- a/genomix/genomix-pregelix/pom.xml
+++ b/genomix/genomix-pregelix/pom.xml
@@ -32,8 +32,9 @@
                                 <artifactId>maven-compiler-plugin</artifactId>
                                 <version>2.0.2</version>
                                 <configuration>
-                                        <source>1.6</source>
-                                        <target>1.6</target>
+                                        <source>1.7</source>
+                                        <target>1.7</target>
+                                        <fork>true</fork>
                                 </configuration>
                         </plugin>
                         <plugin>

genomix/genomix-pregelix/src/test/java/edu/uci/ics/pregelix/JobRun/RunJobTestCase.java

diff --git a/genomix/genomix-pregelix/src/test/java/edu/uci/ics/pregelix/JobRun/RunJobTestCase.java b/genomix/genomix-pregelix/src/test/java/edu/uci/ics/pregelix/JobRun/RunJobTestCase.java
index 3928d4f..1143c95 100644
--- a/genomix/genomix-pregelix/src/test/java/edu/uci/ics/pregelix/JobRun/RunJobTestCase.java
+++ b/genomix/genomix-pregelix/src/test/java/edu/uci/ics/pregelix/JobRun/RunJobTestCase.java
@@ -52,12 +52,12 @@
         this.expectedFileName = expectedFile;
         giraphJobGens = new JobGen[4];
         giraphJobGens[0] = new JobGenOuterJoin(job);
-        waitawhile();
+        /*waitawhile();
         giraphJobGens[1] = new JobGenInnerJoin(job);
         waitawhile();
         giraphJobGens[2] = new JobGenOuterJoinSort(job);
         waitawhile();
-        giraphJobGens[3] = new JobGenOuterJoinSingleSort(job);
+        giraphJobGens[3] = new JobGenOuterJoinSingleSort(job);*/
     }
     
     private void waitawhile() throws InterruptedException {