change to genomix-data
git-svn-id: https://hyracks.googlecode.com/svn/branches/fullstack_genomix@3030 123451ca-8445-de46-9d55-352943316053
diff --git a/genomix/genomix-core/HyracksCodeFormatProfile.xml b/genomix/genomix-data/HyracksCodeFormatProfile.xml
similarity index 100%
rename from genomix/genomix-core/HyracksCodeFormatProfile.xml
rename to genomix/genomix-data/HyracksCodeFormatProfile.xml
diff --git a/genomix/genomix-core/pom.xml b/genomix/genomix-data/pom.xml
similarity index 94%
rename from genomix/genomix-core/pom.xml
rename to genomix/genomix-data/pom.xml
index 2af3391..651beb6 100644
--- a/genomix/genomix-core/pom.xml
+++ b/genomix/genomix-data/pom.xml
@@ -2,8 +2,8 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <artifactId>genomix-core</artifactId>
- <name>genomix-core</name>
+ <artifactId>genomix-data</artifactId>
+ <name>genomix-data</name>
<parent>
<groupId>edu.uci.ics.hyracks</groupId>
diff --git a/genomix/genomix-core/src/main/assembly/binary-assembly.xml b/genomix/genomix-data/src/main/assembly/binary-assembly.xml
similarity index 100%
rename from genomix/genomix-core/src/main/assembly/binary-assembly.xml
rename to genomix/genomix-data/src/main/assembly/binary-assembly.xml
diff --git a/genomix/genomix-core/src/main/java/edu/uci/ics/genomix/type/Kmer.java b/genomix/genomix-data/src/main/java/edu/uci/ics/genomix/type/Kmer.java
similarity index 100%
rename from genomix/genomix-core/src/main/java/edu/uci/ics/genomix/type/Kmer.java
rename to genomix/genomix-data/src/main/java/edu/uci/ics/genomix/type/Kmer.java
diff --git a/genomix/genomix-core/src/main/java/edu/uci/ics/genomix/type/KmerCountValue.java b/genomix/genomix-data/src/main/java/edu/uci/ics/genomix/type/KmerCountValue.java
similarity index 100%
rename from genomix/genomix-core/src/main/java/edu/uci/ics/genomix/type/KmerCountValue.java
rename to genomix/genomix-data/src/main/java/edu/uci/ics/genomix/type/KmerCountValue.java
diff --git a/genomix/genomix-core/src/main/resources/conf/cluster.properties b/genomix/genomix-data/src/main/resources/conf/cluster.properties
similarity index 100%
rename from genomix/genomix-core/src/main/resources/conf/cluster.properties
rename to genomix/genomix-data/src/main/resources/conf/cluster.properties
diff --git a/genomix/genomix-core/src/main/resources/conf/debugnc.properties b/genomix/genomix-data/src/main/resources/conf/debugnc.properties
similarity index 100%
rename from genomix/genomix-core/src/main/resources/conf/debugnc.properties
rename to genomix/genomix-data/src/main/resources/conf/debugnc.properties
diff --git a/genomix/genomix-core/src/main/resources/conf/master b/genomix/genomix-data/src/main/resources/conf/master
similarity index 100%
rename from genomix/genomix-core/src/main/resources/conf/master
rename to genomix/genomix-data/src/main/resources/conf/master
diff --git a/genomix/genomix-core/src/main/resources/conf/slaves b/genomix/genomix-data/src/main/resources/conf/slaves
similarity index 100%
rename from genomix/genomix-core/src/main/resources/conf/slaves
rename to genomix/genomix-data/src/main/resources/conf/slaves
diff --git a/genomix/genomix-core/src/main/resources/scripts/genomix b/genomix/genomix-data/src/main/resources/scripts/genomix
similarity index 100%
rename from genomix/genomix-core/src/main/resources/scripts/genomix
rename to genomix/genomix-data/src/main/resources/scripts/genomix
diff --git a/genomix/genomix-core/src/main/resources/scripts/genomix.bat b/genomix/genomix-data/src/main/resources/scripts/genomix.bat
similarity index 100%
rename from genomix/genomix-core/src/main/resources/scripts/genomix.bat
rename to genomix/genomix-data/src/main/resources/scripts/genomix.bat
diff --git a/genomix/genomix-core/src/main/resources/scripts/getip.sh b/genomix/genomix-data/src/main/resources/scripts/getip.sh
similarity index 100%
rename from genomix/genomix-core/src/main/resources/scripts/getip.sh
rename to genomix/genomix-data/src/main/resources/scripts/getip.sh
diff --git a/genomix/genomix-core/src/main/resources/scripts/startAllNCs.sh b/genomix/genomix-data/src/main/resources/scripts/startAllNCs.sh
similarity index 100%
rename from genomix/genomix-core/src/main/resources/scripts/startAllNCs.sh
rename to genomix/genomix-data/src/main/resources/scripts/startAllNCs.sh
diff --git a/genomix/genomix-core/src/main/resources/scripts/startCluster.sh b/genomix/genomix-data/src/main/resources/scripts/startCluster.sh
similarity index 100%
rename from genomix/genomix-core/src/main/resources/scripts/startCluster.sh
rename to genomix/genomix-data/src/main/resources/scripts/startCluster.sh
diff --git a/genomix/genomix-core/src/main/resources/scripts/startDebugNc.sh b/genomix/genomix-data/src/main/resources/scripts/startDebugNc.sh
similarity index 100%
rename from genomix/genomix-core/src/main/resources/scripts/startDebugNc.sh
rename to genomix/genomix-data/src/main/resources/scripts/startDebugNc.sh
diff --git a/genomix/genomix-core/src/main/resources/scripts/startcc.sh b/genomix/genomix-data/src/main/resources/scripts/startcc.sh
similarity index 100%
rename from genomix/genomix-core/src/main/resources/scripts/startcc.sh
rename to genomix/genomix-data/src/main/resources/scripts/startcc.sh
diff --git a/genomix/genomix-core/src/main/resources/scripts/startnc.sh b/genomix/genomix-data/src/main/resources/scripts/startnc.sh
similarity index 100%
rename from genomix/genomix-core/src/main/resources/scripts/startnc.sh
rename to genomix/genomix-data/src/main/resources/scripts/startnc.sh
diff --git a/genomix/genomix-core/src/main/resources/scripts/stopAllNCs.sh b/genomix/genomix-data/src/main/resources/scripts/stopAllNCs.sh
similarity index 100%
rename from genomix/genomix-core/src/main/resources/scripts/stopAllNCs.sh
rename to genomix/genomix-data/src/main/resources/scripts/stopAllNCs.sh
diff --git a/genomix/genomix-core/src/main/resources/scripts/stopCluster.sh b/genomix/genomix-data/src/main/resources/scripts/stopCluster.sh
similarity index 100%
rename from genomix/genomix-core/src/main/resources/scripts/stopCluster.sh
rename to genomix/genomix-data/src/main/resources/scripts/stopCluster.sh
diff --git a/genomix/genomix-core/src/main/resources/scripts/stopcc.sh b/genomix/genomix-data/src/main/resources/scripts/stopcc.sh
similarity index 100%
rename from genomix/genomix-core/src/main/resources/scripts/stopcc.sh
rename to genomix/genomix-data/src/main/resources/scripts/stopcc.sh
diff --git a/genomix/genomix-core/src/main/resources/scripts/stopnc.sh b/genomix/genomix-data/src/main/resources/scripts/stopnc.sh
similarity index 100%
rename from genomix/genomix-core/src/main/resources/scripts/stopnc.sh
rename to genomix/genomix-data/src/main/resources/scripts/stopnc.sh
diff --git a/genomix/genomix-core/src/test/java/edu/uci/ics/genomix/example/kmer/KmerTest.java b/genomix/genomix-data/src/test/java/edu/uci/ics/genomix/example/kmer/KmerTest.java
similarity index 100%
rename from genomix/genomix-core/src/test/java/edu/uci/ics/genomix/example/kmer/KmerTest.java
rename to genomix/genomix-data/src/test/java/edu/uci/ics/genomix/example/kmer/KmerTest.java
diff --git a/genomix/genomix-core/src/test/resources/data/0/text.txt b/genomix/genomix-data/src/test/resources/data/0/text.txt
similarity index 100%
rename from genomix/genomix-core/src/test/resources/data/0/text.txt
rename to genomix/genomix-data/src/test/resources/data/0/text.txt
diff --git a/genomix/genomix-core/src/test/resources/data/webmap/text.txt b/genomix/genomix-data/src/test/resources/data/webmap/text.txt
similarity index 100%
rename from genomix/genomix-core/src/test/resources/data/webmap/text.txt
rename to genomix/genomix-data/src/test/resources/data/webmap/text.txt
diff --git a/genomix/genomix-core/src/test/resources/expected/result2 b/genomix/genomix-data/src/test/resources/expected/result2
similarity index 100%
rename from genomix/genomix-core/src/test/resources/expected/result2
rename to genomix/genomix-data/src/test/resources/expected/result2
diff --git a/genomix/genomix-core/src/test/resources/hadoop/conf/core-site.xml b/genomix/genomix-data/src/test/resources/hadoop/conf/core-site.xml
similarity index 100%
rename from genomix/genomix-core/src/test/resources/hadoop/conf/core-site.xml
rename to genomix/genomix-data/src/test/resources/hadoop/conf/core-site.xml
diff --git a/genomix/genomix-core/src/test/resources/hadoop/conf/hdfs-site.xml b/genomix/genomix-data/src/test/resources/hadoop/conf/hdfs-site.xml
similarity index 100%
rename from genomix/genomix-core/src/test/resources/hadoop/conf/hdfs-site.xml
rename to genomix/genomix-data/src/test/resources/hadoop/conf/hdfs-site.xml
diff --git a/genomix/genomix-core/src/test/resources/hadoop/conf/log4j.properties b/genomix/genomix-data/src/test/resources/hadoop/conf/log4j.properties
similarity index 100%
rename from genomix/genomix-core/src/test/resources/hadoop/conf/log4j.properties
rename to genomix/genomix-data/src/test/resources/hadoop/conf/log4j.properties
diff --git a/genomix/genomix-core/src/test/resources/hadoop/conf/mapred-site.xml b/genomix/genomix-data/src/test/resources/hadoop/conf/mapred-site.xml
similarity index 100%
rename from genomix/genomix-core/src/test/resources/hadoop/conf/mapred-site.xml
rename to genomix/genomix-data/src/test/resources/hadoop/conf/mapred-site.xml
diff --git a/genomix/genomix-hyracks/pom.xml b/genomix/genomix-hyracks/pom.xml
index 8adcec7..87fa816 100644
--- a/genomix/genomix-hyracks/pom.xml
+++ b/genomix/genomix-hyracks/pom.xml
@@ -247,7 +247,7 @@
</dependency>
<dependency>
<groupId>edu.uci.ics.hyracks</groupId>
- <artifactId>genomix-core</artifactId>
+ <artifactId>genomix-data</artifactId>
<version>0.2.3-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
diff --git a/genomix/genomix-hyracks/src/main/java/edu/uci/ics/genomix/dataflow/KMerSequenceWriterFactory.java b/genomix/genomix-hyracks/src/main/java/edu/uci/ics/genomix/dataflow/KMerSequenceWriterFactory.java
index 0ef10cf..66ce324 100644
--- a/genomix/genomix-hyracks/src/main/java/edu/uci/ics/genomix/dataflow/KMerSequenceWriterFactory.java
+++ b/genomix/genomix-hyracks/src/main/java/edu/uci/ics/genomix/dataflow/KMerSequenceWriterFactory.java
@@ -49,7 +49,7 @@
// writer = new NonSyncWriter((FSDataOutputStream) output);
writer = SequenceFile.createWriter(cf.getConf(),
(FSDataOutputStream) output, BytesWritable.class,
- BytesWritable.class, CompressionType.NONE, null);
+ KmerCountValue.class, CompressionType.NONE, null);
}
byte[] kmer = tuple.getFieldData(0);
int keyStart = tuple.getFieldStart(0);
diff --git a/genomix/pom.xml b/genomix/pom.xml
index 2e64b59..1939f99 100644
--- a/genomix/pom.xml
+++ b/genomix/pom.xml
@@ -40,7 +40,7 @@
</pluginRepositories>
<modules>
- <module>genomix-core</module>
+ <module>genomix-data</module>
<module>genomix-hyracks</module>
<module>genomix-hadoop</module>
</modules>