Skip to content

JBIDE-17552 ewp 5.2 not recognized properly #239

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
merged 1 commit into from
Jul 8, 2014
Merged

JBIDE-17552 ewp 5.2 not recognized properly #239

Show file tree
Hide file tree
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ....eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ServerModeSectionComposite.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ public void handleEvent(Event event) {
}

protected WizardFragment createRootConfigureFragment() {
return new LayeredProductServerWizardFragment();
return ServerUIPlugin.getWizardFragment( callback.getServer().getServerType().getId());
}

private void configurePressed() {
Expand Down
16 changes: 10 additions & 6 deletions ...imes.integration/src/org/jboss/tools/as/runtimes/integration/internal/JBossASHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,12 @@ public void initializeRuntimes(List<RuntimeDefinition> runtimeDefinitions) {
public static void createJBossServerFromDefinitions(List<RuntimeDefinition> runtimeDefinitions) {
for (RuntimeDefinition runtimeDefinition:runtimeDefinitions) {
if (runtimeDefinition.isEnabled()) {
File asLocation = getServerAdapterRuntimeLocation(runtimeDefinition);
ServerBean sb = new ServerBeanLoader(runtimeDefinition.getLocation()).getServerBean();
File asLocation = getServerAdapterRuntimeLocation(sb, runtimeDefinition.getLocation());
if (asLocation != null && asLocation.isDirectory()) {
String type = runtimeDefinition.getType();
if (serverBeanTypeExists(type)) {
String typeId = new ServerBeanLoader(asLocation).getServerAdapterId();
String typeId = sb.getServerAdapterTypeId();
String name = runtimeDefinition.getName();
String runtimeName = name + " " + RUNTIME; //$NON-NLS-1$
createJBossServer(asLocation, typeId, name, runtimeName);
Expand Down Expand Up @@ -308,11 +309,14 @@ private String getLocationForRuntimeDefinition(RuntimeDefinition runtimeDefiniti

private static File getServerAdapterRuntimeLocation(RuntimeDefinition runtimeDefinitions) {
ServerBeanLoader loader = new ServerBeanLoader( runtimeDefinitions.getLocation() );
String version = runtimeDefinitions.getVersion();
String relative = loader.getServerBean().getType().getRootToAdapterRelativePath(version);
return getServerAdapterRuntimeLocation(loader.getServerBean(), runtimeDefinitions.getLocation());
}
private static File getServerAdapterRuntimeLocation(ServerBean sb, File root) {
String version = sb.getVersion();
String relative = sb.getBeanType().getRootToAdapterRelativePath(version);
if( relative == null )
return runtimeDefinitions.getLocation();
return new File(runtimeDefinitions.getLocation(), relative);
return root;
return new File(root, relative);
}

@Override
Expand Down