Merge pull request #300 from mpradny/java_sl_split

#299 Early import of Java Script libraries

Author: jesse-gallagher

nsfodp/bundles/org.openntf.nsfodp.commons.odp/src/org/openntf/nsfodp/commons/odp/OnDiskProject.java

@@ -56,7 +56,6 @@ public class OnDiskProject {
 		"Code/Agents/*.ija", //$NON-NLS-1$
 		"Code/Agents/*.lsa", //$NON-NLS-1$
 		"Code/Agents/*.aa", //$NON-NLS-1$
-		"Code/ScriptLibraries/*.javalib", //$NON-NLS-1$
 		"Folders/*", //$NON-NLS-1$
 		"Forms/*", //$NON-NLS-1$
 		"Framesets/*", //$NON-NLS-1$
@@ -73,6 +72,12 @@ public class OnDiskProject {
 	).collect(Collectors.toList());
 	private final List<PathMatcher> directDxlFiles;
 
+	public static final List<String> DIRECT_EARLY_DXL_FILE_GLOBS = Stream.of(
+			"Code/ScriptLibraries/*.javalib" //$NON-NLS-1$
+		).collect(Collectors.toList());
+	private final List<PathMatcher> directEarlyDxlFiles;
+	
+	
 	public static final List<String> IGNORED_FILE_GLOBS = Stream.of(
 		"**/.DS_Store", //$NON-NLS-1$
 		"**/Thumbs.db" //$NON-NLS-1$
@@ -110,6 +115,9 @@ public OnDiskProject(Path baseDirectory) {
 		this.directDxlFiles = DIRECT_DXL_FILE_GLOBS.stream()
 			.map(glob -> GlobMatcher.glob(baseDir.getFileSystem(), glob))
 			.collect(Collectors.toList());
+		this.directEarlyDxlFiles = DIRECT_EARLY_DXL_FILE_GLOBS.stream()
+				.map(glob -> GlobMatcher.glob(baseDir.getFileSystem(), glob))
+				.collect(Collectors.toList());
 		this.ignoredFileGlobs = IGNORED_FILE_GLOBS.stream()
 			.map(glob -> GlobMatcher.glob(baseDir.getFileSystem(), glob))
 			.collect(Collectors.toList());
@@ -280,6 +288,20 @@ public Stream<Path> getDirectDXLElements() {
 			.flatMap(Function.identity());
 	}
 
+	public Stream<Path> getDirectEarlyDXLElements() {
+		return directEarlyDxlFiles.stream()
+			.map(glob -> {
+				try {
+					return Files.find(baseDir, Integer.MAX_VALUE, (path, attr) -> {
+						return glob.matches(baseDir.relativize(path)) && attr.size() > 0;
+					});
+				} catch (IOException e) {
+					throw new RuntimeException(e);
+				}
+			})
+			.flatMap(Function.identity());
+	}
+	
 	public List<AbstractSplitDesignElement> getFileResources() {
 		FileSystem fs = baseDir.getFileSystem();
 		return FILE_RESOURCES.stream()

nsfodp/bundles/org.openntf.nsfodp.compiler/src/org/openntf/nsfodp/compiler/Messages.java

@@ -32,6 +32,7 @@ public class Messages extends NLS {
 	public static String ODPCompiler_errorConvertingXSP;
 	public static String ODPCompiler_importingCustomControls;
 	public static String ODPCompiler_importingDbProperties;
+	public static String ODPCompiler_importingEarlyDesignElements;
 	public static String ODPCompiler_importingDesignElements;
 	public static String ODPCompiler_importingFileResources;
 	public static String ODPCompiler_importingJava;

nsfodp/bundles/org.openntf.nsfodp.compiler/src/org/openntf/nsfodp/compiler/ODPCompiler.java

@@ -398,6 +398,7 @@ public synchronized Path compile(ClassLoader cl) throws Exception {
 					try(NDXLImporter importer = session.createDXLImporter()) {
 
 						importDbProperties(importer, database);
+						importEarlyBasicElements(importer, database);
 						importLotusScriptLibraries(importer, database);
 						importBasicElements(importer, database);
 						importFileResources(importer, database);
@@ -598,6 +599,30 @@ private void importDbProperties(NDXLImporter importer, NDatabase database) throw
 		importDxl(importer, dxl, database, "database.properties"); //$NON-NLS-1$
 	}
 
+	private void importEarlyBasicElements(NDXLImporter importer, NDatabase database) throws Exception {
+		subTask(Messages.ODPCompiler_importingEarlyDesignElements);
+		List<Integer> noteIds = new ArrayList<>();
+		try(Stream<Path> dxlElements = odp.getDirectEarlyDXLElements()) {
+			dxlElements
+				.filter(p -> {
+					try {
+						return Files.size(p) > 0;
+					} catch (IOException e) {
+						throw new RuntimeException(e);
+					}
+				})
+				.forEach(p -> {
+					try {
+						try(InputStream is = NSFODPUtil.newInputStream(p)) {
+							noteIds.addAll(importDxl(importer, is, database, MessageFormat.format(Messages.ODPCompiler_basicElementLabel, odp.getBaseDirectory().relativize(p))));
+						}
+					} catch(Exception e) {
+						throw new RuntimeException("Exception while importing element " + odp.getBaseDirectory().relativize(p), e);
+					}
+				});
+		}
+	}
+	
 	private void importBasicElements(NDXLImporter importer, NDatabase database) throws Exception {
 		subTask(Messages.ODPCompiler_importingDesignElements);
 		List<Integer> noteIds = new ArrayList<>();

nsfodp/bundles/org.openntf.nsfodp.compiler/src/org/openntf/nsfodp/compiler/messages.properties

@@ -27,6 +27,7 @@ ODPCompiler_dxlImportFailed=DXL import failed for element ''{0}'':\n{1}
 ODPCompiler_errorConvertingXSP=Exception while converting XSP element {0}
 ODPCompiler_importingCustomControls=Importing custom controls
 ODPCompiler_importingDbProperties=Importing DB properties
+ODPCompiler_importingEarlyDesignElements=Importing basic design elements - early part (Java libs)
 ODPCompiler_importingDesignElements=Importing basic design elements
 ODPCompiler_importingFileResources=Importing file resources
 ODPCompiler_importingJava=Importing Java design elements