edgent-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ddebrunner <...@git.apache.org>
Subject [GitHub] incubator-quarks pull request #131: [WIP][QUARKS-139] Alternative gradle bui...
Date Wed, 08 Jun 2016 20:45:47 GMT
Github user ddebrunner commented on a diff in the pull request:

    https://github.com/apache/incubator-quarks/pull/131#discussion_r66336256
  
    --- Diff: console/server/src/main/java/quarks/console/server/ServerUtil.java ---
    @@ -45,31 +53,35 @@ private String getPath() {
          * @return a File object
          */
         private File getTopDirFilePath() {
    +        String topDirProp = System.getProperty("top.dir.file.path");
    +        if (topDirProp != null) {
    +          return new File(topDirProp);
    +        }
             File jarFile = new File(getPath());
             return jarFile.getParentFile().getParentFile().getParentFile();
         }
     
    -    // create new filename filter
    -    FilenameFilter fileNameFilter = new FilenameFilter() {
    -
    -        @Override
    -        public boolean accept(File dir, String name) {
    -            if (name.equals("webapps")) {
    -                return true;
    -            }
    -            else {
    -                return false;
    -            }
    -        }
    -    };
         /**
          * Returns the File object representing the "webapps" directory
          * @return a File object or null if the "webapps" directory is not found
          */
         private File getWarFilePath() {
    -        File[] foundFiles = getTopDirFilePath().listFiles(fileNameFilter);
    -        if (foundFiles.length == 1) {
    -            return foundFiles[0];
    +        List<File> foundFiles = new ArrayList<>();
    --- End diff --
    
    Seems like this is a merge error, I'm assuming this file should not change because of
gradle.


---
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