equal
deleted
inserted
replaced
109 return; |
109 return; |
110 } |
110 } |
111 |
111 |
112 Path jmod = MODS_DIR.resolve("apa.jmod"); |
112 Path jmod = MODS_DIR.resolve("apa.jmod"); |
113 jmod("create", |
113 jmod("create", |
114 "--libs=", libDir.toString(), |
114 "--libs=" + libDir.toString(), |
115 "--class-path", classesDir.toString(), |
115 "--class-path", classesDir.toString(), |
116 jmod.toString()) |
116 jmod.toString()) |
117 .assertSuccess(); |
117 .assertSuccess(); |
118 } |
118 } |
119 |
119 |
308 FileUtils.deleteFileIfExistsWithRetry(jmod); |
308 FileUtils.deleteFileIfExistsWithRetry(jmod); |
309 Path cp = EXPLODED_DIR.resolve("foo").resolve("classes"); |
309 Path cp = EXPLODED_DIR.resolve("foo").resolve("classes"); |
310 Path lp = EXPLODED_DIR.resolve("foo").resolve("lib"); |
310 Path lp = EXPLODED_DIR.resolve("foo").resolve("lib"); |
311 |
311 |
312 jmod("create", |
312 jmod("create", |
313 "--libs=", lp.toString(), |
313 "--libs=" + lp.toString(), |
314 "--class-path", cp.toString(), |
314 "--class-path", cp.toString(), |
315 jmod.toString()) |
315 jmod.toString()) |
316 .assertSuccess() |
316 .assertSuccess() |
317 .resultChecker(r -> { |
317 .resultChecker(r -> { |
318 try (Stream<String> s1 = findFiles(lp).map(p -> LIBS_PREFIX + p); |
318 try (Stream<String> s1 = findFiles(lp).map(p -> LIBS_PREFIX + p); |
333 Path lp = EXPLODED_DIR.resolve("foo").resolve("lib"); |
333 Path lp = EXPLODED_DIR.resolve("foo").resolve("lib"); |
334 Path cf = EXPLODED_DIR.resolve("foo").resolve("conf"); |
334 Path cf = EXPLODED_DIR.resolve("foo").resolve("conf"); |
335 |
335 |
336 jmod("create", |
336 jmod("create", |
337 "--conf", cf.toString(), |
337 "--conf", cf.toString(), |
338 "--cmds=", bp.toString(), |
338 "--cmds=" + bp.toString(), |
339 "--libs=", lp.toString(), |
339 "--libs=" + lp.toString(), |
340 "--class-path", cp.toString(), |
340 "--class-path", cp.toString(), |
341 jmod.toString()) |
341 jmod.toString()) |
342 .assertSuccess() |
342 .assertSuccess() |
343 .resultChecker(r -> { |
343 .resultChecker(r -> { |
344 try (Stream<String> s1 = findFiles(lp).map(p -> LIBS_PREFIX + p); |
344 try (Stream<String> s1 = findFiles(lp).map(p -> LIBS_PREFIX + p); |
359 FileUtils.deleteFileIfExistsWithRetry(jmod); |
359 FileUtils.deleteFileIfExistsWithRetry(jmod); |
360 Path cp = EXPLODED_DIR.resolve("foo").resolve("classes"); |
360 Path cp = EXPLODED_DIR.resolve("foo").resolve("classes"); |
361 Path lp = EXPLODED_DIR.resolve("foo").resolve("lib"); |
361 Path lp = EXPLODED_DIR.resolve("foo").resolve("lib"); |
362 |
362 |
363 jmod("create", |
363 jmod("create", |
364 "--libs=", lp.toString(), |
364 "--libs=" + lp.toString(), |
365 "--class-path", cp.toString(), |
365 "--class-path", cp.toString(), |
366 "--exclude", "**internal**", |
366 "--exclude", "**internal**", |
367 "--exclude", "first.so", |
367 "--exclude", "first.so", |
368 jmod.toString()) |
368 jmod.toString()) |
369 .assertSuccess() |
369 .assertSuccess() |