Skip to content
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

Jump to bottom

JBIDE-25095 - update default classpath jars for wf11 / eap71 #541

Merged
merged 1 commit into from Oct 4, 2017
Merged

JBIDE-25095 - update default classpath jars for wf11 / eap71 #541

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
25 changes: 22 additions & 3 deletions ...se/as/classpath/core/runtime/jbossmodules/internal/JBossModulesDefaultClasspathModel.java
View file
Open in desktop
Expand Up @@ -45,11 +45,28 @@ private IRuntimePathProvider[] getDefaultJBossModulesEntries(IRuntimeType rtt) {
if( rtt.getId().equals(IJBossToolingConstants.EAP_70)) {
return getDefaultJEE8JBossModulesEntries();
}
if( rtt.getId().equals(IJBossToolingConstants.EAP_71)) {
return getDefaultWF11JBossModulesEntries();
}
if( rtt.getId().equals(IJBossToolingConstants.WILDFLY_110)) {
return getDefaultWF11JBossModulesEntries();
}

return getDefaultJBossModulesEntries();
}

private IRuntimePathProvider[] getDefaultWF11JBossModulesEntries() {
ArrayList<String> all = new ArrayList<String>();
all.addAll(Arrays.asList(getDefaultJEE8JBossModulesEntryKeys()));

all.add("org.wildfly.common"); //$NON-NLS-1$
all.add("org.wildfly.security.elytron-private"); //$NON-NLS-1$

String[] allString = (String[]) all.toArray(new String[all.size()]);
return toRuntimePathProvider(allString);
}

private IRuntimePathProvider[] getDefaultJEE8JBossModulesEntries() {
private String[] getDefaultJEE8JBossModulesEntryKeys() {
ArrayList<String> all = new ArrayList<String>();
all.addAll(Arrays.asList(getDefaultJBossModulesEntryKeys()));
all.add("javax.batch.api"); //$NON-NLS-1$
Expand All @@ -62,8 +79,10 @@ private IRuntimePathProvider[] getDefaultJEE8JBossModulesEntries() {
all.remove("javax.rmi.api");//$NON-NLS-1$
all.remove("javax.xml.registry.api");//$NON-NLS-1$

// Convert
String[] allString = (String[]) all.toArray(new String[all.size()]);
return (String[]) all.toArray(new String[all.size()]);
}
private IRuntimePathProvider[] getDefaultJEE8JBossModulesEntries() {
String[] allString = getDefaultJEE8JBossModulesEntryKeys();
return toRuntimePathProvider(allString);
}

Expand Down