JBoss Tools SVN: r42487 - branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2012-07-10 10:44:38 -0400 (Tue, 10 Jul 2012)
New Revision: 42487
Modified:
branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java
branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPageModel.java
branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/GitCloningSettingsWizardPage.java
branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/GitCloningSettingsWizardPageModel.java
branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizardModel.java
branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ProjectAndServerAdapterSettingsWizardPage.java
branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ProjectAndServerAdapterSettingsWizardPageModel.java
Log:
[JBIDE-11310] resetting models when user switches the openshift user
Modified: branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java
===================================================================
--- branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java 2012-07-10 06:59:43 UTC (rev 42486)
+++ branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java 2012-07-10 14:44:38 UTC (rev 42487)
@@ -18,8 +18,6 @@
import org.eclipse.core.databinding.UpdateListStrategy;
import org.eclipse.core.databinding.beans.BeanProperties;
import org.eclipse.core.databinding.conversion.Converter;
-import org.eclipse.core.databinding.observable.list.IObservableList;
-import org.eclipse.core.databinding.observable.list.WritableList;
import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.core.databinding.observable.value.IValueChangeListener;
import org.eclipse.core.databinding.observable.value.ValueChangeEvent;
@@ -36,6 +34,7 @@
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.dialogs.ErrorDialog;
import org.eclipse.jface.dialogs.IDialogConstants;
+import org.eclipse.jface.dialogs.PageChangingEvent;
import org.eclipse.jface.fieldassist.AutoCompleteField;
import org.eclipse.jface.fieldassist.ControlDecoration;
import org.eclipse.jface.fieldassist.FieldDecoration;
@@ -161,6 +160,9 @@
ValueBindingBuilder.bind(existingAppNameTextObservable).to(existingAppNameModelObservable).in(dbc);
UIUtils.focusOnSelection(useExistingAppBtn, existingAppNameText);
createExistingAppNameContentAssist();
+ useExistingAppBtnSelection.addValueChangeListener(
+ onUseExistingApplication(
+ newAppConfigurationGroup, existingAppNameText, browseAppsButton));
this.browseAppsButton = new Button(existingAppSelectionGroup, SWT.NONE);
browseAppsButton.setText("Browse...");
@@ -236,11 +238,6 @@
GridDataFactory.fillDefaults()
.grab(true, true).align(SWT.FILL, SWT.FILL).applyTo(newAppConfigurationGroup);
- IObservableValue useExistingApplication = WidgetProperties.selection().observe(useExistingAppBtn);
- useExistingApplication.addValueChangeListener(
- onUseExistingApplication(
- newAppConfigurationGroup, existingAppNameText, browseAppsButton));
-
final Label newAppNameLabel = new Label(newAppConfigurationGroup, SWT.NONE);
newAppNameLabel.setText("Name:");
GridDataFactory.fillDefaults().align(SWT.FILL, SWT.CENTER).applyTo(newAppNameLabel);
@@ -661,25 +658,32 @@
@Override
protected void onPageActivated(final DataBindingContext dbc) {
+
if (ensureHasDomain()) {
- new Thread() {
- public void run() {
- Display.getDefault().asyncExec(new Runnable() {
- public void run() {
- loadOpenshiftResources(dbc);
- enableApplicationWidgets(pageModel.isUseExistingApplication());
- createExistingAppNameContentAssist();
- // this is needed because of weird issues with UI
- // not reacting to model changes while wizard
- // runnable is run. We force another update
- dbc.updateModels();
- }
- });
- }
- }.start();
+ enableApplicationWidgets(pageModel.isUseExistingApplication());
+ createExistingAppNameContentAssist();
+ // this is needed because of weird issues with UI
+ // not reacting to model changes while wizard
+ // runnable is run. We force another update
+ //dbc.updateModels();
+ this.newAppNameText.setFocus();
}
}
+ @Override
+ protected void onPageWillGetActivated(Direction direction, PageChangingEvent event, DataBindingContext dbc) {
+ if(direction == Direction.FORWARDS) {
+ try {
+ pageModel.reset(); // needs to be done before loading resources, otherwise: dbc.updateModels() will be called and old data could be restored
+ loadOpenshiftResources(dbc);
+ dbc.updateTargets();
+ setPageComplete(false);
+ } catch (OpenShiftException e) {
+ Logger.error("Failed to reset page fields", e);
+ }
+ }
+ }
+
/**
* Checks that the user has a domain, opens the creation dialog in case he
* hasn't, closes the wizard if the user does not create a domain (required
@@ -718,60 +722,28 @@
protected void loadOpenshiftResources(final DataBindingContext dbc) {
try {
- WizardUtils.runInWizard(new Job("Loading existing applications...") {
+ WizardUtils.runInWizard(new Job("Loading data...") {
@Override
protected IStatus run(IProgressMonitor monitor) {
try {
+ monitor.setTaskName("Loading existing applications...");
pageModel.loadExistingApplications();
- return Status.OK_STATUS;
- } catch (NotFoundOpenShiftException e) {
- return Status.OK_STATUS;
- } catch (Exception e) {
- return OpenShiftUIActivator.createErrorStatus("Could not load applications", e);
- }
- }
-
- }, getContainer(), dbc);
-
- WizardUtils.runInWizard(new Job("Loading application cartridges...") {
- @Override
- protected IStatus run(IProgressMonitor monitor) {
- try {
+ monitor.setTaskName("Loading application cartridges...");
pageModel.loadStandaloneCartridges();
- return Status.OK_STATUS;
- } catch (NotFoundOpenShiftException e) {
- return Status.OK_STATUS;
- } catch (Exception e) {
- return OpenShiftUIActivator.createErrorStatus("Could not load application cartridges", e);
- }
- }
- }, getContainer(), dbc);
- WizardUtils.runInWizard(new Job("Loading embeddable cartridges...") {
- @Override
- protected IStatus run(IProgressMonitor monitor) {
- try {
+ monitor.setTaskName("Loading embeddable cartridges...");
setViewerInput(pageModel.loadEmbeddedCartridges());
- return Status.OK_STATUS;
- } catch (NotFoundOpenShiftException e) {
- return Status.OK_STATUS;
- } catch (Exception e) {
- return OpenShiftUIActivator.createErrorStatus("Could not load embeddable cartridges", e);
- }
- }
- }, getContainer(), dbc);
- WizardUtils.runInWizard(new Job("Loading gear sizes...") {
- @Override
- protected IStatus run(IProgressMonitor monitor) {
- try {
+ monitor.setTaskName("Loading gear profiles...");
pageModel.loadGearProfiles();
return Status.OK_STATUS;
} catch (NotFoundOpenShiftException e) {
return Status.OK_STATUS;
} catch (Exception e) {
- return OpenShiftUIActivator.createErrorStatus("Could not load gear sizes", e);
+ return OpenShiftUIActivator.createErrorStatus("Could not load applications", e);
}
}
+
}, getContainer(), dbc);
+
} catch (Exception ex) {
// ignore
}
@@ -819,16 +791,8 @@
}
return ValidationStatus.ok();
-
}
- @Override
- public IObservableList getTargets() {
- WritableList targets = new WritableList();
- targets.add(existingAppNameTextObservable);
- return targets;
- }
-
}
class NewApplicationNameValidator extends MultiValidator {
@@ -863,12 +827,6 @@
return ValidationStatus.ok();
}
- @Override
- public IObservableList getTargets() {
- WritableList targets = new WritableList();
- targets.add(applicationNameObservable);
- return targets;
- }
}
/**
@@ -879,18 +837,18 @@
*/
class NewApplicationTypeValidator extends MultiValidator {
- private final IObservableValue useExistingAppBtnbservable;
+ private final IObservableValue useExistingAppBtnObservable;
private final IObservableValue selectedApplicationTypeObservable;
public NewApplicationTypeValidator(IObservableValue useExistingAppBtnbservable,
IObservableValue selectedApplicationTypeObservable) {
- this.useExistingAppBtnbservable = useExistingAppBtnbservable;
+ this.useExistingAppBtnObservable = useExistingAppBtnbservable;
this.selectedApplicationTypeObservable = selectedApplicationTypeObservable;
}
@Override
protected IStatus validate() {
- final boolean useExistingApp = (Boolean) useExistingAppBtnbservable.getValue();
+ final boolean useExistingApp = (Boolean) useExistingAppBtnObservable.getValue();
final Integer selectedCartridgeIndex = (Integer) selectedApplicationTypeObservable.getValue();
if (useExistingApp) {
return ValidationStatus.ok();
@@ -902,12 +860,6 @@
return ValidationStatus.ok();
}
- @Override
- public IObservableList getTargets() {
- WritableList targets = new WritableList();
- targets.add(selectedApplicationTypeObservable);
- return targets;
- }
}
protected void setupWizardPageSupport(DataBindingContext dbc) {
Modified: branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPageModel.java
===================================================================
--- branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPageModel.java 2012-07-10 06:59:43 UTC (rev 42486)
+++ branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPageModel.java 2012-07-10 14:44:38 UTC (rev 42487)
@@ -146,7 +146,7 @@
*
* @see #doSetExistingApplication(IApplication)
*/
- public void setExistingApplicationName(String applicationName) throws OpenShiftException {
+ public void setExistingApplicationName(String applicationName) throws OpenShiftException {
firePropertyChange(PROPERTY_EXISTING_APPLICATION_NAME
, this.existingApplicationName, this.existingApplicationName = applicationName);
@@ -325,7 +325,9 @@
public void setExistingApplication(IApplication application) throws OpenShiftException {
if (application != null) {
setExistingApplicationName(application.getName());
- doSetExistingApplication(application);
+ //doSetExistingApplication(application); // already called within setExistingApplicationName(String) above
+ } else {
+ setExistingApplicationName(null);
}
}
@@ -353,10 +355,6 @@
}
}
- public void resetExistingApplication() throws OpenShiftException, SocketTimeoutException {
- setExistingApplication((IApplication) null);
- }
-
public void setApplicationName(String applicationName) {
firePropertyChange(PROPERTY_APPLICATION_NAME
, wizardModel.getApplicationName()
@@ -426,4 +424,12 @@
public IDomain getDomain() throws SocketTimeoutException, OpenShiftException {
return wizardModel.getUser().getDefaultDomain();
}
+
+ public void reset() throws OpenShiftException {
+ setApplicationName(wizardModel.getApplication());
+ setExistingApplication(wizardModel.getApplication());
+ setUseExistingApplication(wizardModel.isUseExistingApplication());
+ setSelectedEmbeddableCartridges(wizardModel.getSelectedEmbeddableCartridges());
+ }
+
}
Modified: branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/GitCloningSettingsWizardPage.java
===================================================================
--- branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/GitCloningSettingsWizardPage.java 2012-07-10 06:59:43 UTC (rev 42486)
+++ branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/GitCloningSettingsWizardPage.java 2012-07-10 14:44:38 UTC (rev 42487)
@@ -12,8 +12,6 @@
import org.eclipse.core.databinding.DataBindingContext;
import org.eclipse.core.databinding.beans.BeanProperties;
-import org.eclipse.core.databinding.observable.list.IObservableList;
-import org.eclipse.core.databinding.observable.list.WritableList;
import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.core.databinding.validation.MultiValidator;
import org.eclipse.core.databinding.validation.ValidationStatus;
@@ -24,6 +22,7 @@
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Status;
import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.dialogs.PageChangingEvent;
import org.eclipse.jface.layout.GridDataFactory;
import org.eclipse.jface.layout.GridLayoutFactory;
import org.eclipse.jface.wizard.IWizardPage;
@@ -223,7 +222,17 @@
protected void onPageActivated(DataBindingContext dbc) {
enableWidgets(pageModel.isNewProject());
}
+
+
+ @Override
+ protected void onPageWillGetActivated(Direction direction, PageChangingEvent event, DataBindingContext dbc) {
+ if(direction == Direction.FORWARDS) {
+ pageModel.reset();
+ dbc.updateTargets();
+ }
+ }
+
private void enableWidgets(boolean isNewProject) {
if (isNewProject) {
useDefaultRepoPathButton.setEnabled(true);
@@ -280,13 +289,6 @@
return ValidationStatus.ok();
}
- @Override
- public IObservableList getTargets() {
- WritableList targets = new WritableList();
- targets.add(repoPathObservable);
- return targets;
- }
-
}
/**
@@ -334,12 +336,13 @@
private boolean hasRemoteName(String remoteName, IProject project) {
try {
- if (project == null
- || !project.isAccessible()) {
+ if (project == null || !project.isAccessible()) {
return false;
}
-
Repository repository = EGitUtils.getRepository(project);
+ if(repository == null) {
+ return false;
+ }
return EGitUtils.hasRemote(remoteName, repository);
} catch (Exception e) {
OpenShiftUIActivator.log(OpenShiftUIActivator.createErrorStatus(e.getMessage(), e));
@@ -347,12 +350,6 @@
}
}
- @Override
- public IObservableList getTargets() {
- WritableList targets = new WritableList();
- targets.add(remoteNameObservable);
- return targets;
- }
}
}
Modified: branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/GitCloningSettingsWizardPageModel.java
===================================================================
--- branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/GitCloningSettingsWizardPageModel.java 2012-07-10 06:59:43 UTC (rev 42486)
+++ branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/GitCloningSettingsWizardPageModel.java 2012-07-10 14:44:38 UTC (rev 42487)
@@ -173,5 +173,10 @@
public boolean isUseDefaultRemoteName() {
return useDefaultRemoteName;
}
+
+ public void reset() {
+ setRemoteName(wizardModel.getRemoteName());
+ setRepositoryPath(wizardModel.getRepositoryPath());
+ }
}
Modified: branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizardModel.java
===================================================================
--- branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizardModel.java 2012-07-10 06:59:43 UTC (rev 42486)
+++ branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizardModel.java 2012-07-10 14:44:38 UTC (rev 42487)
@@ -39,6 +39,12 @@
private static final String KEY_SELECTED_EMBEDDABLE_CARTRIDGES = "selectedEmbeddableCartridges";
+ private static final String DEFAULT_APPLICATION = "default_application";
+
+ private static final String DEFAULT_PROJECT = "default_project";
+
+ private static final String DEFAULT_USE_EXISTING_APPLICATION = "default_useExistingApplication";
+
public OpenShiftExpressApplicationWizardModel(UserDelegate user) {
this(user, null, null, false);
}
@@ -46,15 +52,10 @@
public OpenShiftExpressApplicationWizardModel(UserDelegate user, IProject project, IApplication application,
boolean useExistingApplication) {
// default value(s)
+ setDefaultProject(project);
+ setDefaultApplication(application);
+ setDefaultUseExistingApplication(useExistingApplication);
setUser(user);
- setProject(project);
- setNewProject(true);
- setApplication(application);
- setUseExistingApplication(useExistingApplication);
- setCreateServerAdapter(true);
- setRepositoryPath(DEFAULT_REPOSITORY_PATH);
- setRemoteName(NEW_PROJECT_REMOTE_NAME_DEFAULT);
- setServerType(ServerCore.findServerType(ExpressServerUtils.OPENSHIFT_SERVER_TYPE));
}
/**
@@ -198,6 +199,15 @@
return (IApplication) getProperty(APPLICATION);
}
+ public void setDefaultApplication(IApplication application) {
+ setProperty(DEFAULT_APPLICATION, application);
+ setApplication(application);
+ }
+
+ public IApplication getDefaultApplication() {
+ return (IApplication)getProperty(DEFAULT_APPLICATION);
+ }
+
@Override
public void setApplication(IApplication application) {
setProperty(APPLICATION, application);
@@ -206,7 +216,6 @@
setApplicationName(application);
setApplicationScaling(application);
setApplicationGearProfile(application);
-
}
@Override
@@ -255,6 +264,16 @@
return (String) setProperty(PROJECT_NAME, projectName);
}
+ public IProject setDefaultProject(IProject project) {
+ setProperty(DEFAULT_PROJECT, project);
+ setProject(project);
+ return project;
+ }
+
+ public IProject getDefaultProject() {
+ return (IProject)getProperty(DEFAULT_PROJECT);
+ }
+
@Override
public IProject setProject(IProject project) {
if (project != null && project.exists()) {
@@ -327,6 +346,20 @@
return (Boolean) getProperty(USE_EXISTING_APPLICATION);
}
+ public boolean setDefaultUseExistingApplication(boolean useExistingApplication) {
+ setProperty(DEFAULT_USE_EXISTING_APPLICATION, useExistingApplication);
+ setUseExistingApplication(useExistingApplication);
+ return useExistingApplication;
+ }
+
+ public boolean getDefaultUseExistingApplication() {
+ Object useExistingApp = getProperty(DEFAULT_USE_EXISTING_APPLICATION);
+ if(useExistingApp != null) {
+ return (Boolean)useExistingApp;
+ }
+ return false;
+ }
+
@Override
public boolean setUseExistingApplication(boolean useExistingApplication) {
Boolean isUseExistingApplication = (Boolean) setProperty(USE_EXISTING_APPLICATION, useExistingApplication);
@@ -429,9 +462,22 @@
@Override
public UserDelegate setUser(UserDelegate user) {
- return (UserDelegate) setProperty(USER, user);
+ setProperty(USER, user);
+ resetWizardModel();
+ return user;
}
-
+
+ public void resetWizardModel() {
+ setApplication(getDefaultApplication());
+ setUseExistingApplication(getDefaultUseExistingApplication());
+ setSelectedEmbeddableCartridges(new HashSet<IEmbeddableCartridge>());
+ setNewProject(true);
+ setCreateServerAdapter(true);
+ setRepositoryPath(IOpenShiftExpressWizardModel.DEFAULT_REPOSITORY_PATH);
+ setRemoteName(IOpenShiftExpressWizardModel.NEW_PROJECT_REMOTE_NAME_DEFAULT);
+ setServerType(ServerCore.findServerType(ExpressServerUtils.OPENSHIFT_SERVER_TYPE));
+ }
+
@Override
public void addUserToModel() {
UserDelegate user = getUser();
Modified: branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ProjectAndServerAdapterSettingsWizardPage.java
===================================================================
--- branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ProjectAndServerAdapterSettingsWizardPage.java 2012-07-10 06:59:43 UTC (rev 42486)
+++ branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ProjectAndServerAdapterSettingsWizardPage.java 2012-07-10 14:44:38 UTC (rev 42487)
@@ -15,8 +15,6 @@
import org.eclipse.core.databinding.DataBindingContext;
import org.eclipse.core.databinding.beans.BeanProperties;
-import org.eclipse.core.databinding.observable.list.IObservableList;
-import org.eclipse.core.databinding.observable.list.WritableList;
import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.core.databinding.validation.MultiValidator;
import org.eclipse.core.resources.IProject;
@@ -27,6 +25,7 @@
import org.eclipse.jface.databinding.swt.ISWTObservableValue;
import org.eclipse.jface.databinding.swt.WidgetProperties;
import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.dialogs.PageChangingEvent;
import org.eclipse.jface.fieldassist.AutoCompleteField;
import org.eclipse.jface.fieldassist.ControlDecoration;
import org.eclipse.jface.fieldassist.FieldDecoration;
@@ -217,6 +216,7 @@
return serverAdapterGroup;
}
+ @SuppressWarnings("unused")
private WorkingSetGroup createWorkingSetGroup(Composite container, DataBindingContext dbc) {
return new WorkingSetGroup(container, null, new String[] { "org.eclipse.ui.resourceWorkingSetPage", //$NON-NLS-1$
"org.eclipse.jdt.ui.JavaWorkingSetPage" /* JavaWorkingSetUpdater.ID */});
@@ -301,22 +301,24 @@
}
return status;
}
-
- @Override
- public IObservableList getTargets() {
- WritableList targets = new WritableList();
- targets.add(projectNameObservable);
- return targets;
- }
}
@Override
protected void onPageActivated(DataBindingContext dbc) {
setPageTitle();
+ dbc.updateTargets();
}
-
+
private void setPageTitle() {
setTitle(NLS.bind(PAGE_TITLE_FORMAT, pageModel.getApplicationName()));
}
+
+ @Override
+ protected void onPageWillGetActivated(Direction direction, PageChangingEvent event, DataBindingContext dbc) {
+ if(direction == Direction.FORWARDS) {
+ pageModel.reset();
+ }
+ }
+
}
Modified: branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ProjectAndServerAdapterSettingsWizardPageModel.java
===================================================================
--- branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ProjectAndServerAdapterSettingsWizardPageModel.java 2012-07-10 06:59:43 UTC (rev 42486)
+++ branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ProjectAndServerAdapterSettingsWizardPageModel.java 2012-07-10 14:44:38 UTC (rev 42487)
@@ -85,4 +85,10 @@
public String getApplicationName() {
return wizardModel.getApplicationName();
}
+
+ public void reset() {
+ setNewProject(!wizardModel.isExistingProject());
+ setProjectName(wizardModel.getProjectName());
+ setCreateServerAdapter(wizardModel.isCreateServerAdapter());
+ }
}
13 years, 9 months
JBoss Tools SVN: r42486 - in trunk/as: plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server and 4 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-07-10 02:59:43 -0400 (Tue, 10 Jul 2012)
New Revision: 42486
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/AbstractServerToolsPublisher.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/LocalPublishMethod.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PublishUtil.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBossServerPublishMethod.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/DeploymentPreferenceLoader.java
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEPublishMethod.java
trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/ASTestSuite.java
trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/MockPublishMethod.java
Log:
JBIDE-12101 to trunk
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/AbstractServerToolsPublisher.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/AbstractServerToolsPublisher.java 2012-07-10 06:07:49 UTC (rev 42485)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/AbstractServerToolsPublisher.java 2012-07-10 06:59:43 UTC (rev 42486)
@@ -134,6 +134,11 @@
return PublishUtil.getDeployPath(publishMethod, moduleTree, server);
}
+ protected IPath getTempDeployPath(IModule[] moduleTree, IDeployableServer server) {
+ return PublishUtil.getTempDeployPath(publishMethod, moduleTree, server);
+ }
+
+
/**
* Gets the actual deploy path for this module's parent
* Given modules *MUST* be of length 2 or more
@@ -167,10 +172,15 @@
protected void finishPublish(int publishType, IModule[] moduleTree, IDeployableServer server, IProgressMonitor monitor){
}
+
protected IPublishCopyCallbackHandler getCallbackHandler(IPath path) {
return publishMethod.getCallbackHandler(path, server.getServer());
}
-
+
+ protected IPublishCopyCallbackHandler getCallbackHandler(IPath deployPath, IPath tempDeployPath) {
+ return publishMethod.getCallbackHandler(deployPath, tempDeployPath, server.getServer());
+ }
+
/**
* For certain module trees, some publishers may want to force a child to be zipped.
* For example, JST Publisher may want to force utility project children to be zipped.
@@ -191,7 +201,11 @@
Trace.trace(Trace.STRING_FINER, "Begin Handling a full publish for module " + module.getName()); //$NON-NLS-1$
IPath deployPath = getDeployPath(moduleTree, server);
- IPublishCopyCallbackHandler callback = getCallbackHandler(getRootPath(deployPath).append(deployPath));
+ IPath dPathSafe = getRootPath(deployPath).append(deployPath);
+ IPath tempDeployPath = getTempDeployPath(moduleTree, server);
+ IPath dTempPathSafe = getRootPath(tempDeployPath).append(tempDeployPath);
+
+ IPublishCopyCallbackHandler callback = getCallbackHandler(dPathSafe, dTempPathSafe);
IModuleResource[] members = PublishUtil.getResources(module, getSubMon(monitor, 200));
if( monitor.isCanceled())
@@ -399,11 +413,16 @@
monitor.beginTask("Copying Child Module: " + moduleTree[moduleTree.length-1].getName(), 100); //$NON-NLS-1$
try {
IPath destinationPath = getDeployPath(moduleTree, server);
+ IPath tempDeployPath = getTempDeployPath(moduleTree, server);
IPath destinationFolder = destinationPath.removeLastSegments(1);
+ IPath tempDeployFolder = tempDeployPath.removeLastSegments(1);
+ IPath safeDest = getRootPath(destinationFolder).append(destinationFolder);
+ IPath safeTempDest = getRootPath(tempDeployFolder).append(tempDeployFolder);
+
IModuleResource[] members = PublishUtil.getResources(moduleTree);
File source = PublishUtil.getFile(members[0]);
if( source != null ) {
- IPublishCopyCallbackHandler handler = getCallbackHandler(getRootPath(destinationFolder).append(destinationFolder));
+ IPublishCopyCallbackHandler handler = getCallbackHandler(safeDest, safeTempDest);
IPath localFilePath = new Path(source.getAbsolutePath());
ModuleFile mf = new ModuleFile(localFilePath.toFile(), localFilePath.lastSegment(), localFilePath);
handler.copyFile(mf, new Path(destinationPath.lastSegment()), new NullProgressMonitor());
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/LocalPublishMethod.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/LocalPublishMethod.java 2012-07-10 06:07:49 UTC (rev 42485)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/LocalPublishMethod.java 2012-07-10 06:59:43 UTC (rev 42486)
@@ -33,13 +33,25 @@
public IPublishCopyCallbackHandler getCallbackHandler(IPath path, IServer server) {
IDeployableServer ds = ServerConverter.getDeployableServer(server);
String tempDeployPath = ds.getTempDeployFolder();
- LocalCopyCallback handler = new LocalCopyCallback(server,
- path, new Path(tempDeployPath));
+ return getCallbackHandler(path, new Path(tempDeployPath), server);
+ }
+
+ public IPublishCopyCallbackHandler getCallbackHandler(IPath deployPath,
+ IPath tmpFolder, IServer server) {
+ LocalCopyCallback handler = new LocalCopyCallback(
+ server, deployPath, tmpFolder);
return handler;
}
+
public String getPublishDefaultRootFolder(IServer server) {
IDeployableServer s = ServerConverter.getDeployableServer(server);
return s.getDeployFolder();
}
+
+ public String getPublishDefaultRootTempFolder(IServer server) {
+ IDeployableServer s = ServerConverter.getDeployableServer(server);
+ return s.getTempDeployFolder();
+ }
+
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PublishUtil.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PublishUtil.java 2012-07-10 06:07:49 UTC (rev 42485)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PublishUtil.java 2012-07-10 06:59:43 UTC (rev 42486)
@@ -65,6 +65,8 @@
* All preferences are stored in the "local" setting as it was decided
* having to replicate deploy paths for each publish method was not good
*
+ * This API should be renamed, as it actually gets a value stored at a property key
+ *
* @param moduleTree
* @param server
* @param defaultFolder
@@ -77,6 +79,7 @@
server, defaultFolder, moduleProperty);
}
+ /* This api should be renamed */
public static String getDeployRootFolder(IModule[] moduleTree, String publishMethod,
IDeployableServer server, String defaultFolder, String moduleProperty) {
String folder = defaultFolder;
@@ -208,6 +211,14 @@
return PublishUtil.getDeployPath(moduleTree, folder, server);
}
+ public static IPath getTempDeployPath(IJBossServerPublishMethod method, IModule[] moduleTree, IDeployableServer server) {
+ String defaultFolder = method.getPublishDefaultRootTempFolder(server.getServer());
+ String folder = PublishUtil.getDeployRootFolder(
+ moduleTree, server, defaultFolder,
+ IJBossToolingConstants.LOCAL_DEPLOYMENT_TEMP_LOC);
+ return PublishUtil.getDeployPath(moduleTree, folder, server);
+ }
+
public static String getSuffix(String type) {
// TODO
// VirtualReferenceUtilities.INSTANCE. has utility methods to help!!
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBossServerPublishMethod.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBossServerPublishMethod.java 2012-07-10 06:07:49 UTC (rev 42485)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBossServerPublishMethod.java 2012-07-10 06:59:43 UTC (rev 42486)
@@ -34,7 +34,30 @@
*/
public int publishModule(DeployableServerBehavior behaviour, int kind, int deltaKind, IModule[] module, IProgressMonitor monitor) throws CoreException;
- // Methods moved from publishers into the publish method
- public IPublishCopyCallbackHandler getCallbackHandler(IPath path, IServer server);
+ /**
+ * Create a callback handler with the given deploy path and server.
+ * Use a default temporary folder as provided by the server's settings
+ */
+ public IPublishCopyCallbackHandler getCallbackHandler(IPath deployPath, IServer server);
+
+ /**
+ * Create a callback handler with the given deploy path and server.
+ * Use a default temporary folder as provided by the server's settings
+ */
+ public IPublishCopyCallbackHandler getCallbackHandler(IPath deployPath, IPath tmpFolder, IServer server);
+
+
+ /**
+ * Get the default root deploy folder for this server
+ * @param server
+ * @return
+ */
public String getPublishDefaultRootFolder(IServer server);
+
+ /**
+ * Get the default root TEMP deploy folder for this server
+ * @param server
+ * @return
+ */
+ public String getPublishDefaultRootTempFolder(IServer server);
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/DeploymentPreferenceLoader.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/DeploymentPreferenceLoader.java 2012-07-10 06:07:49 UTC (rev 42485)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/DeploymentPreferenceLoader.java 2012-07-10 06:59:43 UTC (rev 42486)
@@ -26,6 +26,7 @@
import org.eclipse.wst.server.core.IModule;
import org.eclipse.wst.server.core.IServer;
import org.eclipse.wst.server.core.IServerAttributes;
+import org.eclipse.wst.server.core.IServerWorkingCopy;
import org.eclipse.wst.server.core.internal.Server;
import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin;
import org.jboss.ide.eclipse.as.core.publishers.LocalPublishMethod;
@@ -64,6 +65,7 @@
return server.getAttribute(IDeployableServer.SERVER_MODE, defaultType);
}
+ @Deprecated
public static DeploymentPreferences loadPreferencesFromFile(IServer server) {
File f = getFile(server);
if( f.exists()) {
@@ -86,6 +88,7 @@
return new DeploymentPreferences(bis);
}
+ @Deprecated
public static void savePreferences(IServer server, DeploymentPreferences prefs) throws IOException {
File f = getFile(server);
prefs.getMemento().saveToFile(f.getAbsolutePath());
@@ -262,15 +265,19 @@
}
public static void savePreferencesToServerWorkingCopy(ServerAttributeHelper helper, DeploymentPreferences prefs) {
+ savePreferencesToServerWorkingCopy(helper.getWorkingCopy(), prefs);
+ }
+
+ public static void savePreferencesToServerWorkingCopy(IServerWorkingCopy wc, DeploymentPreferences prefs) {
try {
ByteArrayOutputStream bos = new ByteArrayOutputStream();
DeploymentPreferenceLoader.savePreferences(bos, prefs);
String asXML = new String(bos.toByteArray());
- helper.setAttribute(DeploymentPreferenceLoader.DEPLOYMENT_PREFERENCES_KEY, asXML);
+ wc.setAttribute(DeploymentPreferenceLoader.DEPLOYMENT_PREFERENCES_KEY, asXML);
} catch(IOException ioe) {
// Should never happen since this is a simple byte array output stream
JBossServerCorePlugin.log(new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID,
- "Could not save module deployment preferences to server " + helper.getServer().getName(), ioe)); //$NON-NLS-1$
+ "Could not save module deployment preferences to server " + wc.getOriginal().getName(), ioe)); //$NON-NLS-1$
}
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEPublishMethod.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEPublishMethod.java 2012-07-10 06:07:49 UTC (rev 42485)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEPublishMethod.java 2012-07-10 06:59:43 UTC (rev 42486)
@@ -244,6 +244,10 @@
public String getPublishDefaultRootFolder(IServer server) {
return getRemoteRootFolder().toString();
}
+ public String getPublishDefaultRootTempFolder(IServer server) {
+ // unsupported
+ return getPublishDefaultRootFolder(server);
+ }
private void launchCommandNoResult(DelegatingServerBehavior behaviour, int delay, String command) {
Trace.trace(Trace.STRING_FINER, "Launching remote command: " + command);
@@ -255,4 +259,11 @@
ServerLogger.getDefault().log(behaviour.getServer(), ce.getStatus());
}
}
+
+ public IPublishCopyCallbackHandler getCallbackHandler(IPath deployPath,
+ IPath tmpFolder, IServer server) {
+ // Currently RSE support does not copy files to a temporary folder and then renameTo.
+ // In fact, RSE support does not use any temporary folder at all.
+ return getCallbackHandler(deployPath, server);
+ }
}
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/ASTestSuite.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/ASTestSuite.java 2012-07-10 06:07:49 UTC (rev 42485)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/ASTestSuite.java 2012-07-10 06:59:43 UTC (rev 42486)
@@ -39,6 +39,7 @@
import org.jboss.ide.eclipse.as.test.publishing.v2.JSTDeployBinaryChildModuleTest;
import org.jboss.ide.eclipse.as.test.publishing.v2.JSTDeploymentTester;
import org.jboss.ide.eclipse.as.test.publishing.v2.JSTDeploymentWarUpdateXML;
+import org.jboss.ide.eclipse.as.test.publishing.v2.JSTModuleDeployFoldersTest;
import org.jboss.ide.eclipse.as.test.publishing.v2.Mock2FilterTest;
import org.jboss.ide.eclipse.as.test.publishing.v2.MockJSTPublisherTest;
import org.jboss.ide.eclipse.as.test.publishing.v2.MockJSTPublisherTestDynUtil;
@@ -86,6 +87,7 @@
suite.addTestSuite(TestEar5WithJBossRuntime.class);
suite.addTestSuite(JSTDeploymentTester.class);
suite.addTestSuite(JSTDeployBinaryChildModuleTest.class);
+ suite.addTestSuite(JSTModuleDeployFoldersTest.class);
suite.addTestSuite(SingleFileDeploymentTester.class);
suite.addTestSuite(JBossServerAPITest.class);
suite.addTestSuite(Mock2FilterTest.class);
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/MockPublishMethod.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/MockPublishMethod.java 2012-07-10 06:07:49 UTC (rev 42485)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/MockPublishMethod.java 2012-07-10 06:59:43 UTC (rev 42486)
@@ -28,27 +28,58 @@
public static final String PUBLISH_METHOD_ID = "mock";
public static final String MOCK_ROOT = "mockRoot";
+ public static final String MOCK_TEMP_ROOT = "mockTempRoot";
public static ArrayList<IPath> changed = new ArrayList<IPath>();
public static ArrayList<IPath> removed = new ArrayList<IPath>();
+ public static ArrayList<IPath> tempFiles = new ArrayList<IPath>();
public static ArrayList<IModuleFile> copiedFiles = new ArrayList<IModuleFile>();
+
+ protected static String expectedRoot = MOCK_ROOT;
+ protected static String expectedTempRoot = MOCK_TEMP_ROOT;
+
public IPublishCopyCallbackHandler getCallbackHandler(IPath path,
IServer server) {
- return new MockCopyCallbackHandler(path);
+ return new MockCopyCallbackHandler(path, null);
}
+ public IPublishCopyCallbackHandler getCallbackHandler(IPath deployPath,
+ IPath tmpFolder, IServer server) {
+ return new MockCopyCallbackHandler(deployPath, tmpFolder);
+ }
+
+
public String getPublishDefaultRootFolder(IServer server) {
return "/" + MOCK_ROOT;
}
+ public String getPublishDefaultRootTempFolder(IServer server) {
+ return "/" + MOCK_TEMP_ROOT;
+ }
+
+
+
+
public String getPublishMethodId() {
return PUBLISH_METHOD_ID;
}
public static void reset() {
changed.clear();
removed.clear();
+ tempFiles.clear();
copiedFiles.clear();
+ expectedRoot = MOCK_ROOT;
+ expectedTempRoot = MOCK_TEMP_ROOT;
}
+
+ public static void setExpectedRoot(String s) {
+ expectedRoot = s;
+ }
+
+ public static void setExpectedTempRoot(String s) {
+ expectedTempRoot = s;
+ }
+
public static IPath[] getRemoved() {
return (IPath[]) removed.toArray(new IPath[removed.size()]);
}
@@ -59,16 +90,24 @@
public static IPath[] getChanged() {
return (IPath[]) changed.toArray(new IPath[changed.size()]);
}
+ public static IPath[] getTempPaths() {
+ return (IPath[]) tempFiles.toArray(new IPath[tempFiles.size()]);
+ }
public class MockCopyCallbackHandler implements IPublishCopyCallbackHandler {
- private IPath root;
- public MockCopyCallbackHandler(IPath root) {
- if( !(new Path(MOCK_ROOT).isPrefixOf(root))) {
+ private IPath root, tempRoot;
+ public MockCopyCallbackHandler(IPath root, IPath tempRoot) {
+ if( !(new Path(expectedRoot).isPrefixOf(root))) {
System.out.println("Expected " + new Path(MOCK_ROOT) + " but got: " + root.toString());
throw new RuntimeException("Unacceptable use of callback handler");
}
+ if( tempRoot != null && !(new Path(expectedTempRoot).isPrefixOf(tempRoot))) {
+ System.out.println("Expected " + new Path(MOCK_TEMP_ROOT) + " but got: " + root.toString());
+ throw new RuntimeException("Unacceptable use of callback handler");
+ }
this.root = root;
+ this.tempRoot = tempRoot;
}
public IStatus[] deleteResource(IPath path, IProgressMonitor monitor)
@@ -102,6 +141,8 @@
IPath path2 = root.append(path);
if( !changed.contains(path2.makeRelative()))
changed.add(path2.makeRelative());
+ IPath tmpFile = (tempRoot == null ? root : tempRoot).append(path);
+ tempFiles.add(tmpFile);
copiedFiles.add(mf);
return new IStatus[]{};
}
13 years, 9 months
JBoss Tools SVN: r42485 - in branches/jbosstools-3.3.x/jsf/docs/userguide/en-US: images/preferences and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2012-07-10 02:07:49 -0400 (Tue, 10 Jul 2012)
New Revision: 42485
Modified:
branches/jbosstools-3.3.x/jsf/docs/userguide/en-US/Book_Info.xml
branches/jbosstools-3.3.x/jsf/docs/userguide/en-US/images/preferences/preferences_13.png
branches/jbosstools-3.3.x/jsf/docs/userguide/en-US/images/preferences/preferences_14.png
branches/jbosstools-3.3.x/jsf/docs/userguide/en-US/images/preferences/preferences_27.png
branches/jbosstools-3.3.x/jsf/docs/userguide/en-US/images/preferences/preferences_28.png
Log:
updated from trunk
Modified: branches/jbosstools-3.3.x/jsf/docs/userguide/en-US/Book_Info.xml
===================================================================
--- branches/jbosstools-3.3.x/jsf/docs/userguide/en-US/Book_Info.xml 2012-07-10 06:07:16 UTC (rev 42484)
+++ branches/jbosstools-3.3.x/jsf/docs/userguide/en-US/Book_Info.xml 2012-07-10 06:07:49 UTC (rev 42485)
@@ -5,9 +5,9 @@
<title>Visual Web Tools Reference Guide</title>
<subtitle>Provides information relating to the Visual Web Tools module.</subtitle>
<productname>JBoss Developer Studio</productname>
-<productnumber>5.0.Beta</productnumber>
+<productnumber>5.0</productnumber>
<edition>5.0.0</edition>
-<pubsnumber>12</pubsnumber>
+<pubsnumber>13</pubsnumber>
<abstract>
<para>The Visual Web Tools Reference Guide explains extensive collection of specialized wizards, editors and views that can be used in various scenarios while developing Web applications.</para>
</abstract>
Modified: branches/jbosstools-3.3.x/jsf/docs/userguide/en-US/images/preferences/preferences_13.png
===================================================================
(Binary files differ)
Modified: branches/jbosstools-3.3.x/jsf/docs/userguide/en-US/images/preferences/preferences_14.png
===================================================================
(Binary files differ)
Modified: branches/jbosstools-3.3.x/jsf/docs/userguide/en-US/images/preferences/preferences_27.png
===================================================================
(Binary files differ)
Modified: branches/jbosstools-3.3.x/jsf/docs/userguide/en-US/images/preferences/preferences_28.png
===================================================================
(Binary files differ)
13 years, 9 months
JBoss Tools SVN: r42484 - trunk/jsf/docs/userguide/en-US.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2012-07-10 02:07:16 -0400 (Tue, 10 Jul 2012)
New Revision: 42484
Modified:
trunk/jsf/docs/userguide/en-US/Book_Info.xml
Log:
updated for brew
Modified: trunk/jsf/docs/userguide/en-US/Book_Info.xml
===================================================================
--- trunk/jsf/docs/userguide/en-US/Book_Info.xml 2012-07-10 05:23:05 UTC (rev 42483)
+++ trunk/jsf/docs/userguide/en-US/Book_Info.xml 2012-07-10 06:07:16 UTC (rev 42484)
@@ -5,7 +5,7 @@
<title>Visual Web Tools Reference Guide</title>
<subtitle>Provides information relating to the Visual Web Tools module.</subtitle>
<productname>JBoss Developer Studio</productname>
-<productnumber>5.0.Beta</productnumber>
+<productnumber>5.0</productnumber>
<edition>5.0.0</edition>
<pubsnumber>13</pubsnumber>
<abstract>
13 years, 9 months
JBoss Tools SVN: r42483 - in trunk/jsf/docs/userguide/en-US: images/preferences and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2012-07-10 01:23:05 -0400 (Tue, 10 Jul 2012)
New Revision: 42483
Modified:
trunk/jsf/docs/userguide/en-US/Book_Info.xml
trunk/jsf/docs/userguide/en-US/images/preferences/preferences_13.png
trunk/jsf/docs/userguide/en-US/images/preferences/preferences_14.png
trunk/jsf/docs/userguide/en-US/images/preferences/preferences_27.png
trunk/jsf/docs/userguide/en-US/images/preferences/preferences_28.png
Log:
updated with new screenshots for TOOLSDOC-2
Modified: trunk/jsf/docs/userguide/en-US/Book_Info.xml
===================================================================
--- trunk/jsf/docs/userguide/en-US/Book_Info.xml 2012-07-10 04:06:49 UTC (rev 42482)
+++ trunk/jsf/docs/userguide/en-US/Book_Info.xml 2012-07-10 05:23:05 UTC (rev 42483)
@@ -7,7 +7,7 @@
<productname>JBoss Developer Studio</productname>
<productnumber>5.0.Beta</productnumber>
<edition>5.0.0</edition>
-<pubsnumber>12</pubsnumber>
+<pubsnumber>13</pubsnumber>
<abstract>
<para>The Visual Web Tools Reference Guide explains extensive collection of specialized wizards, editors and views that can be used in various scenarios while developing Web applications.</para>
</abstract>
Modified: trunk/jsf/docs/userguide/en-US/images/preferences/preferences_13.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en-US/images/preferences/preferences_14.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en-US/images/preferences/preferences_27.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en-US/images/preferences/preferences_28.png
===================================================================
(Binary files differ)
13 years, 9 months
JBoss Tools SVN: r42480 - branches/jbosstools-3.3.x/documentation/guides/GettingStartedGuide/en-US.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2012-07-09 22:27:16 -0400 (Mon, 09 Jul 2012)
New Revision: 42480
Modified:
branches/jbosstools-3.3.x/documentation/guides/GettingStartedGuide/en-US/Book_Info.xml
branches/jbosstools-3.3.x/documentation/guides/GettingStartedGuide/en-US/jboss_perspective.xml
Log:
updated for TOOLSDOC-275
Modified: branches/jbosstools-3.3.x/documentation/guides/GettingStartedGuide/en-US/Book_Info.xml
===================================================================
--- branches/jbosstools-3.3.x/documentation/guides/GettingStartedGuide/en-US/Book_Info.xml 2012-07-10 02:26:34 UTC (rev 42479)
+++ branches/jbosstools-3.3.x/documentation/guides/GettingStartedGuide/en-US/Book_Info.xml 2012-07-10 02:27:16 UTC (rev 42480)
@@ -8,7 +8,7 @@
<productname>JBoss Developer Studio</productname>
<productnumber>5.0</productnumber>
<edition>5.0.0</edition>
-<pubsnumber>29</pubsnumber>
+<pubsnumber>30</pubsnumber>
<abstract>
<para>The Getting Started Guide explains the JBoss Developer Studio.</para>
</abstract>
Modified: branches/jbosstools-3.3.x/documentation/guides/GettingStartedGuide/en-US/jboss_perspective.xml
===================================================================
--- branches/jbosstools-3.3.x/documentation/guides/GettingStartedGuide/en-US/jboss_perspective.xml 2012-07-10 02:26:34 UTC (rev 42479)
+++ branches/jbosstools-3.3.x/documentation/guides/GettingStartedGuide/en-US/jboss_perspective.xml 2012-07-10 02:27:16 UTC (rev 42480)
@@ -12,7 +12,7 @@
</mediaobject>
</figure>
<para>
- The JBoss perspective views include: <guilabel>Project Explorer</guilabel>, <guilabel>JBoss Central</guilabel>, <guilabel>Outline</guilabel>, <guilabel>Palette</guilabel>, <guilabel>Properties</guilabel> and <guilabel>Servers</guilabel>.
+ The JBoss perspective views include: <guilabel>Project Explorer</guilabel>, <guilabel>Outline</guilabel>, <guilabel>Palette</guilabel>, <guilabel>Properties</guilabel> and <guilabel>Servers</guilabel>.
</para>
<para>
Certain menus also see a change in available items. These menus include <menuchoice>
13 years, 9 months
JBoss Tools SVN: r42479 - trunk/documentation/guides/GettingStartedGuide/en-US.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2012-07-09 22:26:34 -0400 (Mon, 09 Jul 2012)
New Revision: 42479
Modified:
trunk/documentation/guides/GettingStartedGuide/en-US/Book_Info.xml
trunk/documentation/guides/GettingStartedGuide/en-US/jboss_perspective.xml
Log:
updated for TOOLSDOC-275
Modified: trunk/documentation/guides/GettingStartedGuide/en-US/Book_Info.xml
===================================================================
--- trunk/documentation/guides/GettingStartedGuide/en-US/Book_Info.xml 2012-07-09 22:20:44 UTC (rev 42478)
+++ trunk/documentation/guides/GettingStartedGuide/en-US/Book_Info.xml 2012-07-10 02:26:34 UTC (rev 42479)
@@ -8,7 +8,7 @@
<productname>JBoss Developer Studio</productname>
<productnumber>5.0</productnumber>
<edition>5.0.0</edition>
-<pubsnumber>29</pubsnumber>
+<pubsnumber>30</pubsnumber>
<abstract>
<para>The Getting Started Guide explains the JBoss Developer Studio.</para>
</abstract>
Modified: trunk/documentation/guides/GettingStartedGuide/en-US/jboss_perspective.xml
===================================================================
--- trunk/documentation/guides/GettingStartedGuide/en-US/jboss_perspective.xml 2012-07-09 22:20:44 UTC (rev 42478)
+++ trunk/documentation/guides/GettingStartedGuide/en-US/jboss_perspective.xml 2012-07-10 02:26:34 UTC (rev 42479)
@@ -12,7 +12,7 @@
</mediaobject>
</figure>
<para>
- The JBoss perspective views include: <guilabel>Project Explorer</guilabel>, <guilabel>JBoss Central</guilabel>, <guilabel>Outline</guilabel>, <guilabel>Palette</guilabel>, <guilabel>Properties</guilabel> and <guilabel>Servers</guilabel>.
+ The JBoss perspective views include: <guilabel>Project Explorer</guilabel>, <guilabel>Outline</guilabel>, <guilabel>Palette</guilabel>, <guilabel>Properties</guilabel> and <guilabel>Servers</guilabel>.
</para>
<para>
Certain menus also see a change in available items. These menus include <menuchoice>
13 years, 9 months
JBoss Tools SVN: r42478 - in trunk/maven/tests: org.jboss.tools.maven.ui.bot.test/META-INF and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2012-07-09 18:20:44 -0400 (Mon, 09 Jul 2012)
New Revision: 42478
Modified:
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/META-INF/MANIFEST.MF
trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/META-INF/MANIFEST.MF
Log:
JBIDE-12293 : ensure compatibility with eclipse.org's m2e-wtp
Modified: trunk/maven/tests/org.jboss.tools.maven.configurators.tests/META-INF/MANIFEST.MF
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.configurators.tests/META-INF/MANIFEST.MF 2012-07-09 22:19:31 UTC (rev 42477)
+++ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/META-INF/MANIFEST.MF 2012-07-09 22:20:44 UTC (rev 42478)
@@ -35,7 +35,8 @@
org.eclipse.jpt.common.utility,
org.jboss.tools.cdi.core,
org.jboss.tools.maven.jdt,
- org.eclipse.ui.ide
+ org.eclipse.ui.ide,
+ org.eclipse.m2e.wtp;bundle-version="0.16.0"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Eclipse-RegisterBuddy: org.apache.log4j
Modified: trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/META-INF/MANIFEST.MF 2012-07-09 22:19:31 UTC (rev 42477)
+++ trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/META-INF/MANIFEST.MF 2012-07-09 22:20:44 UTC (rev 42478)
@@ -23,7 +23,8 @@
org.eclipse.wst.server.core,
org.jboss.tools.seam.core,
org.eclipse.datatools.connectivity,
- org.eclipse.datatools.connectivity.db.generic
+ org.eclipse.datatools.connectivity.db.generic,
+ org.eclipse.m2e.wtp;bundle-version="0.16.0"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Eclipse-RegisterBuddy: org.apache.log4j
13 years, 9 months
JBoss Tools SVN: r42477 - trunk/central/plugins/org.jboss.tools.central.discovery.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-07-09 18:19:31 -0400 (Mon, 09 Jul 2012)
New Revision: 42477
Modified:
trunk/central/plugins/org.jboss.tools.central.discovery/plugin.xml
Log:
fix order of Mylyn connectors in Central (JBDS-2219, JBDS-2220, JBDS-2221)
Modified: trunk/central/plugins/org.jboss.tools.central.discovery/plugin.xml
===================================================================
--- trunk/central/plugins/org.jboss.tools.central.discovery/plugin.xml 2012-07-09 22:16:37 UTC (rev 42476)
+++ trunk/central/plugins/org.jboss.tools.central.discovery/plugin.xml 2012-07-09 22:19:31 UTC (rev 42477)
@@ -283,11 +283,11 @@
<connectorDescriptor
categoryId="org.jboss.tools.central.discovery.scm"
groupId="org.jboss.tools.central.discovery.scm.git"
- description="Mylyn support for Git and GitHub"
+ description="Mylyn support for Eclipse EGit and GitHub"
id="org.eclipse.egit.mylyn"
kind="task"
license="Free, EPL"
- name="Mylyn support for Eclipse EGit + GitHub"
+ name="Eclipse EGit: Mylyn Support"
provider="eclipse.org"
siteUrl="http://download.jboss.org/jbosstools/updates/development/juno/central/core/">
<iu id="org.eclipse.jgit"/>
@@ -337,7 +337,7 @@
id="org.tigris.subversion.subclipse.mylyn"
kind="task"
license="Free, Subclipse License"
- name="Mylyn for Subclipse + SVNKit"
+ name="Subclipse + SVNKit: Mylyn Support"
provider="tigris.org"
siteUrl="http://download.jboss.org/jbosstools/updates/development/juno/central/core/">
<iu id="org.tigris.subversion.subclipse"/>
13 years, 9 months