[ONOS-4144] ,[ONOS-4145] Bug fixes for YANG translator.
Change-Id: I6922c01269611b3aec61a9e46cda5166f8fe1ec0
diff --git a/src/main/java/org/onosproject/yangutils/plugin/manager/YangUtilManager.java b/src/main/java/org/onosproject/yangutils/plugin/manager/YangUtilManager.java
index 6771421..a2478d9 100644
--- a/src/main/java/org/onosproject/yangutils/plugin/manager/YangUtilManager.java
+++ b/src/main/java/org/onosproject/yangutils/plugin/manager/YangUtilManager.java
@@ -17,7 +17,6 @@
package org.onosproject.yangutils.plugin.manager;
import java.io.File;
-import java.io.IOException;
import java.util.Iterator;
import java.util.List;
@@ -56,6 +55,12 @@
private String yangFilesDir;
/**
+ * Source directory for generated files.
+ */
+ @Parameter(property = "genFilesDir", defaultValue = "src/main/java")
+ private String genFilesDir;
+
+ /**
* Base directory for project.
*/
@Parameter(property = "basedir", defaultValue = "${basedir}")
@@ -105,7 +110,7 @@
YangIoUtils.clean(baseDir);
searchDir = baseDir + File.separator + yangFilesDir;
- codeGenDir = baseDir + File.separator + UtilConstants.YANG_GEN_DIR;
+ codeGenDir = baseDir + File.separator + genFilesDir + File.separator;
List<String> yangFiles = YangFileScanner.getYangFiles(searchDir);
Iterator<String> yangFileIterator = yangFiles.iterator();
@@ -129,8 +134,8 @@
}
YangIoUtils.addToSource(baseDir + File.separator + UtilConstants.YANG_GEN_DIR, project, context);
- } catch (final IOException e) {
- getLog().info("IOException occured");
+ } catch (Exception e) {
+ getLog().info(e);
}
}