[Bigdata-commit] SF.net SVN: bigdata:[7504] branches/BIGDATA_RELEASE_1_3_0/bigdata-jini/src/ java/com/bigdata/journal/jini/ha/HAClient.java

[<tho...@us...>]

Revision: 7504
          http://bigdata.svn.sourceforge.net/bigdata/?rev=7504&view=rev
Author:   thompsonbry
Date:     2013-10-31 14:53:27 +0000 (Thu, 31 Oct 2013)
Log Message:
-----------
Dead code cleanup on HAClient

Modified Paths:
--------------
    branches/BIGDATA_RELEASE_1_3_0/bigdata-jini/src/java/com/bigdata/journal/jini/ha/HAClient.java

Modified: branches/BIGDATA_RELEASE_1_3_0/bigdata-jini/src/java/com/bigdata/journal/jini/ha/HAClient.java
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/bigdata-jini/src/java/com/bigdata/journal/jini/ha/HAClient.java	2013-10-31 13:29:45 UTC (rev 7503)
+++ branches/BIGDATA_RELEASE_1_3_0/bigdata-jini/src/java/com/bigdata/journal/jini/ha/HAClient.java	2013-10-31 14:53:27 UTC (rev 7504)
@@ -320,144 +320,6 @@
 
     }
 
-    // /**
-    // * {@inheritDoc}
-    // *
-    // * @see #getProperties(String component)
-    // */
-    // public Properties getProperties() {
-    //
-    // return properties;
-    //
-    // }
-
-    // /**
-    // * Return the {@link Properties} for the {@link JiniClient} merged with
-    // * those for the named component in the {@link Configuration}. Any
-    // * properties found for the {@link JiniClient} "component" will be read
-    // * first. Properties for the named component are next, and therefore will
-    // * override those given for the {@link JiniClient}. You can specify
-    // * properties for either the {@link JiniClient} or the <i>component</i>
-    // * using:
-    // *
-    // * <pre>
-    // * properties = NV[]{...};
-    // * </pre>
-    // *
-    // * in the appropriate section of the {@link Configuration}. For example:
-    // *
-    // * <pre>
-    // *
-    // * // Jini client configuration
-    // * com.bigdata.service.jini.JiniClient {
-    // *
-    // * // ...
-    // *
-    // * // optional JiniClient properties.
-    // * properties = new NV[] {
-    // *
-    // * new NV(&quot;foo&quot;,&quot;bar&quot;)
-    // *
-    // * };
-    // *
-    // * }
-    // * </pre>
-    // *
-    // * And overrides for a named component as:
-    // *
-    // * <pre>
-    // *
-    // * com.bigdata.service.FooBaz {
-    // *
-    // * properties = new NV[] {
-    // *
-    // * new NV(&quot;foo&quot;,&quot;baz&quot;),
-    // * new NV(&quot;goo&quot;,&quot;12&quot;),
-    // *
-    // * };
-    // *
-    // * }
-    // * </pre>
-    // *
-    // * @param component
-    // * The name of the component.
-    // *
-    // * @return The properties specified for that component.
-    // *
-    // * @see #getConfiguration()
-    // */
-    // public Properties getProperties(final String component)
-    // throws ConfigurationException {
-    //
-    // return JiniClient.getProperties(component, getConfiguration());
-    //
-    // }
-
-    // /**
-    // * Read {@value JiniClientConfig.Options#PROPERTIES} for the optional
-    // * application or server class identified by [cls].
-    // * <p>
-    // * Note: Anything read for the specific class will overwrite any value for
-    // * the same properties specified for {@link JiniClient}.
-    // *
-    // * @param className
-    // * The class name of the client or service (optional). When
-    // * specified, properties defined for that class in the
-    // * configuration will be used and will override those specified
-    // * for the {@value Options#NAMESPACE}.
-    // * @param config
-    // * The {@link Configuration}.
-    // *
-    // * @todo this could be replaced by explicit use of the java identifier
-    // * corresponding to the Option and simply collecting all such
-    // * properties into a Properties object using their native type (as
-    // * reported by the ConfigurationFile).
-    // */
-    // static public Properties getProperties(final String className,
-    // final Configuration config) throws ConfigurationException {
-    //
-    // final NV[] a = (NV[]) config
-    // .getEntry(JiniClient.class.getName(),
-    // JiniClientConfig.Options.PROPERTIES, NV[].class,
-    // new NV[] {}/* defaultValue */);
-    //
-    // final NV[] b;
-    // if (className != null) {
-    //
-    // b = (NV[]) config.getEntry(className,
-    // JiniClientConfig.Options.PROPERTIES, NV[].class,
-    // new NV[] {}/* defaultValue */);
-    //
-    // } else
-    // b = null;
-    //
-    // final NV[] tmp = ConfigMath.concat(a, b);
-    //
-    // final Properties properties = new Properties();
-    //
-    // for (NV nv : tmp) {
-    //
-    // properties.setProperty(nv.getName(), nv.getValue());
-    //
-    // }
-    //
-    // if (log.isInfoEnabled() || BigdataStatics.debug) {
-    //
-    // final String msg = "className=" + className + " : properties="
-    // + properties.toString();
-    //
-    // if (BigdataStatics.debug)
-    // System.err.println(msg);
-    //
-    // if (log.isInfoEnabled())
-    // log.info(msg);
-    //
-    // }
-    //
-    // return properties;
-    //
-    // }
-
     /**
      * Installs a {@link SecurityManager} and returns a new client.
      * 
@@ -562,50 +424,6 @@
 
     }
 
-    // /**
-    // * Read and return the content of the properties file.
-    // *
-    // * @param propertyFile
-    // * The properties file.
-    // *
-    // * @throws IOException
-    // */
-    // static protected Properties getProperties(final File propertyFile)
-    // throws IOException {
-    //
-    // if(log.isInfoEnabled()) {
-    //
-    // log.info("Reading properties: file="+propertyFile);
-    //
-    // }
-    //
-    // final Properties properties = new Properties();
-    //
-    // InputStream is = null;
-    //
-    // try {
-    //
-    // is = new BufferedInputStream(new FileInputStream(propertyFile));
-    //
-    // properties.load(is);
-    //
-    // if(log.isInfoEnabled()) {
-    //
-    // log.info("Read properties: " + properties);
-    //
-    // }
-    //
-    // return properties;
-    //
-    // } finally {
-    //
-    // if (is != null)
-    // is.close();
-    //
-    // }
-    //
-    // }
-
     /**
      * Invoked when a service join is noticed.
      * 
@@ -1054,16 +872,6 @@
                 zk = null;
 
             }
-            // try {
-            //
-            // // close the zookeeper client.
-            // zooKeeperAccessor.close();
-            //
-            // } catch (InterruptedException e) {
-            //
-            // throw new RuntimeException(e);
-            //
-            // }
 
         }
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.