JBoss Tools SVN: r41052 - in trunk/openshift: plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2012-05-16 06:44:57 -0400 (Wed, 16 May 2012)
New Revision: 41052
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/EmbedCartridgeStrategy.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPageModel.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeStrategyAdapter.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizardPageModel.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/IEmbedCartridgesWizardPageModel.java
trunk/openshift/tests/org.jboss.tools.openshift.express.test/src/org/jboss/tools/openshift/express/test/EmbedCartridgeStrategyTest.java
Log:
[JBIDE-11880] fixed NPE when trying to get the domain from the application when there was no application yet (was the case in the "new application wizard").
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/EmbedCartridgeStrategy.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/EmbedCartridgeStrategy.java 2012-05-16 10:43:54 UTC (rev 41051)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/EmbedCartridgeStrategy.java 2012-05-16 10:44:57 UTC (rev 41052)
@@ -20,6 +20,7 @@
import com.openshift.client.IApplication;
import com.openshift.client.ICartridge;
+import com.openshift.client.IDomain;
import com.openshift.client.IEmbeddableCartridge;
import com.openshift.client.OpenShiftException;
@@ -54,10 +55,10 @@
private Map<IEmbeddableCartridge, EmbeddableCartridgeRelations> dependenciesByCartridge;
private HashMap<IEmbeddableCartridge, Set<IEmbeddableCartridge>> dependantsByCartridge;
- private IApplication application;
+ private IDomain domain;
- public EmbedCartridgeStrategy(IApplication application) {
- this.application = application;
+ public EmbedCartridgeStrategy(IDomain domain) {
+ this.domain = domain;
initDependencyMaps(dependencies);
}
@@ -115,7 +116,7 @@
private void addRequiredApplication(EmbeddableCartridgeDiff diff,
EmbeddableCartridgeRelations relation) throws OpenShiftException {
if (relation.getRequiredApplication() != null
- && !application.getDomain().hasApplicationByCartridge(relation.getRequiredApplication())) {
+ && !domain.hasApplicationByCartridge(relation.getRequiredApplication())) {
diff.addApplicationAddition(relation.getRequiredApplication());
}
}
@@ -155,9 +156,9 @@
private static class EmbeddableCartridgeRelations {
+ private IEmbeddableCartridge subject;
private IEmbeddableCartridge conflicting;
private IEmbeddableCartridge required;
- private IEmbeddableCartridge subject;
private ICartridge requiredApplication;
protected EmbeddableCartridgeRelations(IEmbeddableCartridge cartridge,
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPageModel.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPageModel.java 2012-05-16 10:43:54 UTC (rev 41051)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPageModel.java 2012-05-16 10:44:57 UTC (rev 41052)
@@ -27,6 +27,7 @@
import com.openshift.client.ApplicationScale;
import com.openshift.client.IApplication;
import com.openshift.client.ICartridge;
+import com.openshift.client.IDomain;
import com.openshift.client.IEmbeddableCartridge;
import com.openshift.client.IGearProfile;
import com.openshift.client.OpenShiftException;
@@ -415,8 +416,9 @@
return getUser().hasApplication(applicationName);
}
- public IApplication getApplication() {
- return wizardModel.getApplication();
+ @Override
+ public IDomain getDomain() throws SocketTimeoutException, OpenShiftException {
+ return wizardModel.getUser().getDefaultDomain();
}
public IApplication createJenkinsApplication(String name, IProgressMonitor monitor) throws OpenShiftException {
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeStrategyAdapter.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeStrategyAdapter.java 2012-05-16 10:43:54 UTC (rev 41051)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeStrategyAdapter.java 2012-05-16 10:44:57 UTC (rev 41052)
@@ -64,7 +64,7 @@
try {
IEmbeddableCartridge cartridge = (IEmbeddableCartridge) event.getElement();
EmbeddableCartridgeDiff diff = null;
- EmbedCartridgeStrategy embedCartridgeStrategy = new EmbedCartridgeStrategy(pageModel.getApplication());
+ EmbedCartridgeStrategy embedCartridgeStrategy = new EmbedCartridgeStrategy(pageModel.getDomain());
diff = createEmbeddableCartridgeDiff(event.getChecked(), cartridge, embedCartridgeStrategy);
if (diff.hasChanges()) {
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizardPageModel.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizardPageModel.java 2012-05-16 10:43:54 UTC (rev 41051)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizardPageModel.java 2012-05-16 10:44:57 UTC (rev 41052)
@@ -24,6 +24,7 @@
import com.openshift.client.ApplicationScale;
import com.openshift.client.IApplication;
import com.openshift.client.ICartridge;
+import com.openshift.client.IDomain;
import com.openshift.client.IEmbeddableCartridge;
import com.openshift.client.IEmbeddedCartridge;
import com.openshift.client.IGearProfile;
@@ -100,12 +101,16 @@
return wizardModel.getUser().hasApplicationOfType(cartridge);
}
- @Override
public IApplication getApplication() {
return wizardModel.getApplication();
}
@Override
+ public IDomain getDomain() throws SocketTimeoutException, OpenShiftException {
+ return wizardModel.getUser().getDefaultDomain();
+ }
+
+ @Override
public void selectEmbeddedCartridges(IEmbeddableCartridge cartridge)
throws OpenShiftException,SocketTimeoutException {
getSelectedEmbeddableCartridges().add(cartridge);
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/IEmbedCartridgesWizardPageModel.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/IEmbedCartridgesWizardPageModel.java 2012-05-16 10:43:54 UTC (rev 41051)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/IEmbedCartridgesWizardPageModel.java 2012-05-16 10:44:57 UTC (rev 41052)
@@ -16,6 +16,7 @@
import org.eclipse.core.runtime.IProgressMonitor;
import com.openshift.client.IApplication;
+import com.openshift.client.IDomain;
import com.openshift.client.IEmbeddableCartridge;
import com.openshift.client.OpenShiftException;
@@ -36,7 +37,7 @@
public boolean isSelected(IEmbeddableCartridge cartridge) throws OpenShiftException, SocketTimeoutException;
- public IApplication getApplication();
+ public IDomain getDomain() throws SocketTimeoutException, OpenShiftException;
public IApplication createJenkinsApplication(String name, IProgressMonitor monitor) throws OpenShiftException;
Modified: trunk/openshift/tests/org.jboss.tools.openshift.express.test/src/org/jboss/tools/openshift/express/test/EmbedCartridgeStrategyTest.java
===================================================================
--- trunk/openshift/tests/org.jboss.tools.openshift.express.test/src/org/jboss/tools/openshift/express/test/EmbedCartridgeStrategyTest.java 2012-05-16 10:43:54 UTC (rev 41051)
+++ trunk/openshift/tests/org.jboss.tools.openshift.express.test/src/org/jboss/tools/openshift/express/test/EmbedCartridgeStrategyTest.java 2012-05-16 10:44:57 UTC (rev 41052)
@@ -10,8 +10,8 @@
******************************************************************************/
package org.jboss.tools.openshift.express.test;
-import static org.junit.Assert.*;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
@@ -52,8 +52,7 @@
@Before
public void setUp() throws SocketTimeoutException, OpenShiftException {
this.domainFake = new DomainFake();
- IApplication applicationFake = domainFake.createApplication("adietish", ICartridge.JBOSSAS_7);
- this.embedStrategy = new EmbedCartridgeStrategy(applicationFake);
+ this.embedStrategy = new EmbedCartridgeStrategy(domainFake);
}
@Test
12 years, 8 months
JBoss Tools SVN: r41051 - trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2012-05-16 06:43:54 -0400 (Wed, 16 May 2012)
New Revision: 41051
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2526Test.java
Log:
https://issues.jboss.org/browse/JBIDE-11137 - junit was corrected.
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2526Test.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2526Test.java 2012-05-16 10:18:36 UTC (rev 41050)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2526Test.java 2012-05-16 10:43:54 UTC (rev 41051)
@@ -85,15 +85,11 @@
nsISelection selection = controller.getVisualSelectionController()
.getSelection(nsISelectionController.SELECTION_NORMAL);
-
- System.out.println("delay");
- TestUtil.delay(20000);
assertEquals(3, selection.getAnchorOffset());
assertEquals(12, selection.getFocusOffset());
- assertEquals(14, TextUtil.visualPosition(child.getNodeValue(), child
- .getNodeValue().length() - 1));
-
+ assertEquals(14, TextUtil.visualPosition(child.getNodeValue(),
+ child.getNodeValue().length() - 1));
}
// check exception
12 years, 8 months
JBoss Tools SVN: r41050 - in trunk/forge: plugins and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2012-05-16 06:18:36 -0400 (Wed, 16 May 2012)
New Revision: 41050
Removed:
trunk/forge/features/.project
trunk/forge/plugins/.project
trunk/forge/tests/.project
Log:
remove wrong .project files
Deleted: trunk/forge/features/.project
===================================================================
--- trunk/forge/features/.project 2012-05-16 10:00:23 UTC (rev 41049)
+++ trunk/forge/features/.project 2012-05-16 10:18:36 UTC (rev 41050)
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>features</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.m2e.core.maven2Builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.m2e.core.maven2Nature</nature>
- </natures>
-</projectDescription>
Deleted: trunk/forge/plugins/.project
===================================================================
--- trunk/forge/plugins/.project 2012-05-16 10:00:23 UTC (rev 41049)
+++ trunk/forge/plugins/.project 2012-05-16 10:18:36 UTC (rev 41050)
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>plugins</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.m2e.core.maven2Builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.m2e.core.maven2Nature</nature>
- </natures>
-</projectDescription>
Deleted: trunk/forge/tests/.project
===================================================================
--- trunk/forge/tests/.project 2012-05-16 10:00:23 UTC (rev 41049)
+++ trunk/forge/tests/.project 2012-05-16 10:18:36 UTC (rev 41050)
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>tests</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.m2e.core.maven2Builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.m2e.core.maven2Nature</nature>
- </natures>
-</projectDescription>
12 years, 8 months
JBoss Tools SVN: r41049 - trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test.
by jbosstools-commits＠lists.jboss.org
Author: mickael_istria
Date: 2012-05-16 06:00:23 -0400 (Wed, 16 May 2012)
New Revision: 41049
Removed:
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/requirements.properties
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/pom.xml
Log:
JBIDE-11714: Remove requirements.properties in favor of pom.xml in "jsf" module
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/pom.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/pom.xml 2012-05-16 09:33:32 UTC (rev 41048)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/pom.xml 2012-05-16 10:00:23 UTC (rev 41049)
@@ -12,14 +12,46 @@
<packaging>eclipse-test-plugin</packaging>
<properties>
- <jbosstools.test.jboss-as.home>${requirement.build.root}/jboss-as-web-7.0.2.Final</jbosstools.test.jboss-as.home>
+ <jbosstools.test.jboss-as.home>${project.build.directory}/requirements/jboss-as-7.0.2.Final</jbosstools.test.jboss-as.home>
+ <org.jboss.tools.vpe.ui.bot.test.richfaces.ui.jar.location>${project.build.directory}/requirements/richfaces-4.2.1.Final/artifacts/ui/richfaces-components-ui-4.2.1.Final.jar</org.jboss.tools.vpe.ui.bot.test.richfaces.ui.jar.location>
<xulrunner.plugin.name>org.mozilla.xulrunner.gtk.linux.x86_1.9.2.16b</xulrunner.plugin.name>
- <org.jboss.tools.vpe.ui.bot.test.richfaces.ui.jar.location>${requirement.build.root}//richfaces-4.2.1.Final/artifacts/ui/richfaces-components-ui-4.2.1.Final.jar</org.jboss.tools.vpe.ui.bot.test.richfaces.ui.jar.location>
<systemProperties>-Dswtbot.test.skip=false -Dtest.configurations.dir=resources/properties/ -Djbosstools.test.jboss-as.home=${jbosstools.test.jboss-as.home} -Dorg.eclipse.swt.browser.XULRunnerPath=${project.build.outputDirectory}/../work/plugins/${xulrunner.plugin.name}/xulrunner -Dorg.jboss.tools.vpe.ui.bot.test.richfaces.ui.jar.location=${org.jboss.tools.vpe.ui.bot.test.richfaces.ui.jar.location}</systemProperties>
<test.suite.class>org.jboss.tools.jsf.ui.bot.test.JSFAllBotTests</test.suite.class>
</properties>
<build>
<plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.4</version>
+ <executions>
+ <execution>
+ <id>unpack</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.jboss.as</groupId>
+ <artifactId>jboss-as-dist</artifactId>
+ <version>7.0.2.Final</version>
+ <type>zip</type>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.richfaces</groupId>
+ <artifactId>richfaces-distribution</artifactId>
+ <version>4.2.1.Final</version>
+ <type>zip</type>
+ </artifactItem>
+ </artifactItems>
+ <outputDirectory>${project.build.directory}/requirements</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-surefire-plugin</artifactId>
Deleted: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/requirements.properties
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/requirements.properties 2012-05-16 09:33:32 UTC (rev 41048)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/requirements.properties 2012-05-16 10:00:23 UTC (rev 41049)
@@ -1 +0,0 @@
-requirements=jbossas-7.0.2.Final,richfaces-4.2.1.Final
12 years, 8 months
JBoss Tools SVN: r41048 - trunk/openshift/plugins/org.jboss.tools.openshift.express.client.
by jbosstools-commits＠lists.jboss.org
Author: xcoulon
Date: 2012-05-16 05:33:32 -0400 (Wed, 16 May 2012)
New Revision: 41048
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.client/openshift-java-client-2.0.0-SNAPSHOT.jar
Log:
Fixing ClassCastException with IDomain.refresh()
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.client/openshift-java-client-2.0.0-SNAPSHOT.jar
===================================================================
(Binary files differ)
12 years, 8 months
JBoss Tools SVN: r41047 - trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action.
by jbosstools-commits＠lists.jboss.org
Author: xcoulon
Date: 2012-05-16 05:29:19 -0400 (Wed, 16 May 2012)
New Revision: 41047
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/RefreshElementAction.java
Log:
Fixing invalid condition to trigger refresh at user level
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/RefreshElementAction.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/RefreshElementAction.java 2012-05-16 09:26:23 UTC (rev 41046)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/RefreshElementAction.java 2012-05-16 09:29:19 UTC (rev 41047)
@@ -18,6 +18,7 @@
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.jface.viewers.ITreeSelection;
import org.eclipse.swt.widgets.Display;
+import org.jboss.tools.openshift.express.internal.core.console.UserDelegate;
import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator;
import org.jboss.tools.openshift.express.internal.ui.messages.OpenShiftExpressUIMessages;
import org.jboss.tools.openshift.express.internal.ui.utils.Logger;
@@ -42,19 +43,25 @@
@Override
public void run() {
if (selection != null && selection instanceof ITreeSelection
- && ((ITreeSelection) selection).getFirstElement() instanceof IOpenShiftResource) {
- refresh((IOpenShiftResource) ((ITreeSelection) selection).getFirstElement());
+ && (((ITreeSelection) selection).getFirstElement() instanceof UserDelegate)
+ || (((ITreeSelection) selection).getFirstElement() instanceof IOpenShiftResource)){
+ refresh( ((ITreeSelection) selection).getFirstElement());
}
}
- private void refresh(final IOpenShiftResource element) {
+ private void refresh(final Object element) {
Job job = new Job("Loading OpenShift information...") {
@Override
protected IStatus run(IProgressMonitor monitor) {
try {
monitor.beginTask("Loading OpenShift information...", IProgressMonitor.UNKNOWN);
- element.refresh();
+ if(element instanceof UserDelegate) {
+ ((UserDelegate)element).refresh();
+ } else if (element instanceof IOpenShiftResource) {
+ ((IOpenShiftResource)element).refresh();
+ }
+
//List<IApplication> applications = user.getApplications();
Display.getDefault().asyncExec(new Runnable() {
public void run() {
12 years, 8 months
JBoss Tools SVN: r41046 - trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard.
by jbosstools-commits＠lists.jboss.org
Author: xcoulon
Date: 2012-05-16 05:26:23 -0400 (Wed, 16 May 2012)
New Revision: 41046
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPageModel.java
Log:
Fixed - JBIDE-10845 Application configuration UI issues JBIDE-10850
loading cartridges could be cached after shown first page
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPageModel.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPageModel.java 2012-05-16 09:20:44 UTC (rev 41045)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPageModel.java 2012-05-16 09:26:23 UTC (rev 41046)
@@ -184,12 +184,20 @@
IStatus status = Status.OK_STATUS;
UserDelegate user = null;
try {
- user = new UserDelegate(UserModel.getDefault().createUser(rhLogin, password), rememberPassword, password != null);
- if (user.isValid()) {
- storeUser(user);
+ // reuse previous user if it was properly logged in
+ user = UserModel.getDefault().findUser(rhLogin);
+ // check user credentials if not logged before or if input password changed
+ if(user != null && user.getPassword().equals(password)) {
+ wizardModel.setUser(user);
} else {
- status = OpenShiftUIActivator.createErrorStatus(
- NLS.bind("The credentials for user {0} are not valid", user.getRhlogin()));
+ user = new UserDelegate(UserModel.getDefault().createUser(rhLogin, password), rememberPassword,
+ password != null);
+ if (user.isValid()) {
+ storeUser(user);
+ } else {
+ status = OpenShiftUIActivator.createErrorStatus(NLS.bind(
+ "The credentials for user {0} are not valid", user.getRhlogin()));
+ }
}
} catch (NotFoundOpenShiftException e) {
// valid user without domain
12 years, 8 months
JBoss Tools SVN: r41045 - trunk/download.jboss.org/jbosstools/examples.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2012-05-16 05:20:44 -0400 (Wed, 16 May 2012)
New Revision: 41045
Modified:
trunk/download.jboss.org/jbosstools/examples/project-examples-shared-3.3....
trunk/download.jboss.org/jbosstools/examples/project-examples-shared-3.3....
Log:
JBIDE-11874 - Java EE Web Project example doesn't contain readme.md
Modified: trunk/download.jboss.org/jbosstools/examples/project-examples-shared-3.3....
===================================================================
--- trunk/download.jboss.org/jbosstools/examples/project-examples-shared-3.3.... 2012-05-16 08:55:23 UTC (rev 41044)
+++ trunk/download.jboss.org/jbosstools/examples/project-examples-shared-3.3.... 2012-05-16 09:20:44 UTC (rev 41045)
@@ -62,7 +62,6 @@
</mavenArchetype>
<tags>wizard</tags>
<icon path="icons/newwebprj_wiz.gif" />
- <welcome type="editor" url="/${project[0]}/readme.md"/>
</project>
<!-- Java EE Project -->
<project>
@@ -118,7 +117,6 @@
<!--targetProjectFacet facet="jst.ear" version="6.0"/-->
<tags>wizard</tags>
<icon path="icons/ear-wiz-icon.gif" />
- <welcome type="editor" url="/${project[0]}/README.md"/>
</project>
<!-- HTML5 project -->
<project>
@@ -173,7 +171,6 @@
</mavenArchetype>
<tags>wizard</tags>
<icon path="icons/html5.png" />
- <welcome type="editor" url="/${project[0]}/README.md"/>
</project>
<!-- Richfaces project -->
<project>
@@ -236,7 +233,6 @@
-->
<tags>wizard</tags>
<icon path="icons/rf_logo.png" />
- <welcome type="editor" url="/${project[0]}/README.md"/>
</project>
<!-- Spring MVC -->
<project>
@@ -354,7 +350,6 @@
</mavenArchetype>
<tags>wizard</tags>
<icon path="icons/new-gdt-project.png" />
- <welcome type="editor" url="/${project[0]}/README.md"/>
</project>
</projects>
Modified: trunk/download.jboss.org/jbosstools/examples/project-examples-shared-3.3....
===================================================================
--- trunk/download.jboss.org/jbosstools/examples/project-examples-shared-3.3.... 2012-05-16 08:55:23 UTC (rev 41044)
+++ trunk/download.jboss.org/jbosstools/examples/project-examples-shared-3.3.... 2012-05-16 09:20:44 UTC (rev 41045)
@@ -62,7 +62,6 @@
</mavenArchetype>
<tags>wizard</tags>
<icon path="icons/newwebprj_wiz.gif" />
- <welcome type="editor" url="/${project[0]}/readme.md"/>
</project>
<!-- Java EE Project -->
<project>
@@ -118,7 +117,6 @@
<!--targetProjectFacet facet="jst.ear" version="6.0"/-->
<tags>wizard</tags>
<icon path="icons/ear-wiz-icon.gif" />
- <welcome type="editor" url="/${project[0]}/README.md"/>
</project>
<!-- HTML5 project -->
<project>
@@ -173,7 +171,6 @@
</mavenArchetype>
<tags>wizard</tags>
<icon path="icons/html5.png" />
- <welcome type="editor" url="/${project[0]}/README.md"/>
</project>
<!-- Richfaces project -->
<project>
@@ -236,7 +233,6 @@
-->
<tags>wizard</tags>
<icon path="icons/rf_logo.png" />
- <welcome type="editor" url="/${project[0]}/README.md"/>
</project>
<!-- Spring MVC -->
<project>
@@ -354,7 +350,6 @@
</mavenArchetype>
<tags>wizard</tags>
<icon path="icons/new-gdt-project.png" />
- <welcome type="editor" url="/${project[0]}/README.md"/>
</project>
</projects>
12 years, 8 months
JBoss Tools SVN: r41044 - trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/messages.
by jbosstools-commits＠lists.jboss.org
Author: xcoulon
Date: 2012-05-16 04:55:23 -0400 (Wed, 16 May 2012)
New Revision: 41044
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/messages/OpenShiftExpressUIMessages.properties
Log:
Fixed - JBIDE-11805
Renaming actions in the OpenShift Explorer context menus
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/messages/OpenShiftExpressUIMessages.properties
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/messages/OpenShiftExpressUIMessages.properties 2012-05-16 08:49:19 UTC (rev 41043)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/messages/OpenShiftExpressUIMessages.properties 2012-05-16 08:55:23 UTC (rev 41044)
@@ -1,17 +1,17 @@
HOSTNAME_NOT_ANSWERING=We weren''t able to lookup your hostname ({0}) in a reasonable amount of time. This can happen periodically and will just take an extra minute or two to propagate depending on where you are in the world.\nOnce you are able to access your application in a browser, you can then clone your git repository.\nIf you can''t get your application running in the browser, you can also try destroying and recreating the application as well using this Wizard.\n\nIf this doesn''t work for you, let us know in the forums or in IRC and we''ll make sure to get you up and running.\n\nForums\: https\://www.redhat.com/openshift/forums/express\n\nIRC\: \#openshift (on Freenode)
-TAIL_SERVER_LOG_ACTION=Remote console
+TAIL_SERVER_LOG_ACTION=Show Remote Logs
#
-CREATE_OR_EDIT_DOMAIN_ACTION=Create or Edit Domain
+CREATE_OR_EDIT_DOMAIN_ACTION=Create or Edit Domain...
DELETE_DOMAIN_ACTION=Delete Domain
#
SHOW_IN_ACTION_GROUP=Show In
SHOW_IN_BROWSER_ACTION=Web Browser
DELETE_APPLICATION_ACTION=Delete Application(s)
-CREATE_APPLICATION_ACTION=New OpenShift Application
-IMPORT_APPLICATION_ACTION=Import Application
-CREATE_SERVER_ADAPTER_ACTION=Create a Server Adapter
-EDIT_CARTRIDGES_ACTION=Edit Embeddable Cartridges
+CREATE_APPLICATION_ACTION=New OpenShift Application...
+IMPORT_APPLICATION_ACTION=Import Application...
+CREATE_SERVER_ADAPTER_ACTION=Create a Server Adapter...
+EDIT_CARTRIDGES_ACTION=Edit Embedded Cartridges...
MAKE_SNAPSHOT_ACTION=Pull down Application Snapshot
SHOW_PROPERTIES_VIEW_ACTION=Properties
@@ -23,7 +23,7 @@
DELETE_CONNECTION_ACTION=Disconnect
USER_NOT_CONNECTED_LABEL=<User is not connected>
-LOADING_USER_APPLICATIONS_LABEL=Loading
+LOADING_USER_APPLICATIONS_LABEL=Loading...
12 years, 8 months
JBoss Tools SVN: r41043 - trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-05-16 04:49:19 -0400 (Wed, 16 May 2012)
New Revision: 41043
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressPublishMethod.java
Log:
JBIDE-11254
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressPublishMethod.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressPublishMethod.java 2012-05-16 08:43:04 UTC (rev 41042)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressPublishMethod.java 2012-05-16 08:49:19 UTC (rev 41043)
@@ -136,18 +136,22 @@
IResource[] resource = new IResource[]{changedResource};
if( deltaKind == ServerBehaviourDelegate.REMOVED) {
- changedResource.delete(false, monitor);
+ changedResource.delete(false, monitor); // uses resource api
} else {
- IStatus status = util.publishModule(behaviour.getServer(), dest.toString(), module, publishType, delta, monitor);
+ monitor.beginTask("Moving module to " + destFolder.getName(), 100);
+ IStatus status = util.publishModule(behaviour.getServer(), dest.toString(), module, publishType, delta,
+ new SubProgressMonitor(monitor,20));
+ // util used file api, so a folder refresh is required
+ destFolder.refreshLocal(IResource.DEPTH_INFINITE, new SubProgressMonitor(monitor,20));
final AddToIndexOperation operation = new AddToIndexOperation(resource);
try {
- operation.execute(monitor);
+ operation.execute(new SubProgressMonitor(monitor,60));
} catch (CoreException e) {
OpenShiftUIActivator.log(e.getStatus());
}
}
} catch( Exception e ) {
- e.printStackTrace();
+ OpenShiftUIActivator.log(new Status(IStatus.ERROR, OpenShiftUIActivator.PLUGIN_ID,e.getMessage(), e));
}
return IServer.PUBLISH_STATE_NONE;
}
12 years, 8 months