rife2/rife2
rife2/rife2
2
0
Fork 0
mirror of https://github.com/ethauvin/rife2.git synced 2025-04-30 18:48:13 -07:00
Code Activity

Reworked project structure so that 'bld' is used where 'project' was used before.

Browse source
This commit is contained in:
Geert Bevin 2023-03-15 13:46:57 -04:00
parent 7fb1fcc813
commit 73298e5613
17 changed files with 130 additions and 130 deletions
Download patch file Download diff file Expand all files Collapse all files

46
lib/src/main/java/rife/bld/Project.java
View file

@ -37,24 +37,24 @@ public class Project extends BuildExecutor {
protected String uberJarMainClass = null; protected String uberJarMainClass = null;
protected File srcDirectory = null; protected File srcDirectory = null;
protected File srcBldDirectory = null;
protected File srcBldJavaDirectory = null;
protected File srcMainDirectory = null; protected File srcMainDirectory = null;
protected File srcMainJavaDirectory = null; protected File srcMainJavaDirectory = null;
protected File srcMainResourcesDirectory = null; protected File srcMainResourcesDirectory = null;
protected File srcMainResourcesTemplatesDirectory = null; protected File srcMainResourcesTemplatesDirectory = null;
protected File srcProjectDirectory = null;
protected File srcProjectJavaDirectory = null;
protected File srcTestJDirectory = null; protected File srcTestJDirectory = null;
protected File srcTestJavaDirectory = null; protected File srcTestJavaDirectory = null;
protected File libBldDirectory = null;
protected File libDirectory = null; protected File libDirectory = null;
protected File libCompileDirectory = null; protected File libCompileDirectory = null;
protected File libProjectDirectory = null;
protected File libRuntimeDirectory = null; protected File libRuntimeDirectory = null;
protected File libStandaloneDirectory = null; protected File libStandaloneDirectory = null;
protected File libTestDirectory = null; protected File libTestDirectory = null;
protected File buildDirectory = null; protected File buildDirectory = null;
protected File buildBldDirectory = null;
protected File buildDistDirectory = null; protected File buildDistDirectory = null;
protected File buildMainDirectory = null; protected File buildMainDirectory = null;
protected File buildProjectDirectory = null;
protected File buildTemplatesDirectory = null; protected File buildTemplatesDirectory = null;
protected File buildTestDirectory = null; protected File buildTestDirectory = null;
@ -192,6 +192,14 @@ public class Project extends BuildExecutor {
return Objects.requireNonNullElseGet(srcDirectory, () -> new File(workDirectory(), "src")); return Objects.requireNonNullElseGet(srcDirectory, () -> new File(workDirectory(), "src"));
} }
public File srcBldDirectory() {
return Objects.requireNonNullElseGet(srcBldDirectory, () -> new File(srcDirectory(), "bld"));
}
public File srcBldJavaDirectory() {
return Objects.requireNonNullElseGet(srcBldJavaDirectory, () -> new File(srcBldDirectory(), "java"));
}
public File srcMainDirectory() { public File srcMainDirectory() {
return Objects.requireNonNullElseGet(srcMainDirectory, () -> new File(srcDirectory(), "main")); return Objects.requireNonNullElseGet(srcMainDirectory, () -> new File(srcDirectory(), "main"));
} }
@ -208,14 +216,6 @@ public class Project extends BuildExecutor {
return Objects.requireNonNullElseGet(srcMainResourcesTemplatesDirectory, () -> new File(srcMainResourcesDirectory(), "templates")); return Objects.requireNonNullElseGet(srcMainResourcesTemplatesDirectory, () -> new File(srcMainResourcesDirectory(), "templates"));
} }
public File srcProjectDirectory() {
return Objects.requireNonNullElseGet(srcProjectDirectory, () -> new File(srcDirectory(), "project"));
}
public File srcProjectJavaDirectory() {
return Objects.requireNonNullElseGet(srcProjectJavaDirectory, () -> new File(srcProjectDirectory(), "java"));
}
public File srcTestJDirectory() { public File srcTestJDirectory() {
return Objects.requireNonNullElseGet(srcTestJDirectory, () -> new File(srcDirectory(), "test")); return Objects.requireNonNullElseGet(srcTestJDirectory, () -> new File(srcDirectory(), "test"));
} }
@ -228,12 +228,12 @@ public class Project extends BuildExecutor {
return Objects.requireNonNullElseGet(libDirectory, () -> new File(workDirectory(), "lib")); return Objects.requireNonNullElseGet(libDirectory, () -> new File(workDirectory(), "lib"));
} }
public File libCompileDirectory() { public File libBldDirectory() {
return Objects.requireNonNullElseGet(libCompileDirectory, () -> new File(libDirectory(), "compile")); return Objects.requireNonNullElseGet(libBldDirectory, () -> new File(libDirectory(), "bld"));
} }
public File libProjectDirectory() { public File libCompileDirectory() {
return Objects.requireNonNullElseGet(libProjectDirectory, () -> new File(libDirectory(), "project")); return Objects.requireNonNullElseGet(libCompileDirectory, () -> new File(libDirectory(), "compile"));
} }
public File libRuntimeDirectory() { public File libRuntimeDirectory() {
@ -252,6 +252,10 @@ public class Project extends BuildExecutor {
return Objects.requireNonNullElseGet(buildDirectory, () -> new File(workDirectory(), "build")); return Objects.requireNonNullElseGet(buildDirectory, () -> new File(workDirectory(), "build"));
} }
public File buildBldDirectory() {
return Objects.requireNonNullElseGet(buildBldDirectory, () -> new File(buildDirectory(), "bld"));
}
public File buildDistDirectory() { public File buildDistDirectory() {
return Objects.requireNonNullElseGet(buildDistDirectory, () -> new File(buildDirectory(), "dist")); return Objects.requireNonNullElseGet(buildDistDirectory, () -> new File(buildDirectory(), "dist"));
} }
@ -260,10 +264,6 @@ public class Project extends BuildExecutor {
return Objects.requireNonNullElseGet(buildMainDirectory, () -> new File(buildDirectory(), "main")); return Objects.requireNonNullElseGet(buildMainDirectory, () -> new File(buildDirectory(), "main"));
} }
public File buildProjectDirectory() {
return Objects.requireNonNullElseGet(buildProjectDirectory, () -> new File(buildDirectory(), "project"));
}
public File buildTemplatesDirectory() { public File buildTemplatesDirectory() {
return Objects.requireNonNullElseGet(buildTemplatesDirectory, this::buildMainDirectory); return Objects.requireNonNullElseGet(buildTemplatesDirectory, this::buildMainDirectory);
} }
@ -275,10 +275,10 @@ public class Project extends BuildExecutor {
public void createProjectStructure() { public void createProjectStructure() {
srcMainJavaDirectory().mkdirs(); srcMainJavaDirectory().mkdirs();
srcMainResourcesTemplatesDirectory().mkdirs(); srcMainResourcesTemplatesDirectory().mkdirs();
srcProjectJavaDirectory().mkdirs(); srcBldJavaDirectory().mkdirs();
srcTestJavaDirectory().mkdirs(); srcTestJavaDirectory().mkdirs();
libCompileDirectory().mkdirs(); libCompileDirectory().mkdirs();
libProjectDirectory().mkdirs(); libBldDirectory().mkdirs();
libRuntimeDirectory().mkdirs(); libRuntimeDirectory().mkdirs();
libTestDirectory().mkdirs(); libTestDirectory().mkdirs();
if (libStandaloneDirectory() != null) { if (libStandaloneDirectory() != null) {
@ -287,9 +287,9 @@ public class Project extends BuildExecutor {
} }
public void createBuildStructure() { public void createBuildStructure() {
buildBldDirectory().mkdirs();
buildDistDirectory().mkdirs(); buildDistDirectory().mkdirs();
buildMainDirectory().mkdirs(); buildMainDirectory().mkdirs();
buildProjectDirectory().mkdirs();
buildTestDirectory().mkdirs(); buildTestDirectory().mkdirs();
} }

26
lib/src/main/java/rife/bld/operations/AbstractCreateOperation.java
View file

@ -33,8 +33,8 @@ abstract class AbstractCreateOperation<T extends AbstractCreateOperation<T, P>,
String projectMainUberName_; String projectMainUberName_;
String projectTestName_; String projectTestName_;
File javaPackageDirectory_; File bldPackageDirectory_;
File projectPackageDirectory_; File mainPackageDirectory_;
File testPackageDirectory_; File testPackageDirectory_;
File ideaDirectory_; File ideaDirectory_;
File ideaLibrariesDirectory_; File ideaLibrariesDirectory_;
@ -89,8 +89,8 @@ abstract class AbstractCreateOperation<T extends AbstractCreateOperation<T, P>,
ideaRunConfigurationsDirectory_ = new File(ideaDirectory_, "runConfigurations"); ideaRunConfigurationsDirectory_ = new File(ideaDirectory_, "runConfigurations");
var package_dir = project_.pkg().replace('.', File.separatorChar); var package_dir = project_.pkg().replace('.', File.separatorChar);
javaPackageDirectory_ = new File(project_.srcMainJavaDirectory(), package_dir); bldPackageDirectory_ = new File(project_.srcBldJavaDirectory(), package_dir);
projectPackageDirectory_ = new File(project_.srcProjectJavaDirectory(), package_dir); mainPackageDirectory_ = new File(project_.srcMainJavaDirectory(), package_dir);
testPackageDirectory_ = new File(project_.srcTestJavaDirectory(), package_dir); testPackageDirectory_ = new File(project_.srcTestJavaDirectory(), package_dir);
} }
@ -102,8 +102,8 @@ abstract class AbstractCreateOperation<T extends AbstractCreateOperation<T, P>,
public void executeCreateProjectStructure() { public void executeCreateProjectStructure() {
project_.createProjectStructure(); project_.createProjectStructure();
javaPackageDirectory_.mkdirs(); bldPackageDirectory_.mkdirs();
projectPackageDirectory_.mkdirs(); mainPackageDirectory_.mkdirs();
testPackageDirectory_.mkdirs(); testPackageDirectory_.mkdirs();
ideaDirectory_.mkdirs(); ideaDirectory_.mkdirs();
@ -128,7 +128,7 @@ abstract class AbstractCreateOperation<T extends AbstractCreateOperation<T, P>,
var site_template = TemplateFactory.TXT.get(templateBase_ + "project_main"); var site_template = TemplateFactory.TXT.get(templateBase_ + "project_main");
site_template.setValue("package", project_.pkg()); site_template.setValue("package", project_.pkg());
site_template.setValue("projectMain", projectMainName_); site_template.setValue("projectMain", projectMainName_);
var project_main_file = new File(javaPackageDirectory_, projectMainName_ + ".java"); var project_main_file = new File(mainPackageDirectory_, projectMainName_ + ".java");
FileUtils.writeString(site_template.getContent(), project_main_file); FileUtils.writeString(site_template.getContent(), project_main_file);
// project test // project test
@ -164,7 +164,7 @@ abstract class AbstractCreateOperation<T extends AbstractCreateOperation<T, P>,
build_template.setValue("name", entry.getKey().name()); build_template.setValue("name", entry.getKey().name());
build_template.appendBlock("scopes", "scope"); build_template.appendBlock("scopes", "scope");
} }
var project_build_file = new File(projectPackageDirectory_, projectBuildName_ + ".java"); var project_build_file = new File(bldPackageDirectory_, projectBuildName_ + ".java");
FileUtils.writeString(build_template.getContent(), project_build_file); FileUtils.writeString(build_template.getContent(), project_build_file);
// build shell scripts // build shell scripts
@ -186,6 +186,9 @@ abstract class AbstractCreateOperation<T extends AbstractCreateOperation<T, P>,
FileUtils.writeString( FileUtils.writeString(
TemplateFactory.XML.get(templateBase_ + "idea.app_iml").getContent(), TemplateFactory.XML.get(templateBase_ + "idea.app_iml").getContent(),
new File(ideaDirectory_, "app.iml")); new File(ideaDirectory_, "app.iml"));
FileUtils.writeString(
TemplateFactory.XML.get(templateBase_ + "idea.bld_iml").getContent(),
new File(ideaDirectory_, "bld.iml"));
FileUtils.writeString( FileUtils.writeString(
TemplateFactory.XML.get(templateBase_ + "idea.misc").getContent(), TemplateFactory.XML.get(templateBase_ + "idea.misc").getContent(),
new File(ideaDirectory_, "misc.xml")); new File(ideaDirectory_, "misc.xml"));
@ -193,14 +196,11 @@ abstract class AbstractCreateOperation<T extends AbstractCreateOperation<T, P>,
TemplateFactory.XML.get(templateBase_ + "idea.modules").getContent(), TemplateFactory.XML.get(templateBase_ + "idea.modules").getContent(),
new File(ideaDirectory_, "modules.xml")); new File(ideaDirectory_, "modules.xml"));
FileUtils.writeString( FileUtils.writeString(
TemplateFactory.XML.get(templateBase_ + "idea.project_iml").getContent(), TemplateFactory.XML.get(templateBase_ + "idea.libraries.bld").getContent(),
new File(ideaDirectory_, "project.iml")); new File(ideaLibrariesDirectory_, "bld.xml"));
FileUtils.writeString( FileUtils.writeString(
TemplateFactory.XML.get(templateBase_ + "idea.libraries.compile").getContent(), TemplateFactory.XML.get(templateBase_ + "idea.libraries.compile").getContent(),
new File(ideaLibrariesDirectory_, "compile.xml")); new File(ideaLibrariesDirectory_, "compile.xml"));
FileUtils.writeString(
TemplateFactory.XML.get(templateBase_ + "idea.libraries.project").getContent(),
new File(ideaLibrariesDirectory_, "project.xml"));
FileUtils.writeString( FileUtils.writeString(
TemplateFactory.XML.get(templateBase_ + "idea.libraries.runtime").getContent(), TemplateFactory.XML.get(templateBase_ + "idea.libraries.runtime").getContent(),
new File(ideaLibrariesDirectory_, "runtime.xml")); new File(ideaLibrariesDirectory_, "runtime.xml"));

2
lib/src/main/java/rife/bld/operations/CleanOperation.java
View file

@ -53,9 +53,9 @@ public class CleanOperation {
*/ */
public CleanOperation fromProject(Project project) { public CleanOperation fromProject(Project project) {
return directories(List.of( return directories(List.of(
project.buildBldDirectory(),
project.buildDistDirectory(), project.buildDistDirectory(),
project.buildMainDirectory(), project.buildMainDirectory(),
project.buildProjectDirectory(),
project.buildTestDirectory())); project.buildTestDirectory()));
} }

2
lib/src/main/java/rife/bld/operations/CreateRife2Operation.java
View file

@ -59,7 +59,7 @@ public class CreateRife2Operation extends AbstractCreateOperation<CreateRife2Ope
main_uber_template.setValue("package", project_.pkg()); main_uber_template.setValue("package", project_.pkg());
main_uber_template.setValue("projectMain", projectMainName_); main_uber_template.setValue("projectMain", projectMainName_);
main_uber_template.setValue("projectMainUber", projectMainUberName_); main_uber_template.setValue("projectMainUber", projectMainUberName_);
var project_main_uber_file = new File(javaPackageDirectory_, projectMainUberName_ + ".java"); var project_main_uber_file = new File(mainPackageDirectory_, projectMainUberName_ + ".java");
FileUtils.writeString(main_uber_template.getContent(), project_main_uber_file); FileUtils.writeString(main_uber_template.getContent(), project_main_uber_file);
// project template // project template

10
lib/src/main/resources/templates/bld/blank/idea/project_iml.xml → lib/src/main/resources/templates/bld/blank/idea/bld_iml.xml
View file

@ -1,15 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4"> <module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager"> <component name="NewModuleRootManager">
<output url="file://$MODULE_DIR$/build/project" /> <output url="file://$MODULE_DIR$/build/bld" />
<output-test url="file://$MODULE_DIR$/build/project" /> <output-test url="file://$MODULE_DIR$/build/bld" />
<exclude-output /> <exclude-output />
<content url="file://$MODULE_DIR$/src/project"> <content url="file://$MODULE_DIR$/src/bld">
<sourceFolder url="file://$MODULE_DIR$/src/project/java" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src/bld/java" isTestSource="false" />
</content> </content>
<orderEntry type="inheritedJdk" /> <orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="bld" level="project" />
<orderEntry type="library" name="compile" level="project" /> <orderEntry type="library" name="compile" level="project" />
<orderEntry type="library" name="project" level="project" />
</component> </component>
</module> </module>

10
lib/src/main/resources/templates/bld/blank/idea/libraries/bld.xml Normal file
View file

@ -0,0 +1,10 @@
<component name="libraryTable">
<library name="bld">
<CLASSES>
<root url="file://$PROJECT_DIR$/lib/bld" />
</CLASSES>
<JAVADOC />
<SOURCES />
<jarDirectory url="file://$PROJECT_DIR$/lib/bld" recursive="false" />
</library>
</component>

10
lib/src/main/resources/templates/bld/blank/idea/libraries/project.xml
View file

@ -1,10 +0,0 @@
<component name="libraryTable">
<library name="project">
<CLASSES>
<root url="file://$PROJECT_DIR$/lib/project" />
</CLASSES>
<JAVADOC />
<SOURCES />
<jarDirectory url="file://$PROJECT_DIR$/lib/project" recursive="false" />
</library>
</component>

2
lib/src/main/resources/templates/bld/blank/idea/modules.xml
View file

@ -3,7 +3,7 @@
<component name="ProjectModuleManager"> <component name="ProjectModuleManager">
<modules> <modules>
<module fileurl="file://$PROJECT_DIR$/.idea/app.iml" filepath="$PROJECT_DIR$/.idea/app.iml" /> <module fileurl="file://$PROJECT_DIR$/.idea/app.iml" filepath="$PROJECT_DIR$/.idea/app.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea/project.iml" filepath="$PROJECT_DIR$/.idea/project.iml" /> <module fileurl="file://$PROJECT_DIR$/.idea/bld.iml" filepath="$PROJECT_DIR$/.idea/bld.iml" />
</modules> </modules>
</component> </component>
</project> </project>

4
lib/src/main/resources/templates/bld/bld_sh.txt
View file

@ -31,9 +31,9 @@ join_by () {
# Construct the classpath # Construct the classpath
project_jars=$(join_by : $(find "lib/compile" "lib/project" -name "*.jar")) project_jars=$(join_by : $(find "lib/bld" "lib/compile" -name "*.jar"))
CLASSPATH="${project_jars}:build/project:src/project/java" CLASSPATH="${project_jars}:src/bld/java"
set -- \ set -- \
-classpath "$CLASSPATH" \ -classpath "$CLASSPATH" \

10
lib/src/main/resources/templates/bld/rife2_hello/idea/project_iml.xml → lib/src/main/resources/templates/bld/rife2_hello/idea/bld_iml.xml
View file

@ -1,15 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4"> <module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager"> <component name="NewModuleRootManager">
<output url="file://$MODULE_DIR$/build/project" /> <output url="file://$MODULE_DIR$/build/bld" />
<output-test url="file://$MODULE_DIR$/build/project" /> <output-test url="file://$MODULE_DIR$/build/bld" />
<exclude-output /> <exclude-output />
<content url="file://$MODULE_DIR$/src/project"> <content url="file://$MODULE_DIR$/src/bld">
<sourceFolder url="file://$MODULE_DIR$/src/project/java" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src/bld/java" isTestSource="false" />
</content> </content>
<orderEntry type="inheritedJdk" /> <orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="bld" level="project" />
<orderEntry type="library" name="compile" level="project" /> <orderEntry type="library" name="compile" level="project" />
<orderEntry type="library" name="project" level="project" />
</component> </component>
</module> </module>

10
lib/src/main/resources/templates/bld/rife2_hello/idea/libraries/bld.xml Normal file
View file

@ -0,0 +1,10 @@
<component name="libraryTable">
<library name="bld">
<CLASSES>
<root url="file://$PROJECT_DIR$/lib/bld" />
</CLASSES>
<JAVADOC />
<SOURCES />
<jarDirectory url="file://$PROJECT_DIR$/lib/bld" recursive="false" />
</library>
</component>

10
lib/src/main/resources/templates/bld/rife2_hello/idea/libraries/project.xml
View file

@ -1,10 +0,0 @@
<component name="libraryTable">
<library name="project">
<CLASSES>
<root url="file://$PROJECT_DIR$/lib/project" />
</CLASSES>
<JAVADOC />
<SOURCES />
<jarDirectory url="file://$PROJECT_DIR$/lib/project" recursive="false" />
</library>
</component>

2
lib/src/main/resources/templates/bld/rife2_hello/idea/modules.xml
View file

@ -3,7 +3,7 @@
<component name="ProjectModuleManager"> <component name="ProjectModuleManager">
<modules> <modules>
<module fileurl="file://$PROJECT_DIR$/.idea/app.iml" filepath="$PROJECT_DIR$/.idea/app.iml" /> <module fileurl="file://$PROJECT_DIR$/.idea/app.iml" filepath="$PROJECT_DIR$/.idea/app.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea/project.iml" filepath="$PROJECT_DIR$/.idea/project.iml" /> <module fileurl="file://$PROJECT_DIR$/.idea/bld.iml" filepath="$PROJECT_DIR$/.idea/bld.iml" />
</modules> </modules>
</component> </component>
</project> </project>

14
lib/src/test/java/rife/bld/operations/TestCleanOperation.java
View file

@ -75,23 +75,23 @@ public class TestCleanOperation {
project.createBuildStructure(); project.createBuildStructure();
assertEquals(""" assertEquals("""
/build /build
/build/bld
/build/dist /build/dist
/build/main /build/main
/build/project
/build/test /build/test
/lib /lib
/lib/bld
/lib/compile /lib/compile
/lib/project
/lib/runtime /lib/runtime
/lib/standalone /lib/standalone
/lib/test /lib/test
/src /src
/src/bld
/src/bld/java
/src/main /src/main
/src/main/java /src/main/java
/src/main/resources /src/main/resources
/src/main/resources/templates /src/main/resources/templates
/src/project
/src/project/java
/src/test /src/test
/src/test/java""", /src/test/java""",
Files.walk(Path.of(tmp.getAbsolutePath())) Files.walk(Path.of(tmp.getAbsolutePath()))
@ -104,18 +104,18 @@ public class TestCleanOperation {
assertEquals(""" assertEquals("""
/build /build
/lib /lib
/lib/bld
/lib/compile /lib/compile
/lib/project
/lib/runtime /lib/runtime
/lib/standalone /lib/standalone
/lib/test /lib/test
/src /src
/src/bld
/src/bld/java
/src/main /src/main
/src/main/java /src/main/java
/src/main/resources /src/main/resources
/src/main/resources/templates /src/main/resources/templates
/src/project
/src/project/java
/src/test /src/test
/src/test/java""", /src/test/java""",
Files.walk(Path.of(tmp.getAbsolutePath())) Files.walk(Path.of(tmp.getAbsolutePath()))

48
lib/src/test/java/rife/bld/operations/TestCreateBlankOperation.java
View file

@ -49,22 +49,22 @@ public class TestCreateBlankOperation {
/myapp/.gitignore /myapp/.gitignore
/myapp/.idea /myapp/.idea
/myapp/.idea/app.iml /myapp/.idea/app.iml
/myapp/.idea/bld.iml
/myapp/.idea/libraries /myapp/.idea/libraries
/myapp/.idea/libraries/bld.xml
/myapp/.idea/libraries/compile.xml /myapp/.idea/libraries/compile.xml
/myapp/.idea/libraries/project.xml
/myapp/.idea/libraries/runtime.xml /myapp/.idea/libraries/runtime.xml
/myapp/.idea/libraries/test.xml /myapp/.idea/libraries/test.xml
/myapp/.idea/misc.xml /myapp/.idea/misc.xml
/myapp/.idea/modules.xml /myapp/.idea/modules.xml
/myapp/.idea/project.iml
/myapp/.idea/runConfigurations /myapp/.idea/runConfigurations
/myapp/.idea/runConfigurations/Run Main.xml /myapp/.idea/runConfigurations/Run Main.xml
/myapp/.idea/runConfigurations/Run Tests.xml /myapp/.idea/runConfigurations/Run Tests.xml
/myapp/bld.sh /myapp/bld.sh
/myapp/lib /myapp/lib
/myapp/lib/bld
/myapp/lib/compile /myapp/lib/compile
/myapp/lib/compile/rife2-1.5.0-20230313.213352-8.jar /myapp/lib/compile/rife2-1.5.0-20230313.213352-8.jar
/myapp/lib/project
/myapp/lib/runtime /myapp/lib/runtime
/myapp/lib/test /myapp/lib/test
/myapp/lib/test/apiguardian-api-1.1.2.jar /myapp/lib/test/apiguardian-api-1.1.2.jar
@ -77,6 +77,11 @@ public class TestCreateBlankOperation {
/myapp/lib/test/junit-platform-engine-1.9.2.jar /myapp/lib/test/junit-platform-engine-1.9.2.jar
/myapp/lib/test/opentest4j-1.2.0.jar /myapp/lib/test/opentest4j-1.2.0.jar
/myapp/src /myapp/src
/myapp/src/bld
/myapp/src/bld/java
/myapp/src/bld/java/com
/myapp/src/bld/java/com/example
/myapp/src/bld/java/com/example/MyappBuild.java
/myapp/src/main /myapp/src/main
/myapp/src/main/java /myapp/src/main/java
/myapp/src/main/java/com /myapp/src/main/java/com
@ -84,11 +89,6 @@ public class TestCreateBlankOperation {
/myapp/src/main/java/com/example/Myapp.java /myapp/src/main/java/com/example/Myapp.java
/myapp/src/main/resources /myapp/src/main/resources
/myapp/src/main/resources/templates /myapp/src/main/resources/templates
/myapp/src/project
/myapp/src/project/java
/myapp/src/project/java/com
/myapp/src/project/java/com/example
/myapp/src/project/java/com/example/MyappBuild.java
/myapp/src/test /myapp/src/test
/myapp/src/test/java /myapp/src/test/java
/myapp/src/test/java/com /myapp/src/test/java/com
@ -108,14 +108,14 @@ public class TestCreateBlankOperation {
/myapp/.gitignore /myapp/.gitignore
/myapp/.idea /myapp/.idea
/myapp/.idea/app.iml /myapp/.idea/app.iml
/myapp/.idea/bld.iml
/myapp/.idea/libraries /myapp/.idea/libraries
/myapp/.idea/libraries/bld.xml
/myapp/.idea/libraries/compile.xml /myapp/.idea/libraries/compile.xml
/myapp/.idea/libraries/project.xml
/myapp/.idea/libraries/runtime.xml /myapp/.idea/libraries/runtime.xml
/myapp/.idea/libraries/test.xml /myapp/.idea/libraries/test.xml
/myapp/.idea/misc.xml /myapp/.idea/misc.xml
/myapp/.idea/modules.xml /myapp/.idea/modules.xml
/myapp/.idea/project.iml
/myapp/.idea/runConfigurations /myapp/.idea/runConfigurations
/myapp/.idea/runConfigurations/Run Main.xml /myapp/.idea/runConfigurations/Run Main.xml
/myapp/.idea/runConfigurations/Run Tests.xml /myapp/.idea/runConfigurations/Run Tests.xml
@ -130,9 +130,9 @@ public class TestCreateBlankOperation {
/myapp/build/test/com/example /myapp/build/test/com/example
/myapp/build/test/com/example/MyappTest.class /myapp/build/test/com/example/MyappTest.class
/myapp/lib /myapp/lib
/myapp/lib/bld
/myapp/lib/compile /myapp/lib/compile
/myapp/lib/compile/rife2-1.5.0-20230313.213352-8.jar /myapp/lib/compile/rife2-1.5.0-20230313.213352-8.jar
/myapp/lib/project
/myapp/lib/runtime /myapp/lib/runtime
/myapp/lib/test /myapp/lib/test
/myapp/lib/test/apiguardian-api-1.1.2.jar /myapp/lib/test/apiguardian-api-1.1.2.jar
@ -145,6 +145,11 @@ public class TestCreateBlankOperation {
/myapp/lib/test/junit-platform-engine-1.9.2.jar /myapp/lib/test/junit-platform-engine-1.9.2.jar
/myapp/lib/test/opentest4j-1.2.0.jar /myapp/lib/test/opentest4j-1.2.0.jar
/myapp/src /myapp/src
/myapp/src/bld
/myapp/src/bld/java
/myapp/src/bld/java/com
/myapp/src/bld/java/com/example
/myapp/src/bld/java/com/example/MyappBuild.java
/myapp/src/main /myapp/src/main
/myapp/src/main/java /myapp/src/main/java
/myapp/src/main/java/com /myapp/src/main/java/com
@ -152,11 +157,6 @@ public class TestCreateBlankOperation {
/myapp/src/main/java/com/example/Myapp.java /myapp/src/main/java/com/example/Myapp.java
/myapp/src/main/resources /myapp/src/main/resources
/myapp/src/main/resources/templates /myapp/src/main/resources/templates
/myapp/src/project
/myapp/src/project/java
/myapp/src/project/java/com
/myapp/src/project/java/com/example
/myapp/src/project/java/com/example/MyappBuild.java
/myapp/src/test /myapp/src/test
/myapp/src/test/java /myapp/src/test/java
/myapp/src/test/java/com /myapp/src/test/java/com
@ -196,24 +196,29 @@ public class TestCreateBlankOperation {
/yourthing/.gitignore /yourthing/.gitignore
/yourthing/.idea /yourthing/.idea
/yourthing/.idea/app.iml /yourthing/.idea/app.iml
/yourthing/.idea/bld.iml
/yourthing/.idea/libraries /yourthing/.idea/libraries
/yourthing/.idea/libraries/bld.xml
/yourthing/.idea/libraries/compile.xml /yourthing/.idea/libraries/compile.xml
/yourthing/.idea/libraries/project.xml
/yourthing/.idea/libraries/runtime.xml /yourthing/.idea/libraries/runtime.xml
/yourthing/.idea/libraries/test.xml /yourthing/.idea/libraries/test.xml
/yourthing/.idea/misc.xml /yourthing/.idea/misc.xml
/yourthing/.idea/modules.xml /yourthing/.idea/modules.xml
/yourthing/.idea/project.iml
/yourthing/.idea/runConfigurations /yourthing/.idea/runConfigurations
/yourthing/.idea/runConfigurations/Run Main.xml /yourthing/.idea/runConfigurations/Run Main.xml
/yourthing/.idea/runConfigurations/Run Tests.xml /yourthing/.idea/runConfigurations/Run Tests.xml
/yourthing/bld.sh /yourthing/bld.sh
/yourthing/lib /yourthing/lib
/yourthing/lib/bld
/yourthing/lib/compile /yourthing/lib/compile
/yourthing/lib/project
/yourthing/lib/runtime /yourthing/lib/runtime
/yourthing/lib/test /yourthing/lib/test
/yourthing/src /yourthing/src
/yourthing/src/bld
/yourthing/src/bld/java
/yourthing/src/bld/java/org
/yourthing/src/bld/java/org/stuff
/yourthing/src/bld/java/org/stuff/YourthingBuild.java
/yourthing/src/main /yourthing/src/main
/yourthing/src/main/java /yourthing/src/main/java
/yourthing/src/main/java/org /yourthing/src/main/java/org
@ -221,11 +226,6 @@ public class TestCreateBlankOperation {
/yourthing/src/main/java/org/stuff/Yourthing.java /yourthing/src/main/java/org/stuff/Yourthing.java
/yourthing/src/main/resources /yourthing/src/main/resources
/yourthing/src/main/resources/templates /yourthing/src/main/resources/templates
/yourthing/src/project
/yourthing/src/project/java
/yourthing/src/project/java/org
/yourthing/src/project/java/org/stuff
/yourthing/src/project/java/org/stuff/YourthingBuild.java
/yourthing/src/test /yourthing/src/test
/yourthing/src/test/java /yourthing/src/test/java
/yourthing/src/test/java/org /yourthing/src/test/java/org

48
lib/src/test/java/rife/bld/operations/TestCreateRife2Operation.java
View file

@ -48,23 +48,23 @@ public class TestCreateRife2Operation {
/myapp/.gitignore /myapp/.gitignore
/myapp/.idea /myapp/.idea
/myapp/.idea/app.iml /myapp/.idea/app.iml
/myapp/.idea/bld.iml
/myapp/.idea/libraries /myapp/.idea/libraries
/myapp/.idea/libraries/bld.xml
/myapp/.idea/libraries/compile.xml /myapp/.idea/libraries/compile.xml
/myapp/.idea/libraries/project.xml
/myapp/.idea/libraries/runtime.xml /myapp/.idea/libraries/runtime.xml
/myapp/.idea/libraries/standalone.xml /myapp/.idea/libraries/standalone.xml
/myapp/.idea/libraries/test.xml /myapp/.idea/libraries/test.xml
/myapp/.idea/misc.xml /myapp/.idea/misc.xml
/myapp/.idea/modules.xml /myapp/.idea/modules.xml
/myapp/.idea/project.iml
/myapp/.idea/runConfigurations /myapp/.idea/runConfigurations
/myapp/.idea/runConfigurations/Run Main.xml /myapp/.idea/runConfigurations/Run Main.xml
/myapp/.idea/runConfigurations/Run Tests.xml /myapp/.idea/runConfigurations/Run Tests.xml
/myapp/bld.sh /myapp/bld.sh
/myapp/lib /myapp/lib
/myapp/lib/bld
/myapp/lib/compile /myapp/lib/compile
/myapp/lib/compile/rife2-1.5.0-20230313.213352-8.jar /myapp/lib/compile/rife2-1.5.0-20230313.213352-8.jar
/myapp/lib/project
/myapp/lib/runtime /myapp/lib/runtime
/myapp/lib/standalone /myapp/lib/standalone
/myapp/lib/standalone/jetty-http-11.0.14.jar /myapp/lib/standalone/jetty-http-11.0.14.jar
@ -88,6 +88,11 @@ public class TestCreateRife2Operation {
/myapp/lib/test/junit-platform-engine-1.9.2.jar /myapp/lib/test/junit-platform-engine-1.9.2.jar
/myapp/lib/test/opentest4j-1.2.0.jar /myapp/lib/test/opentest4j-1.2.0.jar
/myapp/src /myapp/src
/myapp/src/bld
/myapp/src/bld/java
/myapp/src/bld/java/com
/myapp/src/bld/java/com/example
/myapp/src/bld/java/com/example/MyappBuild.java
/myapp/src/main /myapp/src/main
/myapp/src/main/java /myapp/src/main/java
/myapp/src/main/java/com /myapp/src/main/java/com
@ -102,11 +107,6 @@ public class TestCreateRife2Operation {
/myapp/src/main/webapp/WEB-INF/web.xml /myapp/src/main/webapp/WEB-INF/web.xml
/myapp/src/main/webapp/css /myapp/src/main/webapp/css
/myapp/src/main/webapp/css/style.css /myapp/src/main/webapp/css/style.css
/myapp/src/project
/myapp/src/project/java
/myapp/src/project/java/com
/myapp/src/project/java/com/example
/myapp/src/project/java/com/example/MyappBuild.java
/myapp/src/test /myapp/src/test
/myapp/src/test/java /myapp/src/test/java
/myapp/src/test/java/com /myapp/src/test/java/com
@ -126,15 +126,15 @@ public class TestCreateRife2Operation {
/myapp/.gitignore /myapp/.gitignore
/myapp/.idea /myapp/.idea
/myapp/.idea/app.iml /myapp/.idea/app.iml
/myapp/.idea/bld.iml
/myapp/.idea/libraries /myapp/.idea/libraries
/myapp/.idea/libraries/bld.xml
/myapp/.idea/libraries/compile.xml /myapp/.idea/libraries/compile.xml
/myapp/.idea/libraries/project.xml
/myapp/.idea/libraries/runtime.xml /myapp/.idea/libraries/runtime.xml
/myapp/.idea/libraries/standalone.xml /myapp/.idea/libraries/standalone.xml
/myapp/.idea/libraries/test.xml /myapp/.idea/libraries/test.xml
/myapp/.idea/misc.xml /myapp/.idea/misc.xml
/myapp/.idea/modules.xml /myapp/.idea/modules.xml
/myapp/.idea/project.iml
/myapp/.idea/runConfigurations /myapp/.idea/runConfigurations
/myapp/.idea/runConfigurations/Run Main.xml /myapp/.idea/runConfigurations/Run Main.xml
/myapp/.idea/runConfigurations/Run Tests.xml /myapp/.idea/runConfigurations/Run Tests.xml
@ -150,9 +150,9 @@ public class TestCreateRife2Operation {
/myapp/build/test/com/example /myapp/build/test/com/example
/myapp/build/test/com/example/MyappTest.class /myapp/build/test/com/example/MyappTest.class
/myapp/lib /myapp/lib
/myapp/lib/bld
/myapp/lib/compile /myapp/lib/compile
/myapp/lib/compile/rife2-1.5.0-20230313.213352-8.jar /myapp/lib/compile/rife2-1.5.0-20230313.213352-8.jar
/myapp/lib/project
/myapp/lib/runtime /myapp/lib/runtime
/myapp/lib/standalone /myapp/lib/standalone
/myapp/lib/standalone/jetty-http-11.0.14.jar /myapp/lib/standalone/jetty-http-11.0.14.jar
@ -176,6 +176,11 @@ public class TestCreateRife2Operation {
/myapp/lib/test/junit-platform-engine-1.9.2.jar /myapp/lib/test/junit-platform-engine-1.9.2.jar
/myapp/lib/test/opentest4j-1.2.0.jar /myapp/lib/test/opentest4j-1.2.0.jar
/myapp/src /myapp/src
/myapp/src/bld
/myapp/src/bld/java
/myapp/src/bld/java/com
/myapp/src/bld/java/com/example
/myapp/src/bld/java/com/example/MyappBuild.java
/myapp/src/main /myapp/src/main
/myapp/src/main/java /myapp/src/main/java
/myapp/src/main/java/com /myapp/src/main/java/com
@ -190,11 +195,6 @@ public class TestCreateRife2Operation {
/myapp/src/main/webapp/WEB-INF/web.xml /myapp/src/main/webapp/WEB-INF/web.xml
/myapp/src/main/webapp/css /myapp/src/main/webapp/css
/myapp/src/main/webapp/css/style.css /myapp/src/main/webapp/css/style.css
/myapp/src/project
/myapp/src/project/java
/myapp/src/project/java/com
/myapp/src/project/java/com/example
/myapp/src/project/java/com/example/MyappBuild.java
/myapp/src/test /myapp/src/test
/myapp/src/test/java /myapp/src/test/java
/myapp/src/test/java/com /myapp/src/test/java/com
@ -242,26 +242,31 @@ public class TestCreateRife2Operation {
/yourthing/.gitignore /yourthing/.gitignore
/yourthing/.idea /yourthing/.idea
/yourthing/.idea/app.iml /yourthing/.idea/app.iml
/yourthing/.idea/bld.iml
/yourthing/.idea/libraries /yourthing/.idea/libraries
/yourthing/.idea/libraries/bld.xml
/yourthing/.idea/libraries/compile.xml /yourthing/.idea/libraries/compile.xml
/yourthing/.idea/libraries/project.xml
/yourthing/.idea/libraries/runtime.xml /yourthing/.idea/libraries/runtime.xml
/yourthing/.idea/libraries/standalone.xml /yourthing/.idea/libraries/standalone.xml
/yourthing/.idea/libraries/test.xml /yourthing/.idea/libraries/test.xml
/yourthing/.idea/misc.xml /yourthing/.idea/misc.xml
/yourthing/.idea/modules.xml /yourthing/.idea/modules.xml
/yourthing/.idea/project.iml
/yourthing/.idea/runConfigurations /yourthing/.idea/runConfigurations
/yourthing/.idea/runConfigurations/Run Main.xml /yourthing/.idea/runConfigurations/Run Main.xml
/yourthing/.idea/runConfigurations/Run Tests.xml /yourthing/.idea/runConfigurations/Run Tests.xml
/yourthing/bld.sh /yourthing/bld.sh
/yourthing/lib /yourthing/lib
/yourthing/lib/bld
/yourthing/lib/compile /yourthing/lib/compile
/yourthing/lib/project
/yourthing/lib/runtime /yourthing/lib/runtime
/yourthing/lib/standalone /yourthing/lib/standalone
/yourthing/lib/test /yourthing/lib/test
/yourthing/src /yourthing/src
/yourthing/src/bld
/yourthing/src/bld/java
/yourthing/src/bld/java/org
/yourthing/src/bld/java/org/stuff
/yourthing/src/bld/java/org/stuff/YourthingBuild.java
/yourthing/src/main /yourthing/src/main
/yourthing/src/main/java /yourthing/src/main/java
/yourthing/src/main/java/org /yourthing/src/main/java/org
@ -276,11 +281,6 @@ public class TestCreateRife2Operation {
/yourthing/src/main/webapp/WEB-INF/web.xml /yourthing/src/main/webapp/WEB-INF/web.xml
/yourthing/src/main/webapp/css /yourthing/src/main/webapp/css
/yourthing/src/main/webapp/css/style.css /yourthing/src/main/webapp/css/style.css
/yourthing/src/project
/yourthing/src/project/java
/yourthing/src/project/java/org
/yourthing/src/project/java/org/stuff
/yourthing/src/project/java/org/stuff/YourthingBuild.java
/yourthing/src/test /yourthing/src/test
/yourthing/src/test/java /yourthing/src/test/java
/yourthing/src/test/java/org /yourthing/src/test/java/org

6
lib/src/test/java/rife/bld/operations/TestDownloadOperation.java
View file

@ -109,9 +109,9 @@ public class TestDownloadOperation {
assertEquals(""" assertEquals("""
/lib /lib
/lib/bld
/lib/compile /lib/compile
/lib/compile/commons-lang3-3.12.0.jar /lib/compile/commons-lang3-3.12.0.jar
/lib/project
/lib/runtime /lib/runtime
/lib/runtime/commons-collections4-4.4.jar /lib/runtime/commons-collections4-4.4.jar
/lib/standalone /lib/standalone
@ -123,12 +123,12 @@ public class TestDownloadOperation {
/lib/test/httpcore5-h2-5.2.jar /lib/test/httpcore5-h2-5.2.jar
/lib/test/slf4j-api-1.7.36.jar /lib/test/slf4j-api-1.7.36.jar
/src /src
/src/bld
/src/bld/java
/src/main /src/main
/src/main/java /src/main/java
/src/main/resources /src/main/resources
/src/main/resources/templates /src/main/resources/templates
/src/project
/src/project/java
/src/test /src/test
/src/test/java""", /src/test/java""",
Files.walk(Path.of(tmp.getAbsolutePath())) Files.walk(Path.of(tmp.getAbsolutePath()))