JBoss Tools SVN: r39779 - trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/operations.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2012-03-22 15:45:52 -0400 (Thu, 22 Mar 2012)
New Revision: 39779
Modified:
trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/operations/AddPortletOperation.java
Log:
JBIDE-11381 - Generating a portlet with init parameter leads to invalid portlet.xml
Modified: trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/operations/AddPortletOperation.java
===================================================================
--- trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/operations/AddPortletOperation.java 2012-03-22 19:43:38 UTC (rev 39778)
+++ trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/operations/AddPortletOperation.java 2012-03-22 19:45:52 UTC (rev 39779)
@@ -493,11 +493,11 @@
.hasNext();) {
String[] arrayString = (String[]) iterator.next();
Element initParam = addNode(document,portlet,"init-param",null); //$NON-NLS-1$
- addNode(document,initParam,"name",arrayString[0]); //$NON-NLS-1$
- addNode(document,initParam,"value",arrayString[1]); //$NON-NLS-1$
if (arrayString[2] != null && arrayString[2].length() > 0) {
addNode(document,initParam,"description",arrayString[2]); //$NON-NLS-1$
}
+ addNode(document,initParam,"name",arrayString[0]); //$NON-NLS-1$
+ addNode(document,initParam,"value",arrayString[1]); //$NON-NLS-1$
}
}
// supports
12 years, 7 months
JBoss Tools SVN: r39778 - trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2012-03-22 15:43:38 -0400 (Thu, 22 Mar 2012)
New Revision: 39778
Modified:
trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/ToolTip.java
Log:
JBIDE-10938 - tooltips fail in wizard examples
Modified: trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/ToolTip.java
===================================================================
--- trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/ToolTip.java 2012-03-22 19:38:04 UTC (rev 39777)
+++ trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/ToolTip.java 2012-03-22 19:43:38 UTC (rev 39778)
@@ -440,7 +440,6 @@
control.getShell().removeListener(SWT.Deactivate, shellListener);
}
} catch (Throwable t) {
- // workaround for https://issues.jboss.org/browse/JBIDE-10938/https://issues.jboss.org/brow...
JBossCentralActivator.log(t, "https://issues.jboss.org/browse/JBIDE-10938");
}
currentArea = null;
12 years, 7 months
JBoss Tools SVN: r39777 - in trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central: editors and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2012-03-22 15:38:04 -0400 (Thu, 22 Mar 2012)
New Revision: 39777
Modified:
trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/JBossCentralActivator.java
trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/FeedsToolTip.java
trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/GettingStartedPage.java
trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/ToolTip.java
Log:
JBIDE-10938 - tooltips fail in wizard examples
Modified: trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/JBossCentralActivator.java
===================================================================
--- trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/JBossCentralActivator.java 2012-03-22 16:38:11 UTC (rev 39776)
+++ trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/JBossCentralActivator.java 2012-03-22 19:38:04 UTC (rev 39777)
@@ -195,7 +195,7 @@
}
}
- public static void log(Exception e, String message) {
+ public static void log(Throwable e, String message) {
IStatus status = new Status(IStatus.ERROR, PLUGIN_ID, message, e);
plugin.getLog().log(status);
}
Modified: trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/FeedsToolTip.java
===================================================================
--- trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/FeedsToolTip.java 2012-03-22 16:38:11 UTC (rev 39776)
+++ trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/FeedsToolTip.java 2012-03-22 19:38:04 UTC (rev 39777)
@@ -11,7 +11,6 @@
package org.jboss.tools.central.editors;
-import org.eclipse.jface.window.ToolTip;
import org.eclipse.swt.SWT;
import org.eclipse.swt.browser.Browser;
import org.eclipse.swt.browser.LocationAdapter;
Modified: trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/GettingStartedPage.java
===================================================================
--- trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/GettingStartedPage.java 2012-03-22 16:38:11 UTC (rev 39776)
+++ trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/GettingStartedPage.java 2012-03-22 19:38:04 UTC (rev 39777)
@@ -46,7 +46,6 @@
import org.eclipse.jface.resource.JFaceResources;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.window.ToolTip;
import org.eclipse.jface.wizard.WizardDialog;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.BusyIndicator;
@@ -925,7 +924,7 @@
displayTutorialLinks(categories.get(category), composite, true);
categoryComposite.setClient(composite);
String description = category.getDescription();
- if (description != null && !description.isEmpty() && categoryComposite.getControl() != null) {
+ if (description != null && !description.isEmpty() && categoryComposite.getControl() != null && !categoryComposite.getControl().isDisposed()) {
final DescriptionToolTip toolTip = new DescriptionToolTip(categoryComposite.getControl(), description);
toolTip.activate();
}
Modified: trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/ToolTip.java
===================================================================
--- trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/ToolTip.java 2012-03-22 16:38:11 UTC (rev 39776)
+++ trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/ToolTip.java 2012-03-22 19:38:04 UTC (rev 39777)
@@ -16,6 +16,7 @@
import org.eclipse.swt.widgets.Listener;
import org.eclipse.swt.widgets.Monitor;
import org.eclipse.swt.widgets.Shell;
+import org.jboss.tools.central.JBossCentralActivator;
/**
* This class gives implementors to provide customized tooltips for any control.
@@ -434,8 +435,13 @@
private void toolTipHide(Shell tip, Event event) {
if (tip != null && !tip.isDisposed() && shouldHideToolTip(event)) {
- if (!control.getShell().isDisposed()) {
- control.getShell().removeListener(SWT.Deactivate, shellListener);
+ try {
+ if (control != null && !control.isDisposed() && !control.getShell().isDisposed()) {
+ control.getShell().removeListener(SWT.Deactivate, shellListener);
+ }
+ } catch (Throwable t) {
+ // workaround for https://issues.jboss.org/browse/JBIDE-10938/https://issues.jboss.org/brow...
+ JBossCentralActivator.log(t, "https://issues.jboss.org/browse/JBIDE-10938");
}
currentArea = null;
passOnEvent(tip, event);
12 years, 7 months
JBoss Tools SVN: r39776 - in branches/jbosstools-3.3.0.Beta1: xulrunner/features/org.mozilla.xpcom.feature and 11 other directories.
by jbosstools-commits＠lists.jboss.org
Author: yradtsevich
Date: 2012-03-22 12:38:11 -0400 (Thu, 22 Mar 2012)
New Revision: 39776
Modified:
branches/jbosstools-3.3.0.Beta1/vpe/features/org.jboss.tools.xulrunner.feature/
branches/jbosstools-3.3.0.Beta1/vpe/features/org.jboss.tools.xulrunner.feature/feature.xml
branches/jbosstools-3.3.0.Beta1/xulrunner/features/org.mozilla.xpcom.feature/
branches/jbosstools-3.3.0.Beta1/xulrunner/features/org.mozilla.xpcom.feature/feature.xml
branches/jbosstools-3.3.0.Beta1/xulrunner/features/org.mozilla.xulrunner.feature/
branches/jbosstools-3.3.0.Beta1/xulrunner/features/org.mozilla.xulrunner.feature/feature.xml
branches/jbosstools-3.3.0.Beta1/xulrunner/plugins/org.mozilla.xpcom/
branches/jbosstools-3.3.0.Beta1/xulrunner/plugins/org.mozilla.xpcom/META-INF/MANIFEST.MF
branches/jbosstools-3.3.0.Beta1/xulrunner/plugins/org.mozilla.xulrunner.cocoa.macosx/
branches/jbosstools-3.3.0.Beta1/xulrunner/plugins/org.mozilla.xulrunner.cocoa.macosx/META-INF/MANIFEST.MF
branches/jbosstools-3.3.0.Beta1/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/
branches/jbosstools-3.3.0.Beta1/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/META-INF/MANIFEST.MF
branches/jbosstools-3.3.0.Beta1/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/
branches/jbosstools-3.3.0.Beta1/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/META-INF/MANIFEST.MF
branches/jbosstools-3.3.0.Beta1/xulrunner/plugins/org.mozilla.xulrunner.win32.win32.x86/
branches/jbosstools-3.3.0.Beta1/xulrunner/plugins/org.mozilla.xulrunner.win32.win32.x86/META-INF/MANIFEST.MF
Log:
https://issues.jboss.org/browse/JBIDE-11353 -set unpack=true and Eclipse-BundleShape: dir for xpcom and xulrunner plugins
- merged changeset 39635 in Beta1
Property changes on: branches/jbosstools-3.3.0.Beta1/vpe/features/org.jboss.tools.xulrunner.feature
___________________________________________________________________
Added: svn:mergeinfo
+ /trunk/vpe/features/org.jboss.tools.xulrunner.feature:39635
Modified: branches/jbosstools-3.3.0.Beta1/vpe/features/org.jboss.tools.xulrunner.feature/feature.xml
===================================================================
--- branches/jbosstools-3.3.0.Beta1/vpe/features/org.jboss.tools.xulrunner.feature/feature.xml 2012-03-22 15:57:17 UTC (rev 39775)
+++ branches/jbosstools-3.3.0.Beta1/vpe/features/org.jboss.tools.xulrunner.feature/feature.xml 2012-03-22 16:38:11 UTC (rev 39776)
@@ -22,6 +22,7 @@
id="org.mozilla.xpcom"
download-size="0"
install-size="0"
+ unpack="true"
version="0.0.0"/>
<plugin
@@ -31,6 +32,7 @@
arch="x86"
download-size="0"
install-size="0"
+ unpack="true"
version="0.0.0"/>
<plugin
@@ -40,6 +42,7 @@
arch="x86"
download-size="0"
install-size="0"
+ unpack="true"
version="0.0.0"/>
<plugin
@@ -49,6 +52,7 @@
arch="x86_64"
download-size="0"
install-size="0"
+ unpack="true"
version="0.0.0"/>
<plugin
@@ -58,6 +62,7 @@
arch="x86"
download-size="0"
install-size="0"
+ unpack="true"
version="0.0.0"/>
<plugin
Property changes on: branches/jbosstools-3.3.0.Beta1/xulrunner/features/org.mozilla.xpcom.feature
___________________________________________________________________
Added: svn:mergeinfo
+ /trunk/xulrunner/features/org.mozilla.xpcom.feature:39635
Modified: branches/jbosstools-3.3.0.Beta1/xulrunner/features/org.mozilla.xpcom.feature/feature.xml
===================================================================
--- branches/jbosstools-3.3.0.Beta1/xulrunner/features/org.mozilla.xpcom.feature/feature.xml 2012-03-22 15:57:17 UTC (rev 39775)
+++ branches/jbosstools-3.3.0.Beta1/xulrunner/features/org.mozilla.xpcom.feature/feature.xml 2012-03-22 16:38:11 UTC (rev 39776)
@@ -21,7 +21,7 @@
id="org.mozilla.xpcom"
download-size="0"
install-size="0"
- version="0.0.0"
- unpack="false"/>
+ unpack="true"
+ version="0.0.0"/>
</feature>
Property changes on: branches/jbosstools-3.3.0.Beta1/xulrunner/features/org.mozilla.xulrunner.feature
___________________________________________________________________
Added: svn:mergeinfo
+ /trunk/xulrunner/features/org.mozilla.xulrunner.feature:39635
Modified: branches/jbosstools-3.3.0.Beta1/xulrunner/features/org.mozilla.xulrunner.feature/feature.xml
===================================================================
--- branches/jbosstools-3.3.0.Beta1/xulrunner/features/org.mozilla.xulrunner.feature/feature.xml 2012-03-22 15:57:17 UTC (rev 39775)
+++ branches/jbosstools-3.3.0.Beta1/xulrunner/features/org.mozilla.xulrunner.feature/feature.xml 2012-03-22 16:38:11 UTC (rev 39776)
@@ -24,6 +24,7 @@
id="org.mozilla.xpcom"
download-size="0"
install-size="0"
+ unpack="true"
version="0.0.0"/>
<plugin
@@ -33,6 +34,7 @@
arch="x86"
download-size="0"
install-size="0"
+ unpack="true"
version="0.0.0"/>
<plugin
@@ -42,6 +44,7 @@
arch="x86_64"
download-size="0"
install-size="0"
+ unpack="true"
version="0.0.0"/>
<plugin
@@ -51,6 +54,7 @@
arch="x86"
download-size="0"
install-size="0"
+ unpack="true"
version="0.0.0"/>
<plugin
@@ -59,6 +63,7 @@
ws="cocoa"
download-size="0"
install-size="0"
+ unpack="true"
version="0.0.0"/>
</feature>
Property changes on: branches/jbosstools-3.3.0.Beta1/xulrunner/plugins/org.mozilla.xpcom
___________________________________________________________________
Added: svn:mergeinfo
+ /trunk/xulrunner/plugins/org.mozilla.xpcom:39635
Modified: branches/jbosstools-3.3.0.Beta1/xulrunner/plugins/org.mozilla.xpcom/META-INF/MANIFEST.MF
===================================================================
--- branches/jbosstools-3.3.0.Beta1/xulrunner/plugins/org.mozilla.xpcom/META-INF/MANIFEST.MF 2012-03-22 15:57:17 UTC (rev 39775)
+++ branches/jbosstools-3.3.0.Beta1/xulrunner/plugins/org.mozilla.xpcom/META-INF/MANIFEST.MF 2012-03-22 16:38:11 UTC (rev 39776)
@@ -8,6 +8,7 @@
Export-Package: org.mozilla.interfaces,
org.mozilla.xpcom
Bundle-Vendor: mozilla.org
+Eclipse-BundleShape: dir
Eclipse-BuddyPolicy: registered
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Require-Bundle: org.jboss.tools.usage;bundle-version="1.0.0";resolution:=optional;x-installation:=greedy,
Property changes on: branches/jbosstools-3.3.0.Beta1/xulrunner/plugins/org.mozilla.xulrunner.cocoa.macosx
___________________________________________________________________
Added: svn:mergeinfo
+ /trunk/xulrunner/plugins/org.mozilla.xulrunner.cocoa.macosx:39635
Modified: branches/jbosstools-3.3.0.Beta1/xulrunner/plugins/org.mozilla.xulrunner.cocoa.macosx/META-INF/MANIFEST.MF
===================================================================
--- branches/jbosstools-3.3.0.Beta1/xulrunner/plugins/org.mozilla.xulrunner.cocoa.macosx/META-INF/MANIFEST.MF 2012-03-22 15:57:17 UTC (rev 39775)
+++ branches/jbosstools-3.3.0.Beta1/xulrunner/plugins/org.mozilla.xulrunner.cocoa.macosx/META-INF/MANIFEST.MF 2012-03-22 16:38:11 UTC (rev 39776)
@@ -4,4 +4,5 @@
Bundle-SymbolicName: org.mozilla.xulrunner.cocoa.macosx;singleton:=true
Bundle-Version: 1.9.2.16
Bundle-Vendor: mozilla.org
+Eclipse-BundleShape: dir
Eclipse-PlatformFilter: (& (osgi.ws=cocoa) (osgi.os=macosx) (|(osgi.arch=x86)(osgi.arch=ppc)))
Property changes on: branches/jbosstools-3.3.0.Beta1/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86
___________________________________________________________________
Added: svn:mergeinfo
+ /trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86:39635
Modified: branches/jbosstools-3.3.0.Beta1/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/META-INF/MANIFEST.MF
===================================================================
--- branches/jbosstools-3.3.0.Beta1/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/META-INF/MANIFEST.MF 2012-03-22 15:57:17 UTC (rev 39775)
+++ branches/jbosstools-3.3.0.Beta1/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/META-INF/MANIFEST.MF 2012-03-22 16:38:11 UTC (rev 39776)
@@ -5,5 +5,6 @@
ue
Bundle-Version: 1.9.2.16b
Bundle-Vendor: mozilla.org
+Eclipse-BundleShape: dir
Eclipse-PlatformFilter: (& (osgi.ws=gtk)(osgi.os=linux)(osgi.arch=x86))
Property changes on: branches/jbosstools-3.3.0.Beta1/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64
___________________________________________________________________
Added: svn:mergeinfo
+ /trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64:39635
Modified: branches/jbosstools-3.3.0.Beta1/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/META-INF/MANIFEST.MF
===================================================================
--- branches/jbosstools-3.3.0.Beta1/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/META-INF/MANIFEST.MF 2012-03-22 15:57:17 UTC (rev 39775)
+++ branches/jbosstools-3.3.0.Beta1/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/META-INF/MANIFEST.MF 2012-03-22 16:38:11 UTC (rev 39776)
@@ -5,5 +5,6 @@
=true
Bundle-Version: 1.9.2.19pre
Bundle-Vendor: mozilla.org
+Eclipse-BundleShape: dir
Eclipse-PlatformFilter: (& (osgi.ws=gtk)(osgi.os=linux)(osgi.arch=x86_64))
Property changes on: branches/jbosstools-3.3.0.Beta1/xulrunner/plugins/org.mozilla.xulrunner.win32.win32.x86
___________________________________________________________________
Added: svn:mergeinfo
+ /trunk/xulrunner/plugins/org.mozilla.xulrunner.win32.win32.x86:39635
Modified: branches/jbosstools-3.3.0.Beta1/xulrunner/plugins/org.mozilla.xulrunner.win32.win32.x86/META-INF/MANIFEST.MF
===================================================================
--- branches/jbosstools-3.3.0.Beta1/xulrunner/plugins/org.mozilla.xulrunner.win32.win32.x86/META-INF/MANIFEST.MF 2012-03-22 15:57:17 UTC (rev 39775)
+++ branches/jbosstools-3.3.0.Beta1/xulrunner/plugins/org.mozilla.xulrunner.win32.win32.x86/META-INF/MANIFEST.MF 2012-03-22 16:38:11 UTC (rev 39776)
@@ -5,5 +5,6 @@
true
Bundle-Version: 1.9.2.16b
Bundle-Vendor: mozilla.org
+Eclipse-BundleShape: dir
Eclipse-PlatformFilter: (& (osgi.ws=win32)(osgi.os=win32)(osgi.arch=x86))
12 years, 7 months
JBoss Tools SVN: r39775 - in trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test: resources/project_config_files and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: ljelinko
Date: 2012-03-22 11:57:17 -0400 (Thu, 22 Mar 2012)
New Revision: 39775
Modified:
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/launchers/prepare_workspace/portlets_prepare_workspace.launch
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/resources/project_config_files/jboss-portal.properties
Log:
Updated jboss-portal configuration
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/launchers/prepare_workspace/portlets_prepare_workspace.launch
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/launchers/prepare_workspace/portlets_prepare_workspace.launch 2012-03-22 15:56:55 UTC (rev 39774)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/launchers/prepare_workspace/portlets_prepare_workspace.launch 2012-03-22 15:57:17 UTC (rev 39775)
@@ -10,6 +10,8 @@
<listEntry value="jbosstools.test.jboss-epp-5.1.home=${folder_prompt:EPP 5.1 installation directory}"/>
<listEntry value="jbosstools.test.jboss-gatein.home=${folder_prompt:GateIn 3.1.0 installation directory}"/>
<listEntry value="jbosstools.test.jboss-seam.home=${folder_prompt:Seam 2.2 installation directory}"/>
+<listEntry value="jbosstools.test.jboss-portal.home=${folder_prompt:JBoss Portal installation directory}"/>
+<listEntry value="jbosstools.test.jboss-seam-2.0.home=${folder_prompt:Seam 2.0 installation directory}"/>
</listAttribute>
<stringAttribute key="M2_RUNTIME" value="EMBEDDED"/>
<booleanAttribute key="M2_SKIP_TESTS" value="false"/>
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/resources/project_config_files/jboss-portal.properties
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/resources/project_config_files/jboss-portal.properties 2012-03-22 15:56:55 UTC (rev 39774)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/resources/project_config_files/jboss-portal.properties 2012-03-22 15:57:17 UTC (rev 39775)
@@ -1,4 +1,4 @@
SERVER=EPP,4.3,default,${jbosstools.test.jboss-portal.home}
SEAM=2.0,${jbosstools.test.jboss-seam-2.0.home}
DB=hsqldb18,internal, , , , ,
-PORTLET_BRIDGE=${jbosstools.test.jboss-portal.home}/jboss-as/server/default/deploy/jboss-portal.sar/portal-identity.sar/portal-identity.war/WEB-INF/lib
\ No newline at end of file
+PORTLET_BRIDGE=${jbosstools.test.jboss-portal.home}/server/default/deploy/jboss-portal.sar/portal-identity.sar/portal-identity.war/WEB-INF/lib
\ No newline at end of file
12 years, 7 months
JBoss Tools SVN: r39774 - trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test.
by jbosstools-commits＠lists.jboss.org
Author: ljelinko
Date: 2012-03-22 11:56:55 -0400 (Thu, 22 Mar 2012)
New Revision: 39774
Modified:
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/pom.xml
Log:
Added timeout
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/pom.xml
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/pom.xml 2012-03-22 15:56:34 UTC (rev 39773)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/pom.xml 2012-03-22 15:56:55 UTC (rev 39774)
@@ -30,6 +30,8 @@
<artifactId>tycho-surefire-plugin</artifactId>
<configuration>
<useUIThread>false</useUIThread>
+ <surefire.timeout>1800</surefire.timeout>
+ <forkedProcessTimeoutInSeconds>1800</forkedProcessTimeoutInSeconds>
<testSuite>org.jboss.tools.portlet.ui.bot.test</testSuite>
<testClass>${test.class}</testClass>
<skip>${swtbot.test.skip}</skip>
12 years, 7 months
JBoss Tools SVN: r39773 - trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/resources/project_config_files.
by jbosstools-commits＠lists.jboss.org
Author: ljelinko
Date: 2012-03-22 11:56:34 -0400 (Thu, 22 Mar 2012)
New Revision: 39773
Added:
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/resources/project_config_files/gatein.properties
Removed:
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/resources/project_config_files/gatein-3.1.0.properties
Log:
Renamed
Deleted: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/resources/project_config_files/gatein-3.1.0.properties
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/resources/project_config_files/gatein-3.1.0.properties 2012-03-22 15:33:07 UTC (rev 39772)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/resources/project_config_files/gatein-3.1.0.properties 2012-03-22 15:56:34 UTC (rev 39773)
@@ -1,4 +0,0 @@
-SERVER=EPP,5.1.0,default,${jbosstools.test.jboss-gatein.home}
-SEAM=2.2,${jbosstools.test.jboss-seam-2.2.home}
-DB=hsqldb18,internal, , , , ,
-PORTLET_BRIDGE=${jbosstools.test.jboss-gatein.home}/server/default/deploy/gatein.ear/lib/
\ No newline at end of file
Copied: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/resources/project_config_files/gatein.properties (from rev 39707, trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/resources/project_config_files/gatein-3.1.0.properties)
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/resources/project_config_files/gatein.properties (rev 0)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/resources/project_config_files/gatein.properties 2012-03-22 15:56:34 UTC (rev 39773)
@@ -0,0 +1,4 @@
+SERVER=EPP,5.1.0,default,${jbosstools.test.jboss-gatein.home}
+SEAM=2.2,${jbosstools.test.jboss-seam-2.2.home}
+DB=hsqldb18,internal, , , , ,
+PORTLET_BRIDGE=${jbosstools.test.jboss-gatein.home}/server/default/deploy/gatein.ear/lib/
\ No newline at end of file
12 years, 7 months
JBoss Tools SVN: r39772 - 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-03-22 11:33:07 -0400 (Thu, 22 Mar 2012)
New Revision: 39772
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizard.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizardModel.java
Log:
Fixed - JBIDE-11361
Increase OpenShift wizards timeouts
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizard.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizard.java 2012-03-22 15:01:58 UTC (rev 39771)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizard.java 2012-03-22 15:33:07 UTC (rev 39772)
@@ -169,12 +169,14 @@
private boolean createApplication() {
try {
final String applicationName = wizardModel.getApplicationName();
+ final DelegatingProgressMonitor delegatingMonitor = new DelegatingProgressMonitor();
IStatus status = WizardUtils.runInWizard(
new Job(NLS.bind("Creating application \"{0}\"...", applicationName)) {
@Override
protected IStatus run(IProgressMonitor monitor) {
try {
- getWizardModel().createApplication(monitor);
+ delegatingMonitor.add(monitor);
+ getWizardModel().createApplication(delegatingMonitor);
return Status.OK_STATUS;
} catch (OpenShiftEndpointException e) {
// TODO: refresh user
@@ -187,7 +189,7 @@
}
}
- }, null, getContainer(), 300);
+ }, delegatingMonitor, getContainer(), 300);
return status.isOK();
} catch (Exception e) {
return false;
@@ -323,4 +325,5 @@
public void dispose() {
wizardModel.dispose();
}
+
}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizardModel.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizardModel.java 2012-03-22 15:01:58 UTC (rev 39771)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizardModel.java 2012-03-22 15:33:07 UTC (rev 39772)
@@ -8,6 +8,10 @@
import java.util.HashSet;
import java.util.List;
import java.util.Set;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.FutureTask;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.ResourcesPlugin;
@@ -24,6 +28,7 @@
import org.jboss.tools.openshift.express.internal.core.console.UserDelegate;
import org.jboss.tools.openshift.express.internal.core.console.UserModel;
import org.jboss.tools.openshift.express.internal.ui.messages.OpenShiftExpressUIMessages;
+import org.jboss.tools.openshift.express.internal.ui.utils.Logger;
import org.jboss.tools.openshift.express.internal.ui.wizard.appimport.ConfigureGitSharedProject;
import org.jboss.tools.openshift.express.internal.ui.wizard.appimport.ConfigureUnsharedProject;
import org.jboss.tools.openshift.express.internal.ui.wizard.appimport.ImportNewProject;
@@ -39,7 +44,7 @@
protected HashMap<String, Object> dataModel = new HashMap<String, Object>();
- private static final int APP_CREATION_TIMEOUT = 120;
+ private static final int APP_CREATION_TIMEOUT = 180;
private static final String KEY_SELECTED_EMBEDDABLE_CARTRIDGES = "selectedEmbeddableCartridges";
public OpenShiftExpressApplicationWizardModel(UserDelegate user) {
@@ -163,13 +168,14 @@
private void createServerAdapter(IProgressMonitor monitor, List<IProject> importedProjects)
throws OpenShiftException {
- if (isCreateServerAdapter()) {
+ Assert.isTrue(importedProjects.size() > 0);
+ if (isCreateServerAdapter()) {
Assert.isTrue(importedProjects.size() > 0);
IProject project = importedProjects.get(0);
new ServerAdapterFactory().create(project, this, monitor);
}
}
-
+
@Override
public File getRepositoryFile() {
String repositoryPath = getRepositoryPath();
@@ -346,15 +352,45 @@
}
}
- protected IApplication createApplication(String name, ICartridge cartridge, IProgressMonitor monitor)
+ protected IApplication createApplication(final String name, final ICartridge cartridge, final IProgressMonitor monitor)
throws OpenShiftApplicationNotAvailableException, OpenShiftException {
- UserDelegate user = getUser();
+ final UserDelegate user = getUser();
if (user == null) {
throw new OpenShiftException("Could not create application, have no valid user credentials");
}
- IApplication application = user.createApplication(name, cartridge);
- waitForAccessible(application, monitor);
- return application;
+ ExecutorService executor = Executors.newFixedThreadPool(1);
+ try {
+ FutureTask<IApplication> future = new FutureTask<IApplication>(
+ new Callable<IApplication>() {
+ @Override
+ public IApplication call() throws Exception {
+ monitor.setTaskName("Creating application \"" + name + "\"...");
+ Logger.debug("creating application...");
+ final IApplication application
+ = user.createApplication(name, cartridge);
+ monitor.beginTask("Waiting for application to be reachable...",
+ IProgressMonitor.UNKNOWN);
+ Logger.debug("Waiting for application to be reachable...");
+ waitForAccessible(application, monitor);
+ return application;
+ }
+ });
+ executor.execute(future);
+ while (!future.isDone()) {
+ if(monitor.isCanceled()) {
+ throw new OpenShiftException("Operation was cancelled by user.");
+ }
+ Thread.sleep(1000);
+ }
+ final IApplication application = future.get();
+ return application;
+ } catch (Exception e) { // InterruptedException and ExecutionException
+ Throwable cause = e.getCause() !=null ?e.getCause() : e;
+ Logger.error("Failed to create application", cause);
+ throw new OpenShiftException("Failed to create application: {0}", cause.getMessage());
+ } finally {
+ executor.shutdown();
+ }
}
public void createApplication(IProgressMonitor monitor) throws OpenShiftApplicationNotAvailableException,
12 years, 7 months
JBoss Tools SVN: r39771 - trunk/build.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-03-22 11:01:58 -0400 (Thu, 22 Mar 2012)
New Revision: 39771
Modified:
trunk/build/pom-core.xml
trunk/build/pom-soa-tooling.xml
trunk/build/pom.xml
Log:
all components except common and tests should include usage in their -bootstrap profile
Modified: trunk/build/pom-core.xml
===================================================================
--- trunk/build/pom-core.xml 2012-03-22 14:43:08 UTC (rev 39770)
+++ trunk/build/pom-core.xml 2012-03-22 15:01:58 UTC (rev 39771)
@@ -68,6 +68,7 @@
<modules>
<module>../tests</module>
<module>../jmx</module>
+ <module>../usage</module>
</modules>
</profile>
@@ -89,6 +90,7 @@
<modules>
<module>../tests</module>
<module>../archives</module>
+ <module>../usage</module>
</modules>
</profile>
@@ -113,6 +115,7 @@
<module>../archives</module>
<module>../jmx</module>
<module>../as</module>
+ <module>../usage</module>
</modules>
</profile>
@@ -138,6 +141,7 @@
<module>../jmx</module>
<module>../as</module>
<module>../openshift</module>
+ <module>../usage</module>
</modules>
</profile>
@@ -175,6 +179,7 @@
<module>../tests</module>
<module>../common</module>
<module>../jst</module>
+ <module>../usage</module>
</modules>
</profile>
@@ -214,6 +219,7 @@
<module>../jst</module>
<module>../xulrunner</module>
<module>../vpe</module>
+ <module>../usage</module>
</modules>
</profile>
@@ -236,6 +242,7 @@
<module>../xulrunner</module>
<module>../vpe</module>
<module>../jsf</module>
+ <module>../usage</module>
</modules>
</profile>
@@ -254,6 +261,7 @@
<modules>
<module>../tests</module>
<module>../freemarker</module>
+ <module>../usage</module>
</modules>
</profile>
@@ -273,6 +281,7 @@
<module>../tests</module>
<module>../freemarker</module>
<module>../hibernatetools</module>
+ <module>../usage</module>
</modules>
</profile>
@@ -324,6 +333,7 @@
<module>../xulrunner</module>
<module>../vpe</module>
<module>../struts</module>
+ <module>../usage</module>
</modules>
</profile>
@@ -341,6 +351,7 @@
<id>forge-bootstrap</id>
<modules>
<module>../forge</module>
+ <module>../usage</module>
</modules>
</profile>
@@ -355,12 +366,22 @@
</profile>
<profile>
+ <id>cdi-tests</id>
+ <modules>
+ <module>libs</module>
+ <module>../cdi/tests</module>
+ <module>reports/emma-coverage</module>
+ </modules>
+ </profile>
+
+ <profile>
<id>cdi-bootstrap</id>
<modules>
<module>../tests</module>
<module>../common</module>
<module>../jst</module>
<module>../cdi</module>
+ <module>../usage</module>
</modules>
</profile>
@@ -379,6 +400,7 @@
<modules>
<module>../tests</module>
<module>../birt</module>
+ <module>../usage</module>
</modules>
</profile>
@@ -406,6 +428,7 @@
<module>../vpe</module>
<module>../jsf</module>
<module>../seam</module>
+ <module>../usage</module>
</modules>
</profile>
@@ -422,7 +445,7 @@
<profile>
<id>examples-bootstrap</id>
<modules>
- <module>../tests</module>
+ <module>../tests</module>
<module>../common</module>
<module>../jmx</module>
<module>../usage</module>
@@ -479,6 +502,7 @@
<module>../common</module>
<module>../as</module>
<module>../ws</module>
+ <module>../usage</module>
</modules>
</profile>
@@ -508,6 +532,7 @@
<module>../tests</module>
<module>../as</module>
<module>../deltacloud</module>
+ <module>../usage</module>
</modules>
</profile>
@@ -554,6 +579,7 @@
<module>../jst</module>
<module>../vpe</module>
<module>../jsf</module>
+ <module>../usage</module>
</modules>
</profile>
Modified: trunk/build/pom-soa-tooling.xml
===================================================================
--- trunk/build/pom-soa-tooling.xml 2012-03-22 14:43:08 UTC (rev 39770)
+++ trunk/build/pom-soa-tooling.xml 2012-03-22 15:01:58 UTC (rev 39771)
@@ -64,6 +64,7 @@
<modules>
<module>../tests</module>
<module>../jmx</module>
+ <module>../usage</module>
</modules>
</profile>
@@ -85,6 +86,7 @@
<modules>
<module>../tests</module>
<module>../archives</module>
+ <module>../usage</module>
</modules>
</profile>
@@ -122,6 +124,7 @@
<module>../tests</module>
<module>../common</module>
<module>../jst</module>
+ <module>../usage</module>
</modules>
</profile>
@@ -171,6 +174,7 @@
<module>../tests</module>
<module>../common</module>
<module>../smooks</module>
+ <module>../usage</module>
</modules>
</profile>
@@ -189,6 +193,7 @@
<modules>
<module>../tests</module>
<module>../bpel</module>
+ <module>../usage</module>
</modules>
</profile>
@@ -208,6 +213,7 @@
<module>../tests</module>
<module>../common</module>
<module>../esb</module>
+ <module>../usage</module>
</modules>
</profile>
@@ -226,6 +232,7 @@
<modules>
<module>../tests</module>
<module>../modeshape</module>
+ <module>../usage</module>
</modules>
</profile>
@@ -244,6 +251,7 @@
<modules>
<module>../tests</module>
<module>../flow</module>
+ <module>../usage</module>
</modules>
</profile>
@@ -263,6 +271,7 @@
<module>../tests</module>
<module>../flow</module>
<module>../jbpm</module>
+ <module>../usage</module>
</modules>
</profile>
@@ -282,6 +291,7 @@
<module>../tests</module>
<module>../as</module>
<module>../deltacloud</module>
+ <module>../usage</module>
</modules>
</profile>
@@ -299,6 +309,9 @@
<id>aggregate-coverage</id>
<activation>
<activeByDefault>true</activeByDefault>
+ <property>
+ <name>coverage</name>
+ </property>
</activation>
<modules>
<module>reports/emma-coverage</module>
Modified: trunk/build/pom.xml
===================================================================
--- trunk/build/pom.xml 2012-03-22 14:43:08 UTC (rev 39770)
+++ trunk/build/pom.xml 2012-03-22 15:01:58 UTC (rev 39771)
@@ -68,6 +68,7 @@
<modules>
<module>../tests</module>
<module>../jmx</module>
+ <module>../usage</module>
</modules>
</profile>
@@ -89,6 +90,7 @@
<modules>
<module>../tests</module>
<module>../archives</module>
+ <module>../usage</module>
</modules>
</profile>
@@ -113,6 +115,7 @@
<module>../archives</module>
<module>../jmx</module>
<module>../as</module>
+ <module>../usage</module>
</modules>
</profile>
@@ -138,6 +141,7 @@
<module>../jmx</module>
<module>../as</module>
<module>../openshift</module>
+ <module>../usage</module>
</modules>
</profile>
@@ -175,10 +179,10 @@
<module>../tests</module>
<module>../common</module>
<module>../jst</module>
+ <module>../usage</module>
</modules>
</profile>
-
<profile>
<id>xulrunner</id>
<activation>
@@ -214,6 +218,7 @@
<module>../jst</module>
<module>../xulrunner</module>
<module>../vpe</module>
+ <module>../usage</module>
</modules>
</profile>
@@ -236,6 +241,7 @@
<module>../xulrunner</module>
<module>../vpe</module>
<module>../jsf</module>
+ <module>../usage</module>
</modules>
</profile>
@@ -254,6 +260,7 @@
<modules>
<module>../tests</module>
<module>../freemarker</module>
+ <module>../usage</module>
</modules>
</profile>
@@ -273,6 +280,7 @@
<module>../tests</module>
<module>../freemarker</module>
<module>../hibernatetools</module>
+ <module>../usage</module>
</modules>
</profile>
@@ -324,6 +332,7 @@
<module>../xulrunner</module>
<module>../vpe</module>
<module>../struts</module>
+ <module>../usage</module>
</modules>
</profile>
@@ -343,6 +352,7 @@
<module>../tests</module>
<module>../common</module>
<module>../smooks</module>
+ <module>../usage</module>
</modules>
</profile>
@@ -360,6 +370,7 @@
<id>forge-bootstrap</id>
<modules>
<module>../forge</module>
+ <module>../usage</module>
</modules>
</profile>
@@ -389,6 +400,7 @@
<module>../common</module>
<module>../jst</module>
<module>../cdi</module>
+ <module>../usage</module>
</modules>
</profile>
@@ -407,6 +419,7 @@
<modules>
<module>../tests</module>
<module>../birt</module>
+ <module>../usage</module>
</modules>
</profile>
@@ -425,6 +438,7 @@
<modules>
<module>../tests</module>
<module>../bpel</module>
+ <module>../usage</module>
</modules>
</profile>
@@ -444,6 +458,7 @@
<module>../tests</module>
<module>../common</module>
<module>../esb</module>
+ <module>../usage</module>
</modules>
</profile>
@@ -471,6 +486,7 @@
<module>../vpe</module>
<module>../jsf</module>
<module>../seam</module>
+ <module>../usage</module>
</modules>
</profile>
@@ -487,12 +503,12 @@
<profile>
<id>examples-bootstrap</id>
<modules>
- <module>../tests</module>
+ <module>../tests</module>
<module>../common</module>
<module>../jmx</module>
<module>../usage</module>
- <module>../runtime</module>
- <module>../examples</module>
+ <module>../runtime</module>
+ <module>../examples</module>
</modules>
</profile>
@@ -544,6 +560,7 @@
<module>../common</module>
<module>../as</module>
<module>../ws</module>
+ <module>../usage</module>
</modules>
</profile>
@@ -562,6 +579,7 @@
<modules>
<module>../tests</module>
<module>../modeshape</module>
+ <module>../usage</module>
</modules>
</profile>
@@ -580,6 +598,7 @@
<modules>
<module>../tests</module>
<module>../flow</module>
+ <module>../usage</module>
</modules>
</profile>
@@ -599,6 +618,7 @@
<module>../tests</module>
<module>../flow</module>
<module>../jbpm</module>
+ <module>../usage</module>
</modules>
</profile>
@@ -628,6 +648,7 @@
<module>../tests</module>
<module>../as</module>
<module>../deltacloud</module>
+ <module>../usage</module>
</modules>
</profile>
@@ -674,6 +695,7 @@
<module>../jst</module>
<module>../vpe</module>
<module>../jsf</module>
+ <module>../usage</module>
</modules>
</profile>
12 years, 7 months
JBoss Tools SVN: r39770 - branches/jbosstools-3.3.0.Beta1/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-03-22 10:43:08 -0400 (Thu, 22 Mar 2012)
New Revision: 39770
Modified:
branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizard.java
branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizardModel.java
Log:
Fixed - JBIDE-11361
Increase OpenShift wizards timeouts
Modified: branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizard.java
===================================================================
--- branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizard.java 2012-03-22 14:00:11 UTC (rev 39769)
+++ branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizard.java 2012-03-22 14:43:08 UTC (rev 39770)
@@ -187,12 +187,14 @@
private boolean createApplication() {
try {
final String applicationName = wizardModel.getApplicationName();
+ final DelegatingProgressMonitor delegatingMonitor = new DelegatingProgressMonitor();
IStatus status = WizardUtils.runInWizard(
new Job(NLS.bind("Creating application \"{0}\"...", applicationName)) {
@Override
protected IStatus run(IProgressMonitor monitor) {
try {
- getWizardModel().createApplication(monitor);
+ delegatingMonitor.add(monitor);
+ getWizardModel().createApplication(delegatingMonitor);
return Status.OK_STATUS;
} catch (OpenShiftEndpointException e) {
// TODO: refresh user
@@ -205,7 +207,7 @@
}
}
- }, null, getContainer(), 300);
+ }, delegatingMonitor, getContainer(), 300);
return status.isOK();
} catch (Exception e) {
return false;
Modified: branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizardModel.java
===================================================================
--- branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizardModel.java 2012-03-22 14:00:11 UTC (rev 39769)
+++ branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizardModel.java 2012-03-22 14:43:08 UTC (rev 39770)
@@ -8,6 +8,10 @@
import java.util.HashSet;
import java.util.List;
import java.util.Set;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.FutureTask;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.ResourcesPlugin;
@@ -24,6 +28,7 @@
import org.jboss.tools.openshift.express.internal.core.console.UserDelegate;
import org.jboss.tools.openshift.express.internal.core.console.UserModel;
import org.jboss.tools.openshift.express.internal.ui.messages.OpenShiftExpressUIMessages;
+import org.jboss.tools.openshift.express.internal.ui.utils.Logger;
import org.jboss.tools.openshift.express.internal.ui.wizard.appimport.ConfigureGitSharedProject;
import org.jboss.tools.openshift.express.internal.ui.wizard.appimport.ConfigureUnsharedProject;
import org.jboss.tools.openshift.express.internal.ui.wizard.appimport.ImportNewProject;
@@ -40,7 +45,7 @@
protected HashMap<String, Object> dataModel = new HashMap<String, Object>();
- private static final int APP_CREATION_TIMEOUT = 120;
+ private static final int APP_CREATION_TIMEOUT = 180;
private static final String KEY_SELECTED_EMBEDDABLE_CARTRIDGES = "selectedEmbeddableCartridges";
public OpenShiftExpressApplicationWizardModel(UserDelegate user, IProject project, IApplication application, boolean useExistingApplication) {
@@ -343,15 +348,45 @@
}
}
- protected IApplication createApplication(String name, ICartridge cartridge, IProgressMonitor monitor)
+ protected IApplication createApplication(final String name, final ICartridge cartridge, final IProgressMonitor monitor)
throws OpenShiftApplicationNotAvailableException, OpenShiftException {
- IUser user = getUser();
+ final IUser user = getUser();
if (user == null) {
throw new OpenShiftException("Could not create application, have no valid user credentials");
}
- IApplication application = user.createApplication(name, cartridge);
- waitForAccessible(application, monitor);
- return application;
+ ExecutorService executor = Executors.newFixedThreadPool(1);
+ try {
+ FutureTask<IApplication> future = new FutureTask<IApplication>(
+ new Callable<IApplication>() {
+ @Override
+ public IApplication call() throws Exception {
+ monitor.setTaskName("Creating application \"" + name + "\"...");
+ Logger.debug("creating application...");
+ final IApplication application
+ = user.createApplication(name, cartridge);
+ monitor.beginTask("Waiting for application to be reachable...",
+ IProgressMonitor.UNKNOWN);
+ Logger.debug("Waiting for application to be reachable...");
+ waitForAccessible(application, monitor);
+ return application;
+ }
+ });
+ executor.execute(future);
+ while (!future.isDone()) {
+ if(monitor.isCanceled()) {
+ throw new OpenShiftException("Operation was cancelled by user.");
+ }
+ Thread.sleep(1000);
+ }
+ final IApplication application = future.get();
+ return application;
+ } catch (Exception e) { // InterruptedException and ExecutionException
+ Throwable cause = e.getCause() !=null ?e.getCause() : e;
+ Logger.error("Failed to create application", cause);
+ throw new OpenShiftException("Failed to create application: {0}", cause.getMessage());
+ } finally {
+ executor.shutdown();
+ }
}
public void createApplication(IProgressMonitor monitor) throws OpenShiftApplicationNotAvailableException,
12 years, 7 months