Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Yang-maven-plugin refactored and config attributes and spi adjusted.
[controller.git]
/
opendaylight
/
sal
/
yang-prototype
/
code-generator
/
maven-yang-plugin
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
yang2sources
/
plugin
/
ConfigArg.java
diff --git
a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin/src/main/java/org/opendaylight/controller/yang2sources/plugin/ConfigArg.java
b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin/src/main/java/org/opendaylight/controller/yang2sources/plugin/ConfigArg.java
index aaf7080a6234c8e6a4155b42ec8dc20d3c7cc58f..0df9a6345ee9384b316f3d71093fa19a9796a658 100644
(file)
--- a/
opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin/src/main/java/org/opendaylight/controller/yang2sources/plugin/ConfigArg.java
+++ b/
opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin/src/main/java/org/opendaylight/controller/yang2sources/plugin/ConfigArg.java
@@
-42,7
+42,10
@@
public abstract class ConfigArg {
public static final class CodeGeneratorArg extends ConfigArg {
private static final String CODE_GEN_DEFAULT_DIR = "target"
+ File.separator + "generated-sources";
public static final class CodeGeneratorArg extends ConfigArg {
private static final String CODE_GEN_DEFAULT_DIR = "target"
+ File.separator + "generated-sources";
+ private static final String CODE_GEN_DEFAULT_RESOURCE_DIR = "target"
+ + File.separator + "generated-resources";
private String codeGeneratorClass;
private String codeGeneratorClass;
+ private File resourceBaseDir = new File(CODE_GEN_DEFAULT_RESOURCE_DIR);
private Map<String, String> additionalConfiguration = Maps.newHashMap();
private Map<String, String> additionalConfiguration = Maps.newHashMap();
@@
-59,6
+62,13
@@
public abstract class ConfigArg {
this.codeGeneratorClass = codeGeneratorClass;
}
this.codeGeneratorClass = codeGeneratorClass;
}
+ public CodeGeneratorArg(String codeGeneratorClass,
+ String outputBaseDir, String resourceBaseDir) {
+ super(outputBaseDir);
+ this.codeGeneratorClass = codeGeneratorClass;
+ this.resourceBaseDir = new File(resourceBaseDir);
+ }
+
@Override
public void check() {
Preconditions.checkNotNull(codeGeneratorClass,
@Override
public void check() {
Preconditions.checkNotNull(codeGeneratorClass,
@@
-69,6
+79,14
@@
public abstract class ConfigArg {
return codeGeneratorClass;
}
return codeGeneratorClass;
}
+ public File getResourceBaseDir(MavenProject project) {
+ if (resourceBaseDir.isAbsolute()) {
+ return resourceBaseDir;
+ } else {
+ return new File(project.getBasedir(), resourceBaseDir.getPath());
+ }
+ }
+
public Map<String, String> getAdditionalConfiguration() {
return additionalConfiguration;
}
public Map<String, String> getAdditionalConfiguration() {
return additionalConfiguration;
}