This is an automated email from the ASF dual-hosted git repository.
mbien pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new d18ab87ca6 Bugfix: Added ability to find `jakarta` related jars for
wildfly server instances
new 8c90bb3ddd Merge pull request #6140 from
asbachb/5407-wildfly-jakarta-classes
d18ab87ca6 is described below
commit d18ab87ca6106bfe2d41ca71e6f22161e5668eb2
Author: Benjamin Asbach <asbachb....@impl.it>
AuthorDate: Thu Jun 29 04:45:25 2023 +0800
Bugfix: Added ability to find `jakarta` related jars for wildfly server
instances
This should fix #5407
---
.../modules/javaee/wildfly/util/WildFlyProperties.java | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git
a/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/util/WildFlyProperties.java
b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/util/WildFlyProperties.java
index 19bc47292e..711855ee35 100644
---
a/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/util/WildFlyProperties.java
+++
b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/util/WildFlyProperties.java
@@ -232,12 +232,16 @@ public class WildFlyProperties {
}
public List<URL> getClasses() {
- List<URL> list = selectJars(FileUtil.toFileObject(new
File(getModulePath("javax"))));
+ List<URL> classes = new ArrayList<>();
+
+ classes.addAll(selectJars(FileUtil.toFileObject(new
File(getModulePath("jakarta")))));
+ classes.addAll(selectJars(FileUtil.toFileObject(new
File(getModulePath("javax")))));
+
File glassfish = new File(getModulePath("org/glassfish/javax"));
if(glassfish.exists()) {
- list.addAll(selectJars(FileUtil.toFileObject(glassfish)));
+ classes.addAll(selectJars(FileUtil.toFileObject(glassfish)));
}
- return list;
+ return classes;
}
public List<URL> getSources() {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org
For additional commands, e-mail: commits-h...@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
