Skip to content

Add basedir to default file resolver for ant basedir support. #53

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
levsa wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add basedir to default file resolver for ant basedir support. #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion ...ocessor-plugin/src/main/java/com/google/code/configprocessor/ant/ConfigProcessorTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,10 @@ public void execute() {
for (NamespaceContext nsContext : namespaceContexts) {
namespaceContextsMap.put(nsContext.getPrefix(), nsContext.getUrl());
}
ConfigProcessor processor = new ConfigProcessor(encoding, indentSize, lineWidth, namespaceContextsMap, getProject().getBaseDir(), outputDirectory, useOutputDirectory, log, new DefaultFileResolver(), parserFeatures, failOnMissingXpath);
DefaultFileResolver fileResolver = new DefaultFileResolver();
File projectBaseDir = getProject().getBaseDir();
fileResolver.setBasedir(projectBaseDir.getAbsolutePath());
ConfigProcessor processor = new ConfigProcessor(encoding, indentSize, lineWidth, namespaceContextsMap, projectBaseDir, outputDirectory, useOutputDirectory, log, fileResolver, parserFeatures, failOnMissingXpath);
processor.init();

Properties additionalProperties = loadIfPossible(specificProperties, log);
Expand Down
13 changes: 12 additions & 1 deletion ...rocessor-plugin/src/main/java/com/google/code/configprocessor/io/DefaultFileResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,23 @@

public class DefaultFileResolver implements FileResolver {

private String basedir;

public File resolve(String name) throws IOException {
File file = new File(name);
if (!file.exists()) {
throw new FileNotFoundException("File [" + name + "] does not exist");
file = new File(basedir, name);
if (!file.exists()) {
throw new FileNotFoundException("File [" + name +
"] does not exist. " + "looked in: " + new File(name) +
"\n" + file);
}
}
return file;
}

public void setBasedir(String basedir) {
this.basedir = basedir;
}

}