[Gzz-commits] storm/org/nongnu/storm AddPointer.java AddToMed...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/storm
Module name:    storm
Changes by:     Tuomas J. Lukka <address@hidden>        03/03/25 08:57:38

Modified files:
        org/nongnu/storm: AddPointer.java AddToMediaserver.java 
                          ComputeID.java Mediaserver.java 
                          MediaserverBlock.java SimpleMediaserver.java 
        org/nongnu/storm/storage: DirStorer.java Storer.java 
                                  TransientStorer.java URLStorer.java 
                                  ZipStorer.java 
Added files:
        org/nongnu/storm/util: CopyUtil.java HeaderUtil.java 
                               HexUtil.java 

Log message:
        Compiles

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/storm/storm/org/nongnu/storm/AddPointer.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/storm/storm/org/nongnu/storm/AddToMediaserver.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/storm/storm/org/nongnu/storm/ComputeID.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/storm/storm/org/nongnu/storm/Mediaserver.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/storm/storm/org/nongnu/storm/MediaserverBlock.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/storm/storm/org/nongnu/storm/SimpleMediaserver.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/storm/storm/org/nongnu/storm/storage/DirStorer.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/storm/storm/org/nongnu/storm/storage/Storer.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/storm/storm/org/nongnu/storm/storage/TransientStorer.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/storm/storm/org/nongnu/storm/storage/URLStorer.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/storm/storm/org/nongnu/storm/storage/ZipStorer.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/storm/storm/org/nongnu/storm/util/CopyUtil.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/storm/storm/org/nongnu/storm/util/HeaderUtil.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/storm/storm/org/nongnu/storm/util/HexUtil.java?rev=1.1

Patches:
Index: storm/org/nongnu/storm/AddPointer.java
diff -u storm/org/nongnu/storm/AddPointer.java:1.2 
storm/org/nongnu/storm/AddPointer.java:1.3
--- storm/org/nongnu/storm/AddPointer.java:1.2  Tue Mar 25 08:48:48 2003
+++ storm/org/nongnu/storm/AddPointer.java      Tue Mar 25 08:57:38 2003
@@ -24,6 +24,7 @@
  * Written by Benja Fallenstein and Antti-Juhani Kaijanaho
  */
 package org.nongnu.storm;
+import org.nongnu.storm.storage.*;
 import java.util.*;
 import java.io.*;
 
@@ -31,7 +32,7 @@
  */
 
 public class AddPointer {
-public static final String rcsid = "$Id: AddPointer.java,v 1.2 2003/03/25 
13:48:48 tjl Exp $";
+public static final String rcsid = "$Id: AddPointer.java,v 1.3 2003/03/25 
13:57:38 tjl Exp $";
     public static boolean dbg = false;
     protected static void p(String s) { if(dbg) pa(s); }
     protected static void pa(String s) { System.err.println(s); }
Index: storm/org/nongnu/storm/AddToMediaserver.java
diff -u storm/org/nongnu/storm/AddToMediaserver.java:1.2 
storm/org/nongnu/storm/AddToMediaserver.java:1.3
--- storm/org/nongnu/storm/AddToMediaserver.java:1.2    Tue Mar 25 08:48:48 2003
+++ storm/org/nongnu/storm/AddToMediaserver.java        Tue Mar 25 08:57:38 2003
@@ -24,6 +24,7 @@
  * Written by Benja Fallenstein and Antti-Juhani Kaijanaho
  */
 package org.nongnu.storm;
+import org.nongnu.storm.storage.*;
 import java.util.*;
 import java.io.*;
 
@@ -31,7 +32,7 @@
  */
 
 public class AddToMediaserver {
-public static final String rcsid = "$Id: AddToMediaserver.java,v 1.2 
2003/03/25 13:48:48 tjl Exp $";
+public static final String rcsid = "$Id: AddToMediaserver.java,v 1.3 
2003/03/25 13:57:38 tjl Exp $";
     public static boolean dbg = false;
     protected static void p(String s) { if(dbg) pa(s); }
     protected static void pa(String s) { System.err.println(s); }
Index: storm/org/nongnu/storm/ComputeID.java
diff -u storm/org/nongnu/storm/ComputeID.java:1.2 
storm/org/nongnu/storm/ComputeID.java:1.3
--- storm/org/nongnu/storm/ComputeID.java:1.2   Tue Mar 25 08:48:48 2003
+++ storm/org/nongnu/storm/ComputeID.java       Tue Mar 25 08:57:38 2003
@@ -25,6 +25,7 @@
  */
 
 package org.nongnu.storm;
+import org.nongnu.storm.util.*;
 import java.security.*;
 import java.io.*;
 import java.util.*;
Index: storm/org/nongnu/storm/Mediaserver.java
diff -u storm/org/nongnu/storm/Mediaserver.java:1.2 
storm/org/nongnu/storm/Mediaserver.java:1.3
--- storm/org/nongnu/storm/Mediaserver.java:1.2 Tue Mar 25 08:48:48 2003
+++ storm/org/nongnu/storm/Mediaserver.java     Tue Mar 25 08:57:38 2003
@@ -26,7 +26,7 @@
 
 package org.nongnu.storm;
 import org.nongnu.storm.storage.*;
-import gzz.util.*;
+import org.nongnu.storm.util.*;
 import java.io.*;
 import java.util.*;
 
Index: storm/org/nongnu/storm/MediaserverBlock.java
diff -u storm/org/nongnu/storm/MediaserverBlock.java:1.2 
storm/org/nongnu/storm/MediaserverBlock.java:1.3
--- storm/org/nongnu/storm/MediaserverBlock.java:1.2    Tue Mar 25 08:48:48 2003
+++ storm/org/nongnu/storm/MediaserverBlock.java        Tue Mar 25 08:57:38 2003
@@ -27,6 +27,7 @@
  */
 
 package org.nongnu.storm;
+import org.nongnu.storm.util.*;
 import java.io.*;
 import java.util.*;
 
Index: storm/org/nongnu/storm/SimpleMediaserver.java
diff -u storm/org/nongnu/storm/SimpleMediaserver.java:1.2 
storm/org/nongnu/storm/SimpleMediaserver.java:1.3
--- storm/org/nongnu/storm/SimpleMediaserver.java:1.2   Tue Mar 25 08:48:48 2003
+++ storm/org/nongnu/storm/SimpleMediaserver.java       Tue Mar 25 08:57:38 2003
@@ -26,6 +26,7 @@
 
 package org.nongnu.storm;
 import org.nongnu.storm.storage.*;
+import org.nongnu.storm.util.*;
 import java.io.*;
 import java.util.*;
 import java.text.*;
@@ -253,7 +254,7 @@
            PointerSet set = getPointerSet(pr.id);
            set.add(pr);
            set.write(store.store("ps_" + pr.id));
-       } else if(b.getContentType().equals(MediaserverFiler.diffContentType)) {
+       } /* else 
if(b.getContentType().equals(MediaserverFiler.diffContentType)) {
            Id to = new Id(HeaderUtil.getOne(b.getHeader(), "X-Gzz-Diff-To"));
            Set t = getDiffsTo(to); t.add(id);
            writeIdSet("dt_" + to.getString(), t);
@@ -264,7 +265,7 @@
                new Id(HeaderUtil.getOne(b.getHeader(), "X-Gzz-Diff-From"));
            Set s = getDiffsFrom(from); s.add(id);
            writeIdSet("df_" + from.getString(), s);
-       }
+       } */
     }
 
     protected Set readIdSet(String key) throws IOException {
Index: storm/org/nongnu/storm/storage/DirStorer.java
diff -u storm/org/nongnu/storm/storage/DirStorer.java:1.1 
storm/org/nongnu/storm/storage/DirStorer.java:1.2
--- storm/org/nongnu/storm/storage/DirStorer.java:1.1   Tue Mar 25 08:43:50 2003
+++ storm/org/nongnu/storm/storage/DirStorer.java       Tue Mar 25 08:57:38 2003
@@ -26,7 +26,8 @@
  * Written by Antti-Juhani Kaijanaho, Tuomas Lukka and Benja Fallenstein
  */
 
-package gzz.mediaserver.storage;
+package org.nongnu.storm.storage;
+import org.nongnu.storm.*;
 import java.io.*;
 import java.util.*;
 
Index: storm/org/nongnu/storm/storage/Storer.java
diff -u storm/org/nongnu/storm/storage/Storer.java:1.1 
storm/org/nongnu/storm/storage/Storer.java:1.2
--- storm/org/nongnu/storm/storage/Storer.java:1.1      Tue Mar 25 08:43:50 2003
+++ storm/org/nongnu/storm/storage/Storer.java  Tue Mar 25 08:57:38 2003
@@ -26,7 +26,8 @@
  * Written by Benja Fallenstein
  */
 
-package gzz.mediaserver.storage;
+package org.nongnu.storm.storage;
+import org.nongnu.storm.*;
 import java.io.*;
 import java.util.*;
 
Index: storm/org/nongnu/storm/storage/TransientStorer.java
diff -u storm/org/nongnu/storm/storage/TransientStorer.java:1.1 
storm/org/nongnu/storm/storage/TransientStorer.java:1.2
--- storm/org/nongnu/storm/storage/TransientStorer.java:1.1     Tue Mar 25 
08:43:50 2003
+++ storm/org/nongnu/storm/storage/TransientStorer.java Tue Mar 25 08:57:38 2003
@@ -26,7 +26,8 @@
  * Written by Benja Fallenstein
  */
 
-package gzz.mediaserver.storage;
+package org.nongnu.storm.storage;
+import org.nongnu.storm.*;
 import java.io.*;
 import java.util.*;
 
Index: storm/org/nongnu/storm/storage/URLStorer.java
diff -u storm/org/nongnu/storm/storage/URLStorer.java:1.1 
storm/org/nongnu/storm/storage/URLStorer.java:1.2
--- storm/org/nongnu/storm/storage/URLStorer.java:1.1   Tue Mar 25 08:43:50 2003
+++ storm/org/nongnu/storm/storage/URLStorer.java       Tue Mar 25 08:57:38 2003
@@ -26,7 +26,8 @@
  * Written by Antti-Juhani Kaijanaho and Benja Fallenstein
  */
 
-package gzz.mediaserver.storage;
+package org.nongnu.storm.storage;
+import org.nongnu.storm.*;
 import java.io.*;
 import java.net.*;
 import java.util.*;
Index: storm/org/nongnu/storm/storage/ZipStorer.java
diff -u storm/org/nongnu/storm/storage/ZipStorer.java:1.1 
storm/org/nongnu/storm/storage/ZipStorer.java:1.2
--- storm/org/nongnu/storm/storage/ZipStorer.java:1.1   Tue Mar 25 08:43:50 2003
+++ storm/org/nongnu/storm/storage/ZipStorer.java       Tue Mar 25 08:57:38 2003
@@ -25,7 +25,8 @@
  * Written by os group
  */
 
-package gzz.mediaserver.storage;
+package org.nongnu.storm.storage;
+import org.nongnu.storm.*;
 
 import java.io.*;
 import java.util.*;