integrate new plugin into Splitter-NG-test and build.xml
authorMaximilian Quellmalz <maximilian.quellmalz@mailbox.tu-dresden.de>
Mon, 2 Jun 2014 12:32:27 +0000 (14:32 +0200)
committerMaximilian Quellmalz <maximilian.quellmalz@mailbox.tu-dresden.de>
Mon, 2 Jun 2014 12:32:27 +0000 (14:32 +0200)
Splitter-ng-plugin-JSharing/.gitignore [new file with mode: 0644]
Splitter-ng-plugin-jerasure/build.xml
Splitter-ng-plugin-raid1/.gitignore [new file with mode: 0644]
Splitter-ng-test/.gitignore [new file with mode: 0644]
Splitter-ng-test/src/SplitterTest.java
Splitter-ng/.gitignore [new file with mode: 0644]
build.xml

diff --git a/Splitter-ng-plugin-JSharing/.gitignore b/Splitter-ng-plugin-JSharing/.gitignore
new file mode 100644 (file)
index 0000000..5e56e04
--- /dev/null
@@ -0,0 +1 @@
+/bin
index 181d0a8..b491d62 100644 (file)
@@ -63,6 +63,7 @@
     <target depends="init" name="build-project">
         <echo message="${ant.project.name}: ${ant.file}"/>
         <javac debug="true" debuglevel="${debuglevel}" destdir="bin" includeantruntime="false" source="${source}" target="${target}">
+            <src path="Jerasure-1.2-java/java/src"/>
             <src path="src"/>
             <classpath refid="Splitter-ng-plugin-jerasure.classpath"/>
         </javac>
diff --git a/Splitter-ng-plugin-raid1/.gitignore b/Splitter-ng-plugin-raid1/.gitignore
new file mode 100644 (file)
index 0000000..5e56e04
--- /dev/null
@@ -0,0 +1 @@
+/bin
diff --git a/Splitter-ng-test/.gitignore b/Splitter-ng-test/.gitignore
new file mode 100644 (file)
index 0000000..5e56e04
--- /dev/null
@@ -0,0 +1 @@
+/bin
index ab68b6d..e3848d6 100644 (file)
@@ -186,6 +186,32 @@ public class SplitterTest implements SplitterCallback {
                                        splitter_metadata_map.put(splittershamir, metadatashamir);
                                        
                                        break;
+                               case "jerasure-java/JerasureJavaCRS":
+                                       // Codecparameter Bauen
+                                       Map<String, Integer> codecParameter11 = new TreeMap<String, Integer>();
+                                       codecParameter11.put("k", 3);
+                                       codecParameter11.put("m", 3);
+                                       codecParameter11.put("w", 16);
+                                       codecParameter11.put("packetsize", 64);
+                                       System.out.println("\t\tinitialisiere mit" + " k="
+                                                       + codecParameter11.get("k") + " m="
+                                                       + codecParameter11.get("m") + " w="
+                                                       + codecParameter11.get("w") + " packetsize="
+                                                       + codecParameter11.get("packetsize"));
+                                       // Splitter mit Plugin-ID CodecID und codecparametern
+                                       // initialisieren
+                                       Splitter splitterjerasure11 = new Splitter(p.getPluginID(), c.getCodecID(),
+                                                       codecParameter11);
+                                       splitters.add(splitterjerasure11);
+                                       
+                                       // Metadaten bauen vorlage
+                                       Map<String, Object> metadatajerasure11 = new TreeMap<String, Object>();
+                                       metadatajerasure11.put("fragmentsize", (int) 4096);
+                                       // Beleiebige weitere Metadaten
+                                       
+                                       splitter_metadata_map.put(splitterjerasure11, metadatajerasure11);
+                                       break;
+///-----------------------------------------------------------------------------------------------
 
 ///-----------------------------------------------------------------------------------------------
 ///-----------------------------------------------------------------------------------------------
diff --git a/Splitter-ng/.gitignore b/Splitter-ng/.gitignore
new file mode 100644 (file)
index 0000000..5e56e04
--- /dev/null
@@ -0,0 +1 @@
+/bin
index 5da863d..7dc0a58 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -4,6 +4,7 @@
        <property name="Splitter-ng.location" value="Splitter-ng" />
        <property name="Splitter-ng-plugin-JSharing.location" value="Splitter-ng-plugin-JSharing" />
        <property name="Splitter-ng-plugin-jerasure.location" value="Splitter-ng-plugin-jerasure" />
+       <property name="Splitter-ng-plugin-jerasure-purejava.location" value="Splitter-ng-plugin-jerasure-purejava" />
        <property name="Splitter-ng-plugin-raid1.location" value="Splitter-ng-plugin-raid1" />
        <property name="Splitter-ng-test.location" value="Splitter-ng-test" />
        <target name="init">
@@ -36,6 +37,7 @@
                <ant antfile="build.xml" dir="${Splitter-ng.location}" inheritAll="false" target="buildall" />
                <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-raid1.location}" inheritAll="false" target="build" />
                <ant antfile="build.xml" dir="${Splitter-ng-test.location}" inheritAll="false" target="build" />
        </target>
@@ -43,6 +45,7 @@
                <ant antfile="build.xml" dir="${Splitter-ng.location}" inheritAll="false" target="dist" />
                <ant antfile="build.xml" dir="${Splitter-ng-plugin-JSharing.location}" inheritAll="false" target="dist" />
                <ant antfile="build.xml" dir="${Splitter-ng-plugin-jerasure.location}" inheritAll="false" target="dist" />
+               <ant antfile="build.xml" dir="${Splitter-ng-plugin-jerasure-purejava.location}" inheritAll="false" target="dist" />
                <ant antfile="build.xml" dir="${Splitter-ng-plugin-raid1.location}" inheritAll="false" target="dist" />
                <ant antfile="build.xml" dir="${Splitter-ng-test.location}" inheritAll="false" target="dist" />
        </target>