Rename Splitter-ng-test to Splitter-ng-filesplitter Apply Modifications
authorMaximilian Quellmalz <maximilian.quellmalz@mailbox.tu-dresden.de>
Tue, 9 Dec 2014 14:31:11 +0000 (15:31 +0100)
committerMaximilian Quellmalz <maximilian.quellmalz@mailbox.tu-dresden.de>
Tue, 9 Dec 2014 14:31:25 +0000 (15:31 +0100)
Splitter-ng-filesplitter/.project
Splitter-ng-filesplitter/build.xml
Splitter-ng-filesplitter/filesplitter
Splitter-ng-filesplitter/filesplitter-x
Splitter-ng-filesplitter/src/Filesplitter.java
build.xml

index 490cf19..4f94082 100644 (file)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-       <name>Splitter-ng-test</name>
+       <name>Splitter-ng-filesplitter</name>
        <comment></comment>
        <projects>
        </projects>
index 714c81f..8e21b77 100644 (file)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project basedir="." default="build" name="Splitter-ng-test">
+<project basedir="." default="build" name="Splitter-ng-filesplitter">
        <property environment="env" />
        <property name="Splitter-ng.location" value="../Splitter-ng" />
        <property name="debuglevel" value="source,lines,vars" />
@@ -8,7 +8,7 @@
        <path id="Splitter-ng.classpath">
                <pathelement location="${Splitter-ng.location}/bin" />
        </path>
-       <path id="Splitter-ng-test.classpath">
+       <path id="Splitter-ng-filesplitter.classpath">
                <pathelement location="bin" />
                <pathelement location="lib" />
                <path refid="Splitter-ng.classpath" />
@@ -59,7 +59,7 @@
                <echo message="${ant.project.name}: ${ant.file}" />
                <javac debug="true" debuglevel="${debuglevel}" destdir="bin" includeantruntime="false" source="${source}" target="${target}">
                        <src path="src" />
-                       <classpath refid="Splitter-ng-test.classpath" />
+                       <classpath refid="Splitter-ng-filesplitter.classpath" />
                </javac>
        </target>
        <target description="Build all projects which reference this project. Useful to propagate changes." name="build-refprojects" />
@@ -67,7 +67,7 @@
                <jar jarfile="bin/${ant.project.name}.jar">
                        <fileset dir="bin" includes="**/*.class" />
                        <manifest>
-                               <attribute name="Main-Class" value="SplitterTest" />
+                               <attribute name="Main-Class" value="Filesplitter" />
                                <attribute name="Class-Path" value="lib/Splitter-ng.jar"/>
                        </manifest>
                </jar>
@@ -75,9 +75,9 @@
        <target name="dist" depends="makejar" description="Create a distribution Directory wirth splitter-ng and all Plugins">
                <mkdir dir="../dist" />
                <copy file="bin/${ant.project.name}.jar" todir="../dist/" />
-               <copy file="starttest-x" todir="../dist/" />
-               <chmod file="../dist/starttest-x" perm="ugo+rx"/>
-               <copy file="starttest" todir="../dist/" />
-               <chmod file="../dist/starttest" perm="ugo+rx"/>
+               <copy file="filesplitter-x" todir="../dist/" />
+               <chmod file="../dist/filesplitter-x" perm="ugo+rx"/>
+               <copy file="filesplitter" todir="../dist/" />
+               <chmod file="../dist/filesplitter" perm="ugo+rx"/>
        </target>
 </project>
index b267fea..a85401a 100755 (executable)
@@ -2,5 +2,5 @@
 #Nicht mehr nötig wenn jerasure im plugin-jar ist
 #PWD="`dirname \`readlink -f $0\``"
 #cd $PWD
-LD_LIBRARY_PATH="/tmp/:$PWD/plugin/" java -jar Splitter-ng-test.jar
-#java -jar Splitter-ng-test.jar
+LD_LIBRARY_PATH="/tmp/:$PWD/plugin/" java -jar Splitter-ng-filesplitter.jar
+#java -jar Splitter-ng-filesplitter.jar
index 7c48493..b9d9ed5 100755 (executable)
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-x-terminal-emulator -e ./starttest
+x-terminal-emulator -e ./filesplitter
index 5836c14..e95aac5 100644 (file)
@@ -20,7 +20,7 @@ import splitterng.SplitterCallback;
 import splitterng.plugin.CodecDescription;
 import splitterng.plugin.PluginDescription;
 
-public class SplitterTest implements SplitterCallback {
+public class Filesplitter implements SplitterCallback {
 
        private Collection<Splitter> splitters = new LinkedList<Splitter>();
        private List<CodingTask> finished_encoding_task = new LinkedList<CodingTask>();
@@ -31,8 +31,8 @@ public class SplitterTest implements SplitterCallback {
        private Map<Splitter, Map<String, Object>> splitter_metadata_map = new HashMap<Splitter, Map<String, Object>>();
 
        public static void main(String[] args) throws InterruptedException {
-               SplitterTest splitterTest = new SplitterTest();
-               splitterTest.run();
+               Filesplitter filesplitter = new Filesplitter();
+               filesplitter.run();
 
                // Thread.sleep(50000);
                // System.exit(0);
index 8275f2e..5b4d453 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -8,7 +8,7 @@
        <property name="Splitter-ng-plugin-raid1.location" value="Splitter-ng-plugin-raid1" />
        <property name="Splitter-ng-plugin-jigdfs.location" value="Splitter-ng-plugin-jigdfs" />
        <property name="Splitter-ng-plugin-bitsplitter.location" value="Splitter-ng-plugin-bitsplitter" />
-       <property name="Splitter-ng-test.location" value="Splitter-ng-test" />
+       <property name="Splitter-ng-filesplitter.location" value="Splitter-ng-filesplitter" />
        <target name="init">
                <exec executable="git" failonerror="no">
                        <env key="GIT_SSL_NO_VERIFY" value="true"/>
                <delete dir="dist/plugin" />
                <delete dir="dist/restoreDir" />
                <delete dir="dist/splitDir" />
-               <delete file="dist/Splitter-ng-test.jar" />
-               <delete file="dist/starttest" />
-               <delete file="dist/starttest-x" />
+               <delete file="dist/Splitter-ng-filesplitter.jar" />
+               <delete file="dist/filesplitter" />
+               <delete file="dist/filesplitter-x" />
        </target>
-       <target name="clean" description="Clean Splitter-ng, all Plugins and Splitter-test">
+       <target name="clean" description="Clean Splitter-ng, all Plugins and Splitter-filesplitter">
                <ant antfile="build.xml" dir="${Splitter-ng.location}" inheritAll="false" target="clean" />
-               <ant antfile="build.xml" dir="${Splitter-ng-test.location}" inheritAll="false" target="clean" />
+               <ant antfile="build.xml" dir="${Splitter-ng-filesplitter.location}" inheritAll="false" target="clean" />
                <ant antfile="build.xml" dir="${Splitter-ng-plugin-JSharing.location}" inheritAll="false" target="clean" />
                <ant antfile="build.xml" dir="${Splitter-ng-plugin-jerasure.location}" inheritAll="false" target="clean" />
                <ant antfile="build.xml" dir="${Splitter-ng-plugin-jerasure-purejava.location}" inheritAll="false" target="clean" />
@@ -45,9 +45,9 @@
                <ant antfile="build.xml" dir="${Splitter-ng-plugin-bitsplitter.location}" inheritAll="false" target="clean" />
        </target>
 
-       <target name="buildall" description="Build (not create Jar) Splitter-NG, all Plugins and Splitter-test">
+       <target name="buildall" description="Build (not create Jar) Splitter-NG, all Plugins and Splitter-filesplitter">
                <ant antfile="build.xml" dir="${Splitter-ng.location}" inheritAll="false" target="build" />
-               <ant antfile="build.xml" dir="${Splitter-ng-test.location}" inheritAll="false" target="build" />
+               <ant antfile="build.xml" dir="${Splitter-ng-filesplitter.location}" inheritAll="false" target="build" />
                <ant antfile="build.xml" dir="${Splitter-ng-plugin-JSharing.location}" inheritAll="false" target="build" />
                <ant antfile="build.xml" dir="${Splitter-ng-plugin-jerasure.location}" inheritAll="false" target="build" />
                <!--ant antfile="build.xml" dir="${Splitter-ng-plugin-jerasure-purejava.location}" inheritAll="false" target="build" /-->
                <ant antfile="build.xml" dir="${Splitter-ng-plugin-bitsplitter.location}" inheritAll="false" target="build" />
        </target>
        
-       <!--target name="distall" depends="init,splitter,test,jsharing,jerasure,raid1,bitsplitter,jigdfs,jerasure-purejava" description="Build and Distribute Splitter-NG, all Plugins and Splitter-test to ./dist"/!-->
-       <target name="distall" depends="init,splitter,test,jsharing,jerasure,raid1,bitsplitter,jigdfs" description="Build and Distribute Splitter-NG, all Plugins and Splitter-test to ./dist"/>
+       <!--target name="distall" depends="init,splitter,filesplitter,jsharing,jerasure,raid1,bitsplitter,jigdfs,jerasure-purejava" description="Build and Distribute Splitter-NG, all Plugins and Splitter-filesplitter to ./dist"/!-->
+       <target name="distall" depends="init,splitter,filesplitter,jsharing,jerasure,raid1,bitsplitter,jigdfs" description="Build and Distribute Splitter-NG, all Plugins and Splitter-filesplitter to ./dist"/>
        
        <target name="splitter" depends="init" >
                <ant antfile="build.xml" dir="${Splitter-ng.location}" inheritAll="false" target="dist" />
        </target>
-       <target name="test" depends="splitter" >
-               <ant antfile="build.xml" dir="${Splitter-ng-test.location}" inheritAll="false" target="dist" />
+       <target name="filesplitter" depends="splitter" >
+               <ant antfile="build.xml" dir="${Splitter-ng-filesplitter.location}" inheritAll="false" target="dist" />
        </target>
        <target name="jsharing" depends="splitter" >
                <ant antfile="build.xml" dir="${Splitter-ng-plugin-JSharing.location}" inheritAll="false" target="dist" />