Skip to content

Identify project bundle by checking for build.properties rather than .project nature #1031

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hugithordarson merged 3 commits into from
Nov 9, 2025
Merged

Identify project bundle by checking for build.properties rather than .project nature #1031

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
06269ba
#1025 Fix bundleless builds in maven projects
hugithordarson Nov 3, 2025
b5d9878
Don't exclude the app project bundle from ERXApp.Loader's loading
hugithordarson Nov 7, 2025
4992298
Identify project bundle using build.properties
hugithordarson Nov 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 25 additions & 27 deletions Frameworks/Core/ERExtensions/Sources/er/extensions/appserver/ERXApplication.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -524,52 +524,50 @@ else if (jar.endsWith(".jar")) {
}
// MS: This is totally hacked in to make Wonder startup properly with the new rapid turnaround. It's duplicating (poorly)
// code from NSProjectBundle. I'm not sure we actually need this anymore, because NSBundle now fires an "all bundles loaded" event.
else if (jar.endsWith("/bin") && new File(new File(jar).getParentFile(), ".project").exists()) {
else if ((jar.endsWith("/bin") && new File(new File(jar).getParentFile(), "build.properties").exists()) || (jar.endsWith("/target/classes") && new File(new File(jar).getParentFile().getParentFile(), "build.properties").exists())) {
// AK: I have no idea if this is checked anywhere else, but this keeps is from having to set it in the VM args.
debugMsg("Plain bundle: " + jar);
for (File classpathFolder = new File(bundle); classpathFolder != null && classpathFolder.exists(); classpathFolder = classpathFolder.getParentFile()) {
File projectFile = new File(classpathFolder, ".project");
if (projectFile.exists()) {
File buildPropertiesFile = new File(classpathFolder, "build.properties");

if (buildPropertiesFile.exists()) {
try {
boolean isBundle = false;
Document projectDocument = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(projectFile);
projectDocument.normalize();
NodeList natureNodeList = projectDocument.getElementsByTagName("nature");
for (int natureNodeNum = 0; !isBundle && natureNodeNum < natureNodeList.getLength(); natureNodeNum ++) {
Element natureContainerNode = (Element)natureNodeList.item(natureNodeNum);
Node natureNode = natureContainerNode.getFirstChild();
String nodeValue = natureNode.getNodeValue();
// AK: we don't actually add apps to the bundle process (Mike, why not!?)
if (nodeValue != null && nodeValue.startsWith("org.objectstyle.wolips.") && !nodeValue.contains("application")) {
isBundle = true;
String bundleName = classpathFolder.getName();

if (buildPropertiesFile.exists()) {
Properties buildProperties = new Properties();
buildProperties.load(new FileReader(buildPropertiesFile));
if (buildProperties.get("project.name") != null) {
// the project folder might be named differently than the actual bundle name
bundleName = (String) buildProperties.get("project.name");

// Basing isBundle on "project.type" (commented out code) is probably better, but the maven archetypes don't contain a "project.type" property // Hugi 2025-11-07
isBundle = bundleName != null;
/*
String projectType = (String) buildProperties.get("project.type");

if( "application".equals(projectType) || "framework".equals(projectType) ) {
isBundle = true;
}
*/
}
}

if (isBundle) {
System.setProperty("NSProjectBundleEnabled", "true");
String bundleName = classpathFolder.getName();

File buildPropertiesFile = new File(classpathFolder, "build.properties");
if (buildPropertiesFile.exists()) {
Properties buildProperties = new Properties();
buildProperties.load(new FileReader(buildPropertiesFile));
if (buildProperties.get("project.name") != null) {
// the project folder might be named differently than the actual bundle name
bundleName = (String) buildProperties.get("project.name");
}
}

allFrameworks.add(bundleName);
debugMsg("Added Binary Bundle (Project bundle): " + bundleName);
} else {
debugMsg("Skipping binary bundle: " + jar);
}
}
catch (Throwable t) {
System.err.println("Skipping '" + projectFile + "': " + t);
System.err.println("Skipping '" + buildPropertiesFile + "': " + t);
}
break;
}
debugMsg("Skipping, no project: " + projectFile);
debugMsg("Skipping, no project: " + buildPropertiesFile);
}
}
}
Expand Down
Loading