Author: rob.stryker(a)jboss.com Date: 2010-07-27 04:18:54 -0400 (Tue, 27 Jul 2010) New Revision: 23742 Added: workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/rse/core/IRSEConstants.java workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ServerModeSection.java Modified: workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IDeployableServer.java workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/DeploymentPreferenceLoader.java workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerConverter.java workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/rse/core/RSEPublishMethod.java workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.ui/META-INF/MANIFEST.MF workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.java workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/ExploreUtils.java workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/DeploymentModuleOptionCompositeAssistant.java workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/IDeploymentTypeUI.java workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ModuleDeploymentPage.java workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/PollerSection.java workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/PortSection.java workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ModuleActionProvider.java workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/rse/ui/RSEDeploymentPreferenceUI.java workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml Log: JBIDE-6580 - moved publish method from second page to first, cleaned up second page, added RSE ui for first page Modified: workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IDeployableServer.java =================================================================== --- workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IDeployableServer.java 2010-07-27 08:18:16 UTC (rev 23741) +++ workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IDeployableServer.java 2010-07-27 08:18:54 UTC (rev 23742) @@ -19,6 +19,7 @@ * @author rob.stryker(a)jboss.com */ public interface IDeployableServer { + public static final String SERVER_MODE = "org.jboss.ide.eclipse.as.core.server.serverMode"; //$NON-NLS-1$ public static final String DEPLOY_DIRECTORY = "org.jboss.ide.eclipse.as.core.server.deployDirectory"; //$NON-NLS-1$ public static final String TEMP_DEPLOY_DIRECTORY = "org.jboss.ide.eclipse.as.core.server.tempDeployDirectory"; //$NON-NLS-1$ public static final String DEPLOY_DIRECTORY_TYPE = "org.jboss.ide.eclipse.as.core.server.deployDirectoryType"; //$NON-NLS-1$ Modified: workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/DeploymentPreferenceLoader.java =================================================================== --- workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/DeploymentPreferenceLoader.java 2010-07-27 08:18:16 UTC (rev 23741) +++ workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/DeploymentPreferenceLoader.java 2010-07-27 08:18:54 UTC (rev 23742) @@ -24,7 +24,9 @@ import org.eclipse.wst.server.core.IServer; import org.eclipse.wst.server.core.internal.Server; import org.jboss.ide.eclipse.as.core.ExtensionManager; +import org.jboss.ide.eclipse.as.core.server.IDeployableServer; import org.jboss.ide.eclipse.as.core.server.IJBossServerPublishMethodType; +import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime; import org.jboss.tools.jmx.core.IMemento; import org.jboss.tools.jmx.core.util.XMLMemento; @@ -43,8 +45,7 @@ * @return */ public static IJBossServerPublishMethodType getCurrentDeploymentMethodType(IServer server) { - DeploymentPreferences prefs = DeploymentPreferenceLoader.loadPreferencesFromServer(server); - String type = prefs.getProperty(DeploymentPreferenceLoader.CURRENT_METHOD_PROPERTY); + String type = server.getAttribute(IDeployableServer.SERVER_MODE, (String)null); if( type != null ) { return ExtensionManager.getDefault().getPublishMethod(type); } Modified: workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerConverter.java =================================================================== --- workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerConverter.java 2010-07-27 08:18:16 UTC (rev 23741) +++ workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerConverter.java 2010-07-27 08:18:54 UTC (rev 23742) @@ -13,10 +13,12 @@ import java.util.ArrayList; import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.wst.server.core.IRuntime; import org.eclipse.wst.server.core.IServer; import org.eclipse.wst.server.core.IServerWorkingCopy; import org.eclipse.wst.server.core.ServerCore; import org.jboss.ide.eclipse.as.core.server.IDeployableServer; +import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime; import org.jboss.ide.eclipse.as.core.server.internal.DeployableServerBehavior; import org.jboss.ide.eclipse.as.core.server.internal.JBossServer; @@ -107,4 +109,8 @@ return ret; } + public static IJBossServerRuntime getJBossRuntime(IServer server) { + IRuntime rt = server.getRuntime(); + return (IJBossServerRuntime)rt.loadAdapter(IJBossServerRuntime.class, null); + } } Added: workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/rse/core/IRSEConstants.java =================================================================== --- workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/rse/core/IRSEConstants.java (rev 0) +++ workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/rse/core/IRSEConstants.java 2010-07-27 08:18:54 UTC (rev 23742) @@ -0,0 +1,18 @@ +/******************************************************************************* + * Copyright (c) 2010 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.ide.eclipse.as.rse.core; + +public interface IRSEConstants { + public static final String RSE_SERVER_CONFIG = "org.jboss.ide.eclipse.as.rse.core.RSEServerConfig"; //$NON-NLS-1$ + public static final String RSE_SERVER_HOME_DIR = "org.jboss.ide.eclipse.as.rse.core.RSEServerHomeDir"; //$NON-NLS-1$ + public static final String RSE_SERVER_HOST = "org.jboss.ide.eclipse.as.rse.core.ServerHost"; //$NON-NLS-1$ + public static final String RSE_SERVER_DEFAULT_HOST = "Local"; //$NON-NLS-1$ +} Modified: workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/rse/core/RSEPublishMethod.java =================================================================== --- workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/rse/core/RSEPublishMethod.java 2010-07-27 08:18:16 UTC (rev 23741) +++ workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/rse/core/RSEPublishMethod.java 2010-07-27 08:18:54 UTC (rev 23742) @@ -34,7 +34,9 @@ public class RSEPublishMethod extends AbstractPublishMethod { public static final String RSE_ID = "rse"; //$NON-NLS-1$ - + + private DeployableServerBehavior behaviour; + @Override public String getPublishMethodId() { return RSE_ID; @@ -45,6 +47,7 @@ private IPath remoteTemporaryFolder; public void publishStart(DeployableServerBehavior behaviour, IProgressMonitor monitor) throws CoreException { + this.behaviour = behaviour; loadRemoteDeploymentDetails(); if (fileSubSystem != null && !fileSubSystem.isConnected()) { try { Modified: workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.ui/META-INF/MANIFEST.MF =================================================================== --- workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.ui/META-INF/MANIFEST.MF 2010-07-27 08:18:16 UTC (rev 23741) +++ workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.ui/META-INF/MANIFEST.MF 2010-07-27 08:18:54 UTC (rev 23742) @@ -53,7 +53,8 @@ org.jboss.tools.jmx.ui, org.jboss.tools.jmx.core, org.eclipse.jst.j2ee.core, - org.eclipse.rse.ui;bundle-version="3.1.100" + org.eclipse.rse.ui;resolution:=optional, + org.eclipse.rse.core;resolution:=optional Bundle-ActivationPolicy: lazy Export-Package: org.jboss.ide.eclipse.as.ui, org.jboss.ide.eclipse.as.ui.dialogs, Modified: workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.java =================================================================== --- workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.java 2010-07-27 08:18:16 UTC (rev 23741) +++ workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.java 2010-07-27 08:18:54 UTC (rev 23742) @@ -73,6 +73,7 @@ public static String swf_NameInUse; public static String swf_DeployEditorHeading; public static String swf_DeploymentDescription; + public static String swf_DeploymentDescriptionLabel; public static String swf_DeployDirectory; public static String swf_TempDeployDirectory; public static String swf_CloneConfiguration; Modified: workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties =================================================================== --- workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties 2010-07-27 08:18:16 UTC (rev 23741) +++ workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties 2010-07-27 08:18:54 UTC (rev 23742) @@ -41,7 +41,8 @@ swf_BaseName=JBoss _VERSION_ Server swf_NameInUse=Server name already in use swf_DeployEditorHeading=Default Settings -swf_DeploymentDescription=This section sets where any non-customized module will be deployed to.\nThe temporary deploy folder should be on the same file-system as the deploy folder.\nThis will ensure safe and complete file copies.\nCustomizations can be made in the table below on a per-module basis.\nBlank columns will use the default values.\nChanges should *not* be made to this page while the server is running. +swf_DeploymentDescriptionLabel=Set the default publish settings for your deployments.\nSettings can be overridden per-module in the table below. +swf_DeploymentDescription=This section sets the default deploy folders for your deployments. To ensure safe and fast file copies, the temporary deploy folder should be on the same file-system as the main deploy folder.\n\nCustomizations can be made in the table below on a per-module basis. Blank (uncustomized) modules will continue to use the default values. Customized paths may be absolute or relative to the server's root directory (eg: server/default/deploy/custom/folder).\n\nChanges should *not* be made to this page while the server is running. swf_DeployDirectory=Deploy Directory swf_TempDeployDirectory=Temporary Deploy Directory swf_CloneConfiguration=Copy this configuration into workspace metadata Modified: workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/ExploreUtils.java =================================================================== --- workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/ExploreUtils.java 2010-07-27 08:18:16 UTC (rev 23741) +++ workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/ExploreUtils.java 2010-07-27 08:18:54 UTC (rev 23742) @@ -19,7 +19,9 @@ import org.eclipse.wst.server.core.IModule; import org.eclipse.wst.server.core.IServer; import org.eclipse.wst.server.core.IServerWorkingCopy; +import org.jboss.ide.eclipse.as.core.publishers.LocalPublishMethod; import org.jboss.ide.eclipse.as.core.server.IDeployableServer; +import org.jboss.ide.eclipse.as.core.server.internal.DeployableServerBehavior; import org.jboss.ide.eclipse.as.core.server.internal.ServerAttributeHelper; import org.jboss.ide.eclipse.as.core.util.ServerConverter; import org.jboss.ide.eclipse.as.ui.JBossServerUIPlugin; @@ -101,6 +103,9 @@ if (ExploreUtils.getExploreCommand() == null) { return false; } + DeployableServerBehavior dsb = ServerConverter.getDeployableServerBehavior(server); + if( !dsb.createPublishMethod().getPublishMethodType().getId().equals(LocalPublishMethod.LOCAL_PUBLISH_METHOD)) + return false; return true; } Modified: workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/DeploymentModuleOptionCompositeAssistant.java =================================================================== --- workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/DeploymentModuleOptionCompositeAssistant.java 2010-07-27 08:18:16 UTC (rev 23741) +++ workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/DeploymentModuleOptionCompositeAssistant.java 2010-07-27 08:18:54 UTC (rev 23742) @@ -118,6 +118,7 @@ ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED | ExpandableComposite.TITLE_BAR); section.setText(Messages.swf_DeployEditorHeading); + section.setToolTipText(Messages.swf_DeploymentDescription); section.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.VERTICAL_ALIGN_FILL)); @@ -126,7 +127,8 @@ composite.setLayout(new FormLayout()); Label descriptionLabel = toolkit.createLabel(composite, - Messages.swf_DeploymentDescription); + Messages.swf_DeploymentDescriptionLabel); + descriptionLabel.setToolTipText(Messages.swf_DeploymentDescription); Control top = descriptionLabel; Composite inner = toolkit.createComposite(composite); inner.setLayout(new GridLayout(1, false)); Modified: workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/IDeploymentTypeUI.java =================================================================== --- workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/IDeploymentTypeUI.java 2010-07-27 08:18:16 UTC (rev 23741) +++ workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/IDeploymentTypeUI.java 2010-07-27 08:18:54 UTC (rev 23742) @@ -25,7 +25,7 @@ * new class which extends Composite and can maintain state. * * @param parent - * @param page + * @param modeSection */ - public void fillComposite(Composite parent, ModuleDeploymentPage page); + public void fillComposite(Composite parent, ServerModeSection modeSection); } Modified: workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ModuleDeploymentPage.java =================================================================== --- workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ModuleDeploymentPage.java 2010-07-27 08:18:16 UTC (rev 23741) +++ workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ModuleDeploymentPage.java 2010-07-27 08:18:54 UTC (rev 23742) @@ -19,26 +19,17 @@ import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Path; import org.eclipse.swt.SWT; -import org.eclipse.swt.events.ModifyEvent; -import org.eclipse.swt.events.ModifyListener; -import org.eclipse.swt.events.SelectionEvent; -import org.eclipse.swt.events.SelectionListener; import org.eclipse.swt.layout.FormAttachment; import org.eclipse.swt.layout.FormData; import org.eclipse.swt.layout.FormLayout; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.Combo; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Label; import org.eclipse.ui.IEditorInput; import org.eclipse.ui.IEditorSite; -import org.eclipse.ui.forms.widgets.ExpandableComposite; import org.eclipse.ui.forms.widgets.FormToolkit; import org.eclipse.ui.forms.widgets.ScrolledForm; -import org.eclipse.ui.forms.widgets.ScrolledPageBook; -import org.eclipse.ui.forms.widgets.Section; import org.eclipse.wst.server.core.IModule; import org.eclipse.wst.server.core.IRuntime; import org.eclipse.wst.server.core.IServerWorkingCopy; @@ -47,17 +38,12 @@ import org.eclipse.wst.server.ui.internal.command.ServerCommand; import org.eclipse.wst.server.ui.internal.editor.ServerEditorPartInput; import org.eclipse.wst.server.ui.internal.editor.ServerResourceCommandManager; -import org.jboss.ide.eclipse.as.core.ExtensionManager; -import org.jboss.ide.eclipse.as.core.server.IJBossServerPublishMethodType; import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime; -import org.jboss.ide.eclipse.as.core.server.internal.DeployableServerBehavior; import org.jboss.ide.eclipse.as.core.server.internal.ServerAttributeHelper; import org.jboss.ide.eclipse.as.core.util.DeploymentPreferenceLoader; import org.jboss.ide.eclipse.as.core.util.DeploymentPreferenceLoader.DeploymentModulePrefs; import org.jboss.ide.eclipse.as.core.util.DeploymentPreferenceLoader.DeploymentPreferences; -import org.jboss.ide.eclipse.as.core.util.ServerConverter; import org.jboss.ide.eclipse.as.core.util.ServerUtil; -import org.jboss.ide.eclipse.as.ui.UIUtil; public class ModuleDeploymentPage extends ServerEditorPart { protected ServerResourceCommandManager commandManager; @@ -114,17 +100,10 @@ } - private ArrayList<DeployUIAdditions> deployAdditions; - private ScrolledPageBook preferencePageBook; - private Combo deployTypeCombo; - private Composite absolutePageRoot; - private Section publishTypeSection; public void createPartControl(Composite parent) { - absolutePageRoot = parent; preferences = DeploymentPreferenceLoader.loadPreferencesFromServer(server.getOriginal()); Composite innerContent = createPageStructure(parent); - Control top = createPublishMethodSection(innerContent); - addDeploymentLocationControls(innerContent, top); + addDeploymentLocationControls(innerContent, null); } private Composite createPageStructure(Composite parent) { @@ -147,7 +126,10 @@ Composite defaultComposite = tab.createDefaultComposite(parent); FormData fd = new FormData(); fd.left = new FormAttachment(0, 5); - fd.top = new FormAttachment(top, 5); + if( top == null ) + fd.top = new FormAttachment(0, 5); + else + fd.top = new FormAttachment(top, 5); fd.right = new FormAttachment(100, -5); defaultComposite.setLayoutData(fd); @@ -161,104 +143,7 @@ } - private class DeployUIAdditions { - private IJBossServerPublishMethodType publishType; - private IDeploymentTypeUI ui; - private boolean registered = false; - public DeployUIAdditions(IJBossServerPublishMethodType type,IDeploymentTypeUI ui) { - this.publishType = type; - this.ui = ui; - } - public boolean isRegistered() { - return registered; - } - public IJBossServerPublishMethodType getPublishType() { - return publishType; - } - public void createComposite(Composite parent) { - // UI can be null - if( ui != null ) { - ui.fillComposite(parent, ModuleDeploymentPage.this); - registered = true; - } - } - } - private void loadDeployTypeData() { - deployAdditions = new ArrayList<DeployUIAdditions>(); - IJBossServerPublishMethodType[] publishMethodTypes = ExtensionManager.getDefault().findPossiblePublishMethods(getServer().getOriginal()); - for( int i = 0; i < publishMethodTypes.length; i++) { - IDeploymentTypeUI ui = EditorExtensionManager.getDefault().getPublishPreferenceUI(publishMethodTypes[i].getId()); - deployAdditions.add(new DeployUIAdditions(publishMethodTypes[i], ui)); - } - } - - private Control createPublishMethodSection(Composite parent) { - loadDeployTypeData(); - - FormToolkit toolkit2 = new FormToolkit(parent.getDisplay()); - publishTypeSection = toolkit2.createSection(parent, - ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED - | ExpandableComposite.TITLE_BAR); - publishTypeSection.setText("Publish Method"); - Composite c = toolkit2.createComposite(publishTypeSection); - publishTypeSection.setClient(c); - FormData fd = UIUtil.createFormData2(0, 5, null, 0, 0, 5, 100, -5); - publishTypeSection.setLayoutData(fd); - c.setLayout(new FormLayout()); - deployTypeCombo = new Combo(c, SWT.DEFAULT); - fd = UIUtil.createFormData2(0, 5, null, 0, 0, 5, 50, -5); - deployTypeCombo.setLayoutData(fd); - - - preferencePageBook = toolkit2.createPageBook(c, SWT.FLAT|SWT.TOP); - preferencePageBook.setLayoutData(UIUtil.createFormData2( - deployTypeCombo, 5, 0, 150, 0, 5, 100, -5)); -// deployTypeCombo, 5, null, 0, 0, 5, 100, -5)); - - // fill widgets - String[] nameList = new String[deployAdditions.size()]; - for( int i = 0; i < nameList.length; i++ ) { - nameList[i] = deployAdditions.get(i).getPublishType().getName(); - } - deployTypeCombo.setItems(nameList); - DeployableServerBehavior ds = ServerConverter.getDeployableServerBehavior(getServer().getOriginal()); - if( ds != null ) { - String current = ds.createPublishMethod().getPublishMethodType().getName(); - int index = deployTypeCombo.indexOf(current); - if( index != -1 ) - deployTypeCombo.select(index); - } - deployTypeCombo.addModifyListener(new ModifyListener(){ - @Override - public void modifyText(ModifyEvent e) { - deployTypeChanged(true); - }}); - return publishTypeSection; - } - - private void deployTypeChanged(boolean fireEvent) { - int index = deployTypeCombo.getSelectionIndex(); - if( index != -1 ) { - DeployUIAdditions ui = deployAdditions.get(index); - if( !ui.isRegistered()) { - Composite newRoot = preferencePageBook.createPage(ui); - ui.createComposite(newRoot); - } - preferencePageBook.showPage(ui); - //((Composite)publishTypeSection.getClient()).layout(true, true); - absolutePageRoot.layout(true, true); - if( fireEvent ) { - commandManager.execute(new ChangeRootDeployPreference(preferences, - DeploymentPreferenceLoader.CURRENT_METHOD_PROPERTY, - ui.getPublishType().getId(), "Change Publish Method")); - } - } else { - // null selection - } - } - - public void execute(ServerCommand command) { commandManager.execute(command); } @@ -267,29 +152,6 @@ commandManager.execute(new ChangePropertyCommand(p,key,val,cmdName)); } - - private class ChangeRootDeployPreference extends ServerCommand { - private DeploymentPreferences p; - private String key; - private String oldVal; - private String newVal; - public ChangeRootDeployPreference(DeploymentPreferences p, String key, String val, String command) { - super(ModuleDeploymentPage.this.server, command); - this.p = p; - this.key = key; - this.newVal = val; - this.oldVal = p.getProperty(key); - } - public void execute() { - p.setProperty(key, newVal); - savePreferencesToWorkingCopy(); - } - public void undo() { - p.setProperty(key, oldVal); - savePreferencesToWorkingCopy(); - } - } - private class ChangePropertyCommand extends ServerCommand { private DeploymentModulePrefs p; private String key; Modified: workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/PollerSection.java =================================================================== --- workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/PollerSection.java 2010-07-27 08:18:16 UTC (rev 23741) +++ workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/PollerSection.java 2010-07-27 08:18:54 UTC (rev 23742) @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2010 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ package org.jboss.ide.eclipse.as.ui.editor; import org.eclipse.swt.SWT; Modified: workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/PortSection.java =================================================================== --- workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/PortSection.java 2010-07-27 08:18:16 UTC (rev 23741) +++ workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/PortSection.java 2010-07-27 08:18:54 UTC (rev 23742) @@ -179,7 +179,7 @@ Composite child = new Composite(parent, SWT.NONE); child.setLayout(new FormLayout()); label = new Label(child, SWT.NONE); - text = new Text(child, SWT.DEFAULT); + text = new Text(child, SWT.SINGLE | SWT.BORDER); detect = new Button(child, SWT.CHECK); link = new Link(child, SWT.NONE); Added: workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ServerModeSection.java =================================================================== --- workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ServerModeSection.java (rev 0) +++ workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ServerModeSection.java 2010-07-27 08:18:54 UTC (rev 23742) @@ -0,0 +1,188 @@ +/******************************************************************************* + * Copyright (c) 2010 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.ide.eclipse.as.ui.editor; + +import java.util.ArrayList; + +import org.eclipse.swt.SWT; +import org.eclipse.swt.events.ModifyEvent; +import org.eclipse.swt.events.ModifyListener; +import org.eclipse.swt.layout.FormData; +import org.eclipse.swt.layout.FormLayout; +import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.widgets.Combo; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; +import org.eclipse.ui.IEditorInput; +import org.eclipse.ui.IEditorSite; +import org.eclipse.ui.forms.widgets.ExpandableComposite; +import org.eclipse.ui.forms.widgets.FormToolkit; +import org.eclipse.ui.forms.widgets.ScrolledPageBook; +import org.eclipse.ui.forms.widgets.Section; +import org.eclipse.wst.server.core.IServerWorkingCopy; +import org.eclipse.wst.server.ui.editor.IServerEditorPartInput; +import org.eclipse.wst.server.ui.editor.ServerEditorSection; +import org.eclipse.wst.server.ui.internal.command.ServerCommand; +import org.eclipse.wst.server.ui.internal.editor.ServerEditorPartInput; +import org.eclipse.wst.server.ui.internal.editor.ServerResourceCommandManager; +import org.jboss.ide.eclipse.as.core.ExtensionManager; +import org.jboss.ide.eclipse.as.core.server.IDeployableServer; +import org.jboss.ide.eclipse.as.core.server.IJBossServerPublishMethodType; +import org.jboss.ide.eclipse.as.core.server.internal.DeployableServerBehavior; +import org.jboss.ide.eclipse.as.core.util.ServerConverter; +import org.jboss.ide.eclipse.as.ui.UIUtil; + +public class ServerModeSection extends ServerEditorSection { + private ArrayList<DeployUIAdditions> deployAdditions; + private ScrolledPageBook preferencePageBook; + private Combo deployTypeCombo; + private Section publishTypeSection; + private ServerResourceCommandManager commandManager; + + public void init(IEditorSite site, IEditorInput input) { + super.init(site, input); + if (input instanceof IServerEditorPartInput) { + IServerEditorPartInput sepi = (IServerEditorPartInput) input; + server = sepi.getServer(); + commandManager = ((ServerEditorPartInput) sepi).getServerCommandManager(); + } + } + + public ServerResourceCommandManager getCommandManager() { + return commandManager; + } + + public IServerWorkingCopy getServer() { + return server; + } + + public void createSection(Composite parent) { + super.createSection(parent); + createPublishMethodSection(parent); + } + + + private class DeployUIAdditions { + private IJBossServerPublishMethodType publishType; + private IDeploymentTypeUI ui; + private boolean registered = false; + public DeployUIAdditions(IJBossServerPublishMethodType type,IDeploymentTypeUI ui) { + this.publishType = type; + this.ui = ui; + } + public boolean isRegistered() { + return registered; + } + public IJBossServerPublishMethodType getPublishType() { + return publishType; + } + public void createComposite(Composite parent) { + // UI can be null + if( ui != null ) { + ui.fillComposite(parent, ServerModeSection.this); + registered = true; + } + } + } + + private void loadDeployTypeData() { + deployAdditions = new ArrayList<DeployUIAdditions>(); + IJBossServerPublishMethodType[] publishMethodTypes = ExtensionManager.getDefault().findPossiblePublishMethods(server.getOriginal()); + for( int i = 0; i < publishMethodTypes.length; i++) { + IDeploymentTypeUI ui = EditorExtensionManager.getDefault().getPublishPreferenceUI(publishMethodTypes[i].getId()); + deployAdditions.add(new DeployUIAdditions(publishMethodTypes[i], ui)); + } + } + + private Control createPublishMethodSection(Composite parent) { + loadDeployTypeData(); + + FormToolkit toolkit2 = new FormToolkit(parent.getDisplay()); + publishTypeSection = toolkit2.createSection(parent, + ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED + | ExpandableComposite.TITLE_BAR); + publishTypeSection.setText("Server Behaviour"); + Composite c = toolkit2.createComposite(publishTypeSection); + publishTypeSection.setClient(c); + publishTypeSection.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.VERTICAL_ALIGN_FILL)); + c.setLayout(new FormLayout()); + deployTypeCombo = new Combo(c, SWT.DEFAULT); + FormData fd = UIUtil.createFormData2(0, 5, null, 0, 0, 5, 50, -5); + deployTypeCombo.setLayoutData(fd); + + + preferencePageBook = toolkit2.createPageBook(c, SWT.FLAT|SWT.TOP); + preferencePageBook.setLayoutData(UIUtil.createFormData2( + deployTypeCombo, 5, 0, 150, 0, 5, 100, -5)); + + // fill widgets + String[] nameList = new String[deployAdditions.size()]; + for( int i = 0; i < nameList.length; i++ ) { + nameList[i] = deployAdditions.get(i).getPublishType().getName(); + } + deployTypeCombo.setItems(nameList); + DeployableServerBehavior ds = ServerConverter.getDeployableServerBehavior(server.getOriginal()); + if( ds != null ) { + String current = ds.createPublishMethod().getPublishMethodType().getName(); + int index = deployTypeCombo.indexOf(current); + if( index != -1 ) + deployTypeCombo.select(index); + } + deployTypeCombo.addModifyListener(new ModifyListener(){ + @Override + public void modifyText(ModifyEvent e) { + deployTypeChanged(true); + }}); + deployTypeChanged(false); + return publishTypeSection; + } + + private void deployTypeChanged(boolean fireEvent) { + int index = deployTypeCombo.getSelectionIndex(); + if( index != -1 ) { + DeployUIAdditions ui = deployAdditions.get(index); + if( !ui.isRegistered()) { + Composite newRoot = preferencePageBook.createPage(ui); + ui.createComposite(newRoot); + } + preferencePageBook.showPage(ui); + if( fireEvent ) { + commandManager.execute(new ChangeServerPropertyCommand( + server, IDeployableServer.SERVER_MODE, + ui.getPublishType().getId(), "Change server mode")); + } + } else { + // null selection + } + } + + + public static class ChangeServerPropertyCommand extends ServerCommand { + private IServerWorkingCopy server; + private String key; + private String oldVal; + private String newVal; + public ChangeServerPropertyCommand(IServerWorkingCopy server, String key, String val, String commandName) { + super(server, commandName); + this.server = server; + this.key = key; + this.newVal = val; + this.oldVal = server.getAttribute(key, "local"); + } + public void execute() { + server.setAttribute(key, newVal); + } + public void undo() { + server.setAttribute(key, oldVal); + } + } + +} Modified: workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ModuleActionProvider.java =================================================================== --- workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ModuleActionProvider.java 2010-07-27 08:18:16 UTC (rev 23741) +++ workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ModuleActionProvider.java 2010-07-27 08:18:54 UTC (rev 23742) @@ -33,6 +33,7 @@ import org.jboss.ide.eclipse.as.core.server.IDeployableServer; import org.jboss.ide.eclipse.as.core.server.IJBossServerPublishMethodType; import org.jboss.ide.eclipse.as.core.server.IJBossServerPublisher; +import org.jboss.ide.eclipse.as.core.server.internal.DeployableServerBehavior; import org.jboss.ide.eclipse.as.core.util.DeploymentPreferenceLoader; import org.jboss.ide.eclipse.as.core.util.ModuleUtil; import org.jboss.ide.eclipse.as.core.util.ServerConverter; @@ -197,10 +198,9 @@ private IPath getDeployPath() { ModuleServer ms = selection[0]; IModule[] module = ms.module; - IJBossServerPublishMethodType type = - DeploymentPreferenceLoader.getCurrentDeploymentMethodType(ms.server); + DeployableServerBehavior dsb = ServerConverter.getDeployableServerBehavior(ms.server); IJBossServerPublisher publisher = ExtensionManager.getDefault() - .getPublisher(ms.getServer(), module, type.getId()); + .getPublisher(ms.getServer(), module, dsb.createPublishMethod().getPublishMethodType().getId()); IPath path = null; IDeployableServer deployableServer = ServerConverter .getDeployableServer(ms.server); Modified: workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/rse/ui/RSEDeploymentPreferenceUI.java =================================================================== --- workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/rse/ui/RSEDeploymentPreferenceUI.java 2010-07-27 08:18:16 UTC (rev 23741) +++ workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/rse/ui/RSEDeploymentPreferenceUI.java 2010-07-27 08:18:54 UTC (rev 23742) @@ -10,38 +10,113 @@ ******************************************************************************/ package org.jboss.tools.as.rse.ui; +import org.eclipse.rse.core.RSECorePlugin; +import org.eclipse.rse.core.model.IHost; +import org.eclipse.rse.ui.widgets.SystemHostCombo; import org.eclipse.swt.SWT; +import org.eclipse.swt.events.ModifyEvent; +import org.eclipse.swt.events.ModifyListener; import org.eclipse.swt.layout.FillLayout; import org.eclipse.swt.layout.FormLayout; +import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Label; +import org.eclipse.swt.widgets.Text; +import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime; +import org.jboss.ide.eclipse.as.core.util.ServerConverter; +import org.jboss.ide.eclipse.as.rse.core.IRSEConstants; import org.jboss.ide.eclipse.as.ui.UIUtil; import org.jboss.ide.eclipse.as.ui.editor.IDeploymentTypeUI; -import org.jboss.ide.eclipse.as.ui.editor.ModuleDeploymentPage; +import org.jboss.ide.eclipse.as.ui.editor.ServerModeSection; +import org.jboss.ide.eclipse.as.ui.editor.ServerModeSection.ChangeServerPropertyCommand; public class RSEDeploymentPreferenceUI implements IDeploymentTypeUI { - public RSEDeploymentPreferenceUI() { - // TODO Auto-generated constructor stub + // Do nothing } @Override public void fillComposite(Composite parent, - ModuleDeploymentPage page) { + ServerModeSection modeSection) { parent.setLayout(new FillLayout()); - new RSEDeploymentPreferenceComposite(parent, SWT.NONE, page); + new RSEDeploymentPreferenceComposite(parent, SWT.NONE, modeSection); } public static class RSEDeploymentPreferenceComposite extends Composite { - private ModuleDeploymentPage page; - public RSEDeploymentPreferenceComposite(Composite parent, int style, ModuleDeploymentPage page) { + private ServerModeSection modeSection; + private SystemHostCombo combo; + private Text rseServerHome,rseServerConfig; + public RSEDeploymentPreferenceComposite(Composite parent, int style, ServerModeSection modeSection) { super(parent, style); - this.page = page; + this.modeSection = modeSection; setLayout(new FormLayout()); - Label l = new Label(this, SWT.NONE); - l.setLayoutData(UIUtil.createFormData2(0, 5, 0,70,0,5,100,-5)); - l.setText("This belongs to rse"); + Composite child = new Composite(this, SWT.None); + child.setLayoutData(UIUtil.createFormData2(0, 0, null, 0, 0, 5, 100, 0)); + child.setLayout(new GridLayout()); + String current = modeSection.getServer().getAttribute(IRSEConstants.RSE_SERVER_HOST, IRSEConstants.RSE_SERVER_DEFAULT_HOST); + combo = new SystemHostCombo(child, SWT.NULL, findHost(current), false, + /* ISubSystemConfigurationCategories.SUBSYSTEM_CATEGORY_FILES*/ + "files"); + combo.addModifyListener(new ModifyListener() { + public void modifyText(ModifyEvent e) { + rseHostChanged(); + } + }); + Label serverHomeLabel = new Label(this, SWT.NONE); + serverHomeLabel.setText("Remote Server Home: "); + rseServerHome = new Text(this, SWT.SINGLE | SWT.BORDER); + serverHomeLabel.setLayoutData(UIUtil.createFormData2(child, 7, null, 0, 0, 10, null, 0)); + rseServerHome.setLayoutData(UIUtil.createFormData2(child, 5, null, 0, serverHomeLabel, 5, 100, -5)); + rseServerHome.setText(modeSection.getServer().getAttribute(IRSEConstants.RSE_SERVER_HOME_DIR, + getRuntime().getRuntime().getLocation().toString())); + rseServerHome.addModifyListener(new ModifyListener(){ + public void modifyText(ModifyEvent e) { + serverHomeChanged(); + }}); + + Label serverConfigLabel = new Label(this, SWT.NONE); + serverConfigLabel.setText("Remote Server Configuration: "); + rseServerConfig= new Text(this, SWT.SINGLE | SWT.BORDER); + serverConfigLabel.setLayoutData(UIUtil.createFormData2(rseServerHome, 7, null, 0, 0, 10, null, 0)); + rseServerConfig.setLayoutData(UIUtil.createFormData2(rseServerHome, 5, null, 0, serverConfigLabel, 5, 100, -5)); + rseServerConfig.setText(modeSection.getServer().getAttribute(IRSEConstants.RSE_SERVER_CONFIG, + getRuntime().getJBossConfiguration())); + rseServerConfig.addModifyListener(new ModifyListener(){ + public void modifyText(ModifyEvent e) { + serverConfigChanged(); + }}); +} + + protected IJBossServerRuntime getRuntime() { + return ServerConverter.getJBossRuntime(modeSection.getServer().getOriginal()); } + + protected void rseHostChanged() { + modeSection.getCommandManager().execute(new ChangeServerPropertyCommand( + modeSection.getServer(), IRSEConstants.RSE_SERVER_HOST, combo.getHost().getAliasName(), + "Change RSE Host")); + } + + protected void serverHomeChanged() { + modeSection.getCommandManager().execute(new ChangeServerPropertyCommand( + modeSection.getServer(), IRSEConstants.RSE_SERVER_HOME_DIR, rseServerHome.getText(), + "Change RSE Server's Home Directory")); + } + + protected void serverConfigChanged() { + modeSection.getCommandManager().execute(new ChangeServerPropertyCommand( + modeSection.getServer(), IRSEConstants.RSE_SERVER_CONFIG, rseServerConfig.getText(), + "Change RSE Server's Configuration")); + } + + public IHost findHost(String name) { + IHost[] hosts = RSECorePlugin.getTheSystemRegistry().getHosts(); + for( int i = 0; i < hosts.length; i++ ) { + if( hosts[i].getAliasName().equals(name)) + return hosts[i]; + } + return null; + } } Modified: workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml =================================================================== --- workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml 2010-07-27 08:18:16 UTC (rev 23741) +++ workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml 2010-07-27 08:18:54 UTC (rev 23742) @@ -175,6 +175,12 @@ insertionId="org.eclipse.wst.server.editor.overview.left" order="10" typeIds="%AllJBossServerTypes"/> + <section + class="org.jboss.ide.eclipse.as.ui.editor.ServerModeSection" + id="org.jboss.ide.eclipse.as.ui.editor.serverModeSection" + insertionId="org.eclipse.wst.server.editor.overview.left" + order="9" + typeIds="%AllJBossServerTypes"/> </extension>