accumulo-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mikewalch <...@git.apache.org>
Subject [GitHub] accumulo pull request #236: ACCUMULO-4614 AccumuloClassLoader should load ac...
Date Wed, 29 Mar 2017 13:55:04 GMT
Github user mikewalch commented on a diff in the pull request:

    https://github.com/apache/accumulo/pull/236#discussion_r108681934
  
    --- Diff: start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java
---
    @@ -44,21 +44,21 @@
     
     public class AccumuloClassLoader {
     
    -  public static final String CLASSPATH_PROPERTY_NAME = "general.classpaths";
    +  public static final String GENERAL_CLASSPATHS = "general.classpaths";
       public static final String MAVEN_PROJECT_BASEDIR_PROPERTY_NAME = "general.maven.project.basedir";
       public static final String DEFAULT_MAVEN_PROJECT_BASEDIR_VALUE = "";
     
    -  private static String SITE_CONF;
    +  private static URL accumuloConfigUrl;
       private static URLClassLoader classloader;
       private static final Logger log = LoggerFactory.getLogger(AccumuloClassLoader.class);
     
       static {
    -    String configFile = System.getProperty("org.apache.accumulo.config.file", "accumulo-site.xml");
    -    if (System.getenv("ACCUMULO_CONF_DIR") != null) {
    -      // accumulo conf dir should be set
    -      SITE_CONF = System.getenv("ACCUMULO_CONF_DIR") + "/" + configFile;
    +    String configFilename = System.getProperty("org.apache.accumulo.config.file", "accumulo-site.xml");
    +    accumuloConfigUrl = AccumuloClassLoader.class.getClassLoader().getResource(configFilename);
    +    if (accumuloConfigUrl == null) {
    +      log.warn("Failed to load Accumulo configuration '{}' from classpath", configFilename);
    --- End diff --
    
    I think there are other cases where the `file://` feature is useful such as a user cannot
modify the classpath easily (ex. unit test) or doesn't want the directory where their accumulo-site.xml
is located placed on classpath. These are rare cases but the code for `file://` feature is
small and the default behavior of loading from the classpath has not changed.


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---

Mime
View raw message