Commit fc4e005c authored by Claus Nagel's avatar Claus Nagel
Browse files

No commit message

No commit message
parent 7687bad9
...@@ -23,7 +23,7 @@ public class ADE_XJC { ...@@ -23,7 +23,7 @@ public class ADE_XJC {
private static final Logger LOG = Logger.getInstance(); private static final Logger LOG = Logger.getInstance();
// some dirs we will need // some dirs we will need
private File schema_dir = new File("schema"); private File schema_dir = new File("schemas");
// some files we will need // some files we will need
private File baseProfileFile = new File(schema_dir.getAbsoluteFile() + "/CityGML/citygml4j_profile.xsd"); private File baseProfileFile = new File(schema_dir.getAbsoluteFile() + "/CityGML/citygml4j_profile.xsd");
...@@ -99,12 +99,13 @@ public class ADE_XJC { ...@@ -99,12 +99,13 @@ public class ADE_XJC {
int status = 0; int status = 0;
try { try {
LOG.info("Checking build environment"); LOG.info("Setting up build environment");
checkBuildEnvironment(); checkBuildEnvironment();
LOG.info("Setting up build environment"); if (clean) {
if (clean) LOG.info("Cleaning output folder");
Util.rmdir(outputFolder); Util.rmdir(outputFolder);
}
createBuildEnvironment(); createBuildEnvironment();
...@@ -114,9 +115,9 @@ public class ADE_XJC { ...@@ -114,9 +115,9 @@ public class ADE_XJC {
System.exit(1); System.exit(1);
} }
LOG.info("Using ADE schema " + adeSchemaFile.getAbsolutePath()); LOG.info("Using ADE schema " + adeSchemaFile.getCanonicalFile());
if (adeBindingFile != null) if (adeBindingFile != null)
LOG.info("Using JAXB binding " + adeBindingFile.getAbsolutePath()); LOG.info("Using JAXB binding " + adeBindingFile.getCanonicalFile());
LOG.info("Generating JAXB classes. This may take some time..."); LOG.info("Generating JAXB classes. This may take some time...");
...@@ -150,7 +151,7 @@ public class ADE_XJC { ...@@ -150,7 +151,7 @@ public class ADE_XJC {
code.build(outputFolder, (PrintStream)null); code.build(outputFolder, (PrintStream)null);
File packageDir = new File(outputFolder.getAbsolutePath()); File packageDir = new File(outputFolder.getAbsolutePath());
LOG.info("JAXB classes successfully written to " + packageDir.getAbsolutePath()); LOG.info("JAXB classes successfully written to " + packageDir.getCanonicalPath());
} catch (Exception e) { } catch (Exception e) {
if (e.getMessage() != null) if (e.getMessage() != null)
LOG.error(e.getMessage()); LOG.error(e.getMessage());
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment