ZOOKEEPER-150. zookeeper build broken

git-svn-id: https://svn.apache.org/repos/asf/hadoop/zookeeper/trunk@700871 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -10,10 +10,18 @@ Non-backward compatible changes:
 
   ZOOKEEPER-18. keeper state inconsistency (Jakob Homan via phunt)
 
+  ZOOKEEPER-38. headers (version+) in log/snap files (Andrew Kornev and Mahadev
+  Konar via breed)
+
+  ZOOKEEPER-127.  Use of non-standard election ports in config breaks services
+  (Mark Harwood and Flavio Junqueira via breed)
+
 Backward compatibile changes:
 
   BUGFIXES: 
 
+  ZOOKEEPER-150. zookeeper build broken (mahadev via phunt)
+
   ZOOKEEPER-144. add tostring support for watcher event, and enums for event
   type/state (Jakob Homan via phunt)
 
@@ -96,9 +104,3 @@ Backward compatibile changes:
 
  ZOOKEEPER-117. threading issues in Leader election (Flavio Junqueira and Patrick
  Hunt via breed)
-
- ZOOKEEPER-38. headers (version+) in log/snap files (Andrew Kornev and Mahadev
- Konar via breed)
-
- ZOOKEEPER-127.  Use of non-standard election ports in config breaks services (Mark
- Harwood and Flavio Junqueira via breed)

src/java/main/org/apache/zookeeper/server/persistence/Util.java

@@ -126,37 +126,7 @@ public class Util {
     public static String getFormatConversionPolicy(Properties props){
         return props.getProperty(DB_FORMAT_CONV);
     }
-    
-    /**
-     * The routine parses the scheme-specific part and returns the attributes 
-     * values (if any) as an instance of Properties.
-     * @param uri the persistence provider URI
-     * @return URI attributes
-     */
-    public static Properties parseUrl(URI uri){
-        Properties props=new Properties();        
-        for(String s: uri.getSchemeSpecificPart().split(";")){
-            String[] pair=s.split("=");
-            if(pair.length==2){
-                if(pair[0].equals(SNAP_DIR)){
-                    props.setProperty(SNAP_DIR,pair[1]);
-                }else if(pair[0].equals(LOG_DIR)){
-                    props.setProperty(LOG_DIR,pair[1]);                        
-                }else if(pair[0].equals(DB_FORMAT_CONV)){
-                    props.setProperty(DB_FORMAT_CONV,pair[1]);                        
-                }else{
-                    LOG.warn("Unknown parameter ["+pair[0]+"] ignored");
-                }
-            }
-        }
-        Set<String> pp=props.stringPropertyNames();
-        if(!pp.contains(SNAP_DIR) || !pp.contains(LOG_DIR)){
-            throw new IllegalArgumentException(
-                    "Both snapDir and logDir must be specified");
-        }
-        return props;
-    }
-
+   
     /**
      * Extracts zxid from the file name. The file name should have been created
      * using one of the {@link makeLogName} or {@link makeSnapshotName}.