diff --git a/org.hl7.fhir.publisher.core/src/main/java/org/hl7/fhir/igtools/publisher/Publisher.java b/org.hl7.fhir.publisher.core/src/main/java/org/hl7/fhir/igtools/publisher/Publisher.java index 340bbf4d..11aa5974 100644 --- a/org.hl7.fhir.publisher.core/src/main/java/org/hl7/fhir/igtools/publisher/Publisher.java +++ b/org.hl7.fhir.publisher.core/src/main/java/org/hl7/fhir/igtools/publisher/Publisher.java @@ -63,10 +63,12 @@ import java.util.zip.ZipEntry; import java.util.zip.ZipInputStream; +import javax.annotation.Nonnull; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; +import net.sf.saxon.trans.SymbolicName; import org.apache.commons.exec.CommandLine; import org.apache.commons.exec.DefaultExecutor; import org.apache.commons.exec.ExecuteWatchdog; @@ -386,19 +388,21 @@ * structure map * * validate all source files (including the IG itself) - * + * * for each source file: * generate all outputs * * generate summary file * * Documentation: see http://wiki.hl7.org/index.php?title=IG_Publisher_Documentation - * + * * @author Grahame Grieve */ public class Publisher implements IWorkerContext.ILoggingService, IReferenceResolver, IValidationProfileUsageTracker { + private static final String PACKAGE_CACHE_FOLDER_PARAM = "-package-cache-folder"; + public class ContainedResourceDetails { private String type; @@ -542,7 +546,7 @@ public class TypeParserR2 implements ITypeParser { @Override public Base parseType(String xml, String type) throws IOException, FHIRException { - org.hl7.fhir.dstu2.model.Type t = new org.hl7.fhir.dstu2.formats.XmlParser().parseType(xml, type); + org.hl7.fhir.dstu2.model.Type t = new org.hl7.fhir.dstu2.formats.XmlParser().parseType(xml, type); return VersionConvertorFactory_10_50.convertType(t); } @@ -556,7 +560,7 @@ public class TypeParserR14 implements ITypeParser { @Override public Base parseType(String xml, String type) throws IOException, FHIRException { - org.hl7.fhir.dstu2016may.model.Type t = new org.hl7.fhir.dstu2016may.formats.XmlParser().parseType(xml, type); + org.hl7.fhir.dstu2016may.model.Type t = new org.hl7.fhir.dstu2016may.formats.XmlParser().parseType(xml, type); return VersionConvertorFactory_14_50.convertType(t); } @Override @@ -569,7 +573,7 @@ public class TypeParserR3 implements ITypeParser { @Override public Base parseType(String xml, String type) throws IOException, FHIRException { - org.hl7.fhir.dstu3.model.Type t = new org.hl7.fhir.dstu3.formats.XmlParser().parseType(xml, type); + org.hl7.fhir.dstu3.model.Type t = new org.hl7.fhir.dstu3.formats.XmlParser().parseType(xml, type); return VersionConvertorFactory_30_50.convertType(t); } @Override @@ -582,7 +586,7 @@ public class TypeParserR4 implements ITypeParser { @Override public Base parseType(String xml, String type) throws IOException, FHIRException { - org.hl7.fhir.r4.model.Type t = new org.hl7.fhir.r4.formats.XmlParser().parseType(xml, type); + org.hl7.fhir.r4.model.Type t = new org.hl7.fhir.r4.formats.XmlParser().parseType(xml, type); return VersionConvertorFactory_40_50.convertType(t); } @Override @@ -598,7 +602,7 @@ public class TypeParserR4B implements ITypeParser { @Override public Base parseType(String xml, String type) throws IOException, FHIRException { - org.hl7.fhir.r4b.model.DataType t = new org.hl7.fhir.r4b.formats.XmlParser().parseType(xml, type); + org.hl7.fhir.r4b.model.DataType t = new org.hl7.fhir.r4b.formats.XmlParser().parseType(xml, type); return VersionConvertorFactory_43_50.convertType(t); } @Override @@ -611,7 +615,7 @@ public class TypeParserR5 implements ITypeParser { @Override public Base parseType(String xml, String type) throws IOException, FHIRException { - return new org.hl7.fhir.r5.formats.XmlParser().parseType(xml, type); + return new org.hl7.fhir.r5.formats.XmlParser().parseType(xml, type); } @Override public Base parseType(Element base) throws FHIRFormatError, IOException, FHIRException { @@ -646,8 +650,8 @@ public enum GenerationTool { private static final String REDIRECT_SOURCE = "\r\n
\r\n\r\n\r\n"+ "\r\nSee here: this link.
\r\n\r\n\r\n"; - private static final long JEKYLL_TIMEOUT = 60000 * 5; // 5 minutes.... - private static final long FSH_TIMEOUT = 60000 * 5; // 5 minutes.... + private static final long JEKYLL_TIMEOUT = 60000 * 5; // 5 minutes.... + private static final long FSH_TIMEOUT = 60000 * 5; // 5 minutes.... private static final int PRISM_SIZE_LIMIT = 16384; private static final String FIXED_CACHE_VERSION = "2"; // invalidating validation cache becaise it was incomplete @@ -700,7 +704,7 @@ public enum GenerationTool { private IGBuildMode mode; // for the IG publication infrastructure private SimpleFetcher fetcher = new SimpleFetcher(this); - private SimpleWorkerContext context; // + private SimpleWorkerContext context; // private DataRenderer dr; private InstanceValidator validator; private ProfileValidator pvalidator; @@ -742,7 +746,7 @@ public enum GenerationTool { private boolean makeQA = true; private boolean bundleReferencesResolve = true; private CqlSubSystem cql; - private File killFile; + private File killFile; private List